Commit e2213a2d authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools include UAPI: Sync linux/vhost.h with the kernel sources 

To get the changes in:

  84d7c8fd ("vhost-vdpa: introduce uAPI to set group ASID")
  2d1fcb77 ("vhost-vdpa: uAPI to get virtqueue group id")
  a0c95f20 ("vhost-vdpa: introduce uAPI to get the number of address spaces")
  3ace88bd ("vhost-vdpa: introduce uAPI to get the number of virtqueue groups")
  175d493c ("vhost: move the backend feature bits to vhost_types.h")

Silencing this perf build warning:

  Warning: Kernel ABI header at 'tools/include/uapi/linux/vhost.h' differs from latest version at 'include/uapi/linux/vhost.h'
  diff -u tools/include/uapi/linux/vhost.h include/uapi/linux/vhost.h

To pick up these changes and support them:

  $ tools/perf/trace/beauty/vhost_virtio_ioctl.sh > before
  $ cp include/uapi/linux/vhost.h tools/include/uapi/linux/vhost.h
  $ tools/perf/trace/beauty/vhost_virtio_ioctl.sh > after
  $ diff -u before after
  --- before	2022-06-26 12:04:35.982003781 -0300
  +++ after	2022-06-26 12:04:43.819972476 -0300
  @@ -28,6 +28,7 @@
   	[0x74] = "VDPA_SET_CONFIG",
   	[0x75] = "VDPA_SET_VRING_ENABLE",
   	[0x77] = "VDPA_SET_CONFIG_CALL",
  +	[0x7C] = "VDPA_SET_GROUP_ASID",
   };
   static const char *vhost_virtio_ioctl_read_cmds[] = {
   	[0x00] = "GET_FEATURES",
  @@ -39,5 +40,8 @@
   	[0x76] = "VDPA_GET_VRING_NUM",
   	[0x78] = "VDPA_GET_IOVA_RANGE",
   	[0x79] = "VDPA_GET_CONFIG_SIZE",
  +	[0x7A] = "VDPA_GET_AS_NUM",
  +	[0x7B] = "VDPA_GET_VRING_GROUP",
   	[0x80] = "VDPA_GET_VQS_COUNT",
  +	[0x81] = "VDPA_GET_GROUP_NUM",
   };
  $

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Gautam Dawar <gautam.dawar@xilinx.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/lkml/Yrh3xMYbfeAD0MFL@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 448ce0e6

tools/include/uapi/linux/vhost.h

+20 −6
Original line number Diff line number Diff line
@@ -89,11 +89,6 @@ 


/* Set or get vhost backend capability */



/* Use message type V2 */

#define VHOST_BACKEND_F_IOTLB_MSG_V2 0x1

/* IOTLB can accept batching hints */

#define VHOST_BACKEND_F_IOTLB_BATCH  0x2



#define VHOST_SET_BACKEND_FEATURES _IOW(VHOST_VIRTIO, 0x25, __u64)

#define VHOST_GET_BACKEND_FEATURES _IOR(VHOST_VIRTIO, 0x26, __u64)
@@ -150,11 +145,30 @@ 
/* Get the valid iova range */

#define VHOST_VDPA_GET_IOVA_RANGE	_IOR(VHOST_VIRTIO, 0x78, \

					     struct vhost_vdpa_iova_range)



/* Get the config size */

#define VHOST_VDPA_GET_CONFIG_SIZE	_IOR(VHOST_VIRTIO, 0x79, __u32)



/* Get the count of all virtqueues */

#define VHOST_VDPA_GET_VQS_COUNT	_IOR(VHOST_VIRTIO, 0x80, __u32)



/* Get the number of virtqueue groups. */

#define VHOST_VDPA_GET_GROUP_NUM	_IOR(VHOST_VIRTIO, 0x81, __u32)



/* Get the number of address spaces. */

#define VHOST_VDPA_GET_AS_NUM		_IOR(VHOST_VIRTIO, 0x7A, unsigned int)



/* Get the group for a virtqueue: read index, write group in num,

 * The virtqueue index is stored in the index field of

 * vhost_vring_state. The group for this specific virtqueue is

 * returned via num field of vhost_vring_state.

 */

#define VHOST_VDPA_GET_VRING_GROUP	_IOWR(VHOST_VIRTIO, 0x7B,	\

					      struct vhost_vring_state)

/* Set the ASID for a virtqueue group. The group index is stored in

 * the index field of vhost_vring_state, the ASID associated with this

 * group is stored at num field of vhost_vring_state.

 */

#define VHOST_VDPA_SET_GROUP_ASID	_IOW(VHOST_VIRTIO, 0x7C, \

					     struct vhost_vring_state)



#endif