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 477E64301F for ; Thu, 10 Aug 2023 02:12:10 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 40E9D40DD8; Thu, 10 Aug 2023 02:12:10 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2080.outbound.protection.outlook.com [40.107.102.80]) by mails.dpdk.org (Postfix) with ESMTP id 3A6E843262 for ; Thu, 10 Aug 2023 02:12:08 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K4xJg+la3ooUh+Z8SM7GKu8o42W0X1rE62nh2vWvuAM8n7AbastdHAmPO1EBMmBOndtZqZcNCxN9+xQcWZ4hZ3O1urmrJ3otX9MWFammC7H9fAO4hhgr5dWDPdNJDvf1PzO8PD872adC9Hw5e7Uuby1SvJa9o4Q19fGvO1IbFp16iE9DMkhLukm02ztS1TKV1WwPNZdHWcOSUIu49tAdBiOQrWTdcmd5OmldNOgamvtgYqPBcESMvBCmxcriWRD+voM6LvFxI1J1VWXFd/HzPWM4CMV4euzDpJKgWe5Mru5AFedU4cYz4Ah+mRP9QUXjZm1Ag9U1QljvDUoRkyQRXg== 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=bUK3PYKj6gReddd568yoXGcyDN1r6bkvBw+kOc/QQ3c=; b=JH2AlWWQfg2xKETB5xzAjnXsdQhDPnf7TfTWP6mM+8T9Qmvww8/Uhkn+XLkxIfaRd6XgsG7F/Lx/Dpg7Yx7FhKnZ90w8X513q9dcxis62/EsxSRgm61xjqwrbH5z0Ot2UmtnCHAkzOpvYTWk0YTFP3cB5C56xo/oExmXpoouScu1pFrauHjrME9m8Ou+o3UoiuoHUXyonxaycqWGTOEZtZk3RGN40q0hWqhTeZQCgURfc6dFC6EG95jQYT7GwkUVd66Oznsx4P0AjC6Ddfb/NuCkQD6z6z3WkyymSsZ9vtHmpGDjwH/qL2ZldgLdm+UBL9ax2vU9CQwH6ye3sFepcQ== 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=bUK3PYKj6gReddd568yoXGcyDN1r6bkvBw+kOc/QQ3c=; b=Ojthtb4+AiLVMw+o9MSTua6EK6SgeHsW3GW7fKqSOmQGdlvOznFBl+ZyRisISa9z3peNZV0qFWLBGWoTxRnYf62+dbrV/KFNIFrc3n5b9Gl18Q6q5937bcCDYPU71W9nglkPSxtwzRm1/XhJ3If2mQsRD5WvrlfB1+X/xUqtKTHh884A6OR8rIOhpnIf5xXTPfjFvtEv4HvnRKs7Q3vRvK/Y0cYbbv2KhQYLjTkxPC+q/PtvlpJxGN4mmug1Ct6oLCaZO/N6SELkH8UPJHUoc/5DxgzS1WL9cIwgtC1uIJ/9RMO05GZX4RCbTSoR1gxPxby0BdFULs3d02UUxvIT4Q== Received: from PH7PR17CA0070.namprd17.prod.outlook.com (2603:10b6:510:325::10) by MW3PR12MB4475.namprd12.prod.outlook.com (2603:10b6:303:55::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Thu, 10 Aug 2023 00:12:06 +0000 Received: from SA2PEPF000015CC.namprd03.prod.outlook.com (2603:10b6:510:325:cafe::c) by PH7PR17CA0070.outlook.office365.com (2603:10b6:510:325::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Thu, 10 Aug 2023 00:12:06 +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 SA2PEPF000015CC.mail.protection.outlook.com (10.167.241.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Thu, 10 Aug 2023 00:12:05 +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; Wed, 9 Aug 2023 17:11:52 -0700 Received: from nvidia.com (10.126.231.37) 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; Wed, 9 Aug 2023 17:11:50 -0700 From: Xueming Li To: Alexander Kozyrev CC: Ori Kam , dpdk stable Subject: patch 'app/testpmd: fix meter mark handle update' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 08:10:34 +0800 Message-ID: <20230810001045.2662-14-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230810001045.2662-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230810001045.2662-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.37] 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: SA2PEPF000015CC:EE_|MW3PR12MB4475:EE_ X-MS-Office365-Filtering-Correlation-Id: f21d27f8-bb13-4ac3-5bc5-08db99366e53 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RwZ2LuYU/63IShbp8POpEnZKM2n7/Xx47shbg0wxT6qaX4Kev81BZMs8FvG3hD73gGIQF42ZFZpn1wD3Ef4/vvOpDHcFlf243CC/Fur6zUjoxokIb+wf0O/Sy88VTfAr8egdgftp0moLT1ZtC2Gx848RPtu0pHR7qzHO+xcS3fqPHhzvDeuIsHY2bbvXX4FAUm4JZoKFINfAwDr7j8kSZW8JnH9KHOTE8d+aUhFbGlYlMz4rfTL1TWDY2lrXOmP6pyHEcH78QRToLqmFnPYMz46PiDrKJ/wPFv/u6uZ7HMoQZOxLtI7UrAb7n6KaQLaLlx4r23hejWZfRQUPXitPtAh1VG+FM89ebNmwqVQ1dGpnnDLiR/1lTiZKlIgjXNJQT0R2x1Tf+LHp03/5nmLGwATsOh9ye73XDGzhluAtjVY9mLUnDgKbiuTgoFHzBJJSXKy4Pwuk6P04YCzpGpvH8B94T6TNNy/2ZcJQUmXxq2VZsWNE+iwpIdNWZSVyHCppl0Kwldb9/WYuvvsxg0FzBFEf1pqF+Rr2ONMuchOCaJja5Hj9oK5jliwyJyfe8TOw9IHLUKPMJgMfnU+xWjNBDfCcEkrmED/pdWgaOAzh6Qf/JL73yIpVKblvlsjbU2tFVqZXJh1RY1Kx/gQ538MJQISNmHVSaiF8BFUqvfRjTsdl8F3LxmM2doudu3vJp/oGOn5pgNQKyFgiYyT5M/l3A0TIFWCvEQFm82tSTt3SHy/kHSBfGXNt96Qmfogq73vus//oiR+BJamGbS89G8fRzQ== 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)(396003)(136003)(376002)(346002)(39860400002)(451199021)(82310400008)(1800799006)(186006)(36840700001)(40470700004)(46966006)(6666004)(7696005)(966005)(40460700003)(86362001)(26005)(1076003)(53546011)(40480700001)(55016003)(426003)(83380400001)(2616005)(47076005)(36756003)(36860700001)(16526019)(6286002)(336012)(7636003)(356005)(82740400003)(2906002)(70206006)(70586007)(6636002)(4326008)(8936002)(6862004)(8676002)(5660300002)(316002)(41300700001)(15650500001)(478600001)(54906003)(37006003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2023 00:12:05.9891 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f21d27f8-bb13-4ac3-5bc5-08db99366e53 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: SA2PEPF000015CC.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4475 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 08/11/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=3eda3753f8ff24b497a0cdd1be43a510d861addb Thanks. Xueming Li --- >From 3eda3753f8ff24b497a0cdd1be43a510d861addb Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Tue, 18 Jul 2023 16:32:14 +0300 Subject: [PATCH] app/testpmd: fix meter mark handle update Cc: Xueming Li [ upstream commit 5ed396098e662be8638c2d08c711db2823c386ac ] The indirect action handle update for the METER_MARK action was implemented only for the async flow API. Allow updating the METER_MARK parameters via the old sync method. Fixes: 9c4a0c1859a3 ("ethdev: add meter color mark flow action") Signed-off-by: Alexander Kozyrev Acked-by: Ori Kam --- app/test-pmd/config.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index acccb6b035..6a9eb4609c 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -1875,6 +1875,7 @@ port_action_handle_update(portid_t port_id, uint32_t id, struct rte_flow_error error; struct rte_flow_action_handle *action_handle; struct port_indirect_action *pia; + struct rte_flow_update_meter_mark mtr_update; const void *update; action_handle = port_action_handle_get_by_id(port_id, id); @@ -1888,6 +1889,17 @@ port_action_handle_update(portid_t port_id, uint32_t id, case RTE_FLOW_ACTION_TYPE_CONNTRACK: update = action->conf; break; + case RTE_FLOW_ACTION_TYPE_METER_MARK: + memcpy(&mtr_update.meter_mark, action->conf, + sizeof(struct rte_flow_action_meter_mark)); + if (mtr_update.meter_mark.profile) + mtr_update.profile_valid = 1; + if (mtr_update.meter_mark.policy) + mtr_update.policy_valid = 1; + mtr_update.color_mode_valid = 1; + mtr_update.state_valid = 1; + update = &mtr_update; + break; default: update = action; break; @@ -2924,8 +2936,10 @@ port_queue_action_handle_update(portid_t port_id, case RTE_FLOW_ACTION_TYPE_METER_MARK: rte_memcpy(&mtr_update.meter_mark, action->conf, sizeof(struct rte_flow_action_meter_mark)); - mtr_update.profile_valid = 1; - mtr_update.policy_valid = 1; + if (mtr_update.meter_mark.profile) + mtr_update.profile_valid = 1; + if (mtr_update.meter_mark.policy) + mtr_update.policy_valid = 1; mtr_update.color_mode_valid = 1; mtr_update.init_color_valid = 1; mtr_update.state_valid = 1; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:21.134752400 +0800 +++ 0117-app-testpmd-fix-meter-mark-handle-update.patch 2023-08-09 21:51:18.294352000 +0800 @@ -1 +1 @@ -From 5ed396098e662be8638c2d08c711db2823c386ac Mon Sep 17 00:00:00 2001 +From 3eda3753f8ff24b497a0cdd1be43a510d861addb Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 5ed396098e662be8638c2d08c711db2823c386ac ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index c4784b7f2c..11f3a22048 100644 +index acccb6b035..6a9eb4609c 100644 @@ -23 +25 @@ -@@ -1943,6 +1943,7 @@ port_action_handle_update(portid_t port_id, uint32_t id, +@@ -1875,6 +1875,7 @@ port_action_handle_update(portid_t port_id, uint32_t id, @@ -31 +33 @@ -@@ -1956,6 +1957,17 @@ port_action_handle_update(portid_t port_id, uint32_t id, +@@ -1888,6 +1889,17 @@ port_action_handle_update(portid_t port_id, uint32_t id, @@ -49 +51 @@ -@@ -3162,8 +3174,10 @@ port_queue_action_handle_update(portid_t port_id, +@@ -2924,8 +2936,10 @@ port_queue_action_handle_update(portid_t port_id,