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 CB3E5A0577; Mon, 13 Apr 2020 17:38:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AF54B1BEE1; Mon, 13 Apr 2020 17:38:05 +0200 (CEST) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [67.231.154.164]) by dpdk.org (Postfix) with ESMTP id D77A51BE9B for ; Mon, 13 Apr 2020 17:38:04 +0200 (CEST) Received: from mx1-us1.ppe-hosted.com (unknown [10.110.50.144]) by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id DE28920086; Mon, 13 Apr 2020 15:38:02 +0000 (UTC) Received: from us4-mdac16-19.at1.mdlocal (unknown [10.110.49.201]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id DD301800A4; Mon, 13 Apr 2020 15:38:02 +0000 (UTC) X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.110.49.6]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 3946540071; Mon, 13 Apr 2020 15:38:02 +0000 (UTC) Received: from webmail.solarflare.com (uk.solarflare.com [193.34.186.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id C2D82B00078; Mon, 13 Apr 2020 15:38:01 +0000 (UTC) Received: from [192.168.38.17] (10.17.10.39) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 13 Apr 2020 16:37:54 +0100 To: Haiyue Wang , , , , , , References: <20200305043311.17065-1-vattunuru@marvell.com> <20200413082930.84050-1-haiyue.wang@intel.com> From: Andrew Rybchenko Autocrypt: addr=arybchenko@solarflare.com; keydata= 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 Znk9 Message-ID: <81fcab72-7d03-befc-f0be-e09e3efbaf30@solarflare.com> Date: Mon, 13 Apr 2020 18:37:53 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <20200413082930.84050-1-haiyue.wang@intel.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 8bit X-Originating-IP: [10.17.10.39] X-ClientProxiedBy: ocex03.SolarFlarecom.com (10.20.40.36) To ukex01.SolarFlarecom.com (10.17.10.4) X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.5.1020-25352.003 X-TM-AS-Result: No-17.384500-8.000000-10 X-TMASE-MatchedRID: Ync95tbzDRlEgaBf5eVRwvZvT2zYoYOwC/ExpXrHizxsMPuLZB/IR4jw YzF1DjNPKLIZjka1nvcI0emILnGBKTCitzEOtuK1EcRh6j7d8SfOoAXTAVKONVIxScKXZnK0nKB 5CrtbtW+G+DRsvJZfNWKjjUHhjaYpx+AW+YdZwPHhYA5szVVSqNGOcAfHKa6uPB9Yny3bGiyV7V ueZm2O7N4HHBYJtjIu/Eml6Vez+EqRQnbVeiX91nYZxYoZm58F5tEK/bi5sK8L9Tj77wy87IZkE 3SAGj/E/18LzfBfUhnMdHm3E7kFwCHhSBQfglfsA9lly13c/gFMQULTNXtspObnFWpNX1DByIVQ A/DQ+LcjW5FWKYjOGAtiP/IxAbjtBGlnQ8BLSeaqNnzrkU+2mtQeZo36ab1gsS0sZEB7c8Yc0TX k4uvg8HH2aMZl5CMITCqF/OLSJdEJz1DzidV4PMzSKGx9g8xhOYqKF7UrYh7zlv7FEwWOy6KkU0 t47vZI9IB03bnxi9nvO4POLDk8RDxTO0Mow+I2nTjUyTU65umiIpNv3rjMdfnqcdWkRgUeKI+fy QV7C09wKZvEQdp9LdNDNbxWJwX128kyDOiPcdYYteHAndhXo6Gnvnr+szpS0LGVgtT0AuLdnUOU 9ZiWzqssgi/t6bTQcg13yMhA5wRoF68z966sx/DrY9Cr30dZIfZjRfGTydhW1jLbx3/rugTbjk+ rHQRkZ6wJ4vl1z/qZg13StAuGxe1KuqFSI2Kuyf21YeIsPYYZSo6PM4LsioJ+amHTb3xDo8WMkQ Wv6iWhMIDkR/KfwI2j49Ftap9EOwBXM346/+yMQ9vFcL9R12rmTuKcw6hMZoVKwMBXqFeOJzPll BB63RnuvVm9P7Lk X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--17.384500-8.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1020-25352.003 X-MDID: 1586792282-VzG4ekJhO20w Subject: Re: [dpdk-dev] [PATCH v4] eal: add VFIO-PCI SR-IOV support 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" On 4/13/20 11:29 AM, Haiyue Wang wrote: > The kernel module vfio-pci introduces the VF token to enable SR-IOV > support since 5.7. > > The VF token can be set by a vfio-pci based PF driver and must be known > by the vfio-pci based VF driver in order to gain access to the device. > > An example VF token option would take this form: > > 1. Install vfio-pci with option 'enable_sriov=1' > > 2. ./usertools/dpdk-devbind.py -b vfio-pci 0000:87:00.0 > > 3. echo 2 > /sys/bus/pci/devices/0000:87:00.0/sriov_numvfs > > 4. Start the PF: > ./x86_64-native-linux-gcc/app/testpmd -l 22-25 -n 4 \ > -w 87:00.0,vf_token=2ab74924-c335-45f4-9b16-8569e5b08258 \ > --file-prefix=pf -- -i Should I get a token from my head? Any? > 5. Start the VF: > ./x86_64-native-linux-gcc/app/testpmd -l 26-29 -n 4 \ > -w 87:02.0,vf_token=2ab74924-c335-45f4-9b16-8569e5b08258 \ > --file-prefix=vf1 -- -i > > Signed-off-by: Haiyue Wang > Acked-by: Vamsi Attunuru > --- > v4: 1. Ignore rte_vfio_setup_device ABI check since it is > for Linux driver use. > > v3: https://patchwork.dpdk.org/patch/68254/ > Fix the Travis build failed: > (1). rte_uuid.h:97:55: error: unknown type name ‘size_t’ > (2). rte_uuid.h:58:2: error: implicit declaration of function ‘memcpy’ > > v2: https://patchwork.dpdk.org/patch/68240/ > Fix the FreeBSD build error. > > v1: https://patchwork.dpdk.org/patch/68237/ > Update the commit message. > > RFC v2: https://patchwork.dpdk.org/patch/68114/ > Based on Vamsi's RFC v1, and Alex's patch for Qemu > [https://lore.kernel.org/lkml/20200204161737.34696b91@w520.home/]: > Use the devarg to pass-down the VF token. > > RFC v1: https://patchwork.dpdk.org/patch/66281/ by Vamsi. > --- > devtools/libabigail.abignore | 3 ++ > drivers/bus/pci/linux/pci_vfio.c | 56 +++++++++++++++++++++++++++++-- > lib/librte_eal/freebsd/eal.c | 3 +- > lib/librte_eal/include/rte_uuid.h | 2 ++ > lib/librte_eal/include/rte_vfio.h | 8 ++++- > lib/librte_eal/linux/eal_vfio.c | 20 +++++++++-- > 6 files changed, 85 insertions(+), 7 deletions(-) > > diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore > index a59df8f13..d918746b4 100644 > --- a/devtools/libabigail.abignore > +++ b/devtools/libabigail.abignore > @@ -11,3 +11,6 @@ > type_kind = enum > name = rte_crypto_asym_xform_type > changed_enumerators = RTE_CRYPTO_ASYM_XFORM_TYPE_LIST_END > +; Ignore this function which is only relevant to linux for driver > +[suppress_type] > + name = rte_vfio_setup_device > diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c > index 64cd84a68..7f99337c7 100644 > --- a/drivers/bus/pci/linux/pci_vfio.c > +++ b/drivers/bus/pci/linux/pci_vfio.c > @@ -11,6 +11,7 @@ > #include > #include > > +#include > #include > #include > #include > @@ -644,11 +645,59 @@ pci_vfio_msix_is_mappable(int vfio_dev_fd, int msix_region) > return ret; > } > > +static void > +vfio_pci_vf_token_arg(struct rte_devargs *devargs, rte_uuid_t uu) > +{ > +#define VF_TOKEN_ARG "vf_token=" > + char c, *p, *vf_token; > + > + if (devargs == NULL) > + return; > + > + p = strstr(devargs->args, VF_TOKEN_ARG); > + if (!p) > + return; > + > + vf_token = p + strlen(VF_TOKEN_ARG); > + if (strlen(vf_token) < (RTE_UUID_STRLEN - 1)) > + return; > + > + c = vf_token[RTE_UUID_STRLEN - 1]; > + if (c != '\0' && c != ',') > + return; > + > + vf_token[RTE_UUID_STRLEN - 1] = '\0'; Is it possible to parse and handle devargs using rte_kvargs.h? > + if (rte_uuid_parse(vf_token, uu)) { > + RTE_LOG(ERR, EAL, > + "The VF token is not a valid uuid : %s\n", vf_token); > + vf_token[RTE_UUID_STRLEN - 1] = c; > + return; I think that the function must return error which is handled by the caller when something bad happens (e.g. invalid UUID). > + } > + > + RTE_LOG(DEBUG, EAL, > + "The VF token is found : %s\n", vf_token); > + > + vf_token[RTE_UUID_STRLEN - 1] = c; > + > + /* Purge this vfio-pci specific token from the device arguments */ > + if (c != '\0') { > + /* 1. Handle the case : 'vf_token=uuid,arg1=val1' */ > + memmove(p, vf_token + RTE_UUID_STRLEN, > + strlen(vf_token + RTE_UUID_STRLEN) + 1); > + } else { > + /* 2. Handle the case : 'arg1=val1,vf_token=uuid' */ > + if (p != devargs->args) > + p--; > + > + *p = '\0'; > + } Is it really required to purge? Why? If yes, it should be explained in the comment above. > +} > > static int > pci_vfio_map_resource_primary(struct rte_pci_device *dev) > { > struct vfio_device_info device_info = { .argsz = sizeof(device_info) }; > + rte_uuid_t vf_token = RTE_UUID_INIT(0, 0, 0, 0, 0ULL); May be it would be better if vfio_pci_vf_token_arg() initializes it anyway instead of duplication init in two places? > char pci_addr[PATH_MAX] = {0}; > int vfio_dev_fd; > struct rte_pci_addr *loc = &dev->addr; > @@ -668,8 +717,9 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev) > snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT, > loc->domain, loc->bus, loc->devid, loc->function); > > + vfio_pci_vf_token_arg(dev->device.devargs, vf_token); > ret = rte_vfio_setup_device(rte_pci_get_sysfs_path(), pci_addr, > - &vfio_dev_fd, &device_info); > + &vfio_dev_fd, &device_info, vf_token); > if (ret) > return ret; > > @@ -797,6 +847,7 @@ static int > pci_vfio_map_resource_secondary(struct rte_pci_device *dev) > { > struct vfio_device_info device_info = { .argsz = sizeof(device_info) }; > + rte_uuid_t vf_token = RTE_UUID_INIT(0, 0, 0, 0, 0ULL); > char pci_addr[PATH_MAX] = {0}; > int vfio_dev_fd; > struct rte_pci_addr *loc = &dev->addr; > @@ -830,8 +881,9 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev) > return -1; > } > > + vfio_pci_vf_token_arg(dev->device.devargs, vf_token); > ret = rte_vfio_setup_device(rte_pci_get_sysfs_path(), pci_addr, > - &vfio_dev_fd, &device_info); > + &vfio_dev_fd, &device_info, vf_token); > if (ret) > return ret; > > diff --git a/lib/librte_eal/freebsd/eal.c b/lib/librte_eal/freebsd/eal.c > index 6ae37e7e6..a92584795 100644 > --- a/lib/librte_eal/freebsd/eal.c > +++ b/lib/librte_eal/freebsd/eal.c > @@ -995,7 +995,8 @@ rte_eal_vfio_intr_mode(void) > int rte_vfio_setup_device(__rte_unused const char *sysfs_base, > __rte_unused const char *dev_addr, > __rte_unused int *vfio_dev_fd, > - __rte_unused struct vfio_device_info *device_info) > + __rte_unused struct vfio_device_info *device_info, > + __rte_unused rte_uuid_t vf_token) > { > return -1; > } > diff --git a/lib/librte_eal/include/rte_uuid.h b/lib/librte_eal/include/rte_uuid.h > index 044afbdfa..8b42e070a 100644 > --- a/lib/librte_eal/include/rte_uuid.h > +++ b/lib/librte_eal/include/rte_uuid.h > @@ -15,6 +15,8 @@ extern "C" { > #endif > > #include > +#include > +#include > > /** > * Struct describing a Universal Unique Identifier > diff --git a/lib/librte_eal/include/rte_vfio.h b/lib/librte_eal/include/rte_vfio.h > index 20ed8c45a..1f9e22d82 100644 > --- a/lib/librte_eal/include/rte_vfio.h > +++ b/lib/librte_eal/include/rte_vfio.h > @@ -16,6 +16,8 @@ extern "C" { > > #include > > +#include > + > /* > * determine if VFIO is present on the system > */ > @@ -102,13 +104,17 @@ struct vfio_device_info; > * @param device_info > * Device information. > * > + * @param vf_token > + * VF token. Such comments are useles and just eat space adding nothing useful. Please, make it useful and explain what is behind the parameter, when it is necessary, why? Should it be specified for PF case, VF case, both? > + * > * @return > * 0 on success. > * <0 on failure. > * >1 if the device cannot be managed this way. > */ > int rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr, > - int *vfio_dev_fd, struct vfio_device_info *device_info); > + int *vfio_dev_fd, struct vfio_device_info *device_info, > + rte_uuid_t vf_token); "rte_uuid_t vf_token" looks confusing. Shouldn't it be "rte_uuid_t *vf_token"? > > /** > * Release a device mapped to a VFIO-managed I/O MMU group. > diff --git a/lib/librte_eal/linux/eal_vfio.c b/lib/librte_eal/linux/eal_vfio.c > index 4502aefed..916082b5d 100644 > --- a/lib/librte_eal/linux/eal_vfio.c > +++ b/lib/librte_eal/linux/eal_vfio.c > @@ -702,7 +702,8 @@ rte_vfio_clear_group(int vfio_group_fd) > > int > rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr, > - int *vfio_dev_fd, struct vfio_device_info *device_info) > + int *vfio_dev_fd, struct vfio_device_info *device_info, > + rte_uuid_t vf_token) > { > struct vfio_group_status group_status = { > .argsz = sizeof(group_status) > @@ -712,6 +713,7 @@ rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr, > int vfio_container_fd; > int vfio_group_fd; > int iommu_group_num; > + char dev[PATH_MAX]; Why PATH_MAX? > int i, ret; > > /* get group number */ > @@ -895,8 +897,19 @@ rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr, > t->type_id, t->name); > } > > + if (!rte_uuid_is_null(vf_token)) { > + char vf_token_str[RTE_UUID_STRLEN]; > + > + rte_uuid_unparse(vf_token, vf_token_str, sizeof(vf_token_str)); > + snprintf(dev, sizeof(dev), > + "%s vf_token=%s", dev_addr, vf_token_str); > + } else { > + snprintf(dev, sizeof(dev), > + "%s", dev_addr); > + } > + > /* get a file descriptor for the device */ > - *vfio_dev_fd = ioctl(vfio_group_fd, VFIO_GROUP_GET_DEVICE_FD, dev_addr); > + *vfio_dev_fd = ioctl(vfio_group_fd, VFIO_GROUP_GET_DEVICE_FD, dev); > if (*vfio_dev_fd < 0) { > /* if we cannot get a device fd, this implies a problem with > * the VFIO group or the container not having IOMMU configured. > @@ -2081,7 +2094,8 @@ int > rte_vfio_setup_device(__rte_unused const char *sysfs_base, > __rte_unused const char *dev_addr, > __rte_unused int *vfio_dev_fd, > - __rte_unused struct vfio_device_info *device_info) > + __rte_unused struct vfio_device_info *device_info, > + __rte_unused rte_uuid_t vf_token) > { > return -1; > } >