* [PATCH] PCI: Identifying detached virtual functions
@ 2020-08-12 14:50 Matthew Rosato
2020-08-12 14:50 ` [PATCH] PCI: Introduce flag for " Matthew Rosato
0 siblings, 1 reply; 4+ messages in thread
From: Matthew Rosato @ 2020-08-12 14:50 UTC (permalink / raw)
To: alex.williamson, bhelgaas
Cc: schnelle, pmorel, mpe, oohall, linux-s390, linux-kernel, kvm, linux-pci
As discussed previously in a qemu-devel thread:
https://www.mail-archive.com/qemu-devel@nongnu.org/msg725141.html
s390x has the notion of unlinked VFs being available at the LPAR-level
(Virtual Functions where the kernel does not have access to the associated
Physical Function). These devices are currently not marked as is_virtfn.
There seems to be some precedent (ex: in powerpc, eeh_debugfs_break_device())
where pdev->is_virtfn && pdev->physfn == 0 is used to detect these sort of
detached VFs. We toyed with the idea of doing this but it causes additional
fallout as various other areas of kernel code have an expectation that
is_virtfn=1 implies there is a linked PF available to the kernel.
In the s390x case, the firmware layer underneath handles the VF emulation
as it still has access to the PF that the LPAR (and thus the kernel) cannot
see. But one thing this firmware layer does not do is emulate the
PCI_COMMAND_MEMORY bit, which was OK until vfio-pci started enforcing it
via abafbc55. The vfio-pci check is waived for VFs as of ebfa440c, but
vfio-pci can't actually tell that these particular devices are VFs.
The proposed patch attempts to identify these detached VFs and subsequently
provide this information to vfio-pci so that it knows to also accept the
lack of PCI_COMMAND_MEMORY for these sorts of devices. For now the bit is
only set for s390x but other architectures could opt in to it as well if
needed.
Matthew Rosato (1):
PCI: Introduce flag for detached virtual functions
arch/s390/pci/pci.c | 8 ++++++++
drivers/vfio/pci/vfio_pci_config.c | 3 ++-
include/linux/pci.h | 1 +
3 files changed, 11 insertions(+), 1 deletion(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] PCI: Introduce flag for detached virtual functions
2020-08-12 14:50 [PATCH] PCI: Identifying detached virtual functions Matthew Rosato
@ 2020-08-12 14:50 ` Matthew Rosato
2020-08-12 16:43 ` Alex Williamson
0 siblings, 1 reply; 4+ messages in thread
From: Matthew Rosato @ 2020-08-12 14:50 UTC (permalink / raw)
To: alex.williamson, bhelgaas
Cc: schnelle, pmorel, mpe, oohall, linux-s390, linux-kernel, kvm, linux-pci
s390x has the notion of providing VFs to the kernel in a manner
where the associated PF is inaccessible other than via firmware.
These are not treated as typical VFs and access to them is emulated
by underlying firmware which can still access the PF. After
abafbc55 however these detached VFs were no longer able to work
with vfio-pci as the firmware does not provide emulation of the
PCI_COMMAND_MEMORY bit. In this case, let's explicitly recognize
these detached VFs so that vfio-pci can allow memory access to
them again.
Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
Reviewed-by: Pierre Morel <pmorel@linux.ibm.com>
Reviewed-by: Niklas Schnelle <schnelle@linux.ibm.com>
---
arch/s390/pci/pci.c | 8 ++++++++
drivers/vfio/pci/vfio_pci_config.c | 3 ++-
include/linux/pci.h | 1 +
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index 3902c9f..04ac76d 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -581,6 +581,14 @@ int pcibios_enable_device(struct pci_dev *pdev, int mask)
{
struct zpci_dev *zdev = to_zpci(pdev);
+ /*
+ * If we have a VF on a non-multifunction bus, it must be a VF that is
+ * detached from its parent PF. We rely on firmware emulation to
+ * provide underlying PF details.
+ */
+ if (zdev->vfn && !zdev->zbus->multifunction)
+ pdev->detached_vf = 1;
+
zpci_debug_init_device(zdev, dev_name(&pdev->dev));
zpci_fmb_enable_device(zdev);
diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c
index d98843f..17845fc 100644
--- a/drivers/vfio/pci/vfio_pci_config.c
+++ b/drivers/vfio/pci/vfio_pci_config.c
@@ -406,7 +406,8 @@ bool __vfio_pci_memory_enabled(struct vfio_pci_device *vdev)
* PF SR-IOV capability, there's therefore no need to trigger
* faults based on the virtual value.
*/
- return pdev->is_virtfn || (cmd & PCI_COMMAND_MEMORY);
+ return pdev->is_virtfn || pdev->detached_vf ||
+ (cmd & PCI_COMMAND_MEMORY);
}
/*
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 8355306..23a6972 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -445,6 +445,7 @@ struct pci_dev {
unsigned int is_probed:1; /* Device probing in progress */
unsigned int link_active_reporting:1;/* Device capable of reporting link active */
unsigned int no_vf_scan:1; /* Don't scan for VFs after IOV enablement */
+ unsigned int detached_vf:1; /* VF without local PF access */
pci_dev_flags_t dev_flags;
atomic_t enable_cnt; /* pci_enable_device has been called */
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] PCI: Introduce flag for detached virtual functions
2020-08-12 14:50 ` [PATCH] PCI: Introduce flag for " Matthew Rosato
@ 2020-08-12 16:43 ` Alex Williamson
2020-08-12 18:04 ` Matthew Rosato
0 siblings, 1 reply; 4+ messages in thread
From: Alex Williamson @ 2020-08-12 16:43 UTC (permalink / raw)
To: Matthew Rosato
Cc: bhelgaas, schnelle, pmorel, mpe, oohall, linux-s390,
linux-kernel, kvm, linux-pci
On Wed, 12 Aug 2020 10:50:17 -0400
Matthew Rosato <mjrosato@linux.ibm.com> wrote:
> s390x has the notion of providing VFs to the kernel in a manner
> where the associated PF is inaccessible other than via firmware.
> These are not treated as typical VFs and access to them is emulated
> by underlying firmware which can still access the PF. After
> abafbc55 however these detached VFs were no longer able to work
> with vfio-pci as the firmware does not provide emulation of the
> PCI_COMMAND_MEMORY bit. In this case, let's explicitly recognize
> these detached VFs so that vfio-pci can allow memory access to
> them again.
>
> Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
> Reviewed-by: Pierre Morel <pmorel@linux.ibm.com>
> Reviewed-by: Niklas Schnelle <schnelle@linux.ibm.com>
> ---
> arch/s390/pci/pci.c | 8 ++++++++
> drivers/vfio/pci/vfio_pci_config.c | 3 ++-
> include/linux/pci.h | 1 +
> 3 files changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
> index 3902c9f..04ac76d 100644
> --- a/arch/s390/pci/pci.c
> +++ b/arch/s390/pci/pci.c
> @@ -581,6 +581,14 @@ int pcibios_enable_device(struct pci_dev *pdev, int mask)
> {
> struct zpci_dev *zdev = to_zpci(pdev);
>
> + /*
> + * If we have a VF on a non-multifunction bus, it must be a VF that is
> + * detached from its parent PF. We rely on firmware emulation to
> + * provide underlying PF details.
> + */
> + if (zdev->vfn && !zdev->zbus->multifunction)
> + pdev->detached_vf = 1;
> +
> zpci_debug_init_device(zdev, dev_name(&pdev->dev));
> zpci_fmb_enable_device(zdev);
>
> diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c
> index d98843f..17845fc 100644
> --- a/drivers/vfio/pci/vfio_pci_config.c
> +++ b/drivers/vfio/pci/vfio_pci_config.c
> @@ -406,7 +406,8 @@ bool __vfio_pci_memory_enabled(struct vfio_pci_device *vdev)
> * PF SR-IOV capability, there's therefore no need to trigger
> * faults based on the virtual value.
> */
> - return pdev->is_virtfn || (cmd & PCI_COMMAND_MEMORY);
> + return pdev->is_virtfn || pdev->detached_vf ||
> + (cmd & PCI_COMMAND_MEMORY);
> }
>
> /*
Wouldn't we also want to enable the is_virtfn related code in
vfio_basic_config_read() and at least the initial setting of the
command register in vfio_config_init()? Otherwise we're extending the
incomplete emulation out to userspace. Thanks,
Alex
> diff --git a/include/linux/pci.h b/include/linux/pci.h
> index 8355306..23a6972 100644
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@ -445,6 +445,7 @@ struct pci_dev {
> unsigned int is_probed:1; /* Device probing in progress */
> unsigned int link_active_reporting:1;/* Device capable of reporting link active */
> unsigned int no_vf_scan:1; /* Don't scan for VFs after IOV enablement */
> + unsigned int detached_vf:1; /* VF without local PF access */
> pci_dev_flags_t dev_flags;
> atomic_t enable_cnt; /* pci_enable_device has been called */
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] PCI: Introduce flag for detached virtual functions
2020-08-12 16:43 ` Alex Williamson
@ 2020-08-12 18:04 ` Matthew Rosato
0 siblings, 0 replies; 4+ messages in thread
From: Matthew Rosato @ 2020-08-12 18:04 UTC (permalink / raw)
To: Alex Williamson
Cc: bhelgaas, schnelle, pmorel, mpe, oohall, linux-s390,
linux-kernel, kvm, linux-pci
On 8/12/20 12:43 PM, Alex Williamson wrote:
> On Wed, 12 Aug 2020 10:50:17 -0400
> Matthew Rosato <mjrosato@linux.ibm.com> wrote:
>
>> s390x has the notion of providing VFs to the kernel in a manner
>> where the associated PF is inaccessible other than via firmware.
>> These are not treated as typical VFs and access to them is emulated
>> by underlying firmware which can still access the PF. After
>> abafbc55 however these detached VFs were no longer able to work
>> with vfio-pci as the firmware does not provide emulation of the
>> PCI_COMMAND_MEMORY bit. In this case, let's explicitly recognize
>> these detached VFs so that vfio-pci can allow memory access to
>> them again.
>>
>> Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
>> Reviewed-by: Pierre Morel <pmorel@linux.ibm.com>
>> Reviewed-by: Niklas Schnelle <schnelle@linux.ibm.com>
>> ---
>> arch/s390/pci/pci.c | 8 ++++++++
>> drivers/vfio/pci/vfio_pci_config.c | 3 ++-
>> include/linux/pci.h | 1 +
>> 3 files changed, 11 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
>> index 3902c9f..04ac76d 100644
>> --- a/arch/s390/pci/pci.c
>> +++ b/arch/s390/pci/pci.c
>> @@ -581,6 +581,14 @@ int pcibios_enable_device(struct pci_dev *pdev, int mask)
>> {
>> struct zpci_dev *zdev = to_zpci(pdev);
>>
>> + /*
>> + * If we have a VF on a non-multifunction bus, it must be a VF that is
>> + * detached from its parent PF. We rely on firmware emulation to
>> + * provide underlying PF details.
>> + */
>> + if (zdev->vfn && !zdev->zbus->multifunction)
>> + pdev->detached_vf = 1;
>> +
>> zpci_debug_init_device(zdev, dev_name(&pdev->dev));
>> zpci_fmb_enable_device(zdev);
>>
>> diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c
>> index d98843f..17845fc 100644
>> --- a/drivers/vfio/pci/vfio_pci_config.c
>> +++ b/drivers/vfio/pci/vfio_pci_config.c
>> @@ -406,7 +406,8 @@ bool __vfio_pci_memory_enabled(struct vfio_pci_device *vdev)
>> * PF SR-IOV capability, there's therefore no need to trigger
>> * faults based on the virtual value.
>> */
>> - return pdev->is_virtfn || (cmd & PCI_COMMAND_MEMORY);
>> + return pdev->is_virtfn || pdev->detached_vf ||
>> + (cmd & PCI_COMMAND_MEMORY);
>> }
>>
>> /*
>
> Wouldn't we also want to enable the is_virtfn related code in
> vfio_basic_config_read() and at least the initial setting of the
> command register in vfio_config_init()? Otherwise we're extending the
> incomplete emulation out to userspace. Thanks,
>
We had discussed doing this internally and I ultimately left it out of
this patch to keep the changes small... But I agree that it makes sense
to fix the emulation for userspace. I can add the changes you suggest +
would also need to change vfio_restore_bar() with:
- if (pdev->is_virtfn)
+ if (pdev->is_virtfn || pdev->detached_vf)
return;
to prevent the config changes from tripping the restore code.
I'll send a V2 with this included.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-08-12 18:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-12 14:50 [PATCH] PCI: Identifying detached virtual functions Matthew Rosato
2020-08-12 14:50 ` [PATCH] PCI: Introduce flag for " Matthew Rosato
2020-08-12 16:43 ` Alex Williamson
2020-08-12 18:04 ` Matthew Rosato
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.