diff for duplicates of <20180904081601.32703-1-npiggin@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 6947967..72a8ecc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -35,7 +35,7 @@ index 0af1c0aea1fe..d8792445d95a 100644 @@ -623,9 +623,10 @@ int kvmppc_book3s_radix_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu, */ hva = gfn_to_hva_memslot(memslot, gfn); - if (upgrade_p && __get_user_pages_fast(hva, 1, 1, &page) = 1) { + if (upgrade_p && __get_user_pages_fast(hva, 1, 1, &page) == 1) { - pfn = page_to_pfn(page); upgrade_write = true; } else { @@ -53,12 +53,12 @@ index 0af1c0aea1fe..d8792445d95a 100644 - if (page && PageCompound(page)) { - pte_size = PAGE_SIZE << compound_order(compound_head(page)); - if (pte_size >= PUD_SIZE && -- (gpa & (PUD_SIZE - PAGE_SIZE)) = +- (gpa & (PUD_SIZE - PAGE_SIZE)) == - (hva & (PUD_SIZE - PAGE_SIZE))) { - level = 2; - pfn &= ~((PUD_SIZE >> PAGE_SHIFT) - 1); - } else if (pte_size >= PMD_SIZE && -- (gpa & (PMD_SIZE - PAGE_SIZE)) = +- (gpa & (PMD_SIZE - PAGE_SIZE)) == - (hva & (PMD_SIZE - PAGE_SIZE))) { - level = 1; - pfn &= ~((PMD_SIZE >> PAGE_SHIFT) - 1); @@ -82,12 +82,12 @@ index 0af1c0aea1fe..d8792445d95a 100644 + local_irq_enable(); + + /* Get pte level from shift/size */ -+ if (shift = PUD_SHIFT && -+ (gpa & (PUD_SIZE - PAGE_SIZE)) = ++ if (shift == PUD_SHIFT && ++ (gpa & (PUD_SIZE - PAGE_SIZE)) == + (hva & (PUD_SIZE - PAGE_SIZE))) { + level = 2; -+ } else if (shift = PMD_SHIFT && -+ (gpa & (PMD_SIZE - PAGE_SIZE)) = ++ } else if (shift == PMD_SHIFT && ++ (gpa & (PMD_SIZE - PAGE_SIZE)) == + (hva & (PMD_SIZE - PAGE_SIZE))) { + level = 1; } else { @@ -99,12 +99,12 @@ index 0af1c0aea1fe..d8792445d95a 100644 - ptep = __find_linux_pte(vcpu->arch.pgdir, hva, NULL, &shift); - pte = *ptep; - local_irq_enable(); -- if (shift = PUD_SHIFT && -- (gpa & (PUD_SIZE - PAGE_SIZE)) = +- if (shift == PUD_SHIFT && +- (gpa & (PUD_SIZE - PAGE_SIZE)) == - (hva & (PUD_SIZE - PAGE_SIZE))) { - level = 2; -- } else if (shift = PMD_SHIFT && -- (gpa & (PMD_SIZE - PAGE_SIZE)) = +- } else if (shift == PMD_SHIFT && +- (gpa & (PMD_SIZE - PAGE_SIZE)) == - (hva & (PMD_SIZE - PAGE_SIZE))) { - level = 1; - } else if (shift && shift != PAGE_SHIFT) { diff --git a/a/content_digest b/N1/content_digest index cea8615..d81d3a5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Nicholas Piggin <npiggin@gmail.com>\0" "Subject\0[PATCH] KVM: PPC: Book3S HV: Don't use compound_order to determine host mapping size\0" - "Date\0Tue, 04 Sep 2018 08:16:01 +0000\0" + "Date\0Tue, 4 Sep 2018 18:16:01 +1000\0" "To\0kvm-ppc@vger.kernel.org\0" "Cc\0Nicholas Piggin <npiggin@gmail.com>" Paul Mackerras <paulus@ozlabs.org> @@ -46,7 +46,7 @@ "@@ -623,9 +623,10 @@ int kvmppc_book3s_radix_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu,\n" " \t */\n" " \thva = gfn_to_hva_memslot(memslot, gfn);\n" - " \tif (upgrade_p && __get_user_pages_fast(hva, 1, 1, &page) = 1) {\n" + " \tif (upgrade_p && __get_user_pages_fast(hva, 1, 1, &page) == 1) {\n" "-\t\tpfn = page_to_pfn(page);\n" " \t\tupgrade_write = true;\n" " \t} else {\n" @@ -64,12 +64,12 @@ "-\tif (page && PageCompound(page)) {\n" "-\t\tpte_size = PAGE_SIZE << compound_order(compound_head(page));\n" "-\t\tif (pte_size >= PUD_SIZE &&\n" - "-\t\t (gpa & (PUD_SIZE - PAGE_SIZE)) =\n" + "-\t\t (gpa & (PUD_SIZE - PAGE_SIZE)) ==\n" "-\t\t (hva & (PUD_SIZE - PAGE_SIZE))) {\n" "-\t\t\tlevel = 2;\n" "-\t\t\tpfn &= ~((PUD_SIZE >> PAGE_SHIFT) - 1);\n" "-\t\t} else if (pte_size >= PMD_SIZE &&\n" - "-\t\t\t (gpa & (PMD_SIZE - PAGE_SIZE)) =\n" + "-\t\t\t (gpa & (PMD_SIZE - PAGE_SIZE)) ==\n" "-\t\t\t (hva & (PMD_SIZE - PAGE_SIZE))) {\n" "-\t\t\tlevel = 1;\n" "-\t\t\tpfn &= ~((PMD_SIZE >> PAGE_SHIFT) - 1);\n" @@ -93,12 +93,12 @@ "+\tlocal_irq_enable();\n" "+\n" "+\t/* Get pte level from shift/size */\n" - "+\tif (shift = PUD_SHIFT &&\n" - "+\t (gpa & (PUD_SIZE - PAGE_SIZE)) =\n" + "+\tif (shift == PUD_SHIFT &&\n" + "+\t (gpa & (PUD_SIZE - PAGE_SIZE)) ==\n" "+\t (hva & (PUD_SIZE - PAGE_SIZE))) {\n" "+\t\tlevel = 2;\n" - "+\t} else if (shift = PMD_SHIFT &&\n" - "+\t\t (gpa & (PMD_SIZE - PAGE_SIZE)) =\n" + "+\t} else if (shift == PMD_SHIFT &&\n" + "+\t\t (gpa & (PMD_SIZE - PAGE_SIZE)) ==\n" "+\t\t (hva & (PMD_SIZE - PAGE_SIZE))) {\n" "+\t\tlevel = 1;\n" " \t} else {\n" @@ -110,12 +110,12 @@ "-\t\tptep = __find_linux_pte(vcpu->arch.pgdir, hva, NULL, &shift);\n" "-\t\tpte = *ptep;\n" "-\t\tlocal_irq_enable();\n" - "-\t\tif (shift = PUD_SHIFT &&\n" - "-\t\t (gpa & (PUD_SIZE - PAGE_SIZE)) =\n" + "-\t\tif (shift == PUD_SHIFT &&\n" + "-\t\t (gpa & (PUD_SIZE - PAGE_SIZE)) ==\n" "-\t\t (hva & (PUD_SIZE - PAGE_SIZE))) {\n" "-\t\t\tlevel = 2;\n" - "-\t\t} else if (shift = PMD_SHIFT &&\n" - "-\t\t\t (gpa & (PMD_SIZE - PAGE_SIZE)) =\n" + "-\t\t} else if (shift == PMD_SHIFT &&\n" + "-\t\t\t (gpa & (PMD_SIZE - PAGE_SIZE)) ==\n" "-\t\t\t (hva & (PMD_SIZE - PAGE_SIZE))) {\n" "-\t\t\tlevel = 1;\n" "-\t\t} else if (shift && shift != PAGE_SHIFT) {\n" @@ -152,4 +152,4 @@ "-- \n" 2.18.0 -27fe9ca6a61218121069800d0f0da6ad9b5ab59f0af4cd3654275b6a3e55565c +f3a1e57942eb8a96f39e0c81b05806ca2801bb23725aa12fab2ca4a78317bc37
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.