History

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

Pull virtio updates from Michael Tsirkin: - vdpa/mlx5: support for resumable vqs - virtio_scsi: mq_poll support - 3virtio_pmem: support SHMEM_REGION - virtio_balloon: stay awake while adjusting balloon - virtio: support for no-reset virtio PCI PM - Fixes, cleanups * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: vdpa/mlx5: Add mkey leak detection vdpa/mlx5: Introduce reference counting to mrs vdpa/mlx5: Use vq suspend/resume during .set_map vdpa/mlx5: Mark vq state for modification in hw vq vdpa/mlx5: Mark vq addrs for modification in hw vq vdpa/mlx5: Introduce per vq and device resume vdpa/mlx5: Allow modifying multiple vq fields in one modify command vdpa/mlx5: Expose resumable vq capability vdpa: Block vq property changes in DRIVER_OK vdpa: Track device suspended state scsi: virtio_scsi: Add mq_poll support virtio_pmem: support feature SHMEM_REGION virtio_balloon: stay awake while adjusting balloon vdpa: Remove usage of the deprecated ida_simple_xx() API virtio: Add support for no-reset virtio PCI PM virtio_net: fix missing dma unmap for resize vhost-vdpa: account iommu allocations vdpa: Fix an error handling path in eni_vdpa_probe()

Linus Torvalds committed 2 years ago

Commit 0b7359c2 parents da3c45c f16d65113 files · +478 −65Browse files

Showing the changes to include/uapi/linux (1 of 13 files). Show all

Unified · Split

include/uapi/linux/virtio_pmem.h+7−0
@@ -14,6 +14,13 @@ · 13 unmodified lines
14#include <linux/virtio_ids.h>14#include <linux/virtio_ids.h>
15#include <linux/virtio_config.h>15#include <linux/virtio_config.h>
16 16
17/* Feature bits */
18/* guest physical address range will be indicated as shared memory region 0 */
19#define VIRTIO_PMEM_F_SHMEM_REGION 0
20
21/* shmid of the shared memory region corresponding to the pmem */
22#define VIRTIO_PMEM_SHMEM_REGION_ID 0
23
17struct virtio_pmem_config {24struct virtio_pmem_config {
18 __le64 start;25 __le64 start;
19 __le64 size;26 __le64 size;