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 43BC942D46 for ; Sun, 25 Jun 2023 08:40:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3FCFB42D12; Sun, 25 Jun 2023 08:40:21 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2080.outbound.protection.outlook.com [40.107.95.80]) by mails.dpdk.org (Postfix) with ESMTP id 340D142D12 for ; Sun, 25 Jun 2023 08:40:19 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YmOLKPK0KHB9Nmk2WBgb+13fNio2qQrX5w/edycijxY3p6C9GnvgSD2up9VehnlXI6sP//4JTTl2RZf7SiWrmBqcRDbj9gve95A2Zazc24mvZa9+ZcyYX+CY0SrfNosPrCTDgSwpJ0Vp+rqNhCzzTQC1yDonPVRPvNICt3KQ1Ce1Q3F/KCkYOX4VUTFa/9sdocKmMXUJw+CWc2CuErBrwCuL5nhfbIMAN49/wJHfIoUD6MJVz8bqATBoOHE+xbyZ9k2axQtDQj45KnRUSGrR6Nkivv5vMyBVVc2JC0awgweYZcwxkgGvcqdGkEwvtwqc2mIOPnpKCcy8RiLYGXArmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zwpZNLtIkZhsvGbI2DuFpGQvT8i3SXHlAiYlkduhYSc=; b=BBPGG1x425MiXnAw87aTmQLnoNDsrjREnoagaEzmWSadkoRHzg5YgbCGIlS3dl7wug1XxpvwL5qGOwzCITlbeOPPahROJRMwR7O9KTdXtpCZ0WGUMfhGqI8sVLWLnsmai0C6vgXL5KzYHJ5fxxNHj5oUWXxVKID8Ic0+p03VWPBJ7cJa5pc/LXjnSv+6O4Qwd156izmVH+myuseie8HTdnZdBglyGmCmMdCmzqXWOCtot1P/waiLw1DpNoykDK9g+n/WN+AqQkfwKPqR7Z1UC097MdqMyveNhZX19Pw9fJlD7qSwOz+iAe3PYuAWWMoslBlUJlUl+KLWvUS1e56HSQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zwpZNLtIkZhsvGbI2DuFpGQvT8i3SXHlAiYlkduhYSc=; b=ae9KqPaK3Z/SZaGuYwRY6ZdwF5LrCKbxtrRB4gb2P4f7LJjPhqrZ81EiqjG+nWIZZpZzccHwPCq3Lfbu9TUNsFfl06mU0LFY1K9uJyg8LxyGpiwMLc5fQw9WLRCnSKHceHqJ5iZ72TGbP9eLstViUi4AXg9Ej1rfGy+5CwHaXcUKS57fLzXA7KpHH0lQDyWEx6TGEhNBtVUbxk78YBfxEJ/7BITrMIyIdJlpjPdZt7S4Xq+bXA82joM2793nTe9C5nUWprNyXVK8ClEsQ3NbGAj9+HGgQqparbvsaCFNhahs2BYRCsYBqTw4NGPFIyWCmJt3/qh7YW7V6+lb5CIOkQ== Received: from BN9PR03CA0903.namprd03.prod.outlook.com (2603:10b6:408:107::8) by CH3PR12MB8995.namprd12.prod.outlook.com (2603:10b6:610:17e::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.23; Sun, 25 Jun 2023 06:39:56 +0000 Received: from BN8NAM11FT026.eop-nam11.prod.protection.outlook.com (2603:10b6:408:107:cafe::5a) by BN9PR03CA0903.outlook.office365.com (2603:10b6:408:107::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.33 via Frontend Transport; Sun, 25 Jun 2023 06:39:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN8NAM11FT026.mail.protection.outlook.com (10.13.177.51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.45 via Frontend Transport; Sun, 25 Jun 2023 06:39:56 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sat, 24 Jun 2023 23:39:38 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sat, 24 Jun 2023 23:39:37 -0700 From: Xueming Li To: Suanming Mou CC: Ori Kam , dpdk stable Subject: patch 'ethdev: fix indirect action conversion' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:34:21 +0800 Message-ID: <20230625063544.11183-44-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT026:EE_|CH3PR12MB8995:EE_ X-MS-Office365-Filtering-Correlation-Id: 8c0b2680-fbe7-4a97-648d-08db7546fd60 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4cIj2TmQHsZjF9Rdt7xDrRYzIio9bBWWccBklKWz3cQEp+4RbTWTMSz2IsVGly4js2ecenxrkeB8JrB/SlfRW2bv2hh6E8V849/yCFx0+AsHjzkWbP3U/pgPUVIK7y/TzxUcCYU63hxxXpyQdkd1Hr6tMSFfB2snpixyR5B1AYXVeqNcllsi4/NFZkepIf4PGmyuySxKFIYj03w00/00HYS53WqnEwJa2Up/IlxsslnQvLGTd+L4kUllo01w3YlDBb1srBjKvDrrrWy9pFktsQ0eo6Sk8CSIyt+oklFYtS1zRNdJk018wtpSVfhQgIM4/eKs8aYF3ws+oVbjP8D/ZH9+jqyAUdMSKDXXtVEVF72lys1taq+rYQ/1u4X4xfu3BvlmY1v0N28HNQPHuBh1iWh3d2HYUgjA6CE6AAaN02TmVSlwKXGYHp5hAxPM1ZK0QeKrRsHoM1KXWC9q2mbYY7td7cLTtWEMdN2uLVBLWMTw58J5wjcmzAq8Wp2czVIvBK5hJICZ1rbS3e9+KC4rPn8xX+stzbg70WBaC1aj/SV5guVbhvcdxD/HyN0i6su7JLbyc4nQYcC07CvTFItdEpLqp7V9jUyQjn0wcnJVImq0/p5i+R5exVBQxZm4c/xFia+hio/VZLWEkgxmnAxUoHrpane0AEI8CkXgKE1ZH/OZp6bXUgQcYZ8wnkGKTayWvHhxb200KVA5oP+Zhl+hWEyMwmfWuKZMFnWsgRGr54SklRjBO9qFyf9Im1K/ck5jSPNNpdK6bC/UdwIl/4sKIA== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(136003)(346002)(396003)(39860400002)(376002)(451199021)(46966006)(36840700001)(40470700004)(36860700001)(82310400005)(47076005)(966005)(478600001)(7696005)(6666004)(2616005)(54906003)(37006003)(426003)(83380400001)(336012)(26005)(53546011)(1076003)(186003)(16526019)(6286002)(2906002)(5660300002)(40460700003)(36756003)(6862004)(70206006)(356005)(4326008)(6636002)(7636003)(70586007)(82740400003)(55016003)(40480700001)(316002)(8936002)(8676002)(41300700001)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:39:56.0295 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8c0b2680-fbe7-4a97-648d-08db7546fd60 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT026.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8995 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 22.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 06/27/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=a678d7da2bb89250de2ac578ad110522906bf7d0 Thanks. Xueming Li --- >From a678d7da2bb89250de2ac578ad110522906bf7d0 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 Cc: Xueming Li [ 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 7d0c24366c..1a67a987f5 100644 --- a/lib/ethdev/rte_flow.c +++ b/lib/ethdev/rte_flow.c @@ -855,7 +855,15 @@ rte_flow_conv_actions(struct rte_flow_action *dst, src -= num; 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 ((void *)(data + off), -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:31:59.676166800 +0800 +++ 0043-ethdev-fix-indirect-action-conversion.patch 2023-06-25 14:31:58.355773900 +0800 @@ -1 +1 @@ -From fb131e295ea838f062278fa63f21c89a4f080d21 Mon Sep 17 00:00:00 2001 +From a678d7da2bb89250de2ac578ad110522906bf7d0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit fb131e295ea838f062278fa63f21c89a4f080d21 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index bcc1982224..494c82932d 100644 +index 7d0c24366c..1a67a987f5 100644 @@ -24 +26 @@ -@@ -919,7 +919,15 @@ rte_flow_conv_actions(struct rte_flow_action *dst, +@@ -855,7 +855,15 @@ rte_flow_conv_actions(struct rte_flow_action *dst,