public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Sean Christopherson <seanjc@google.com>
To: Sean Christopherson <seanjc@google.com>,
	Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
	Michal Luczaj <mhal@rbox.co>,
	David Woodhouse <dwmw2@infradead.org>
Subject: [PATCH v2 03/16] KVM: x86: Always use non-compat vcpu_runstate_info size for gfn=>pfn cache
Date: Thu, 13 Oct 2022 21:12:21 +0000	[thread overview]
Message-ID: <20221013211234.1318131-4-seanjc@google.com> (raw)
In-Reply-To: <20221013211234.1318131-1-seanjc@google.com>

Always use the size of Xen's non-compat vcpu_runstate_info struct when
checking that the GPA+size doesn't cross a page boundary.  Conceptually,
using the current mode is more correct, but KVM isn't consistent with
itself as kvm_xen_vcpu_set_attr() unconditionally uses the "full" size
when activating the cache.  More importantly, prior to the introduction
of the gfn_to_pfn_cache, KVM _always_ used the full size, i.e. allowing
the guest (userspace?) to use a poorly aligned GPA in 32-bit mode but not
64-bit mode is more of a bug than a feature, and fixing the bug doesn't
break KVM's historical ABI.

Always using the non-compat size will allow for future gfn_to_pfn_cache
clenups as this is (was) the only case where KVM uses a different size at
check()+refresh() than at activate().  E.g. the length/size of the cache
can be made immutable and dropped from check()+refresh(), which yields a
cleaner set of APIs and avoids potential bugs that could occur if check()
where invoked with a different size than refresh().

Fixes: a795cd43c5b5 ("KVM: x86/xen: Use gfn_to_pfn_cache for runstate area")
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
 arch/x86/kvm/xen.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c
index b2be60c6efa4..9e79ef2cca99 100644
--- a/arch/x86/kvm/xen.c
+++ b/arch/x86/kvm/xen.c
@@ -212,10 +212,7 @@ void kvm_xen_update_runstate_guest(struct kvm_vcpu *v, int state)
 	if (!vx->runstate_cache.active)
 		return;
 
-	if (IS_ENABLED(CONFIG_64BIT) && v->kvm->arch.xen.long_mode)
-		user_len = sizeof(struct vcpu_runstate_info);
-	else
-		user_len = sizeof(struct compat_vcpu_runstate_info);
+	user_len = sizeof(struct vcpu_runstate_info);
 
 	read_lock_irqsave(&gpc->lock, flags);
 	while (!kvm_gfn_to_pfn_cache_check(v->kvm, gpc, gpc->gpa,
-- 
2.38.0.413.g74048e4d9e-goog


  parent reply	other threads:[~2022-10-13 21:13 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-13 21:12 [PATCH v2 00/16] KVM: x86: gfn_to_pfn_cache fixes and cleanups Sean Christopherson
2022-10-13 21:12 ` [PATCH v2 01/16] KVM: Initialize gfn_to_pfn_cache locks in dedicated helper Sean Christopherson
2022-10-13 21:12 ` [PATCH v2 02/16] KVM: Reject attempts to consume or refresh inactive gfn_to_pfn_cache Sean Christopherson
2022-10-13 21:12 ` Sean Christopherson [this message]
2022-10-27 11:11   ` [PATCH v2 03/16] KVM: x86: Always use non-compat vcpu_runstate_info size for gfn=>pfn cache Paolo Bonzini
2022-10-27 14:44     ` Sean Christopherson
2022-10-27 15:03       ` Paolo Bonzini
2022-10-27 15:10         ` Sean Christopherson
2022-10-27 16:56       ` Sean Christopherson
2022-10-13 21:12 ` [PATCH v2 04/16] KVM: Shorten gfn_to_pfn_cache function names Sean Christopherson
2022-10-13 21:12 ` [PATCH v2 05/16] KVM: x86: Remove unused argument in gpc_unmap_khva() Sean Christopherson
2022-12-02  9:28   ` Like Xu
2022-12-02 10:57     ` Michal Luczaj
2022-12-02 14:21       ` David Woodhouse
2022-12-02 17:01         ` Sean Christopherson
2022-10-13 21:12 ` [PATCH v2 06/16] KVM: Store immutable gfn_to_pfn_cache properties Sean Christopherson
2022-10-13 21:12 ` [PATCH v2 07/16] KVM: Store gfn_to_pfn_cache length as an immutable property Sean Christopherson
2022-11-21 14:26   ` David Woodhouse
2022-11-21 19:11     ` Sean Christopherson
2022-11-21 20:02       ` David Woodhouse
2022-11-22 18:59         ` Sean Christopherson
2022-10-13 21:12 ` [PATCH v2 08/16] KVM: Use gfn_to_pfn_cache's immutable "kvm" in kvm_gpc_check() Sean Christopherson
2022-10-13 21:12 ` [PATCH v2 09/16] KVM: Clean up hva_to_pfn_retry() Sean Christopherson
2022-10-13 21:12 ` [PATCH v2 10/16] KVM: Use gfn_to_pfn_cache's immutable "kvm" in kvm_gpc_refresh() Sean Christopherson
2022-10-13 21:12 ` [PATCH v2 11/16] KVM: Drop KVM's API to allow temprorarily unmapping gfn=>pfn cache Sean Christopherson
2022-10-13 21:12 ` [PATCH v2 12/16] KVM: Do not partially reinitialize gfn=>pfn cache during activation Sean Christopherson
2022-10-13 21:12 ` [PATCH v2 13/16] KVM: Drop @gpa from exported gfn=>pfn cache check() and refresh() helpers Sean Christopherson
2022-10-13 21:12 ` [PATCH v2 14/16] KVM: Skip unnecessary "unmap" if gpc is already valid during refresh Sean Christopherson
2022-10-13 21:12 ` [PATCH v2 15/16] KVM: selftests: Add tests in xen_shinfo_test to detect lock races Sean Christopherson
2022-10-13 21:12 ` [PATCH v2 16/16] KVM: selftests: Mark "guest_saw_irq" as volatile in xen_shinfo_test Sean Christopherson

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=20221013211234.1318131-4-seanjc@google.com \
    --to=seanjc@google.com \
    --cc=dwmw2@infradead.org \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mhal@rbox.co \
    --cc=pbonzini@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