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 (file)
index 59bbce4..0000000
--- 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 <ziy@nvidia.com>
-Date: Wed, 30 Mar 2022 15:45:43 -0700
-Subject: mm: page_alloc: validate buddy before check its migratetype.
-
-From: Zi Yan <ziy@nvidia.com>
-
-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 <rostedt@goodmis.org>
-Signed-off-by: Zi Yan <ziy@nvidia.com>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-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 <xianting.tian@linux.alibaba.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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 7a8c64326c8cfff450e7d6898df46037d0e9a2c2..7181ad155b9ff5b5067d6752141dbfe432ae6441 100644 (file)
--- 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 (file)
index 799d472..0000000
--- 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 <ziy@nvidia.com>
-Date: Wed, 30 Mar 2022 15:45:43 -0700
-Subject: mm: page_alloc: validate buddy before check its migratetype.
-
-From: Zi Yan <ziy@nvidia.com>
-
-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 <rostedt@goodmis.org>
-Signed-off-by: Zi Yan <ziy@nvidia.com>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-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 <xianting.tian@linux.alibaba.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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 dc4e7385327f1d61d5b43b4ab970125be4bd4db7..c34cf34495337ab6dd42e079fb8a4a6bafd00a3d 100644 (file)
--- 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 (file)
index b03e19a..0000000
--- 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 <ziy@nvidia.com>
-Date: Wed, 30 Mar 2022 15:45:43 -0700
-Subject: mm: page_alloc: validate buddy before check its migratetype.
-
-From: Zi Yan <ziy@nvidia.com>
-
-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 <rostedt@goodmis.org>
-Signed-off-by: Zi Yan <ziy@nvidia.com>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-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 <xianting.tian@linux.alibaba.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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 2f94686e3506b998f5b93f9bc7b36bfa45bc7791..c9e8370e2052ed059def5fe6700ea3bb6d3f43ff 100644 (file)
--- 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 (file)
index 14047e2..0000000
--- 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 <ziy@nvidia.com>
-Date: Wed, 30 Mar 2022 15:45:43 -0700
-Subject: mm: page_alloc: validate buddy before check its migratetype.
-
-From: Zi Yan <ziy@nvidia.com>
-
-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 <rostedt@goodmis.org>
-Signed-off-by: Zi Yan <ziy@nvidia.com>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-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 <xianting.tian@linux.alibaba.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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 6d217d6bf4bdcfc6927d6f14bc291ba1d2eb4040..25d89846cee2f1df237603e66f3bf0c9af72c2b8 100644 (file)
--- 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 (file)
index c519fb2..0000000
--- 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 <ziy@nvidia.com>
-Date: Wed, 30 Mar 2022 15:45:43 -0700
-Subject: mm: page_alloc: validate buddy before check its migratetype.
-
-From: Zi Yan <ziy@nvidia.com>
-
-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 <rostedt@goodmis.org>
-Signed-off-by: Zi Yan <ziy@nvidia.com>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-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 <xianting.tian@linux.alibaba.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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 b4fe4b15310bee93496795091bc61005455eaf6e..f76fab3173e0cc46f17d9343fc861a66042d4f32 100644 (file)
--- 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 (file)
index 7600c4e..0000000
--- 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 <ziy@nvidia.com>
-Date: Wed, 30 Mar 2022 15:45:43 -0700
-Subject: mm: page_alloc: validate buddy before check its migratetype.
-
-From: Zi Yan <ziy@nvidia.com>
-
-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 <rostedt@goodmis.org>
-Signed-off-by: Zi Yan <ziy@nvidia.com>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-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 <xianting.tian@linux.alibaba.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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 dcf1f6f94648d3d9e8328adb619fe0c6dee477ed..b1e0a2611b7274bfd335039aa14a481b4bdc4ad6 100644 (file)
--- 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