On 1/24/22 18:54, David Matlack wrote:
On Sun, Jan 23, 2022 at 5:36 AM gregkh@linuxfoundation.org wrote:
The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
I'll take a look and send a backport to 5.10.
It's just context, in that 5.10 didn't have shadow_mmu_writable_mask yet (and instead has a constant SPTE_MMU_WRITABLE). Thanks for fixing it up!
Paolo
index 7b1bc816b7c3..bc9e3553fba2 100644 --- a/arch/x86/kvm/mmu/tdp_mmu.c +++ b/arch/x86/kvm/mmu/tdp_mmu.c @@ -1442,12 +1442,12 @@ static bool write_protect_gfn(struct kvm *kvm, struct kvm_mmu_page *root, !is_last_spte(iter.old_spte, iter.level)) continue;
if (!is_writable_pte(iter.old_spte))break;new_spte = iter.old_spte & ~(PT_WRITABLE_MASK | shadow_mmu_writable_mask);
if (new_spte == iter.old_spte)break;tdp_mmu_set_spte(kvm, &iter, new_spte); spte_set = true; }