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 A86D5A0C42 for ; Wed, 23 Jun 2021 09:25:10 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9548440683; Wed, 23 Jun 2021 09:25:10 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2076.outbound.protection.outlook.com [40.107.93.76]) by mails.dpdk.org (Postfix) with ESMTP id BFD954003E; Wed, 23 Jun 2021 09:25:08 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OFbgUWCqlp5x5xp3pLWMBZYITgVwV2M86XC5b39tn5XkjZfySVbo6l8HQsF7LO8ZYVwr4Av7ciLaxMO8icecevj3UuHdptj6gU2qIAuAs44oCSp7/zq6OdzPOaUI6Tn6WohpWDWoC6mD+uKTlOVvMpnngl339YHoPaRYhdTFShL4Bh+PqigqYL9LTgRQKcw1QphYO9BlG9ksZd440WgwaJyD+DgwG/Kpbd8BbSs0Nb3FFFcci06s3VmrL8CMjn3/4DikPK8D1GjnBKqYAUZDzltfG9MQ0L9kh2rFn71m0h35gAZIo0TNV3fsQSHEsDxal/5oFt4bOo3RpCxwQAjCOw== 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-SenderADCheck; bh=EhPQ1NGqCzUXLGOHbm+MGocxTLW1JnM8q5umtAu1PDQ=; b=Fdm+7p5hU5UqxdmDRvJARpQsvk3gKmf+OvWt0v/XPm98/Xhndq5FcsJRb5IISirTChj75IrvhxndAuQuEbHe9k8Ccv7ducmfNUU86nWKDJ7OWo7deiOzl3lNmqwHuofj2txhYfGOzGaq1MHSJAlW0GYR28twx1KtGgpvPjWL1zwGIUyVeu2p2jijypsxPlIyi+Z/hCX2VClerCTh0TZSHg6a+7q1XUB8IyzLR7w/YfOWV3GaAyj9TB5WB7KM1QMc9PX1HXBlLchuZYw5rxW8I+/5eKbHaE+rjQlC0U46KLSvqshKy17fuqeuWxiZbVnY+DIJ84i4fj6WUQ1v3wyVSw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=EhPQ1NGqCzUXLGOHbm+MGocxTLW1JnM8q5umtAu1PDQ=; b=Z4m31bYzL9BC6Ot7sVhI9nNWxSyeCAzxNf/YuseDfujVjVxHERyyciz4S9pPGGE4/mvGfXC7cR2sdhnB11TasVmFEMbj6gcHxnaLgIqqpiSuC8EDsmMMDfYWD7pMBCbL/YgbyfX6cH3P1uQ7YVLUOYp310Y+PAHXLDFbxBUPzhU6UyUx04FXlny81GOHjjXwlZbkBCE9FKyPwSaibghvddXGeM7R7mgotaOxf7VXHWSk+LKEWskvwVC9kEFa203YvP3jNc96wswiY1mp//EPYUzxH07be5uEUNkO91X9+9+f0/94slexjwGk60/hifnPk0bm2mKy6K7C1l4HnkrrLQ== Received: from MWHPR20CA0005.namprd20.prod.outlook.com (2603:10b6:300:13d::15) by DM6PR12MB3625.namprd12.prod.outlook.com (2603:10b6:5:116::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.19; Wed, 23 Jun 2021 07:25:07 +0000 Received: from CO1NAM11FT036.eop-nam11.prod.protection.outlook.com (2603:10b6:300:13d:cafe::4c) by MWHPR20CA0005.outlook.office365.com (2603:10b6:300:13d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.18 via Frontend Transport; Wed, 23 Jun 2021 07:25:06 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT036.mail.protection.outlook.com (10.13.174.124) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4264.18 via Frontend Transport; Wed, 23 Jun 2021 07:25:06 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 23 Jun 2021 07:25:03 +0000 From: Li Zhang To: , , , CC: , , , , Date: Wed, 23 Jun 2021 10:24:40 +0300 Message-ID: <20210623072443.121380-1-lizh@nvidia.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 670afb4b-5a4f-46ff-5b8f-08d936180689 X-MS-TrafficTypeDiagnostic: DM6PR12MB3625: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2887; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dwRndruwnEA6sRPYTIlTWDI+/GhTAe1iMRl0BTEgBuJfJ6CTWi69HOik05mhZRWi2EZ0cEcxOfcVOfCU7bvpdD5EptWRvwnzbdHVvRWOG61Dw7vU02u9a6kgXxahDRoaK93zv356GSWEy2ZKTTdt15sqfV6DX9AAE2WA20bgDfp/sfjntPzuTm/J4iTUzcFoH0pOJKtm+2MSNHfAjVdiX7ZWfkKuPegyFbNmoW4GyrbzVDnk8IImPWyrtrJ7TDz8D4rbFGwTPfjOn3tZM2B9Ozrg/bqDxulvK7vI/9JKPQwaVXza6zfBXimAdk+bUZrOit+lkEFy7N5P7lNnPUCKY0Z3uVijaScjaaFPCyz9P6wUa2GRpFnjm+tf3KGC7I5cxzoNJ/1Da5S0g9PRqbjzGedQ/fi/4a0QveWgwdNnFDLBQ48n6uIYIYpuUKQEsVtq6CVuJdiNAe9tFPM3SRtRHdZf/JMpuIblNSx16T18Jrjy48M4DOKCh+0kto/xIONXHtcvL5j+WNpLMpxXC1DaMLdfHC3TUSoEhHT7NJOUqjYBm1UiZ0Ks2CYdQd58U8h3TLRlMLG1SpM56slQPVEQ313fdDWla12D6PcA9PSXYWWonTspxBzx+SzAzgPVpRL3tOFqOy5NXHPz+ieDqNlac0lJC9rx1D+eQf8hmuwS9AM= X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(136003)(376002)(39860400002)(346002)(396003)(36840700001)(46966006)(70586007)(70206006)(4326008)(36756003)(478600001)(6636002)(110136005)(83380400001)(7636003)(316002)(2616005)(426003)(55016002)(54906003)(36906005)(86362001)(2906002)(36860700001)(82740400003)(7696005)(6286002)(26005)(6666004)(5660300002)(356005)(16526019)(8676002)(8936002)(47076005)(1076003)(186003)(82310400003)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2021 07:25:06.5016 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 670afb4b-5a4f-46ff-5b8f-08d936180689 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT036.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3625 Subject: [dpdk-stable] [PATCH] net/mlx5: fix meter policy with RSS action 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 Sender: "stable" When creating the meter sub-policy RSS rule, the RSS descriptor was used before its update. It also need update tunnel bit in RSS descriptor after flow translate. Use it only when it is updated. Fixes: ec962bad14e ("net/mlx5: fix metering cleanup on stop") Cc: stable@dpdk.org Signed-off-by: Li Zhang Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index c5c767aaee..c5d4a95a8f 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -4613,7 +4613,6 @@ get_meter_sub_policy(struct rte_eth_dev *dev, struct mlx5_flow dev_flow = {0}; struct mlx5_flow_handle dev_handle = { {0} }; - rss_desc_v[i] = wks->rss_desc; if (policy->is_rss) { const void *rss_act = policy->act_cnt[i].rss->conf; @@ -4641,14 +4640,19 @@ get_meter_sub_policy(struct rte_eth_dev *dev, if (flow_drv_translate(dev, &dev_flow, attr, items, rss_actions, error)) goto exit; + rss_desc_v[i] = wks->rss_desc; rss_desc_v[i].key_len = MLX5_RSS_HASH_KEY_LEN; rss_desc_v[i].hash_fields = dev_flow.hash_fields; rss_desc_v[i].queue_num = rss_desc_v[i].hash_fields ? rss_desc_v[i].queue_num : 1; + rss_desc_v[i].tunnel = + !!(dev_flow.handle->layers & + MLX5_FLOW_LAYER_TUNNEL); } else { /* This is queue action. */ + rss_desc_v[i] = wks->rss_desc; rss_desc_v[i].key_len = 0; rss_desc_v[i].hash_fields = 0; rss_desc_v[i].queue = -- 2.27.0