From: Greg Kroah-Hartman Date: Mon, 20 Jun 2022 11:43:27 +0000 (+0200) Subject: drop mm-page_alloc-validate-buddy-before-check-its-migratetype.patch from everywhere X-Git-Tag: v5.4.200~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d12ac06d96cd9f58fc40697f222f05296231b602;p=thirdparty%2Fkernel%2Fstable-queue.git drop mm-page_alloc-validate-buddy-before-check-its-migratetype.patch from everywhere --- diff --git a/queue-4.14/mm-page_alloc-validate-buddy-before-check-its-migratetype.patch b/queue-4.14/mm-page_alloc-validate-buddy-before-check-its-migratetype.patch deleted file mode 100644 index 59bbce41cb8..00000000000 --- a/queue-4.14/mm-page_alloc-validate-buddy-before-check-its-migratetype.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 787af64d05cd528aac9ad16752d11bb1c6061bb9 Mon Sep 17 00:00:00 2001 -From: Zi Yan -Date: Wed, 30 Mar 2022 15:45:43 -0700 -Subject: mm: page_alloc: validate buddy before check its migratetype. - -From: Zi Yan - -commit 787af64d05cd528aac9ad16752d11bb1c6061bb9 upstream. - -Whenever a buddy page is found, page_is_buddy() should be called to -check its validity. Add the missing check during pageblock merge check. - -Fixes: 1dd214b8f21c ("mm: page_alloc: avoid merging non-fallbackable pageblocks with others") -Link: https://lore.kernel.org/all/20220330154208.71aca532@gandalf.local.home/ -Reported-and-tested-by: Steven Rostedt -Signed-off-by: Zi Yan -Signed-off-by: Linus Torvalds -Fixes: d9dddbf55667 ("mm/page_alloc: prevent merging between isolated and other pageblocks") -Cc: stable@vger.kernel.org -Reported-by: zjb194813@alibaba-inc.com -Reported-by: tianhu.hh@alibaba-inc.com -Signed-off-by: Xianting Tian -Signed-off-by: Greg Kroah-Hartman ---- - mm/page_alloc.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -866,6 +866,9 @@ continue_merging: - - buddy_pfn = __find_buddy_pfn(pfn, order); - buddy = page + (buddy_pfn - pfn); -+ -+ if (!page_is_buddy(page, buddy, order)) -+ goto done_merging; - buddy_mt = get_pageblock_migratetype(buddy); - - if (migratetype != buddy_mt diff --git a/queue-4.14/series b/queue-4.14/series index 7a8c64326c8..7181ad155b9 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -225,4 +225,3 @@ ext4-fix-bug_on-ext4_mb_use_inode_pa.patch ext4-make-variable-count-signed.patch ext4-add-reserved-gdt-blocks-check.patch virtio-pci-remove-wrong-address-verification-in-vp_del_vqs.patch -mm-page_alloc-validate-buddy-before-check-its-migratetype.patch diff --git a/queue-4.19/mm-page_alloc-validate-buddy-before-check-its-migratetype.patch b/queue-4.19/mm-page_alloc-validate-buddy-before-check-its-migratetype.patch deleted file mode 100644 index 799d472c6c1..00000000000 --- a/queue-4.19/mm-page_alloc-validate-buddy-before-check-its-migratetype.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 787af64d05cd528aac9ad16752d11bb1c6061bb9 Mon Sep 17 00:00:00 2001 -From: Zi Yan -Date: Wed, 30 Mar 2022 15:45:43 -0700 -Subject: mm: page_alloc: validate buddy before check its migratetype. - -From: Zi Yan - -commit 787af64d05cd528aac9ad16752d11bb1c6061bb9 upstream. - -Whenever a buddy page is found, page_is_buddy() should be called to -check its validity. Add the missing check during pageblock merge check. - -Fixes: 1dd214b8f21c ("mm: page_alloc: avoid merging non-fallbackable pageblocks with others") -Link: https://lore.kernel.org/all/20220330154208.71aca532@gandalf.local.home/ -Reported-and-tested-by: Steven Rostedt -Signed-off-by: Zi Yan -Signed-off-by: Linus Torvalds -Fixes: d9dddbf55667 ("mm/page_alloc: prevent merging between isolated and other pageblocks") -Cc: stable@vger.kernel.org -Reported-by: zjb194813@alibaba-inc.com -Reported-by: tianhu.hh@alibaba-inc.com -Signed-off-by: Xianting Tian -Signed-off-by: Greg Kroah-Hartman ---- - mm/page_alloc.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -858,6 +858,9 @@ continue_merging: - - buddy_pfn = __find_buddy_pfn(pfn, order); - buddy = page + (buddy_pfn - pfn); -+ -+ if (!page_is_buddy(page, buddy, order)) -+ goto done_merging; - buddy_mt = get_pageblock_migratetype(buddy); - - if (migratetype != buddy_mt diff --git a/queue-4.19/series b/queue-4.19/series index dc4e7385327..c34cf344953 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -220,4 +220,3 @@ ext4-fix-bug_on-ext4_mb_use_inode_pa.patch ext4-make-variable-count-signed.patch ext4-add-reserved-gdt-blocks-check.patch virtio-pci-remove-wrong-address-verification-in-vp_del_vqs.patch -mm-page_alloc-validate-buddy-before-check-its-migratetype.patch diff --git a/queue-4.9/mm-page_alloc-validate-buddy-before-check-its-migratetype.patch b/queue-4.9/mm-page_alloc-validate-buddy-before-check-its-migratetype.patch deleted file mode 100644 index b03e19aec7f..00000000000 --- a/queue-4.9/mm-page_alloc-validate-buddy-before-check-its-migratetype.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 787af64d05cd528aac9ad16752d11bb1c6061bb9 Mon Sep 17 00:00:00 2001 -From: Zi Yan -Date: Wed, 30 Mar 2022 15:45:43 -0700 -Subject: mm: page_alloc: validate buddy before check its migratetype. - -From: Zi Yan - -commit 787af64d05cd528aac9ad16752d11bb1c6061bb9 upstream. - -Whenever a buddy page is found, page_is_buddy() should be called to -check its validity. Add the missing check during pageblock merge check. - -Fixes: 1dd214b8f21c ("mm: page_alloc: avoid merging non-fallbackable pageblocks with others") -Link: https://lore.kernel.org/all/20220330154208.71aca532@gandalf.local.home/ -Reported-and-tested-by: Steven Rostedt -Signed-off-by: Zi Yan -Signed-off-by: Linus Torvalds -Fixes: d9dddbf55667 ("mm/page_alloc: prevent merging between isolated and other pageblocks") -Cc: stable@vger.kernel.org -Reported-by: zjb194813@alibaba-inc.com -Reported-by: tianhu.hh@alibaba-inc.com -Signed-off-by: Xianting Tian -Signed-off-by: Greg Kroah-Hartman ---- - mm/page_alloc.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -864,6 +864,9 @@ continue_merging: - - buddy_idx = __find_buddy_index(page_idx, order); - buddy = page + (buddy_idx - page_idx); -+ -+ if (!page_is_buddy(page, buddy, order)) -+ goto done_merging; - buddy_mt = get_pageblock_migratetype(buddy); - - if (migratetype != buddy_mt diff --git a/queue-4.9/series b/queue-4.9/series index 2f94686e350..c9e8370e205 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -248,4 +248,3 @@ dm-mirror-log-round-up-region-bitmap-size-to-bits_per_long.patch ext4-fix-bug_on-ext4_mb_use_inode_pa.patch ext4-make-variable-count-signed.patch ext4-add-reserved-gdt-blocks-check.patch -mm-page_alloc-validate-buddy-before-check-its-migratetype.patch diff --git a/queue-5.10/mm-page_alloc-validate-buddy-before-check-its-migratetype.patch b/queue-5.10/mm-page_alloc-validate-buddy-before-check-its-migratetype.patch deleted file mode 100644 index 14047e2584a..00000000000 --- a/queue-5.10/mm-page_alloc-validate-buddy-before-check-its-migratetype.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 787af64d05cd528aac9ad16752d11bb1c6061bb9 Mon Sep 17 00:00:00 2001 -From: Zi Yan -Date: Wed, 30 Mar 2022 15:45:43 -0700 -Subject: mm: page_alloc: validate buddy before check its migratetype. - -From: Zi Yan - -commit 787af64d05cd528aac9ad16752d11bb1c6061bb9 upstream. - -Whenever a buddy page is found, page_is_buddy() should be called to -check its validity. Add the missing check during pageblock merge check. - -Fixes: 1dd214b8f21c ("mm: page_alloc: avoid merging non-fallbackable pageblocks with others") -Link: https://lore.kernel.org/all/20220330154208.71aca532@gandalf.local.home/ -Reported-and-tested-by: Steven Rostedt -Signed-off-by: Zi Yan -Signed-off-by: Linus Torvalds -Fixes: d9dddbf55667 ("mm/page_alloc: prevent merging between isolated and other pageblocks") -Cc: stable@vger.kernel.org -Reported-by: zjb194813@alibaba-inc.com -Reported-by: tianhu.hh@alibaba-inc.com -Signed-off-by: Xianting Tian -Signed-off-by: Greg Kroah-Hartman ---- - mm/page_alloc.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -1049,6 +1049,9 @@ continue_merging: - - buddy_pfn = __find_buddy_pfn(pfn, order); - buddy = page + (buddy_pfn - pfn); -+ -+ if (!page_is_buddy(page, buddy, order)) -+ goto done_merging; - buddy_mt = get_pageblock_migratetype(buddy); - - if (migratetype != buddy_mt diff --git a/queue-5.10/series b/queue-5.10/series index 6d217d6bf4b..25d89846cee 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -75,4 +75,3 @@ kvm-x86-account-a-variety-of-miscellaneous-allocations.patch kvm-svm-use-kzalloc-for-sev-ioctl-interfaces-to-prevent-kernel-data-leak.patch alsa-hda-realtek-fix-right-sounds-and-mute-micmute-leds-for-hp-machine.patch virtio-pci-remove-wrong-address-verification-in-vp_del_vqs.patch -mm-page_alloc-validate-buddy-before-check-its-migratetype.patch diff --git a/queue-5.15/mm-page_alloc-validate-buddy-before-check-its-migratetype.patch b/queue-5.15/mm-page_alloc-validate-buddy-before-check-its-migratetype.patch deleted file mode 100644 index c519fb2320c..00000000000 --- a/queue-5.15/mm-page_alloc-validate-buddy-before-check-its-migratetype.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 787af64d05cd528aac9ad16752d11bb1c6061bb9 Mon Sep 17 00:00:00 2001 -From: Zi Yan -Date: Wed, 30 Mar 2022 15:45:43 -0700 -Subject: mm: page_alloc: validate buddy before check its migratetype. - -From: Zi Yan - -commit 787af64d05cd528aac9ad16752d11bb1c6061bb9 upstream. - -Whenever a buddy page is found, page_is_buddy() should be called to -check its validity. Add the missing check during pageblock merge check. - -Fixes: 1dd214b8f21c ("mm: page_alloc: avoid merging non-fallbackable pageblocks with others") -Link: https://lore.kernel.org/all/20220330154208.71aca532@gandalf.local.home/ -Reported-and-tested-by: Steven Rostedt -Signed-off-by: Zi Yan -Signed-off-by: Linus Torvalds -Fixes: d9dddbf55667 ("mm/page_alloc: prevent merging between isolated and other pageblocks") -Cc: stable@vger.kernel.org -Reported-by: zjb194813@alibaba-inc.com -Reported-by: tianhu.hh@alibaba-inc.com -Signed-off-by: Xianting Tian -Signed-off-by: Greg Kroah-Hartman ---- - mm/page_alloc.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -1118,6 +1118,9 @@ continue_merging: - - buddy_pfn = __find_buddy_pfn(pfn, order); - buddy = page + (buddy_pfn - pfn); -+ -+ if (!page_is_buddy(page, buddy, order)) -+ goto done_merging; - buddy_mt = get_pageblock_migratetype(buddy); - - if (migratetype != buddy_mt diff --git a/queue-5.15/series b/queue-5.15/series index b4fe4b15310..f76fab3173e 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -102,4 +102,3 @@ ext4-add-reserved-gdt-blocks-check.patch kvm-arm64-don-t-read-a-hw-interrupt-pending-state-in-user-context.patch alsa-hda-realtek-fix-right-sounds-and-mute-micmute-leds-for-hp-machine.patch virtio-pci-remove-wrong-address-verification-in-vp_del_vqs.patch -mm-page_alloc-validate-buddy-before-check-its-migratetype.patch diff --git a/queue-5.4/mm-page_alloc-validate-buddy-before-check-its-migratetype.patch b/queue-5.4/mm-page_alloc-validate-buddy-before-check-its-migratetype.patch deleted file mode 100644 index 7600c4e309b..00000000000 --- a/queue-5.4/mm-page_alloc-validate-buddy-before-check-its-migratetype.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 787af64d05cd528aac9ad16752d11bb1c6061bb9 Mon Sep 17 00:00:00 2001 -From: Zi Yan -Date: Wed, 30 Mar 2022 15:45:43 -0700 -Subject: mm: page_alloc: validate buddy before check its migratetype. - -From: Zi Yan - -commit 787af64d05cd528aac9ad16752d11bb1c6061bb9 upstream. - -Whenever a buddy page is found, page_is_buddy() should be called to -check its validity. Add the missing check during pageblock merge check. - -Fixes: 1dd214b8f21c ("mm: page_alloc: avoid merging non-fallbackable pageblocks with others") -Link: https://lore.kernel.org/all/20220330154208.71aca532@gandalf.local.home/ -Reported-and-tested-by: Steven Rostedt -Signed-off-by: Zi Yan -Signed-off-by: Linus Torvalds -Fixes: d9dddbf55667 ("mm/page_alloc: prevent merging between isolated and other pageblocks") -Cc: stable@vger.kernel.org -Reported-by: zjb194813@alibaba-inc.com -Reported-by: tianhu.hh@alibaba-inc.com -Signed-off-by: Xianting Tian -Signed-off-by: Greg Kroah-Hartman ---- - mm/page_alloc.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -959,6 +959,9 @@ continue_merging: - - buddy_pfn = __find_buddy_pfn(pfn, order); - buddy = page + (buddy_pfn - pfn); -+ -+ if (!page_is_buddy(page, buddy, order)) -+ goto done_merging; - buddy_mt = get_pageblock_migratetype(buddy); - - if (migratetype != buddy_mt diff --git a/queue-5.4/series b/queue-5.4/series index dcf1f6f9464..b1e0a2611b7 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -231,4 +231,3 @@ ext4-add-reserved-gdt-blocks-check.patch alsa-hda-realtek-fix-mute-micmute-leds-for-hp-440-g8.patch alsa-hda-realtek-fix-right-sounds-and-mute-micmute-leds-for-hp-machine.patch virtio-pci-remove-wrong-address-verification-in-vp_del_vqs.patch -mm-page_alloc-validate-buddy-before-check-its-migratetype.patch