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 6684343345 for ; Thu, 16 Nov 2023 14:24:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 604EB40A7D; Thu, 16 Nov 2023 14:24:34 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 1E3FB402C6 for ; Thu, 16 Nov 2023 14:24:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7YHs8AEo8yilazrBh4oBGbxulb/rfJqrCpp7rULQsrk=; b=cf94qvNkNfilSd5CaxS+SKdYP7YOanVawvOXE6C+G7J/vyLA1mnRhsh0sZqhm80egXE3kW bF12lMxQFn4KXszZuDkfDJrAaOAMB/60mylqZP+ctyjKPLPhlQVsnSJTEdk2X4UyrtRzvu VrZsFmcCbr6+IyXAzN1Hk2Wtd+bm9G8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-185-7kMh_ptROMmGAEqNHHjVOA-1; Thu, 16 Nov 2023 08:24:30 -0500 X-MC-Unique: 7kMh_ptROMmGAEqNHHjVOA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7751D811E7E; Thu, 16 Nov 2023 13:24:29 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id C467C2166B28; Thu, 16 Nov 2023 13:24:26 +0000 (UTC) From: Kevin Traynor To: Weiguo Li Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/enic: avoid extra unlock in MTU set' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:23:03 +0000 Message-ID: <20231116132348.557257-21-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/21/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/48ce6323ad78840b36664e12c50d10e17f19c519 Thanks. Kevin --- >From 48ce6323ad78840b36664e12c50d10e17f19c519 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 [ 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 1111c386e2..3ba8d68383 100644 --- a/.mailmap +++ b/.mailmap @@ -1448,5 +1448,5 @@ Weichun Chen Wei Dai Weifeng Li -Weiguo Li +Weiguo Li Wei Huang Wei Hu (Xavier) diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index 97d97ea793..2ea26c0407 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -1640,5 +1640,5 @@ int enic_set_mtu(struct enic *enic, uint16_t new_mtu) */ if (!eth_dev->data->dev_started) - goto set_mtu_done; + return rc; /* -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:53.070885029 +0000 +++ 0021-net-enic-avoid-extra-unlock-in-MTU-set.patch 2023-11-16 13:21:52.441946349 +0000 @@ -1 +1 @@ -From e90884a65bf6d8ed0e1e5618af42cf5856a422f1 Mon Sep 17 00:00:00 2001 +From 48ce6323ad78840b36664e12c50d10e17f19c519 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e90884a65bf6d8ed0e1e5618af42cf5856a422f1 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 1e6d750979..c384d97a1a 100644 +index 1111c386e2..3ba8d68383 100644 @@ -26 +27 @@ -@@ -1503,5 +1503,5 @@ Weichun Chen +@@ -1448,5 +1448,5 @@ Weichun Chen @@ -32 +33 @@ - Wei Hu + Wei Hu (Xavier) @@ -34 +35 @@ -index 19a99a82c5..a6aaa760ca 100644 +index 97d97ea793..2ea26c0407 100644