diff for duplicates of <1485141440.8172.4.camel@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 5933784..836bd3e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -205,7 +205,7 @@ On Thu, 2017-01-12 at 20:07 +1100, Paul Mackerras wrote: > + else > + new_pmd = pmd_alloc_one(kvm->mm, gpa); > + -> + if (level = 0 && !(pmd && pmd_present(*pmd))) +> + if (level == 0 && !(pmd && pmd_present(*pmd))) > + new_ptep = kvmppc_pte_alloc(); > + > + /* Check if we might have been invalidated; let the guest @@ -237,7 +237,7 @@ On Thu, 2017-01-12 at 20:07 +1100, Paul Mackerras wrote: > + ret = -EAGAIN; > + goto out_unlock; > + } -> + if (level = 1 && !pmd_none(*pmd)) { +> + if (level == 1 && !pmd_none(*pmd)) { > + /* > + * There's a page table page here, but we wanted > + * to install a large page. Tell the caller and let @@ -246,7 +246,7 @@ On Thu, 2017-01-12 at 20:07 +1100, Paul Mackerras wrote: > + ret = -EBUSY; > + goto out_unlock; > + } -> + if (level = 0) { +> + if (level == 0) { > + if (pmd_none(*pmd)) { > + if (!new_ptep) > + goto out_unlock; @@ -364,7 +364,7 @@ On Thu, 2017-01-12 at 20:07 +1100, Paul Mackerras wrote: > + if (ptep) { > + pte = READ_ONCE(*ptep); > + if (pte_present(pte) && -> + (pte_val(pte) & pgflags) = pgflags) +> + (pte_val(pte) & pgflags) == pgflags) > + ok = 1; > + } > + local_irq_restore(flags); @@ -420,7 +420,7 @@ On Thu, 2017-01-12 at 20:07 +1100, Paul Mackerras wrote: > + /* See if we can insert a 2MB large-page PTE > here */ > + if (pte_size >= PMD_SIZE && -> + (gpa & PMD_MASK & PAGE_MASK) = +> + (gpa & PMD_MASK & PAGE_MASK) == > + (hva & PMD_MASK & PAGE_MASK)) { > + level = 1; > + pfn &= ~((PMD_SIZE >> PAGE_SHIFT) - @@ -457,7 +457,7 @@ On Thu, 2017-01-12 at 20:07 +1100, Paul Mackerras wrote: > + > + /* Allocate space in the tree and write the PTE */ > + ret = kvmppc_create_pte(kvm, pte, gpa, level, mmu_seq); -> + if (ret = -EBUSY) { +> + if (ret == -EBUSY) { > + /* > + * There's already a PMD where wanted to install a > large page; @@ -469,7 +469,7 @@ On Thu, 2017-01-12 at 20:07 +1100, Paul Mackerras wrote: > + ret = kvmppc_create_pte(kvm, pte, gpa, level, > mmu_seq); > + } -> + if (ret = 0 || ret = -EAGAIN) +> + if (ret == 0 || ret == -EAGAIN) > + ret = RESUME_GUEST; > + > + if (page) { diff --git a/a/content_digest b/N1/content_digest index 867395a..c308448 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01484212046-29591-14-git-send-email-paulus@ozlabs.org\0" "From\0Suraj Jitindar Singh <sjitindarsingh@gmail.com>\0" "Subject\0Re: [PATCH 13/18] KVM: PPC: Book3S HV: Page table construction and page faults for radix guests\0" - "Date\0Mon, 23 Jan 2017 03:17:20 +0000\0" + "Date\0Mon, 23 Jan 2017 14:17:20 +1100\0" "To\0Paul Mackerras <paulus@ozlabs.org>" linuxppc-dev@ozlabs.org kvm@vger.kernel.org @@ -216,7 +216,7 @@ "> +\telse\n" "> +\t\tnew_pmd = pmd_alloc_one(kvm->mm, gpa);\n" "> +\n" - "> +\tif (level = 0 && !(pmd && pmd_present(*pmd)))\n" + "> +\tif (level == 0 && !(pmd && pmd_present(*pmd)))\n" "> +\t\tnew_ptep = kvmppc_pte_alloc();\n" "> +\n" "> +\t/* Check if we might have been invalidated; let the guest\n" @@ -248,7 +248,7 @@ "> +\t\tret = -EAGAIN;\n" "> +\t\tgoto out_unlock;\n" "> +\t}\n" - "> +\tif (level = 1 && !pmd_none(*pmd)) {\n" + "> +\tif (level == 1 && !pmd_none(*pmd)) {\n" "> +\t\t/*\n" "> +\t\t\302\240* There's a page table page here, but we wanted\n" "> +\t\t\302\240* to install a large page.\302\240\302\240Tell the caller and let\n" @@ -257,7 +257,7 @@ "> +\t\tret = -EBUSY;\n" "> +\t\tgoto out_unlock;\n" "> +\t}\n" - "> +\tif (level = 0) {\n" + "> +\tif (level == 0) {\n" "> +\t\tif (pmd_none(*pmd)) {\n" "> +\t\t\tif (!new_ptep)\n" "> +\t\t\t\tgoto out_unlock;\n" @@ -375,7 +375,7 @@ "> +\t\tif (ptep) {\n" "> +\t\t\tpte = READ_ONCE(*ptep);\n" "> +\t\t\tif (pte_present(pte) &&\n" - "> +\t\t\t\302\240\302\240\302\240\302\240(pte_val(pte) & pgflags) = pgflags)\n" + "> +\t\t\t\302\240\302\240\302\240\302\240(pte_val(pte) & pgflags) == pgflags)\n" "> +\t\t\t\tok = 1;\n" "> +\t\t}\n" "> +\t\tlocal_irq_restore(flags);\n" @@ -431,7 +431,7 @@ "> +\t\t\t/* See if we can insert a 2MB large-page PTE\n" "> here */\n" "> +\t\t\tif (pte_size >= PMD_SIZE &&\n" - "> +\t\t\t\302\240\302\240\302\240\302\240(gpa & PMD_MASK & PAGE_MASK) =\n" + "> +\t\t\t\302\240\302\240\302\240\302\240(gpa & PMD_MASK & PAGE_MASK) ==\n" "> +\t\t\t\302\240\302\240\302\240\302\240(hva & PMD_MASK & PAGE_MASK)) {\n" "> +\t\t\t\tlevel = 1;\n" "> +\t\t\t\tpfn &= ~((PMD_SIZE >> PAGE_SHIFT) -\n" @@ -468,7 +468,7 @@ "> +\n" "> +\t/* Allocate space in the tree and write the PTE */\n" "> +\tret = kvmppc_create_pte(kvm, pte, gpa, level, mmu_seq);\n" - "> +\tif (ret = -EBUSY) {\n" + "> +\tif (ret == -EBUSY) {\n" "> +\t\t/*\n" "> +\t\t\302\240* There's already a PMD where wanted to install a\n" "> large page;\n" @@ -480,7 +480,7 @@ "> +\t\tret = kvmppc_create_pte(kvm, pte, gpa, level,\n" "> mmu_seq);\n" "> +\t}\n" - "> +\tif (ret = 0 || ret = -EAGAIN)\n" + "> +\tif (ret == 0 || ret == -EAGAIN)\n" "> +\t\tret = RESUME_GUEST;\n" "> +\n" "> +\tif (page) {\n" @@ -610,4 +610,4 @@ "> \302\240}\n" > -0536c71663e04371612a77c7b7eee55c5638d41e9315c6fa9547979333e586af +bc93de25d3c4e3c05a99ccfc0685b8162b51f4d76d4be0a1942ae451f3e906df
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.