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 E860AA06CB for ; Tue, 22 Nov 2022 23:03:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E0E2942D79; Tue, 22 Nov 2022 23:03:07 +0100 (CET) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id DB92E42B77 for ; Tue, 22 Nov 2022 23:03:06 +0100 (CET) Received: by mail-wm1-f53.google.com with SMTP id h126-20020a1c2184000000b003d03017c6efso88982wmh.4 for ; Tue, 22 Nov 2022 14:03:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=CURRg/oOMlnL+fY/hj67TXhri9J//gv+zNh+vSysuQI=; b=W8+BltEywCeJU7I0hTPDClKp8OKIN2z9lvKc4nkdBqdD9QnpNnOymYAm0VMYO2UUQf lJDcBR/rAg4FDPUmqVcqzMSs2V+i5InHaKUvXfZ/0CedWG1dO5R+nEwXVCRHihL7l3mp FD0jI2C0ZU+fRnC3ch5SPt1Yd9m0yJZ12/C/jAEHFqMtTDoPxf/P/KfgX0pd6/s3fNAL 0ky0gj4229XqbN5oQEbK/lnHTARH9M9rJfA5t7JcxWSm9f8dvEHvRgxmZre3K6YRzXj7 giHR4t/1xU7Uo905uUd96Cek3RuXrM/3nKEtZuBtLCvLGuYBsMc18Q78XNvyQ86m0tjj dsXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=CURRg/oOMlnL+fY/hj67TXhri9J//gv+zNh+vSysuQI=; b=IbJpbccQ1ciRDecnk4S/222xf1l7WALZ5iKeYmp4tv1rs0epNIHmX4HpyPbyS7PAvt tfXSZTifqV1p5Mebn3+DfzCp5WiSJRXHpESqNCO2jnMAEmN90aBvGGBBsRpsS0smlA6d LZLzP5vizzMrf3j11DOMP3nY5D0QItcA0ocwFtxMte64JYBBJg2GKeaeiT/blM4NnaTs +blwywu+zAo86Qno/3GqsgSliKH71af6cc6WYM8Chx3043MZUo3h4sMrvuEuuMIKi+P8 O3pdWxK/FFUcma8UYLDC/7TEoEmwhaBP280Fin5dHmBFkobqm3PihQ1yx5jg8JRdkG4g Louw== X-Gm-Message-State: ANoB5plinzYivEVY7RAG3Iv5qQC0YkTSazKdZpIrDPRQzME/OIgzPNeO IUoQm0g8RwgUCd+YYdipR74= X-Google-Smtp-Source: AA0mqf61AczirFhHOijDnt0No7DuUS2TK6X46bJxTOPRbsacTFvQkMI8DazUdcfBhOEKMZUGqxSCzw== X-Received: by 2002:a05:600c:5010:b0:3cf:b067:416c with SMTP id n16-20020a05600c501000b003cfb067416cmr5941559wmr.134.1669154586595; Tue, 22 Nov 2022 14:03:06 -0800 (PST) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id j13-20020a5d604d000000b00236695ff94fsm14968560wrt.34.2022.11.22.14.03.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 14:03:06 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: Tyler Retzlaff , dpdk stable Subject: patch 'app/testpmd: fix build with clang 15 in flow code' has been queued to stable release 20.11.7 Date: Tue, 22 Nov 2022 22:02:30 +0000 Message-Id: <20221122220241.926784-6-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221122220241.926784-1-luca.boccassi@gmail.com> References: <20221117230859.611465-34-luca.boccassi@gmail.com> <20221122220241.926784-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.7 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/24/22. 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/1b0e836662deb509ba4d1010ee1f9bbdd5556d72 Thanks. Luca Boccassi --- >From 1b0e836662deb509ba4d1010ee1f9bbdd5556d72 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 18 Nov 2022 09:53:10 +0100 Subject: [PATCH] app/testpmd: fix build with clang 15 in flow code [ upstream commit 2809981e858f5cfa3ea9182e400a2c67f7c4744d ] This variable is not used and has been copy/pasted in a lot of other code. Fixes: 938a184a1870 ("app/testpmd: implement basic support for flow API") Fixes: 55509e3a49fb ("app/testpmd: support shared flow action") Fixes: 04cc665fab38 ("app/testpmd: add flow template management") Fixes: c4b38873346b ("app/testpmd: add flow table management") Fixes: ecdc927b99f2 ("app/testpmd: add async flow create/destroy operations") Fixes: d906fff51878 ("app/testpmd: add async indirect actions operations") Signed-off-by: David Marchand Acked-by: Tyler Retzlaff --- app/test-pmd/config.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index f3ffc23ecd..9e2e8aeb8f 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -1842,7 +1842,6 @@ port_shared_action_destroy(portid_t port_id, { struct rte_port *port; struct port_shared_action **tmp; - uint32_t c = 0; int ret = 0; if (port_id_is_invalid(port_id, ENABLED_WARN) || @@ -1877,7 +1876,6 @@ port_shared_action_destroy(portid_t port_id, } if (i == n) tmp = &(*tmp)->next; - ++c; } return ret; } @@ -2186,7 +2184,6 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule) { struct rte_port *port; struct port_flow **tmp; - uint32_t c = 0; int ret = 0; if (port_id_is_invalid(port_id, ENABLED_WARN) || @@ -2219,7 +2216,6 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule) } if (i == n) tmp = &(*tmp)->next; - ++c; } return ret; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-22 22:01:31.922900641 +0000 +++ 0006-app-testpmd-fix-build-with-clang-15-in-flow-code.patch 2022-11-22 22:01:31.483524189 +0000 @@ -1 +1 @@ -From 2809981e858f5cfa3ea9182e400a2c67f7c4744d Mon Sep 17 00:00:00 2001 +From 1b0e836662deb509ba4d1010ee1f9bbdd5556d72 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2809981e858f5cfa3ea9182e400a2c67f7c4744d ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -20,2 +21,2 @@ - app/test-pmd/config.c | 14 -------------- - 1 file changed, 14 deletions(-) + app/test-pmd/config.c | 4 ---- + 1 file changed, 4 deletions(-) @@ -24 +25 @@ -index 982549ffed..9103ba6c77 100644 +index f3ffc23ecd..9e2e8aeb8f 100644 @@ -27,33 +28 @@ -@@ -1787,7 +1787,6 @@ port_action_handle_destroy(portid_t port_id, - { - struct rte_port *port; - struct port_indirect_action **tmp; -- uint32_t c = 0; - int ret = 0; - - if (port_id_is_invalid(port_id, ENABLED_WARN) || -@@ -1822,7 +1821,6 @@ port_action_handle_destroy(portid_t port_id, - } - if (i == n) - tmp = &(*tmp)->next; -- ++c; - } - return ret; - } -@@ -2251,7 +2249,6 @@ port_flow_pattern_template_destroy(portid_t port_id, uint32_t n, - { - struct rte_port *port; - struct port_template **tmp; -- uint32_t c = 0; - int ret = 0; - - if (port_id_is_invalid(port_id, ENABLED_WARN) || -@@ -2288,7 +2285,6 @@ port_flow_pattern_template_destroy(portid_t port_id, uint32_t n, - } - if (i == n) - tmp = &(*tmp)->next; -- ++c; - } - return ret; - } -@@ -2368,7 +2364,6 @@ port_flow_actions_template_destroy(portid_t port_id, uint32_t n, +@@ -1842,7 +1842,6 @@ port_shared_action_destroy(portid_t port_id, @@ -62 +31 @@ - struct port_template **tmp; + struct port_shared_action **tmp; @@ -67,49 +36 @@ -@@ -2404,7 +2399,6 @@ port_flow_actions_template_destroy(portid_t port_id, uint32_t n, - } - if (i == n) - tmp = &(*tmp)->next; -- ++c; - } - return ret; - } -@@ -2534,7 +2528,6 @@ port_flow_template_table_destroy(portid_t port_id, - { - struct rte_port *port; - struct port_table **tmp; -- uint32_t c = 0; - int ret = 0; - - if (port_id_is_invalid(port_id, ENABLED_WARN) || -@@ -2571,7 +2564,6 @@ port_flow_template_table_destroy(portid_t port_id, - } - if (i == n) - tmp = &(*tmp)->next; -- ++c; - } - return ret; - } -@@ -2719,7 +2711,6 @@ port_queue_flow_destroy(portid_t port_id, queueid_t queue_id, - struct rte_flow_op_attr op_attr = { .postpone = postpone }; - struct rte_port *port; - struct port_flow **tmp; -- uint32_t c = 0; - int ret = 0; - struct queue_job *job; - -@@ -2768,7 +2759,6 @@ port_queue_flow_destroy(portid_t port_id, queueid_t queue_id, - } - if (i == n) - tmp = &(*tmp)->next; -- ++c; - } - return ret; - } -@@ -2836,7 +2826,6 @@ port_queue_action_handle_destroy(portid_t port_id, - const struct rte_flow_op_attr attr = { .postpone = postpone}; - struct rte_port *port; - struct port_indirect_action **tmp; -- uint32_t c = 0; - int ret = 0; - struct queue_job *job; - -@@ -2886,7 +2875,6 @@ port_queue_action_handle_destroy(portid_t port_id, +@@ -1877,7 +1876,6 @@ port_shared_action_destroy(portid_t port_id, @@ -123 +44 @@ -@@ -3304,7 +3292,6 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule) +@@ -2186,7 +2184,6 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule) @@ -131 +52 @@ -@@ -3337,7 +3324,6 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule) +@@ -2219,7 +2216,6 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule)