Message ID | 1440046805-24459-3-git-send-email-noamc@ezchip.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D0F371402A2 for <patchwork-incoming@ozlabs.org>; Thu, 20 Aug 2015 15:06:23 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751755AbbHTFGH (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Thu, 20 Aug 2015 01:06:07 -0400 Received: from mail-db3on0078.outbound.protection.outlook.com ([157.55.234.78]:19907 "EHLO emea01-db3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751677AbbHTFGD (ORCPT <rfc822;netdev@vger.kernel.org>); Thu, 20 Aug 2015 01:06:03 -0400 Received: from AM3PR02CA0057.eurprd02.prod.outlook.com (10.163.180.25) by AM3PR02MB179.eurprd02.prod.outlook.com (10.242.248.146) with Microsoft SMTP Server (TLS) id 15.1.231.21; Thu, 20 Aug 2015 05:06:00 +0000 Received: from DB3FFO11FD050.protection.gbl (2a01:111:f400:7e04::166) by AM3PR02CA0057.outlook.office365.com (2a01:111:e400:5365::25) with Microsoft SMTP Server (TLS) id 15.1.231.21 via Frontend Transport; Thu, 20 Aug 2015 05:06:00 +0000 Authentication-Results: spf=fail (sender IP is 212.179.42.66) smtp.mailfrom=ezchip.com; synopsys.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of ezchip.com does not designate 212.179.42.66 as permitted sender) receiver=protection.outlook.com; client-ip=212.179.42.66; helo=ezex10.ezchip.com; Received: from ezex10.ezchip.com (212.179.42.66) by DB3FFO11FD050.mail.protection.outlook.com (10.47.217.81) with Microsoft SMTP Server (TLS) id 15.1.249.14 via Frontend Transport; Thu, 20 Aug 2015 05:05:58 +0000 Received: from localhost.localdomain (10.1.3.132) by ezex10.ezchip.com (10.1.1.4) with Microsoft SMTP Server (TLS) id 14.3.224.2; Thu, 20 Aug 2015 08:05:43 +0300 From: Noam Camus <noamc@ezchip.com> To: <linux-kernel@vger.kernel.org>, <netdev@vger.kernel.org> CC: <davem@davemloft.net>, <Alexey.Brodkin@synopsys.com>, <vgupta@synopsys.com>, <talz@ezchip.com>, Noam Camus <noamc@ezchip.com> Subject: [v2 2/5] NET: nps_enet: TX done race condition Date: Thu, 20 Aug 2015 08:00:02 +0300 Message-ID: <1440046805-24459-3-git-send-email-noamc@ezchip.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1440046805-24459-2-git-send-email-noamc@ezchip.com> References: <20150817.103607.1737876155019074073.davem@davemloft.net> <1440046805-24459-1-git-send-email-noamc@ezchip.com> <1440046805-24459-2-git-send-email-noamc@ezchip.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-Product-Ver: SMEX-11.0.0.1191-8.000.1202-21758.005 X-TM-AS-Result: No--7.176500-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; DB3FFO11FD050; 1:324jgJqsoIrEUQfuKBlGq9YnHZpaO3JBbggn6HLtT30h7C2jhyyzKdZKf2zwZq3g5vxUUHjGWwri0kpDK3taB091j9j/8Jo35JLXBR/qjC5kaniJrNKLsvqF1kHHFlPk4gOzGl5fS8CeS7gRpcrZR5Dq1EXqxqILevwBjSgTBxfKEgvIZHP25Jk9fm94GSvRsfHGDJ6Kym+1KMlNa/ETN56/IZUdcAD9I8qb+JAb9nZrE7PATGi940edrVbI15xwGMyFF9I0AAV1nLYOLLpjG0Swpuc97Cvzh8TrzfGYcEGDFqZtMxcfTwwayaChzQSpBHuIsm9DllvZ8VxFXncUiRUkM7X8y5LfKUoCGuOvMKYJ2UvarJo/jlYsLxPmavj+ X-Forefront-Antispam-Report: CIP:212.179.42.66; CTRY:IL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(3050300001)(339900001)(199003)(189002)(77096005)(229853001)(86362001)(47776003)(106466001)(77156002)(64706001)(105606002)(189998001)(5001830100001)(5001860100001)(4001540100001)(5001970100001)(19580395003)(5003940100001)(107886002)(19580405001)(50986999)(50466002)(76176999)(46102003)(104016003)(92566002)(85426001)(5001770100001)(33646002)(36756003)(87936001)(5007970100001)(50226001)(6806004)(62966003)(2950100001)(49486002)(48376002)(4001430100001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM3PR02MB179; H:ezex10.ezchip.com; FPR:; SPF:Fail; PTR:ezmail.ezchip.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; AM3PR02MB179; 2:HvbRc0MsDuBAb7l+AmmaxKB4uyAIE9kZbQyoxNCfvUph9/8nME6PEMSZnPGc5R5sFcsijzFqOV23dX4lCcC1Vc/NBq+2Io1taJbtvbzpeSAtNdgIoXJWaBDxqn+IUKJ4ChYyfCoO8rppD2Qw3MLi7dqh2lrRrq33E9k7PlcCnY0=; 3:bmWT9FHbidhTpHulkpJnMo+kH4IHNeLRDLfucGhkEmfXZJzS6xnHBxbHcykb1aN78bUnGuEZ1wWAAs720WzGLBXHnIHypheXYGIvwhlfbtvSTi1usEJJrCCf00oe6OpFgWCWcTMLFoYBreb2E/RiwfzzYGpwVu6zXIAy1Vel23JdGXlV9102QNpamgjhE6oeH8bGVnyI5btiRK2lZlUPzF8z7IFqpluNkdYUcAPvEG0=; 25:LLWiSx5XCN0TqiOl9kODmIAL6Pq50+Eh2g/D51ix3ER2Cu4x/0bRveFYzxB+9Lx5j7AuPPeSb46z1v5bVQ8qK8eCdn5NAaZKyEU2K/3RESphtv+4K50KOXJWgHbttLz9si4YiaQkr+OXbUQfJ9hhSzhyiHDxUoc9GGMyR+9PrDb1NolKBukSITbBtz/m3LpsjntFwji+Vg9M45E3MXw3ZgNxottX4T9n/BGC5EeMhwzu3ryVPAHFDvjrLtstlz2s; 20:SvnuK7w9Smv4w5Qegxf2k343o+OBjsnTzqHIR7MQbgZMny7aweLafyCEWWRemj7g409xQQq6h+ZujIty6I6mEnF6uI/9YHj9luo9Cm6BV4LWcAUJCz6F2llYIPZExofEhwcHmZIQRxGhWLiy8tdQoUy6dlSmkleR2BS78kahotA= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM3PR02MB179; X-Microsoft-Antispam-PRVS: <AM3PR02MB179A5F58791EFF22DF6CC9FD6660@AM3PR02MB179.eurprd02.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(8121501046)(5005006)(3002001); SRVR:AM3PR02MB179; BCL:0; PCL:0; RULEID:; SRVR:AM3PR02MB179; X-Microsoft-Exchange-Diagnostics: 1; AM3PR02MB179; 4:cBYYXuGVEZhqOD0fTCM6NJMn37mtiuqoFi6erDTGB7HnC+kcFnk+bcv7K+1X+j4jQQpu0tdc+R2YqjAMps9ysctPh/Z3oyoJnM5HnCH8OjIl7gale4HzhwJ/tUUtuaz+QTbCWLqTMvxZpXCJMhl7CvJVawSdk7/hXzZ3cpZxIfoTpMfYoG7VxRTrVr8cdBjqQ0EryDTtPHHYxd3kw5h4DM5o8UlUukmLWiWXrnFsnpAs19P8PY2KxqDKDjJ4jWwOBMLSibs1qgT75Bt5wz5NKGJERQXsC5ts5st7LRXKCJUFmlmmevOETyuQlNTIuQml X-Forefront-PRVS: 0674DC6DD3 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM3PR02MB179; 23:G34Vj3ovuZaV4XYJTmWqzQElEqG3H8SlvKzXmrCGs8?= =?us-ascii?Q?pR2M11oG7LbZsXcmSag0bkLUraPLjkrI4QkO/jiICnmNg37uREBMmYoFRjQu?= =?us-ascii?Q?fZrj2H4fSzdTd0UrVT8fn3Vacbo1NXJE5XZ0I/CV0PscBWtqI14zZfUr78fj?= =?us-ascii?Q?gi7L/tpSYxuhkpiGJWK131Nh6Ds1jvoCLC98tJbOmAcA70THGTk4Re95Hh0D?= =?us-ascii?Q?f1oFtANp6poguQCvRIBrd40pXca9Yynb6mWDdXC3mKOQVCWo2iCXR5PCIrgn?= =?us-ascii?Q?2hoXJSyHD0Qx9WJ5FBVfeQtjuDEza4CHO4IQaGlFTqk56w1WDXMlfwh3qUMC?= =?us-ascii?Q?mwW6Mu1eCc5QpQpHMzSp+aosSQKhO8MQCjIl+ho5RmnzWRiWWcIT3HMO/F5s?= =?us-ascii?Q?s7ZwVEA+udo4QZ16FRmPLULtx93BRBswF7oXMBCtxQOeEHBEsy93O4BnBWKJ?= =?us-ascii?Q?YktkPMfagqcpFSqiqTXpmuEdIDB//u3InZJwplvtRtoDL7qFp5AhcMJD6gYY?= =?us-ascii?Q?9cbZU5gzhJrYfH82vnGhD9/MPsLh2sjVQvg2TzusPQc7xDKLO9iW2++WVv2a?= =?us-ascii?Q?A2zbsaCGy393mgalKA/OpA8eXnCzJdaI943EVr4DjWyW0SvF+0n8WDvhFP1F?= =?us-ascii?Q?W0hdjjeiE8APOntsqTt5YSFmCHlfJF29XO/4Rx949osb7MkpH8EH7RUW+L5K?= =?us-ascii?Q?6GlnQB0Sf72rBTZxRNhU7sYPym5bVd+0UqYyFWNguqK4mwldXbfaEN1/bEMi?= =?us-ascii?Q?kmsHyDgKBzcIsUN3kChVz2F1bpocoo7bsZZ7A0Z3ZBwSHUhqszKm9fvJfwsi?= =?us-ascii?Q?skLBpU4ethLoVqPUT4fah7pLz1h7sCskK3Cf3znGDxBKL3N1Nz0he13XPPLp?= =?us-ascii?Q?75toFs2eIVzqJVqFN7/g7/QgE2Y+NrZY+qjtcxfdW9QrmA2L+oufEaI/ldbJ?= =?us-ascii?Q?TUA9pwhUhosqdyY5aLZabG8yRjoWj7D+oGSrCIEGxUC/Pr5jBlmqrups5NHn?= =?us-ascii?Q?bEdVFEg8RglfloDFkEsqslxreSx2EFRxM2QLqziJvmc+EdY6jZ97rb/8uX+C?= =?us-ascii?Q?RA3vzYzuuExTz3+mm74uS6TxDgS/G9c5hIfvuKaHe0K6uWJ21cZEtqeyKus/?= =?us-ascii?Q?thA47wn2MMiRdnsEtjSFIcNaPU1oS8ZY0/XEw15/PqPBx1kzloXg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; AM3PR02MB179; 5:7Y2+cxAw/eOhax81YJVtM25mYQoJAVNATEDvmTH8m/vWdEKbIAQlGnU6FGroVirPmEY7WnbonCtEz9j4OZ/bq40irGVFS88irLByfyyyOUbqZukiUWRJjoEgvbPM1ISrID6XPQ+5t58UCd+f+FQ9jQ==; 24:CymQ15SzeseMOlBNaBdJesaNPDXVtaOA3hEZ261S8m7rI3WQATzUeQLUEZSqNyYY3i6Fucs6ei+APyUDqJpVQNQ8I11ZCRAjk3H4Vp4XNDY=; 20:PAiyWTi9D4u28jgCX8UOgxkYQm8ys4GyLgOqej8SSYtFaRI/Z9OPBv4AD5XuZAORfqERIllabAoCXYsxQT2mQg== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: ezchip.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2015 05:05:58.2244 (UTC) X-MS-Exchange-CrossTenant-Id: 0fc16e0a-3cd3-4092-8b2f-0a42cff122c3 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0fc16e0a-3cd3-4092-8b2f-0a42cff122c3; Ip=[212.179.42.66]; Helo=[ezex10.ezchip.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR02MB179 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
diff --git a/drivers/net/ethernet/ezchip/nps_enet.c b/drivers/net/ethernet/ezchip/nps_enet.c index 0e652b4..8b25f24 100644 --- a/drivers/net/ethernet/ezchip/nps_enet.c +++ b/drivers/net/ethernet/ezchip/nps_enet.c @@ -158,11 +158,7 @@ static void nps_enet_tx_handler(struct net_device *ndev) ndev->stats.tx_bytes += tx_ctrl.nt; } - if (priv->tx_skb) { - dev_kfree_skb(priv->tx_skb); - priv->tx_skb = NULL; - } - + dev_kfree_skb(priv->tx_skb); priv->tx_packet_sent = false; if (netif_queue_stopped(ndev)) @@ -528,10 +524,10 @@ static netdev_tx_t nps_enet_start_xmit(struct sk_buff *skb, /* This driver handles one frame at a time */ netif_stop_queue(ndev); - nps_enet_send_frame(ndev, skb); - priv->tx_skb = skb; + nps_enet_send_frame(ndev, skb); + return NETDEV_TX_OK; }