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 1D6F4432DA for ; Wed, 8 Nov 2023 20:26:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 174C7406A2; Wed, 8 Nov 2023 20:26:33 +0100 (CET) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id 4D849406A2 for ; Wed, 8 Nov 2023 20:26:30 +0100 (CET) Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-32ddfb38c02so13262f8f.3 for ; Wed, 08 Nov 2023 11:26:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699471590; x=1700076390; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tKWsUy0UOw26a5/IO9Yc9B5KxueSoaJTCNOQvfHN4oQ=; b=glyDXGzKPxWn04F4XDo+gH0lUmO3WImRXvzeO0x8lUJfpKUsvoleVurg5QD5zkStTp xh7YJzjzfj78ZUrus1tVWWzbeUM9mzIm+X3lf9QtYmQTv8xUoGdOpUu3n0j2nPOgcl/g Re8cwtjrnXVEAwU4xbTQE8/hrlatJNmOnbeybubidEYiJg1fBVRQLWU4fpcLLhM28DG8 I/W0hYZM3dXL2i3JTI02166+d8MV2/4EElRGr8t+x4n7528YE3G1wxTuO1K7DgMN7Gnv oFWSuCa93/OuZfhf+HIeaOGnF2JWYxyfy4C5z/2Pp2SoW0vmK/ct8ZHfpa/HNY/7leR7 lV5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699471590; x=1700076390; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tKWsUy0UOw26a5/IO9Yc9B5KxueSoaJTCNOQvfHN4oQ=; b=O8p7ANYfbYniSO85pfQEfvwaudbzfSjMLvPZxEyqH0W12kDHtoiM+H/ZduiUHuQIfV R7d8YjE0PFIc5BKHPNOqwcAAfCLV62sCRPyDf7duLPgg5VO0t76wVSCsZXn+NLSH8joB Dm3I30thZcm5FVsW78VSx3Hkv//bLDaxQN2H5y3scqP+FhYnCZfI6e4dhHWTi3cQlaXL UD5bfxNvbFBlWMe9eBFWgHiEuvHo12b/ijJm0Ve6bMDe8Dw0XCs5z/8Y7pI0jC8HBydO 4D4WmcD5d3H7dG1leEcRPV7WW1IGc75za8PsbzMsIXTMDElt/5QbrtF/4MMNDfWjpCuf +sFg== X-Gm-Message-State: AOJu0Yx2nK1FZDs2SxgKmSebxTACVsD+4biKd7MWEEEjd9mqX/VhzcDi ZYjZG6jBRW/hrdGpr9nipKc= X-Google-Smtp-Source: AGHT+IEruXY7BaMRVIhKhGP2ehTwkzJVTUinAx1v+XKbb3i8bV3Pu+GZhtLAd0Dysn4157k2+/9FXA== X-Received: by 2002:a5d:53c2:0:b0:32f:996c:8b12 with SMTP id a2-20020a5d53c2000000b0032f996c8b12mr2109795wrw.66.1699471589873; Wed, 08 Nov 2023 11:26:29 -0800 (PST) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id e12-20020adffd0c000000b0032196c508e3sm5644844wrr.53.2023.11.08.11.26.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 11:26:29 -0800 (PST) From: luca.boccassi@gmail.com To: Weiguo Li Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/enic: avoid extra unlock in MTU set' has been queued to stable release 20.11.10 Date: Wed, 8 Nov 2023 19:25:17 +0000 Message-Id: <20231108192535.922238-19-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231108192535.922238-1-luca.boccassi@gmail.com> References: <20231018235930.3144-41-luca.boccassi@gmail.com> <20231108192535.922238-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.10 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/10/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/02f1c312bf87e5fdbf0c7696bfa16b2d7f2a8323 Thanks. Luca Boccassi --- >From 02f1c312bf87e5fdbf0c7696bfa16b2d7f2a8323 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 --- drivers/net/enic/enic_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index 498476fce5..7e21557f58 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -1630,7 +1630,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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-08 19:23:52.950910547 +0000 +++ 0019-net-enic-avoid-extra-unlock-in-MTU-set.patch 2023-11-08 19:23:51.785396541 +0000 @@ -1 +1 @@ -From e90884a65bf6d8ed0e1e5618af42cf5856a422f1 Mon Sep 17 00:00:00 2001 +From 02f1c312bf87e5fdbf0c7696bfa16b2d7f2a8323 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e90884a65bf6d8ed0e1e5618af42cf5856a422f1 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -18 +18,0 @@ - .mailmap | 2 +- @@ -20 +20 @@ - 2 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) @@ -22,13 +21,0 @@ -diff --git a/.mailmap b/.mailmap -index 1e6d750979..c384d97a1a 100644 ---- a/.mailmap -+++ b/.mailmap -@@ -1502,7 +1502,7 @@ Waterman Cao - Weichun Chen - Wei Dai - Weifeng Li --Weiguo Li -+Weiguo Li - Wei Huang - Wei Hu - Wei Hu (Xavier) @@ -36 +23 @@ -index 19a99a82c5..a6aaa760ca 100644 +index 498476fce5..7e21557f58 100644 @@ -39 +26 @@ -@@ -1639,7 +1639,7 @@ int enic_set_mtu(struct enic *enic, uint16_t new_mtu) +@@ -1630,7 +1630,7 @@ int enic_set_mtu(struct enic *enic, uint16_t new_mtu)