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 15739A00BE for ; Fri, 18 Feb 2022 08:43:32 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7CE774114F; Fri, 18 Feb 2022 08:43:31 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2040.outbound.protection.outlook.com [40.107.237.40]) by mails.dpdk.org (Postfix) with ESMTP id 94DAC4068B for ; Fri, 18 Feb 2022 08:43:30 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AO4u/9CwxdbJfA/gSQOtUtpiYPIprobCoSP9ujaZxq4L6Cbx5cF+YjtjLt2HPf+9lQ2cbNaHH4o1iSnmzp2Ws7Ixxo6occMyoMacbZL46Glx4xMeDcz4MP2xsIHhTc797rlBfgc9IURCEZlyArpGyzvYlYF8/f+npuVAdLgtrMjm6+k/oGo9MKSsr7JlTetjHd6XkO+9yScAAGhWN1FCm0mHkbpearo3yu2Tr9Yv9gPHUUU2oZ0nRJT96kfAy0weyDyyeMfdwokkZtZ5Yyr0wLPzn08NWTZk36DMTzQw30SGapu4xkBTfS+QWAVuWQFoIKg1Ly+0TwYYj11Yd8w3hA== 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=Y8vp3PLIMLfkhY3HhuglqqDEjw9eEOWDsEt5wwpCw1c=; b=X9BeQXXlz6S3MJcZYNHlUI/zWQnSkVHD8tebmfhKoxVblF1Au/L0W1p76+9Jj9iSmP/9IN7je3vDA5Pps7+0+x0eQNKyoH2gYUi3gblrxn6Uo4+5qdRuQJeaZVmmKjrHy21J/pQmmPwxr/wOq5GHn8iXjZP9HbRnausxflgKXrEDTDmtGFX/zarrfUlvQ8zpd0NDyvUupWqGOcEIcBfc3YrxiA7skQ2oQJIM3CY1t7py8seyOCc/In6P1b+GCW2+MSiB8156HynkalKBjvV0Jw/r8obAg7DH+L0bjssBWne5ZgprCX7Hl00XwaD3zwRhQ66w+JDaRbUAgAZ6ojit9Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.238) 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=Y8vp3PLIMLfkhY3HhuglqqDEjw9eEOWDsEt5wwpCw1c=; b=f9EW51Aj6Q9Tk/u50C9YA1jNY9djy8eyyD1bWpNmpCYLHMLjiS20nR5nVKAcsQOOXHKqEismSJXAHM7sv90A8Ja304Y8c/movr6Fj2in+znTdqkplfyyxeYmZQQA7kyDbddvuJL0tAjGs9FcoOr1hTEGPRsaptMxtZhN3AanzvMIZmXPZ61NOCI0nXqIq35RYf4ReqVmy56WaLZlrC6DPxBKlo+2HXlMcpvq8anLaZa6a5FbFQk+A3BxS4H/BTWo/R/qcxcb1c3d8JJ5UUXGdDJouq0NFt7yv6C+DdQQt5X/ypYno80EVXzhoVf6POFuKonOoB22tX1MjjPJeXlmVw== Received: from MW4PR03CA0015.namprd03.prod.outlook.com (2603:10b6:303:8f::20) by CY4PR12MB1894.namprd12.prod.outlook.com (2603:10b6:903:128::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.18; Fri, 18 Feb 2022 07:43:25 +0000 Received: from CO1NAM11FT067.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8f:cafe::23) by MW4PR03CA0015.outlook.office365.com (2603:10b6:303:8f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.14 via Frontend Transport; Fri, 18 Feb 2022 07:43:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.238) 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 12.22.5.238 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.238; helo=mail.nvidia.com; Received: from mail.nvidia.com (12.22.5.238) by CO1NAM11FT067.mail.protection.outlook.com (10.13.174.212) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4995.15 via Frontend Transport; Fri, 18 Feb 2022 07:43:25 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL105.nvidia.com (10.27.9.14) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 18 Feb 2022 07:43:24 +0000 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.9; Thu, 17 Feb 2022 23:43:22 -0800 From: Shun Hao To: , , , CC: , , Subject: [PATCH v1] net/mlx5: provide correct items to meter sub-policy Date: Fri, 18 Feb 2022 09:43:08 +0200 Message-ID: <20220218074309.24518-1-shunh@nvidia.com> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2f65cd2c-8ebb-4ab9-ae42-08d9f2b258ab X-MS-TrafficTypeDiagnostic: CY4PR12MB1894:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2657; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /TnFZdq/R82ILQ1PrFHElQn/rEghxYiDSSlsQ4ixUw1CaxyxPIK/CM1MBnptfLTC21RU4KAdTmFR+xBD046CjnbFLaht6xzbOCFRaM8wDOeDbAjv3bo61Cqo0wHJnwbujX3Kb/A4jEuWdCsmw92udMSpZYMURZOCnRGb6o9IITRNUKiMeDKDr9nXEKgIJ8woTqUcoVuiNVYx7bCbEvbZ0+JNSodgE8h7o+7fl6cCQDr1Lw3Ozq+MHnHz9BBXuguyB9WJughM2+KuXJhiQnh7Z3vspuKm+MjL30sURXtn/DXZ8LtKZu924xmxU0IbQZR/5PDCTMGi7DYvHmWCDF7WjaHnHWK+fQBTqUnBAEOH0EkrEzLbTrWojVChiZm2DsVI2Zv6GScV2R6roN6UBWaPkHQE9Jffav7G1qwFeWdJnbU6dqQiwY3S0d2h27mDduJxhsoP//t+VoHXqM13zQmiJp98RkT0jQf8Yk0l4aZ7/OFft4aN3tAcNxDk9ezM1tnvusdCS0pF/iKJwWdET0UVGBVar+fPy7/rJJ1VdSnJ4VrjxQPHkNufsYTk4+bPuRlZXB9MSwEyeYJpWfvqcn62w7H3rjW2JsajmgTPdMqFhmvzZPLm/JIsPiaCRUphwfLxrRNWc7wJOKBctWbgTAxq0GGH+Z41wIdegE2mkhaPrFx8dDrBEzvDbvI8trVOcshFEuBhG6CZyxtHeojqpf2GqQ== X-Forefront-Antispam-Report: CIP:12.22.5.238; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(36756003)(2616005)(2906002)(1076003)(5660300002)(26005)(55016003)(186003)(6286002)(8936002)(81166007)(70206006)(356005)(4326008)(8676002)(16526019)(70586007)(40460700003)(426003)(83380400001)(316002)(336012)(86362001)(47076005)(36860700001)(6666004)(82310400004)(508600001)(110136005)(7696005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2022 07:43:25.4288 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2f65cd2c-8ebb-4ab9-ae42-08d9f2b258ab X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.238]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT067.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1894 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 If meter policy action was RSS, the correct items were not provided for sub-policy creation. This fixes the issue by providing original items in meter split, so the sub-policy creation gets the correct items. Fixes: 3c481324baf3 ("net/mlx5: fix meter flow direction check") Cc: stable@dpdk.org Signed-off-by: Shun Hao Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 179cc3b303..0311f91bf2 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -5022,6 +5022,7 @@ flow_meter_split_prep(struct rte_eth_dev *dev, uint32_t tag_id = 0; struct rte_flow_item *vlan_item_dst = NULL; const struct rte_flow_item *vlan_item_src = NULL; + const struct rte_flow_item *orig_items = items; struct rte_flow_action *hw_mtr_action; struct rte_flow_action *action_pre_head = NULL; int32_t flow_src_port = priv->representor_id; @@ -5146,7 +5147,8 @@ flow_meter_split_prep(struct rte_eth_dev *dev, if (!fm->def_policy) { sub_policy = get_meter_sub_policy(dev, flow, wks, - attr, items, error); + attr, orig_items, + error); if (!sub_policy) return -rte_errno; } else { -- 2.20.0