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 3A46D45DB9 for ; Wed, 27 Nov 2024 18:23:49 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 35EA540695; Wed, 27 Nov 2024 18:23:49 +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 AD82A402DE for ; Wed, 27 Nov 2024 18:23:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728227; 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=oM8yU0Q0sZxFoyg8cS/uECvBb8DaLro6zsCWdgwTQQM=; b=DBeOiu1x23yGLLQ4Ywx6/Lnb/sxOelv+5/9+qzCbAg4D4yWk7+IoHL80O9H5K6gtkEeaAR /zHZn32BZGhWTdZKxYRppT9NIzY3M/w9amjqBmDuRweah9bB3H7SIdViiZuFt9ncIi+UfW 05T0tFH/pFOxZnB8uBR9UrUokHG8VBo= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-157-oAu9K4K-PSG0UbAd2rnXZA-1; Wed, 27 Nov 2024 12:23:43 -0500 X-MC-Unique: oAu9K4K-PSG0UbAd2rnXZA-1 X-Mimecast-MFC-AGG-ID: oAu9K4K-PSG0UbAd2rnXZA Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C185F1955F3C; Wed, 27 Nov 2024 17:23:41 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B163C30001A2; Wed, 27 Nov 2024 17:23:39 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Bruce Richardson , Ajit Khaparde , Chengwen Feng , dpdk stable Subject: patch 'app/testpmd: remove redundant policy action condition' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:19:08 +0000 Message-ID: <20241127171916.690404-121-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: dW-FqdRWAU2SVzRTMVTNZWG0X_8-1z0LvBAOIvx255I_1732728221 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.9 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/02/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/3c69c95e715abbfbb3d980d529b7844ea493434f Thanks. Kevin --- >From 3c69c95e715abbfbb3d980d529b7844ea493434f Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 21 Nov 2024 10:23:29 -0800 Subject: [PATCH] app/testpmd: remove redundant policy action condition [ upstream commit 4c2e7468426ae6be3f2a8f2d15e7d1222083eb9d ] The loop over policy actions will always exit when it sees the flow end action, so the next check is redundant. Link: https://pvs-studio.com/en/blog/posts/cpp/1179/ Fixes: f29fa2c59b85 ("app/testpmd: support policy actions per color") Signed-off-by: Stephen Hemminger Acked-by: Bruce Richardson Acked-by: Ajit Khaparde Acked-by: Chengwen Feng --- app/test-pmd/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index aa979e886f..ad215c78f6 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2064,5 +2064,5 @@ port_meter_policy_add(portid_t port_id, uint32_t policy_id, act->type != RTE_FLOW_ACTION_TYPE_END; act++) act_n++; - if (act_n && act->type == RTE_FLOW_ACTION_TYPE_END) + if (act_n > 0) policy.actions[i] = start; else -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:42.052627006 +0000 +++ 0121-app-testpmd-remove-redundant-policy-action-condition.patch 2024-11-27 17:17:38.361270078 +0000 @@ -1 +1 @@ -From 4c2e7468426ae6be3f2a8f2d15e7d1222083eb9d Mon Sep 17 00:00:00 2001 +From 3c69c95e715abbfbb3d980d529b7844ea493434f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4c2e7468426ae6be3f2a8f2d15e7d1222083eb9d ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -18,2 +19,2 @@ - app/test-pmd/config.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + app/test-pmd/config.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) @@ -22 +23 @@ -index 28d45568ac..4e7fb69183 100644 +index aa979e886f..ad215c78f6 100644 @@ -25 +26 @@ -@@ -2289,5 +2289,5 @@ port_meter_policy_add(portid_t port_id, uint32_t policy_id, +@@ -2064,5 +2064,5 @@ port_meter_policy_add(portid_t port_id, uint32_t policy_id, @@ -32,4 +32,0 @@ -@@ -7339,3 +7339,2 @@ show_mcast_macs(portid_t port_id) - } - } --