From patchwork Wed Feb 6 22:43:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manish Chopra X-Patchwork-Id: 1037784 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=marvell.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43vxRf37gzz9sLw for ; Thu, 7 Feb 2019 09:47:58 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726186AbfBFWr5 (ORCPT ); Wed, 6 Feb 2019 17:47:57 -0500 Received: from mail-eopbgr710054.outbound.protection.outlook.com ([40.107.71.54]:58688 "EHLO NAM05-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726266AbfBFWr4 (ORCPT ); Wed, 6 Feb 2019 17:47:56 -0500 Received: from DM5PR07CA0104.namprd07.prod.outlook.com (2603:10b6:4:ae::33) by BLUPR0701MB1921.namprd07.prod.outlook.com (2a01:111:e400:5165::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.22; Wed, 6 Feb 2019 22:46:14 +0000 Received: from CO1NAM05FT023.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::202) by DM5PR07CA0104.outlook.office365.com (2603:10b6:4:ae::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1580.22 via Frontend Transport; Wed, 6 Feb 2019 22:46:14 +0000 Authentication-Results: spf=fail (sender IP is 199.233.58.38) smtp.mailfrom=marvell.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=fail action=none header.from=marvell.com; Received-SPF: Fail (protection.outlook.com: domain of marvell.com does not designate 199.233.58.38 as permitted sender) receiver=protection.outlook.com; client-ip=199.233.58.38; helo=CAEXCH02.caveonetworks.com; Received: from CAEXCH02.caveonetworks.com (199.233.58.38) by CO1NAM05FT023.mail.protection.outlook.com (10.152.96.131) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) id 15.20.1580.2 via Frontend Transport; Wed, 6 Feb 2019 22:46:13 +0000 Received: from dut1171.mv.qlogic.com (10.112.88.18) by CAEXCH02.caveonetworks.com (10.67.98.110) with Microsoft SMTP Server (TLS) id 14.2.347.0; Wed, 6 Feb 2019 14:44:02 -0800 Received: from dut1171.mv.qlogic.com (localhost [127.0.0.1]) by dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id x16Mi1fx017115; Wed, 6 Feb 2019 14:44:01 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id x16Mi15R017114; Wed, 6 Feb 2019 14:44:01 -0800 From: Manish Chopra To: CC: , , , Sudarsana Reddy Kalluru Subject: [PATCH net 4/6] qede: Fix system crash on configuring channels. Date: Wed, 6 Feb 2019 14:43:45 -0800 Message-ID: <20190206224347.17054-5-manishc@marvell.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20190206224347.17054-1-manishc@marvell.com> References: <20190206224347.17054-1-manishc@marvell.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131939667742937593; (abac79dc-c90b-41ba-8033-08d666125e47); (abac79dc-c90b-41ba-8033-08d666125e47) X-Forefront-Antispam-Report: CIP:199.233.58.38; IPV:CAL; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(136003)(346002)(396003)(376002)(2980300002)(1110001)(1109001)(339900001)(189003)(199004)(80596001)(8676002)(51416003)(76176011)(126002)(11346002)(2616005)(476003)(48376002)(6862004)(16586007)(1076003)(316002)(42186006)(81166006)(26005)(36906005)(446003)(87636003)(498600001)(86362001)(336012)(486006)(85426001)(50466002)(8936002)(2351001)(2906002)(26826003)(97736004)(105606002)(68736007)(6666004)(50226002)(47776003)(356004)(14444005)(106466001)(36756003)(81156014)(4326008)(107886003)(54906003)(53936002)(69596002)(305945005); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0701MB1921; H:CAEXCH02.caveonetworks.com; FPR:; SPF:Fail; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; CO1NAM05FT023; 1:JvKxyX4KP21nDZl7l9AJJiRLDqxMmused+nhzx6NSgHrIelyou61RuBW/7an1g98CcHpsUayEWSEteB474x48WX2DkDL0YKekMCLSo8jmbB1E4TEr3XGu6qLKJATtti3PO6gu6VARE5rOlJXZgB39g== X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 97102f20-d6bd-420b-5664-08d68c84e609 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(5600110)(711020)(4605077)(2017052603328); SRVR:BLUPR0701MB1921; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1921; 3:p9SSwg4txtSSsRK05LTlH9N26OH843xv+O9kJfw8mmx9nve/mq8i54uWmObrSnSRiwCQptqYniplzDdY4tMNrgr505TmDTIf59xb8Rh7QkCnuYc2Zn7v4fwK0VX42eBOGSIcoyv4JvYafRd8/v2MWCEBzQlmzK+oY54zG3SU/gFpRgu/Z0LV/v4UXCmoNDkeZXHO+oiIRCYSV0N9Y8D8jjmjdXTV5NEb23BspV2EUpHWSCV81tVpFolrtAlwxrpv0txG4B0j7FNgRXYp+GTYD/FhKWHtRAnWpnQzKrGToH6s5k1qFIEWlWWMoLFWvA5UZ+le9uPtKiT4q8WTk1anITIWtswFuBrx0D4o4nJZv+Hkg9uKf8Hz1VmokUo9D5xt; 25:ODnFxJFhz6Q0U3RnqDYWIdO9bqCyqikum2C0v++63XiV/tqro9PEX+gwKAHFe9h4a53YBIFArmaCfnK9f4V9ui+j9MhQq7OqEhT8G63vO9OfQzQNgrW2lJyfM/rODPw1PoaNrpfsv5Eu7hxKzElpfKaljyWthjbOyJNKFje6D+heZKhc20b38Gmrl/sG28718gROpnWL19KCp19Sntqzcoyq7Nq9hm0fi5eLK8aaADOhUxVHKR8cU8uam7qrjH5Z3ktPe5jnc8OZkVbM7+DLNqz3Ud+Uk2nmRwOoITNGW847fNG/7/eww7Y0EeYx4yiC9wABKSCmNEs+T+Ypje+BAQ== X-MS-TrafficTypeDiagnostic: BLUPR0701MB1921: X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1921; 31:2V5Gh+r3C29EFPjBHLkQ9c8ltwHG38jUKx/CfGEf3lWXrSsBXLwZ28KAzk3fpDJD0602nUMNOGby1Zed9Yumwwut1c1+DrqP+c7/Czehr6I2n53EKDF3pC/T6gHlHi+aJB4enDwcy3RwlDno3zCvRtKJuO+m/ULeO3kRkGkVz3//hUZ+ZZW3w20okb2d4A8qjM2ialDgdJeOY4LpNU031bjc2aOyCXDEGKRw5kaAUjI=; 4:o79qznXyD8bBcQlc+/UGd7v17TkaWGcv554K1ieO3TIefVyPhjBrr2BF55SjeqCPLPePGPqu0eccdchcWjkHUDFVslpKYgIiWoNqpavgd+yPrrjtRgQ4+C0zMPlZILmBIVhVvN8aRUFqy+lgzk46X8NjqDotPykANODfFEII2kyDVXcywIJzN+Qc88c06eB6jB2Pkls++r6AxeBiwQVWKG2tCnLAWgDMNwm3IFwAKH8Tr9IYSUUVmWdfMaD4QrFDPeev6xlOogqzfhwqGnwu35UOzBQV0XpxAScAfRckSXjsYSXH4NdvIph6tHtbrQIa X-Microsoft-Antispam-PRVS: X-Forefront-PRVS: 0940A19703 X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1921; 23:4bqfpfLVZWK1nSIpttY4zyJza5Nz0DmSM9Vvl64ebUibQoIyFQg02F317CCz1DAwRfqFLZcloknvxty8vZwvSnIOtJuDatSR9IXEs3OazVOncjxUgcCNsf32nBldl8KHgG+YiLx96mGMXABjtBvaEIUCsn09AjCoBv/arFVvAJmc4OkT2MhCX1kJL9kk53N7dWqvbKgxyTtAku2+BfWhrhwhGAfxqmxXJqJlxfi/zmD26tT+v4ZrjznlBtlhbivXJUskhk9RyKYb092JuGDFvEV4/D1FQZ8rnjM/XZhEkrKucXJghJbxcbcAaSO70+BXocY/2lxGCRy3vcCIQt7XGTP/XNFOmZqh5baZCKjkbs/VRd6y2ZyV4ZvThvFTBy7bRRIA5axw87XtNxUHSWRnlh03lvLT2V/BQVsU8gZRLH/GTSE2UzsB6gKba2JVM9Gv5/7LIyQGRNi7G+/iTU9Xz2c8NLeSLLjGIsxhOqoTea60U0AFUntn3Lr5Kwx6TWHtJDoKbCf51ZYmM/+KdQ/a4sKcRKYdwIqPGrii9D7YAnKYI1MZADqvdUcUnFrdBZCfs+OFtldqH33wQa/Czmx0jDj0rd6oBoFAbyp1xp4lcTAGkjOQi/N3vXcacTt8Cv/V44svRxTfMrWlFCZDAxYO0xyHxT69i0mQSQrstK8tvDyACO9G4I4RIiZAindYHK5Wf1HWXhTvIrK9TlhefCq7Bwt9tiDcsZ3Iwf1lUiUNH3z9K+OrNuqVG95E+YM5gflwSYsYKqrFUxCoQatvNfzVrXEVM54UGVwyn0r/pn2EzbAsS/jACMZNzENrjKOoMR7dy1mUkHzdtycvJkkvXIPdPZ+AxBi3NxQIfjq6xZTksFg5WEAaZnBMmx4I5HRY90bN2rXcEghS3RghTXc2CR4YBY2y1YvMCTRrmKhsZ0gkDL+j7VblYERCeX+5qYM+Q4JFum/3LOQAhL9FXWxwiNOPsOcOVFCHw/POukGggfNR3huVYqcyvYbIl+W3UMYqJVD7XtTzrBB6xWqzkF8evfOG6TFnLhBqmGFd0uAaFb+WWEbigA9W+pZnlVDFi5QxfOfVh2vzgpxGFTHrvPXiUM/twuGk7PX/9/8boQAsBuioHlp5z2+fGdC/KYw6/3kVg7yXG+37aRvQ0xHHpD85MhsCcopdu4205ROvFrDu3E1ZO1rRc0GGmBFYzc7k0+WQDsUQaJTSXSSac4BVZHTiEavqJFGKpl6QT3Qt41Cf2jEpVRGdcWu7h5zsiPi5E0dmy/OV X-Microsoft-Antispam-Message-Info: LhuUTufD+LqkuF6mZBJ2nGecxXGshPLFV0akluz0mhvLBLD5RYnMhY0/o4Y+czasN1QXpGuBU21Rcwib6nrrzDTl5GKmsTMhWyjABJwughEads2LhRV/iPumdrU8g5Wkqpc7V0OTxljFeXfeUqgzV9Ctv1GCu1MwiRgQGbdCHEXVPMfIPGSCkSyiOyvdYM7NP8Ap2PF9DMhA9nx2hOrmZcxQQ0A0VmggonlGyLNO9jFbUEZHQULEIlTZa54DLfLVeKLFVLDnXJm2bEfu7d4H780zbz4jqEqobEEC7W5QhgSef2pUvB1ZQnSTPH163boRxFvFNctC9huCTVHGFP5hlcUs7+0TKX2pGykTXcvhzMrergYo6Re8LItNVumym59DH76TCyI+J5CPqGLya4D4chNbXlNaWZZj2njZ3hZVuWo= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1921; 6:QvmQ9zMtLf4k4mfBheqAKhIFyGaL+mReQwQ9VYcMc3djp3XksRdcmGrbQGTqc89HTEMZ5ilB+kdWy2OAYxBPqIFeIiBDpamdlLzg6h3So4sA7uhtQxKOO1Wdh8zb+f84zGixET0sNoyUKoJKhJkGWvV3gvvu1BpsMt/QJ2yzzqscTnV/OkMFyPHaTGGmTRgCLmdxNzL9ezIeLcNzoJ3VvK3M79zcr0C558voFAvQA5hS4jgy2msWF5YaakllLk4lokUpxRK+QBFG++dUk3xLYKwwphSyayOHjZbXc8G852q3qwhsDhD3JftmkaKQ0p1JCcuUeZwJOcdLarRFAVyojBBgNnXIn6nOrGtKp7pFKaE6OgT0poxYLLvRgBgXM/MBx4t/JKeCek7E6Qk8ZFBARa2ao5mc/A/IEsFlSBJAiXs7D3mcN/52Ub0+wENM3zRUsSe6d4P2EmnNXTvPM2XWRg==; 5:dfXMS9fsL0mf0VD2g9j4g0/rKdNo5c3wprq1IFi0EG97xwgmk4JnAVwg5bjzx1E2sq1fpixLd3SE8NFEY+HvqMqU0Q7RJrHBZahKfxl1pKraRsaCBbaqr6IDsqHGLps++4yVprnoK4d7z95ayH58IM1ES/ErwTdeGYSo6JfvRa2Bfpx7Q6xzMngTYuvCmTvywc6lq3OmdNeyIuWXalKNQA==; 7:yRURn496PvKjcf4La9OHiQXyGWG47Pz53os1HjKaHMD+PIPGcj95eycgTn2tMcvUzpkXY9tqT2cUqdEH7RS3ZraZGEdSQv1lOsJEBawp8XXnusJcas1FDBdmdG3uWy4oiSP/Oq6tgrRlScgl/9nhdw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2019 22:46:13.9634 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 97102f20-d6bd-420b-5664-08d68c84e609 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[199.233.58.38]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0701MB1921 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Sudarsana Reddy Kalluru Under heavy traffic load, when changing number of channels via ethtool (ethtool -L) which will cause interface to be reloaded, it was observed that some packets gets transmitted on old TX channel/queue id which doesn't really exist after the channel configuration leads to system crash. Add a safeguard in the driver by validating queue id through ndo_select_queue() which is called before the ndo_start_xmit(). Signed-off-by: Sudarsana Reddy Kalluru Signed-off-by: Ariel Elior --- drivers/net/ethernet/qlogic/qede/qede.h | 3 +++ drivers/net/ethernet/qlogic/qede/qede_fp.c | 13 +++++++++++++ drivers/net/ethernet/qlogic/qede/qede_main.c | 3 +++ 3 files changed, 19 insertions(+) diff --git a/drivers/net/ethernet/qlogic/qede/qede.h b/drivers/net/ethernet/qlogic/qede/qede.h index 613249d..cd40426 100644 --- a/drivers/net/ethernet/qlogic/qede/qede.h +++ b/drivers/net/ethernet/qlogic/qede/qede.h @@ -494,6 +494,9 @@ struct qede_reload_args { /* Datapath functions definition */ netdev_tx_t qede_start_xmit(struct sk_buff *skb, struct net_device *ndev); +u16 qede_select_queue(struct net_device *dev, struct sk_buff *skb, + struct net_device *sb_dev, + select_queue_fallback_t fallback); netdev_features_t qede_features_check(struct sk_buff *skb, struct net_device *dev, netdev_features_t features); diff --git a/drivers/net/ethernet/qlogic/qede/qede_fp.c b/drivers/net/ethernet/qlogic/qede/qede_fp.c index bdf816f..31b046e 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_fp.c +++ b/drivers/net/ethernet/qlogic/qede/qede_fp.c @@ -1695,6 +1695,19 @@ netdev_tx_t qede_start_xmit(struct sk_buff *skb, struct net_device *ndev) return NETDEV_TX_OK; } +u16 qede_select_queue(struct net_device *dev, struct sk_buff *skb, + struct net_device *sb_dev, + select_queue_fallback_t fallback) +{ + struct qede_dev *edev = netdev_priv(dev); + int total_txq; + + total_txq = QEDE_TSS_COUNT(edev) * edev->dev_info.num_tc; + + return QEDE_TSS_COUNT(edev) ? + fallback(dev, skb, NULL) % total_txq : 0; +} + /* 8B udp header + 8B base tunnel header + 32B option length */ #define QEDE_MAX_TUN_HDR_LEN 48 diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c index 5a74fcb..9790f26 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_main.c +++ b/drivers/net/ethernet/qlogic/qede/qede_main.c @@ -631,6 +631,7 @@ static int qede_setup_tc_block(struct qede_dev *edev, .ndo_open = qede_open, .ndo_stop = qede_close, .ndo_start_xmit = qede_start_xmit, + .ndo_select_queue = qede_select_queue, .ndo_set_rx_mode = qede_set_rx_mode, .ndo_set_mac_address = qede_set_mac_addr, .ndo_validate_addr = eth_validate_addr, @@ -666,6 +667,7 @@ static int qede_setup_tc_block(struct qede_dev *edev, .ndo_open = qede_open, .ndo_stop = qede_close, .ndo_start_xmit = qede_start_xmit, + .ndo_select_queue = qede_select_queue, .ndo_set_rx_mode = qede_set_rx_mode, .ndo_set_mac_address = qede_set_mac_addr, .ndo_validate_addr = eth_validate_addr, @@ -684,6 +686,7 @@ static int qede_setup_tc_block(struct qede_dev *edev, .ndo_open = qede_open, .ndo_stop = qede_close, .ndo_start_xmit = qede_start_xmit, + .ndo_select_queue = qede_select_queue, .ndo_set_rx_mode = qede_set_rx_mode, .ndo_set_mac_address = qede_set_mac_addr, .ndo_validate_addr = eth_validate_addr,