Pull virtio updates from Michael Tsirkin: "virtio,vdpa,qemu_fw_cfg: features, cleanups, and fixes. - partial support for < MAX_ORDER - 1 granularity for virtio-mem - driver_override for vdpa - sysfs ABI documentation for vdpa - multiqueue config support for mlx5 vdpa - and misc fixes, cleanups" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (42 commits) vdpa/mlx5: Fix tracking of current number of VQs vdpa/mlx5: Fix is_index_valid() to refer to features vdpa: Protect vdpa reset with cf_mutex vdpa: Avoid taking cf_mutex lock on get status vdpa/vdpa_sim_net: Report max device capabilities vdpa: Use BIT_ULL for bit operations vdpa/vdpa_sim: Configure max supported virtqueues vdpa/mlx5: Report max device capabilities vdpa: Support reporting max device capabilities vdpa/mlx5: Restore cur_num_vqs in case of failure in change_num_qps() vdpa: Add support for returning device configuration information vdpa/mlx5: Support configuring max data virtqueue vdpa/mlx5: Fix config_attr_mask assignment vdpa: Allow to configure max data virtqueues vdpa: Read device configuration only if FEATURES_OK vdpa: Sync calls set/get config/status with cf_mutex vdpa/mlx5: Distribute RX virtqueues in RQT object vdpa: Provide interface to read driver features vdpa: clean up get_config_size ret value handling virtio_ring: mark ring unused on error ...
Showing the changes to include/uapi/linux (1 of 47 files). Show all
Unified · Split
| @@ -23,6 +23,9 @@ enum vdpa_command { · 22 unmodified lines | ||
| 23 | 23 | enum vdpa_attr { |
| 24 | 24 | VDPA_ATTR_UNSPEC, |
| 25 | 25 | |
| 26 | + /* Pad attribute for 64b alignment */ | |
| 27 | + VDPA_ATTR_PAD = VDPA_ATTR_UNSPEC, | |
| 28 | + | |
| 26 | 29 | /* bus name (optional) + dev name together make the parent device handle */ |
| 27 | 30 | VDPA_ATTR_MGMTDEV_BUS_NAME, /* string */ |
| 28 | 31 | VDPA_ATTR_MGMTDEV_DEV_NAME, /* string */ |
| @@ -40,6 +43,9 @@ enum vdpa_attr { · 11 unmodified lines | ||
| 40 | 43 | VDPA_ATTR_DEV_NET_CFG_MAX_VQP, /* u16 */ |
| 41 | 44 | VDPA_ATTR_DEV_NET_CFG_MTU, /* u16 */ |
| 42 | 45 | |
| 46 | + VDPA_ATTR_DEV_NEGOTIATED_FEATURES, /* u64 */ | |
| 47 | + VDPA_ATTR_DEV_MGMTDEV_MAX_VQS, /* u32 */ | |
| 48 | + VDPA_ATTR_DEV_SUPPORTED_FEATURES, /* u64 */ | |
| 43 | 49 | /* new attributes must be added above here */ |
| 44 | 50 | VDPA_ATTR_MAX, |
| 45 | 51 | }; |