mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Paul Durrant <paul@xen.org>
To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Paul Durrant <pdurrant@amazon.com>,
	David Woodhouse <dwmw@amazon.co.uk>,
	Sean Christopherson <seanjc@google.com>,
	David Woodhouse <dwmw2@infradead.org>,
	Paolo Bonzini <pbonzini@redhat.com>
Subject: [PATCH v5 04/10] KVM: pfncache: base offset check on khva rather than gpa
Date: Fri, 22 Sep 2023 15:00:03 +0000	[thread overview]
Message-ID: <20230922150009.3319-5-paul@xen.org> (raw)
In-Reply-To: <20230922150009.3319-1-paul@xen.org>

From: Paul Durrant <pdurrant@amazon.com>

After a subsequent patch, the gpa may not always be set whereas khva will
(as long as the cache valid flag is also set).

No functional change intended.

Signed-off-by: Paul Durrant <pdurrant@amazon.com>
Reviewed-by: David Woodhouse <dwmw@amazon.co.uk>
---
Cc: Sean Christopherson <seanjc@google.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
 virt/kvm/pfncache.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/virt/kvm/pfncache.c b/virt/kvm/pfncache.c
index 17afbb464a70..37bcb4399780 100644
--- a/virt/kvm/pfncache.c
+++ b/virt/kvm/pfncache.c
@@ -83,15 +83,18 @@ bool kvm_gpc_check(struct gfn_to_pfn_cache *gpc, unsigned long len)
 	if (!gpc->active)
 		return false;
 
-	if ((gpc->gpa & ~PAGE_MASK) + len > PAGE_SIZE)
+	if (gpc->generation != slots->generation)
 		return false;
 
-	if (gpc->generation != slots->generation || kvm_is_error_hva(gpc->uhva))
+	if (kvm_is_error_hva(gpc->uhva))
 		return false;
 
 	if (!gpc->valid)
 		return false;
 
+	if (offset_in_page(gpc->khva) + len > PAGE_SIZE)
+		return false;
+
 	return true;
 }
 EXPORT_SYMBOL_GPL(kvm_gpc_check);
-- 
2.39.2


  parent reply	other threads:[~2023-09-22 15:00 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-22 14:59 [PATCH v5 00/10] KVM: xen: update shared_info and vcpu_info handling Paul Durrant
2023-09-22 15:00 ` [PATCH v5 01/10] KVM: pfncache: add a map helper function Paul Durrant
2023-09-22 15:00 ` [PATCH v5 02/10] KVM: pfncache: add a mark-dirty helper Paul Durrant
2023-09-22 15:00 ` [PATCH v5 03/10] KVM: pfncache: add a helper to get the gpa Paul Durrant
2023-09-22 15:00 ` Paul Durrant [this message]
2023-09-22 15:00 ` [PATCH v5 05/10] KVM: pfncache: allow a cache to be activated with a fixed (userspace) HVA Paul Durrant
2023-09-22 15:00 ` [PATCH v5 06/10] KVM: xen: allow shared_info to be mapped by fixed HVA Paul Durrant
2023-09-23  7:07   ` David Woodhouse
2023-09-26  9:22     ` Paul Durrant
2023-09-22 15:00 ` [PATCH v5 07/10] KVM: xen: allow vcpu_info " Paul Durrant
2023-09-22 15:44   ` David Woodhouse
2023-09-22 15:49     ` Paul Durrant
2023-09-22 15:52       ` David Woodhouse
2023-09-22 16:10   ` David Woodhouse
2023-09-22 15:00 ` [PATCH v5 08/10] KVM: selftests / xen: map shared_info using HVA rather than GFN Paul Durrant
2023-09-22 15:00 ` [PATCH v5 09/10] KVM: selftests / xen: re-map vcpu_info using HVA rather than GPA Paul Durrant
2023-09-22 16:11   ` David Woodhouse
2023-09-22 15:00 ` [PATCH v5 10/10] KVM: xen: advertize the KVM_XEN_HVM_CONFIG_SHARED_INFO_HVA capability Paul Durrant
2023-09-22 15:37 ` [PATCH v5 00/10] KVM: xen: update shared_info and vcpu_info handling David Woodhouse

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=20230922150009.3319-5-paul@xen.org \
    --to=paul@xen.org \
    --cc=dwmw2@infradead.org \
    --cc=dwmw@amazon.co.uk \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=pdurrant@amazon.com \
    --cc=seanjc@google.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

all inboxes | Powered by JetHome®