Message ID | 1439791119-26892-4-git-send-email-noamc@ezchip.com |
---|---|
State | Changes Requested, 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 3827F140134 for <patchwork-incoming@ozlabs.org>; Mon, 17 Aug 2015 16:16:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752584AbbHQGQF (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Mon, 17 Aug 2015 02:16:05 -0400 Received: from mail-db3on0066.outbound.protection.outlook.com ([157.55.234.66]:20057 "EHLO emea01-db3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752188AbbHQGQE (ORCPT <rfc822;netdev@vger.kernel.org>); Mon, 17 Aug 2015 02:16:04 -0400 Received: from AM3PR02CA0069.eurprd02.prod.outlook.com (10.163.180.37) by AM3PR02MB1026.eurprd02.prod.outlook.com (10.163.182.152) with Microsoft SMTP Server (TLS) id 15.1.231.21; Mon, 17 Aug 2015 06:01:03 +0000 Received: from AM1FFO11FD023.protection.gbl (2a01:111:f400:7e00::198) by AM3PR02CA0069.outlook.office365.com (2a01:111:e400:5365::37) with Microsoft SMTP Server (TLS) id 15.1.231.21 via Frontend Transport; Mon, 17 Aug 2015 06:01:02 +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 AM1FFO11FD023.mail.protection.outlook.com (10.174.64.212) with Microsoft SMTP Server (TLS) id 15.1.243.9 via Frontend Transport; Mon, 17 Aug 2015 06:01:02 +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; Mon, 17 Aug 2015 09:00:39 +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: [v1 3/6] NET: nps_enet: TX done race condition Date: Mon, 17 Aug 2015 08:58:36 +0300 Message-ID: <1439791119-26892-4-git-send-email-noamc@ezchip.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1439791119-26892-3-git-send-email-noamc@ezchip.com> References: <1439791119-26892-1-git-send-email-noamc@ezchip.com> <1439791119-26892-2-git-send-email-noamc@ezchip.com> <1439791119-26892-3-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-21750.005 X-TM-AS-Result: No--7.531100-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; AM1FFO11FD023; 1:lHPyOoPYdZT80+L9FFprOeodzvQiz27H0t6u3647sJi2XpGgKgPuDVXWxEW1ZIX+QOXiV9iEWm90OmkzlCbMvhCpyoU0/h2w/x8TAvTDUO6IZoghp+xDc7uxK3B+978y7CXlqRmKjm7I+w5hq3IgJmSFsR6PF5//rarL4P8KX3NG9ATLnXEbO3H4ZNaAEoPQPgRvS3UfFHeyt3q9cYJ51rcFTiWVpbQUjtGwhAFnqsZNIOjV5pAiRYUEHDHuuj/zYyKkUeS0L0YDew7RgHWV01njMEKp+Yd+VU73/Zcgu0hcjPmlWwe7ZqzkqhKON5fP5JqIWZ9yxeYi8UsKtIYoJER9pHzGlChHbj2xea53cYgnd0lKpH6XrYGLBaa6pud9 X-Forefront-Antispam-Report: CIP:212.179.42.66; CTRY:IL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(339900001)(3050300001)(199003)(189002)(50466002)(46102003)(47776003)(104016003)(49486002)(92566002)(19580405001)(189998001)(5001860100001)(6806004)(19580395003)(50986999)(5001830100001)(48376002)(76176999)(107886002)(4001540100001)(5001970100001)(77156002)(33646002)(106466001)(50226001)(5001920100001)(62966003)(5001770100001)(85426001)(87936001)(5003940100001)(2950100001)(86362001)(77096005)(36756003)(64706001)(229853001)(105606002)(4001430100001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM3PR02MB1026; H:ezex10.ezchip.com; FPR:; SPF:Fail; PTR:ezmail.ezchip.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; AM3PR02MB1026; 2:GViPSGkgLpZFzAn4wZvVqMhESmjciNr6rX2A4T96odj1P8OPWgewn71BijP+2TYjgdbzB1lqn8DERnc+GBHBcVnb6HE9WmhxwxOJMCulkDxsYsM1jLH4KDhtBR4daQYifnaldlu2o8nFurzJm8yeytztH1Ta2TndOHuTeWw2mYw=; 3:xgjU7cpRmTGV54qjxYW0P7a+yTSXZC9CTfM5T0OxwnzkFym+6SSiCxg5Fnfd8PgWhlGEQUVhVH5N19E77V/RsMKCp+aPpNHVd5xtUy5ug+zTtNNi+FtGi8PfUDCqXlJvcbgBcxqn6tUGHOcVoRDYc7bnCNhSoeBbQNzTTw68BQl3TL4wdEzGHlkJxq6EsRvT1JTECLq3HabResfBWTSws7gbfING17RD+z8UJII+P54=; 25:fjx2VTOS6PdSZZRUhgAMVdq82IL6EWGhQKwsO1UCgzwsGDedCuBF/5KT0lC1oUBXYfFnnx2rZWYjagMBc/VzeCeGXtK51H/wwc9p7CTK46vZZ3w67efUf6MzEfCSxoxVdVU2k60Epxm4KRN5w6DwsL3jlbQhyGnmFJQPOBb61Q2bBdtMJYa14+z+D/enWscpEyqIPb2ph12shJM/xYimEIn8clyfzpz2/thXttk8OVfDBE8BKAGtsHHN2E3e+h8MKgeA16MC67F4qdN/vzx8lw==; 20:eLcnXNrXtsezxmOlSNIh/wT1DgksL5lxiSsOtXeGDFHFZQYxBeID4+Jo+6/2ijxhe33QjAjkMqcifgxWXezsguOrB3M5nB4VDh0EtXQmEWy0ylqDhwlFyNbUXVxtvsKmaKI8N0Nn2wDjCpHUl3cH92arxZNb0dO4L7Tzlsh1K5s= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM3PR02MB1026; X-Microsoft-Antispam-PRVS: <AM3PR02MB1026A3B49040CFDC970F02D9D6790@AM3PR02MB1026.eurprd02.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(8121501046)(3002001); SRVR:AM3PR02MB1026; BCL:0; PCL:0; RULEID:; SRVR:AM3PR02MB1026; X-Microsoft-Exchange-Diagnostics: 1; AM3PR02MB1026; 4:zO5ZZV4PkX9kcAWO6F5EhbosEn1mqIUbQDNTa/jRj9I6t4XC/DgsEHaGpsmOR4e0CGP9f5Ne2NOqFKWoO3w+t5A+/1VgnHIIDtU7qTqRiQLSs2/CQ6+6k1oj3c21tsQO6uxo7aiKZ9xexPLI9dXF7yqW5ebWjXF9EHo/JFk1BceKu90Y8/08FSz141r3lKnynyl9xoujPHvJrMym5fxSs9kqDhjufTE3Azx0+wWrCs/h8r2UIHyoqDIDwTIyLeMIz6Zn3nv0tbmFLpr+j1qiOJCXiw1xb3vFYKHI2LLJ2mRzgwwdHEdL7KHUxpuXE7h9 X-Forefront-PRVS: 0671F32598 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM3PR02MB1026; 23:l4elu+ar9r0hnAOHG5K6isGLtC7QPJtY38DIGdGM8?= =?us-ascii?Q?oHcrE0KRItXoVlz4NTmRRvk3vsnZ3z0OgbW4/Mo0Kpej39QYYJaV0zigtbRg?= =?us-ascii?Q?Q9+ogN/2vls/9H431S5xg8I5GMCXmddCPp7jBBZQJ7yh4UOb2L2LeSTbUea7?= =?us-ascii?Q?yROXaH5siGFGxYnE+stDrRR6Qu7iXEnaYpLg5KegaSHMg9E/V9nSbIXlceyP?= =?us-ascii?Q?3nEy3cTiULDNKIu+wEo4dC7P4fnqg60BqqUxh6CVW7CUDtUfOMYL83cIQfPy?= =?us-ascii?Q?up1okyXS3u6hDUZKSFDXH3CDDZU4ZsvrEWcEmbIq7rLf6Q4Ei1uGJA35QQvk?= =?us-ascii?Q?vN80+P8rigM/qXAF3gU6yxe+TfdoWbown+ooZ5hToRiuA/A2pEirf3gKkwhz?= =?us-ascii?Q?OlKjQddXEYYBQOS1Ml6bn4lI0FIPd+Dryab/uD87sNrOZ6oXyhwycyJuYALo?= =?us-ascii?Q?h6+RcpcNrhG2YqMC8gCsuv/U80vPid3RSlbqTHcbM4uattmOuRWBTjnVOo0n?= =?us-ascii?Q?xPlwFziQRvu4XtZFN3T7/YoCREqnXjZZ1vMlpZUwOQj4XbyNErg0k7jLVlb4?= =?us-ascii?Q?enx1MdO5xVTn6PJ544p44PTIRWgOvpvDWzi1doB1MIGx+ECMRQrCxE+f9QdF?= =?us-ascii?Q?HS8Mq4DsfyzqlETvJRYgsF1/sYNB2S91cdYv9Hs+Oe23W4kkCmSzwPXInbin?= =?us-ascii?Q?wevJbx/jL1GMj0WK9VbVEMadcNzP9XdTUMolnaOZZheqx1Ki2hS+xfy64E40?= =?us-ascii?Q?G9HlQTifx/OyR7ifsCnzBq8jJefIR92qc33cTYpi5astaRksw2hvuzrvNLwW?= =?us-ascii?Q?Iyr+kNOpEfWQUiVqSdKWpkKtNMbTIfgiSeUoKtMxa4bGCmQPCrGDA3mylgG/?= =?us-ascii?Q?3jrST2HjNcBeWsjbt39H1OgMKlE0XtpeTP+MfBu3v9NBhhV8ps9Z/tMVHy1Z?= =?us-ascii?Q?7zsSzQrmb6x54qSQki5zunxi+b/0Q4k6PFhSErLEHsSMTVXINojTDPuUGHC1?= =?us-ascii?Q?hCHWc2YQKjM9Igkliu+zik+GZ33J33RvIqV4aiDujSTIEKK1cGasK9Mka9Mw?= =?us-ascii?Q?FAeLHpPPVbpa5fRrABJtHykLApcZpPab8ItXZhnq7vQv0X5hpzTGzW8mCvHZ?= =?us-ascii?Q?hQPUNMizckhm0PO7puMyPeI7LXE0iCZPNn8uU3u91364D5LqpSBdQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; AM3PR02MB1026; 5:fpQ4a6UTxAn7nocHxzwgnnWEFVA/JdE/N/P2O6vqTTK8F2HdYL2rhYx7EWHL/wNzMNc+AHJ4OsyjNgqYUBOh7q1peeycyiF3GB4cwZtKVjDOKR4mIAgpy0rEbPjwUJZ8m0XWBTvBrCm3g7qt7/wz1A==; 24:dZQVbZtRNK8SH1eqi6Cv5KMeuAOU5+EJ1nsl8mLaxCUYPmoZZdDOoKQ29Kjs1lg/6MpbYdDTm2CeB0TZKpcy6RGdORCgX2VkHfe1DjgY18g=; 20:cqYrQnqG6hwapoycMWkHVVeRE6uwO2vwcfw/2X38vG5ah63ictSRJqKlXfHHzp7G7L1qBHWegm78bl8Msqzy3A== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: ezchip.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Aug 2015 06:01:02.5352 (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: AM3PR02MB1026 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 af72181..f78ad3d 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_irq(priv->tx_skb); - priv->tx_skb = NULL; - } - + dev_kfree_skb_irq(priv->tx_skb); priv->tx_packet_sent = false; if (netif_queue_stopped(ndev)) @@ -531,10 +527,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; }