diff for duplicates of <20200319035609.158654-11-aneesh.kumar@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 7f94988..bba0522 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -64,7 +64,7 @@ index 7f1fc5db13ea..b2cc3eaec618 100644 - ptep = __find_linux_pte(gp->shadow_pgtable, gpa, NULL, &shift); + ptep = find_kvm_nested_guest_pte(kvm, lpid, gpa, &shift); /* Don't spuriously invalidate ptes if the pfn has changed */ - if (ptep && pte_present(*ptep) && ((pte_val(*ptep) & mask) = hpa)) + if (ptep && pte_present(*ptep) && ((pte_val(*ptep) & mask) == hpa)) kvmppc_unmap_pte(kvm, ptep, gpa, shift, NULL, gp->shadow_lpid); @@ -921,7 +935,7 @@ static bool kvmhv_invalidate_shadow_pte(struct kvm_vcpu *vcpu, int shift; diff --git a/a/content_digest b/N1/content_digest index 0a9e2a2..deed0cf 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,16 @@ "ref\020200319035609.158654-1-aneesh.kumar@linux.ibm.com\0" "From\0Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>\0" "Subject\0[PATCH v2 10/22] powerpc/kvm/nested: Add helper to walk nested shadow linux page table.\0" - "Date\0Thu, 19 Mar 2020 03:57:32 +0000\0" + "Date\0Thu, 19 Mar 2020 09:25:57 +0530\0" "To\0linuxppc-dev@lists.ozlabs.org" mpe@ellerman.id.au linux-mm@kvack.org linux-kernel@vger.kernel.org " kvm-ppc@vger.kernel.org\0" - "Cc\0npiggin@gmail.com" - paulus@ozlabs.org - leonardo@linux.ibm.com - kirill@shutemov.name - " Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>\0" + "Cc\0leonardo@linux.ibm.com" + Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> + npiggin@gmail.com + " kirill@shutemov.name\0" "\00:1\0" "b\0" "The locking rules for walking nested shadow linux page table is different from process\n" @@ -80,7 +79,7 @@ "-\tptep = __find_linux_pte(gp->shadow_pgtable, gpa, NULL, &shift);\n" "+\tptep = find_kvm_nested_guest_pte(kvm, lpid, gpa, &shift);\n" " \t/* Don't spuriously invalidate ptes if the pfn has changed */\n" - " \tif (ptep && pte_present(*ptep) && ((pte_val(*ptep) & mask) = hpa))\n" + " \tif (ptep && pte_present(*ptep) && ((pte_val(*ptep) & mask) == hpa))\n" " \t\tkvmppc_unmap_pte(kvm, ptep, gpa, shift, NULL, gp->shadow_lpid);\n" "@@ -921,7 +935,7 @@ static bool kvmhv_invalidate_shadow_pte(struct kvm_vcpu *vcpu,\n" " \tint shift;\n" @@ -94,4 +93,4 @@ "-- \n" 2.24.1 -f0f108fe8a64513cecca8b3877c371e8f2e4b71b655f26f2b661d7a9ab509d84 +0521e40ecd0bce157249884d14e71ebd5d63c66f5f097f08a8e79c3144355525
diff --git a/a/1.txt b/N2/1.txt index 7f94988..bba0522 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -64,7 +64,7 @@ index 7f1fc5db13ea..b2cc3eaec618 100644 - ptep = __find_linux_pte(gp->shadow_pgtable, gpa, NULL, &shift); + ptep = find_kvm_nested_guest_pte(kvm, lpid, gpa, &shift); /* Don't spuriously invalidate ptes if the pfn has changed */ - if (ptep && pte_present(*ptep) && ((pte_val(*ptep) & mask) = hpa)) + if (ptep && pte_present(*ptep) && ((pte_val(*ptep) & mask) == hpa)) kvmppc_unmap_pte(kvm, ptep, gpa, shift, NULL, gp->shadow_lpid); @@ -921,7 +935,7 @@ static bool kvmhv_invalidate_shadow_pte(struct kvm_vcpu *vcpu, int shift; diff --git a/a/content_digest b/N2/content_digest index 0a9e2a2..a75c45c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020200319035609.158654-1-aneesh.kumar@linux.ibm.com\0" "From\0Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>\0" "Subject\0[PATCH v2 10/22] powerpc/kvm/nested: Add helper to walk nested shadow linux page table.\0" - "Date\0Thu, 19 Mar 2020 03:57:32 +0000\0" + "Date\0Thu, 19 Mar 2020 09:25:57 +0530\0" "To\0linuxppc-dev@lists.ozlabs.org" mpe@ellerman.id.au linux-mm@kvack.org @@ -80,7 +80,7 @@ "-\tptep = __find_linux_pte(gp->shadow_pgtable, gpa, NULL, &shift);\n" "+\tptep = find_kvm_nested_guest_pte(kvm, lpid, gpa, &shift);\n" " \t/* Don't spuriously invalidate ptes if the pfn has changed */\n" - " \tif (ptep && pte_present(*ptep) && ((pte_val(*ptep) & mask) = hpa))\n" + " \tif (ptep && pte_present(*ptep) && ((pte_val(*ptep) & mask) == hpa))\n" " \t\tkvmppc_unmap_pte(kvm, ptep, gpa, shift, NULL, gp->shadow_lpid);\n" "@@ -921,7 +935,7 @@ static bool kvmhv_invalidate_shadow_pte(struct kvm_vcpu *vcpu,\n" " \tint shift;\n" @@ -94,4 +94,4 @@ "-- \n" 2.24.1 -f0f108fe8a64513cecca8b3877c371e8f2e4b71b655f26f2b661d7a9ab509d84 +eb9df8e9d8d60d588e4316d5000d6805fcc94d4269666c5e4234bf679fe7406d
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.