diff for duplicates of <20181016170521.241312038@linuxfoundation.org> diff --git a/a/1.txt b/N1/1.txt index aac791e..be2a825 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> @@ -636,9 +636,10 @@ int kvmppc_book3s_radix_page_fault(struc */ 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 { @@ -62,12 +62,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 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); @@ -91,12 +91,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + 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 { @@ -108,12 +108,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 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 9c848f0..7e3feb0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,16 @@ "ref\020181016170515.447235311@linuxfoundation.org\0" "From\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0" "Subject\0[PATCH 4.18 086/135] KVM: PPC: Book3S HV: Dont use compound_order to determine host mapping size\0" - "Date\0Tue, 16 Oct 2018 17:05:16 +0000\0" + "Date\0Tue, 16 Oct 2018 19:05:16 +0200\0" "To\0linux-kernel@vger.kernel.org\0" - "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>" + "Cc\0Sasha Levin <alexander.levin@microsoft.com>" + Greg Kroah-Hartman <gregkh@linuxfoundation.org> + Nicholas Piggin <npiggin@gmail.com> + kvm-ppc@vger.kernel.org stable@vger.kernel.org - David Gibson <david@gibson.dropbear.id.au> Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> - kvm-ppc@vger.kernel.org linuxppc-dev@lists.ozlabs.org - Nicholas Piggin <npiggin@gmail.com> - Paul Mackerras <paulus@ozlabs.org> - " Sasha Levin <alexander.levin@microsoft.com>\0" + " David Gibson <david@gibson.dropbear.id.au>\0" "\00:1\0" "b\0" "4.18-stable review patch. If anyone has any objections, please let me know.\n" @@ -60,7 +59,7 @@ "@@ -636,9 +636,10 @@ int kvmppc_book3s_radix_page_fault(struc\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" @@ -78,12 +77,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" @@ -107,12 +106,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" @@ -124,12 +123,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" @@ -166,4 +165,4 @@ " \t/* Allocate space in the tree and write the PTE */\n" " \tret = kvmppc_create_pte(kvm, pte, gpa, level, mmu_seq);" -38d29c46ba8a9ca88681061d914aa5bca3afd703678fa4688966ba58731e496f +137a1a508090818a9901cb82f49054873ac3b0a1aaeb629a52677a6e6e2cfcb1
diff --git a/a/1.txt b/N2/1.txt index aac791e..be2a825 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> @@ -636,9 +636,10 @@ int kvmppc_book3s_radix_page_fault(struc */ 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 { @@ -62,12 +62,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 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); @@ -91,12 +91,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + 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 { @@ -108,12 +108,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 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/N2/content_digest index 9c848f0..2452947 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020181016170515.447235311@linuxfoundation.org\0" "From\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0" "Subject\0[PATCH 4.18 086/135] KVM: PPC: Book3S HV: Dont use compound_order to determine host mapping size\0" - "Date\0Tue, 16 Oct 2018 17:05:16 +0000\0" + "Date\0Tue, 16 Oct 2018 19:05:16 +0200\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>" stable@vger.kernel.org @@ -60,7 +60,7 @@ "@@ -636,9 +636,10 @@ int kvmppc_book3s_radix_page_fault(struc\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" @@ -78,12 +78,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" @@ -107,12 +107,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" @@ -124,12 +124,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" @@ -166,4 +166,4 @@ " \t/* Allocate space in the tree and write the PTE */\n" " \tret = kvmppc_create_pte(kvm, pte, gpa, level, mmu_seq);" -38d29c46ba8a9ca88681061d914aa5bca3afd703678fa4688966ba58731e496f +e5449bf22233b9084301333439cc2af2973248279c512a8eb478e3c1bfe81f1a
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.