| Message ID | 20200611030559.75257-1-aik@ozlabs.ru |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [kernel] KVM: PPC: Fix nested guest RC bits update | expand |
On Thu, 11 Jun 2020 13:05:59 +1000, Alexey Kardashevskiy wrote: > Before commit 6cdf30375f82 ("powerpc/kvm/book3s: Use kvm helpers > to walk shadow or secondary table") we called __find_linux_pte() with > a page table pointer from a kvm_nested_guest struct but > now we rely on kvmhv_find_nested() which takes an L1 LPID and returns > a kvm_nested_guest pointer, however we pass a L0 LPID there and > the L2 guest hangs. > > [...] Applied to powerpc/fixes. [1/1] KVM: PPC: Fix nested guest RC bits update https://git.kernel.org/powerpc/c/e881bfaf5a5f409390973e076333281465f2b0d9 cheers
diff --git a/arch/powerpc/kvm/book3s_hv_nested.c b/arch/powerpc/kvm/book3s_hv_nested.c index 99011f1b772a..f36f0a2993c0 100644 --- a/arch/powerpc/kvm/book3s_hv_nested.c +++ b/arch/powerpc/kvm/book3s_hv_nested.c @@ -1234,7 +1234,7 @@ static long kvmhv_handle_nested_set_rc(struct kvm_vcpu *vcpu, /* Set the rc bit in the pte of the shadow_pgtable for the nest guest */ ret = kvmppc_hv_handle_set_rc(kvm, true, writing, - n_gpa, gp->shadow_lpid); + n_gpa, gp->l1_lpid); if (!ret) ret = -EINVAL; else
Before commit 6cdf30375f82 ("powerpc/kvm/book3s: Use kvm helpers to walk shadow or secondary table") we called __find_linux_pte() with a page table pointer from a kvm_nested_guest struct but now we rely on kvmhv_find_nested() which takes an L1 LPID and returns a kvm_nested_guest pointer, however we pass a L0 LPID there and the L2 guest hangs. This fixes the LPID passed to kvmppc_hv_handle_set_rc(). Fixes: 6cdf30375f82 ("powerpc/kvm/book3s: Use kvm helpers to walk shadow or secondary table") Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> --- arch/powerpc/kvm/book3s_hv_nested.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)