]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
KVM: x86/mmu: Fix return value in tdp_mmu_map_handle_target_level()
authorKai Huang <kai.huang@intel.com>
Tue, 15 Jun 2021 00:57:09 +0000 (12:57 +1200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Jul 2021 14:59:36 +0000 (16:59 +0200)
commitff78c1f7b68ddba519b060f0bf6a92e7cc83a063
tree8af12f90623697aa8d59f43db989485437cff37a
parent2e4093f2b730886c04ddc2707aa1ca428962aaf4
KVM: x86/mmu: Fix return value in tdp_mmu_map_handle_target_level()

[ Upstream commit 57a3e96d6d17ae5ac9861ef34af024a627f1c3bb ]

Currently tdp_mmu_map_handle_target_level() returns 0, which is
RET_PF_RETRY, when page fault is actually fixed.  This makes
kvm_tdp_mmu_map() also return RET_PF_RETRY in this case, instead of
RET_PF_FIXED.  Fix by initializing ret to RET_PF_FIXED.

Note that kvm_mmu_page_fault() resumes guest on both RET_PF_RETRY and
RET_PF_FIXED, which means in practice returning the two won't make
difference, so this fix alone won't be necessary for stable tree.

Fixes: bb18842e2111 ("kvm: x86/mmu: Add TDP MMU PF handler")
Reviewed-by: Sean Christopherson <seanjc@google.com>
Reviewed-by: Ben Gardon <bgardon@google.com>
Signed-off-by: Kai Huang <kai.huang@intel.com>
Message-Id: <f9e8956223a586cd28c090879a8ff40f5eb6d609.1623717884.git.kai.huang@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/x86/kvm/mmu/tdp_mmu.c