From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
To: kvm@vger.kernel.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Sean Christopherson <seanjc@google.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
David Hildenbrand <david@redhat.com>,
Maxim Levitsky <mlevitsk@redhat.com>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
linux-kernel@vger.kernel.org,
Emanuele Giuseppe Esposito <eesposit@redhat.com>
Subject: [RFC PATCH 6/9] kvm_main.c: simplify change-specific callbacks
Date: Fri, 9 Sep 2022 06:45:03 -0400 [thread overview]
Message-ID: <20220909104506.738478-7-eesposit@redhat.com> (raw)
In-Reply-To: <20220909104506.738478-1-eesposit@redhat.com>
Instead of replacing the memslot in the inactive slots and
activate for each "change" specific function (NEW, MOVE, DELETE, ...),
make kvm_set_memslot() replace the memslot in current inactive list
and swap the lists, and then kvm_finish_memslot just takes care of
updating the new inactive list (was active).
We can generalize here the pre-swap replacement with
replace(old, new) because even if in a DELETE or MOVE operation,
old will always stay in the inactive list (used by kvm_replace_memslot).
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
virt/kvm/kvm_main.c | 44 +++++++++++++++++++++++---------------------
1 file changed, 23 insertions(+), 21 deletions(-)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 9d917af30593..6b73615891f0 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1747,34 +1747,26 @@ static void kvm_invalidate_memslot(struct kvm *kvm,
static void kvm_create_memslot(struct kvm *kvm,
struct kvm_memory_slot *new)
{
- /* Add the new memslot to the inactive set and activate. */
+ /* Update inactive slot (was active) by adding the new slot */
kvm_replace_memslot(kvm, NULL, new);
- kvm_activate_memslot(kvm, NULL, new);
}
static void kvm_delete_memslot(struct kvm *kvm,
- struct kvm_memory_slot *old,
struct kvm_memory_slot *invalid_slot)
{
- /*
- * Remove the old memslot (in the inactive memslots) by passing NULL as
- * the "new" slot, and for the invalid version in the active slots.
- */
- kvm_replace_memslot(kvm, old, NULL);
- kvm_activate_memslot(kvm, invalid_slot, NULL);
+ /* Update inactive slot (was active) by removing the invalid slot */
+ kvm_replace_memslot(kvm, invalid_slot, NULL);
}
static void kvm_move_memslot(struct kvm *kvm,
- struct kvm_memory_slot *old,
struct kvm_memory_slot *new,
struct kvm_memory_slot *invalid_slot)
{
/*
- * Replace the old memslot in the inactive slots, and then swap slots
- * and replace the current INVALID with the new as well.
+ * Update inactive slot (was active) by removing the invalid slot
+ * and adding the new one.
*/
- kvm_replace_memslot(kvm, old, new);
- kvm_activate_memslot(kvm, invalid_slot, new);
+ kvm_replace_memslot(kvm, invalid_slot, new);
}
static void kvm_update_flags_memslot(struct kvm *kvm,
@@ -1782,12 +1774,10 @@ static void kvm_update_flags_memslot(struct kvm *kvm,
struct kvm_memory_slot *new)
{
/*
- * Similar to the MOVE case, but the slot doesn't need to be zapped as
- * an intermediate step. Instead, the old memslot is simply replaced
- * with a new, updated copy in both memslot sets.
+ * Update inactive slot (was active) by removing the old slot
+ * and adding the new one.
*/
kvm_replace_memslot(kvm, old, new);
- kvm_activate_memslot(kvm, old, new);
}
/*
@@ -1880,9 +1870,9 @@ static void kvm_finish_memslot(struct kvm *kvm,
if (change == KVM_MR_CREATE)
kvm_create_memslot(kvm, new);
else if (change == KVM_MR_DELETE)
- kvm_delete_memslot(kvm, old, invalid_slot);
+ kvm_delete_memslot(kvm, invalid_slot);
else if (change == KVM_MR_MOVE)
- kvm_move_memslot(kvm, old, new, invalid_slot);
+ kvm_move_memslot(kvm, new, invalid_slot);
else if (change == KVM_MR_FLAGS_ONLY)
kvm_update_flags_memslot(kvm, old, new);
else
@@ -1903,12 +1893,24 @@ static void kvm_finish_memslot(struct kvm *kvm,
static int kvm_set_memslot(struct kvm *kvm,
struct kvm_internal_memory_region_list *batch)
{
- int r;
+ int r, as_id;
r = kvm_prepare_memslot(kvm, batch);
if (r)
return r;
+ /*
+ * if change is DELETE or MOVE, invalid is in active memslots
+ * and old in inactive, so replace old with new.
+ */
+ kvm_replace_memslot(kvm, batch->old, batch->new);
+
+ /* either old or invalid is the same, since invalid is old's copy */
+ as_id = kvm_memslots_get_as_id(batch->old, batch->new);
+
+ /* releases kvm->slots_arch_lock */
+ kvm_swap_active_memslots(kvm, as_id);
+
kvm_finish_memslot(kvm, batch);
return 0;
--
2.31.1
next prev parent reply other threads:[~2022-09-09 10:45 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-09 10:44 [RFC PATCH 0/9] kvm: implement atomic memslot updates Emanuele Giuseppe Esposito
2022-09-09 10:44 ` [RFC PATCH 1/9] kvm_main.c: move slot check in kvm_set_memory_region Emanuele Giuseppe Esposito
2022-09-28 16:41 ` Paolo Bonzini
2022-09-09 10:44 ` [RFC PATCH 2/9] kvm.h: introduce KVM_SET_USER_MEMORY_REGION_LIST ioctl Emanuele Giuseppe Esposito
2022-09-28 16:42 ` Paolo Bonzini
2022-09-09 10:45 ` [RFC PATCH 3/9] kvm_main.c: introduce kvm_internal_memory_region_list Emanuele Giuseppe Esposito
2022-09-28 16:48 ` Paolo Bonzini
2022-09-09 10:45 ` [RFC PATCH 4/9] kvm_main.c: split logic in kvm_set_memslots Emanuele Giuseppe Esposito
2022-09-28 17:04 ` Paolo Bonzini
2022-09-09 10:45 ` [RFC PATCH 5/9] kvm_main.c: split __kvm_set_memory_region logic in kvm_check_mem and kvm_prepare_batch Emanuele Giuseppe Esposito
2022-09-13 2:56 ` Yang, Weijiang
2022-09-18 16:22 ` Emanuele Giuseppe Esposito
2022-09-28 17:11 ` Paolo Bonzini
2022-09-09 10:45 ` Emanuele Giuseppe Esposito [this message]
2022-09-09 10:45 ` [RFC PATCH 7/9] kvm_main.c: duplicate invalid memslot also in inactive list Emanuele Giuseppe Esposito
2022-09-28 17:18 ` Paolo Bonzini
2022-09-09 10:45 ` [RFC PATCH 8/9] kvm_main.c: find memslots from the inactive memslot list Emanuele Giuseppe Esposito
2022-09-09 10:45 ` [RFC PATCH 9/9] kvm_main.c: handle atomic memslot update Emanuele Giuseppe Esposito
2022-09-13 2:30 ` Yang, Weijiang
2022-09-18 16:18 ` Emanuele Giuseppe Esposito
2022-09-27 7:46 ` David Hildenbrand
2022-09-27 8:35 ` Emanuele Giuseppe Esposito
2022-09-27 9:22 ` David Hildenbrand
2022-09-27 9:32 ` Emanuele Giuseppe Esposito
2022-09-27 14:52 ` David Hildenbrand
2022-09-28 17:29 ` Paolo Bonzini
2022-09-09 14:30 ` [RFC PATCH 0/9] kvm: implement atomic memslot updates Sean Christopherson
2022-09-18 16:13 ` Emanuele Giuseppe Esposito
2022-09-19 7:38 ` Like Xu
2022-09-19 7:53 ` David Hildenbrand
2022-09-19 17:30 ` David Hildenbrand
2022-09-23 13:10 ` Emanuele Giuseppe Esposito
2022-09-23 13:21 ` David Hildenbrand
2022-09-23 13:38 ` Emanuele Giuseppe Esposito
2022-09-26 9:03 ` David Hildenbrand
2022-09-26 21:28 ` Sean Christopherson
2022-09-27 7:38 ` Emanuele Giuseppe Esposito
2022-09-27 15:58 ` Sean Christopherson
2022-09-28 9:11 ` Emanuele Giuseppe Esposito
2022-09-28 11:14 ` Maxim Levitsky
2022-09-28 12:52 ` David Hildenbrand
2022-09-28 15:07 ` Paolo Bonzini
2022-09-28 15:33 ` David Hildenbrand
2022-09-28 15:58 ` Sean Christopherson
2022-09-28 16:38 ` Paolo Bonzini
2022-09-28 20:41 ` Sean Christopherson
2022-09-29 8:05 ` Emanuele Giuseppe Esposito
2022-09-29 8:24 ` David Hildenbrand
2022-09-29 15:18 ` Sean Christopherson
2022-09-29 15:41 ` Paolo Bonzini
2022-09-29 15:28 ` Paolo Bonzini
2022-09-29 15:40 ` Maxim Levitsky
2022-09-29 16:00 ` David Hildenbrand
2022-09-29 21:39 ` Sean Christopherson
2022-10-13 7:43 ` Emanuele Giuseppe Esposito
2022-10-13 8:44 ` David Hildenbrand
2022-10-13 11:12 ` Emanuele Giuseppe Esposito
2022-10-13 14:45 ` David Hildenbrand
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=20220909104506.738478-7-eesposit@redhat.com \
--to=eesposit@redhat.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=david@redhat.com \
--cc=hpa@zytor.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=mlevitsk@redhat.com \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=tglx@linutronix.de \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
--cc=x86@kernel.org \
/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).