From: Peter Xu <peterx@redhat.com>
To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: "Dr . David Alan Gilbert" <dgilbert@redhat.com>,
Andrew Jones <drjones@redhat.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
peterx@redhat.com,
Sean Christopherson <sean.j.christopherson@intel.com>,
Kevin Tian <kevin.tian@intel.com>
Subject: [PATCH v10 09/14] KVM: selftests: Sync uapi/linux/kvm.h to tools/
Date: Mon, 1 Jun 2020 07:59:52 -0400 [thread overview]
Message-ID: <20200601115957.1581250-10-peterx@redhat.com> (raw)
In-Reply-To: <20200601115957.1581250-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 | 53 ++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/tools/include/uapi/linux/kvm.h b/tools/include/uapi/linux/kvm.h
index 428c7dde6b4b..74f150c69ee6 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. */
@@ -1017,6 +1018,7 @@ struct kvm_ppc_resize_hpt {
#define KVM_CAP_S390_VCPU_RESETS 179
#define KVM_CAP_S390_PROTECTED 180
#define KVM_CAP_PPC_SECURE_GUEST 181
+#define KVM_CAP_DIRTY_LOG_RING 182
#ifdef KVM_CAP_IRQ_ROUTING
@@ -1518,6 +1520,9 @@ struct kvm_pv_cmd {
/* Available with KVM_CAP_S390_PROTECTED */
#define KVM_S390_PV_COMMAND _IOWR(KVMIO, 0xc5, struct kvm_pv_cmd)
+/* Available with KVM_CAP_DIRTY_LOG_RING */
+#define KVM_RESET_DIRTY_RINGS _IO(KVMIO, 0xc6)
+
/* Secure Encrypted Virtualization command */
enum sev_cmd_id {
/* Guest initialization commands */
@@ -1671,4 +1676,52 @@ struct kvm_hyperv_eventfd {
#define KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE (1 << 0)
#define KVM_DIRTY_LOG_INITIALLY_SET (1 << 1)
+/*
+ * Arch needs to define the macro after implementing the dirty ring
+ * feature. KVM_DIRTY_LOG_PAGE_OFFSET should be defined as the
+ * starting page offset of the dirty ring structures.
+ */
+#ifndef KVM_DIRTY_LOG_PAGE_OFFSET
+#define KVM_DIRTY_LOG_PAGE_OFFSET 0
+#endif
+
+/*
+ * 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.26.2
next prev parent reply other threads:[~2020-06-01 12:00 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-01 11:59 [PATCH v10 00/14] KVM: Dirty ring interface Peter Xu
2020-06-01 11:59 ` [PATCH v10 01/14] KVM: X86: Change parameter for fast_page_fault tracepoint Peter Xu
2020-06-01 11:59 ` [PATCH v10 02/14] KVM: Cache as_id in kvm_memory_slot Peter Xu
2020-07-02 23:08 ` Sean Christopherson
2020-07-03 18:41 ` Peter Xu
2020-07-07 6:17 ` Sean Christopherson
2020-07-07 19:50 ` Peter Xu
2020-07-07 19:56 ` Sean Christopherson
2020-07-07 20:15 ` Peter Xu
2020-07-07 20:26 ` Sean Christopherson
2020-07-07 20:38 ` Peter Xu
2020-06-01 11:59 ` [PATCH v10 03/14] KVM: X86: Don't track dirty for KVM_SET_[TSS_ADDR|IDENTITY_MAP_ADDR] Peter Xu
2020-07-03 0:05 ` Sean Christopherson
2020-07-03 19:02 ` Peter Xu
2020-06-01 11:59 ` [PATCH v10 04/14] KVM: Pass in kvm pointer into mark_page_dirty_in_slot() Peter Xu
2020-06-01 11:59 ` [PATCH v10 05/14] KVM: X86: Implement ring-based dirty memory tracking Peter Xu
2020-06-01 11:59 ` [PATCH v10 06/14] KVM: Make dirty ring exclusive to dirty bitmap log Peter Xu
2020-06-01 11:59 ` [PATCH v10 07/14] KVM: Don't allocate dirty bitmap if dirty ring is enabled Peter Xu
2020-06-01 11:59 ` [PATCH v10 08/14] KVM: selftests: Always clear dirty bitmap after iteration Peter Xu
2020-06-01 11:59 ` Peter Xu [this message]
2020-06-01 11:59 ` [PATCH v10 10/14] KVM: selftests: Use a single binary for dirty/clear log test Peter Xu
2020-06-01 11:59 ` [PATCH v10 11/14] KVM: selftests: Introduce after_vcpu_run hook for dirty " Peter Xu
2020-06-01 11:59 ` [PATCH v10 12/14] KVM: selftests: Add dirty ring buffer test Peter Xu
2020-06-01 12:05 ` [PATCH v10 13/14] KVM: selftests: Let dirty_log_test async for dirty ring test Peter Xu
2020-06-01 12:05 ` [PATCH v10 14/14] KVM: selftests: Add "-c" parameter to dirty log test 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=20200601115957.1581250-10-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=dgilbert@redhat.com \
--cc=drjones@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 \
/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).