From: "Ma, WenwuX" <wenwux.ma@intel.com>
To: David Marchand <david.marchand@redhat.com>,
"nipun.gupta@amd.com" <nipun.gupta@amd.com>,
"chenbo.xia@outlook.com" <chenbo.xia@outlook.com>
Cc: "dev@dpdk.org" <dev@dpdk.org>,
"maxime.coquelin@redhat.com" <maxime.coquelin@redhat.com>,
"Li, Miao" <miao.li@intel.com>,
"Ling, WeiX" <weix.ling@intel.com>,
"stable@dpdk.org" <stable@dpdk.org>
Subject: RE: [PATCH v4] bus/pci: fix legacy device IO port map in secondary process
Date: Mon, 9 Oct 2023 03:06:30 +0000 [thread overview]
Message-ID: <MN0PR11MB61102AB412BC12A5D57DF848EBCEA@MN0PR11MB6110.namprd11.prod.outlook.com> (raw)
In-Reply-To: <CAJFAV8y4BmS2c6ArZRs8wNx3RTm5KaOyZVGZLLw-gCLJZhJLZQ@mail.gmail.com>
Hi,
> -----Original Message-----
> From: David Marchand <david.marchand@redhat.com>
> Sent: 2023年10月3日 18:21
> To: Ma, WenwuX <wenwux.ma@intel.com>; nipun.gupta@amd.com;
> chenbo.xia@outlook.com
> Cc: dev@dpdk.org; maxime.coquelin@redhat.com; Li, Miao
> <miao.li@intel.com>; Ling, WeiX <weix.ling@intel.com>; stable@dpdk.org
> Subject: Re: [PATCH v4] bus/pci: fix legacy device IO port map in secondary
> process
>
> On Wed, Aug 30, 2023 at 7:07 AM Wenwu Ma <wenwux.ma@intel.com>
> wrote:
> >
> > When doing IO port mapping for legacy device in secondary process, the
> > region information is missing, so, we need to refill it.
> >
> > Fixes: 4b741542ecde ("bus/pci: avoid depending on private kernel
> > value")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Wenwu Ma <wenwux.ma@intel.com>
> >
> > ---
> > drivers/bus/pci/linux/pci_vfio.c | 43
> > ++++++++++++++++++++++++++++++--
> > 1 file changed, 41 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/bus/pci/linux/pci_vfio.c
> > b/drivers/bus/pci/linux/pci_vfio.c
> > index e634de8322..5ef26c98d1 100644
> > --- a/drivers/bus/pci/linux/pci_vfio.c
> > +++ b/drivers/bus/pci/linux/pci_vfio.c
> > @@ -1314,6 +1314,27 @@ pci_vfio_ioport_map(struct rte_pci_device
> *dev, int bar,
> > return -1;
> > }
> >
> > + if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
> > + struct vfio_device_info device_info = { .argsz = sizeof(device_info) };
> > + char pci_addr[PATH_MAX];
> > + int vfio_dev_fd;
> > + struct rte_pci_addr *loc = &dev->addr;
> > + int ret;
> > + /* store PCI address string */
> > + snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT,
> > + loc->domain, loc->bus, loc->devid,
> > + loc->function);
> > +
> > + ret = rte_vfio_setup_device(rte_pci_get_sysfs_path(), pci_addr,
> > + &vfio_dev_fd,
> > + &device_info);
>
> From a pci bus API pov, nothing prevents a driver from mixing memory
> mapped with vfio and ioport resources (iow, calls to
> rte_pci_map_resource() and rte_pci_ioport_map()).
> IOW, it may not be the case with the net/virtio driver but, in theory,
> rte_pci_ioport_map()/pci_vfio_ioport_map() may be called after a
> rte_pci_map_resource() call.
>
> In a similar manner, from the API pov,
> rte_pci_ioport_map()/pci_vfio_ioport_map() may be called for multiple bars.
>
> In summary, nothing in this patch checks that vfio has been configured already
> and I think we need a refcount to handle those situations.
>
We call rte_vfio_setup_device just to get device info, we can call rte_vfio_release_device as soon as pci_vfio_fill_regions is done.
This avoids reference counting operations, do you think it works?
> Nipun, Chenbo, WDYT?
>
>
> > + if (ret)
> > + return -1;
>
> ret value is not used, so there is no need for this variable.
>
> if (rte_vfio_setup_device(rte_pci_get_sysfs_path(), pci_addr,
> &vfio_dev_fd, &device_info) != 0)
> return -1;
>
> > +
> > + ret = pci_vfio_fill_regions(dev, vfio_dev_fd, &device_info);
> > + if (ret)
> > + return -1;
>
> Same here, ret is not needed.
>
>
> > +
> > + }
> > +
> > if (pci_vfio_get_region(dev, bar, &size, &offset) != 0) {
> > RTE_LOG(ERR, EAL, "Cannot get offset of region %d.\n", bar);
> > return -1;
> > @@ -1361,8 +1382,26 @@ pci_vfio_ioport_write(struct rte_pci_ioport *p,
> > int pci_vfio_ioport_unmap(struct rte_pci_ioport *p) {
> > - RTE_SET_USED(p);
> > - return -1;
> > + char pci_addr[PATH_MAX] = {0};
> > + struct rte_pci_addr *loc = &p->dev->addr;
> > + int ret, vfio_dev_fd;
> > +
> > + /* store PCI address string */
> > + snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT,
> > + loc->domain, loc->bus, loc->devid,
> > + loc->function);
> > +
> > + vfio_dev_fd = rte_intr_dev_fd_get(p->dev->intr_handle);
> > + if (vfio_dev_fd < 0)
> > + return -1;
>
> This check is odd and does not seem related.
>
>
> > +
> > + ret = rte_vfio_release_device(rte_pci_get_sysfs_path(), pci_addr,
> > + vfio_dev_fd);
> > + if (ret < 0) {
> > + RTE_LOG(ERR, EAL, "Cannot release VFIO device\n");
> > + return ret;
> > + }
>
>
> --
> David Marchand
next prev parent reply other threads:[~2023-10-09 3:06 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-07 1:58 [PATCH] " Wenwu Ma
2023-08-13 6:15 ` Gupta, Nipun
2023-08-16 1:11 ` Ma, WenwuX
2023-08-21 1:27 ` [PATCH v2] " Wenwu Ma
2023-08-21 2:53 ` Stephen Hemminger
2023-08-22 2:13 ` Ma, WenwuX
2023-08-22 2:18 ` [PATCH v3] " Wenwu Ma
2023-08-28 6:06 ` Gupta, Nipun
2023-08-29 8:00 ` Ma, WenwuX
2023-08-30 5:07 ` [PATCH v4] " Wenwu Ma
2023-09-04 15:06 ` Gupta, Nipun
2023-09-05 3:10 ` Ling, WeiX
2023-10-03 10:21 ` David Marchand
2023-10-09 3:06 ` Ma, WenwuX [this message]
2023-10-18 10:05 ` David Marchand
2023-10-18 12:38 ` Gupta, Nipun
2023-10-18 13:44 ` David Marchand
2023-10-24 2:00 ` [PATCH v5] " Wenwu Ma
2023-10-27 12:50 ` Gupta, Nipun
2023-11-14 10:24 ` [PATCH v6] bus/pci: fix legacy device IO port map Mingjin Ye
2023-11-15 11:26 ` Gupta, Nipun
2023-08-29 8:07 [PATCH v4] bus/pci: fix legacy device IO port map in secondary process xinfeng zhao
2023-08-29 8:09 xinfeng zhao
2023-08-30 1:36 Wenwu Ma
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=MN0PR11MB61102AB412BC12A5D57DF848EBCEA@MN0PR11MB6110.namprd11.prod.outlook.com \
--to=wenwux.ma@intel.com \
--cc=chenbo.xia@outlook.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=maxime.coquelin@redhat.com \
--cc=miao.li@intel.com \
--cc=nipun.gupta@amd.com \
--cc=stable@dpdk.org \
--cc=weix.ling@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).