From: Lilit Janpoladyan <lilitj@amazon.com>
To: <kvm@vger.kernel.org>, <maz@kernel.org>, <oliver.upton@linux.dev>,
<james.morse@arm.com>, <suzuki.poulose@arm.com>,
<yuzenghui@huawei.com>, <nh-open-source@amazon.com>,
<lilitj@amazon.com>
Subject: [PATCH 5/8] KVM: arm64: get dirty pages from the page tracking device
Date: Wed, 18 Sep 2024 15:28:04 +0000 [thread overview]
Message-ID: <20240918152807.25135-6-lilitj@amazon.com> (raw)
In-Reply-To: <20240918152807.25135-1-lilitj@amazon.com>
If a page tracking device is available, use it in
kvm_arch_sync_dirty_log to read device dirty log and mark logged
pages as dirty. Allocate a page to use as a buffer for reading
device dirty log; the allocation and access to the page are not
synchronized - assumes that userspace won't try to enable/disable
dirty logging and read dirty log at the same time.
Signed-off-by: Lilit Janpoladyan <lilitj@amazon.com>
---
arch/arm64/include/asm/kvm_host.h | 3 +-
arch/arm64/kvm/arm.c | 46 ++++++++++++++++++++++++++++++-
2 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index db9bf42123e1..a76f25d4d2bc 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -379,9 +379,10 @@ struct kvm_arch {
struct kvm_protected_vm pkvm;
/*
- * Stores page tracking context if page tracking device is in use
+ * Stores page tracking context and buffer if page tracking device is in use
*/
void *page_tracking_ctx;
+ gpa_t *page_tracking_pg;
};
struct kvm_vcpu_fault_info {
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index c8dcf719ee99..139d7e929266 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -1822,6 +1822,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
int kvm_arch_enable_dirty_logging(struct kvm *kvm, const struct kvm_memory_slot *memslot)
{
void *ctx = NULL;
+ unsigned long read_buffer;
struct pt_config config;
int r;
@@ -1836,16 +1837,31 @@ int kvm_arch_enable_dirty_logging(struct kvm *kvm, const struct kvm_memory_slot
return -ENOENT;
kvm->arch.page_tracking_ctx = ctx;
+
+ read_buffer = __get_free_page(GFP_KERNEL_ACCOUNT | __GFP_ZERO);
+ if (!read_buffer) {
+ r = -ENOMEM;
+ goto out_free;
+ }
+
+ kvm->arch.page_tracking_pg = (gpa_t *)read_buffer;
}
r = page_tracking_enable(kvm->arch.page_tracking_ctx, -1);
+out_free:
if (r) {
if (ctx) {
page_tracking_release(ctx);
kvm->arch.page_tracking_ctx = NULL;
}
+
+ if (read_buffer) {
+ free_page(read_buffer);
+ kvm->arch.page_tracking_pg = NULL;
+ }
}
+
return r;
}
@@ -1866,13 +1882,41 @@ int kvm_arch_disable_dirty_logging(struct kvm *kvm, const struct kvm_memory_slot
} else {
page_tracking_release(kvm->arch.page_tracking_ctx);
kvm->arch.page_tracking_ctx = NULL;
+
+ if (kvm->arch.page_tracking_pg) {
+ free_page((unsigned long)kvm->arch.page_tracking_pg);
+ kvm->arch.page_tracking_pg = NULL;
+ }
}
return r;
}
-void kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot)
+int kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot)
{
+ int r;
+ u32 i;
+ u32 max_pages = PAGE_SIZE/sizeof(gpa_t);
+ if (!kvm->arch.page_tracking_ctx)
+ return 0;
+
+ if (!kvm->arch.page_tracking_pg)
+ return -ENOENT;
+
+ r = page_tracking_read_dirty_pages(kvm->arch.page_tracking_ctx, -1,
+ kvm->arch.page_tracking_pg, max_pages);
+
+ while (r > 0) {
+ for (i = 0; i < r; ++i) {
+ u32 gfn = kvm->arch.page_tracking_pg[i] >> PAGE_SHIFT;
+
+ memslot = gfn_to_memslot(kvm, gfn);
+ mark_page_dirty_in_slot(kvm, memslot, gfn);
+ }
+ r = page_tracking_read_dirty_pages(kvm->arch.page_tracking_ctx, -1,
+ kvm->arch.page_tracking_pg, max_pages);
+ }
+ return r < 0 ? r : 0;
}
static int kvm_vm_ioctl_set_device_addr(struct kvm *kvm,
--
2.40.1
next prev parent reply other threads:[~2024-09-18 15:28 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-18 15:27 [PATCH 0/8] *** RFC: ARM KVM dirty tracking device *** Lilit Janpoladyan
2024-09-18 15:28 ` [PATCH 1/8] arm64: add an interface for stage-2 page tracking Lilit Janpoladyan
2024-09-18 15:28 ` [PATCH 2/8] KVM: arm64: add page tracking device as a capability Lilit Janpoladyan
2024-09-18 15:28 ` [PATCH 3/8] KVM: arm64: use page tracking interface to enable dirty logging Lilit Janpoladyan
2024-09-22 7:31 ` Sean Christopherson
2024-09-18 15:28 ` [PATCH 4/8] KVM: return value from kvm_arch_sync_dirty_log Lilit Janpoladyan
2024-09-19 1:50 ` kernel test robot
2024-09-19 2:32 ` kernel test robot
2024-09-18 15:28 ` Lilit Janpoladyan [this message]
2024-09-18 15:28 ` [PATCH 6/8] KVM: arm64: flush dirty logging data Lilit Janpoladyan
2024-09-18 15:28 ` [PATCH 7/8] KVM: arm64: enable hardware dirty state management for stage-2 Lilit Janpoladyan
2024-09-18 15:28 ` [PATCH 8/8] KVM: arm64: make hardware manage dirty state after write faults Lilit Janpoladyan
2024-09-19 9:11 ` [PATCH 0/8] *** RFC: ARM KVM dirty tracking device *** Oliver Upton
2024-09-20 10:12 ` Janpoladyan, Lilit
2024-09-26 10:00 ` David Woodhouse
2024-09-30 17:33 ` Oliver Upton
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=20240918152807.25135-6-lilitj@amazon.com \
--to=lilitj@amazon.com \
--cc=james.morse@arm.com \
--cc=kvm@vger.kernel.org \
--cc=maz@kernel.org \
--cc=nh-open-source@amazon.com \
--cc=oliver.upton@linux.dev \
--cc=suzuki.poulose@arm.com \
--cc=yuzenghui@huawei.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