From: Ganapatrao Kulkarni <gankulkarni@os.amperecomputing.com>
To: maz@kernel.org
Cc: catalin.marinas@arm.com, will@kernel.org, andre.przywara@arm.com,
linux-arm-kernel@lists.infradead.org,
kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org,
darren@os.amperecomputing.com,
d.scott.phillips@amperecomputing.com,
gankulkarni@os.amperecomputing.com
Subject: [PATCH 2/2] KVM: arm64: nv: fixup! Support multiple nested Stage-2 mmu structures
Date: Mon, 22 Nov 2021 01:58:03 -0800 [thread overview]
Message-ID: <20211122095803.28943-3-gankulkarni@os.amperecomputing.com> (raw)
In-Reply-To: <20211122095803.28943-1-gankulkarni@os.amperecomputing.com>
Commit 1776c91346b6 ("KVM: arm64: nv: Support multiple nested Stage-2 mmu
structures")[1] added a function kvm_vcpu_init_nested which expands the
stage-2 mmu structures array when ever a new vCPU is created. The array
is expanded using krealloc() and results in a stale mmu address pointer
in pgt->mmu. Adding a fix to update the pointer with the new address after
successful krealloc.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git/
branch kvm-arm64/nv-5.13
Signed-off-by: Ganapatrao Kulkarni <gankulkarni@os.amperecomputing.com>
---
arch/arm64/kvm/nested.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c
index 4ffbc14d0245..57ad8d8f4ee5 100644
--- a/arch/arm64/kvm/nested.c
+++ b/arch/arm64/kvm/nested.c
@@ -68,6 +68,8 @@ int kvm_vcpu_init_nested(struct kvm_vcpu *vcpu)
num_mmus * sizeof(*kvm->arch.nested_mmus),
GFP_KERNEL | __GFP_ZERO);
if (tmp) {
+ int i;
+
if (kvm_init_stage2_mmu(kvm, &tmp[num_mmus - 1]) ||
kvm_init_stage2_mmu(kvm, &tmp[num_mmus - 2])) {
kvm_free_stage2_pgd(&tmp[num_mmus - 1]);
@@ -80,6 +82,13 @@ int kvm_vcpu_init_nested(struct kvm_vcpu *vcpu)
}
kvm->arch.nested_mmus = tmp;
+
+ /* Fixup pgt->mmu after krealloc */
+ for (i = 0; i < kvm->arch.nested_mmus_size; i++) {
+ struct kvm_s2_mmu *mmu = &kvm->arch.nested_mmus[i];
+
+ mmu->pgt->mmu = mmu;
+ }
}
mutex_unlock(&kvm->lock);
--
2.27.0
next prev parent reply other threads:[~2021-11-22 9:58 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-22 9:58 [PATCH 0/2] KVM: arm64: nv: Fix issue with Stage 2 MMU init for Nested case Ganapatrao Kulkarni
2021-11-22 9:58 ` [PATCH 1/2] KVM: arm64: Use appropriate mmu pointer in stage2 page table init Ganapatrao Kulkarni
2021-11-25 13:49 ` Marc Zyngier
2021-11-26 5:45 ` Ganapatrao Kulkarni
2021-11-26 10:50 ` Marc Zyngier
2021-11-26 16:51 ` Ganapatrao Kulkarni
2021-11-22 9:58 ` Ganapatrao Kulkarni [this message]
2021-11-25 14:23 ` [PATCH 2/2] KVM: arm64: nv: fixup! Support multiple nested Stage-2 mmu structures Marc Zyngier
2021-11-26 5:59 ` Ganapatrao Kulkarni
2021-11-26 15:28 ` Marc Zyngier
2021-11-26 16:33 ` Marc Zyngier
2021-11-26 19:20 ` Marc Zyngier
2021-11-29 6:00 ` Ganapatrao Kulkarni
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=20211122095803.28943-3-gankulkarni@os.amperecomputing.com \
--to=gankulkarni@os.amperecomputing.com \
--cc=andre.przywara@arm.com \
--cc=catalin.marinas@arm.com \
--cc=d.scott.phillips@amperecomputing.com \
--cc=darren@os.amperecomputing.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=maz@kernel.org \
--cc=will@kernel.org \
/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).