vdpa: Support reporting max device capabilities

Add max_supported_vqs and supported_features fields to struct
vdpa_mgmt_dev. Upstream drivers need to feel these values according to
the device capabilities.

These values are reported back in a netlink message when showing management
devices.

Examples:

$ auxiliary/mlx5_core.sf.1:
  supported_classes net
  max_supported_vqs 257
  dev_features CSUM GUEST_CSUM MTU HOST_TSO4 HOST_TSO6 STATUS CTRL_VQ MQ \
               CTRL_MAC_ADDR VERSION_1 ACCESS_PLATFORM

$ vdpa -j mgmtdev show
{"mgmtdev":{"auxiliary/mlx5_core.sf.1":{"supported_classes":["net"], \
  "max_supported_vqs":257,"dev_features":["CSUM","GUEST_CSUM","MTU", \
  "HOST_TSO4","HOST_TSO6","STATUS","CTRL_VQ","MQ","CTRL_MAC_ADDR", \
  "VERSION_1","ACCESS_PLATFORM"]}}}

$ vdpa -jp mgmtdev show
{
    "mgmtdev": {
        "auxiliary/mlx5_core.sf.1": {
            "supported_classes": [ "net" ],
            "max_supported_vqs": 257,
            "dev_features": ["CSUM","GUEST_CSUM","MTU","HOST_TSO4", \
                             "HOST_TSO6","STATUS","CTRL_VQ","MQ", \
                             "CTRL_MAC_ADDR","VERSION_1","ACCESS_PLATFORM"]
        }
    }
}

Signed-off-by: Eli Cohen <elic@nvidia.com>
Link: https://lore.kernel.org/r/20220105114646.577224-11-elic@nvidia.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Si-Wei Liu<si-wei.liu@oracle.com>

diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c
index 60cf821175fa79985ce124dcfc2edd45d6da7245..34fa251db8cc3c1bc5fb3713204a0a285016a438 100644 (file)
--- a/drivers/vdpa/vdpa.c
+++ b/drivers/vdpa/vdpa.c
@@ -514,6 +514,16 @@ static int vdpa_mgmtdev_fill(const struct vdpa_mgmt_dev *mdev, struct sk_buff *m
                err = -EMSGSIZE;
                goto msg_err;
        }
+       if (nla_put_u32(msg, VDPA_ATTR_DEV_MGMTDEV_MAX_VQS,
+                       mdev->max_supported_vqs)) {
+               err = -EMSGSIZE;
+               goto msg_err;
+       }
+       if (nla_put_u64_64bit(msg, VDPA_ATTR_DEV_SUPPORTED_FEATURES,
+                             mdev->supported_features, VDPA_ATTR_PAD)) {
+               err = -EMSGSIZE;
+               goto msg_err;
+       }
 
        genlmsg_end(msg, hdr);
        return 0;

diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h
index 6d4d7e4fe20849043d4b2ce4bc9a4624d91aea9c..a6047fd6cf12301d30ac4f2875dab83c014e63f0 100644 (file)
--- a/include/linux/vdpa.h
+++ b/include/linux/vdpa.h
@@ -460,6 +460,8 @@ struct vdpa_mgmt_dev {
        const struct virtio_device_id *id_table;
        u64 config_attr_mask;
        struct list_head list;
+       u64 supported_features;
+       u32 max_supported_vqs;
 };
 
 int vdpa_mgmtdev_register(struct vdpa_mgmt_dev *mdev);

diff --git a/include/uapi/linux/vdpa.h b/include/uapi/linux/vdpa.h
index db3738ef3beb4d2fc59008583ecbb4e534861f71..1061d8d2d09d4647e2e65dc1a80fc5dc457496b9 100644 (file)
--- a/include/uapi/linux/vdpa.h
+++ b/include/uapi/linux/vdpa.h
@@ -44,6 +44,8 @@ enum vdpa_attr {
        VDPA_ATTR_DEV_NET_CFG_MTU,              /* u16 */
 
        VDPA_ATTR_DEV_NEGOTIATED_FEATURES,      /* u64 */
+       VDPA_ATTR_DEV_MGMTDEV_MAX_VQS,          /* u32 */
+       VDPA_ATTR_DEV_SUPPORTED_FEATURES,       /* u64 */
        /* new attributes must be added above here */
        VDPA_ATTR_MAX,
 };