From: Peter Xu <peterx@redhat.com>
To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: dinechin@redhat.com, sean.j.christopherson@intel.com,
pbonzini@redhat.com, jasowang@redhat.com, yan.y.zhao@intel.com,
mst@redhat.com, peterx@redhat.com, kevin.tian@intel.com,
alex.williamson@redhat.com, dgilbert@redhat.com,
vkuznets@redhat.com
Subject: [PATCH 09/14] KVM: selftests: Sync uapi/linux/kvm.h to tools/
Date: Tue, 4 Feb 2020 21:58:37 -0500 [thread overview]
Message-ID: <20200205025842.367575-6-peterx@redhat.com> (raw)
In-Reply-To: <20200205025842.367575-1-peterx@redhat.com>
This will be needed to extend the kvm selftest program.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
tools/include/uapi/linux/kvm.h | 44 ++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/tools/include/uapi/linux/kvm.h b/tools/include/uapi/linux/kvm.h
index f0a16b4adbbd..5877d7fa88d1 100644
--- a/tools/include/uapi/linux/kvm.h
+++ b/tools/include/uapi/linux/kvm.h
@@ -236,6 +236,7 @@ struct kvm_hyperv_exit {
#define KVM_EXIT_IOAPIC_EOI 26
#define KVM_EXIT_HYPERV 27
#define KVM_EXIT_ARM_NISV 28
+#define KVM_EXIT_DIRTY_RING_FULL 29
/* For KVM_EXIT_INTERNAL_ERROR */
/* Emulate instruction failed. */
@@ -1009,6 +1010,7 @@ struct kvm_ppc_resize_hpt {
#define KVM_CAP_PPC_GUEST_DEBUG_SSTEP 176
#define KVM_CAP_ARM_NISV_TO_USER 177
#define KVM_CAP_ARM_INJECT_EXT_DABT 178
+#define KVM_CAP_DIRTY_LOG_RING 179
#ifdef KVM_CAP_IRQ_ROUTING
@@ -1473,6 +1475,9 @@ struct kvm_enc_region {
/* Available with KVM_CAP_ARM_SVE */
#define KVM_ARM_VCPU_FINALIZE _IOW(KVMIO, 0xc2, int)
+/* Available with KVM_CAP_DIRTY_LOG_RING */
+#define KVM_RESET_DIRTY_RINGS _IO(KVMIO, 0xc3)
+
/* Secure Encrypted Virtualization command */
enum sev_cmd_id {
/* Guest initialization commands */
@@ -1623,4 +1628,43 @@ struct kvm_hyperv_eventfd {
#define KVM_HYPERV_CONN_ID_MASK 0x00ffffff
#define KVM_HYPERV_EVENTFD_DEASSIGN (1 << 0)
+/*
+ * KVM dirty GFN flags, defined as:
+ *
+ * |---------------+---------------+--------------|
+ * | bit 1 (reset) | bit 0 (dirty) | Status |
+ * |---------------+---------------+--------------|
+ * | 0 | 0 | Invalid GFN |
+ * | 0 | 1 | Dirty GFN |
+ * | 1 | X | GFN to reset |
+ * |---------------+---------------+--------------|
+ *
+ * Lifecycle of a dirty GFN goes like:
+ *
+ * dirtied collected reset
+ * 00 -----------> 01 -------------> 1X -------+
+ * ^ |
+ * | |
+ * +------------------------------------------+
+ *
+ * The userspace program is only responsible for the 01->1X state
+ * conversion (to collect dirty bits). Also, it must not skip any
+ * dirty bits so that dirty bits are always collected in sequence.
+ */
+#define KVM_DIRTY_GFN_F_DIRTY BIT(0)
+#define KVM_DIRTY_GFN_F_RESET BIT(1)
+#define KVM_DIRTY_GFN_F_MASK 0x3
+
+/*
+ * KVM dirty rings should be mapped at KVM_DIRTY_LOG_PAGE_OFFSET of
+ * per-vcpu mmaped regions as an array of struct kvm_dirty_gfn. The
+ * size of the gfn buffer is decided by the first argument when
+ * enabling KVM_CAP_DIRTY_LOG_RING.
+ */
+struct kvm_dirty_gfn {
+ __u32 flags;
+ __u32 slot;
+ __u64 offset;
+};
+
#endif /* __LINUX_KVM_H */
--
2.24.1
next prev parent reply other threads:[~2020-02-05 2:59 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-05 2:50 [PATCH v4 00/14] KVM: Dirty ring interface Peter Xu
2020-02-05 2:50 ` [PATCH v4 01/14] KVM: X86: Change parameter for fast_page_fault tracepoint Peter Xu
2020-02-05 2:50 ` [PATCH v4 02/14] KVM: Cache as_id in kvm_memory_slot Peter Xu
2020-02-05 2:50 ` [PATCH v4 03/14] KVM: X86: Don't track dirty for KVM_SET_[TSS_ADDR|IDENTITY_MAP_ADDR] Peter Xu
2020-02-05 2:58 ` [PATCH 04/14] KVM: Pass in kvm pointer into mark_page_dirty_in_slot() Peter Xu
2020-02-05 2:58 ` [PATCH 05/14] KVM: X86: Implement ring-based dirty memory tracking Peter Xu
2020-02-05 2:58 ` [PATCH 06/14] KVM: Make dirty ring exclusive to dirty bitmap log Peter Xu
2020-02-05 2:58 ` [PATCH 07/14] KVM: Don't allocate dirty bitmap if dirty ring is enabled Peter Xu
2020-02-05 2:58 ` [PATCH 08/14] KVM: selftests: Always clear dirty bitmap after iteration Peter Xu
2020-02-05 2:58 ` Peter Xu [this message]
2020-02-05 2:58 ` [PATCH 10/14] KVM: selftests: Use a single binary for dirty/clear log test Peter Xu
2020-02-05 9:28 ` Andrew Jones
2020-02-05 15:46 ` Peter Xu
2020-02-05 17:11 ` Andrew Jones
2020-02-05 17:39 ` Peter Xu
2020-02-06 22:40 ` Peter Xu
2020-02-07 8:31 ` Andrew Jones
2020-02-05 2:58 ` [PATCH 11/14] KVM: selftests: Introduce after_vcpu_run hook for dirty " Peter Xu
2020-02-05 2:58 ` [PATCH 12/14] KVM: selftests: Add dirty ring buffer test Peter Xu
2020-02-05 2:58 ` [PATCH 13/14] KVM: selftests: Let dirty_log_test async for dirty ring test Peter Xu
2020-02-05 9:48 ` Andrew Jones
2020-02-05 15:55 ` Peter Xu
2020-02-05 17:15 ` Andrew Jones
2020-02-05 3:00 ` [PATCH 14/14] KVM: selftests: Add "-c" parameter to dirty log test Peter Xu
2020-03-03 17:33 ` [PATCH v4 00/14] KVM: Dirty ring interface Peter Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200205025842.367575-6-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=dgilbert@redhat.com \
--cc=dinechin@redhat.com \
--cc=jasowang@redhat.com \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=sean.j.christopherson@intel.com \
--cc=vkuznets@redhat.com \
--cc=yan.y.zhao@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).