c300b8e80b
- vfio/migration: Add support for manual clear vfio dirty log - vfio: Maintain DMA mapping range for the container - linux-headers: update against 5.10 and manual clear vfio dirty log series - arm/acpi: Fix when make qemu-system-aarch64 at x86_64 host bios_tables_test fail reason: __aarch64__ macro let build_pptt at x86_64 and aarch64 host build different function that let bios_tables_test fail. - pl031: support rtc-timer property for pl031 - feature: Add logs for vm start and destroy - feature: Add log for each modules - log: Add log at boot & cpu init for aarch64 - bugfix: irq: Avoid covering object refcount of qemu_irq - i386: cache passthrough: Update AMD 8000_001D.EAX[25:14] based on vCPU topo - freeclock: set rtc_date_diff for X86 - freeclock: set rtc_date_diff for arm - freeclock: add qmp command to get time offset of vm in seconds - tests: Disable filemonitor testcase - shadow_dev: introduce shadow dev for virtio-net device - pl011: reset read FIFO when UARTTIMSC=0 & UARTICR=0xffff - tests: virt: Update expected ACPI tables for virt test(update BinDir) - arm64: Add the cpufreq device to show cpufreq info to guest - hw/arm64: add vcpu cache info support - tests: virt: Allow changes to PPTT test table - cpu: add Cortex-A72 processor kvm target support - cpu: add Kunpeng-920 cpu support - net: eepro100: validate various address valuesi(CVE-2021-20255) - ide: ahci: add check to avoid null dereference (CVE-2019-12067) - vdpa: set vring enable only if the vring address has already been set - docs: Add generic vhost-vdpa device documentation - vdpa: don't suspend/resume device when vdpa device not started - vdpa: correct param passed in when unregister save - vdpa: suspend function return 0 when the vdpa device is stopped - vdpa: support vdpa device suspend/resume - vdpa: move memory listener to the realize stage - vdpa: implement vdpa device migration - vhost: implement migration state notifier for vdpa device - vhost: implement post resume bh - vhost: implement savevm_handler for vdpa device - vhost: implement vhost_vdpa_device_suspend/resume - vhost: implement vhost-vdpa suspend/resume - vhost: add vhost_dev_suspend/resume_op - vhost: introduce bytemap for vhost backend logging - vhost-vdpa: add migration log ops for VhostOps - vhost-vdpa: add VHOST_BACKEND_F_BYTEMAPLOG - hw/usb: reduce the vpcu cost of UHCI when VNC disconnect - virtio-net: update the default and max of rx/tx_queue_size - virtio-net: set the max of queue size to 4096 - virtio-net: fix max vring buf size when set ring num - virtio-net: bugfix: do not delete netdev before virtio net - monitor: Discard BLOCK_IO_ERROR event when VM rebooted - vhost-user: add unregister_savevm when vhost-user cleanup - vhost-user: add vhost_set_mem_table when vm load_setup at destination - vhost-user: quit infinite loop while used memslots is more than the backend limit - fix qemu-core when vhost-user-net config with server mode - vhost-user: Add support reconnect vhost-user socket - vhost-user: Set the acked_features to vm's featrue - i6300esb watchdog: bugfix: Add a runstate transition - hw/net/rocker_of_dpa: fix double free bug of rocker device - net/dump.c: Suppress spurious compiler warning - pcie: Add pcie-root-port fast plug/unplug feature - pcie: Compat with devices which do not support Link Width, such as ioh3420 - qdev/monitors: Fix reundant error_setg of qdev_add_device - qemu-nbd: set timeout to qemu-nbd socket - qemu-nbd: make native as the default aio mode - nbd/server.c: fix invalid read after client was already free - virtio-scsi: bugfix: fix qemu crash for hotplug scsi disk with dataplane - virtio: bugfix: check the value of caches before accessing it - virtio: print the guest virtio_net features that host does not support - virtio: bugfix: add rcu_read_lock when vring_avail_idx is called - virtio: check descriptor numbers - migration: report multiFd related thread pid to libvirt - migration: report migration related thread pid to libvirt - cpu/features: fix bug for memory leakage - doc: Update multi-thread compression doc - migration: Add compress_level sanity check - migration: Add zstd support in multi-thread compression - migration: Add multi-thread compress ops - migration: Refactoring multi-thread compress migration - migration: Add multi-thread compress method - migration: skip cache_drop for bios bootloader and nvram template - oslib-posix: optimise vm startup time for 1G hugepage - monitor/qmp: drop inflight rsp if qmp client broken - ps2: fix oob in ps2 kbd - Currently, while kvm and qemu can not handle some kvm exit, qemu will do vm_stop, which will make vm in pause state. This action make vm unrecoverable, so send guest panic to libvirt instead. - vhost: cancel migration when vhost-user restarted during migraiton Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
83 lines
3.7 KiB
Diff
83 lines
3.7 KiB
Diff
From 2ccd1ec0d18070727ad9b9647da6b6937f16de2a Mon Sep 17 00:00:00 2001
|
|
From: Zenghui Yu <yuzenghui@huawei.com>
|
|
Date: Sat, 8 May 2021 17:31:03 +0800
|
|
Subject: [PATCH] linux-headers: update against 5.10 and manual clear vfio
|
|
dirty log series
|
|
|
|
The new capability VFIO_DIRTY_LOG_MANUAL_CLEAR and the new ioctl
|
|
VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP_NOCLEAR and
|
|
VFIO_IOMMU_DIRTY_PAGES_FLAG_CLEAR_BITMAP have been introduced in
|
|
the kernel, update the header to add them.
|
|
|
|
Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
|
|
Signed-off-by: Kunkun Jiang <jiangkunkun@huawei.com>
|
|
---
|
|
linux-headers/linux/vfio.h | 36 +++++++++++++++++++++++++++++++++++-
|
|
1 file changed, 35 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/linux-headers/linux/vfio.h b/linux-headers/linux/vfio.h
|
|
index 8e175ece31..956154e509 100644
|
|
--- a/linux-headers/linux/vfio.h
|
|
+++ b/linux-headers/linux/vfio.h
|
|
@@ -56,6 +56,16 @@
|
|
*/
|
|
#define VFIO_UPDATE_VADDR 10
|
|
|
|
+/*
|
|
+ * The vfio_iommu driver may support user clears dirty log manually, which means
|
|
+ * dirty log can be requested to not cleared automatically after dirty log is
|
|
+ * copied to userspace, it's user's duty to clear dirty log.
|
|
+ *
|
|
+ * Note: please refer to VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP_NOCLEAR and
|
|
+ * VFIO_IOMMU_DIRTY_PAGES_FLAG_CLEAR_BITMAP.
|
|
+ */
|
|
+#define VFIO_DIRTY_LOG_MANUAL_CLEAR 11
|
|
+
|
|
/*
|
|
* The IOCTL interface is designed for extensibility by embedding the
|
|
* structure length (argsz) and flags into structures passed between
|
|
@@ -1651,8 +1661,30 @@ struct vfio_iommu_type1_dma_unmap {
|
|
* actual bitmap. If dirty pages logging is not enabled, an error will be
|
|
* returned.
|
|
*
|
|
- * Only one of the flags _START, _STOP and _GET may be specified at a time.
|
|
+ * The VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP_NOCLEAR flag is almost same as
|
|
+ * VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP, except that it requires underlying
|
|
+ * dirty bitmap is not cleared automatically. The user can clear it manually by
|
|
+ * calling the IOCTL with VFIO_IOMMU_DIRTY_PAGES_FLAG_CLEAR_BITMAP flag set.
|
|
*
|
|
+ * Calling the IOCTL with VFIO_IOMMU_DIRTY_PAGES_FLAG_CLEAR_BITMAP flag set,
|
|
+ * instructs the IOMMU driver to clear the dirty status of pages in a bitmap
|
|
+ * for IOMMU container for a given IOVA range. The user must specify the IOVA
|
|
+ * range, the bitmap and the pgsize through the structure
|
|
+ * vfio_iommu_type1_dirty_bitmap_get in the data[] portion. This interface
|
|
+ * supports clearing a bitmap of the smallest supported pgsize only and can be
|
|
+ * modified in future to clear a bitmap of any specified supported pgsize. The
|
|
+ * user must provide a memory area for the bitmap memory and specify its size
|
|
+ * in bitmap.size. One bit is used to represent one page consecutively starting
|
|
+ * from iova offset. The user should provide page size in bitmap.pgsize field.
|
|
+ * A bit set in the bitmap indicates that the page at that offset from iova is
|
|
+ * cleared the dirty status, and dirty tracking is re-enabled for that page. The
|
|
+ * caller must set argsz to a value including the size of structure
|
|
+ * vfio_iommu_dirty_bitmap_get, but excluing the size of the actual bitmap. If
|
|
+ * dirty pages logging is not enabled, an error will be returned. Note: user
|
|
+ * should clear dirty log before handle corresponding dirty pages.
|
|
+ *
|
|
+ * Only one of the flags _START, _STOP, _GET, _GET_NOCLEAR_, and _CLEAR may be
|
|
+ * specified at a time.
|
|
*/
|
|
struct vfio_iommu_type1_dirty_bitmap {
|
|
__u32 argsz;
|
|
@@ -1660,6 +1692,8 @@ struct vfio_iommu_type1_dirty_bitmap {
|
|
#define VFIO_IOMMU_DIRTY_PAGES_FLAG_START (1 << 0)
|
|
#define VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP (1 << 1)
|
|
#define VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP (1 << 2)
|
|
+#define VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP_NOCLEAR (1 << 3)
|
|
+#define VFIO_IOMMU_DIRTY_PAGES_FLAG_CLEAR_BITMAP (1 << 4)
|
|
__u8 data[];
|
|
};
|
|
|
|
--
|
|
2.27.0
|
|
|