From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7BDE5A057C; Thu, 26 Mar 2020 17:33:22 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 50511378E; Thu, 26 Mar 2020 17:33:21 +0100 (CET) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00067.outbound.protection.outlook.com [40.107.0.67]) by dpdk.org (Postfix) with ESMTP id 66FE6374C for ; Thu, 26 Mar 2020 17:33:19 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lt+rusTG08BNXtB4DNeqFSf8AhlqIOWqxGdHXzMv2T6jfROsvOOzr8bbPyadewb5t/EoOKGjhJHdGbLSPyOyVFwSoY5KykQu5iNv5GtcsXhCMIiSIpq9qJ8a0bXzv11lV5eP0wslOHW/NKTmiITT52TL8RQPgM+ckc7eET280HHC8hh0XQ3a52UIimO3fFSbu+2Zv0SDgc/ZJOceAyCLE6zX5leDTmu951JiaMa2TdkLU38PJXUls/oQVpmDppNFryvwQZvkKyp4u9HyFLC187ELuL/mfQkJKrgDjv8DLgXLC9xuH0P+VSuqTaPifmHZqN69KKmY7yiIFHY/9nY6kQ== 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=tlrcz60GIgvsWRbNY36xd5txnicrUUdAEIB0oQbkIqc=; b=jZGXIeMtG3hOYD2iFeCOykU9gTnqbbuE4xQpRkH4J7yy/LGyyIqHJKPmjVphWWrCvnWd9+IM1P2I93hozX5PMgn42EB6rnQWw+urbCvADr02WuQdnEzh9cpRTfR2NgZ2rZ4Za/5rI8cr2VNp9e0YHipoSrEBm3u2yvDt1kqIGhCe5k4PTT+I71t36M++MObCGA6wYtxjbuOleHqOLgtoQJXlLYGWP3wNrIwJpntKI5O844i/ZGdPbaYUxtNeG+Q8cL1Vn6wFRztaZvUe0s28R6O2nBwum84dJFkdaxFeAm2Sys5tyrk798M/v5M1yljm/OZRpWrX3EQflvAC+Qir+g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tlrcz60GIgvsWRbNY36xd5txnicrUUdAEIB0oQbkIqc=; b=kTKrm9UMhEuOlqtNde/D8uwHz4y5JBhSulgqPYQSYc4EauQ6vaUCO890kTag7lgc2Sjo3ccWsBvsfAfLqR8SStbBa5rd1FeK2yDAWaymmn6I6v8s5j7qzrXAOOz6WN7NE+gVzazopzRnn+g9Q0Ko7rmZp+kdeUHOL9NtLYTgCI0= Received: from AM0PR0502MB4019.eurprd05.prod.outlook.com (52.133.39.139) by AM0PR0502MB3634.eurprd05.prod.outlook.com (52.133.44.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2835.18; Thu, 26 Mar 2020 16:33:18 +0000 Received: from AM0PR0502MB4019.eurprd05.prod.outlook.com ([fe80::a564:a117:9022:1fee]) by AM0PR0502MB4019.eurprd05.prod.outlook.com ([fe80::a564:a117:9022:1fee%7]) with mapi id 15.20.2856.018; Thu, 26 Mar 2020 16:33:18 +0000 From: Matan Azrad To: Maxime Coquelin , "dev@dpdk.org" , "xiaolong.ye@intel.com" , "zhihong.wang@intel.com" , Slava Ovsiienko , "xiao.w.wang@intel.com" Thread-Topic: [PATCH] vhost: prefix vDPA enum value for PCI address type Thread-Index: AQHWA3jiVrkv5LUEDEaKir3QNf/s9qhbEQZw Date: Thu, 26 Mar 2020 16:33:18 +0000 Message-ID: References: <20200326141422.20264-1-maxime.coquelin@redhat.com> In-Reply-To: <20200326141422.20264-1-maxime.coquelin@redhat.com> Accept-Language: en-US, he-IL Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=matan@mellanox.com; x-originating-ip: [77.125.94.232] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 302b18e7-ac7f-461a-2c70-08d7d1a36415 x-ms-traffictypediagnostic: AM0PR0502MB3634:|AM0PR0502MB3634: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6430; x-forefront-prvs: 0354B4BED2 x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR0502MB4019.eurprd05.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(10009020)(4636009)(376002)(366004)(136003)(346002)(39860400002)(396003)(8676002)(81166006)(316002)(5660300002)(81156014)(8936002)(71200400001)(2906002)(66946007)(186003)(33656002)(9686003)(478600001)(6506007)(66476007)(86362001)(66446008)(76116006)(66556008)(55016002)(110136005)(26005)(64756008)(52536014)(7696005); DIR:OUT; SFP:1101; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: EzBdP83/+Y7G8M49Z2aDg+gcNGzWFdqv5XpwUEMr7x+PEahQpcQnwjahhUkp4o7UIDKkxnZxiGNJzA86Ka97zhgq8vI9PPWU6WqVaXaQKmcIpPo8Cglz+X8dy3OFNS1kvTOJtP3qOF7ggiYA//HjDYBoUejwtN4Eabp+gsY12zHDhBNu/mkQ9mkRY7AswEEcCsKILKJnjURGeNmsV/sgFhSqgPIV02WHOU+5BuMcZI9OUQ/xNtLLdfNCofj3yWYU8NJUNhHd53dSXyZjc+nVLcWluCEmn57I23LPTlSp1+dcmRDLuI9Bjtrp4qk7u04+vftr3vJWydXiwNxxAsOKT6Ryoi//Ql8N1VHxTCXqvqTzd4cgx7RJS9mAPBDuWQGbc9R2WgBxPr3T/XpeF8i9+Ry7ZK7nQOiixIgPC3FFPmDS4pFQbURG6ftaEQzcdsoF x-ms-exchange-antispam-messagedata: WWYwb6s2cQo5eTTvn7KSiCJlEAVeLPJFCFjoHp3ACjDvqeCXWy/NHSwrcbw60RfQFUS3NpIw4LqiAMthzfFXB8ZiJ4abKk2fMljez6uKH5VAfBZB8bzCxi4+Y5jnwoBv3HTiZKvfpUDlpw3brjGAxw== Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 302b18e7-ac7f-461a-2c70-08d7d1a36415 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Mar 2020 16:33:18.3599 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 7oi6a5v6WnnBN8f2dHqNxvHplxOBSxRCJ7m4EtnF8X6ZV+XKpqaod7TeE/CQJg6IwPvQiYK7WRLBSQDTNh4fNg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0502MB3634 Subject: Re: [dpdk-dev] [PATCH] vhost: prefix vDPA enum value for PCI address type X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Hi From: Maxime Coquelin > In order to avoid potential conflicts, rename the PCI_ADDR enum value to > VDPA_ADDR_PCI in vdpa_addr_type_enum. >=20 > All symbols referencing this enum are experimental, so it does not break = API > policy. >=20 > Signed-off-by: Maxime Coquelin Acked-by: Matan Azrad I think this patch is in conflict with my last patches for mlx5 vDPA driver= . > --- > drivers/vdpa/ifc/ifcvf_vdpa.c | 2 +- > drivers/vdpa/mlx5/mlx5_vdpa.c | 2 +- > examples/vdpa/main.c | 2 +- > lib/librte_vhost/rte_vdpa.h | 2 +- > lib/librte_vhost/vdpa.c | 2 +- > 5 files changed, 5 insertions(+), 5 deletions(-) >=20 > diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.= c > index da4667ba5..ec97178dc 100644 > --- a/drivers/vdpa/ifc/ifcvf_vdpa.c > +++ b/drivers/vdpa/ifc/ifcvf_vdpa.c > @@ -1177,7 +1177,7 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv > __rte_unused, > (1ULL << VHOST_F_LOG_ALL); >=20 > internal->dev_addr.pci_addr =3D pci_dev->addr; > - internal->dev_addr.type =3D PCI_ADDR; > + internal->dev_addr.type =3D VDPA_ADDR_PCI; > list->internal =3D internal; >=20 > if (rte_kvargs_count(kvlist, IFCVF_SW_FALLBACK_LM)) { diff --git > a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c index > 97d914a47..0a9f31a87 100644 > --- a/drivers/vdpa/mlx5/mlx5_vdpa.c > +++ b/drivers/vdpa/mlx5/mlx5_vdpa.c > @@ -446,7 +446,7 @@ mlx5_vdpa_pci_probe(struct rte_pci_driver *pci_drv > __rte_unused, > } > priv->ctx =3D ctx; > priv->dev_addr.pci_addr =3D pci_dev->addr; > - priv->dev_addr.type =3D PCI_ADDR; > + priv->dev_addr.type =3D VDPA_ADDR_PCI; > priv->id =3D rte_vdpa_register_device(&priv->dev_addr, > &mlx5_vdpa_ops); > if (priv->id < 0) { > DRV_LOG(ERR, "Failed to register vDPA device."); diff --git > a/examples/vdpa/main.c b/examples/vdpa/main.c index > d2e2cb7cd..78d72634b 100644 > --- a/examples/vdpa/main.c > +++ b/examples/vdpa/main.c > @@ -331,7 +331,7 @@ static void cmd_create_vdpa_port_parsed(void > *parsed_result, > cmdline_printf(cl, "Unable to parse the given bdf.\n"); > return; > } > - addr.type =3D PCI_ADDR; > + addr.type =3D VDPA_ADDR_PCI; > did =3D rte_vdpa_find_device_id(&addr); > if (did < 0) { > cmdline_printf(cl, "Unable to find vdpa device id.\n"); diff -- > git a/lib/librte_vhost/rte_vdpa.h b/lib/librte_vhost/rte_vdpa.h index > 9a3deb31d..3c400ee79 100644 > --- a/lib/librte_vhost/rte_vdpa.h > +++ b/lib/librte_vhost/rte_vdpa.h > @@ -19,7 +19,7 @@ > #define MAX_VDPA_NAME_LEN 128 >=20 > enum vdpa_addr_type { > - PCI_ADDR, > + VDPA_ADDR_PCI, > VDPA_ADDR_MAX > }; >=20 > diff --git a/lib/librte_vhost/vdpa.c b/lib/librte_vhost/vdpa.c index > 2b8670873..b2b2a105f 100644 > --- a/lib/librte_vhost/vdpa.c > +++ b/lib/librte_vhost/vdpa.c > @@ -27,7 +27,7 @@ is_same_vdpa_device(struct rte_vdpa_dev_addr *a, > return false; >=20 > switch (a->type) { > - case PCI_ADDR: > + case VDPA_ADDR_PCI: > if (a->pci_addr.domain !=3D b->pci_addr.domain || > a->pci_addr.bus !=3D b->pci_addr.bus || > a->pci_addr.devid !=3D b->pci_addr.devid || > -- > 2.24.1