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 86C2342ECF for ; Thu, 20 Jul 2023 17:23:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8322040685; Thu, 20 Jul 2023 17:23:20 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 9FFB1400D6 for ; Thu, 20 Jul 2023 17:23:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866599; 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=WR4g6KozmPfB9K5NzJFdmDmMWYpui9pdoQgc2FeAWwg=; b=RY9BNsaSsLfysDoWMndFbqE/6oWl+gCU3nNotfbux5ZAPhNVfNAOdfACGh3TpipFypcIou 3QONhqo0w1A4+fv6YXlrgp/MN3HNV1oKhLvvv6++voC4m4JZs9wEbuy1DZP3jisZ4FdloN ARQOsmbq02O0yiW2HLQfCkACf5R5FYA= Received: from mimecast-mx02.redhat.com (66.187.233.88 [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-298-DUfLBId-NEyhiA65Ho7J2Q-1; Thu, 20 Jul 2023 11:21:26 -0400 X-MC-Unique: DUfLBId-NEyhiA65Ho7J2Q-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 0BABE848193; Thu, 20 Jul 2023 15:20:48 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id DD397492C13; Thu, 20 Jul 2023 15:20:46 +0000 (UTC) From: Kevin Traynor To: Suanming Mou Cc: Ori Kam , dpdk stable Subject: patch 'ethdev: fix indirect action conversion' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:17:45 +0100 Message-ID: <20230720151942.262154-34-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/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/c11ee881c2f6e0fa282e0814d999c82da99cad23 Thanks. Kevin --- >From c11ee881c2f6e0fa282e0814d999c82da99cad23 Mon Sep 17 00:00:00 2001 From: Suanming Mou Date: Fri, 26 May 2023 06:18:00 +0300 Subject: [PATCH] ethdev: fix indirect action conversion [ upstream commit fb131e295ea838f062278fa63f21c89a4f080d21 ] As indirect action conf fills the indirect action handler, while converting indirect action, the action conf(action handler) should be copied from original indirect action conf instead of duplicating the action handler memory. Fixes: 4b61b8774be9 ("ethdev: introduce indirect flow action") Signed-off-by: Suanming Mou Acked-by: Ori Kam --- lib/ethdev/rte_flow.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c index a93f68abbc..b311dd2a00 100644 --- a/lib/ethdev/rte_flow.c +++ b/lib/ethdev/rte_flow.c @@ -858,5 +858,13 @@ rte_flow_conv_actions(struct rte_flow_action *dst, dst -= num; do { - if (src->conf) { + if (src->type == RTE_FLOW_ACTION_TYPE_INDIRECT) { + /* + * Indirect action conf fills the indirect action + * handler. Copy the action handle directly instead + * of duplicating the pointer memory. + */ + if (size) + dst->conf = src->conf; + } else if (src->conf) { off = RTE_ALIGN_CEIL(off, sizeof(double)); ret = rte_flow_conv_action_conf -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:17:59.173538880 +0100 +++ 0034-ethdev-fix-indirect-action-conversion.patch 2023-07-20 16:17:54.585750197 +0100 @@ -1 +1 @@ -From fb131e295ea838f062278fa63f21c89a4f080d21 Mon Sep 17 00:00:00 2001 +From c11ee881c2f6e0fa282e0814d999c82da99cad23 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fb131e295ea838f062278fa63f21c89a4f080d21 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index bcc1982224..494c82932d 100644 +index a93f68abbc..b311dd2a00 100644 @@ -24 +25 @@ -@@ -920,5 +920,13 @@ rte_flow_conv_actions(struct rte_flow_action *dst, +@@ -858,5 +858,13 @@ rte_flow_conv_actions(struct rte_flow_action *dst,