From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 902A1457A1 for ; Mon, 12 Aug 2024 14:59:23 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ECFBD406BC; Mon, 12 Aug 2024 14:59:18 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2064.outbound.protection.outlook.com [40.107.100.64]) by mails.dpdk.org (Postfix) with ESMTP id 7B0C140A75 for ; Mon, 12 Aug 2024 14:59:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LK0tJPYhnf3vghLPDJEM3CGvts4NBtMEXCGoVDyZXvpbZqWOYRlkesccEu+MzlxiicEgmqxZamIp2/NU3JaLH8ggO/184aXYEjDbWtpx02huTyVzFGQLl58oXWtTCkWxgJjzUkSjdrFvZnuPn5H91gsV2KfszfyGTlTIVb31JNoAijBioiJkFxgCozIbQ18SVbWfP8tqIrc2jFzT8QTVd2dmF10wtEuQQOgTutlJr/jpv5VQKDnXWz/8rs91mwa7voLABCZFD7z/iB51nKXTBbCFq1bweSGfBcEt614U8Akz5lQk47o1ImZaSctll5oQ/P4d0IEhGQna8ie/OcvlFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=d6NUbR36dUB9k7PmgdOte5BqFAG1Bj0MsUlcIjHM64A=; b=koHUpuemRoVQq2nQp7GFwYdpIHST2pTzZzDdutLxxxQQ60x8xTY81fv7KhqfO6xp/zCqst2beR7YBK8I1h7mdQFgy2tYyVaJEXuTdF+LlkQA47L6zyQYKB+E3x+ORg6OhtsqmYlBkbPsPtaShXremVLCQX9bnAT9qRJQa1/OgBS7UkshCzPa6S3ElrUnRt4YgQihy0hMsKjqYpv6YsV9m4EY6XdiWaP52aFBWfvAxaHmQlSNtidB+eK15RRVmSy9tES8E94hfk4AhQQbGSuNuLyEQ5sga812E9BUZBYEPoABtQjkXu61viqYvT/ADeD6FwB8rALvugg9btjHRJSvvA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=netgate.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=d6NUbR36dUB9k7PmgdOte5BqFAG1Bj0MsUlcIjHM64A=; b=DICLO89KIBniokTxqkwsivEUitAYhkpebLWxOHoOoKwSnQMvWFqKKgletqDNCfXnDH+8IRaPubou6QwhIkGp922fd6zuDpkoEKR8pEFpNubsSFhXxPqt9+qukSrhg/uisWSdygw/AXdXnEho5WRU9HlIgWNUiE0TuEfXOKmNhVbMwSBLTxjOrIzVD6aZOGDNVQYgChW/Ceb+MLUmAO4QmKte0J7SWoR2GrgECPT8VYvnqmFJzvNfc0K2GCPhFV4I/W5X63x044vF9MAAC877tXPemirtqvQjTkuGBZvXXF7Dn5RIDxHg7yWRCjpm42Gqq01O85gIJQ8KTmyd3VVrgQ== Received: from BN9PR03CA0465.namprd03.prod.outlook.com (2603:10b6:408:139::20) by DS7PR12MB6071.namprd12.prod.outlook.com (2603:10b6:8:9d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22; Mon, 12 Aug 2024 12:59:11 +0000 Received: from BL02EPF0001A0FD.namprd03.prod.outlook.com (2603:10b6:408:139:cafe::c6) by BN9PR03CA0465.outlook.office365.com (2603:10b6:408:139::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.33 via Frontend Transport; Mon, 12 Aug 2024 12:59:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BL02EPF0001A0FD.mail.protection.outlook.com (10.167.242.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Mon, 12 Aug 2024 12:59:11 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 05:58:58 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 05:58:56 -0700 From: Xueming Li To: Alexander Skorichenko CC: , Long Li , Sam Andrew , dpdk stable Subject: patch 'net/netvsc: fix MTU set' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:49:24 +0800 Message-ID: <20240812125035.389667-88-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0001A0FD:EE_|DS7PR12MB6071:EE_ X-MS-Office365-Filtering-Correlation-Id: 86035601-cd18-469d-ea30-08dcbace8f77 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?wO1KW3/dMp9FzZpcq7NTsJqOULy6shXtr4sX4CPMlqIu2ttzsdbuGb52Nm5H?= =?us-ascii?Q?Wv++hEUPKJI8eUGAsxpD/AE8fbCxZUAuPRpCllcAG5WECSwirXnKIhYOSEhC?= =?us-ascii?Q?Nr+Lq0heBnpCpLOydDpTp7TgSVz17QPsr7HIB/HsZZIwTwQh/pvN7R3ogv2U?= =?us-ascii?Q?X93yl4ZdGbyxwX+bDmwssUdOwUqZ6qCL12J1uutIaEm9ANG0E03HTbCBngvw?= =?us-ascii?Q?HW2/w4DXG7eh6pxFvFziCjEKIzv/gKofrIcU7zdqh+XDAHxyw/aHzP7qAXAY?= =?us-ascii?Q?Uxkpw0+I0ij/KQfInn7FWgN6uxQiuxvHWnu6tPWBPBJktiFXuUgizVzZXcJT?= =?us-ascii?Q?NB5MKmkk0u4V/iTCNyJnapOr7SKJbn/4y5Cchg02A563M/6o/wdeMugt+Bru?= =?us-ascii?Q?puwCPDb8SIONnP6G13+20VcY1rRcNh/NoRyCtWevl82kZj516LcaroaV2l0h?= =?us-ascii?Q?BOZSw9DOzPwAvJHn91m9DVE6z3st+XVJLJ4L/N3QggBLMg1vGSLC6tCTTkxF?= =?us-ascii?Q?K8YLlwbKctzrplrYYwDmd5iqo33yzMtJQaLOuRTzwulI8y4kLHF4LgcHunNY?= =?us-ascii?Q?tcw4qM0rzbOiTZaFYTdDxakwiomiCYRHHo4vl4x0Q9o3eejBpOxHAbrGss5A?= =?us-ascii?Q?rZAENGdapN3/W3aJmTQ1olIbk/Kj6S817zJJoZwixvnOx3Gow3w1Y+A5KGew?= =?us-ascii?Q?cgC9trr2YVDPu9MMergVv54SJN+TrVOvPqpGgHCZxxF8+3q0KuFbDEh19LaI?= =?us-ascii?Q?PCIMGBcanru30GlLCzQIOk1340o7Xi7aii8Vt6To4p3/ROqao2lMqcC7pSmf?= =?us-ascii?Q?zauh8koreMelY6H1tpMJ2FYRfvSCAc4o2oQQR4t213jJdOAPMaZfxpLw8hdH?= =?us-ascii?Q?fEVOJIyeh/EyX0jQqDI4UJpyAlzMkFdXg07ih9GSDz2fi6zubhzfTYyElaWz?= =?us-ascii?Q?S87QRtynfkb47zTfDrjV0OsZ0JcIrUJKkOCfoYSGRS2dCQJzDO7DDVHENH3V?= =?us-ascii?Q?ttxhtZdKX1nQUwqSuCe6PNAkGjdew6FjKbbCdLNfH4m3nhZzmv6Up5iGft1A?= =?us-ascii?Q?JqPMaRTQbKAAuJ+dSUdtfHHbcNHhbWXEk8SGP/BFUnJCYOrRUp/Ou+mPMK5r?= =?us-ascii?Q?nXzsT5IDlywkIMzLXo1zWOBRXtm/zeJHRuWMonu0KRh6SB7JDGa4dAOI552u?= =?us-ascii?Q?xwVrHLj4StBUfRvNWiHh8QpaUVbBys2joBDz+yzyJVBAhUQdIwU6sfoAVUvY?= =?us-ascii?Q?/cFXSY9Jednu/5XbI+bNhwYdBcu0bY46hD9F9IMzm+WUknfMrr6+OiAEM3tn?= =?us-ascii?Q?Tfz10zHBYvBAkPt5HrXsiLvjWxpREIN08xB568rE6pEp7fq0ao9TfNE2RkP6?= =?us-ascii?Q?Kvnoy0UXapD6mNuNgG+sCjFqRaIHDZ3lCoTq2Bx+pNmKDVrXvPmHaozCIU13?= =?us-ascii?Q?Vh1lSFsNzlYKvpCeDg9qmGfgQjXTCYoB?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(1800799024)(376014)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:59:11.1235 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 86035601-cd18-469d-ea30-08dcbace8f77 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0001A0FD.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6071 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 23.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/14/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=2a50559bfd461ed25ff5507626a5d0b5cf956232 Thanks. Xueming Li --- >From 2a50559bfd461ed25ff5507626a5d0b5cf956232 Mon Sep 17 00:00:00 2001 From: Alexander Skorichenko Date: Fri, 28 Jun 2024 18:35:03 +0200 Subject: [PATCH] net/netvsc: fix MTU set Cc: Xueming Li [ upstream commit 107c9ef336c24fce06047b29475ad97b2d5dc74f ] Prevent segfault in hn_reinit() caused by changing the MTU for an incompletely initialized device. Fixes: 45c83603087e ("net/netvsc: support MTU set") Signed-off-by: Alexander Skorichenko Acked-by: Long Li Reviewed-by: Sam Andrew --- .mailmap | 1 + drivers/net/netvsc/hn_ethdev.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.mailmap b/.mailmap index 12ed3d1e74..24c450efaa 100644 --- a/.mailmap +++ b/.mailmap @@ -51,6 +51,7 @@ Alexander Chernavin Alexander Guy Alexander Kozyrev Alexander Matushevsky +Alexander Skorichenko Alexander Solganik Alexander V Gutkin Alexandre Ferrieux diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c index b8a32832d7..f8cb05a118 100644 --- a/drivers/net/netvsc/hn_ethdev.c +++ b/drivers/net/netvsc/hn_ethdev.c @@ -1127,8 +1127,10 @@ hn_reinit(struct rte_eth_dev *dev, uint16_t mtu) int i, ret = 0; /* Point primary queues at new primary channel */ - rxqs[0]->chan = hv->channels[0]; - txqs[0]->chan = hv->channels[0]; + if (rxqs[0]) { + rxqs[0]->chan = hv->channels[0]; + txqs[0]->chan = hv->channels[0]; + } ret = hn_attach(hv, mtu); if (ret) @@ -1140,10 +1142,12 @@ hn_reinit(struct rte_eth_dev *dev, uint16_t mtu) return ret; /* Point any additional queues at new subchannels */ - for (i = 1; i < dev->data->nb_rx_queues; i++) - rxqs[i]->chan = hv->channels[i]; - for (i = 1; i < dev->data->nb_tx_queues; i++) - txqs[i]->chan = hv->channels[i]; + if (rxqs[0]) { + for (i = 1; i < dev->data->nb_rx_queues; i++) + rxqs[i]->chan = hv->channels[i]; + for (i = 1; i < dev->data->nb_tx_queues; i++) + txqs[i]->chan = hv->channels[i]; + } return ret; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:05.371991372 +0800 +++ 0087-net-netvsc-fix-MTU-set.patch 2024-08-12 20:44:02.335069342 +0800 @@ -1 +1 @@ -From 107c9ef336c24fce06047b29475ad97b2d5dc74f Mon Sep 17 00:00:00 2001 +From 2a50559bfd461ed25ff5507626a5d0b5cf956232 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 107c9ef336c24fce06047b29475ad97b2d5dc74f ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 256506fba4..874df4d162 100644 +index 12ed3d1e74..24c450efaa 100644 @@ -24 +26 @@ -@@ -52,6 +52,7 @@ Alexander Chernavin +@@ -51,6 +51,7 @@ Alexander Chernavin