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 0E21CA0545 for ; Thu, 11 Aug 2022 02:36:19 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D1E6C40694; Thu, 11 Aug 2022 02:36:18 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2076.outbound.protection.outlook.com [40.107.212.76]) by mails.dpdk.org (Postfix) with ESMTP id DD8E54068E for ; Thu, 11 Aug 2022 02:36:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zk2/k1kA9pzyLzTY/TqBrvhl76E8wN/1+LtTWzWsxiEnYPJ1r2KtHpmdTbgmU7kXxt7cY/KWtqc6BVNFg80npng1sYEpj+MB/wSvtibM3RQxkZsS9O91YFHGsJYqLhihYYItao4M09ohWKj+P1GSaKv5idBDht2iMiT5syJrM2G5CzY9YYJAfKLnPs3JGsrCU8eMkZGTvxDFNMGQ2k0VD8JYV0hJo+fIAd77v2Swb4dCyiKmXtcZMLFhl2uMCc1JQy+PkOZ2gUgub6a3u31dHgvIN+z86fFuSYiWt8vjoWuAPXwwar2jBmmJbhKhzLSh3lme88pHmb0TWugU9jszPA== 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=r0mwRfMs9KP1mVGBoFO+e7NTawGI9icbqI5Vo6CGDOo=; b=X6VQYKBujgNHBlBRwjffwWij/soYF/Vom0gpUqLPrLkfrcvzIhMRxoFkdiGiPHkXePEGEgJlreY9qxZ6oGfsCOcj4f2zLdPraBSs6pV+fXQj6qYLejcOt3dsRbL+htRnTiLDJDTJy0f15wM16gzSk/Kjjp55BOGvw7wH4XEQis8fYi8cbyy+fPHIvtX+vrLMTdcuS1xy62ozFmA5wNShjtRZzz+w+f5Nq+oU2GFZ5Xe2QPS989rtOEKT2yssm8mfHTLPawnI1qRcjTQPPE9B8YP3lLyBF2e4UQnEgKzZYXdsQlZilnj4S3aW0+dt4EzykUqlIo7Y4wNGKmAyEVOUqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.235) smtp.rcpttodomain=redhat.com 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=r0mwRfMs9KP1mVGBoFO+e7NTawGI9icbqI5Vo6CGDOo=; b=RcuqLjBvm8xroMqYdKEHmSD91RAIFjAbC7+vIpK2/oxRhddJETQkuEPeXjmPBwFTZfzT0iAr6Xs8ypzBdHY0f6t4gr2J9PB/9PZqRx3YY0nhIq96Oy7xa94s3jd7t0zAHcBvJc2GvM+nBKU6DqXPejwAoEU2C4JE7u28pqQ7Qif+38gD7jqTo8+UuRS8cjtIN6pKuM+7XCVkJhswKWD971prhTv5Y1FlMEHQu+93cFHjveyOtulMMI1zYECV3Ge0PHg8FsbtFN6Cvm9jk+wlsU9v0atxP+NO9Hfna6VpLRzP0uOiu3JECXgvSGg1YxCmOp8UAVsIXz5T+YgSJM3XnQ== Received: from BN0PR03CA0004.namprd03.prod.outlook.com (2603:10b6:408:e6::9) by DM6PR12MB4895.namprd12.prod.outlook.com (2603:10b6:5:1bc::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.10; Thu, 11 Aug 2022 00:36:15 +0000 Received: from BN8NAM11FT005.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e6:cafe::1b) by BN0PR03CA0004.outlook.office365.com (2603:10b6:408:e6::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.15 via Frontend Transport; Thu, 11 Aug 2022 00:36:15 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.235) 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.235 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.235; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.235) by BN8NAM11FT005.mail.protection.outlook.com (10.13.176.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5525.11 via Frontend Transport; Thu, 11 Aug 2022 00:36:15 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Thu, 11 Aug 2022 00:36:14 +0000 Received: from pegasus01.mtr.labs.mlnx (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.26; Wed, 10 Aug 2022 17:36:12 -0700 From: Alexander Kozyrev To: CC: , , , , Subject: [PATCH 20.11] net/mlx5: handle MPRQ incompatibility with external buffers Date: Thu, 11 Aug 2022 03:35:56 +0300 Message-ID: <20220811003556.1081794-1-akozyrev@nvidia.com> X-Mailer: git-send-email 2.18.2 MIME-Version: 1.0 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-Office365-Filtering-Correlation-Id: ea670ebb-7964-405d-3653-08da7b317fef X-MS-TrafficTypeDiagnostic: DM6PR12MB4895:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2YSMNjnuJPDn9/5pHW0BIr++2tYHWtxAuO/qWyVyeQlmUvxORpOXB1h33hu/PUlvwogOPQ6km0WwrCVBHZO6SSDUsPkcYvPqjAUHq8XAZQ9IdIhp04xzeJhfCBGNHf7HZdsRo2CIUD8GmvHt9X4vdoEWjxBd3TlT0S14atnYJwG+dJJO0BArxpFDTOh49232dxp44Iu1HoeoBb8YQYiR/XLF39JPIlgxLkiy0Ep59YXQHe930AXVH6gXImf8ENp3d+9B0HcMD022npUpzd49Lyq+NCDMGHdCn9do28mQJV9TQGneVcbJ5PXRRtESss4i9FVNNZuG8GfQOn3Yq5TEzc8gg6hZA94tcLqaFFOLL+slPneHlwOmsoOf6/gBziTDEEjbJ4rm/39uWw9YH4sqxUJB5uSAL80H+ol35h7ePM3Zg+aElQnkmmcy5yBmfUDi1moCcAr9/JKoxxNMbZotxRFsBlzO2YOsRT08VlRCcb1AZypy8I4GC+W3XiFffuLmbc1NIqipIE4UvpQt49kXThnPR7ezloaw0Qx/5IwRwFYcFtDoiS35u7fR0fv+/VdhyJ6vbslTzCIpgRyVJ7dHdLqD76ZRDVobvAx8JklNx2zmb8YVwOy5TDe3eHpeiifT+Kqavrd7lJxVLtY5Ghrv5v+3wr/lHpYQi0nhzkIQkUuOnlbBtBOtIlBpV075nClYh/4WAFJUe0b5uwLztwQeJ+ATeD9YDfE0CUbCfydvbsgfG9L7MHrr173ORCucZ5S+hWWp33tVChVdZ455npGt0w9P4qdU26EXDNul98CwPpdVjO7w9zySmDDVk9L24Y10avp5Q77g2pdkqE4WTjjHZw== X-Forefront-Antispam-Report: CIP:12.22.5.235; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(136003)(396003)(39860400002)(376002)(346002)(36840700001)(40470700004)(46966006)(83380400001)(26005)(40460700003)(47076005)(16526019)(426003)(81166007)(356005)(186003)(86362001)(2616005)(36860700001)(336012)(40480700001)(82740400003)(70586007)(82310400005)(8676002)(8936002)(1076003)(70206006)(36756003)(4326008)(2906002)(6666004)(6916009)(316002)(54906003)(478600001)(5660300002)(41300700001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2022 00:36:15.4625 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ea670ebb-7964-405d-3653-08da7b317fef 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.235]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT005.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4895 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 [ upstream commit 3a29cb3a730ba0def6b088c969da379a9ffea988 ] Multi-Packet Rx queue uses PMD-managed buffers to store packets. These buffers are externally attached to user mbufs. This conflicts with the feature that allows using user-managed externally attached buffers in an application. Fall back to SPRQ in case external buffers mempool is configured. The limitation is already documented in mlx5 guide. Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rxq.c | 23 ++++++++++++++++------- drivers/net/mlx5/mlx5_rxtx.h | 2 +- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index 4a263a5803..80d9d2fe12 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -754,6 +754,7 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, (struct rte_eth_rxseg_split *)conf->rx_seg; struct rte_eth_rxseg_split rx_single = {.mp = mp}; uint16_t n_seg = conf->rx_nseg; + bool is_extmem = false; int res; if (mp) { @@ -764,6 +765,8 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, */ rx_seg = &rx_single; n_seg = 1; + is_extmem = rte_pktmbuf_priv_flags(mp) & + RTE_PKTMBUF_POOL_F_PINNED_EXT_BUF; } if (n_seg > 1) { uint64_t offloads = conf->offloads | @@ -783,7 +786,8 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, res = mlx5_rx_queue_pre_setup(dev, idx, &desc); if (res) return res; - rxq_ctrl = mlx5_rxq_new(dev, idx, desc, socket, conf, rx_seg, n_seg); + rxq_ctrl = mlx5_rxq_new(dev, idx, desc, socket, + conf, rx_seg, n_seg, is_extmem); if (!rxq_ctrl) { DRV_LOG(ERR, "port %u unable to allocate queue index %u", dev->data->port_id, idx); @@ -1397,6 +1401,8 @@ mlx5_max_lro_msg_size_adjust(struct rte_eth_dev *dev, uint16_t idx, * Log number of strides to configure for this queue. * @param actual_log_stride_size * Log stride size to configure for this queue. + * @param is_extmem + * Is external pinned memory pool used. * * @return * 0 if Multi-Packet RQ is supported, otherwise -1. @@ -1405,7 +1411,8 @@ static int mlx5_mprq_prepare(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, bool rx_seg_en, uint32_t min_mbuf_size, uint32_t *actual_log_stride_num, - uint32_t *actual_log_stride_size) + uint32_t *actual_log_stride_size, + bool is_extmem) { struct mlx5_priv *priv = dev->data->dev_private; struct mlx5_dev_config *config = &priv->config; @@ -1423,7 +1430,7 @@ mlx5_mprq_prepare(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, log_max_stride_size); uint32_t log_stride_wqe_size; - if (mlx5_check_mprq_support(dev) != 1 || rx_seg_en) + if (mlx5_check_mprq_support(dev) != 1 || rx_seg_en || is_extmem) goto unsupport; /* Checks if chosen number of strides is in supported range. */ if (config->mprq.log_stride_num > log_max_stride_num || @@ -1489,7 +1496,7 @@ mlx5_mprq_prepare(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, " rxq_num = %u, stride_sz = %u, stride_num = %u\n" " supported: min_rxqs_num = %u, min_buf_wqe_sz = %u" " min_stride_sz = %u, max_stride_sz = %u).\n" - "Rx segment is %senable.", + "Rx segment is %senabled. External mempool is %sused.", dev->data->port_id, min_mbuf_size, desc, priv->rxqs_n, RTE_BIT32(config->mprq.log_stride_size), RTE_BIT32(config->mprq.log_stride_num), @@ -1497,7 +1504,7 @@ mlx5_mprq_prepare(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, RTE_BIT32(config->mprq.log_min_stride_wqe_size), RTE_BIT32(config->mprq.log_min_stride_size), RTE_BIT32(config->mprq.log_max_stride_size), - rx_seg_en ? "" : "not "); + rx_seg_en ? "" : "not ", is_extmem ? "" : "not "); return -1; } @@ -1519,7 +1526,8 @@ mlx5_mprq_prepare(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, struct mlx5_rxq_ctrl * mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, unsigned int socket, const struct rte_eth_rxconf *conf, - const struct rte_eth_rxseg_split *rx_seg, uint16_t n_seg) + const struct rte_eth_rxseg_split *rx_seg, uint16_t n_seg, + bool is_extmem) { struct mlx5_priv *priv = dev->data->dev_private; struct mlx5_rxq_ctrl *tmpl; @@ -1541,7 +1549,8 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, const int mprq_en = !mlx5_mprq_prepare(dev, idx, desc, rx_seg_en, non_scatter_min_mbuf_size, &mprq_log_actual_stride_num, - &mprq_log_actual_stride_size); + &mprq_log_actual_stride_size, + is_extmem); /* * Always allocate extra slots, even if eventually * the vector Rx will not be used. diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h index 237a7faa5c..9e00031ed6 100644 --- a/drivers/net/mlx5/mlx5_rxtx.h +++ b/drivers/net/mlx5/mlx5_rxtx.h @@ -336,7 +336,7 @@ struct mlx5_rxq_ctrl *mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, unsigned int socket, const struct rte_eth_rxconf *conf, const struct rte_eth_rxseg_split *rx_seg, - uint16_t n_seg); + uint16_t n_seg, bool is_extmem); struct mlx5_rxq_ctrl *mlx5_rxq_hairpin_new (struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, const struct rte_eth_hairpin_conf *hairpin_conf); -- 2.18.2