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 63600A04FD for ; Wed, 23 Nov 2022 19:05:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5406042DB1; Wed, 23 Nov 2022 19:05:25 +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 3012842DA3 for ; Wed, 23 Nov 2022 19:05:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669226721; 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=hmEKGbzzfZYd8LIF/pk9PvwW7mMRUX7Ygt6fjbxqfRk=; b=SH4AV056YHhjSB2v7KnHhE43mqFamwa6Ir6yr/sHWPZQLosmHfLZ/8yeG1nRFAE72RQSPk G96M/34fEpGFbQ7LjJIfXbxZJVN8brtDlw2vUmAGZECpRWuQ4H9Xm8Kvmjn2FVgpjRFbjr xY/ynHvEI9nyVIvtrpx5nDGEZwv/2co= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-513-cdGI3LLtO-OBt8dHBCRLLw-1; Wed, 23 Nov 2022 13:05:18 -0500 X-MC-Unique: cdGI3LLtO-OBt8dHBCRLLw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C5998185A7A8; Wed, 23 Nov 2022 18:05:17 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 23854492B07; Wed, 23 Nov 2022 18:05:16 +0000 (UTC) From: Kevin Traynor 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 21.11.3 Date: Wed, 23 Nov 2022 18:04:01 +0000 Message-Id: <20221123180413.733554-48-ktraynor@redhat.com> In-Reply-To: <20221123180413.733554-1-ktraynor@redhat.com> References: <20221123180413.733554-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.3 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/28/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/1cd61dc7fb4534a070cc2cafc48ce2cd8bdf97a0 Thanks. Kevin --- >From 1cd61dc7fb4534a070cc2cafc48ce2cd8bdf97a0 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 ad1b5f51d5..fef7fa71e4 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -1730,5 +1730,4 @@ port_action_handle_destroy(portid_t port_id, struct rte_port *port; struct port_indirect_action **tmp; - uint32_t c = 0; int ret = 0; @@ -1765,5 +1764,4 @@ port_action_handle_destroy(portid_t port_id, if (i == n) tmp = &(*tmp)->next; - ++c; } return ret; @@ -2197,5 +2195,4 @@ 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; @@ -2230,5 +2227,4 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule) if (i == n) tmp = &(*tmp)->next; - ++c; } return ret; -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-23 09:55:58.185352005 +0000 +++ 0048-app-testpmd-fix-build-with-clang-15-in-flow-code.patch 2022-11-23 09:55:57.100149385 +0000 @@ -1 +1 @@ -From 2809981e858f5cfa3ea9182e400a2c67f7c4744d Mon Sep 17 00:00:00 2001 +From 1cd61dc7fb4534a070cc2cafc48ce2cd8bdf97a0 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 ad1b5f51d5..fef7fa71e4 100644 @@ -27 +28 @@ -@@ -1788,5 +1788,4 @@ port_action_handle_destroy(portid_t port_id, +@@ -1730,5 +1730,4 @@ port_action_handle_destroy(portid_t port_id, @@ -33,61 +34 @@ -@@ -1823,5 +1822,4 @@ port_action_handle_destroy(portid_t port_id, - if (i == n) - tmp = &(*tmp)->next; -- ++c; - } - return ret; -@@ -2252,5 +2250,4 @@ 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; - -@@ -2289,5 +2286,4 @@ port_flow_pattern_template_destroy(portid_t port_id, uint32_t n, - if (i == n) - tmp = &(*tmp)->next; -- ++c; - } - return ret; -@@ -2369,5 +2365,4 @@ port_flow_actions_template_destroy(portid_t port_id, uint32_t n, - struct rte_port *port; - struct port_template **tmp; -- uint32_t c = 0; - int ret = 0; - -@@ -2405,5 +2400,4 @@ port_flow_actions_template_destroy(portid_t port_id, uint32_t n, - if (i == n) - tmp = &(*tmp)->next; -- ++c; - } - return ret; -@@ -2535,5 +2529,4 @@ port_flow_template_table_destroy(portid_t port_id, - struct rte_port *port; - struct port_table **tmp; -- uint32_t c = 0; - int ret = 0; - -@@ -2572,5 +2565,4 @@ port_flow_template_table_destroy(portid_t port_id, - if (i == n) - tmp = &(*tmp)->next; -- ++c; - } - return ret; -@@ -2720,5 +2712,4 @@ port_queue_flow_destroy(portid_t port_id, queueid_t queue_id, - struct rte_port *port; - struct port_flow **tmp; -- uint32_t c = 0; - int ret = 0; - struct queue_job *job; -@@ -2769,5 +2760,4 @@ port_queue_flow_destroy(portid_t port_id, queueid_t queue_id, - if (i == n) - tmp = &(*tmp)->next; -- ++c; - } - return ret; -@@ -2837,5 +2827,4 @@ port_queue_action_handle_destroy(portid_t port_id, - struct rte_port *port; - struct port_indirect_action **tmp; -- uint32_t c = 0; - int ret = 0; - struct queue_job *job; -@@ -2887,5 +2876,4 @@ port_queue_action_handle_destroy(portid_t port_id, +@@ -1765,5 +1764,4 @@ port_action_handle_destroy(portid_t port_id, @@ -99 +40 @@ -@@ -3305,5 +3293,4 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule) +@@ -2197,5 +2195,4 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule) @@ -105 +46 @@ -@@ -3338,5 +3325,4 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule) +@@ -2230,5 +2227,4 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule)