From: Paolo Bonzini <pbonzini@redhat.com>
To: Peter Xu <peterx@redhat.com>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: "Dr . David Alan Gilbert" <dgilbert@redhat.com>,
Christophe de Dinechin <dinechin@redhat.com>,
Sean Christopherson <sean.j.christopherson@intel.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>
Subject: Re: [PATCH RESEND v2 06/17] KVM: Pass in kvm pointer into mark_page_dirty_in_slot()
Date: Wed, 8 Jan 2020 18:47:34 +0100 [thread overview]
Message-ID: <8d784ead-44f8-8ebc-6192-be1b4eec6ff8@redhat.com> (raw)
In-Reply-To: <20191221014938.58831-7-peterx@redhat.com>
On 21/12/19 02:49, Peter Xu wrote:
> The context will be needed to implement the kvm dirty ring.
>
> Signed-off-by: Peter Xu <peterx@redhat.com>
> ---
> virt/kvm/kvm_main.c | 24 ++++++++++++++----------
> 1 file changed, 14 insertions(+), 10 deletions(-)
>
> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
> index c80a363831ae..17969cf110dd 100644
> --- a/virt/kvm/kvm_main.c
> +++ b/virt/kvm/kvm_main.c
> @@ -144,7 +144,9 @@ static void hardware_disable_all(void);
>
> static void kvm_io_bus_destroy(struct kvm_io_bus *bus);
>
> -static void mark_page_dirty_in_slot(struct kvm_memory_slot *memslot, gfn_t gfn);
> +static void mark_page_dirty_in_slot(struct kvm *kvm,
> + struct kvm_memory_slot *memslot,
> + gfn_t gfn);
>
> __visible bool kvm_rebooting;
> EXPORT_SYMBOL_GPL(kvm_rebooting);
> @@ -2053,8 +2055,9 @@ int kvm_vcpu_read_guest_atomic(struct kvm_vcpu *vcpu, gpa_t gpa,
> }
> EXPORT_SYMBOL_GPL(kvm_vcpu_read_guest_atomic);
>
> -static int __kvm_write_guest_page(struct kvm_memory_slot *memslot, gfn_t gfn,
> - const void *data, int offset, int len,
> +static int __kvm_write_guest_page(struct kvm *kvm,
> + struct kvm_memory_slot *memslot, gfn_t gfn,
> + const void *data, int offset, int len,
> bool track_dirty)
> {
> int r;
> @@ -2067,7 +2070,7 @@ static int __kvm_write_guest_page(struct kvm_memory_slot *memslot, gfn_t gfn,
> if (r)
> return -EFAULT;
> if (track_dirty)
> - mark_page_dirty_in_slot(memslot, gfn);
> + mark_page_dirty_in_slot(kvm, memslot, gfn);
> return 0;
> }
>
> @@ -2077,7 +2080,7 @@ int kvm_write_guest_page(struct kvm *kvm, gfn_t gfn,
> {
> struct kvm_memory_slot *slot = gfn_to_memslot(kvm, gfn);
>
> - return __kvm_write_guest_page(slot, gfn, data, offset, len,
> + return __kvm_write_guest_page(kvm, slot, gfn, data, offset, len,
> track_dirty);
> }
> EXPORT_SYMBOL_GPL(kvm_write_guest_page);
> @@ -2087,7 +2090,7 @@ int kvm_vcpu_write_guest_page(struct kvm_vcpu *vcpu, gfn_t gfn,
> {
> struct kvm_memory_slot *slot = kvm_vcpu_gfn_to_memslot(vcpu, gfn);
>
> - return __kvm_write_guest_page(slot, gfn, data, offset,
> + return __kvm_write_guest_page(vcpu->kvm, slot, gfn, data, offset,
> len, true);
> }
> EXPORT_SYMBOL_GPL(kvm_vcpu_write_guest_page);
> @@ -2202,7 +2205,7 @@ int kvm_write_guest_offset_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
> r = __copy_to_user((void __user *)ghc->hva + offset, data, len);
> if (r)
> return -EFAULT;
> - mark_page_dirty_in_slot(ghc->memslot, gpa >> PAGE_SHIFT);
> + mark_page_dirty_in_slot(kvm, ghc->memslot, gpa >> PAGE_SHIFT);
>
> return 0;
> }
> @@ -2269,7 +2272,8 @@ int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len)
> }
> EXPORT_SYMBOL_GPL(kvm_clear_guest);
>
> -static void mark_page_dirty_in_slot(struct kvm_memory_slot *memslot,
> +static void mark_page_dirty_in_slot(struct kvm *kvm,
> + struct kvm_memory_slot *memslot,
> gfn_t gfn)
> {
> if (memslot && memslot->dirty_bitmap) {
> @@ -2284,7 +2288,7 @@ void mark_page_dirty(struct kvm *kvm, gfn_t gfn)
> struct kvm_memory_slot *memslot;
>
> memslot = gfn_to_memslot(kvm, gfn);
> - mark_page_dirty_in_slot(memslot, gfn);
> + mark_page_dirty_in_slot(kvm, memslot, gfn);
> }
> EXPORT_SYMBOL_GPL(mark_page_dirty);
>
> @@ -2293,7 +2297,7 @@ void kvm_vcpu_mark_page_dirty(struct kvm_vcpu *vcpu, gfn_t gfn)
> struct kvm_memory_slot *memslot;
>
> memslot = kvm_vcpu_gfn_to_memslot(vcpu, gfn);
> - mark_page_dirty_in_slot(memslot, gfn);
> + mark_page_dirty_in_slot(vcpu->kvm, memslot, gfn);
> }
> EXPORT_SYMBOL_GPL(kvm_vcpu_mark_page_dirty);
>
>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
next prev parent reply other threads:[~2020-01-08 17:47 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-21 1:49 [PATCH RESEND v2 00/17] KVM: Dirty ring interface Peter Xu
2019-12-21 1:49 ` [PATCH RESEND v2 01/17] KVM: Remove kvm_read_guest_atomic() Peter Xu
2020-01-08 17:45 ` Paolo Bonzini
2019-12-21 1:49 ` [PATCH RESEND v2 02/17] KVM: X86: Change parameter for fast_page_fault tracepoint Peter Xu
2020-01-08 17:46 ` Paolo Bonzini
2019-12-21 1:49 ` [PATCH RESEND v2 03/17] KVM: X86: Don't track dirty for KVM_SET_[TSS_ADDR|IDENTITY_MAP_ADDR] Peter Xu
2019-12-21 13:51 ` Paolo Bonzini
2019-12-23 17:27 ` Peter Xu
2019-12-23 17:59 ` Paolo Bonzini
2019-12-23 20:10 ` Peter Xu
2020-01-08 17:46 ` Paolo Bonzini
2020-01-08 19:15 ` Peter Xu
2020-01-08 19:44 ` Paolo Bonzini
2020-01-08 21:02 ` Peter Xu
2019-12-21 1:49 ` [PATCH RESEND v2 04/17] KVM: Cache as_id in kvm_memory_slot Peter Xu
2020-01-08 17:47 ` Paolo Bonzini
2019-12-21 1:49 ` [PATCH RESEND v2 05/17] KVM: Add build-time error check on kvm_run size Peter Xu
2019-12-21 1:49 ` [PATCH RESEND v2 06/17] KVM: Pass in kvm pointer into mark_page_dirty_in_slot() Peter Xu
2020-01-08 17:47 ` Paolo Bonzini [this message]
2019-12-21 1:49 ` [PATCH RESEND v2 07/17] KVM: Move running VCPU from ARM to common code Peter Xu
2020-01-08 17:47 ` Paolo Bonzini
2019-12-21 1:49 ` [PATCH RESEND v2 08/17] KVM: X86: Implement ring-based dirty memory tracking Peter Xu
2019-12-24 6:16 ` Jason Wang
2019-12-24 15:08 ` Peter Xu
2019-12-25 3:23 ` Jason Wang
2020-01-08 15:52 ` Peter Xu
2020-01-08 17:41 ` Paolo Bonzini
2020-01-08 19:06 ` Peter Xu
2020-01-08 19:44 ` Paolo Bonzini
2020-01-08 19:59 ` Peter Xu
2020-01-08 20:06 ` Paolo Bonzini
2019-12-21 1:49 ` [PATCH RESEND v2 09/17] KVM: Make dirty ring exclusive to dirty bitmap log Peter Xu
2019-12-21 1:58 ` [PATCH RESEND v2 10/17] KVM: Don't allocate dirty bitmap if dirty ring is enabled Peter Xu
2019-12-21 2:04 ` [PATCH RESEND v2 11/17] KVM: selftests: Always clear dirty bitmap after iteration Peter Xu
2019-12-21 2:04 ` [PATCH RESEND v2 12/17] KVM: selftests: Sync uapi/linux/kvm.h to tools/ Peter Xu
2019-12-21 2:04 ` [PATCH RESEND v2 13/17] KVM: selftests: Use a single binary for dirty/clear log test Peter Xu
2019-12-21 2:04 ` [PATCH RESEND v2 14/17] KVM: selftests: Introduce after_vcpu_run hook for dirty " Peter Xu
2019-12-21 2:04 ` [PATCH RESEND v2 15/17] KVM: selftests: Add dirty ring buffer test Peter Xu
2019-12-24 6:18 ` Jason Wang
2019-12-24 15:22 ` Peter Xu
2019-12-24 6:50 ` Jason Wang
2019-12-24 15:24 ` Peter Xu
2019-12-21 2:04 ` [PATCH RESEND v2 16/17] KVM: selftests: Let dirty_log_test async for dirty ring test Peter Xu
2019-12-21 2:04 ` [PATCH RESEND v2 17/17] KVM: selftests: Add "-c" parameter to dirty log test Peter Xu
2019-12-24 6:34 ` [PATCH RESEND v2 00/17] KVM: Dirty ring interface Jason Wang
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=8d784ead-44f8-8ebc-6192-be1b4eec6ff8@redhat.com \
--to=pbonzini@redhat.com \
--cc=dgilbert@redhat.com \
--cc=dinechin@redhat.com \
--cc=jasowang@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=peterx@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).