| Message ID | 20230914021332.1929155-1-oushixiong@kylinos.cn (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | vfio/pds: Use proper PF device access helper | expand |
On 9/13/2023 7:13 PM, oushixiong wrote: > Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding. > > > From: Shixiong Ou <oushixiong@kylinos.cn> > > The pci_physfn() helper exists to support cases where the physfn > field may not be compiled into the pci_dev structure. We've > declared this driver dependent on PCI_IOV to avoid this problem, > but regardless we should follow the precedent not to access this > field directly. > > Signed-off-by: Shixiong Ou <oushixiong@kylinos.cn> > --- > > This patch changes the subject line and commit log, and the previous > patch's links is: > https://patchwork.kernel.org/project/kvm/patch/20230911080828.635184-1-oushixiong@kylinos.cn/ > > drivers/vfio/pci/pds/vfio_dev.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/vfio/pci/pds/vfio_dev.c b/drivers/vfio/pci/pds/vfio_dev.c > index b46174f5eb09..649b18ee394b 100644 > --- a/drivers/vfio/pci/pds/vfio_dev.c > +++ b/drivers/vfio/pci/pds/vfio_dev.c > @@ -162,7 +162,7 @@ static int pds_vfio_init_device(struct vfio_device *vdev) > pci_id = PCI_DEVID(pdev->bus->number, pdev->devfn); > dev_dbg(&pdev->dev, > "%s: PF %#04x VF %#04x vf_id %d domain %d pds_vfio %p\n", > - __func__, pci_dev_id(pdev->physfn), pci_id, vf_id, > + __func__, pci_dev_id(pci_physfn(pdev)), pci_id, vf_id, > pci_domain_nr(pdev->bus), pds_vfio); > > return 0; > -- > 2.25.1 > LGTM! Thanks again. Reviewed-by: Brett Creeley <brett.creeley@amd.com>
On Thu, 14 Sep 2023 10:13:32 +0800 oushixiong <oushixiong@kylinos.cn> wrote: > From: Shixiong Ou <oushixiong@kylinos.cn> > > The pci_physfn() helper exists to support cases where the physfn > field may not be compiled into the pci_dev structure. We've > declared this driver dependent on PCI_IOV to avoid this problem, > but regardless we should follow the precedent not to access this > field directly. > > Signed-off-by: Shixiong Ou <oushixiong@kylinos.cn> > --- > > This patch changes the subject line and commit log, and the previous > patch's links is: > https://patchwork.kernel.org/project/kvm/patch/20230911080828.635184-1-oushixiong@kylinos.cn/ Kevin & Jason, I assume your R-b's apply to this version as well. Thanks, Alex > > drivers/vfio/pci/pds/vfio_dev.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/vfio/pci/pds/vfio_dev.c b/drivers/vfio/pci/pds/vfio_dev.c > index b46174f5eb09..649b18ee394b 100644 > --- a/drivers/vfio/pci/pds/vfio_dev.c > +++ b/drivers/vfio/pci/pds/vfio_dev.c > @@ -162,7 +162,7 @@ static int pds_vfio_init_device(struct vfio_device *vdev) > pci_id = PCI_DEVID(pdev->bus->number, pdev->devfn); > dev_dbg(&pdev->dev, > "%s: PF %#04x VF %#04x vf_id %d domain %d pds_vfio %p\n", > - __func__, pci_dev_id(pdev->physfn), pci_id, vf_id, > + __func__, pci_dev_id(pci_physfn(pdev)), pci_id, vf_id, > pci_domain_nr(pdev->bus), pds_vfio); > > return 0;
> From: Alex Williamson <alex.williamson@redhat.com> > Sent: Saturday, September 16, 2023 2:59 AM > > On Thu, 14 Sep 2023 10:13:32 +0800 > oushixiong <oushixiong@kylinos.cn> wrote: > > > From: Shixiong Ou <oushixiong@kylinos.cn> > > > > The pci_physfn() helper exists to support cases where the physfn > > field may not be compiled into the pci_dev structure. We've > > declared this driver dependent on PCI_IOV to avoid this problem, > > but regardless we should follow the precedent not to access this > > field directly. > > > > Signed-off-by: Shixiong Ou <oushixiong@kylinos.cn> > > --- > > > > This patch changes the subject line and commit log, and the previous > > patch's links is: > > > https://patchwork.kernel.org/project/kvm/patch/20230911080828.6 > 35184-1-oushixiong@kylinos.cn/ > > Kevin & Jason, > > I assume your R-b's apply to this version as well. Thanks, > yes.
On Sat, Sep 16, 2023 at 09:53:29AM +0000, Tian, Kevin wrote: > > From: Alex Williamson <alex.williamson@redhat.com> > > Sent: Saturday, September 16, 2023 2:59 AM > > > > On Thu, 14 Sep 2023 10:13:32 +0800 > > oushixiong <oushixiong@kylinos.cn> wrote: > > > > > From: Shixiong Ou <oushixiong@kylinos.cn> > > > > > > The pci_physfn() helper exists to support cases where the physfn > > > field may not be compiled into the pci_dev structure. We've > > > declared this driver dependent on PCI_IOV to avoid this problem, > > > but regardless we should follow the precedent not to access this > > > field directly. > > > > > > Signed-off-by: Shixiong Ou <oushixiong@kylinos.cn> > > > --- > > > > > > This patch changes the subject line and commit log, and the previous > > > patch's links is: > > > > > https://patchwork.kernel.org/project/kvm/patch/20230911080828.6 > > 35184-1-oushixiong@kylinos.cn/ > > > > Kevin & Jason, > > > > I assume your R-b's apply to this version as well. Thanks, > > > > yes. yes
On Thu, 14 Sep 2023 10:13:32 +0800 oushixiong <oushixiong@kylinos.cn> wrote: > From: Shixiong Ou <oushixiong@kylinos.cn> > > The pci_physfn() helper exists to support cases where the physfn > field may not be compiled into the pci_dev structure. We've > declared this driver dependent on PCI_IOV to avoid this problem, > but regardless we should follow the precedent not to access this > field directly. > > Signed-off-by: Shixiong Ou <oushixiong@kylinos.cn> > --- > > This patch changes the subject line and commit log, and the previous > patch's links is: > https://patchwork.kernel.org/project/kvm/patch/20230911080828.635184-1-oushixiong@kylinos.cn/ > > drivers/vfio/pci/pds/vfio_dev.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to vfio for-linus branch for v6.6. Thanks, Alex > > diff --git a/drivers/vfio/pci/pds/vfio_dev.c b/drivers/vfio/pci/pds/vfio_dev.c > index b46174f5eb09..649b18ee394b 100644 > --- a/drivers/vfio/pci/pds/vfio_dev.c > +++ b/drivers/vfio/pci/pds/vfio_dev.c > @@ -162,7 +162,7 @@ static int pds_vfio_init_device(struct vfio_device *vdev) > pci_id = PCI_DEVID(pdev->bus->number, pdev->devfn); > dev_dbg(&pdev->dev, > "%s: PF %#04x VF %#04x vf_id %d domain %d pds_vfio %p\n", > - __func__, pci_dev_id(pdev->physfn), pci_id, vf_id, > + __func__, pci_dev_id(pci_physfn(pdev)), pci_id, vf_id, > pci_domain_nr(pdev->bus), pds_vfio); > > return 0;
diff --git a/drivers/vfio/pci/pds/vfio_dev.c b/drivers/vfio/pci/pds/vfio_dev.c index b46174f5eb09..649b18ee394b 100644 --- a/drivers/vfio/pci/pds/vfio_dev.c +++ b/drivers/vfio/pci/pds/vfio_dev.c @@ -162,7 +162,7 @@ static int pds_vfio_init_device(struct vfio_device *vdev) pci_id = PCI_DEVID(pdev->bus->number, pdev->devfn); dev_dbg(&pdev->dev, "%s: PF %#04x VF %#04x vf_id %d domain %d pds_vfio %p\n", - __func__, pci_dev_id(pdev->physfn), pci_id, vf_id, + __func__, pci_dev_id(pci_physfn(pdev)), pci_id, vf_id, pci_domain_nr(pdev->bus), pds_vfio); return 0;