drop a 3.18 patch

diff --git a/queue-3.18/series b/queue-3.18/series
index 4314f0973456af1b2f1709ba080b488a0ddaf539..5c854496912256246541326aa6156f85ac2d9582 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -48,7 +48,6 @@ ata-libahci-correct-setting-of-devslp-register.patch
 scsi-3ware-fix-return-0-on-the-error-path-of-probe.patch
 bluetooth-hidp-fix-handling-of-strncpy-for-hid-name-information.patch
 x86-mm-remove-in_nmi-warning-from-vmalloc_fault.patch
-x86-kexec-allocate-8k-pgds-for-pti.patch
 gpio-ml-ioh-fix-buffer-underwrite-on-probe-error-path.patch
 net-mvneta-fix-mtu-change-on-port-without-link.patch
 net-dcb-for-wild-card-lookups-use-priority-1-not-0.patch

diff --git a/queue-3.18/x86-kexec-allocate-8k-pgds-for-pti.patch b/queue-3.18/x86-kexec-allocate-8k-pgds-for-pti.patch
deleted file mode 100644 (file)
index 7692400..0000000
--- a/queue-3.18/x86-kexec-allocate-8k-pgds-for-pti.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From foo@baz Mon Sep 17 11:45:57 CEST 2018
-From: Joerg Roedel <jroedel@suse.de>
-Date: Wed, 25 Jul 2018 17:48:03 +0200
-Subject: x86/kexec: Allocate 8k PGDs for PTI
-
-From: Joerg Roedel <jroedel@suse.de>
-
-[ Upstream commit ca38dc8f2724d101038b1205122c93a1c7f38f11 ]
-
-Fuzzing the PTI-x86-32 code with trinity showed unhandled
-kernel paging request oops-messages that looked a lot like
-silent data corruption.
-
-Lot's of debugging and testing lead to the kexec-32bit code,
-which is still allocating 4k PGDs when PTI is enabled. But
-since it uses native_set_pud() to build the page-table, it
-will unevitably call into __pti_set_user_pgtbl(), which
-writes beyond the allocated 4k page.
-
-Use PGD_ALLOCATION_ORDER to allocate PGDs in the kexec code
-to fix the issue.
-
-Signed-off-by: Joerg Roedel <jroedel@suse.de>
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-Tested-by: David H. Gutteridge <dhgutteridge@sympatico.ca>
-Cc: "H . Peter Anvin" <hpa@zytor.com>
-Cc: linux-mm@kvack.org
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Cc: Andy Lutomirski <luto@kernel.org>
-Cc: Dave Hansen <dave.hansen@intel.com>
-Cc: Josh Poimboeuf <jpoimboe@redhat.com>
-Cc: Juergen Gross <jgross@suse.com>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Borislav Petkov <bp@alien8.de>
-Cc: Jiri Kosina <jkosina@suse.cz>
-Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
-Cc: Brian Gerst <brgerst@gmail.com>
-Cc: David Laight <David.Laight@aculab.com>
-Cc: Denys Vlasenko <dvlasenk@redhat.com>
-Cc: Eduardo Valentin <eduval@amazon.com>
-Cc: Greg KH <gregkh@linuxfoundation.org>
-Cc: Will Deacon <will.deacon@arm.com>
-Cc: aliguori@amazon.com
-Cc: daniel.gruss@iaik.tugraz.at
-Cc: hughd@google.com
-Cc: keescook@google.com
-Cc: Andrea Arcangeli <aarcange@redhat.com>
-Cc: Waiman Long <llong@redhat.com>
-Cc: Pavel Machek <pavel@ucw.cz>
-Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Jiri Olsa <jolsa@redhat.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: joro@8bytes.org
-Link: https://lkml.kernel.org/r/1532533683-5988-4-git-send-email-joro@8bytes.org
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/x86/kernel/machine_kexec_32.c |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/arch/x86/kernel/machine_kexec_32.c
-+++ b/arch/x86/kernel/machine_kexec_32.c
-@@ -69,7 +69,7 @@ static void load_segments(void)
- 
- static void machine_kexec_free_page_tables(struct kimage *image)
- {
--      free_page((unsigned long)image->arch.pgd);
-+      free_pages((unsigned long)image->arch.pgd, PGD_ALLOCATION_ORDER);
-       image->arch.pgd = NULL;
- #ifdef CONFIG_X86_PAE
-       free_page((unsigned long)image->arch.pmd0);
-@@ -85,7 +85,8 @@ static void machine_kexec_free_page_tabl
- 
- static int machine_kexec_alloc_page_tables(struct kimage *image)
- {
--      image->arch.pgd = (pgd_t *)get_zeroed_page(GFP_KERNEL);
-+      image->arch.pgd = (pgd_t *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,
-+                                                  PGD_ALLOCATION_ORDER);
- #ifdef CONFIG_X86_PAE
-       image->arch.pmd0 = (pmd_t *)get_zeroed_page(GFP_KERNEL);
-       image->arch.pmd1 = (pmd_t *)get_zeroed_page(GFP_KERNEL);