From: Greg Kroah-Hartman Date: Tue, 7 Mar 2023 12:34:27 +0000 (+0100) Subject: drop broken dm-flakey patch from 5.10 and older kernels X-Git-Tag: v6.2.3~42 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5513a1c8df38a7334e1a9c2b16e8e8bf9bbfcbbd;p=thirdparty%2Fkernel%2Fstable-queue.git drop broken dm-flakey patch from 5.10 and older kernels --- diff --git a/queue-4.14/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch b/queue-4.14/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch deleted file mode 100644 index 9475c10ba4b..00000000000 --- a/queue-4.14/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8eb29c4fbf9661e6bd4dd86197a37ffe0ecc9d50 Mon Sep 17 00:00:00 2001 -From: Mikulas Patocka -Date: Sun, 22 Jan 2023 14:03:31 -0500 -Subject: dm flakey: fix a bug with 32-bit highmem systems - -From: Mikulas Patocka - -commit 8eb29c4fbf9661e6bd4dd86197a37ffe0ecc9d50 upstream. - -The function page_address does not work with 32-bit systems with high -memory. Use bvec_kmap_local/kunmap_local instead. - -Cc: stable@vger.kernel.org -Signed-off-by: Mikulas Patocka -Reviewed-by: Sweet Tea Dorminy -Signed-off-by: Mike Snitzer -Signed-off-by: Greg Kroah-Hartman ---- - drivers/md/dm-flakey.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/md/dm-flakey.c -+++ b/drivers/md/dm-flakey.c -@@ -305,8 +305,9 @@ static void corrupt_bio_data(struct bio - struct page *page = bio_iter_page(bio, iter); - if (unlikely(page == ZERO_PAGE(0))) - break; -- segment = (page_address(page) + bio_iter_offset(bio, iter)); -+ segment = bvec_kmap_local(&bvec); - segment[corrupt_bio_byte] = fc->corrupt_bio_value; -+ kunmap_local(segment); - DMDEBUG("Corrupting data bio=%p by writing %u to byte %u " - "(rw=%c bi_opf=%u bi_sector=%llu size=%u)\n", - bio, fc->corrupt_bio_value, fc->corrupt_bio_byte, diff --git a/queue-4.14/series b/queue-4.14/series index 6c343487773..bb274faf13e 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -134,7 +134,6 @@ wifi-cfg80211-fix-use-after-free-for-wext.patch thermal-intel-powerclamp-fix-cur_state-for-multi-package-system.patch dm-flakey-fix-logic-when-corrupting-a-bio.patch dm-flakey-don-t-corrupt-the-zero-page.patch -dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch arm-dts-exynos-correct-tmu-phandle-in-exynos4.patch arm-dts-exynos-correct-tmu-phandle-in-odroid-xu.patch rbd-avoid-use-after-free-in-do_rbd_add-when-rbd_dev_create-fails.patch diff --git a/queue-4.19/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch b/queue-4.19/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch deleted file mode 100644 index 9475c10ba4b..00000000000 --- a/queue-4.19/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8eb29c4fbf9661e6bd4dd86197a37ffe0ecc9d50 Mon Sep 17 00:00:00 2001 -From: Mikulas Patocka -Date: Sun, 22 Jan 2023 14:03:31 -0500 -Subject: dm flakey: fix a bug with 32-bit highmem systems - -From: Mikulas Patocka - -commit 8eb29c4fbf9661e6bd4dd86197a37ffe0ecc9d50 upstream. - -The function page_address does not work with 32-bit systems with high -memory. Use bvec_kmap_local/kunmap_local instead. - -Cc: stable@vger.kernel.org -Signed-off-by: Mikulas Patocka -Reviewed-by: Sweet Tea Dorminy -Signed-off-by: Mike Snitzer -Signed-off-by: Greg Kroah-Hartman ---- - drivers/md/dm-flakey.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/md/dm-flakey.c -+++ b/drivers/md/dm-flakey.c -@@ -305,8 +305,9 @@ static void corrupt_bio_data(struct bio - struct page *page = bio_iter_page(bio, iter); - if (unlikely(page == ZERO_PAGE(0))) - break; -- segment = (page_address(page) + bio_iter_offset(bio, iter)); -+ segment = bvec_kmap_local(&bvec); - segment[corrupt_bio_byte] = fc->corrupt_bio_value; -+ kunmap_local(segment); - DMDEBUG("Corrupting data bio=%p by writing %u to byte %u " - "(rw=%c bi_opf=%u bi_sector=%llu size=%u)\n", - bio, fc->corrupt_bio_value, fc->corrupt_bio_byte, diff --git a/queue-4.19/series b/queue-4.19/series index cc9ff92bc68..100e47e9835 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -178,7 +178,6 @@ wifi-cfg80211-fix-use-after-free-for-wext.patch thermal-intel-powerclamp-fix-cur_state-for-multi-package-system.patch dm-flakey-fix-logic-when-corrupting-a-bio.patch dm-flakey-don-t-corrupt-the-zero-page.patch -dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch arm-dts-exynos-correct-tmu-phandle-in-exynos4.patch arm-dts-exynos-correct-tmu-phandle-in-odroid-xu.patch rbd-avoid-use-after-free-in-do_rbd_add-when-rbd_dev_create-fails.patch diff --git a/queue-5.10/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch b/queue-5.10/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch deleted file mode 100644 index 9475c10ba4b..00000000000 --- a/queue-5.10/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8eb29c4fbf9661e6bd4dd86197a37ffe0ecc9d50 Mon Sep 17 00:00:00 2001 -From: Mikulas Patocka -Date: Sun, 22 Jan 2023 14:03:31 -0500 -Subject: dm flakey: fix a bug with 32-bit highmem systems - -From: Mikulas Patocka - -commit 8eb29c4fbf9661e6bd4dd86197a37ffe0ecc9d50 upstream. - -The function page_address does not work with 32-bit systems with high -memory. Use bvec_kmap_local/kunmap_local instead. - -Cc: stable@vger.kernel.org -Signed-off-by: Mikulas Patocka -Reviewed-by: Sweet Tea Dorminy -Signed-off-by: Mike Snitzer -Signed-off-by: Greg Kroah-Hartman ---- - drivers/md/dm-flakey.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/md/dm-flakey.c -+++ b/drivers/md/dm-flakey.c -@@ -305,8 +305,9 @@ static void corrupt_bio_data(struct bio - struct page *page = bio_iter_page(bio, iter); - if (unlikely(page == ZERO_PAGE(0))) - break; -- segment = (page_address(page) + bio_iter_offset(bio, iter)); -+ segment = bvec_kmap_local(&bvec); - segment[corrupt_bio_byte] = fc->corrupt_bio_value; -+ kunmap_local(segment); - DMDEBUG("Corrupting data bio=%p by writing %u to byte %u " - "(rw=%c bi_opf=%u bi_sector=%llu size=%u)\n", - bio, fc->corrupt_bio_value, fc->corrupt_bio_byte, diff --git a/queue-5.10/series b/queue-5.10/series index 0e02c2bf13d..d4bf37ed76b 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -392,7 +392,6 @@ wifi-cfg80211-fix-use-after-free-for-wext.patch thermal-intel-powerclamp-fix-cur_state-for-multi-package-system.patch dm-flakey-fix-logic-when-corrupting-a-bio.patch dm-flakey-don-t-corrupt-the-zero-page.patch -dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch arm-dts-exynos-correct-tmu-phandle-in-exynos4210.patch arm-dts-exynos-correct-tmu-phandle-in-exynos4.patch arm-dts-exynos-correct-tmu-phandle-in-odroid-xu3-family.patch diff --git a/queue-5.4/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch b/queue-5.4/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch deleted file mode 100644 index 9475c10ba4b..00000000000 --- a/queue-5.4/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8eb29c4fbf9661e6bd4dd86197a37ffe0ecc9d50 Mon Sep 17 00:00:00 2001 -From: Mikulas Patocka -Date: Sun, 22 Jan 2023 14:03:31 -0500 -Subject: dm flakey: fix a bug with 32-bit highmem systems - -From: Mikulas Patocka - -commit 8eb29c4fbf9661e6bd4dd86197a37ffe0ecc9d50 upstream. - -The function page_address does not work with 32-bit systems with high -memory. Use bvec_kmap_local/kunmap_local instead. - -Cc: stable@vger.kernel.org -Signed-off-by: Mikulas Patocka -Reviewed-by: Sweet Tea Dorminy -Signed-off-by: Mike Snitzer -Signed-off-by: Greg Kroah-Hartman ---- - drivers/md/dm-flakey.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/md/dm-flakey.c -+++ b/drivers/md/dm-flakey.c -@@ -305,8 +305,9 @@ static void corrupt_bio_data(struct bio - struct page *page = bio_iter_page(bio, iter); - if (unlikely(page == ZERO_PAGE(0))) - break; -- segment = (page_address(page) + bio_iter_offset(bio, iter)); -+ segment = bvec_kmap_local(&bvec); - segment[corrupt_bio_byte] = fc->corrupt_bio_value; -+ kunmap_local(segment); - DMDEBUG("Corrupting data bio=%p by writing %u to byte %u " - "(rw=%c bi_opf=%u bi_sector=%llu size=%u)\n", - bio, fc->corrupt_bio_value, fc->corrupt_bio_byte, diff --git a/queue-5.4/series b/queue-5.4/series index 4517f79e6af..1e3d8fdc53f 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -258,7 +258,6 @@ wifi-cfg80211-fix-use-after-free-for-wext.patch thermal-intel-powerclamp-fix-cur_state-for-multi-package-system.patch dm-flakey-fix-logic-when-corrupting-a-bio.patch dm-flakey-don-t-corrupt-the-zero-page.patch -dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch arm-dts-exynos-correct-tmu-phandle-in-exynos4.patch arm-dts-exynos-correct-tmu-phandle-in-odroid-xu.patch rbd-avoid-use-after-free-in-do_rbd_add-when-rbd_dev_create-fails.patch