From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 93E0BA0C4D;
Thu, 7 Oct 2021 00:05:44 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 9330C411FF;
Thu, 7 Oct 2021 00:04:37 +0200 (CEST)
Received: from NAM11-DM6-obe.outbound.protection.outlook.com
(mail-dm6nam11on2041.outbound.protection.outlook.com [40.107.223.41])
by mails.dpdk.org (Postfix) with ESMTP id 1A1DF411EB
for <dev@dpdk.org>; Thu, 7 Oct 2021 00:04:35 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=Hjzjo/ApTumOxnQ1sihogNsU0Jj2v2YX5g2mGfxdFDUV2A6ZfOJG7YXrYlc3XYRjWSE8kvZHSifMwup+pITHzb7F0+7Hsvo7DbFa45D4+a1LPfSFG15IG4EWWN94cxI87SKSJ1IMzCQIXCwVTV6AJ4va/FZgcKFOq8J9KuRD8mEcquHO6hgPvSx+Jr3igYripR4IuVLmWmue2akZz/iAud50ocl8oi/X0sO9ZaZEWAcxwc5vAjOYdZxXuHd9ZQ19N7m1G4LdBOYbu044k0RPJgPEsjIlFKx7GiUMNZxzAJI5tAII73QwZO137KsKao/kU1rw66H1vBGIOFYyoT1OaA==
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=K4IJp+kPbKYwjs/FADLnb8IrBkxNwYrBarapXujIFd0=;
b=cj4SUDWOxOMUrsQ19moYe0vO7A9T/A1jV3UdEiMDCl9LL5iuNND1ze1IHKYaPFD2Z04ORC/i24TWAMntfxEao55l6KfQWtCK7pU50UsRSbL9Lpj+tXA5fRFlKIp70S2QcdZ2U01/kHon+1iM4o3NVBCSpdUH17I1FM4Aog/XflJ5UD/NgmC41F7Eilzi7sSo0g9rR6JFNdZ9pbDjgMz/eRINcDhXczEAbKybjtSsgROw2FMsUIoEPqdUGXGYss6k1o/o8omfXEECKYjSpmQHqtetzgPoUsy6FmQTGKFZToi7gLeTiVK3UAUzCvK3pPLG4HZlfrCdTkxiLasPOFxlaQ==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is
216.228.112.34) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com;
dmarc=pass (p=quarantine 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=K4IJp+kPbKYwjs/FADLnb8IrBkxNwYrBarapXujIFd0=;
b=iTTy/euXFJP/lWzasAjZ+alCx0pyNE7BVDDPtDD4d5FKqjVkMvMFXIhyKRA880m6qRSP9EifgURITUPd/D60eL0+qVg7LK7WHa5rrpNs9tDCbptfmylC/xJGxo5ba+gVWl0ssfu7ewS9/HXd+emgkBbQY3FJMKrMSe3SeEgGjuMzXe1gymwad8qgnUciN5yOAGtqa4Xh3HjkRo/pe8atyVC8LH2+yUx+qqSxfbnHtzPD3f5bx/1sALSPrIbJc4CofngasES1JDBZ932HiqIN9mzR8AZwh8NAYljP+JcI2iMh9rgZEtCXJrbus1RjI2bbUWr5aLG2aW7/Y1ubiflaUw==
Received: from CO2PR04CA0183.namprd04.prod.outlook.com (2603:10b6:104:5::13)
by DM6PR12MB4266.namprd12.prod.outlook.com (2603:10b6:5:21a::22) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15; Wed, 6 Oct
2021 22:04:33 +0000
Received: from CO1NAM11FT015.eop-nam11.prod.protection.outlook.com
(2603:10b6:104:5:cafe::ac) by CO2PR04CA0183.outlook.office365.com
(2603:10b6:104:5::13) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.20 via Frontend
Transport; Wed, 6 Oct 2021 22:04:33 +0000
X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34)
smtp.mailfrom=nvidia.com; monjalon.net; dkim=none (message not signed)
header.d=none;monjalon.net; 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
CO1NAM11FT015.mail.protection.outlook.com (10.13.175.130) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id
15.20.4587.18 via Frontend Transport; Wed, 6 Oct 2021 22:04:32 +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.18; Wed, 6 Oct
2021 22:04:30 +0000
From: <michaelba@nvidia.com>
To: <dev@dpdk.org>
CC: Matan Azrad <matan@nvidia.com>, Thomas Monjalon <thomas@monjalon.net>,
Michael Baum <michaelba@oss.nvidia.com>
Date: Thu, 7 Oct 2021 01:03:44 +0300
Message-ID: <20211006220350.2357487-13-michaelba@nvidia.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20211006220350.2357487-1-michaelba@nvidia.com>
References: <20210930172822.1949969-1-michaelba@nvidia.com>
<20211006220350.2357487-1-michaelba@nvidia.com>
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: 98129b9d-12d4-49e3-9e0a-08d989154719
X-MS-TrafficTypeDiagnostic: DM6PR12MB4266:
X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr
X-Microsoft-Antispam-PRVS: <DM6PR12MB4266B55B654FD87FEF382349CCB09@DM6PR12MB4266.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:238;
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: VdRgtV9X3DlBn6ybXFMMzoPwGCUADpgLQsXyhBrchKbUUksnXf+K1RI2cOpNpJsxiu9ak5GpRSsEoOgie1IqkClgmPYAxcbkRU+kgghyhtIODYVV6dRbLRwhmscEj0G8YvRWMlS+KwZeL/eqtP8U/PBj8cqlAo+0LhNcc7m3WGv+4iwsmGTFRpvbuzoSKHndJ4uLyzog04pW3+IkaXbgBhiBrSuua3zt0M4N+yPVLcNMwCgp2HezPk7/MjoPk6q3wTmzpFwTDZiT/cn3Afy/FwfZbrO2smXSvff+O/F3X0bFX140AsslUJt/AP5V8CdQNEh4ik32eOtjJQIU/6GHdmfkUQzaXkLK69kEP3JVuYzNe0lXsAYffRWQvyv2ZdsZrnO/1KN8yUNszAou4k1YsvVTVURECqJh4ddMNq47aCr9uKhsidaMzvm12QKEDhz59INOl/Icn9wNc0CDcLGyUsDQG334waM6lSl6a2FvyF53ZzgvNG8mFezI59OuMlFJhfgmJSRZiiekh970i+jOvLE1o94LUSqiNvqPsl0O0Z2n+RLeh1Uyqt0QtuvWxW94Ch/ItfpjuNJYuLrTjXb8JguNxJ6AutveEuAsPscOUXWkFA/YktrSrfq6fnvv5fp9jf3GhhZ8iYAnZnjjo4TnbNBdvMRthrEu++fql+90v71mhVpDYUuun55CQU0o7F2HIlQnfy0KBFKvcn/JN5lylA==
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)(46966006)(36840700001)(107886003)(6286002)(83380400001)(47076005)(54906003)(508600001)(55016002)(7636003)(82310400003)(316002)(5660300002)(356005)(7696005)(36756003)(2906002)(8676002)(70586007)(186003)(36860700001)(16526019)(6666004)(2876002)(6916009)(8936002)(26005)(336012)(2616005)(86362001)(4326008)(70206006)(426003)(1076003);
DIR:OUT; SFP:1101;
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2021 22:04:32.8706 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 98129b9d-12d4-49e3-9e0a-08d989154719
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: CO1NAM11FT015.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4266
Subject: [dpdk-dev] [PATCH v2 12/18] net/mlx5: remove redundancy in MR file
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
From: Michael Baum <michaelba@oss.nvidia.com>
This patch remove two redundant things from MR file:
1. mr_find_contig_memsegs_data structure which is moved to common file
before.
2. External memory mechanism - mlx5_tx_update_ext_mp function.
Since commit [1] which added support for DMA map and unmap, external
mem must be configured by the user using rte_mem_map function and no
need to handle this in pmd.
[1]
commit 989e999d9305
("net/mlx5: support PCI device DMA map and unmap")
Signed-off-by: Michael Baum <michaelba@oss.nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
---
drivers/net/mlx5/mlx5_mr.c | 142 +------------------------------------
drivers/net/mlx5/mlx5_tx.h | 2 -
2 files changed, 1 insertion(+), 143 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c
index 4d884f7295..9ce973d95c 100644
--- a/drivers/net/mlx5/mlx5_mr.c
+++ b/drivers/net/mlx5/mlx5_mr.c
@@ -17,19 +17,6 @@
#include "mlx5_rx.h"
#include "mlx5_tx.h"
-struct mr_find_contig_memsegs_data {
- uintptr_t addr;
- uintptr_t start;
- uintptr_t end;
- const struct rte_memseg_list *msl;
-};
-
-struct mr_update_mp_data {
- struct rte_eth_dev *dev;
- struct mlx5_mr_ctrl *mr_ctrl;
- int ret;
-};
-
/**
* Callback for memory event. This can be called from both primary and secondary
* process.
@@ -134,70 +121,7 @@ mlx5_tx_mb2mr_bh(struct mlx5_txq_data *txq, struct rte_mbuf *mb)
}
/* Fallback for generic mechanism in corner cases. */
}
- lkey = mlx5_tx_addr2mr_bh(txq, addr);
- if (lkey == UINT32_MAX && rte_errno == ENXIO) {
- /* Mempool may have externally allocated memory. */
- return mlx5_tx_update_ext_mp(txq, addr, mlx5_mb2mp(mb));
- }
- return lkey;
-}
-
-/**
- * Called during rte_mempool_mem_iter() by mlx5_mr_update_ext_mp().
- *
- * Externally allocated chunk is registered and a MR is created for the chunk.
- * The MR object is added to the global list. If memseg list of a MR object
- * (mr->msl) is null, the MR object can be regarded as externally allocated
- * memory.
- *
- * Once external memory is registered, it should be static. If the memory is
- * freed and the virtual address range has different physical memory mapped
- * again, it may cause crash on device due to the wrong translation entry. PMD
- * can't track the free event of the external memory for now.
- */
-static void
-mlx5_mr_update_ext_mp_cb(struct rte_mempool *mp, void *opaque,
- struct rte_mempool_memhdr *memhdr,
- unsigned mem_idx __rte_unused)
-{
- struct mr_update_mp_data *data = opaque;
- struct rte_eth_dev *dev = data->dev;
- struct mlx5_priv *priv = dev->data->dev_private;
- struct mlx5_dev_ctx_shared *sh = priv->sh;
- struct mlx5_mr_ctrl *mr_ctrl = data->mr_ctrl;
- struct mlx5_mr *mr = NULL;
- uintptr_t addr = (uintptr_t)memhdr->addr;
- size_t len = memhdr->len;
- struct mr_cache_entry entry;
- uint32_t lkey;
-
- MLX5_ASSERT(rte_eal_process_type() == RTE_PROC_PRIMARY);
- /* If already registered, it should return. */
- rte_rwlock_read_lock(&sh->share_cache.rwlock);
- lkey = mlx5_mr_lookup_cache(&sh->share_cache, &entry, addr);
- rte_rwlock_read_unlock(&sh->share_cache.rwlock);
- if (lkey != UINT32_MAX)
- return;
- DRV_LOG(DEBUG, "port %u register MR for chunk #%d of mempool (%s)",
- dev->data->port_id, mem_idx, mp->name);
- mr = mlx5_create_mr_ext(sh->cdev->pd, addr, len, mp->socket_id,
- sh->share_cache.reg_mr_cb);
- if (!mr) {
- DRV_LOG(WARNING,
- "port %u unable to allocate a new MR of"
- " mempool (%s).",
- dev->data->port_id, mp->name);
- data->ret = -1;
- return;
- }
- rte_rwlock_write_lock(&sh->share_cache.rwlock);
- LIST_INSERT_HEAD(&sh->share_cache.mr_list, mr, mr);
- /* Insert to the global cache table. */
- mlx5_mr_insert_cache(&sh->share_cache, mr);
- rte_rwlock_write_unlock(&sh->share_cache.rwlock);
- /* Insert to the local cache table */
- mlx5_mr_addr2mr_bh(sh->cdev->pd, &priv->mp_id, &sh->share_cache,
- mr_ctrl, addr, sh->cdev->config.mr_ext_memseg_en);
+ return mlx5_tx_addr2mr_bh(txq, addr);
}
/**
@@ -331,67 +255,3 @@ mlx5_net_dma_unmap(struct rte_device *rte_dev, void *addr,
rte_rwlock_write_unlock(&sh->share_cache.rwlock);
return 0;
}
-
-/**
- * Register MR for entire memory chunks in a Mempool having externally allocated
- * memory and fill in local cache.
- *
- * @param dev
- * Pointer to Ethernet device.
- * @param mr_ctrl
- * Pointer to per-queue MR control structure.
- * @param mp
- * Pointer to registering Mempool.
- *
- * @return
- * 0 on success, -1 on failure.
- */
-static uint32_t
-mlx5_mr_update_ext_mp(struct rte_eth_dev *dev, struct mlx5_mr_ctrl *mr_ctrl,
- struct rte_mempool *mp)
-{
- struct mr_update_mp_data data = {
- .dev = dev,
- .mr_ctrl = mr_ctrl,
- .ret = 0,
- };
-
- rte_mempool_mem_iter(mp, mlx5_mr_update_ext_mp_cb, &data);
- return data.ret;
-}
-
-/**
- * Register MR entire memory chunks in a Mempool having externally allocated
- * memory and search LKey of the address to return.
- *
- * @param dev
- * Pointer to Ethernet device.
- * @param addr
- * Search key.
- * @param mp
- * Pointer to registering Mempool where addr belongs.
- *
- * @return
- * LKey for address on success, UINT32_MAX on failure.
- */
-uint32_t
-mlx5_tx_update_ext_mp(struct mlx5_txq_data *txq, uintptr_t addr,
- struct rte_mempool *mp)
-{
- struct mlx5_txq_ctrl *txq_ctrl =
- container_of(txq, struct mlx5_txq_ctrl, txq);
- struct mlx5_mr_ctrl *mr_ctrl = &txq->mr_ctrl;
- struct mlx5_priv *priv = txq_ctrl->priv;
-
- if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
- DRV_LOG(WARNING,
- "port %u using address (%p) from unregistered mempool"
- " having externally allocated memory"
- " in secondary process, please create mempool"
- " prior to rte_eth_dev_start()",
- PORT_ID(priv), (void *)addr);
- return UINT32_MAX;
- }
- mlx5_mr_update_ext_mp(ETH_DEV(priv), mr_ctrl, mp);
- return mlx5_tx_addr2mr_bh(txq, addr);
-}
diff --git a/drivers/net/mlx5/mlx5_tx.h b/drivers/net/mlx5/mlx5_tx.h
index 77d6069755..a6aa34084c 100644
--- a/drivers/net/mlx5/mlx5_tx.h
+++ b/drivers/net/mlx5/mlx5_tx.h
@@ -239,8 +239,6 @@ int mlx5_tx_burst_mode_get(struct rte_eth_dev *dev, uint16_t tx_queue_id,
/* mlx5_mr.c */
uint32_t mlx5_tx_mb2mr_bh(struct mlx5_txq_data *txq, struct rte_mbuf *mb);
-uint32_t mlx5_tx_update_ext_mp(struct mlx5_txq_data *txq, uintptr_t addr,
- struct rte_mempool *mp);
/* mlx5_tx_empw.c */
--
2.25.1