Commit 2fa0656c authored by Alex Williamson's avatar Alex Williamson Committed by Kelsey Skunberg

vfio-pci: Mask cap zero

BugLink: https://bugs.launchpad.net/bugs/1885932

[ Upstream commit bc138db1 ]

The PCI Code and ID Assignment Specification changed capability ID 0
from reserved to a NULL capability in the v1.1 revision.  The NULL
capability is defined to include only the 16-bit capability header,
ie. only the ID and next pointer.  Unfortunately vfio-pci creates a
map of config space, where ID 0 is used to reserve the standard type
0 header.  Finding an actual capability with this ID therefore results
in a bogus range marked in that map and conflicts with subsequent
capabilities.  As this seems to be a dummy capability anyway and we
already support dropping capabilities, let's hide this one rather than
delving into the potentially subtle dependencies within our map.

Seen on an NVIDIA Tesla T4.
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
Signed-off-by: default avatarKelsey Skunberg <kelsey.skunberg@canonical.com>
parent 39c954e7
...@@ -1412,7 +1412,12 @@ static int vfio_cap_init(struct vfio_pci_device *vdev) ...@@ -1412,7 +1412,12 @@ static int vfio_cap_init(struct vfio_pci_device *vdev)
if (ret) if (ret)
return ret; return ret;
if (cap <= PCI_CAP_ID_MAX) { /*
* ID 0 is a NULL capability, conflicting with our fake
* PCI_CAP_ID_BASIC. As it has no content, consider it
* hidden for now.
*/
if (cap && cap <= PCI_CAP_ID_MAX) {
len = pci_cap_length[cap]; len = pci_cap_length[cap];
if (len == 0xFF) { /* Variable length */ if (len == 0xFF) { /* Variable length */
len = vfio_cap_len(vdev, cap, pos); len = vfio_cap_len(vdev, cap, pos);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment