History

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Pull virtio updates from Michael Tsirkin: "vhost,virtio,vdpa: features, fixes, cleanups. vdpa/mlx5: - VHOST_BACKEND_F_ENABLE_AFTER_DRIVER_OK - new maintainer vdpa: - support for vq descriptor mappings - decouple reset of iotlb mapping from device reset and fixes, cleanups all over the place" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (34 commits) vdpa_sim: implement .reset_map support vdpa/mlx5: implement .reset_map driver op vhost-vdpa: clean iotlb map during reset for older userspace vdpa: introduce .compat_reset operation callback vhost-vdpa: introduce IOTLB_PERSIST backend feature bit vhost-vdpa: reset vendor specific mapping to initial state in .release vdpa: introduce .reset_map operation callback virtio_pci: add check for common cfg size virtio-blk: fix implicit overflow on virtio_max_dma_size virtio_pci: add build offset check for the new common cfg items virtio: add definition of VIRTIO_F_NOTIF_CONFIG_DATA feature bit vduse: make vduse_class constant vhost-scsi: Spelling s/preceeding/preceding/g virtio: kdoc for struct virtio_pci_modern_device vdpa: Update sysfs ABI documentation MAINTAINERS: Add myself as mlx5_vdpa driver virtio-balloon: correct the comment of virtballoon_migratepage() mlx5_vdpa: offer VHOST_BACKEND_F_ENABLE_AFTER_DRIVER_OK vdpa/mlx5: Update cvq iotlb mapping on ASID change vdpa/mlx5: Make iotlb helper functions more generic ...

Linus Torvalds committed 3 years ago

Commit 77fa2fb2 parents 1cfb751 86f6c2222 files · +544 −184Browse files

Showing the changes to include/linux/mlx5 (2 of 22 files). Show all

Unified · Split

2 files
  1. include/linux/mlx5/mlx5_ifc.h +7 −1
  2. include/linux/mlx5/mlx5_ifc_vdpa.h +6 −1
include/linux/mlx5/mlx5_ifc.h+7−1
@@ -1232,7 +1232,13 @@ struct mlx5_ifc_virtio_emulation_cap_bits { · 1231 unmodified lines
1232 u8 max_emulated_devices[0x8];1232 u8 max_emulated_devices[0x8];
1233 u8 max_num_virtio_queues[0x18];1233 u8 max_num_virtio_queues[0x18];
1234 1234
1235 u8 reserved_at_a0[0x60];1235 u8 reserved_at_a0[0x20];
1236
1237 u8 reserved_at_c0[0x13];
1238 u8 desc_group_mkey_supported[0x1];
1239 u8 reserved_at_d4[0xc];
1240
1241 u8 reserved_at_e0[0x20];
1236 1242
1237 u8 umem_1_buffer_param_a[0x20];1243 u8 umem_1_buffer_param_a[0x20];
1238 1244
include/linux/mlx5/mlx5_ifc_vdpa.h+6−1
@@ -74,7 +74,11 @@ struct mlx5_ifc_virtio_q_bits { · 73 unmodified lines
74 u8 reserved_at_320[0x8];74 u8 reserved_at_320[0x8];
75 u8 pd[0x18];75 u8 pd[0x18];
76 76
77 u8 reserved_at_340[0xc0];77 u8 reserved_at_340[0x20];
78
79 u8 desc_group_mkey[0x20];
80
81 u8 reserved_at_380[0x80];
78};82};
79 83
80struct mlx5_ifc_virtio_net_q_object_bits {84struct mlx5_ifc_virtio_net_q_object_bits {
@@ -141,6 +145,7 @@ enum { · 60 unmodified lines
141 MLX5_VIRTQ_MODIFY_MASK_STATE = (u64)1 << 0,145 MLX5_VIRTQ_MODIFY_MASK_STATE = (u64)1 << 0,
142 MLX5_VIRTQ_MODIFY_MASK_DIRTY_BITMAP_PARAMS = (u64)1 << 3,146 MLX5_VIRTQ_MODIFY_MASK_DIRTY_BITMAP_PARAMS = (u64)1 << 3,
143 MLX5_VIRTQ_MODIFY_MASK_DIRTY_BITMAP_DUMP_ENABLE = (u64)1 << 4,147 MLX5_VIRTQ_MODIFY_MASK_DIRTY_BITMAP_DUMP_ENABLE = (u64)1 << 4,
148 MLX5_VIRTQ_MODIFY_MASK_DESC_GROUP_MKEY = (u64)1 << 14,
144};149};
145 150
146enum {151enum {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t