Drop block-fix-cached-zone-reports-on-devices-with-native.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.12/block-fix-cached-zone-reports-on-devices-with-native.patch b/queue-6.12/block-fix-cached-zone-reports-on-devices-with-native.patch
deleted file mode 100644 (file)
index 509c8fd..0000000
--- a/queue-6.12/block-fix-cached-zone-reports-on-devices-with-native.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 921d4c53b5c0da92417ec6c8d7dc98ece9a01728 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 10 Dec 2025 03:10:37 +0100
-Subject: block: fix cached zone reports on devices with native zone append
-
-From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
-
-[ Upstream commit 2c38ec934ddfe2d35c813edea2674356bea0fabe ]
-
-When mounting a btrfs file system on virtio-blk which supports native
-Zone Append there has been a WARN triggering in btrfs' space management
-code.
-
-Further looking into btrfs' zoned statistics uncovered the filesystem
-expecting the zones to be used, but the write pointers being 0:
- # cat /sys/fs/btrfs/8eabd2e7-3294-4f9e-9b58-7e64135c8bf4/zoned_stats
- active block-groups: 4
-         reclaimable: 0
-         unused: 0
-         need reclaim: false
- data relocation block-group: 1342177280
- active zones:
-         start: 1073741824, wp: 0 used: 0, reserved: 0, unusable: 0
-         start: 1342177280, wp: 0 used: 0, reserved: 0, unusable: 0
-         start: 1610612736, wp: 0 used: 16384, reserved: 0, unusable: 18446744073709535232
-         start: 1879048192, wp: 0 used: 131072, reserved: 0, unusable: 18446744073709420544
-
-Looking at the blkzone report output for the zone in question
-(1610612736) the write pointer on the device moved, but the filesystem
-did not see a change on the write pointer:
- # blkzone report -c 1 -o 0x300000 /dev/vda
-   start: 0x000300000, len 0x080000, cap 0x080000, wptr 0x000040 reset:0 non-seq:0, zcond: 2(oi) [type: 2(SEQ_WRITE_REQUIRED)]
-
-The zone write pointer is 0, because btrfs is using the cached version
-of blkdev_report_zones() and as virtio-blk is supporting native zone
-append, but blkdev_revalidate_zones() does not initialize the zone write
-plugs in this case.
-
-Not skipping the revalidate of sequential zones in
-blkdev_revalidate_zones() callchain fixes this issue.
-
-Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
-Reviewed-by: Christoph Hellwig <hch@lst.de>
-Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
-Fixes: a6aa36e957a1 ("block: Remove zone write plugs when handling native zone append writes")
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- block/blk-zoned.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/block/blk-zoned.c b/block/blk-zoned.c
-index f1160cc2cf85d..42b08796f6bc1 100644
---- a/block/blk-zoned.c
-+++ b/block/blk-zoned.c
-@@ -1621,7 +1621,7 @@ static int blk_revalidate_seq_zone(struct blk_zone *zone, unsigned int idx,
-        * we have a zone write plug for such zone if the device has a zone
-        * write plug hash table.
-        */
--      if (!queue_emulates_zone_append(disk->queue) || !disk->zone_wplugs_hash)
-+      if (!disk->zone_wplugs_hash)
-               return 0;
- 
-       disk_zone_wplug_sync_wp_offset(disk, zone);
--- 
-2.51.0
-

diff --git a/queue-6.12/series b/queue-6.12/series
index 9dbc822b1a99b966f3b47299e544c63cb24c3d57..784774dc1c5c08f9f88801508b37b73d9d78a72c 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -335,6 +335,5 @@ alsa-firewire-motu-add-bounds-check-in-put_user-loop.patch
 arm-9464-1-fix-input-only-operand-modification-in-lo.patch
 block-use-rcu-in-blk_mq_-un-quiesce_tagset-instead-o.patch
 block-return-unsigned-int-from-queue_dma_alignment.patch
-block-fix-cached-zone-reports-on-devices-with-native.patch
 dm-raid-fix-possible-null-dereference-with-undefined.patch
 dm-log-writes-add-missing-set_freezable-for-freezabl.patch

diff --git a/queue-6.17/block-fix-cached-zone-reports-on-devices-with-native.patch b/queue-6.17/block-fix-cached-zone-reports-on-devices-with-native.patch
deleted file mode 100644 (file)
index fd75b80..0000000
--- a/queue-6.17/block-fix-cached-zone-reports-on-devices-with-native.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 93e4793a96e645acaffa5acba6d4a3a9a4c796e0 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 10 Dec 2025 03:10:37 +0100
-Subject: block: fix cached zone reports on devices with native zone append
-
-From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
-
-[ Upstream commit 2c38ec934ddfe2d35c813edea2674356bea0fabe ]
-
-When mounting a btrfs file system on virtio-blk which supports native
-Zone Append there has been a WARN triggering in btrfs' space management
-code.
-
-Further looking into btrfs' zoned statistics uncovered the filesystem
-expecting the zones to be used, but the write pointers being 0:
- # cat /sys/fs/btrfs/8eabd2e7-3294-4f9e-9b58-7e64135c8bf4/zoned_stats
- active block-groups: 4
-         reclaimable: 0
-         unused: 0
-         need reclaim: false
- data relocation block-group: 1342177280
- active zones:
-         start: 1073741824, wp: 0 used: 0, reserved: 0, unusable: 0
-         start: 1342177280, wp: 0 used: 0, reserved: 0, unusable: 0
-         start: 1610612736, wp: 0 used: 16384, reserved: 0, unusable: 18446744073709535232
-         start: 1879048192, wp: 0 used: 131072, reserved: 0, unusable: 18446744073709420544
-
-Looking at the blkzone report output for the zone in question
-(1610612736) the write pointer on the device moved, but the filesystem
-did not see a change on the write pointer:
- # blkzone report -c 1 -o 0x300000 /dev/vda
-   start: 0x000300000, len 0x080000, cap 0x080000, wptr 0x000040 reset:0 non-seq:0, zcond: 2(oi) [type: 2(SEQ_WRITE_REQUIRED)]
-
-The zone write pointer is 0, because btrfs is using the cached version
-of blkdev_report_zones() and as virtio-blk is supporting native zone
-append, but blkdev_revalidate_zones() does not initialize the zone write
-plugs in this case.
-
-Not skipping the revalidate of sequential zones in
-blkdev_revalidate_zones() callchain fixes this issue.
-
-Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
-Reviewed-by: Christoph Hellwig <hch@lst.de>
-Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
-Fixes: a6aa36e957a1 ("block: Remove zone write plugs when handling native zone append writes")
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- block/blk-zoned.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/block/blk-zoned.c b/block/blk-zoned.c
-index 5e2a5788dc3b2..1675d5d7bd9b1 100644
---- a/block/blk-zoned.c
-+++ b/block/blk-zoned.c
-@@ -1629,7 +1629,7 @@ static int blk_revalidate_seq_zone(struct blk_zone *zone, unsigned int idx,
-        * we have a zone write plug for such zone if the device has a zone
-        * write plug hash table.
-        */
--      if (!queue_emulates_zone_append(disk->queue) || !disk->zone_wplugs_hash)
-+      if (!disk->zone_wplugs_hash)
-               return 0;
- 
-       disk_zone_wplug_sync_wp_offset(disk, zone);
--- 
-2.51.0
-

diff --git a/queue-6.17/series b/queue-6.17/series
index 78eda137082bb7eb7e7d5c7e247929a59c1c2f83..228ab516643b7e98b50a61c2c4eba86f1d37434a 100644 (file)
--- a/queue-6.17/series
+++ b/queue-6.17/series
@@ -484,6 +484,5 @@ drm-i915-xe-fbdev-deduplicate-struct-drm_mode_fb_cmd.patch
 drm-i915-fbdev-hold-runtime-pm-ref-during-fbdev-bo-c.patch
 block-use-rcu-in-blk_mq_-un-quiesce_tagset-instead-o.patch
 asoc-amd-acp-update-tdm-channels-for-specific-dai.patch
-block-fix-cached-zone-reports-on-devices-with-native.patch
 dm-raid-fix-possible-null-dereference-with-undefined.patch
 dm-log-writes-add-missing-set_freezable-for-freezabl.patch

diff --git a/queue-6.18/block-fix-cached-zone-reports-on-devices-with-native.patch b/queue-6.18/block-fix-cached-zone-reports-on-devices-with-native.patch
deleted file mode 100644 (file)
index 1bde35e..0000000
--- a/queue-6.18/block-fix-cached-zone-reports-on-devices-with-native.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 8824f5ef2b790ce17c86094cea8df1e928e419c8 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 10 Dec 2025 03:10:37 +0100
-Subject: block: fix cached zone reports on devices with native zone append
-
-From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
-
-[ Upstream commit 2c38ec934ddfe2d35c813edea2674356bea0fabe ]
-
-When mounting a btrfs file system on virtio-blk which supports native
-Zone Append there has been a WARN triggering in btrfs' space management
-code.
-
-Further looking into btrfs' zoned statistics uncovered the filesystem
-expecting the zones to be used, but the write pointers being 0:
- # cat /sys/fs/btrfs/8eabd2e7-3294-4f9e-9b58-7e64135c8bf4/zoned_stats
- active block-groups: 4
-         reclaimable: 0
-         unused: 0
-         need reclaim: false
- data relocation block-group: 1342177280
- active zones:
-         start: 1073741824, wp: 0 used: 0, reserved: 0, unusable: 0
-         start: 1342177280, wp: 0 used: 0, reserved: 0, unusable: 0
-         start: 1610612736, wp: 0 used: 16384, reserved: 0, unusable: 18446744073709535232
-         start: 1879048192, wp: 0 used: 131072, reserved: 0, unusable: 18446744073709420544
-
-Looking at the blkzone report output for the zone in question
-(1610612736) the write pointer on the device moved, but the filesystem
-did not see a change on the write pointer:
- # blkzone report -c 1 -o 0x300000 /dev/vda
-   start: 0x000300000, len 0x080000, cap 0x080000, wptr 0x000040 reset:0 non-seq:0, zcond: 2(oi) [type: 2(SEQ_WRITE_REQUIRED)]
-
-The zone write pointer is 0, because btrfs is using the cached version
-of blkdev_report_zones() and as virtio-blk is supporting native zone
-append, but blkdev_revalidate_zones() does not initialize the zone write
-plugs in this case.
-
-Not skipping the revalidate of sequential zones in
-blkdev_revalidate_zones() callchain fixes this issue.
-
-Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
-Reviewed-by: Christoph Hellwig <hch@lst.de>
-Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
-Fixes: a6aa36e957a1 ("block: Remove zone write plugs when handling native zone append writes")
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- block/blk-zoned.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/block/blk-zoned.c b/block/blk-zoned.c
-index 5e2a5788dc3b2..1675d5d7bd9b1 100644
---- a/block/blk-zoned.c
-+++ b/block/blk-zoned.c
-@@ -1629,7 +1629,7 @@ static int blk_revalidate_seq_zone(struct blk_zone *zone, unsigned int idx,
-        * we have a zone write plug for such zone if the device has a zone
-        * write plug hash table.
-        */
--      if (!queue_emulates_zone_append(disk->queue) || !disk->zone_wplugs_hash)
-+      if (!disk->zone_wplugs_hash)
-               return 0;
- 
-       disk_zone_wplug_sync_wp_offset(disk, zone);
--- 
-2.51.0
-

diff --git a/queue-6.18/series b/queue-6.18/series
index dd08d9b5368c9cb14b8015c2fc7278781b424b13..89ebf84bf0a5a29e770c302ec9f0387b02a53ab2 100644 (file)
--- a/queue-6.18/series
+++ b/queue-6.18/series
@@ -590,6 +590,5 @@ drm-i915-xe-fbdev-deduplicate-struct-drm_mode_fb_cmd.patch
 drm-i915-fbdev-hold-runtime-pm-ref-during-fbdev-bo-c.patch
 block-use-rcu-in-blk_mq_-un-quiesce_tagset-instead-o.patch
 asoc-amd-acp-update-tdm-channels-for-specific-dai.patch
-block-fix-cached-zone-reports-on-devices-with-native.patch
 dm-raid-fix-possible-null-dereference-with-undefined.patch
 dm-log-writes-add-missing-set_freezable-for-freezabl.patch