From: Peter Fang <peter.fang@intel•com>
To: Paolo Bonzini <pbonzini@redhat•com>,
Sean Christopherson <seanjc@google•com>,
Madhavan Srinivasan <maddy@linux•ibm.com>,
"Nicholas Piggin" <npiggin@gmail•com>
Cc: Yosry Ahmed <yosry@kernel•org>,
Ritesh Harjani <ritesh.list@gmail•com>,
Michael Ellerman <mpe@ellerman•id.au>,
"Christophe Leroy (CS GROUP)" <chleroy@kernel•org>,
Thomas Gleixner <tglx@kernel•org>, Ingo Molnar <mingo@redhat•com>,
Borislav Petkov <bp@alien8•de>,
Dave Hansen <dave.hansen@linux•intel.com>, <x86@kernel•org>,
"H. Peter Anvin" <hpa@zytor•com>, <kvm@vger•kernel.org>,
<linuxppc-dev@lists•ozlabs.org>, <linux-kernel@vger•kernel.org>,
Peter Fang <peter.fang@intel•com>,
"KarimAllah Ahmed" <karahmed@amazon•de>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle•com>
Subject: [PATCH v2 1/3] KVM: Fix kvm_vcpu_map[_readonly]() function prototypes
Date: Tue, 7 Apr 2026 17:11:28 -0700 [thread overview]
Message-ID: <20260408001137.3290444-2-peter.fang@intel.com> (raw)
In-Reply-To: <20260408001137.3290444-1-peter.fang@intel.com>
kvm_vcpu_map() and kvm_vcpu_map_readonly() should take a gfn instead of
a gpa. This appears to be a result of the original kvm_vcpu_map() being
declared with the wrong function prototype in kvm_host.h, even though
it was correct in the actual implementation in kvm_main.c.
No actual harm has been done yet as all of the call sites are correctly
passing in a gfn. Plus, both gfn_t and gpa_t are typedef'd to u64 so
this change shouldn't have any functional impact.
Compile-tested on x86 and ppc, which are the current users of these
interfaces.
Fixes: e45adf665a53 ("KVM: Introduce a new guest mapping API")
Cc: KarimAllah Ahmed <karahmed@amazon•de>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle•com>
Signed-off-by: Peter Fang <peter.fang@intel•com>
---
include/linux/kvm_host.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 6b76e7a6f4c2..4e3bea92a06b 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -1382,20 +1382,20 @@ void mark_page_dirty_in_slot(struct kvm *kvm, const struct kvm_memory_slot *mems
void mark_page_dirty(struct kvm *kvm, gfn_t gfn);
void kvm_vcpu_mark_page_dirty(struct kvm_vcpu *vcpu, gfn_t gfn);
-int __kvm_vcpu_map(struct kvm_vcpu *vcpu, gpa_t gpa, struct kvm_host_map *map,
+int __kvm_vcpu_map(struct kvm_vcpu *vcpu, gfn_t gfn, struct kvm_host_map *map,
bool writable);
void kvm_vcpu_unmap(struct kvm_vcpu *vcpu, struct kvm_host_map *map);
-static inline int kvm_vcpu_map(struct kvm_vcpu *vcpu, gpa_t gpa,
+static inline int kvm_vcpu_map(struct kvm_vcpu *vcpu, gfn_t gfn,
struct kvm_host_map *map)
{
- return __kvm_vcpu_map(vcpu, gpa, map, true);
+ return __kvm_vcpu_map(vcpu, gfn, map, true);
}
-static inline int kvm_vcpu_map_readonly(struct kvm_vcpu *vcpu, gpa_t gpa,
+static inline int kvm_vcpu_map_readonly(struct kvm_vcpu *vcpu, gfn_t gfn,
struct kvm_host_map *map)
{
- return __kvm_vcpu_map(vcpu, gpa, map, false);
+ return __kvm_vcpu_map(vcpu, gfn, map, false);
}
static inline void kvm_vcpu_map_mark_dirty(struct kvm_vcpu *vcpu,
--
2.53.0
next prev parent reply other threads:[~2026-04-08 0:12 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-08 0:11 [PATCH v2 0/3] KVM: Fix and clean up kvm_vcpu_map[_readonly]() usages Peter Fang
2026-04-08 0:11 ` Peter Fang [this message]
2026-04-21 23:05 ` [PATCH v2 1/3] KVM: Fix kvm_vcpu_map[_readonly]() function prototypes Yosry Ahmed
2026-04-08 0:11 ` [PATCH v2 2/3] KVM: Move page mapping/unmapping APIs in kvm_host.h Peter Fang
2026-04-21 23:06 ` Yosry Ahmed
2026-04-08 0:11 ` [PATCH v2 3/3] KVM: Take gpa_t in kvm_vcpu_map[_readonly]() Peter Fang
2026-04-21 23:08 ` Yosry Ahmed
2026-04-21 23:19 ` Sean Christopherson
2026-04-21 23:25 ` Yosry Ahmed
2026-04-21 23:29 ` Sean Christopherson
2026-04-21 23:41 ` Yosry Ahmed
2026-04-22 0:27 ` Sean Christopherson
2026-04-22 20:19 ` Yosry Ahmed
2026-04-22 20:34 ` Sean Christopherson
2026-04-22 21:44 ` Yosry Ahmed
2026-04-22 22:17 ` Sean Christopherson
2026-04-22 22:19 ` Yosry Ahmed
2026-04-23 7:49 ` Peter Fang
2026-04-24 8:25 ` Gautam Menghani
2026-04-25 4:25 ` Peter Fang
2026-04-24 10:27 ` [PATCH v2 0/3] KVM: Fix and clean up kvm_vcpu_map[_readonly]() usages David Woodhouse
2026-04-27 8:05 ` Peter Fang
2026-05-04 17:59 ` Sean Christopherson
2026-05-07 8:18 ` Peter Fang
2026-05-13 17:33 ` Sean Christopherson
2026-05-19 0:40 ` 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=20260408001137.3290444-2-peter.fang@intel.com \
--to=peter.fang@intel$(echo .)com \
--cc=bp@alien8$(echo .)de \
--cc=chleroy@kernel$(echo .)org \
--cc=dave.hansen@linux$(echo .)intel.com \
--cc=hpa@zytor$(echo .)com \
--cc=karahmed@amazon$(echo .)de \
--cc=konrad.wilk@oracle$(echo .)com \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=maddy@linux$(echo .)ibm.com \
--cc=mingo@redhat$(echo .)com \
--cc=mpe@ellerman$(echo .)id.au \
--cc=npiggin@gmail$(echo .)com \
--cc=pbonzini@redhat$(echo .)com \
--cc=ritesh.list@gmail$(echo .)com \
--cc=seanjc@google$(echo .)com \
--cc=tglx@kernel$(echo .)org \
--cc=x86@kernel$(echo .)org \
--cc=yosry@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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