83 lines
3.8 KiB
Diff
83 lines
3.8 KiB
Diff
From 40512773625a4f8ddd96a5af924f119b89a14706 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 e680594f27..f4ff038e8c 100644
|
|
--- a/linux-headers/linux/vfio.h
|
|
+++ b/linux-headers/linux/vfio.h
|
|
@@ -52,6 +52,16 @@
|
|
/* Supports the vaddr flag for DMA map and unmap */
|
|
#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
|
|
@@ -1196,8 +1206,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;
|
|
@@ -1205,6 +1237,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
|
|
|