From: Peter Xu <peterx@redhat.com>
To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: peterx@redhat.com,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
Andrew Jones <drjones@redhat.com>,
Sean Christopherson <sean.j.christopherson@intel.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: [PATCH v13 02/14] KVM: Cache as_id in kvm_memory_slot
Date: Wed, 30 Sep 2020 21:20:32 -0400 [thread overview]
Message-ID: <20201001012044.5151-3-peterx@redhat.com> (raw)
In-Reply-To: <20201001012044.5151-1-peterx@redhat.com>
Cache the address space ID just like the slot ID. It will be used in
order to fill in the dirty ring entries.
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Suggested-by: Sean Christopherson <sean.j.christopherson@intel.com>
Reviewed-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
include/linux/kvm_host.h | 1 +
virt/kvm/kvm_main.c | 6 ++++++
2 files changed, 7 insertions(+)
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 05e3c2fb3ef7..c6f45687ba89 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -346,6 +346,7 @@ struct kvm_memory_slot {
unsigned long userspace_addr;
u32 flags;
short id;
+ u16 as_id;
};
static inline unsigned long kvm_dirty_bitmap_bytes(struct kvm_memory_slot *memslot)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 68edd25dcb11..2e8539213125 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1247,6 +1247,11 @@ static int kvm_delete_memslot(struct kvm *kvm,
memset(&new, 0, sizeof(new));
new.id = old->id;
+ /*
+ * This is only for debugging purpose; it should never be referenced
+ * for a removed memslot.
+ */
+ new.as_id = as_id;
r = kvm_set_memslot(kvm, mem, old, &new, as_id, KVM_MR_DELETE);
if (r)
@@ -1313,6 +1318,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
if (!mem->memory_size)
return kvm_delete_memslot(kvm, mem, &old, as_id);
+ new.as_id = as_id;
new.id = id;
new.base_gfn = mem->guest_phys_addr >> PAGE_SHIFT;
new.npages = mem->memory_size >> PAGE_SHIFT;
--
2.26.2
next prev parent reply other threads:[~2020-10-01 1:21 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-01 1:20 [PATCH v13 00/14] KVM: Dirty ring interface Peter Xu
2020-10-01 1:20 ` [PATCH v13 01/14] KVM: Documentation: Update entry for KVM_X86_SET_MSR_FILTER Peter Xu
2020-10-01 1:20 ` Peter Xu [this message]
2020-10-01 1:20 ` [PATCH v13 03/14] KVM: X86: Don't track dirty for KVM_SET_[TSS_ADDR|IDENTITY_MAP_ADDR] Peter Xu
2020-10-01 1:20 ` [PATCH v13 04/14] KVM: Pass in kvm pointer into mark_page_dirty_in_slot() Peter Xu
2020-10-01 1:22 ` [PATCH v13 05/14] KVM: X86: Implement ring-based dirty memory tracking Peter Xu
2020-11-06 10:56 ` Paolo Bonzini
2020-10-01 1:22 ` [PATCH v13 06/14] KVM: Make dirty ring exclusive to dirty bitmap log Peter Xu
2020-11-06 11:00 ` Paolo Bonzini
2020-10-01 1:22 ` [PATCH v13 07/14] KVM: Don't allocate dirty bitmap if dirty ring is enabled Peter Xu
2020-10-01 1:22 ` [PATCH v13 08/14] KVM: selftests: Always clear dirty bitmap after iteration Peter Xu
2020-10-01 1:22 ` [PATCH v13 09/14] KVM: selftests: Sync uapi/linux/kvm.h to tools/ Peter Xu
2020-10-01 1:22 ` [PATCH v13 10/14] KVM: selftests: Use a single binary for dirty/clear log test Peter Xu
2020-10-01 1:22 ` [PATCH v13 11/14] KVM: selftests: Introduce after_vcpu_run hook for dirty " Peter Xu
2020-10-01 1:22 ` [PATCH v13 12/14] KVM: selftests: Add dirty ring buffer test Peter Xu
2020-10-01 1:22 ` [PATCH v13 13/14] KVM: selftests: Let dirty_log_test async for dirty ring test Peter Xu
2020-11-06 11:27 ` Paolo Bonzini
2020-11-06 18:06 ` Peter Xu
2020-11-06 18:15 ` Paolo Bonzini
2020-11-06 18:27 ` Peter Xu
2020-10-01 1:22 ` [PATCH v13 14/14] KVM: selftests: Add "-c" parameter to dirty log test Peter Xu
2020-11-06 11:28 ` [PATCH v13 00/14] KVM: Dirty ring interface Paolo Bonzini
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=20201001012044.5151-3-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=dgilbert@redhat.com \
--cc=drjones@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=sean.j.christopherson@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).