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 CF3C4A0548;
Thu, 27 May 2021 15:39:56 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id EE4C141135;
Thu, 27 May 2021 15:39:09 +0200 (CEST)
Received: from NAM12-MW2-obe.outbound.protection.outlook.com
(mail-mw2nam12on2069.outbound.protection.outlook.com [40.107.244.69])
by mails.dpdk.org (Postfix) with ESMTP id CDB2041121
for <dev@dpdk.org>; Thu, 27 May 2021 15:39:07 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=ErwQPjsg7AGXlXAURhJB/3k4M1zWoTPDVVooMTe9kS9unSnwYSxm4wgWhk4JDRazo3CuCWCnmf4RMYp9k42SR0sz5UfycnT3LgZZT8rlQ4F2gwWzPhMyfhjwZVAQoLuVN26ZMk20UE059ddL+KX6suBDRiBxLLqJMVCLnWi/f4b8Dt+0DQdiFPLfjJ9YDR52Z98wlv4RH/1xRGuklkSKJyBZx00qFq6LExpOQ+L7+99m5tPNnVPZLm+xOlk6fb2L3w7oM/S39cN4j+eSkFGrigM3UxAYLGiFc2oXEA8gig+2Ml/0FdxE8QUt486z8KJjdmCi/yvt1M72av4kj5oXtQ==
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=cU0R+8zcVx82stiyIirQFBA9ZrQyzP9bFbh81l/h+0E=;
b=H5AhaZwnFv0nzYcsQTuJTxd/OYU0P/Vy1S2liPCliRIFScefbUANQzAzO9tBurLZOUyK/bhEogPZtp+h2PeINKGnagW9KWocXfMZ7BDwr0vQTmVQV3DdgHbw+FQduHGP1KS9CMd/7ZnvmFbLwXJS6NLauB9Is8xB+uTdnFjsni6OuUziCriN0PZ84YwD899Sv/c2z4RENS/QuaY3EKAnM6hlodtKVNrPzqDAICH6AGz4kHuACK4yyrqB1jro/hayEi+c9shUmOsao0VYLWjFlv65o+r/B7wTBnQaMZ3qVImBws+h1F0R69vS1K+59mOegkNY1rSbDTHu/EXyQhOR+g==
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=cU0R+8zcVx82stiyIirQFBA9ZrQyzP9bFbh81l/h+0E=;
b=tCpKYBO9Xw3MIA3MCAh/9r8TU4RifdemCObr0XZ/PWeFWa5lFP2Hq86yRrCCBOanQGMo4IR025cjQo2OSFc1XMzrI3llSwkPUcZvDqVDtvHqwEXV3UybcET0bkSIAgjdrwXpThEx8bZm/wjaDDElTMuvYK3oaFKINImKfksYQvYKlK8nyteATCbV35acvr5er1PeNYrtdX9BXsKJOiJM4OYqoKg+0vCAWsfRI5YV9EJrbG7C/joIlR9sNZgYollM0T6YKzBYLLs55nGhjpGixIcwAZlI+M3WMdDJ+qCBOayNTEf/ptQszACt+v32dl34b590d6cHZCKA0gFPLg5lSA==
Received: from MW4P220CA0019.NAMP220.PROD.OUTLOOK.COM (2603:10b6:303:115::24)
by DM6PR12MB4369.namprd12.prod.outlook.com (2603:10b6:5:2a1::9) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.21; Thu, 27 May
2021 13:39:06 +0000
Received: from CO1NAM11FT005.eop-nam11.prod.protection.outlook.com
(2603:10b6:303:115:cafe::7d) by MW4P220CA0019.outlook.office365.com
(2603:10b6:303:115::24) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20 via Frontend
Transport; Thu, 27 May 2021 13:39: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
CO1NAM11FT005.mail.protection.outlook.com (10.13.174.147) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id
15.20.4129.25 via Frontend Transport; Thu, 27 May 2021 13:39:05 +0000
Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com
(172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 27 May
2021 13:39:03 +0000
From: Xueming Li <xuemingl@nvidia.com>
To: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
CC: Thomas Monjalon <thomas@monjalon.net>, <dev@dpdk.org>,
<xuemingl@nvidia.com>, Matan Azrad <matan@nvidia.com>
Date: Thu, 27 May 2021 16:37:53 +0300
Message-ID: <20210527133759.17401-9-xuemingl@nvidia.com>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20210527133759.17401-1-xuemingl@nvidia.com>
References: <20210527133759.17401-1-xuemingl@nvidia.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Originating-IP: [172.20.145.6]
X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To
HQMAIL107.nvidia.com (172.20.187.13)
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 817e624a-3c0b-4c18-c912-08d92114cc56
X-MS-TrafficTypeDiagnostic: DM6PR12MB4369:
X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr
X-Microsoft-Antispam-PRVS: <DM6PR12MB43699AD713D180546F91B8EFA1239@DM6PR12MB4369.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:1850;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: Gvjp0+jK3VGpMXIxVPNx0ms/pmNJIYVkRvhuTUn3kMMhxiTqX1nA808FaBa9Lx+g4zO6yOF+t5FMTQbVIXzsxypUNq8Jx6VvmLM8cdkWwTHEB+TNzWBNekxBVFD3u+n0zlwcd3C5wMbg8VlfNjlp+iVhjfY1RVJlT+KpxQ9El0W4NXg1xfRrGTu4+n9x6NeMGTvahqnt7mPASQ73PptVnmfn7HrAjvn4wx3yuMefdICGlrtW56Vx5SPHvn3wvk5hoCPtbj/vw1EsOhGQwyO3H5rF00J0KxSKY96aCk9MA9AoZGRQulmYX7VOvZkTm/xiYPW13UjFA+vB1ovA6zyjXXR9L4sPo6pVupWZ6Zj0oWoPRprcZbuOanB5Fz58eN4+Ah0K/k7ESNdcQiUPdwSQpB0FahmTZp8QdLbdZvlntSk4k71+RTtNwLhL/TgxK3K7530tj1Mm3h8M4oDrfKHxdDedamgG3RncRaZ9CNcZ+X4+zVA44gC9yT4JZrSVzTmO2RwK9ioFJVVnv9EHUCW1Ks3j4speNAq6f2zspSIACbkbNy8BLZNI2OMPdUYBYFYVBmlsGl13f5BPWbufncupmXPrb3oAZYZNozaijVFHkkCi/aG96vlgu8ZNOEAv1YEPmfrcojzlMsskxtod7GwaBg==
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)(396003)(376002)(39860400002)(346002)(136003)(36840700001)(46966006)(83380400001)(2616005)(6636002)(1076003)(2906002)(426003)(316002)(186003)(16526019)(36906005)(336012)(82740400003)(82310400003)(478600001)(54906003)(5660300002)(356005)(7636003)(36860700001)(6286002)(86362001)(107886003)(8936002)(55016002)(26005)(37006003)(8676002)(7696005)(6666004)(47076005)(4326008)(70586007)(36756003)(70206006)(6862004);
DIR:OUT; SFP:1101;
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2021 13:39:05.9958 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 817e624a-3c0b-4c18-c912-08d92114cc56
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: CO1NAM11FT005.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4369
Subject: [dpdk-dev] [RFC 08/14] vdpa/mlx5: remove PCI specifics
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: Thomas Monjalon <thomas@monjalon.net>
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
drivers/vdpa/mlx5/mlx5_vdpa.c | 119 ++++++++++------------------------
drivers/vdpa/mlx5/mlx5_vdpa.h | 1 -
2 files changed, 34 insertions(+), 86 deletions(-)
diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c
index 5ab7c525c2..967234193f 100644
--- a/drivers/vdpa/mlx5/mlx5_vdpa.c
+++ b/drivers/vdpa/mlx5/mlx5_vdpa.c
@@ -11,12 +11,11 @@
#include <rte_malloc.h>
#include <rte_log.h>
#include <rte_errno.h>
-#include <rte_pci.h>
#include <rte_string_fns.h>
+#include <rte_bus_pci.h>
#include <mlx5_glue.h>
#include <mlx5_common.h>
-#include <mlx5_common_pci.h>
#include <mlx5_devx_cmds.h>
#include <mlx5_prm.h>
#include <mlx5_nl.h>
@@ -552,34 +551,13 @@ mlx5_vdpa_sys_roce_disable(const char *addr)
}
static int
-mlx5_vdpa_roce_disable(struct rte_pci_addr *addr, struct ibv_device **ibv)
+mlx5_vdpa_roce_disable(struct rte_device *dev)
{
- char addr_name[64] = {0};
-
- rte_pci_device_name(addr, addr_name, sizeof(addr_name));
/* Firstly try to disable ROCE by Netlink and fallback to sysfs. */
- if (mlx5_vdpa_nl_roce_disable(addr_name) == 0 ||
- mlx5_vdpa_sys_roce_disable(addr_name) == 0) {
- /*
- * Succeed to disable ROCE, wait for the IB device to appear
- * again after reload.
- */
- int r;
- struct ibv_device *ibv_new;
-
- for (r = MLX5_VDPA_MAX_RETRIES; r; r--) {
- ibv_new = mlx5_os_get_ibv_device(addr);
- if (ibv_new) {
- *ibv = ibv_new;
- return 0;
- }
- usleep(MLX5_VDPA_USEC);
- }
- DRV_LOG(ERR, "Cannot much device %s after ROCE disable, "
- "retries exceed %d", addr_name, MLX5_VDPA_MAX_RETRIES);
- rte_errno = EAGAIN;
- }
- return -rte_errno;
+ if (mlx5_vdpa_nl_roce_disable(dev->name) != 0 &&
+ mlx5_vdpa_sys_roce_disable(dev->name) != 0)
+ return -rte_errno;
+ return 0;
}
static int
@@ -647,44 +625,33 @@ mlx5_vdpa_config_get(struct rte_devargs *devargs, struct mlx5_vdpa_priv *priv)
DRV_LOG(DEBUG, "no traffic max is %u.", priv->no_traffic_max);
}
-/**
- * DPDK callback to register a mlx5 PCI device.
- *
- * This function spawns vdpa device out of a given PCI device.
- *
- * @param[in] pci_drv
- * PCI driver structure (mlx5_vpda_driver).
- * @param[in] pci_dev
- * PCI device information.
- *
- * @return
- * 0 on success, 1 to skip this driver, a negative errno value otherwise
- * and rte_errno is set.
- */
static int
-mlx5_vdpa_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
- struct rte_pci_device *pci_dev __rte_unused)
+mlx5_vdpa_dev_probe(struct rte_device *dev)
{
struct ibv_device *ibv;
struct mlx5_vdpa_priv *priv = NULL;
struct ibv_context *ctx = NULL;
struct mlx5_hca_attr attr;
+ int retry;
int ret;
- ibv = mlx5_os_get_ibv_device(&pci_dev->addr);
- if (!ibv) {
- DRV_LOG(ERR, "No matching IB device for PCI slot "
- PCI_PRI_FMT ".", pci_dev->addr.domain,
- pci_dev->addr.bus, pci_dev->addr.devid,
- pci_dev->addr.function);
+ if (mlx5_vdpa_roce_disable(dev) != 0) {
+ DRV_LOG(WARNING, "Failed to disable ROCE for \"%s\".",
+ dev->name);
return -rte_errno;
- } else {
- DRV_LOG(INFO, "PCI information matches for device \"%s\".",
- ibv->name);
}
- if (mlx5_vdpa_roce_disable(&pci_dev->addr, &ibv) != 0) {
- DRV_LOG(WARNING, "Failed to disable ROCE for \"%s\".",
- ibv->name);
+ /* Wait for the IB device to appear again after reload. */
+ for (retry = MLX5_VDPA_MAX_RETRIES; retry > 0; --retry) {
+ ibv = mlx5_get_ibv_device(dev);
+ if (ibv != NULL)
+ break;
+ usleep(MLX5_VDPA_USEC);
+ }
+ if (ibv == NULL) {
+ DRV_LOG(ERR, "Cannot get IB device after disabling RoCE for "
+ "\"%s\", retries exceed %d.",
+ dev->name, MLX5_VDPA_MAX_RETRIES);
+ rte_errno = EAGAIN;
return -rte_errno;
}
ctx = mlx5_glue->dv_open_device(ibv);
@@ -722,20 +689,18 @@ mlx5_vdpa_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
if (attr.num_lag_ports == 0)
priv->num_lag_ports = 1;
priv->ctx = ctx;
- priv->pci_dev = pci_dev;
priv->var = mlx5_glue->dv_alloc_var(ctx, 0);
if (!priv->var) {
DRV_LOG(ERR, "Failed to allocate VAR %u.", errno);
goto error;
}
- priv->vdev = rte_vdpa_register_device(&pci_dev->device,
- &mlx5_vdpa_ops);
+ priv->vdev = rte_vdpa_register_device(dev, &mlx5_vdpa_ops);
if (priv->vdev == NULL) {
DRV_LOG(ERR, "Failed to register vDPA device.");
rte_errno = rte_errno ? rte_errno : EINVAL;
goto error;
}
- mlx5_vdpa_config_get(pci_dev->device.devargs, priv);
+ mlx5_vdpa_config_get(dev->devargs, priv);
SLIST_INIT(&priv->mr_list);
pthread_mutex_init(&priv->vq_config_lock, NULL);
pthread_mutex_lock(&priv_list_lock);
@@ -754,26 +719,15 @@ mlx5_vdpa_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
return -rte_errno;
}
-/**
- * DPDK callback to remove a PCI device.
- *
- * This function removes all vDPA devices belong to a given PCI device.
- *
- * @param[in] pci_dev
- * Pointer to the PCI device.
- *
- * @return
- * 0 on success, the function cannot fail.
- */
static int
-mlx5_vdpa_pci_remove(struct rte_pci_device *pci_dev)
+mlx5_vdpa_dev_remove(struct rte_device *dev)
{
struct mlx5_vdpa_priv *priv = NULL;
int found = 0;
pthread_mutex_lock(&priv_list_lock);
TAILQ_FOREACH(priv, &priv_list, next) {
- if (!rte_pci_addr_cmp(&priv->pci_dev->addr, &pci_dev->addr)) {
+ if (priv->vdev->device == dev) {
found = 1;
break;
}
@@ -831,17 +785,12 @@ static const struct rte_pci_id mlx5_vdpa_pci_id_map[] = {
}
};
-static struct mlx5_pci_driver mlx5_vdpa_driver = {
- .driver_class = MLX5_CLASS_VDPA,
- .pci_driver = {
- .driver = {
- .name = RTE_STR(MLX5_VDPA_DRIVER_NAME),
- },
- .id_table = mlx5_vdpa_pci_id_map,
- .probe = mlx5_vdpa_pci_probe,
- .remove = mlx5_vdpa_pci_remove,
- .drv_flags = 0,
- },
+static struct mlx5_class_driver mlx5_vdpa_driver = {
+ .drv_class = MLX5_CLASS_VDPA,
+ .name = RTE_STR(MLX5_VDPA_DRIVER_NAME),
+ .id_table = mlx5_vdpa_pci_id_map,
+ .probe = mlx5_vdpa_dev_probe,
+ .remove = mlx5_vdpa_dev_remove,
};
RTE_LOG_REGISTER_DEFAULT(mlx5_vdpa_logtype, NOTICE)
@@ -853,7 +802,7 @@ RTE_INIT(rte_mlx5_vdpa_init)
{
mlx5_common_init();
if (mlx5_glue)
- mlx5_pci_driver_register(&mlx5_vdpa_driver);
+ mlx5_class_driver_register(&mlx5_vdpa_driver);
}
RTE_PMD_EXPORT_NAME(MLX5_VDPA_DRIVER_NAME, __COUNTER__);
diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.h b/drivers/vdpa/mlx5/mlx5_vdpa.h
index 722c72b65e..2a04e36607 100644
--- a/drivers/vdpa/mlx5/mlx5_vdpa.h
+++ b/drivers/vdpa/mlx5/mlx5_vdpa.h
@@ -133,7 +133,6 @@ struct mlx5_vdpa_priv {
struct rte_vdpa_device *vdev; /* vDPA device. */
int vid; /* vhost device id. */
struct ibv_context *ctx; /* Device context. */
- struct rte_pci_device *pci_dev;
struct mlx5_hca_vdpa_attr caps;
uint32_t pdn; /* Protection Domain number. */
struct ibv_pd *pd;
--
2.25.1