Skip to content

Commit c1ca352

Browse files
jasowangmstsirkin
authored andcommitted
vp_vdpa: support feature provisioning
This patch allows the device features to be provisioned via netlink. This is done by: 1) validating the provisioned features to be a subset of the parent features. 2) clearing the features that is not wanted by the userspace For example: # vdpa mgmtdev show pci/0000:02:00.0: supported_classes net max_supported_vqs 3 dev_features CSUM GUEST_CSUM CTRL_GUEST_OFFLOADS MAC GUEST_TSO4 GUEST_TSO6 GUEST_ECN GUEST_UFO HOST_TSO4 HOST_TSO6 HOST_ECN HOST_UFO MRG_RXBUF STATUS CTRL_VQ CTRL_RX CTRL_VLAN CTRL_RX_EXTRA GUEST_ANNOUNCE CTRL_MAC_ADDR RING_INDIRECT_DESC RING_EVENT_IDX VERSION_1 ACCESS_PLATFORM 1) provision vDPA device with all features that are supported by the virtio-pci # vdpa dev add name dev1 mgmtdev pci/0000:02:00.0 # vdpa dev config show dev1: mac 52:54:00:12:34:56 link up link_announce false mtu 65535 negotiated_features CSUM GUEST_CSUM CTRL_GUEST_OFFLOADS MAC GUEST_TSO4 GUEST_TSO6 GUEST_ECN GUEST_UFO HOST_TSO4 HOST_TSO6 HOST_ECN HOST_UFO MRG_RXBUF STATUS CTRL_VQ CTRL_RX CTRL_VLAN GUEST_ANNOUNCE CTRL_MAC_ADDR RING_INDIRECT_DESC RING_EVENT_IDX VERSION_1 ACCESS_PLATFORM 2) provision vDPA device with a subset of the features # vdpa dev add name dev1 mgmtdev pci/0000:02:00.0 device_features 0x300020000 # dev1: mac 52:54:00:12:34:56 link up link_announce false mtu 65535 negotiated_features CTRL_VQ VERSION_1 ACCESS_PLATFORM Reviewed-by: Eli Cohen <elic@nvidia.com> Signed-off-by: Jason Wang <jasowang@redhat.com> Message-Id: <20220927074810.28627-4-jasowang@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
1 parent 477f719 commit c1ca352

File tree

1 file changed

+20
-2
lines changed

1 file changed

+20
-2
lines changed

drivers/vdpa/virtio_pci/vp_vdpa.c

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <linux/virtio_ring.h>
1818
#include <linux/virtio_pci.h>
1919
#include <linux/virtio_pci_modern.h>
20+
#include <uapi/linux/vdpa.h>
2021

2122
#define VP_VDPA_QUEUE_MAX 256
2223
#define VP_VDPA_DRIVER_NAME "vp_vdpa"
@@ -35,6 +36,7 @@ struct vp_vdpa {
3536
struct virtio_pci_modern_device *mdev;
3637
struct vp_vring *vring;
3738
struct vdpa_callback config_cb;
39+
u64 device_features;
3840
char msix_name[VP_VDPA_NAME_SIZE];
3941
int config_irq;
4042
int queues;
@@ -66,9 +68,9 @@ static struct virtio_pci_modern_device *vp_vdpa_to_mdev(struct vp_vdpa *vp_vdpa)
6668

6769
static u64 vp_vdpa_get_device_features(struct vdpa_device *vdpa)
6870
{
69-
struct virtio_pci_modern_device *mdev = vdpa_to_mdev(vdpa);
71+
struct vp_vdpa *vp_vdpa = vdpa_to_vp(vdpa);
7072

71-
return vp_modern_get_features(mdev);
73+
return vp_vdpa->device_features;
7274
}
7375

7476
static int vp_vdpa_set_driver_features(struct vdpa_device *vdpa, u64 features)
@@ -475,6 +477,7 @@ static int vp_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name,
475477
struct pci_dev *pdev = mdev->pci_dev;
476478
struct device *dev = &pdev->dev;
477479
struct vp_vdpa *vp_vdpa = NULL;
480+
u64 device_features;
478481
int ret, i;
479482

480483
vp_vdpa = vdpa_alloc_device(struct vp_vdpa, vdpa,
@@ -491,6 +494,20 @@ static int vp_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name,
491494
vp_vdpa->queues = vp_modern_get_num_queues(mdev);
492495
vp_vdpa->mdev = mdev;
493496

497+
device_features = vp_modern_get_features(mdev);
498+
if (add_config->mask & BIT_ULL(VDPA_ATTR_DEV_FEATURES)) {
499+
if (add_config->device_features & ~device_features) {
500+
ret = -EINVAL;
501+
dev_err(&pdev->dev, "Try to provision features "
502+
"that are not supported by the device: "
503+
"device_features 0x%llx provisioned 0x%llx\n",
504+
device_features, add_config->device_features);
505+
goto err;
506+
}
507+
device_features = add_config->device_features;
508+
}
509+
vp_vdpa->device_features = device_features;
510+
494511
ret = devm_add_action_or_reset(dev, vp_vdpa_free_irq_vectors, pdev);
495512
if (ret) {
496513
dev_err(&pdev->dev,
@@ -599,6 +616,7 @@ static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
599616
mgtdev->id_table = mdev_id;
600617
mgtdev->max_supported_vqs = vp_modern_get_num_queues(mdev);
601618
mgtdev->supported_features = vp_modern_get_features(mdev);
619+
mgtdev->config_attr_mask = (1 << VDPA_ATTR_DEV_FEATURES);
602620
pci_set_master(pdev);
603621
pci_set_drvdata(pdev, vp_vdpa_mgtdev);
604622

0 commit comments

Comments
 (0)