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 315E9433D8 for ; Mon, 11 Dec 2023 11:15:45 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2B43340ED2; Mon, 11 Dec 2023 11:15:45 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id C4F0D40E0F for ; Mon, 11 Dec 2023 11:15:43 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DvQlBOJrmS7a1ZdLaE3G/A8S4R5FGtNda8wZuijERvcck8BHc4PQp1A25tsmVzUdBKF1YVlWdsWMrSrTuvAxYLtIRNzRTpAhp6b/Wx/2HVIT69VHzIepSygJUKY/jIHgzV9LXpOoHxpQDKcu6DD2pMTgC28sjaXaCsCczEBhMIv90PRjbNRwTK9q1NEUnIVnjZS1gJ6HEFm96+oe0hcvSUQdIQbtkJuzMcXrodJhf+8I+WLkLTmDqulpDAPWS0mfxlmpIIgTeSS+V/FvG0EjcbhVgNvR34TiwNuf59UiU/azExTS8pPhbkyYADMaTsqb82niEosIziPdcg8FW007xQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=CXLucunsWeWsbaNv8PMZ79FPG06KYiMtrhrhDuky9NU=; b=mAeDdxIg8fw36DmA7Tc9L4nzJzzh4vdYjO6y/ebFgOyG9egY+YdHhttL/hk5ZNQMu+DjL8rpJDFcNWxZ6xtmNEN1yjhboc9KPQ/pvee6DFRBVAWwb+iHZiEZTGPbqx9LIqeP9dkuS7ljeBckP06/IYpepBmSFKwJKCOhGTOGFhfNnbrAC7Y/1YSb8fxLHOiun95fjQnEL9LroqvYcCCUOpnz4ZISL0boJREttPsFJOK6ykXkWOS5ToSd9VLHzF9ECK9hpVMpxLMQXd2Pe5y8r6Fy9zenXWxZinq2F/iXKM8utdQEJ31DUNLWE2TbaxqpNJSRowX7DG3Vj37htQhdCA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=xencore.cn 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=CXLucunsWeWsbaNv8PMZ79FPG06KYiMtrhrhDuky9NU=; b=ZIvTGGqTJyif/idaeQFGVW2mPdSZVQq2wrCmT5LZKOYz/MSw4iXwGywECzuChHZKbcnjluM12ZBjVtfBdXKq1rR8j+9UMvASBIG+AIIq2VTCN+FLfmVkiCoY/YYcWnsDIt2D7HYnAOZzUMzLnl/CKHoQCLa9MtWzm902Z0oVZOb2cTCdT48vrDUgmy40fj4aGHiWelx8BlWa7Fi7aIeEFyN8b12kg46EM9M68xGcdJPIzXlxAQnX+pNpzMYeku27vvyp+hWhcgXXkfuqiYJXRHIJlih0kZy+mamYecFhqmUv+DhYqS9wPF2DDifTKrEurBRmcOsMD26GJ5aIEvZ8Kg== Received: from CH2PR14CA0011.namprd14.prod.outlook.com (2603:10b6:610:60::21) by IA1PR12MB8407.namprd12.prod.outlook.com (2603:10b6:208:3d9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:15:41 +0000 Received: from DS3PEPF000099E2.namprd04.prod.outlook.com (2603:10b6:610:60:cafe::fd) by CH2PR14CA0011.outlook.office365.com (2603:10b6:610:60::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33 via Frontend Transport; Mon, 11 Dec 2023 10:15:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DS3PEPF000099E2.mail.protection.outlook.com (10.167.17.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:15:40 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:15:26 -0800 Received: from nvidia.com (10.126.231.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.986.41; Mon, 11 Dec 2023 02:15:24 -0800 From: Xueming Li To: Weiguo Li CC: Ferruh Yigit , dpdk stable Subject: patch 'net/enic: avoid extra unlock in MTU set' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:10:59 +0800 Message-ID: <20231211101226.2122-35-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.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: DS3PEPF000099E2:EE_|IA1PR12MB8407:EE_ X-MS-Office365-Filtering-Correlation-Id: e85a84f4-ed8c-4a44-ad37-08dbfa3220a8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yfJQRn3EPfAa+H9ZyaQreqFaTKcN1cdmMo2hWewCz5oyxaq2lPLBbePIabSc03iETpZobsd71YsCwqHwh5/z1sOdQ5Wjxb4AQfwCR2SQVwNTh+93TiR+47mBQ/rDh+qx5KQGeNGBv9B7ERr/9Gy+IDDDaXqS6XvZ0UnyEqb9/g2mNF0cCQjNrDPqyHa+/KYStkUjG53OkWqIa8aPKJdii5Uu+4AX8Hj9ALJP7sQ48m23vLCt1eJc8LKe61BcQlZP9I6PPBaPotqT+ctGrRMv+78BbVxnnm/GC98QmaS5L0Q2F8WFFZz9Pdbwzc0qc20FV4W9ctt4sX7MPYX31R/cMG+JfmKvi2FRqAL92OY3vKpS3OlGMpxs7Uaa0z38aVIVcHou7btp6gcLMQDlf7J4pNUdjOcOUbDKIAsbL2hrdvftfH205lUXcmDoNvF2fsbU9bH4T1cySWRKph310vbH2yiRhDcELAen9m02Ks+aph6v+O6VhDuBfr9A5qar5WZywHeFbBI0sbhHK7DNHeeR4csKEoWz3YU+FEDhtXcK5+aVibQ9l7Ut0cjrkgOdLRh669zmHUq6s7h1QkE7fCOcCoVbsMFfbRvQ+90sHAuUAb9CV7/oz9867/fI1hMYzQGuM9jT95I5gg0lootiLGNUqqt41Ki0c/Jzh6YIN4sd+J7eIlRNUBajlzbZhi+6mFb117WnpfmMs7AIfjf9cll66zbV9GejduSJzjes5hECX/ntEFQnT8/9hH+nljVxyQ5Bf2675vjur/VlAcSb7AYzziPOuP6XPZUI61EQY5AeX1RpUrh4A8IUeB8oQvPIBMVbv0B0HUSX6H3m6+bEOZHuIg== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(396003)(376002)(39860400002)(136003)(346002)(230922051799003)(1800799012)(451199024)(64100799003)(186009)(82310400011)(36840700001)(46966006)(40470700004)(55016003)(40480700001)(1076003)(6286002)(26005)(426003)(336012)(16526019)(2616005)(40460700003)(82740400003)(36756003)(7636003)(86362001)(356005)(6916009)(47076005)(45080400002)(83380400001)(5660300002)(53546011)(7696005)(6666004)(36860700001)(316002)(70586007)(70206006)(8936002)(8676002)(966005)(54906003)(41300700001)(4001150100001)(4326008)(2906002)(478600001)(525324003)(48020200002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:15:40.4884 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e85a84f4-ed8c-4a44-ad37-08dbfa3220a8 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF000099E2.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8407 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 22.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/13/23. 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=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=4f039a69e904d24f92922337aa0919635b08e718 Thanks. Xueming Li --- >From 4f039a69e904d24f92922337aa0919635b08e718 Mon Sep 17 00:00:00 2001 From: Weiguo Li Date: Wed, 1 Nov 2023 15:28:09 +0800 Subject: [PATCH] net/enic: avoid extra unlock in MTU set Cc: Xueming Li [ upstream commit e90884a65bf6d8ed0e1e5618af42cf5856a422f1 ] The 'set_mtu_done' goto statement is being executed in a context where the 'mtu_lock' has not been previously locked. To avoid the extra unlocking operation, replace the goto statement with a return statement. Fixes: c3e09182bcd6 ("net/enic: support scatter Rx in MTU update") Signed-off-by: Weiguo Li Reviewed-by: Ferruh Yigit --- .mailmap | 2 +- drivers/net/enic/enic_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index a1ff0137a7..b3473b08eb 100644 --- a/.mailmap +++ b/.mailmap @@ -1446,7 +1446,7 @@ Waterman Cao Weichun Chen Wei Dai Weifeng Li -Weiguo Li +Weiguo Li Wei Huang Wei Hu Wei Hu (Xavier) diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index 19a99a82c5..a6aaa760ca 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -1639,7 +1639,7 @@ int enic_set_mtu(struct enic *enic, uint16_t new_mtu) * packet length. */ if (!eth_dev->data->dev_started) - goto set_mtu_done; + return rc; /* * The device has started, re-do RQs on the fly. In the process, we -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:24.277400500 +0800 +++ 0034-net-enic-avoid-extra-unlock-in-MTU-set.patch 2023-12-11 17:56:22.947652300 +0800 @@ -1 +1 @@ -From e90884a65bf6d8ed0e1e5618af42cf5856a422f1 Mon Sep 17 00:00:00 2001 +From 4f039a69e904d24f92922337aa0919635b08e718 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e90884a65bf6d8ed0e1e5618af42cf5856a422f1 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 1e6d750979..c384d97a1a 100644 +index a1ff0137a7..b3473b08eb 100644 @@ -26 +28 @@ -@@ -1502,7 +1502,7 @@ Waterman Cao +@@ -1446,7 +1446,7 @@ Waterman Cao