diff for duplicates of <1534420669170195@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 3e1695a..e1b99be 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,84 +12,3 @@ and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@vger.kernel.org> know about it. - - ->From f967db0b9ed44ec3057a28f3b28efc51df51b835 Mon Sep 17 00:00:00 2001 -From: Toshi Kani <toshi.kani@hpe.com> -Date: Wed, 27 Jun 2018 08:13:46 -0600 -Subject: x86/mm: Disable ioremap free page handling on x86-PAE - -From: Toshi Kani <toshi.kani@hpe.com> - -commit f967db0b9ed44ec3057a28f3b28efc51df51b835 upstream. - -ioremap() supports pmd mappings on x86-PAE. However, kernel's pmd -tables are not shared among processes on x86-PAE. Therefore, any -update to sync'd pmd entries need re-syncing. Freeing a pte page -also leads to a vmalloc fault and hits the BUG_ON in vmalloc_sync_one(). - -Disable free page handling on x86-PAE. pud_free_pmd_page() and -pmd_free_pte_page() simply return 0 if a given pud/pmd entry is present. -This assures that ioremap() does not update sync'd pmd entries at the -cost of falling back to pte mappings. - -Fixes: 28ee90fe6048 ("x86/mm: implement free pmd/pte page interfaces") -Reported-by: Joerg Roedel <joro@8bytes.org> -Signed-off-by: Toshi Kani <toshi.kani@hpe.com> -Signed-off-by: Thomas Gleixner <tglx@linutronix.de> -Cc: mhocko at suse.com -Cc: akpm at linux-foundation.org -Cc: hpa at zytor.com -Cc: cpandya at codeaurora.org -Cc: linux-mm at kvack.org -Cc: linux-arm-kernel at lists.infradead.org -Cc: stable at vger.kernel.org -Cc: Andrew Morton <akpm@linux-foundation.org> -Cc: Michal Hocko <mhocko@suse.com> -Cc: "H. Peter Anvin" <hpa@zytor.com> -Cc: <stable@vger.kernel.org> -Link: https://lkml.kernel.org/r/20180627141348.21777-2-toshi.kani at hpe.com -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - ---- - arch/x86/mm/pgtable.c | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - ---- a/arch/x86/mm/pgtable.c -+++ b/arch/x86/mm/pgtable.c -@@ -676,6 +676,7 @@ int pmd_clear_huge(pmd_t *pmd) - return 0; - } - -+#ifdef CONFIG_X86_64 - /** - * pud_free_pmd_page - Clear pud entry and free pmd page. - * @pud: Pointer to a PUD. -@@ -723,4 +724,22 @@ int pmd_free_pte_page(pmd_t *pmd) - - return 1; - } -+ -+#else /* !CONFIG_X86_64 */ -+ -+int pud_free_pmd_page(pud_t *pud) -+{ -+ return pud_none(*pud); -+} -+ -+/* -+ * Disable free page handling on x86-PAE. This assures that ioremap() -+ * does not update sync'd pmd entries. See vmalloc_sync_one(). -+ */ -+int pmd_free_pte_page(pmd_t *pmd) -+{ -+ return pmd_none(*pmd); -+} -+ -+#endif /* CONFIG_X86_64 */ - #endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */ - - -Patches currently in stable-queue which might be from toshi.kani at hpe.com are - -queue-4.4/x86-mm-disable-ioremap-free-page-handling-on-x86-pae.patch diff --git a/a/content_digest b/N1/content_digest index cde0b84..70ef92e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,17 @@ - "From\0gregkh@linuxfoundation.org (gregkh at linuxfoundation.org)\0" + "From\0<gregkh@linuxfoundation.org>\0" "Subject\0Patch \"x86/mm: Disable ioremap free page handling on x86-PAE\" has been added to the 4.4-stable tree\0" "Date\0Thu, 16 Aug 2018 13:57:49 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\020180627141348.21777-2-toshi.kani@hpe.com" + akpm@linux-foundation.org + cpandya@codeaurora.org + gregkh@linuxfoundation.org + hpa@zytor.com + joro@8bytes.org + linux-arm-kernel@lists.infradead.org + linux-mm@kvack.org + mhocko@suse.com + " tglx@linutronix.detoshi.kani@hpe.com\0" + "Cc\0stable-commits@vger.kernel.org\0" "\00:1\0" "b\0" "\n" @@ -17,87 +27,6 @@ "and it can be found in the queue-4.4 subdirectory.\n" "\n" "If you, or anyone else, feels it should not be added to the stable tree,\n" - "please let <stable@vger.kernel.org> know about it.\n" - "\n" - "\n" - ">From f967db0b9ed44ec3057a28f3b28efc51df51b835 Mon Sep 17 00:00:00 2001\n" - "From: Toshi Kani <toshi.kani@hpe.com>\n" - "Date: Wed, 27 Jun 2018 08:13:46 -0600\n" - "Subject: x86/mm: Disable ioremap free page handling on x86-PAE\n" - "\n" - "From: Toshi Kani <toshi.kani@hpe.com>\n" - "\n" - "commit f967db0b9ed44ec3057a28f3b28efc51df51b835 upstream.\n" - "\n" - "ioremap() supports pmd mappings on x86-PAE. However, kernel's pmd\n" - "tables are not shared among processes on x86-PAE. Therefore, any\n" - "update to sync'd pmd entries need re-syncing. Freeing a pte page\n" - "also leads to a vmalloc fault and hits the BUG_ON in vmalloc_sync_one().\n" - "\n" - "Disable free page handling on x86-PAE. pud_free_pmd_page() and\n" - "pmd_free_pte_page() simply return 0 if a given pud/pmd entry is present.\n" - "This assures that ioremap() does not update sync'd pmd entries at the\n" - "cost of falling back to pte mappings.\n" - "\n" - "Fixes: 28ee90fe6048 (\"x86/mm: implement free pmd/pte page interfaces\")\n" - "Reported-by: Joerg Roedel <joro@8bytes.org>\n" - "Signed-off-by: Toshi Kani <toshi.kani@hpe.com>\n" - "Signed-off-by: Thomas Gleixner <tglx@linutronix.de>\n" - "Cc: mhocko at suse.com\n" - "Cc: akpm at linux-foundation.org\n" - "Cc: hpa at zytor.com\n" - "Cc: cpandya at codeaurora.org\n" - "Cc: linux-mm at kvack.org\n" - "Cc: linux-arm-kernel at lists.infradead.org\n" - "Cc: stable at vger.kernel.org\n" - "Cc: Andrew Morton <akpm@linux-foundation.org>\n" - "Cc: Michal Hocko <mhocko@suse.com>\n" - "Cc: \"H. Peter Anvin\" <hpa@zytor.com>\n" - "Cc: <stable@vger.kernel.org>\n" - "Link: https://lkml.kernel.org/r/20180627141348.21777-2-toshi.kani at hpe.com\n" - "Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>\n" - "\n" - "---\n" - " arch/x86/mm/pgtable.c | 19 +++++++++++++++++++\n" - " 1 file changed, 19 insertions(+)\n" - "\n" - "--- a/arch/x86/mm/pgtable.c\n" - "+++ b/arch/x86/mm/pgtable.c\n" - "@@ -676,6 +676,7 @@ int pmd_clear_huge(pmd_t *pmd)\n" - " \treturn 0;\n" - " }\n" - " \n" - "+#ifdef CONFIG_X86_64\n" - " /**\n" - " * pud_free_pmd_page - Clear pud entry and free pmd page.\n" - " * @pud: Pointer to a PUD.\n" - "@@ -723,4 +724,22 @@ int pmd_free_pte_page(pmd_t *pmd)\n" - " \n" - " \treturn 1;\n" - " }\n" - "+\n" - "+#else /* !CONFIG_X86_64 */\n" - "+\n" - "+int pud_free_pmd_page(pud_t *pud)\n" - "+{\n" - "+\treturn pud_none(*pud);\n" - "+}\n" - "+\n" - "+/*\n" - "+ * Disable free page handling on x86-PAE. This assures that ioremap()\n" - "+ * does not update sync'd pmd entries. See vmalloc_sync_one().\n" - "+ */\n" - "+int pmd_free_pte_page(pmd_t *pmd)\n" - "+{\n" - "+\treturn pmd_none(*pmd);\n" - "+}\n" - "+\n" - "+#endif /* CONFIG_X86_64 */\n" - " #endif\t/* CONFIG_HAVE_ARCH_HUGE_VMAP */\n" - "\n" - "\n" - "Patches currently in stable-queue which might be from toshi.kani at hpe.com are\n" - "\n" - queue-4.4/x86-mm-disable-ioremap-free-page-handling-on-x86-pae.patch + please let <stable@vger.kernel.org> know about it. -c74f8e9470c00526e90f2b0139a1c4c8474fb843dbca714a9d19e91bf7dc8ee4 +4a698ebe1c614f7be46c3437dcd1213574d85ff40f94a26eae909af5f06c2cd9
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.