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 39418433D8 for ; Mon, 11 Dec 2023 11:21:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 328C042D9D; Mon, 11 Dec 2023 11:21:34 +0100 (CET) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2061.outbound.protection.outlook.com [40.107.101.61]) by mails.dpdk.org (Postfix) with ESMTP id 724B240ED2 for ; Mon, 11 Dec 2023 11:21:32 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TxLcjRZV9c+8J8m2+oKvfTPq/Yjtpyf2RBssof1wVpGHjQnbTdSUPBkv5K3SPyQl8Snsnt34fTmYC9Wan89Ukxw1+xxdwTRqDPeTW6FErcCVLTxqHu0zbbo/d04gshxr6skWoBH2kkhrqLAbnKMIB+HyLMBvWiKfRhsO/TsLOHrUccjLjmN2Hg5HgB+xFqS913rV7QpGavTmmOu7Iv5P0l0wyzhl0hNSEQgry+qsKg+pSOHnUmfmy/1lqrMQc0PommLse4uHj/7HH2HKPzbAYFAhcWKIogCNpTuv/rF2tSTAFCRSohhNOlMTAjhxlbWvbIwFzCncbfav+YMOnJ+H7w== 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=YqwLYhYa8Efpk101wYClkeDtZh+b5ESZxn3vp7+y3+4=; b=eSEe3tORZA7S4HyKcmQik0y5wQs5/h4YuexNzCFJfdl9sKrH6a0LDeBxmJvpq71zxHFfi5ygdAse8bCuN/mZ4RtD1I0uTEj7s0IbSkOqZuN+5TSa7LWWnmTdGARBrhQFwTg2N+IcDWgKZi1OrTsJK7+ZmkQfZgDERPUMQkrMcRX1iJekVfCISRPBQGveGUHh0ghdz+PHJZXzb3wKlGIdWvSZPdwUruYytRX5bqdxYWMKQsUuJ8fRbDMwxZIVvQb/KQfhK26GBq1AwzwHPdV2DBRgKweRyw87jqUU3yWJfDseJA/wFN0/088wSASji+MarQJ1t286nwz/iVl9tYjUYQ== 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 (0) 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=YqwLYhYa8Efpk101wYClkeDtZh+b5ESZxn3vp7+y3+4=; b=n6Xerw6R/e7aiLoWvZmepk37FPKrM13jEDDeysGwV2HoiqcEcmaVxxyvxmePHq4tAkq3Hf41naRO2RXm+FCG2gpiprb/njC3ytTtK5rSsr5iyoqv127+GCetVSt1UErr65lFAxSzAjQ0aK2x5jTmLXQjnACzwIRdeU2jj4YgjY2C98g9As10LM/4oHjvtvS4aJ4DR/UdlRRlmcU0HdBfhtsD5I3+vtYXYkg/NT8MuM5vWnUoBYGZEo6SZOPQhzWr1tsSv1Ai/aT12gOmlYq4FI9VySZKOgoqPPvpUwOVX6Xyw2bOGqW1qzjLFAyFLsb9rZwfP/IIpMAlTgu0gteODA== Received: from CH0PR13CA0008.namprd13.prod.outlook.com (2603:10b6:610:b1::13) by SA0PR12MB7090.namprd12.prod.outlook.com (2603:10b6:806:2d5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:21:29 +0000 Received: from CY4PEPF0000EE3B.namprd03.prod.outlook.com (2603:10b6:610:b1:cafe::fc) by CH0PR13CA0008.outlook.office365.com (2603:10b6:610:b1::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.23 via Frontend Transport; Mon, 11 Dec 2023 10:21:29 +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 CY4PEPF0000EE3B.mail.protection.outlook.com (10.167.242.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:21:29 +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.41; Mon, 11 Dec 2023 02:21:13 -0800 Received: from nvidia.com (10.126.231.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.41; Mon, 11 Dec 2023 02:21:12 -0800 From: Xueming Li To: Alexander Kozyrev CC: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix MPRQ stride size check' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:12:00 +0800 Message-ID: <20231211101226.2122-96-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.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-TrafficTypeDiagnostic: CY4PEPF0000EE3B:EE_|SA0PR12MB7090:EE_ X-MS-Office365-Filtering-Correlation-Id: bee1028e-1df2-4b9a-1f5b-08dbfa32f092 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SXyzI+9rQaAJhsLLMPJDtlQ/qF5vhQBgJSC8WMBpq6ijE/3TffMbXo6W1fm9kZZ6x3FbGL+FwAmBHx//kQzP1oI0kHLMD5fasd+sg9UcgUXaAVKPNMHgaTqNEUCXxYaxa1lrifKl9PQJsmoQpzPQJoNyOzYQiDoXpDLLl4ed3/MZhfFykvJOMoAGuq7DT/+qqq0HqA6SAmNlIksAUPF8VG2zT2N7Y72vkW6LK3OE0Gk8Z7pQZ1hKNGzKH8cUgH6V8SVq6O+g7zaAp2JGALNB+ImtkFiVH+S6VuUtX6lv2pfwT2QEYeMzg8+EtLuFaVP2jRKzIsW9T84G9SiGmrZVe+vKPv/P8n7tD9CHCSTG7px7kqumpdSDpgwdpczXkK+N0IDWO9Elghlzr+ZBHx0MoWdkH+gh4gZjTpeyW5pjh4vxynT8CkCneFMBSXncXahZ+Y/p4DOduyWdr1+T+ixGnXrXDg86ofd6/jV3LXCeDiPB5NNsBoOH/jCbI67EErPyE2qt7NLjixluM4eDkvsnnhC/3L8ODtDhjnzOT0bvCW3FtDd8AZDMFfRJNu1EO3DnPsbNXL8eR5kk/So+d6FZJNDKJ8PNAWpENiXecIE9rqBqXQ8qv3YDAROBvlgqeJcSW8vm7Ps/oINC4CscT19ivLvaL2wtuJkiWwyFbsav61Bhbc9qdXhXHmYuudidVmHuMcpYUPg1oECBkT9bF1x7Uft/eDm/6cgcMAsoTAd1vcClIt5501AGWOs1jCeilx2HVlOTZVtfpZTWKRgpf2QxlmvYmmqLcf/2VO8b/DFSFevYL8fH6aTvuDxFdFsv0pRO7DoLy6MhGcqKQgus6yHewQ== 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:(13230031)(4636009)(39860400002)(396003)(136003)(376002)(346002)(230273577357003)(230173577357003)(230922051799003)(64100799003)(82310400011)(1800799012)(451199024)(186009)(40470700004)(36840700001)(46966006)(4001150100001)(6666004)(7696005)(2906002)(6636002)(54906003)(70206006)(37006003)(53546011)(7636003)(356005)(36756003)(86362001)(316002)(8936002)(4326008)(6862004)(8676002)(5660300002)(55016003)(40480700001)(70586007)(966005)(478600001)(40460700003)(41300700001)(36860700001)(82740400003)(47076005)(6286002)(26005)(336012)(426003)(1076003)(2616005)(83380400001)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:21:29.3067 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bee1028e-1df2-4b9a-1f5b-08dbfa32f092 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: CY4PEPF0000EE3B.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB7090 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/13/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=d3741774d0daa3702a711df16d16428e06e33354 Thanks. Xueming Li --- >From d3741774d0daa3702a711df16d16428e06e33354 Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Thu, 12 Oct 2023 19:34:33 +0300 Subject: [PATCH] net/mlx5: fix MPRQ stride size check Cc: Xueming Li [ upstream commit fdee0f1b30ae8dfc431465878aae5295372cca6f ] We should only check that MPRQ stride size is bigger than the mbuf size in case no devarg configuration has been provided. Headroom check was indtroduced recently and removed this condition inadvertently. Restore this condition and only check if mprq_log_stride_size is not set. Fixes: e6479f009fbd ("net/mlx5: fix MPRQ stride size for headroom") Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5.c | 2 +- drivers/net/mlx5/mlx5_rxq.c | 25 ++++++++++++++----------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 90dbb6e3b0..1a5f95b22b 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -2494,7 +2494,7 @@ mlx5_port_args_config(struct mlx5_priv *priv, struct mlx5_kvargs_ctrl *mkvlist, config->mprq.max_memcpy_len = MLX5_MPRQ_MEMCPY_DEFAULT_LEN; config->mprq.min_rxqs_num = MLX5_MPRQ_MIN_RXQS; config->mprq.log_stride_num = MLX5_MPRQ_DEFAULT_LOG_STRIDE_NUM; - config->mprq.log_stride_size = MLX5_MPRQ_DEFAULT_LOG_STRIDE_SIZE; + config->mprq.log_stride_size = MLX5_ARG_UNSET; config->log_hp_size = MLX5_ARG_UNSET; config->std_delay_drop = 0; config->hp_delay_drop = 0; diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index 834707ea87..9179b9d9d7 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -1602,18 +1602,19 @@ mlx5_mprq_prepare(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, *actual_log_stride_num = config->mprq.log_stride_num; } /* Checks if chosen size of stride is in supported range. */ - if (config->mprq.log_stride_size > log_max_stride_size || - config->mprq.log_stride_size < log_min_stride_size) { - *actual_log_stride_size = log_def_stride_size; - DRV_LOG(WARNING, - "Port %u Rx queue %u size of a stride for Multi-Packet RQ is out of range, setting default value (%u)", - dev->data->port_id, idx, - RTE_BIT32(log_def_stride_size)); + if (config->mprq.log_stride_size != (uint32_t)MLX5_ARG_UNSET) { + if (config->mprq.log_stride_size > log_max_stride_size || + config->mprq.log_stride_size < log_min_stride_size) { + *actual_log_stride_size = log_def_stride_size; + DRV_LOG(WARNING, + "Port %u Rx queue %u size of a stride for Multi-Packet RQ is out of range, setting default value (%u)", + dev->data->port_id, idx, + RTE_BIT32(log_def_stride_size)); + } else { + *actual_log_stride_size = config->mprq.log_stride_size; + } } else { - *actual_log_stride_size = config->mprq.log_stride_size; - } - /* Make the stride fit the mbuf size by default. */ - if (*actual_log_stride_size == MLX5_MPRQ_DEFAULT_LOG_STRIDE_SIZE) { + /* Make the stride fit the mbuf size by default. */ if (min_mbuf_size <= RTE_BIT32(log_max_stride_size)) { DRV_LOG(WARNING, "Port %u Rx queue %u size of a stride for Multi-Packet RQ is adjusted to match the mbuf size (%u)", @@ -1672,6 +1673,8 @@ unsupport: " min_stride_sz = %u, max_stride_sz = %u).\n" "Rx segment is %senabled. External mempool is %sused.", dev->data->port_id, min_mbuf_size, desc, priv->rxqs_n, + config->mprq.log_stride_size == (uint32_t)MLX5_ARG_UNSET ? + RTE_BIT32(MLX5_MPRQ_DEFAULT_LOG_STRIDE_SIZE) : RTE_BIT32(config->mprq.log_stride_size), RTE_BIT32(config->mprq.log_stride_num), config->mprq.min_rxqs_num, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:26.192184600 +0800 +++ 0095-net-mlx5-fix-MPRQ-stride-size-check.patch 2023-12-11 17:56:23.207652300 +0800 @@ -1 +1 @@ -From fdee0f1b30ae8dfc431465878aae5295372cca6f Mon Sep 17 00:00:00 2001 +From d3741774d0daa3702a711df16d16428e06e33354 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit fdee0f1b30ae8dfc431465878aae5295372cca6f ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index d6cb0d1c8a..3a182de248 100644 +index 90dbb6e3b0..1a5f95b22b 100644 @@ -25 +27 @@ -@@ -2709,7 +2709,7 @@ mlx5_port_args_config(struct mlx5_priv *priv, struct mlx5_kvargs_ctrl *mkvlist, +@@ -2494,7 +2494,7 @@ mlx5_port_args_config(struct mlx5_priv *priv, struct mlx5_kvargs_ctrl *mkvlist, @@ -35 +37 @@ -index 2c51af11c7..1bb036afeb 100644 +index 834707ea87..9179b9d9d7 100644 @@ -38 +40 @@ -@@ -1605,18 +1605,19 @@ mlx5_mprq_prepare(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, +@@ -1602,18 +1602,19 @@ mlx5_mprq_prepare(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, @@ -69 +71 @@ -@@ -1675,6 +1676,8 @@ unsupport: +@@ -1672,6 +1673,8 @@ unsupport: