From: Greg Kroah-Hartman Date: Tue, 5 Dec 2023 18:26:17 +0000 (+0900) Subject: drop queue-6.1/s390-cmma-fix-handling-of-swapper_pg_dir-and-invalid.patch X-Git-Tag: v4.14.332~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af9076fd2b0ae8510f966861a10fbe8ed24a6e3b;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-6.1/s390-cmma-fix-handling-of-swapper_pg_dir-and-invalid.patch --- diff --git a/queue-6.1/s390-cmma-fix-handling-of-swapper_pg_dir-and-invalid.patch b/queue-6.1/s390-cmma-fix-handling-of-swapper_pg_dir-and-invalid.patch deleted file mode 100644 index 480eba6ffe9..00000000000 --- a/queue-6.1/s390-cmma-fix-handling-of-swapper_pg_dir-and-invalid.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 7e345172ed606a5193d78ef0664b6061754fbee8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 24 Oct 2023 10:15:20 +0200 -Subject: s390/cmma: fix handling of swapper_pg_dir and invalid_pg_dir - -From: Heiko Carstens - -[ Upstream commit 84bb41d5df48868055d159d9247b80927f1f70f9 ] - -If the cmma no-dat feature is available the kernel page tables are walked -to identify and mark all pages which are used for address translation (all -region, segment, and page tables). In a subsequent loop all other pages are -marked as "no-dat" pages with the ESSA instruction. - -This information is visible to the hypervisor, so that the hypervisor can -optimize purging of guest TLB entries. All pages used for swapper_pg_dir -and invalid_pg_dir are incorrectly marked as no-dat, which in turn can -result in incorrect guest TLB flushes. - -Fix this by marking those pages correctly as being used for DAT. - -Cc: -Reviewed-by: Claudio Imbrenda -Signed-off-by: Heiko Carstens -Signed-off-by: Vasily Gorbik -Signed-off-by: Sasha Levin ---- - arch/s390/mm/page-states.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/arch/s390/mm/page-states.c b/arch/s390/mm/page-states.c -index 7bea3be8b8280..c112762e38015 100644 ---- a/arch/s390/mm/page-states.c -+++ b/arch/s390/mm/page-states.c -@@ -192,6 +192,12 @@ void __init cmma_init_nodat(void) - return; - /* Mark pages used in kernel page tables */ - mark_kernel_pgd(); -+ page = virt_to_page(&swapper_pg_dir); -+ for (i = 0; i < 4; i++) -+ set_bit(PG_arch_1, &page[i].flags); -+ page = virt_to_page(&invalid_pg_dir); -+ for (i = 0; i < 4; i++) -+ set_bit(PG_arch_1, &page[i].flags); - - /* Set all kernel pages not used for page tables to stable/no-dat */ - for_each_mem_pfn_range(i, MAX_NUMNODES, &start, &end, NULL) { --- -2.42.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 3c19c337761..7b6765e093a 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -77,7 +77,6 @@ net-ravb-stop-dma-in-case-of-failures-on-ravb_open.patch net-ravb-keep-reverse-order-of-operations-in-ravb_re.patch kvm-x86-fix-lapic-timer-interrupt-lost-after-loading.patch pci-lengthen-reset-delay-for-videopropulsion-torrent.patch -s390-cmma-fix-handling-of-swapper_pg_dir-and-invalid.patch pci-qcom-ep-add-dedicated-callback-for-writing-to-db.patch fbdev-stifb-make-the-sti-next-font-pointer-a-32-bit-.patch spi-fix-null-dereference-on-suspend.patch