From: Robert Hoo <robert.hu@linux.intel.com>
To: seanjc@google.com, pbonzini@redhat.com,
yu.c.zhang@linux.intel.com, yuan.yao@linux.intel.com,
jingqi.liu@intel.com, weijiang.yang@intel.com,
chao.gao@intel.com, isaku.yamahata@intel.com
Cc: kirill.shutemov@linux.intel.com, kvm@vger.kernel.org,
Robert Hoo <robert.hu@linux.intel.com>
Subject: [PATCH v4 2/9] KVM: x86: MMU: Clear CR3 LAM bits when allocate shadow root
Date: Thu, 9 Feb 2023 10:40:15 +0800 [thread overview]
Message-ID: <20230209024022.3371768-3-robert.hu@linux.intel.com> (raw)
In-Reply-To: <20230209024022.3371768-1-robert.hu@linux.intel.com>
mmu->get_guest_pgd()'s implementation is get_cr3(), clear the LAM bits for
root_pgd, which needs a pure address, plus (possible) PCID info (low 12
bits).
Signed-off-by: Robert Hoo <robert.hu@linux.intel.com>
---
arch/x86/kvm/mmu/mmu.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 835426254e76..1d61dfe37c77 100644
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -3698,8 +3698,11 @@ static int mmu_alloc_shadow_roots(struct kvm_vcpu *vcpu)
gfn_t root_gfn, root_pgd;
int quadrant, i, r;
hpa_t root;
-
+#ifdef CONFIG_X86_64
+ root_pgd = mmu->get_guest_pgd(vcpu) & ~(X86_CR3_LAM_U48 | X86_CR3_LAM_U57);
+#else
root_pgd = mmu->get_guest_pgd(vcpu);
+#endif
root_gfn = root_pgd >> PAGE_SHIFT;
if (mmu_check_root(vcpu, root_gfn))
--
2.31.1
next prev parent reply other threads:[~2023-02-09 2:41 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-09 2:40 [PATCH v4 0/9] Linear Address Masking (LAM) KVM Enabling Robert Hoo
2023-02-09 2:40 ` [PATCH v4 1/9] KVM: x86: Intercept CR4.LAM_SUP when LAM feature is enabled in guest Robert Hoo
2023-02-09 9:21 ` Chao Gao
2023-02-09 12:48 ` Robert Hoo
2023-02-10 3:29 ` Yang, Weijiang
2023-02-10 5:02 ` Robert Hoo
2023-02-10 16:30 ` Sean Christopherson
2023-02-14 1:27 ` Binbin Wu
2023-02-14 6:11 ` Robert Hoo
2023-02-14 9:00 ` Binbin Wu
2023-02-14 12:24 ` Robert Hoo
2023-02-14 12:36 ` Robert Hoo
2023-02-16 5:31 ` Binbin Wu
2023-02-16 5:54 ` Robert Hoo
2023-02-09 2:40 ` Robert Hoo [this message]
2023-02-09 9:55 ` [PATCH v4 2/9] KVM: x86: MMU: Clear CR3 LAM bits when allocate shadow root Chao Gao
2023-02-09 13:02 ` Robert Hoo
2023-02-14 2:55 ` Binbin Wu
2023-02-15 1:17 ` Robert Hoo
2023-02-16 2:14 ` Robert Hoo
2023-02-10 3:38 ` Yang, Weijiang
2023-02-11 3:12 ` Robert Hoo
2023-02-09 2:40 ` [PATCH v4 3/9] KVM: x86: MMU: Commets update Robert Hoo
2023-02-10 6:59 ` Chao Gao
2023-02-10 7:55 ` Robert Hoo
2023-02-10 16:54 ` Sean Christopherson
2023-02-09 2:40 ` [PATCH v4 4/9] KVM: x86: MMU: Integrate LAM bits when build guest CR3 Robert Hoo
2023-02-10 14:04 ` Chao Gao
2023-02-11 6:24 ` Robert Hoo
2023-02-11 6:29 ` Robert Hoo
2023-02-09 2:40 ` [PATCH v4 5/9] KVM: x86: Untag LAM bits when applicable Robert Hoo
2023-02-10 15:04 ` Chao Gao
2023-02-11 5:57 ` Robert Hoo
2023-02-16 6:37 ` Binbin Wu
2023-02-09 2:40 ` [PATCH v4 6/9] KVM: x86: When KVM judges CR3 valid or not, consider LAM bits Robert Hoo
2023-02-13 2:01 ` Chao Gao
2023-02-13 13:25 ` Robert Hoo
2023-02-14 6:18 ` Chao Gao
2023-02-14 7:00 ` Chao Gao
2023-02-18 5:44 ` Robert Hoo
2023-02-09 2:40 ` [PATCH v4 7/9] KVM: x86: When guest set CR3, handle LAM bits semantics Robert Hoo
2023-02-13 3:31 ` Chao Gao
2023-02-14 5:28 ` Robert Hoo
2023-02-14 6:48 ` Chao Gao
2023-02-09 2:40 ` [PATCH v4 8/9] KVM: x86: emulation: Apply LAM when emulating data access Robert Hoo
2023-02-13 3:53 ` Chao Gao
2023-02-14 5:38 ` Robert Hoo
2023-02-09 2:40 ` [PATCH v4 9/9] KVM: x86: LAM: Expose LAM CPUID to user space VMM Robert Hoo
2023-02-21 5:47 ` Binbin Wu
2023-02-21 7:26 ` Robert Hoo
2023-02-21 8:26 ` Binbin Wu
2023-02-21 11:13 ` Yu Zhang
2023-02-21 13:18 ` Binbin Wu
2023-02-21 14:36 ` Robert Hoo
2023-02-09 6:15 ` [PATCH v4 0/9] Linear Address Masking (LAM) KVM Enabling Chao Gao
2023-02-09 12:25 ` Robert Hoo
2023-02-09 17:27 ` Sean Christopherson
2023-02-10 2:07 ` Robert Hoo
2023-02-10 3:17 ` Chao Gao
2023-02-10 8:41 ` Robert Hoo
2023-02-10 8:39 ` Robert Hoo
2023-02-10 9:22 ` Chao Gao
2023-02-13 9:02 ` Binbin Wu
2023-02-13 13:16 ` Robert Hoo
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=20230209024022.3371768-3-robert.hu@linux.intel.com \
--to=robert.hu@linux.intel.com \
--cc=chao.gao@intel.com \
--cc=isaku.yamahata@intel.com \
--cc=jingqi.liu@intel.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=weijiang.yang@intel.com \
--cc=yu.c.zhang@linux.intel.com \
--cc=yuan.yao@linux.intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.