From: Sasha Levin Date: Fri, 23 May 2025 12:19:15 +0000 (-0400) Subject: Drop fs-mpage-avoid-negative-shift-for-large-blocksize.patch X-Git-Tag: v6.12.31~88 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f06c7b1652b3bfd48d2ee80debb1be37b21ff203;p=thirdparty%2Fkernel%2Fstable-queue.git Drop fs-mpage-avoid-negative-shift-for-large-blocksize.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.12/fs-mpage-avoid-negative-shift-for-large-blocksize.patch b/queue-6.12/fs-mpage-avoid-negative-shift-for-large-blocksize.patch deleted file mode 100644 index 629f3eda20..0000000000 --- a/queue-6.12/fs-mpage-avoid-negative-shift-for-large-blocksize.patch +++ /dev/null @@ -1,49 +0,0 @@ -From f2345d09fc1cbee743f0fae7e636e69045e8ec0b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 21 Feb 2025 14:38:18 -0800 -Subject: fs/mpage: avoid negative shift for large blocksize - -From: Hannes Reinecke - -[ Upstream commit 86c60efd7c0ede43bd677f2eee1d84200528df1e ] - -For large blocksizes the number of block bits is larger than PAGE_SHIFT, -so calculate the sector number from the byte offset instead. This is -required to enable large folios with buffer-heads. - -Reviewed-by: "Matthew Wilcox (Oracle)" -Signed-off-by: Luis Chamberlain -Signed-off-by: Hannes Reinecke -Link: https://lore.kernel.org/r/20250221223823.1680616-4-mcgrof@kernel.org -Reviewed-by: Hannes Reinecke -Signed-off-by: Christian Brauner -Signed-off-by: Sasha Levin ---- - fs/mpage.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/fs/mpage.c b/fs/mpage.c -index 82aecf3727437..a3c82206977f6 100644 ---- a/fs/mpage.c -+++ b/fs/mpage.c -@@ -181,7 +181,7 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args) - if (folio_buffers(folio)) - goto confused; - -- block_in_file = (sector_t)folio->index << (PAGE_SHIFT - blkbits); -+ block_in_file = folio_pos(folio) >> blkbits; - last_block = block_in_file + args->nr_pages * blocks_per_page; - last_block_in_file = (i_size_read(inode) + blocksize - 1) >> blkbits; - if (last_block > last_block_in_file) -@@ -527,7 +527,7 @@ static int __mpage_writepage(struct folio *folio, struct writeback_control *wbc, - * The page has no buffers: map it to disk - */ - BUG_ON(!folio_test_uptodate(folio)); -- block_in_file = (sector_t)folio->index << (PAGE_SHIFT - blkbits); -+ block_in_file = folio_pos(folio) >> blkbits; - /* - * Whole page beyond EOF? Skip allocating blocks to avoid leaking - * space. --- -2.39.5 - diff --git a/queue-6.12/series b/queue-6.12/series index 8924f6e239..c38d565477 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -307,7 +307,6 @@ scsi-mpi3mr-update-timestamp-only-for-supervisor-ioc.patch loop-check-in-lo_flags_direct_io-in-loop_default_blo.patch libbpf-fix-out-of-bound-read.patch dm-fix-unconditional-io-throttle-caused-by-req_prefl.patch -fs-mpage-avoid-negative-shift-for-large-blocksize.patch scsi-scsi_debug-first-fixes-for-tapes.patch net-mlx5-change-pool_next_size-define-value-and-make.patch x86-kaslr-reduce-kaslr-entropy-on-most-x86-systems.patch diff --git a/queue-6.14/fs-mpage-avoid-negative-shift-for-large-blocksize.patch b/queue-6.14/fs-mpage-avoid-negative-shift-for-large-blocksize.patch deleted file mode 100644 index 763959be08..0000000000 --- a/queue-6.14/fs-mpage-avoid-negative-shift-for-large-blocksize.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 937e1cfc23766b242d46fb08e8b736ddd499d0a6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 21 Feb 2025 14:38:18 -0800 -Subject: fs/mpage: avoid negative shift for large blocksize - -From: Hannes Reinecke - -[ Upstream commit 86c60efd7c0ede43bd677f2eee1d84200528df1e ] - -For large blocksizes the number of block bits is larger than PAGE_SHIFT, -so calculate the sector number from the byte offset instead. This is -required to enable large folios with buffer-heads. - -Reviewed-by: "Matthew Wilcox (Oracle)" -Signed-off-by: Luis Chamberlain -Signed-off-by: Hannes Reinecke -Link: https://lore.kernel.org/r/20250221223823.1680616-4-mcgrof@kernel.org -Reviewed-by: Hannes Reinecke -Signed-off-by: Christian Brauner -Signed-off-by: Sasha Levin ---- - fs/mpage.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/fs/mpage.c b/fs/mpage.c -index 82aecf3727437..a3c82206977f6 100644 ---- a/fs/mpage.c -+++ b/fs/mpage.c -@@ -181,7 +181,7 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args) - if (folio_buffers(folio)) - goto confused; - -- block_in_file = (sector_t)folio->index << (PAGE_SHIFT - blkbits); -+ block_in_file = folio_pos(folio) >> blkbits; - last_block = block_in_file + args->nr_pages * blocks_per_page; - last_block_in_file = (i_size_read(inode) + blocksize - 1) >> blkbits; - if (last_block > last_block_in_file) -@@ -527,7 +527,7 @@ static int __mpage_writepage(struct folio *folio, struct writeback_control *wbc, - * The page has no buffers: map it to disk - */ - BUG_ON(!folio_test_uptodate(folio)); -- block_in_file = (sector_t)folio->index << (PAGE_SHIFT - blkbits); -+ block_in_file = folio_pos(folio) >> blkbits; - /* - * Whole page beyond EOF? Skip allocating blocks to avoid leaking - * space. --- -2.39.5 - diff --git a/queue-6.14/series b/queue-6.14/series index ccb8e0d13b..66fa7f43fb 100644 --- a/queue-6.14/series +++ b/queue-6.14/series @@ -378,7 +378,6 @@ net-stmmac-correct-usage-of-maximum-queue-number-mac.patch libbpf-fix-out-of-bound-read.patch virtio-break-and-reset-virtio-devices-on-device_shut.patch dm-fix-unconditional-io-throttle-caused-by-req_prefl.patch -fs-mpage-avoid-negative-shift-for-large-blocksize.patch gpiolib-sanitize-the-return-value-of-gpio_chip-set_c.patch scsi-scsi_debug-first-fixes-for-tapes.patch bpf-arm64-silence-ubsan-negation-overflow-warning.patch diff --git a/queue-6.6/fs-mpage-avoid-negative-shift-for-large-blocksize.patch b/queue-6.6/fs-mpage-avoid-negative-shift-for-large-blocksize.patch deleted file mode 100644 index aa2e660816..0000000000 --- a/queue-6.6/fs-mpage-avoid-negative-shift-for-large-blocksize.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 966dd16171be03ee31a7d390a6802bec42c2e823 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 21 Feb 2025 14:38:18 -0800 -Subject: fs/mpage: avoid negative shift for large blocksize - -From: Hannes Reinecke - -[ Upstream commit 86c60efd7c0ede43bd677f2eee1d84200528df1e ] - -For large blocksizes the number of block bits is larger than PAGE_SHIFT, -so calculate the sector number from the byte offset instead. This is -required to enable large folios with buffer-heads. - -Reviewed-by: "Matthew Wilcox (Oracle)" -Signed-off-by: Luis Chamberlain -Signed-off-by: Hannes Reinecke -Link: https://lore.kernel.org/r/20250221223823.1680616-4-mcgrof@kernel.org -Reviewed-by: Hannes Reinecke -Signed-off-by: Christian Brauner -Signed-off-by: Sasha Levin ---- - fs/mpage.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/fs/mpage.c b/fs/mpage.c -index 242e213ee0644..20d95847666b6 100644 ---- a/fs/mpage.c -+++ b/fs/mpage.c -@@ -189,7 +189,7 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args) - if (folio_buffers(folio)) - goto confused; - -- block_in_file = (sector_t)folio->index << (PAGE_SHIFT - blkbits); -+ block_in_file = folio_pos(folio) >> blkbits; - last_block = block_in_file + args->nr_pages * blocks_per_page; - last_block_in_file = (i_size_read(inode) + blocksize - 1) >> blkbits; - if (last_block > last_block_in_file) -@@ -543,7 +543,7 @@ static int __mpage_writepage(struct folio *folio, struct writeback_control *wbc, - * The page has no buffers: map it to disk - */ - BUG_ON(!folio_test_uptodate(folio)); -- block_in_file = (sector_t)folio->index << (PAGE_SHIFT - blkbits); -+ block_in_file = folio_pos(folio) >> blkbits; - /* - * Whole page beyond EOF? Skip allocating blocks to avoid leaking - * space. --- -2.39.5 - diff --git a/queue-6.6/series b/queue-6.6/series index 979ae94c2c..dd0a0bee38 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -194,7 +194,6 @@ media-adv7180-disable-test-pattern-control-on-adv718.patch media-tc358746-improve-calculation-of-the-d-phy-timi.patch libbpf-fix-out-of-bound-read.patch dm-fix-unconditional-io-throttle-caused-by-req_prefl.patch -fs-mpage-avoid-negative-shift-for-large-blocksize.patch net-mlx5-change-pool_next_size-define-value-and-make.patch x86-kaslr-reduce-kaslr-entropy-on-most-x86-systems.patch crypto-ahash-set-default-reqsize-from-ahash_alg.patch