diff for duplicates of <20180717071913.2167-3-aik@ozlabs.ru>
diff --git a/a/1.txt b/N1/1.txt
index 71aab68..43f506b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -65,7 +65,7 @@ v2:
The bug is: run QEMU _without_ hugepages (no -mempath) and tell it to
advertise 16MB pages to the guest; a typical pseries guest will use 16MB
for IOMMU pages without checking the mmu pagesize and this will fail
-at https://git.qemu.org/?p=qemu.git;a=blob;f=hw/vfio/common.c;h=fb396cf00ac40eb35967a04c9cc798ca896eed57;hb=refs/heads/master#l256
+at https://git.qemu.org/?p=qemu.git;a=blob;f=hw/vfio/common.c;hû396cf00ac40eb35967a04c9cc798ca896eed57;hb=refs/heads/master#l256
With the change, mapping will fail in KVM and the guest will print:
@@ -127,9 +127,9 @@ index 925fc31..5b298f5 100644
mem = mm_iommu_lookup_rm(vcpu->kvm->mm, ua, IOMMU_PAGE_SIZE_4K);
if (mem)
-- prereg = mm_iommu_ua_to_hpa_rm(mem, ua, &tces) == 0;
+- prereg = mm_iommu_ua_to_hpa_rm(mem, ua, &tces) = 0;
+ prereg = mm_iommu_ua_to_hpa_rm(mem, ua,
-+ IOMMU_PAGE_SHIFT_4K, &tces) == 0;
++ IOMMU_PAGE_SHIFT_4K, &tces) = 0;
}
if (!prereg) {
@@ -190,8 +190,8 @@ index abb4364..a4ca576 100644
+ local_irq_restore(flags);
+
+ /* Double check it is still the same pinned page */
-+ if (pte && pte_page(*pte) == head &&
-+ pageshift == compshift)
++ if (pte && pte_page(*pte) = head &&
++ pageshift = compshift)
+ pageshift = max_t(unsigned int, pageshift,
+ PAGE_SHIFT);
+ }
diff --git a/a/content_digest b/N1/content_digest
index ad9e7ff..df61b8a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH kernel v7 2/2] KVM: PPC: Check if IOMMU page is contained in the pinned physical page\0"
]
[
- "Date\0Tue, 17 Jul 2018 17:19:13 +1000\0"
+ "Date\0Tue, 17 Jul 2018 07:19:13 +0000\0"
]
[
"To\0linuxppc-dev\@lists.ozlabs.org\0"
@@ -97,7 +97,7 @@
"The bug is: run QEMU _without_ hugepages (no -mempath) and tell it to\n",
"advertise 16MB pages to the guest; a typical pseries guest will use 16MB\n",
"for IOMMU pages without checking the mmu pagesize and this will fail\n",
- "at https://git.qemu.org/?p=qemu.git;a=blob;f=hw/vfio/common.c;h=fb396cf00ac40eb35967a04c9cc798ca896eed57;hb=refs/heads/master#l256\n",
+ "at https://git.qemu.org/?p=qemu.git;a=blob;f=hw/vfio/common.c;h\303\273396cf00ac40eb35967a04c9cc798ca896eed57;hb=refs/heads/master#l256\n",
"\n",
"With the change, mapping will fail in KVM and the guest will print:\n",
"\n",
@@ -159,9 +159,9 @@
" \n",
" \t\tmem = mm_iommu_lookup_rm(vcpu->kvm->mm, ua, IOMMU_PAGE_SIZE_4K);\n",
" \t\tif (mem)\n",
- "-\t\t\tprereg = mm_iommu_ua_to_hpa_rm(mem, ua, &tces) == 0;\n",
+ "-\t\t\tprereg = mm_iommu_ua_to_hpa_rm(mem, ua, &tces) = 0;\n",
"+\t\t\tprereg = mm_iommu_ua_to_hpa_rm(mem, ua,\n",
- "+\t\t\t\t\tIOMMU_PAGE_SHIFT_4K, &tces) == 0;\n",
+ "+\t\t\t\t\tIOMMU_PAGE_SHIFT_4K, &tces) = 0;\n",
" \t}\n",
" \n",
" \tif (!prereg) {\n",
@@ -222,8 +222,8 @@
"+\t\t\tlocal_irq_restore(flags);\n",
"+\n",
"+\t\t\t/* Double check it is still the same pinned page */\n",
- "+\t\t\tif (pte && pte_page(*pte) == head &&\n",
- "+\t\t\t\t\tpageshift == compshift)\n",
+ "+\t\t\tif (pte && pte_page(*pte) = head &&\n",
+ "+\t\t\t\t\tpageshift = compshift)\n",
"+\t\t\t\tpageshift = max_t(unsigned int, pageshift,\n",
"+\t\t\t\t\t\tPAGE_SHIFT);\n",
"+\t\t}\n",
@@ -286,4 +286,4 @@
"2.11.0"
]
-40a64be20ec8b122bf77f840a2d6a527a018889dd668a95541417746c050b57f
+3baeb5e925bf2f98897fb4c3d782567a331a377c3026936d669ba6b70aa1b887
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.