btrfs: zoned block device support
Subsystems (4)
v12 cover btrfs: zoned block device support
This series adds zoned block device support to btrfs. Some of the patches in the previous series are already merged as preparation patches.
This series is also available on github.
Kernel https://github.com/naota/linux/tree/btrfs-zoned-v12
Userland https://github.com/naota/btrfs-progs/tree/btrfs-zoned
xfstests https://github.com/naota/fstests/tree/btrfs-zoned
Userland tool depends on patched util-linux (libblkid and wipefs) to handle log-structured superblock. To ease the testing, pre-compiled static linked userland tools are available here:
https://wdc.app.box.com/s/fnhqsb3otrvgkstq66o6bvdw6tk525kp
v11 restructured the series so that it starts with the minimum patches to run emulated zoned mode on regular devices (chunk/extent allocator, allocation pointer handling, pinning of freed extents (re-dirtying released extent)).
This series still leaves the following issues left for later fix.
- Bio submission path & splitting an ordered extent
- Redirtying freed tree blocks
- Switch to keeping it dirty
- Not working correctly for now
- Dedicated tree-log block group
- We need tree-log for zoned device
- Dbench (32 clients) is 85% slower with "-o notreelog"
- Need to separate tree-log block group from other metadata space_info
- Relocation
- Use normal write command for relocation
- Relocated device extents must be reset
- It should be discarded on regular btrfs too though
- Support for zone capacity
Changes from v11
- Addressed the review comments
- Add @return to btrfs_bio_add_page()
- Load and pass struct btrfs_block_group_item* to read_one_block_group
- Remove lock contention from transaction log serialisation
- Introduce btrfs_clear_treelog_bg() helper
- Do not eat errored return value in calculate_alloc_pointer()
- Handle errors from btrfs_add_ordered_extent() in clone_ordered_extent()
- Use btrfs_is_zoned in btrfs_ioctl_fitrim()
- Code style and commit message fix
- Use the same SB locations as regular btrfs if the device is non-zoned.
- Remove "force_zoned" flag since it's no longer necessary by delaying the load of zone info.
- Added comments.
btrfs-progs and xfstests series will follow.
This version of ZONED btrfs switched from normal write command to zone append write command. You do not need to specify LBA (at the write pointer) to write for zone append write command. Instead, you only select a zone to write with its start LBA. Then the device (NVMe ZNS), or the emulation of zone append command in the sd driver in the case of SAS or SATA HDDs, automatically writes the data at the write pointer position and return the written LBA as a command reply.
The benefit of using the zone append write command is that write command issuing order does not matter. So, we can eliminate block group lock and utilize asynchronous checksum, which can reorder the IOs.
Eliminating the lock improves performance. In particular, on a workload with massive competing to the same zone [1], we observed 36% performance improvement compared to normal write.
[1] Fio running 16 jobs with 4KB random writes for 5 minutes
However, there are some limitations. We cannot use the non-SINGLE profile. Supporting non-SINGLE profile with zone append writing is not trivial. For example, in the DUP profile, we send a zone append writing IO to two zones on a device. The device reply with written LBAs for the IOs. If the offsets of the returned addresses from the beginning of the zone are different, then it results in different logical addresses.
For the same reason, we cannot issue multiple IOs for one ordered extent. Thus, the size of an ordered extent is limited under max_zone_append_size. This limitation will cause fragmentation and increased usage of metadata. In the future, we can add optimization to merge ordered extents after end_bio.
* Patch series description
A zoned block device consists of a number of zones. Zones are either conventional and accepting random writes or sequential and requiring that writes be issued in LBA order from each zone write pointer position. This patch series ensures that the sequential write constraint of sequential zones is respected while fundamentally not changing BtrFS block and I/O management for block stored in conventional zones.
To achieve this, the default chunk size of btrfs is changed on zoned block devices so that chunks are always aligned to a zone. Allocation of blocks within a chunk is changed so that the allocation is always sequential from the beginning of the chunks. To do so, an allocation pointer is added to block groups and used as the allocation hint. The allocation changes also ensure that blocks freed below the allocation pointer are ignored, resulting in sequential block allocation regardless of the chunk usage.
The zone of a chunk is reset to allow reuse of the zone only when the block group is being freed, that is, when all the chunks of the block group are unused.
For btrfs volumes composed of multiple zoned disks, a restriction is added to ensure that all disks have the same zone size. This restriction matches the existing constraint that all chunks in a block group must have the same size.
* Enabling tree-log
The tree-log feature does not work on ZONED mode as is. Blocks for a tree-log tree are allocated mixed with other metadata blocks, and btrfs writes and syncs the tree-log blocks to devices at the time of fsync(), which is different timing than a global transaction commit. As a result, both writing tree-log blocks and writing other metadata blocks become non-sequential writes which ZONED mode must avoid.
This series introduces a dedicated block group for tree-log blocks to create two metadata writing streams, one for tree-log blocks and the other for metadata blocks. As a result, each write stream can now be written to devices separately and sequentially.
* Log-structured superblock
Superblock (and its copies) is the only data structure in btrfs which has a fixed location on a device. Since we cannot overwrite in a sequential write required zone, we cannot place superblock in the zone.
This series implements superblock log writing. It uses two zones as a circular buffer to write updated superblocks. Once the first zone is filled up, start writing into the second zone. The first zone will be reset once both zones are filled. We can determine the postion of the latest superblock by reading the write pointer information from a device.
* Patch series organization
Patches 1 and 2 are preparing patches for block and iomap layer.
Patches 3 to 7 are fixes for previous patches or preparing for the latter patches.
Patch 8 implements emulated zoned mode for non-zoned devices.
Patches 9 and 10 tweak the device extent allocation for ZONED mode and add verification to check if a device extent is properly aligned to zones.
Patches 11 to 14 implements sequential block allocator for ZONED mode.
Patches 15 and 16 tweak some btrfs features work with emulated ZONED mode. These include re-dirtying (and pinning) of once-freed metadata blocks to prevent write holes, and advancing the allocation offset for tree-log node blocks.
Patch 17 adds the ZONED feature to the list of supported features. So, at this point, emulated ZONED mode works on non-zoned device.
Patches 18 and later are for real zoned devices.
Patch 18 implement a zone reset for unused block groups.
Patches 19 to 31 implement the writing path for several types of IO (non-compressed data, direct IO, and metadata). These include re-dirtying once-freed metadata blocks to prevent write holes.
Patches 32 to 41 tweak some btrfs features work with ZONED mode. These include device-replace, relocation, repairing IO error, and tree-log.
* Patch testing note
** Zone-aware util-linux
Since the log-structured superblock feature changed the location of superblock magic, the current util-linux (libblkid) cannot detect ZONED btrfs anymore. You need to apply a to-be posted patch to util-linux to make it "zone aware".
** Testing device
You need devices with zone append writing command support to run ZONED btrfs.
Other than real devices, null_blk supports zone append write command. You can use memory backed null_blk to run the test on it. Following script creates 12800 MB /dev/nullb0.
sysfs=/sys/kernel/config/nullb/nullb0
size=12800 # MB
# drop nullb0
if [[ -d $sysfs ]]; then
echo 0 > "${sysfs}"/power
rmdir $sysfs
fi
lsmod | grep -q null_blk && rmmod null_blk
modprobe null_blk nr_devices=0
mkdir "${sysfs}"
echo "${size}" > "${sysfs}"/size
echo 1 > "${sysfs}"/zoned
echo 0 > "${sysfs}"/zone_nr_conv
echo 1 > "${sysfs}"/memory_backed
echo 1 > "${sysfs}"/power
udevadm settleZoned SCSI devices such as SMR HDDs or scsi_debug also support the zone append command as an emulated command within the SCSI sd driver. This emulation is completely transparent to the user and provides the same semantic as a NVMe ZNS native drive support.
Also, there is a qemu patch available to enable NVMe ZNS device.
** xfstests
We ran xfstests on ZONED btrfs, and, if we omit some cases that are known to fail currently, all test cases pass.
Cases that can be ignored:
1) failing also with the regular btrfs on regular devices,
2) trying to test fallocate feature without testing with "_require_xfs_io_command "falloc"",
3) trying to test incompatible features for ZONED btrfs (e.g. RAID5/6)
4) trying to use incompatible setup for ZONED btrfs (e.g. dm-linear not aligned to zone boundary, swap)
5) trying to create a file system with too small size, (we require at least 9 zones to initiate a ZONED btrfs)
6) dropping original MKFS_OPTIONS ("-O zoned"), so it cannot create ZONED btrfs (btrfs/003)
7) having ENOSPC which incurred by larger metadata block group size
I will send a patch series for xfstests to handle these cases (2-6) properly.
Patched xfstests is available here:
https://github.com/naota/fstests/tree/btrfs-zoned
Also, you need to apply the following patch if you run xfstests with tcmu devices. xfstests btrfs/003 failed to "_devmgt_add" after "_devmgt_remove" without this patch.
https://marc.info/?l=linux-scsi&m=156498625421698&w=2
v11 https://lore.kernel.org/linux-btrfs/SN4PR0401MB35989E15509A0D36CBC35B109BAA0@SN4PR0401MB3598.namprd04.prod.outlook.com/T/#t
v10 https://lore.kernel.org/linux-btrfs/[email protected]/
v9 https://lore.kernel.org/linux-btrfs/[email protected]/
v8 https://lore.kernel.org/linux-btrfs/[email protected]/
v7 https://lore.kernel.org/linux-btrfs/[email protected]/
v6 https://lore.kernel.org/linux-btrfs/[email protected]/
v5 https://lore.kernel.org/linux-btrfs/[email protected]/
v4 https://lwn.net/Articles/797061/
v3 https://lore.kernel.org/linux-btrfs/[email protected]/
v2 https://lore.kernel.org/linux-btrfs/[email protected]/
v1 https://lore.kernel.org/linux-btrfs/[email protected]/
Changelog
v10
- Added emulated zoned mode support.
- Change superblock (SB) location on conventional zones to unify the location of primary SB on regular btrfs and emulated zoned btrfs.
- Move zone info loading later to open_ctre() stage to determine emulated zone size from the size of device extents.
- Set REQ_OP_ZONE_APPEND only if the block group is on a sequential zone.
- Disallow fitrim on zoned mode for now.
- Mark fully zone_unusable block group as unused, so that it can be reclaimed soon.
- Replace: do not issue zero out on conventional zones.
- Add treelog_bg_lock's lock order description.
- Open code btrfs_align_offset_to_zone() and dev_extent_search_start_zoned() (Anand).
- Bug fix:
- Re-check pending extent if device extent hole is changed by dev_extent_hole_check_zoned()
- Do not load allocation pointer for new block group on conventional zones to avoid deadlock.
v9
- Direct-IO path now follow several hardware restrictions (other than max_zone_append_size) by using ZONE_APPEND support of iomap
- introduces union of fs_info->zone_size and fs_info->zoned [Johannes]
- and use btrfs_is_zoned(fs_info) in place of btrfs_fs_incompat(fs_info, ZONED)
- print if zoned is enabled or not when printing module info [Johannes]
- drop patch of disabling inode_cache on ZONED
- moved for_teelog flag to a proper location [Johannes]
- Code style fixes [Johannes]
- Add comment about adding physical layer things to ordered extent structure
- Pass file_offset explicitly to extract_ordered_extent() instead of determining it from bio
- Bug fixes
- write out fsync region so that the logical address of ordered extents and checksums are properly finalized
- free zone_info at umount time
- fix superblock log handling when entering zones[1] in the first time
- fixes double free of log-tree roots [Johannes]
- Drop erroneous ASSERT in do_allocation_zoned()
v8
- Use bio_add_hw_page() to build up bio to honor hardware restrictions
- add bio_add_zone_append_page() as a wrapper of the function
- Split file extent on submitting bio
- If bio_add_zone_append_page() fails, split the file extent and send out bio
- so, we can ensure one bio == one file extent
- Fix build bot issues
- Rebased on misc-next
v7:
- Use zone append write command instead of normal write command
- Bio issuing order does not matter
- No need to use lock anymore
- Can use asynchronous checksum
- Removed RAID support for now
- Rename HMZONED to ZONED
- Split some patches
- Rebased on kdave/for-5.9-rc3 + iomap direct IO
v6:
- Use bitmap helpers (Johannes)
- Code cleanup (Johannes)
- Rebased on kdave/for-5.5
- Enable the tree-log feature.
- Treat conventional zones as sequential zones, so we can now allow mixed allocation of conventional zone and sequential write required zone to construct a block group.
- Implement log-structured superblock
- No need for one conventional zone at the beginning of a device.
- Fix deadlock of direct IO writing
- Fix building with !CONFIG_BLK_DEV_ZONED (Johannes)
- Fix leak of zone_info (Johannes)
v5:
- Rebased on kdave/for-5.5
- Enable the tree-log feature.
- Treat conventional zones as sequential zones, so we can now allow mixed allocation of conventional zone and sequential write required zone to construct a block group.
- Implement log-structured superblock
- No need for one conventional zone at the beginning of a device.
- Fix deadlock of direct IO writing
- Fix building with !CONFIG_BLK_DEV_ZONED (Johannes)
- Fix leak of zone_info (Johannes)
v4:
- Move memory allcation of zone informattion out of btrfs_get_dev_zones() (Anand)
- Add disabled features table in commit log (Anand)
- Ensure "max_chunk_size >= devs_min * data_stripes * zone_size"
v3:
- Serialize allocation and submit_bio instead of bio buffering in btrfs_map_bio().
-- Disable async checksum/submit in HMZONED mode
- Introduce helper functions and hmzoned.c/h (Josef, David)
- Add support for repairing IO failure
- Add support for NOCOW direct IO write (Josef)
- Disable preallocation entirely
-- Disable INODE_MAP_CACHE
-- relocation is reworked not to rely on preallocation in HMZONED mode
- Disable NODATACOW
-Disable MIXED_BG
- Device extent that cover super block position is banned (David)
v2:
- Add support for dev-replace
-- To support dev-replace, moved submit_buffer one layer up. It now
handles bio instead of btrfs_bio.
-- Mark unmirrored Block Group readonly only when there are writable
mirrored BGs. Necessary to handle degraded RAID.
- Expire worker use vanilla delayed_work instead of btrfs's async-thread
- Device extent allocator now ensure that region is on the same zone type.
- Add delayed allocation shrinking.
- Rename btrfs_drop_dev_zonetypes() to btrfs_destroy_dev_zonetypes
- Fix
-- Use SECTOR_SHIFT (Nikolay)
-- Use btrfs_err (Nikolay)
Johannes Thumshirn (6):
block: add bio_add_zone_append_page
btrfs: release path before calling into
btrfs_load_block_group_zone_info
btrfs: do not load fs_info->zoned from incompat flag
btrfs: allow zoned mode on non-zoned block devices
btrfs: cache if block-group is on a sequential zone
btrfs: save irq flags when looking up an ordered extent
Naohiro Aota (35):
iomap: support REQ_OP_ZONE_APPEND
btrfs: defer loading zone info after opening trees
btrfs: use regular SB location on emulated zoned mode
btrfs: disallow fitrim in ZONED mode
btrfs: implement zoned chunk allocator
btrfs: verify device extent is aligned to zone
btrfs: load zone's allocation offset
btrfs: calculate allocation offset for conventional zones
btrfs: track unusable bytes for zones
btrfs: do sequential extent allocation in ZONED mode
btrfs: redirty released extent buffers in ZONED mode
btrfs: advance allocation pointer after tree log node
btrfs: enable to mount ZONED incompat flag
btrfs: reset zones of unused block groups
btrfs: extract page adding function
btrfs: use bio_add_zone_append_page for zoned btrfs
btrfs: handle REQ_OP_ZONE_APPEND as writing
btrfs: split ordered extent when bio is sent
btrfs: extend btrfs_rmap_block for specifying a device
btrfs: use ZONE_APPEND write for ZONED btrfs
btrfs: enable zone append writing for direct IO
btrfs: introduce dedicated data write path for ZONED mode
btrfs: serialize meta IOs on ZONED mode
btrfs: wait existing extents before truncating
btrfs: avoid async metadata checksum on ZONED mode
btrfs: mark block groups to copy for device-replace
btrfs: implement cloning for ZONED device-replace
btrfs: implement copying for ZONED device-replace
btrfs: support dev-replace in ZONED mode
btrfs: enable relocation in ZONED mode
btrfs: relocate block group to repair IO failure in ZONED
btrfs: split alloc_log_tree()
btrfs: extend zoned allocator to use dedicated tree-log block group
btrfs: serialize log transaction on ZONED mode
btrfs: reorder log node allocation
block/bio.c | 33 ++ fs/btrfs/block-group.c | 111 ++-- fs/btrfs/block-group.h | 20 +- fs/btrfs/ctree.h | 6 +- fs/btrfs/dev-replace.c | 182 +++++++ fs/btrfs/dev-replace.h | 3 + fs/btrfs/disk-io.c | 57 +- fs/btrfs/disk-io.h | 2 + fs/btrfs/extent-tree.c | 230 +++++++- fs/btrfs/extent_io.c | 128 ++++- fs/btrfs/extent_io.h | 2 + fs/btrfs/file.c | 2 +- fs/btrfs/free-space-cache.c | 77 +++ fs/btrfs/free-space-cache.h | 2 + fs/btrfs/inode.c | 166 +++++- fs/btrfs/ioctl.c | 8 + fs/btrfs/ordered-data.c | 93 +++- fs/btrfs/ordered-data.h | 10 + fs/btrfs/relocation.c | 34 +- fs/btrfs/scrub.c | 145 +++++ fs/btrfs/space-info.c | 13 +- fs/btrfs/space-info.h | 4 +- fs/btrfs/sysfs.c | 2 + fs/btrfs/tests/extent-map-tests.c | 2 +- fs/btrfs/transaction.c | 10 + fs/btrfs/transaction.h | 3 + fs/btrfs/tree-log.c | 59 +- fs/btrfs/volumes.c | 314 ++++++++++- fs/btrfs/volumes.h | 3 + fs/btrfs/zoned.c | 877 +++++++++++++++++++++++++++++- fs/btrfs/zoned.h | 159 +++++- fs/iomap/direct-io.c | 43 +- include/linux/bio.h | 2 + include/linux/iomap.h | 1 + 34 files changed, 2639 insertions(+), 164 deletions(-)
Signature · 1 line
2.27.0
PATCH v12 1/41 block: add bio_add_zone_append_page
From: Johannes Thumshirn <[email protected]>
Add bio_add_zone_append_page(), a wrapper around bio_add_hw_page() which is intended to be used by file systems that directly add pages to a bio instead of using bio_iov_iter_get_pages().
--- block/bio.c | 33 +++++++++++++++++++++++++++++++++ include/linux/bio.h | 2 ++ 2 files changed, 35 insertions(+)
block/bio.c +33 -0
@@ -851,6 +851,39 @@ int bio_add_pc_page(struct request_queue *q, struct bio *bio, }EXPORT_SYMBOL (bio_add_pc_page); +/** +* bio_add_zone_append_page - attempt to add page to zone-append bio +* @bio: destination bio +* @page: page to add +* @len: vec entry length +* @offset: vec entry offset +* +* Attempt to add a page to the bio_vec maplist of a bio that will be submitted +* for a zone-append request. This can fail for a number of reasons, such as the +* bio being full or the target block device is not a zoned block device or +* other limitations of the target block device. The target block device must +* allow bio's up to PAGE_SIZE, so it is always possible to add a single page +* to an empty bio. +* +* Returns: number of bytes added to the bio, or 0 in case of a failure. +*/ +int bio_add_zone_append_page (struct bio *bio,struct page *page, +unsigned int len,unsigned int offset) +{ +struct request_queue *q = bio->bi_disk->queue; +bool same_page = false; + +if (WARN_ON_ONCE (bio_op (bio) !=REQ_OP_ZONE_APPEND )) +return 0 ; + +if (WARN_ON_ONCE (!blk_queue_is_zoned (q))) +return 0 ; + +return bio_add_hw_page (q, bio, page, len, offset, +queue_max_zone_append_sectors (q), &same_page); +} +EXPORT_SYMBOL_GPL (bio_add_zone_append_page); +/** * __bio_try_merge_page - try appending data to an existing bvec. * @bio: destination bio
include/linux/bio.h +2 -0
@@ -442,6 +442,8 @@ void bio_chain(struct bio *, struct bio *);extern int bio_add_page (struct bio *,struct page *,unsigned int ,unsigned int );extern int bio_add_pc_page (struct request_queue *,struct bio *,struct page *,unsigned int ,unsigned int ); +int bio_add_zone_append_page (struct bio *bio,struct page *page, +unsigned int len,unsigned int offset);bool __bio_try_merge_page (struct bio *bio,struct page *page,unsigned int len,unsigned int off,bool *same_page); void __bio_add_page(struct bio *bio, struct page *page,
Signature · 1 line
2.27.0
Re: [PATCH v12 01/41] block: add bio_add_zone_append_page
Quoted 9 lines · Naohiro Aota
From: Johannes Thumshirn <[email protected]>
Add
bio_add_zone_append_page(), a wrapper aroundbio_add_hw_page()which is intended to be used by file systems that directly add pages to a bio instead of usingbio_iov_iter_get_pages().Cc Jens Axboe <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Johannes Thumshirn <[email protected]>
Thanks,
Josef
Re: [PATCH v12 01/41] block: add bio_add_zone_append_page
In reply to Naohiro AotaQuoted 7 lines · Naohiro Aota
From: Johannes Thumshirn <[email protected]>
Add
bio_add_zone_append_page(), a wrapper aroundbio_add_hw_page()which is intended to be used by file systems that directly add pages to a bio instead of usingbio_iov_iter_get_pages().Cc Jens Axboe <[email protected]>
Jens, can I have an Ack fro you on this one? Christoph and Josef are fine with it.
Quoted 65 lines
Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Johannes Thumshirn <[email protected]>--- block/bio.c | 33 +++++++++++++++++++++++++++++++++ include/linux/bio.h | 2 ++ 2 files changed, 35 insertions(+)block/bio.c +33
-0@@ -851,6 +851,39 @@ int bio_add_pc_page(struct request_queue *q, struct bio *bio, }EXPORT_SYMBOL (bio_add_pc_page); +/** +* bio_add_zone_append_page - attempt to add page to zone-append bio +* @bio: destination bio +* @page: page to add +* @len: vec entry length +* @offset: vec entry offset +* +* Attempt to add a page to the bio_vec maplist of a bio that will be submitted +* for a zone-append request. This can fail for a number of reasons, such as the +* bio being full or the target block device is not a zoned block device or +* other limitations of the target block device. The target block device must +* allow bio's up to PAGE_SIZE, so it is always possible to add a single page +* to an empty bio. +* +* Returns: number of bytes added to the bio, or 0 in case of a failure. +*/ +int bio_add_zone_append_page (struct bio *bio,struct page *page, +unsigned int len,unsigned int offset) +{ +struct request_queue *q = bio->bi_disk->queue; +bool same_page = false; + +if (WARN_ON_ONCE (bio_op (bio) !=REQ_OP_ZONE_APPEND )) +return 0 ; + +if (WARN_ON_ONCE (!blk_queue_is_zoned (q))) +return 0 ; + +return bio_add_hw_page (q, bio, page, len, offset, +queue_max_zone_append_sectors (q), &same_page); +} +EXPORT_SYMBOL_GPL (bio_add_zone_append_page); +/** * __bio_try_merge_page - try appending data to an existing bvec. * @bio: destination bio include/linux/bio.h +2
-0@@ -442,6 +442,8 @@ void bio_chain(struct bio *, struct bio *);extern int bio_add_page (struct bio *,struct page *,unsigned int ,unsigned int );extern int bio_add_pc_page (struct request_queue *,struct bio *,struct page *,unsigned int ,unsigned int ); +int bio_add_zone_append_page (struct bio *bio,struct page *page, +unsigned int len,unsigned int offset);bool __bio_try_merge_page (struct bio *bio,struct page *page,unsigned int len,unsigned int off,bool *same_page); void __bio_add_page(struct bio *bio, struct page *page,
PATCH v12 2/41 iomap: support REQ_OP_ZONE_APPEND
In reply to Naohiro AotaA ZONE_APPEND bio must follow hardware restrictions (e.g. not exceeding max_zone_append_sectors) not to be split. bio_iov_iter_get_pages builds such restricted bio using __bio_iov_append_get_pages if bio_op(bio) == REQ_OP_ZONE_APPEND.
To utilize it, we need to set the bio_op before calling bio_iov_iter_get_pages(). This commit introduces IOMAP_F_ZONE_APPEND, so that iomap user can set the flag to indicate they want REQ_OP_ZONE_APPEND and restricted bio.
--- fs/iomap/direct-io.c | 43 +++++++++++++++++++++++++++++++++++++------ include/linux/iomap.h | 1 + 2 files changed, 38 insertions(+), 6 deletions(-)
fs/iomap/direct-io.c +37 -6
@@ -201,6 +201,34 @@ iomap_dio_zero(struct iomap_dio *dio, struct iomap *iomap, loff_t pos,iomap_dio_submit_bio (dio, iomap, bio, pos); } +/* +* Figure out the bio's operation flags from the dio request, the +* mapping, and whether or not we want FUA. Note that we can end up +* clearing the WRITE_FUA flag in the dio request. +*/ +static inline unsigned int +iomap_dio_bio_opflags (struct iomap_dio *dio,struct iomap *iomap,bool use_fua) +{ +unsigned int opflags =REQ_SYNC |REQ_IDLE ; + +if (!(dio->flags &IOMAP_DIO_WRITE )) { +WARN_ON_ONCE (iomap->flags &IOMAP_F_ZONE_APPEND ); +return REQ_OP_READ ; + } + +if (iomap->flags &IOMAP_F_ZONE_APPEND ) + opflags |=REQ_OP_ZONE_APPEND ; +else + opflags |=REQ_OP_WRITE ; + +if (use_fua) + opflags |=REQ_FUA ; +else + dio->flags &= ~IOMAP_DIO_WRITE_FUA ; + +return opflags; +} +static loff_t iomap_dio_bio_actor (struct inode *inode,loff_t pos,loff_t length,struct iomap_dio *dio,struct iomap *iomap)
@@ -208,6 +236,7 @@ iomap_dio_bio_actor(struct inode *inode, loff_t pos, loff_t length,unsigned int blkbits =blksize_bits (bdev_logical_block_size (iomap->bdev));unsigned int fs_block_size =i_blocksize (inode), pad;unsigned int align =iov_iter_alignment (dio->submit.iter); +unsigned int bio_opf;struct bio *bio;bool need_zeroout = false;bool use_fua = false;
@@ -263,6 +292,13 @@ iomap_dio_bio_actor(struct inode *inode, loff_t pos, loff_t length,iomap_dio_zero (dio, iomap, pos - pad, pad); } +/* +* Set the operation flags early so that bio_iov_iter_get_pages +* can set up the page vector appropriately for a ZONE_APPEND +* operation. +*/ + bio_opf =iomap_dio_bio_opflags (dio, iomap, use_fua); + do { size_t n; if (dio->error) {
@@ -278,6 +314,7 @@ iomap_dio_bio_actor(struct inode *inode, loff_t pos, loff_t length, bio->bi_ioprio = dio->iocb->ki_ioprio; bio->bi_private = dio; bio->bi_end_io = iomap_dio_bio_end_io; + bio->bi_opf = bio_opf; ret =bio_iov_iter_get_pages (bio, dio->submit.iter);if (unlikely (ret)) {
@@ -293,14 +330,8 @@ iomap_dio_bio_actor(struct inode *inode, loff_t pos, loff_t length, n = bio->bi_iter.bi_size;if (dio->flags &IOMAP_DIO_WRITE ) { - bio->bi_opf =REQ_OP_WRITE |REQ_SYNC |REQ_IDLE ; -if (use_fua) - bio->bi_opf |=REQ_FUA ; -else - dio->flags &= ~IOMAP_DIO_WRITE_FUA ;task_io_account_write (n); }else { - bio->bi_opf =REQ_OP_READ ;if (dio->flags &IOMAP_DIO_DIRTY )bio_set_pages_dirty (bio); }
include/linux/iomap.h +1 -0
@@ -55,6 +55,7 @@ struct vm_fault;#define IOMAP_F_SHARED 0x04#define IOMAP_F_MERGED 0x08#define IOMAP_F_BUFFER_HEAD 0x10 +#define IOMAP_F_ZONE_APPEND 0x20/* * Flags set by the core iomap code during operations:
Signature · 1 line
2.27.0
PATCH v12 3/41 btrfs: defer loading zone info after opening trees
In reply to Naohiro AotaThis is preparation patch to implement zone emulation on a regular device.
To emulate zoned mode on a regular (non-zoned) device, we need to decide an emulating zone size. Instead of making it compile-time static value, we'll make it configurable at mkfs time. Since we have one zone == one device extent restriction, we can determine the emulated zone size from the size of a device extent. We can extend btrfs_get_dev_zone_info() to show a regular device filled with conventional zones once the zone size is decided.
The current call site of btrfs_get_dev_zone_info() during the mount process is earlier than reading the trees, so we can't slice a regular device to conventional zones. This patch defers the loading of zone info to open_ctree() to load the emulated zone size from a device extent.
--- fs/btrfs/disk-io.c | 13 +++++++++++++ fs/btrfs/volumes.c | 4 ---- fs/btrfs/zoned.c | 24 ++++++++++++++++++++++++ fs/btrfs/zoned.h | 7 +++++++ 4 files changed, 44 insertions(+), 4 deletions(-)
fs/btrfs/disk-io.c +13 -0
@@ -3257,6 +3257,19 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_deviceif (ret) goto fail_tree_roots; +/* +* Get zone type information of zoned block devices. This will also +* handle emulation of the zoned mode for btrfs if a regular device has +* the zoned incompat feature flag set. +*/ + ret =btrfs_get_dev_zone_info_all_devices (fs_info); +if (ret) { +btrfs_err (fs_info, +"failed to read device zone info: %d" , + ret); + goto fail_block_groups; + } +/* * If we have a uuid root and we're not being told to rescan we need to * check the generation here so we can set the
fs/btrfs/volumes.c +0 -4
@@ -669,10 +669,6 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices,clear_bit (BTRFS_DEV_STATE_IN_FS_METADATA , &device->dev_state); device->mode = flags; - ret =btrfs_get_dev_zone_info (device); -if (ret !=0 ) - goto error_free_page; - fs_devices->open_devices++;if (test_bit (BTRFS_DEV_STATE_WRITEABLE , &device->dev_state) && device->devid !=BTRFS_DEV_REPLACE_DEVID ) {
fs/btrfs/zoned.c +24 -0
@@ -143,6 +143,30 @@ static int btrfs_get_dev_zones(struct btrfs_device *device, u64 pos,return 0 ; } +int btrfs_get_dev_zone_info_all_devices (struct btrfs_fs_info *fs_info) +{ +struct btrfs_fs_devices *fs_devices = fs_info->fs_devices; +struct btrfs_device *device; +int ret =0 ; + +if (!btrfs_fs_incompat (fs_info,ZONED )) +return 0 ; + +mutex_lock (&fs_devices->device_list_mutex); +list_for_each_entry (device, &fs_devices->devices, dev_list) { +/* We can skip reading of zone info for missing devices */ +if (!device->bdev) +continue ; + + ret =btrfs_get_dev_zone_info (device); +if (ret) +break ; + } +mutex_unlock (&fs_devices->device_list_mutex); + +return ret; +} +int btrfs_get_dev_zone_info (struct btrfs_device *device) {struct btrfs_zoned_device_info *zone_info =NULL ;
fs/btrfs/zoned.h +7 -0
@@ -25,6 +25,7 @@ struct btrfs_zoned_device_info {#ifdef CONFIG_BLK_DEV_ZONED int btrfs_get_dev_zone (struct btrfs_device *device,u64 pos,struct blk_zone *zone); +int btrfs_get_dev_zone_info_all_devices (struct btrfs_fs_info *fs_info);int btrfs_get_dev_zone_info (struct btrfs_device *device);void btrfs_destroy_dev_zone_info (struct btrfs_device *device);int btrfs_check_zoned_mode (struct btrfs_fs_info *fs_info);
@@ -42,6 +43,12 @@ static inline int btrfs_get_dev_zone(struct btrfs_device *device, u64 pos,return 0 ; } +static inline int btrfs_get_dev_zone_info_all_devices ( +struct btrfs_fs_info *fs_info) +{ +return 0 ; +} +static inline int btrfs_get_dev_zone_info (struct btrfs_device *device) {return 0 ;
Signature · 1 line
2.27.0
PATCH v12 4/41 btrfs: use regular SB location on emulated zoned mode
In reply to Naohiro AotaThe zoned btrfs puts a superblock at the beginning of SB logging zones if the zone is conventional. This difference causes a chicken-and-egg problem for emulated zoned mode. Since the device is a regular (non-zoned) device, we cannot know if the btrfs is regular or emulated zoned while we read the superblock. But, to load proper superblock, we need to see if it is emulated zoned or not.
We place the SBs at the same location as the regular btrfs on emulated zoned mode to solve the problem. It is possible because it's ensured that all the SB locations are at a conventional zone on emulated zoned mode.
--- fs/btrfs/zoned.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
fs/btrfs/zoned.c +7 -1
@@ -553,7 +553,13 @@ int btrfs_sb_log_location(struct btrfs_device *device, int mirror, int rw,struct btrfs_zoned_device_info *zinfo = device->zone_info;u32 zone_num; -if (!zinfo) { +/* +* With btrfs zoned mode on a non-zoned block device, use the same +* super block locations as regular btrfs. Doing so, the super +* block can always be retrieved and the zoned-mode of the volume +* detected from the super block information. +*/ +if (!bdev_is_zoned (device->bdev)) { *bytenr_ret =btrfs_sb_offset (mirror);return 0 ; }
Signature · 1 line
2.27.0
Re: [PATCH v12 04/41] btrfs: use regular SB location on emulated zoned mode
Quoted 7 lines · Naohiro Aota
The zoned btrfs puts a superblock at the beginning of SB logging zones if the zone is conventional. This difference causes a chicken-and-egg problem for emulated zoned mode. Since the device is a regular (non-zoned) device, we cannot know if the btrfs is regular or emulated zoned while we read the superblock. But, to load proper superblock, we need to see if it is emulated zoned or not.
Quoted 6 lines
We place the SBs at the same location as the regular btrfs on emulated zoned mode to solve the problem. It is possible because it's ensured that all the SB locations are at a conventional zone on emulated zoned mode.
Signed-off-by Naohiro Aota <[email protected]>
Ok so in emulated mode we simply won't be able to test the SB logging stuff. I think this is an OK trade-off,
Thanks,
Josef
PATCH v12 5/41 btrfs: release path before calling into btrfs_load_block_group_zone_info
In reply to Naohiro AotaFrom: Johannes Thumshirn <[email protected]>
Since we have no write pointer in conventional zones, we cannot determine the allocation offset from it. Instead, we set the allocation offset after the highest addressed extent. This is done by reading the extent tree in btrfs_load_block_group_zone_info().
However, this function is called from btrfs_read_block_groups(), so the read lock for the tree node can recursively taken.
To avoid this unsafe locking scenario, release the path before reading the extent tree to get the allocation offset.
--- fs/btrfs/block-group.c | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-)
fs/btrfs/block-group.c +18 -21
@@ -1806,24 +1806,8 @@ static int check_chunk_block_group_mappings(struct btrfs_fs_info *fs_info)return ret; } -static void read_block_group_item (struct btrfs_block_group *cache, -struct btrfs_path *path, -const struct btrfs_key *key) -{ -struct extent_buffer *leaf = path->nodes[0 ]; -struct btrfs_block_group_item bgi; -int slot = path->slots[0 ]; - - cache->length = key->offset; - -read_extent_buffer (leaf, &bgi,btrfs_item_ptr_offset (leaf, slot), -sizeof (bgi)); - cache->used =btrfs_stack_block_group_used (&bgi); - cache->flags =btrfs_stack_block_group_flags (&bgi); -} -static int read_one_block_group (struct btrfs_fs_info *info, -struct btrfs_path *path, +struct btrfs_block_group_item *bgi,const struct btrfs_key *key,int need_clear) {
@@ -1838,7 +1822,9 @@ static int read_one_block_group(struct btrfs_fs_info *info,if (!cache)return -ENOMEM ; -read_block_group_item (cache, path, key); + cache->length = key->offset; + cache->used =btrfs_stack_block_group_used (bgi); + cache->flags =btrfs_stack_block_group_flags (bgi);set_free_space_tree_thresholds (cache);
@@ -1997,19 +1983,30 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info) need_clear =1 ;while (1 ) { +struct btrfs_block_group_item bgi; +struct extent_buffer *leaf; +int slot; + ret =find_first_block_group (info, path, &key);if (ret >0 )break ;if (ret !=0 ) goto error; -btrfs_item_key_to_cpu (path->nodes[0 ], &key, path->slots[0 ]); - ret =read_one_block_group (info, path, &key, need_clear); + leaf = path->nodes[0 ]; + slot = path->slots[0 ]; +btrfs_release_path (path); + +read_extent_buffer (leaf, &bgi, +btrfs_item_ptr_offset (leaf, slot), +sizeof (bgi)); + +btrfs_item_key_to_cpu (leaf, &key, slot); + ret =read_one_block_group (info, &bgi, &key, need_clear);if (ret <0 ) goto error; key.objectid += key.offset; key.offset =0 ; -btrfs_release_path (path); }btrfs_release_path (path);
Signature · 1 line
2.27.0
Re: [PATCH v12 05/41] btrfs: release path before calling into btrfs_load_block_group_zone_info
Quoted 68 lines · Naohiro Aota
From: Johannes Thumshirn <[email protected]>
Since we have no write pointer in conventional zones, we cannot determine the allocation offset from it. Instead, we set the allocation offset after the highest addressed extent. This is done by reading the extent tree in
btrfs_load_block_group_zone_info().However, this function is called from
btrfs_read_block_groups(), so the read lock for the tree node can recursively taken.To avoid this unsafe locking scenario, release the path before reading the extent tree to get the allocation offset.
Signed-off-by Johannes Thumshirn <[email protected]>--- fs/btrfs/block-group.c | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-)fs/btrfs/block-group.c +8
-18@@ -1806,24 +1806,8 @@ static int check_chunk_block_group_mappings(struct btrfs_fs_info *fs_info)return ret; } -static void read_block_group_item (struct btrfs_block_group *cache, -struct btrfs_path *path, -const struct btrfs_key *key) -{ -struct extent_buffer *leaf = path->nodes[0 ]; -struct btrfs_block_group_item bgi; -int slot = path->slots[0 ]; - - cache->length = key->offset; - -read_extent_buffer (leaf, &bgi,btrfs_item_ptr_offset (leaf, slot), -sizeof (bgi)); - cache->used =btrfs_stack_block_group_used (&bgi); - cache->flags =btrfs_stack_block_group_flags (&bgi); -} -static int read_one_block_group (struct btrfs_fs_info *info, -struct btrfs_path *path, +struct btrfs_block_group_item *bgi,const struct btrfs_key *key,int need_clear) {@@ -1838,7 +1822,9 @@ static int read_one_block_group(struct btrfs_fs_info *info,if (!cache)return -ENOMEM ; -read_block_group_item (cache, path, key); + cache->length = key->offset; + cache->used =btrfs_stack_block_group_used (bgi); + cache->flags =btrfs_stack_block_group_flags (bgi);set_free_space_tree_thresholds (cache);@@ -1997,19 +1983,30 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info) need_clear =1 ;while (1 ) { +struct btrfs_block_group_item bgi; +struct extent_buffer *leaf; +int slot; + ret =find_first_block_group (info, path, &key);
fs/btrfs/block-group.c int btrfs_read_block_groups(struct btrfs_fs_info *info) · line 1998
Quoted 10 lines
fs/btrfs/block-group.c +3
-2if (ret >0 )break ;if (ret !=0 ) goto error; -btrfs_item_key_to_cpu (path->nodes[0 ], &key, path->slots[0 ]); - ret =read_one_block_group (info, path, &key, need_clear); + leaf = path->nodes[0 ]; + slot = path->slots[0 ]; +btrfs_release_path (path);
You're releasing the path and then reading from it, a potential UAF. Thanks,
Josef
Re: [PATCH v12 05/41] btrfs: release path before calling into btrfs_load_block_group_zone_info
Quoted 1 line · Josef Bacik
You're releasing the path and then reading from it, a potential UAF. Thanks,
*\@#%! I'm stupid, fixed for v13.
PATCH v12 6/41 btrfs: do not load fs_info->zoned from incompat flag
In reply to Naohiro AotaFrom: Johannes Thumshirn <[email protected]>
Don't set the zoned flag in fs_info when encountering the BTRFS_FEATURE_INCOMPAT_ZONED on mount. The zoned flag in fs_info is in a union together with the zone_size, so setting it too early will result in setting an incorrect zone_size as well.
Once the correct zone_size is read from the device, we can rely on the zoned flag in fs_info as well to determine if the filesystem is running in zoned mode.
--- fs/btrfs/disk-io.c | 2 -- fs/btrfs/zoned.c | 8 ++++++++ 2 files changed, 8 insertions(+), 2 deletions(-)
fs/btrfs/disk-io.c +0 -2
@@ -3136,8 +3136,6 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_deviceif (features &BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA )btrfs_info (fs_info,"has skinny extents" ); - fs_info->zoned = (features &BTRFS_FEATURE_INCOMPAT_ZONED ); -/* * flag our filesystem as having big metadata blocks if * they are bigger than the page size
fs/btrfs/zoned.c +8 -0
@@ -431,6 +431,14 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info) fs_info->zone_size = zone_size; fs_info->max_zone_append_size = max_zone_append_size; +/* +* Check mount options here, because we might change fs_info->zoned +* from fs_info->zone_size. +*/ + ret =btrfs_check_mountopts_zoned (fs_info); +if (ret) + goto out; +btrfs_info (fs_info,"zoned mode enabled with zone size %llu" , zone_size); out:return ret;
Signature · 1 line
2.27.0
PATCH v12 7/41 btrfs: disallow fitrim in ZONED mode
In reply to Naohiro AotaThe implementation of fitrim is depending on space cache, which is not used and disabled for zoned btrfs' extent allocator. So the current code does not work with zoned btrfs. In the future, we can implement fitrim for zoned btrfs by enabling space cache (but, only for fitrim) or scanning the extent tree at fitrim time. But, for now, disallow fitrim in ZONED mode.
--- fs/btrfs/ioctl.c | 8 ++++++++ 1 file changed, 8 insertions(+)
fs/btrfs/ioctl.c +8 -0
@@ -527,6 +527,14 @@ static noinline int btrfs_ioctl_fitrim(struct btrfs_fs_info *fs_info,if (!capable (CAP_SYS_ADMIN ))return -EPERM ; +/* +* btrfs_trim_block_group() is depending on space cache, which is +* not available in ZONED mode. So, disallow fitrim in ZONED mode +* for now. +*/ +if (btrfs_is_zoned (fs_info)) +return -EOPNOTSUPP ; +/* * If the fs is mounted with nologreplay, which requires it to be * mounted in RO mode as well, we can not allow discard on free space
Signature · 1 line
2.27.0
PATCH v12 8/41 btrfs: allow zoned mode on non-zoned block devices
In reply to Naohiro AotaFrom: Johannes Thumshirn <[email protected]>
Run zoned btrfs mode on non-zoned devices. This is done by "slicing up" the block-device into static sized chunks and fake a conventional zone on each of them. The emulated zone size is determined from the size of device extent.
This is mainly aimed at testing parts of the zoned mode, i.e. the zoned chunk allocator, on regular block devices.
--- fs/btrfs/zoned.c | 149 +++++++++++++++++++++++++++++++++++++++++++---- fs/btrfs/zoned.h | 14 +++-- 2 files changed, 147 insertions(+), 16 deletions(-)
fs/btrfs/zoned.c +138 -11
@@ -119,6 +119,37 @@ static inline u32 sb_zone_number(int shift, int mirror)return 0 ; } +/* +* Emulate blkdev_report_zones() for a non-zoned device. It slice up +* the block device into static sized chunks and fake a conventional zone +* on each of them. +*/ +static int emulate_report_zones (struct btrfs_device *device,u64 pos, +struct blk_zone *zones,unsigned int nr_zones) +{ +const sector_t zone_sectors = + device->fs_info->zone_size >>SECTOR_SHIFT ; +sector_t bdev_size = device->bdev->bd_part->nr_sects; +unsigned int i; + + pos >>=SECTOR_SHIFT ; +for (i =0 ; i < nr_zones; i++) { + zones[i].start = i * zone_sectors + pos; + zones[i].len = zone_sectors; + zones[i].capacity = zone_sectors; + zones[i].wp = zones[i].start + zone_sectors; + zones[i].type =BLK_ZONE_TYPE_CONVENTIONAL ; + zones[i].cond =BLK_ZONE_COND_NOT_WP ; + +if (zones[i].wp >= bdev_size) { + i++; +break ; + } + } + +return i; +} +static int btrfs_get_dev_zones (struct btrfs_device *device,u64 pos,struct blk_zone *zones,unsigned int *nr_zones) {
@@ -127,6 +158,12 @@ static int btrfs_get_dev_zones(struct btrfs_device *device, u64 pos,if (!*nr_zones)return 0 ; +if (!bdev_is_zoned (device->bdev)) { + ret =emulate_report_zones (device, pos, zones, *nr_zones); + *nr_zones = ret; +return 0 ; + } + ret =blkdev_report_zones (device->bdev, pos >>SECTOR_SHIFT , *nr_zones, copy_zone_info_cb, zones);if (ret <0 ) {
@@ -143,6 +180,50 @@ static int btrfs_get_dev_zones(struct btrfs_device *device, u64 pos,return 0 ; } +/* The emulated zone size is determined from the size of device extent. */ +static int calculate_emulated_zone_size (struct btrfs_fs_info *fs_info) +{ +struct btrfs_path *path; +struct btrfs_root *root = fs_info->dev_root; +struct btrfs_key key; +struct extent_buffer *leaf; +struct btrfs_dev_extent *dext; +int ret =0 ; + + key.objectid =1 ; + key.type =BTRFS_DEV_EXTENT_KEY ; + key.offset =0 ; + + path =btrfs_alloc_path (); +if (!path) +return -ENOMEM ; + + ret =btrfs_search_slot (NULL , root, &key, path,0 ,0 ); +if (ret <0 ) + goto out; + +if (path->slots[0 ] >=btrfs_header_nritems (path->nodes[0 ])) { + ret =btrfs_next_item (root, path); +if (ret <0 ) + goto out; +/* No dev extents at all? Not good */ +if (ret >0 ) { + ret = -EUCLEAN ; + goto out; + } + } + + leaf = path->nodes[0 ]; + dext = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_dev_extent); + fs_info->zone_size =btrfs_dev_extent_length (leaf, dext); + ret =0 ; + +out: +btrfs_free_path (path); + +return ret; +} +int btrfs_get_dev_zone_info_all_devices (struct btrfs_fs_info *fs_info) {struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
@@ -169,6 +250,7 @@ int btrfs_get_dev_zone_info_all_devices(struct btrfs_fs_info *fs_info)int btrfs_get_dev_zone_info (struct btrfs_device *device) { +struct btrfs_fs_info *fs_info = device->fs_info;struct btrfs_zoned_device_info *zone_info =NULL ;struct block_device *bdev = device->bdev;struct request_queue *queue =bdev_get_queue (bdev);
@@ -177,9 +259,14 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device)struct blk_zone *zones =NULL ;unsigned int i, nreported =0 , nr_zones;unsigned int zone_sectors; +char *model, *emulated;int ret; -if (!bdev_is_zoned (bdev)) +/* +* Cannot use btrfs_is_zoned here, since fs_info->zone_size might +* not be set yet. +*/ +if (!btrfs_fs_incompat (fs_info,ZONED ))return 0 ;if (device->zone_info)
@@ -189,8 +276,20 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device)if (!zone_info)return -ENOMEM ; +if (!bdev_is_zoned (bdev)) { +if (!fs_info->zone_size) { + ret =calculate_emulated_zone_size (fs_info); +if (ret) + goto out; + } + +ASSERT (fs_info->zone_size); + zone_sectors = fs_info->zone_size >>SECTOR_SHIFT ; + }else { + zone_sectors =bdev_zone_sectors (bdev); + } + nr_sectors = bdev->bd_part->nr_sects; - zone_sectors =bdev_zone_sectors (bdev);/* Check if it's power of 2 (see is_power_of_2) */ ASSERT (zone_sectors !=0 && (zone_sectors & (zone_sectors -1 )) ==0 ); zone_info->zone_size = zone_sectors <<SECTOR_SHIFT ;
@@ -296,12 +395,32 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device) device->zone_info = zone_info; -/* device->fs_info is not safe to use for printing messages */ -btrfs_info_in_rcu (NULL , -"host-%s zoned block device %s, %u zones of %llu bytes" , -bdev_zoned_model (bdev) ==BLK_ZONED_HM ?"managed" :"aware" , -rcu_str_deref (device->name), zone_info->nr_zones, - zone_info->zone_size); +switch (bdev_zoned_model (bdev)) { +case BLK_ZONED_HM : + model ="host-managed zoned" ; + emulated ="" ; +break ; +case BLK_ZONED_HA : + model ="host-aware zoned" ; + emulated ="" ; +break ; +case BLK_ZONED_NONE : + model ="regular" ; + emulated ="emulated " ; +break ; +default : +/* Just in case */ +btrfs_err_in_rcu (fs_info,"Unsupported zoned model %d on %s" , +bdev_zoned_model (bdev), +rcu_str_deref (device->name)); + ret = -EOPNOTSUPP ; + goto out; + } + +btrfs_info_in_rcu (fs_info, +"%s block device %s, %u %szones of %llu bytes" , + model,rcu_str_deref (device->name), zone_info->nr_zones, + emulated, zone_info->zone_size);return 0 ;
@@ -348,7 +467,7 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info)u64 nr_devices =0 ;u64 zone_size =0 ;u64 max_zone_append_size =0 ; -const bool incompat_zoned =btrfs_is_zoned (fs_info); +const bool incompat_zoned =btrfs_fs_incompat (fs_info,ZONED );int ret =0 ;/* Count zoned devices */
@@ -359,9 +478,17 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info)continue ; model =bdev_zoned_model (device->bdev); +/* +* A Host-Managed zoned device msut be used as a zoned +* device. A Host-Aware zoned device and a non-zoned devices +* can be treated as a zoned device, if ZONED flag is +* enabled in the superblock. +*/ if (model ==BLK_ZONED_HM || - (model ==BLK_ZONED_HA && incompat_zoned)) { -struct btrfs_zoned_device_info *zone_info; + (model ==BLK_ZONED_HA && incompat_zoned) || + (model ==BLK_ZONED_NONE && incompat_zoned)) { +struct btrfs_zoned_device_info *zone_info = + device->zone_info; zone_info = device->zone_info; zoned_devices++;
fs/btrfs/zoned.h +9 -5
@@ -143,12 +143,16 @@ static inline void btrfs_dev_clear_zone_empty(struct btrfs_device *device, u64 pstatic inline bool btrfs_check_device_zone_type (const struct btrfs_fs_info *fs_info,struct block_device *bdev) { -u64 zone_size; -if (btrfs_is_zoned (fs_info)) { - zone_size =bdev_zone_sectors (bdev) <<SECTOR_SHIFT ; -/* Do not allow non-zoned device */ -return bdev_is_zoned (bdev) && fs_info->zone_size == zone_size; +/* +* We can allow a regular device on a zoned btrfs, because +* we will emulate zoned device on the regular device. +*/ +if (!bdev_is_zoned (bdev)) +return true; + +return fs_info->zone_size == + (bdev_zone_sectors (bdev) <<SECTOR_SHIFT ); }/* Do not allow Host Manged zoned device */
Signature · 1 line
2.27.0
Re: [PATCH v12 08/41] btrfs: allow zoned mode on non-zoned block devices
Quoted 26 lines · Naohiro Aota
From: Johannes Thumshirn <[email protected]>
Run zoned btrfs mode on non-zoned devices. This is done by "slicing up" the block-device into static sized chunks and fake a conventional zone on each of them. The emulated zone size is determined from the size of device extent.
This is mainly aimed at testing parts of the zoned mode, i.e. the zoned chunk allocator, on regular block devices.
Signed-off-by Johannes Thumshirn <[email protected]>Signed-off-by Naohiro Aota <[email protected]>--- fs/btrfs/zoned.c | 149 +++++++++++++++++++++++++++++++++++++++++++---- fs/btrfs/zoned.h | 14 +++-- 2 files changed, 147 insertions(+), 16 deletions(-)fs/btrfs/zoned.c +1
-0@@ -119,6 +119,37 @@ static inline u32 sb_zone_number(int shift, int mirror)return 0 ; } +/*
fs/btrfs/zoned.c static inline u32 sb_zone_number(int shift, int mirror) · line 132
Quoted 10 lines
fs/btrfs/zoned.c +10
-0+* Emulate blkdev_report_zones() for a non-zoned device. It slice up +* the block device into static sized chunks and fake a conventional zone +* on each of them. +*/ +static int emulate_report_zones (struct btrfs_device *device,u64 pos, +struct blk_zone *zones,unsigned int nr_zones) +{ +const sector_t zone_sectors = + device->fs_info->zone_size >>SECTOR_SHIFT ; +sector_t bdev_size = device->bdev->bd_part->nr_sects;
This needs to be changed to bdev_nr_sectors(), it fails to compile on misc-next.
This patch also fails to apply to misc-next as well. Thanks,
Josef
Re: [PATCH v12 08/41] btrfs: allow zoned mode on non-zoned block devices
Quoted 39 lines · Josef Bacik
Quoted 25 lines · Naohiro Aota
From: Johannes Thumshirn <[email protected]>
Run zoned btrfs mode on non-zoned devices. This is done by "slicing up" the block-device into static sized chunks and fake a conventional zone on each of them. The emulated zone size is determined from the size of device extent.
This is mainly aimed at testing parts of the zoned mode, i.e. the zoned chunk allocator, on regular block devices.
Signed-off-by Johannes Thumshirn <[email protected]>Signed-off-by Naohiro Aota <[email protected]>--- fs/btrfs/zoned.c | 149 +++++++++++++++++++++++++++++++++++++++++++---- fs/btrfs/zoned.h | 14 +++-- 2 files changed, 147 insertions(+), 16 deletions(-)fs/btrfs/zoned.c +1
-0@@ -119,6 +119,37 @@ static inline u32 sb_zone_number(int shift, int mirror)return 0 ; } +/* fs/btrfs/zoned.c static inline u32 sb_zone_number(int shift, int mirror) · line 131
Quoted 10 lines
fs/btrfs/zoned.c +10
-0+* Emulate blkdev_report_zones() for a non-zoned device. It slice up +* the block device into static sized chunks and fake a conventional zone +* on each of them. +*/ +static int emulate_report_zones (struct btrfs_device *device,u64 pos, +struct blk_zone *zones,unsigned int nr_zones) +{ +const sector_t zone_sectors = + device->fs_info->zone_size >>SECTOR_SHIFT ; +sector_t bdev_size = device->bdev->bd_part->nr_sects;This needs to be changed to
bdev_nr_sectors(), it fails to compile on misc-next. This patch also fails to apply to misc-next as well. Thanks,
Quoted 1 line
Josef
Oh, I'll rebase on the latest misc-next and fix them all in v13. Thanks.
Re: [PATCH v12 08/41] btrfs: allow zoned mode on non-zoned block devices
Quoted 42 lines · Naohiro Aota
Quoted 41 lines · Josef Bacik
Quoted 31 lines · Naohiro Aota
From: Johannes Thumshirn <[email protected]>
Run zoned btrfs mode on non-zoned devices. This is done by "slicing up" the block-device into static sized chunks and fake a conventional zone on each of them. The emulated zone size is determined from the size of device extent.
This is mainly aimed at testing parts of the zoned mode, i.e. the zoned chunk allocator, on regular block devices.
Signed-off-by Johannes Thumshirn <[email protected]>Signed-off-by Naohiro Aota <[email protected]>---
fs/btrfs/zoned.c | 149 +++++++++++++++++++++++++++++++++++++++++++----fs/btrfs/zoned.h| 14 +++--2 files changed, 147 insertions(+), 16 deletions(-)fs/btrfs/zoned.c +3
-0@@ -119,6 +119,37 @@ static inline u32 sb_zone_number(int shift, int mirror) return 0; } +/* +* Emulate blkdev_report_zones() for a non-zoned device. It slice up +* the block device into static sized chunks and fake a conventional zone
+ * on each of them.
+ */fs/btrfs/zoned.c static inline u32 sb_zone_number(int shift, int mirror) · line 132
Quoted 6 lines
fs/btrfs/zoned.c +6
-0+static int emulate_report_zones (struct btrfs_device *device,u64 pos, + struct blk_zone *zones, unsigned int nr_zones) +{ + const sector_t zone_sectors = + device->fs_info->zone_size >> SECTOR_SHIFT; + sector_t bdev_size = device->bdev->bd_part->nr_sects;This needs to be changed to
bdev_nr_sectors(), it fails to compile on misc-next. This patch also fails to apply to misc-next as well. Thanks,
Quoted 3 lines
Quoted 1 line
Josef
Oh, I'll rebase on the latest misc-next and fix them all in v13. Thanks.
Patch 12 was conflicting in zone.c which was due to line number changes, and again I was stuck with the patch 19 due to conflicts. I will wait for v13.
Thanks, Anand
PATCH v12 8/41 btrfs: emulated zoned mode on non-zoned devices
In reply to Naohiro AotaFrom: Johannes Thumshirn <[email protected]>
Emulate zoned btrfs mode on non-zoned devices. This is done by "slicing up" the block-device into static sized chunks and fake a conventional zone on each of them. The emulated zone size is determined from the size of device extent.
This is mainly aimed at testing parts of the zoned mode, i.e. the zoned chunk allocator, on regular block devices.
--- fs/btrfs/zoned.c | 139 +++++++++++++++++++++++++++++++++++++++++++---- fs/btrfs/zoned.h | 14 +++-- 2 files changed, 137 insertions(+), 16 deletions(-)
fs/btrfs/zoned.c +128 -11
@@ -119,14 +119,48 @@ static inline u32 sb_zone_number(int shift, int mirror)return 0 ; } +static int emulate_report_zones (struct btrfs_device *device,u64 pos, +struct blk_zone *zones,unsigned int nr_zones) +{ +const sector_t zone_sectors = + device->fs_info->zone_size >>SECTOR_SHIFT ; +sector_t bdev_size = device->bdev->bd_part->nr_sects; +unsigned int i; + + pos >>=SECTOR_SHIFT ; +for (i =0 ; i < nr_zones; i++) { + zones[i].start = i * zone_sectors + pos; + zones[i].len = zone_sectors; + zones[i].capacity = zone_sectors; + zones[i].wp = zones[i].start + zone_sectors; + zones[i].type =BLK_ZONE_TYPE_CONVENTIONAL ; + zones[i].cond =BLK_ZONE_COND_NOT_WP ; + +if (zones[i].wp >= bdev_size) { + i++; +break ; + } + } + +return i; +} +static int btrfs_get_dev_zones (struct btrfs_device *device,u64 pos,struct blk_zone *zones,unsigned int *nr_zones) {int ret; +ASSERT (btrfs_is_zoned (device->fs_info)); +if (!*nr_zones)return 0 ; +if (!bdev_is_zoned (device->bdev)) { + ret =emulate_report_zones (device, pos, zones, *nr_zones); + *nr_zones = ret; +return 0 ; + } + ret =blkdev_report_zones (device->bdev, pos >>SECTOR_SHIFT , *nr_zones, copy_zone_info_cb, zones);if (ret <0 ) {
@@ -143,6 +177,49 @@ static int btrfs_get_dev_zones(struct btrfs_device *device, u64 pos,return 0 ; } +static int calculate_emulated_zone_size (struct btrfs_fs_info *fs_info) +{ +struct btrfs_path *path; +struct btrfs_root *root = fs_info->dev_root; +struct btrfs_key key; +struct extent_buffer *leaf; +struct btrfs_dev_extent *dext; +int ret =0 ; + + key.objectid =1 ; + key.type =BTRFS_DEV_EXTENT_KEY ; + key.offset =0 ; + + path =btrfs_alloc_path (); +if (!path) +return -ENOMEM ; + + ret =btrfs_search_slot (NULL , root, &key, path,0 ,0 ); +if (ret <0 ) + goto out; + +if (path->slots[0 ] >=btrfs_header_nritems (path->nodes[0 ])) { + ret =btrfs_next_item (root, path); +if (ret <0 ) + goto out; +/* No dev extents at all? Not good */ +if (ret >0 ) { + ret = -EUCLEAN ; + goto out; + } + } + + leaf = path->nodes[0 ]; + dext = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_dev_extent); + fs_info->zone_size =btrfs_dev_extent_length (leaf, dext); + ret =0 ; + +out: +btrfs_free_path (path); + +return ret; +} +int btrfs_get_dev_zone_info_all_devices (struct btrfs_fs_info *fs_info) {struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
@@ -169,6 +246,7 @@ int btrfs_get_dev_zone_info_all_devices(struct btrfs_fs_info *fs_info)int btrfs_get_dev_zone_info (struct btrfs_device *device) { +struct btrfs_fs_info *fs_info = device->fs_info;struct btrfs_zoned_device_info *zone_info =NULL ;struct block_device *bdev = device->bdev;struct request_queue *queue =bdev_get_queue (bdev);
@@ -177,9 +255,14 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device)struct blk_zone *zones =NULL ;unsigned int i, nreported =0 , nr_zones;unsigned int zone_sectors; +char *model, *emulated;int ret; -if (!bdev_is_zoned (bdev)) +/* +* Cannot use btrfs_is_zoned here, since fs_info->zone_size might +* not be set yet. +*/ +if (!btrfs_fs_incompat (fs_info,ZONED ))return 0 ;if (device->zone_info)
@@ -189,8 +272,20 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device)if (!zone_info)return -ENOMEM ; +if (!bdev_is_zoned (bdev)) { +if (!fs_info->zone_size) { + ret =calculate_emulated_zone_size (fs_info); +if (ret) + goto out; + } + +ASSERT (fs_info->zone_size); + zone_sectors = fs_info->zone_size >>SECTOR_SHIFT ; + }else { + zone_sectors =bdev_zone_sectors (bdev); + } + nr_sectors = bdev->bd_part->nr_sects; - zone_sectors =bdev_zone_sectors (bdev);/* Check if it's power of 2 (see is_power_of_2) */ ASSERT (zone_sectors !=0 && (zone_sectors & (zone_sectors -1 )) ==0 ); zone_info->zone_size = zone_sectors <<SECTOR_SHIFT ;
@@ -296,12 +391,32 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device) device->zone_info = zone_info; -/* device->fs_info is not safe to use for printing messages */ -btrfs_info_in_rcu (NULL , -"host-%s zoned block device %s, %u zones of %llu bytes" , -bdev_zoned_model (bdev) ==BLK_ZONED_HM ?"managed" :"aware" , -rcu_str_deref (device->name), zone_info->nr_zones, - zone_info->zone_size); +switch (bdev_zoned_model (bdev)) { +case BLK_ZONED_HM : + model ="host-managed zoned" ; + emulated ="" ; +break ; +case BLK_ZONED_HA : + model ="host-aware zoned" ; + emulated ="" ; +break ; +case BLK_ZONED_NONE : + model ="regular" ; + emulated ="emulated " ; +break ; +default : +/* Just in case */ +btrfs_err_in_rcu (fs_info,"Unsupported zoned model %d on %s" , +bdev_zoned_model (bdev), +rcu_str_deref (device->name)); + ret = -EOPNOTSUPP ; + goto out; + } + +btrfs_info_in_rcu (fs_info, +"%s block device %s, %u %szones of %llu bytes" , + model,rcu_str_deref (device->name), zone_info->nr_zones, + emulated, zone_info->zone_size);return 0 ;
@@ -348,7 +463,7 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info)u64 nr_devices =0 ;u64 zone_size =0 ;u64 max_zone_append_size =0 ; -const bool incompat_zoned =btrfs_is_zoned (fs_info); +const bool incompat_zoned =btrfs_fs_incompat (fs_info,ZONED );int ret =0 ;/* Count zoned devices */
@@ -360,8 +475,10 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info) model =bdev_zoned_model (device->bdev);if (model ==BLK_ZONED_HM || - (model ==BLK_ZONED_HA && incompat_zoned)) { -struct btrfs_zoned_device_info *zone_info; + (model ==BLK_ZONED_HA && incompat_zoned) || + (model ==BLK_ZONED_NONE && incompat_zoned)) { +struct btrfs_zoned_device_info *zone_info = + device->zone_info; zone_info = device->zone_info; zoned_devices++;
fs/btrfs/zoned.h +9 -5
@@ -143,12 +143,16 @@ static inline void btrfs_dev_clear_zone_empty(struct btrfs_device *device, u64 pstatic inline bool btrfs_check_device_zone_type (const struct btrfs_fs_info *fs_info,struct block_device *bdev) { -u64 zone_size; -if (btrfs_is_zoned (fs_info)) { - zone_size =bdev_zone_sectors (bdev) <<SECTOR_SHIFT ; -/* Do not allow non-zoned device */ -return bdev_is_zoned (bdev) && fs_info->zone_size == zone_size; +/* +* We can allow a regular device on a zoned btrfs, because +* we will emulate zoned device on the regular device. +*/ +if (!bdev_is_zoned (bdev)) +return true; + +return fs_info->zone_size == + (bdev_zone_sectors (bdev) <<SECTOR_SHIFT ); }/* Do not allow Host Manged zoned device */
Signature · 1 line
2.27.0
PATCH v12 9/41 btrfs: implement zoned chunk allocator
In reply to Naohiro AotaThis commit implements a zoned chunk/dev_extent allocator. The zoned allocator aligns the device extents to zone boundaries, so that a zone reset affects only the device extent and does not change the state of blocks in the neighbor device extents.
Also, it checks that a region allocation is not overlapping any of the super block zones, and ensures the region is empty.
--- fs/btrfs/volumes.c | 169 ++++++++++++++++++++++++++++++++++++++++----- fs/btrfs/volumes.h | 1 + fs/btrfs/zoned.c | 144 ++++++++++++++++++++++++++++++++++++++ fs/btrfs/zoned.h | 25 +++++++ 4 files changed, 323 insertions(+), 16 deletions(-)
fs/btrfs/volumes.c +153 -16
@@ -1415,11 +1415,62 @@ static u64 dev_extent_search_start(struct btrfs_device *device, u64 start)* make sure to start at an offset of at least 1MB. */ return max_t (u64, start,SZ_1M ); +case BTRFS_CHUNK_ALLOC_ZONED : +/* +* We don't care about the starting region like regular +* allocator, because we anyway use/reserve the first two +* zones for superblock logging. +*/ +return ALIGN (start, device->zone_info->zone_size);default :BUG (); } } +static bool dev_extent_hole_check_zoned (struct btrfs_device *device, +u64 *hole_start,u64 *hole_size, +u64 num_bytes) +{ +u64 zone_size = device->zone_info->zone_size; +u64 pos; +int ret; +int changed =0 ; + +ASSERT (IS_ALIGNED (*hole_start, zone_size)); + +while (*hole_size >0 ) { + pos =btrfs_find_allocatable_zones (device, *hole_start, + *hole_start + *hole_size, + num_bytes); +if (pos != *hole_start) { + *hole_size = *hole_start + *hole_size - pos; + *hole_start = pos; + changed =1 ; +if (*hole_size < num_bytes) +break ; + } + + ret =btrfs_ensure_empty_zones (device, pos, num_bytes); + +/* Range is ensured to be empty */ +if (!ret) +return changed; + +/* Given hole range was invalid (outside of device) */ +if (ret == -ERANGE ) { + *hole_start += *hole_size; + *hole_size =0 ; +return 1 ; + } + + *hole_start += zone_size; + *hole_size -= zone_size; + changed =1 ; + } + +return changed; +} +/** * dev_extent_hole_check - check if specified hole is suitable for allocation * @device: the device which we have the hole
@@ -1436,24 +1487,39 @@ static bool dev_extent_hole_check(struct btrfs_device *device, u64 *hole_start,bool changed = false;u64 hole_end = *hole_start + *hole_size; -/* -* Check before we set max_hole_start, otherwise we could end up -* sending back this offset anyway. -*/ -if (contains_pending_extent (device, hole_start, *hole_size)) { -if (hole_end >= *hole_start) - *hole_size = hole_end - *hole_start; -else - *hole_size =0 ; - changed = true; - } +for (;;) { +/* +* Check before we set max_hole_start, otherwise we could end up +* sending back this offset anyway. +*/ +if (contains_pending_extent (device, hole_start, *hole_size)) { +if (hole_end >= *hole_start) + *hole_size = hole_end - *hole_start; +else + *hole_size =0 ; + changed = true; + } + +switch (device->fs_devices->chunk_alloc_policy) { +case BTRFS_CHUNK_ALLOC_REGULAR : +/* No extra check */ +break ; +case BTRFS_CHUNK_ALLOC_ZONED : +if (dev_extent_hole_check_zoned (device, hole_start, + hole_size, num_bytes)) { + changed = true; +/* +* The changed hole can contain pending +* extent. Loop again to check that. +*/ +continue ; + } +break ; +default : +BUG (); + } -switch (device->fs_devices->chunk_alloc_policy) { -case BTRFS_CHUNK_ALLOC_REGULAR : -/* No extra check */ break ; -default : -BUG (); }return changed;
@@ -1506,6 +1572,9 @@ static int find_free_dev_extent_start(struct btrfs_device *device, search_start =dev_extent_search_start (device, search_start); +WARN_ON (device->zone_info && + !IS_ALIGNED (num_bytes, device->zone_info->zone_size)); + path =btrfs_alloc_path ();if (!path)return -ENOMEM ;
@@ -4899,6 +4968,37 @@ static void init_alloc_chunk_ctl_policy_regular( ctl->dev_extent_min =BTRFS_STRIPE_LEN * ctl->dev_stripes; } +static void init_alloc_chunk_ctl_policy_zoned ( +struct btrfs_fs_devices *fs_devices, +struct alloc_chunk_ctl *ctl) +{ +u64 zone_size = fs_devices->fs_info->zone_size; +u64 limit; +int min_num_stripes = ctl->devs_min * ctl->dev_stripes; +int min_data_stripes = (min_num_stripes - ctl->nparity) / ctl->ncopies; +u64 min_chunk_size = min_data_stripes * zone_size; +u64 type = ctl->type; + + ctl->max_stripe_size = zone_size; +if (type &BTRFS_BLOCK_GROUP_DATA ) { + ctl->max_chunk_size =round_down (BTRFS_MAX_DATA_CHUNK_SIZE , + zone_size); + }else if (type &BTRFS_BLOCK_GROUP_METADATA ) { + ctl->max_chunk_size = ctl->max_stripe_size; + }else if (type &BTRFS_BLOCK_GROUP_SYSTEM ) { + ctl->max_chunk_size =2 * ctl->max_stripe_size; + ctl->devs_max =min_t (int, ctl->devs_max, +BTRFS_MAX_DEVS_SYS_CHUNK ); + } + +/* We don't want a chunk larger than 10% of writable space */ + limit =max (round_down (div_factor (fs_devices->total_rw_bytes,1 ), + zone_size), + min_chunk_size); + ctl->max_chunk_size =min (limit, ctl->max_chunk_size); + ctl->dev_extent_min = zone_size * ctl->dev_stripes; +} +static void init_alloc_chunk_ctl (struct btrfs_fs_devices *fs_devices,struct alloc_chunk_ctl *ctl) {
@@ -4919,6 +5019,9 @@ static void init_alloc_chunk_ctl(struct btrfs_fs_devices *fs_devices,case BTRFS_CHUNK_ALLOC_REGULAR :init_alloc_chunk_ctl_policy_regular (fs_devices, ctl);break ; +case BTRFS_CHUNK_ALLOC_ZONED : +init_alloc_chunk_ctl_policy_zoned (fs_devices, ctl); +break ;default :BUG (); }
@@ -5045,6 +5148,38 @@ static int decide_stripe_size_regular(struct alloc_chunk_ctl *ctl,return 0 ; } +static int decide_stripe_size_zoned (struct alloc_chunk_ctl *ctl, +struct btrfs_device_info *devices_info) +{ +u64 zone_size = devices_info[0 ].dev->zone_info->zone_size; +/* Number of stripes that count for block group size */ +int data_stripes; + +/* +* It should hold because: +* dev_extent_min == dev_extent_want == zone_size * dev_stripes +*/ +ASSERT (devices_info[ctl->ndevs -1 ].max_avail == ctl->dev_extent_min); + + ctl->stripe_size = zone_size; + ctl->num_stripes = ctl->ndevs * ctl->dev_stripes; + data_stripes = (ctl->num_stripes - ctl->nparity) / ctl->ncopies; + +/* stripe_size is fixed in ZONED. Reduce ndevs instead. */ +if (ctl->stripe_size * data_stripes > ctl->max_chunk_size) { + ctl->ndevs =div_u64 (div_u64 (ctl->max_chunk_size * ctl->ncopies, + ctl->stripe_size) + ctl->nparity, + ctl->dev_stripes); + ctl->num_stripes = ctl->ndevs * ctl->dev_stripes; + data_stripes = (ctl->num_stripes - ctl->nparity) / ctl->ncopies; +ASSERT (ctl->stripe_size * data_stripes <= ctl->max_chunk_size); + } + + ctl->chunk_size = ctl->stripe_size * data_stripes; + +return 0 ; +} +static int decide_stripe_size (struct btrfs_fs_devices *fs_devices,struct alloc_chunk_ctl *ctl,struct btrfs_device_info *devices_info)
@@ -5072,6 +5207,8 @@ static int decide_stripe_size(struct btrfs_fs_devices *fs_devices,switch (fs_devices->chunk_alloc_policy) {case BTRFS_CHUNK_ALLOC_REGULAR :return decide_stripe_size_regular (ctl, devices_info); +case BTRFS_CHUNK_ALLOC_ZONED : +return decide_stripe_size_zoned (ctl, devices_info);default :BUG (); }
fs/btrfs/volumes.h +1 -0
@@ -213,6 +213,7 @@ BTRFS_DEVICE_GETSET_FUNCS(bytes_used);enum btrfs_chunk_allocation_policy {BTRFS_CHUNK_ALLOC_REGULAR , +BTRFS_CHUNK_ALLOC_ZONED , };/*
fs/btrfs/zoned.c +144 -0
164 lines not on this page · raw message
fs/btrfs/zoned.h +25 -0
@@ -36,6 +36,11 @@ int btrfs_sb_log_location(struct btrfs_device *device, int mirror, int rw, u64 *bytenr_ret);void btrfs_advance_sb_log (struct btrfs_device *device,int mirror);int btrfs_reset_sb_log_zones (struct block_device *bdev,int mirror); +u64 btrfs_find_allocatable_zones (struct btrfs_device *device,u64 hole_start, +u64 hole_end,u64 num_bytes); +int btrfs_reset_device_zone (struct btrfs_device *device,u64 physical, +u64 length,u64 *bytes); +int btrfs_ensure_empty_zones (struct btrfs_device *device,u64 start,u64 size);#else /* CONFIG_BLK_DEV_ZONED */ static inline int btrfs_get_dev_zone (struct btrfs_device *device,u64 pos,struct blk_zone *zone)
@@ -92,6 +97,26 @@ static inline int btrfs_reset_sb_log_zones(struct block_device *bdev, int mirror return 0; } +static inline u64 btrfs_find_allocatable_zones (struct btrfs_device *device, +u64 hole_start,u64 hole_end, +u64 num_bytes) +{ +return hole_start; +} + +static inline int btrfs_reset_device_zone (struct btrfs_device *device, +u64 physical,u64 length,u64 *bytes) +{ + *bytes =0 ; +return 0 ; +} + +static inline int btrfs_ensure_empty_zones (struct btrfs_device *device, +u64 start,u64 size) +{ +return 0 ; +} +#endif static inline bool btrfs_dev_is_sequential (struct btrfs_device *device,u64 pos)
Signature · 1 line
2.27.0
PATCH v12 10/41 btrfs: verify device extent is aligned to zone
In reply to Naohiro AotaAdd a check in verify_one_dev_extent() to check if a device extent on a zoned block device is aligned to the respective zone boundary.
--- fs/btrfs/volumes.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
fs/btrfs/volumes.c +14 -0
@@ -7776,6 +7776,20 @@ static int verify_one_dev_extent(struct btrfs_fs_info *fs_info, ret = -EUCLEAN ; goto out; } + +if (dev->zone_info) { +u64 zone_size = dev->zone_info->zone_size; + +if (!IS_ALIGNED (physical_offset, zone_size) || + !IS_ALIGNED (physical_len, zone_size)) { +btrfs_err (fs_info, +"zoned: dev extent devid %llu physical offset %llu len %llu is not aligned to device zone" , + devid, physical_offset, physical_len); + ret = -EUCLEAN ; + goto out; + } + } + out:free_extent_map (em);return ret;
Signature · 1 line
2.27.0
PATCH v12 11/41 btrfs: load zone's allocation offset
In reply to Naohiro AotaZoned btrfs must allocate blocks at the zones' write pointer. The device's write pointer position can be mapped to a logical address within a block group. This commit adds "alloc_offset" to track the logical address.
This logical address is populated in btrfs_load_block_group_zone_info() from write pointers of corresponding zones.
For now, zoned btrfs only support the SINGLE profile. Supporting non-SINGLE profile with zone append writing is not trivial. For example, in the DUP profile, we send a zone append writing IO to two zones on a device. The device reply with written LBAs for the IOs. If the offsets of the returned addresses from the beginning of the zone are different, then it results in different logical addresses.
We need fine-grained logical to physical mapping to support such separated physical address issue. Since it should require additional metadata type, disable non-SINGLE profiles for now.
This commit supports the case all the zones in a block group are sequential. The next patch will handle the case having a conventional zone.
--- fs/btrfs/block-group.c | 15 +++++ fs/btrfs/block-group.h | 6 ++ fs/btrfs/zoned.c | 150 +++++++++++++++++++++++++++++++++++++++++ fs/btrfs/zoned.h | 7 ++ 4 files changed, 178 insertions(+)
fs/btrfs/block-group.c +15 -0
@@ -15,6 +15,7 @@#include "delalloc-space.h" #include "discard.h" #include "raid56.h" +#include "zoned.h" /* * Return target flags in extended format or 0 if restripe for this chunk_type
@@ -1851,6 +1852,13 @@ static int read_one_block_group(struct btrfs_fs_info *info, goto error; } + ret =btrfs_load_block_group_zone_info (cache); +if (ret) { +btrfs_err (info,"zoned: failed to load zone info of bg %llu" , + cache->start); + goto error; + } +/* * We need to exclude the super stripes now so that the space info has * super bytes accounted for, otherwise we'll think we have more space
@@ -2138,6 +2146,13 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans, u64 bytes_used, cache->cached =BTRFS_CACHE_FINISHED ;if (btrfs_fs_compat_ro (fs_info,FREE_SPACE_TREE )) cache->needs_free_space =1 ; + + ret =btrfs_load_block_group_zone_info (cache); +if (ret) { +btrfs_put_block_group (cache); +return ret; + } + ret =exclude_super_stripes (cache);if (ret) {/* We may have excluded something, so call this just in case */
fs/btrfs/block-group.h +6 -0
@@ -183,6 +183,12 @@ struct btrfs_block_group {/* Record locked full stripes for RAID5/6 block group */ struct btrfs_full_stripe_locks_tree full_stripe_locks_root; + +/* +* Allocation offset for the block group to implement sequential +* allocation. This is used only with ZONED mode enabled. +*/ +u64 alloc_offset; };static inline u64 btrfs_block_group_end (struct btrfs_block_group *block_group)
fs/btrfs/zoned.c +150 -0
167 lines not on this page · raw message
fs/btrfs/zoned.h +7 -0
@@ -41,6 +41,7 @@ u64 btrfs_find_allocatable_zones(struct btrfs_device *device, u64 hole_start,int btrfs_reset_device_zone (struct btrfs_device *device,u64 physical,u64 length,u64 *bytes);int btrfs_ensure_empty_zones (struct btrfs_device *device,u64 start,u64 size); +int btrfs_load_block_group_zone_info (struct btrfs_block_group *cache);#else /* CONFIG_BLK_DEV_ZONED */ static inline int btrfs_get_dev_zone (struct btrfs_device *device,u64 pos,struct blk_zone *zone)
@@ -117,6 +118,12 @@ static inline int btrfs_ensure_empty_zones(struct btrfs_device *device, return 0; } +static inline int btrfs_load_block_group_zone_info ( +struct btrfs_block_group *cache) +{ +return 0 ; +} +#endif static inline bool btrfs_dev_is_sequential (struct btrfs_device *device,u64 pos)
Signature · 1 line
2.27.0
PATCH v12 12/41 btrfs: calculate allocation offset for conventional zones
In reply to Naohiro AotaConventional zones do not have a write pointer, so we cannot use it to determine the allocation offset if a block group contains a conventional zone.
But instead, we can consider the end of the last allocated extent in the block group as an allocation offset.
For new block group, we cannot calculate the allocation offset by consulting the extent tree, because it can cause deadlock by taking extent buffer lock after chunk mutex (which is already taken in btrfs_make_block_group()). Since it is a new block group, we can simply set the allocation offset to 0, anyway.
--- fs/btrfs/block-group.c | 4 +- fs/btrfs/zoned.c | 99 +++++++++++++++++++++++++++++++++++++++--- fs/btrfs/zoned.h | 4 +- 3 files changed, 98 insertions(+), 9 deletions(-)
fs/btrfs/block-group.c +2 -2
@@ -1852,7 +1852,7 @@ static int read_one_block_group(struct btrfs_fs_info *info, goto error; } - ret =btrfs_load_block_group_zone_info (cache); + ret =btrfs_load_block_group_zone_info (cache, false);if (ret) {btrfs_err (info,"zoned: failed to load zone info of bg %llu" , cache->start);
@@ -2147,7 +2147,7 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans, u64 bytes_used,if (btrfs_fs_compat_ro (fs_info,FREE_SPACE_TREE )) cache->needs_free_space =1 ; - ret =btrfs_load_block_group_zone_info (cache); + ret =btrfs_load_block_group_zone_info (cache, true);if (ret) {btrfs_put_block_group (cache);return ret;
fs/btrfs/zoned.c +94 -5
124 lines not on this page · raw message
fs/btrfs/zoned.h +2 -2
@@ -41,7 +41,7 @@ u64 btrfs_find_allocatable_zones(struct btrfs_device *device, u64 hole_start,int btrfs_reset_device_zone (struct btrfs_device *device,u64 physical,u64 length,u64 *bytes);int btrfs_ensure_empty_zones (struct btrfs_device *device,u64 start,u64 size); -int btrfs_load_block_group_zone_info (struct btrfs_block_group *cache); +int btrfs_load_block_group_zone_info (struct btrfs_block_group *cache,bool new);#else /* CONFIG_BLK_DEV_ZONED */ static inline int btrfs_get_dev_zone (struct btrfs_device *device,u64 pos,struct blk_zone *zone)
@@ -119,7 +119,7 @@ static inline int btrfs_ensure_empty_zones(struct btrfs_device *device, }static inline int btrfs_load_block_group_zone_info ( -struct btrfs_block_group *cache) +struct btrfs_block_group *cache,bool new) {return 0 ; }
Signature · 1 line
2.27.0
PATCH v12 13/41 btrfs: track unusable bytes for zones
In reply to Naohiro AotaIn zoned btrfs a region that was once written then freed is not usable until we reset the underlying zone. So we need to distinguish such unusable space from usable free space.
Therefore we need to introduce the "zone_unusable" field to the block group structure, and "bytes_zone_unusable" to the space_info structure to track the unusable space.
Pinned bytes are always reclaimed to the unusable space. But, when an allocated region is returned before using e.g., the block group becomes read-only between allocation time and reservation time, we can safely return the region to the block group. For the situation, this commit introduces "btrfs_add_free_space_unused". This behaves the same as btrfs_add_free_space() on regular btrfs. On zoned btrfs, it rewinds the allocation offset.
--- fs/btrfs/block-group.c | 23 ++++++++++----- fs/btrfs/block-group.h | 1 + fs/btrfs/extent-tree.c | 10 ++++++- fs/btrfs/free-space-cache.c | 57 +++++++++++++++++++++++++++++++++++++ fs/btrfs/free-space-cache.h | 2 ++ fs/btrfs/space-info.c | 13 +++++---- fs/btrfs/space-info.h | 4 ++- fs/btrfs/sysfs.c | 2 ++ fs/btrfs/zoned.c | 24 ++++++++++++++++ fs/btrfs/zoned.h | 3 ++ 10 files changed, 125 insertions(+), 14 deletions(-)
fs/btrfs/block-group.c +16 -7
@@ -1010,12 +1010,17 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,WARN_ON (block_group->space_info->total_bytes < block_group->length);WARN_ON (block_group->space_info->bytes_readonly - < block_group->length); + < block_group->length - block_group->zone_unusable); +WARN_ON (block_group->space_info->bytes_zone_unusable + < block_group->zone_unusable);WARN_ON (block_group->space_info->disk_total < block_group->length * factor); } block_group->space_info->total_bytes -= block_group->length; - block_group->space_info->bytes_readonly -= block_group->length; + block_group->space_info->bytes_readonly -= + (block_group->length - block_group->zone_unusable); + block_group->space_info->bytes_zone_unusable -= + block_group->zone_unusable; block_group->space_info->disk_total -= block_group->length * factor;spin_unlock (&block_group->space_info->lock);
@@ -1159,7 +1164,7 @@ static int inc_block_group_ro(struct btrfs_block_group *cache, int force) } num_bytes = cache->length - cache->reserved - cache->pinned - - cache->bytes_super - cache->used; + cache->bytes_super - cache->zone_unusable - cache->used;/* * Data never overcommits, even in mixed mode, so do just the straight
@@ -1889,6 +1894,8 @@ static int read_one_block_group(struct btrfs_fs_info *info,btrfs_free_excluded_extents (cache); } +btrfs_calc_zone_unusable (cache); + ret =btrfs_add_block_group_cache (info, cache);if (ret) {btrfs_remove_free_space_cache (cache);
@@ -1896,7 +1903,8 @@ static int read_one_block_group(struct btrfs_fs_info *info, }trace_btrfs_add_block_group (info, cache,0 );btrfs_update_space_info (info, cache->flags, cache->length, - cache->used, cache->bytes_super, &space_info); + cache->used, cache->bytes_super, + cache->zone_unusable, &space_info); cache->space_info = space_info;
@@ -1952,7 +1960,7 @@ static int fill_dummy_bgs(struct btrfs_fs_info *fs_info)break ; }btrfs_update_space_info (fs_info, bg->flags, em->len, em->len, -0 , &space_info); +0 ,0 , &space_info); bg->space_info = space_info;link_block_group (bg);
@@ -2194,7 +2202,7 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans, u64 bytes_used,*/ trace_btrfs_add_block_group (fs_info, cache,1 );btrfs_update_space_info (fs_info, cache->flags, size, bytes_used, - cache->bytes_super, &cache->space_info); + cache->bytes_super,0 , &cache->space_info);btrfs_update_global_block_rsv (fs_info);link_block_group (cache);
@@ -2302,7 +2310,8 @@ void btrfs_dec_block_group_ro(struct btrfs_block_group *cache)spin_lock (&cache->lock);if (!--cache->ro) { num_bytes = cache->length - cache->reserved - - cache->pinned - cache->bytes_super - cache->used; + cache->pinned - cache->bytes_super - + cache->zone_unusable - cache->used; sinfo->bytes_readonly -= num_bytes;list_del_init (&cache->ro_list); }
fs/btrfs/block-group.h +1 -0
@@ -189,6 +189,7 @@ struct btrfs_block_group {* allocation. This is used only with ZONED mode enabled. */ u64 alloc_offset; +u64 zone_unusable; };static inline u64 btrfs_block_group_end (struct btrfs_block_group *block_group)
fs/btrfs/extent-tree.c +9 -1
@@ -34,6 +34,7 @@#include "block-group.h" #include "discard.h" #include "rcu-string.h" +#include "zoned.h" #undef SCRAMBLE_DELAYED_REFS
@@ -2725,6 +2726,9 @@ fetch_cluster_info(struct btrfs_fs_info *fs_info, {struct btrfs_free_cluster *ret =NULL ; +if (btrfs_is_zoned (fs_info)) +return NULL ; + *empty_cluster =0 ;if (btrfs_mixed_space_info (space_info))return ret;
@@ -2808,7 +2812,11 @@ static int unpin_extent_range(struct btrfs_fs_info *fs_info, space_info->max_extent_size =0 ;percpu_counter_add_batch (&space_info->total_bytes_pinned, -len,BTRFS_TOTAL_BYTES_PINNED_BATCH ); -if (cache->ro) { +if (btrfs_is_zoned (fs_info)) { +/* Need reset before reusing in a zoned block group */ + space_info->bytes_zone_unusable += len; + readonly = true; + }else if (cache->ro) { space_info->bytes_readonly += len; readonly = true; }
fs/btrfs/free-space-cache.c +57 -0
92 lines not on this page · raw message
fs/btrfs/free-space-cache.h +2 -0
@@ -107,6 +107,8 @@ int __btrfs_add_free_space(struct btrfs_fs_info *fs_info, enum btrfs_trim_state trim_state);int btrfs_add_free_space (struct btrfs_block_group *block_group,u64 bytenr,u64 size); +int btrfs_add_free_space_unused (struct btrfs_block_group *block_group, +u64 bytenr,u64 size);int btrfs_add_free_space_async_trimmed (struct btrfs_block_group *block_group,u64 bytenr,u64 size); int btrfs_remove_free_space(struct btrfs_block_group *block_group,
fs/btrfs/space-info.c +8 -5
@@ -163,6 +163,7 @@ u64 __pure btrfs_space_info_used(struct btrfs_space_info *s_info,ASSERT (s_info);return s_info->bytes_used + s_info->bytes_reserved + s_info->bytes_pinned + s_info->bytes_readonly + + s_info->bytes_zone_unusable + (may_use_included ? s_info->bytes_may_use :0 ); }
@@ -257,7 +258,7 @@ int btrfs_init_space_info(struct btrfs_fs_info *fs_info)void btrfs_update_space_info (struct btrfs_fs_info *info,u64 flags,u64 total_bytes,u64 bytes_used, -u64 bytes_readonly, +u64 bytes_readonly,u64 bytes_zone_unusable,struct btrfs_space_info **space_info) {struct btrfs_space_info *found;
@@ -273,6 +274,7 @@ void btrfs_update_space_info(struct btrfs_fs_info *info, u64 flags, found->bytes_used += bytes_used; found->disk_used += bytes_used * factor; found->bytes_readonly += bytes_readonly; + found->bytes_zone_unusable += bytes_zone_unusable;if (total_bytes >0 ) found->full =0 ;btrfs_try_granting_tickets (info, found);
@@ -422,10 +424,10 @@ static void __btrfs_dump_space_info(struct btrfs_fs_info *fs_info, info->total_bytes -btrfs_space_info_used (info, true), info->full ? "" : "not ");btrfs_info (fs_info, -"space_info total=%llu, used=%llu, pinned=%llu, reserved=%llu, may_use=%llu, readonly=%llu" , +"space_info total=%llu, used=%llu, pinned=%llu, reserved=%llu, may_use=%llu, readonly=%llu zone_unusable=%llu" , info->total_bytes, info->bytes_used, info->bytes_pinned, info->bytes_reserved, info->bytes_may_use, - info->bytes_readonly); + info->bytes_readonly, info->bytes_zone_unusable);DUMP_BLOCK_RSV (fs_info, global_block_rsv);DUMP_BLOCK_RSV (fs_info, trans_block_rsv);
@@ -454,9 +456,10 @@ void btrfs_dump_space_info(struct btrfs_fs_info *fs_info,list_for_each_entry (cache, &info->block_groups[index], list) {spin_lock (&cache->lock);btrfs_info (fs_info, -"block group %llu has %llu bytes, %llu used %llu pinned %llu reserved %s" , +"block group %llu has %llu bytes, %llu used %llu pinned %llu reserved %llu zone_unusable %s" , cache->start, cache->length, cache->used, cache->pinned, - cache->reserved, cache->ro ?"[readonly]" :"" ); + cache->reserved, cache->zone_unusable, + cache->ro ?"[readonly]" :"" );spin_unlock (&cache->lock);btrfs_dump_free_space (cache, bytes); }
fs/btrfs/space-info.h +3 -1
@@ -17,6 +17,8 @@ struct btrfs_space_info {u64 bytes_may_use;/* number of bytes that may be used for delalloc/allocations */ u64 bytes_readonly;/* total bytes that are read only */ +u64 bytes_zone_unusable;/* total bytes that are unusable until +resetting the device zone */ u64 max_extent_size;/* This will hold the maximum extent size of the space info if we had an ENOSPC in the
@@ -119,7 +121,7 @@ DECLARE_SPACE_INFO_UPDATE(bytes_pinned, "pinned");int btrfs_init_space_info (struct btrfs_fs_info *fs_info);void btrfs_update_space_info (struct btrfs_fs_info *info,u64 flags,u64 total_bytes,u64 bytes_used, -u64 bytes_readonly, +u64 bytes_readonly,u64 bytes_zone_unusable,struct btrfs_space_info **space_info);struct btrfs_space_info *btrfs_find_space_info (struct btrfs_fs_info *info,u64 flags);
fs/btrfs/sysfs.c +2 -0
@@ -666,6 +666,7 @@ SPACE_INFO_ATTR(bytes_pinned);SPACE_INFO_ATTR (bytes_reserved);SPACE_INFO_ATTR (bytes_may_use);SPACE_INFO_ATTR (bytes_readonly); +SPACE_INFO_ATTR (bytes_zone_unusable);SPACE_INFO_ATTR (disk_used);SPACE_INFO_ATTR (disk_total); BTRFS_ATTR(space_info, total_bytes_pinned,
@@ -679,6 +680,7 @@ static struct attribute *space_info_attrs[] = {BTRFS_ATTR_PTR (space_info, bytes_reserved),BTRFS_ATTR_PTR (space_info, bytes_may_use),BTRFS_ATTR_PTR (space_info, bytes_readonly), +BTRFS_ATTR_PTR (space_info, bytes_zone_unusable),BTRFS_ATTR_PTR (space_info, disk_used),BTRFS_ATTR_PTR (space_info, disk_total), BTRFS_ATTR_PTR(space_info, total_bytes_pinned),
fs/btrfs/zoned.c +24 -0
@@ -1162,3 +1162,27 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new)return ret; } + +void btrfs_calc_zone_unusable (struct btrfs_block_group *cache) +{ +u64 unusable, free; + +if (!btrfs_is_zoned (cache->fs_info)) +return ; + +WARN_ON (cache->bytes_super !=0 ); + unusable = cache->alloc_offset - cache->used; + free = cache->length - cache->alloc_offset; + +/* We only need ->free_space in ALLOC_SEQ BGs */ + cache->last_byte_to_unpin = (u64)-1 ; + cache->cached =BTRFS_CACHE_FINISHED ; + cache->free_space_ctl->free_space = free; + cache->zone_unusable = unusable; + +/* +* Should not have any excluded extents. Just +* in case, though. +*/ +btrfs_free_excluded_extents (cache); +}
fs/btrfs/zoned.h +3 -0
@@ -42,6 +42,7 @@ int btrfs_reset_device_zone(struct btrfs_device *device, u64 physical, u64 length, u64 *bytes);int btrfs_ensure_empty_zones (struct btrfs_device *device,u64 start,u64 size);int btrfs_load_block_group_zone_info (struct btrfs_block_group *cache,bool new); +void btrfs_calc_zone_unusable (struct btrfs_block_group *cache);#else /* CONFIG_BLK_DEV_ZONED */ static inline int btrfs_get_dev_zone (struct btrfs_device *device,u64 pos,struct blk_zone *zone)
@@ -124,6 +125,8 @@ static inline int btrfs_load_block_group_zone_info( return 0; } +static inline void btrfs_calc_zone_unusable (struct btrfs_block_group *cache) { } +#endif static inline bool btrfs_dev_is_sequential (struct btrfs_device *device,u64 pos)
Signature · 1 line
2.27.0
PATCH v12 14/41 btrfs: do sequential extent allocation in ZONED mode
In reply to Naohiro AotaThis commit implements a sequential extent allocator for the ZONED mode. This allocator just needs to check if there is enough space in the block group. Therefor the allocator never manages bitmaps or clusters. Also add ASSERTs to the corresponding functions.
Actually, with zone append writing, it is unnecessary to track the allocation offset. It only needs to check space availability. But, by tracking the offset and returning the offset as an allocated region, we can skip modification of ordered extents and checksum information when there is no IO reordering.
--- fs/btrfs/block-group.c | 4 ++ fs/btrfs/extent-tree.c | 85 ++++++++++++++++++++++++++++++++++--- fs/btrfs/free-space-cache.c | 6 +++ 3 files changed, 89 insertions(+), 6 deletions(-)
fs/btrfs/block-group.c +4 -0
@@ -726,6 +726,10 @@ int btrfs_cache_block_group(struct btrfs_block_group *cache, int load_cache_onlystruct btrfs_caching_control *caching_ctl =NULL ;int ret =0 ; +/* Allocator for ZONED btrfs does not use the cache at all */ +if (btrfs_is_zoned (fs_info)) +return 0 ; + caching_ctl =kzalloc (sizeof (*caching_ctl),GFP_NOFS );if (!caching_ctl)return -ENOMEM ;
fs/btrfs/extent-tree.c +79 -6
147 lines not on this page · raw message
fs/btrfs/free-space-cache.c +6 -0
@@ -2906,6 +2906,8 @@ u64 btrfs_find_space_for_alloc(struct btrfs_block_group *block_group,u64 align_gap_len =0 ;enum btrfs_trim_state align_gap_trim_state =BTRFS_TRIM_STATE_UNTRIMMED ; +ASSERT (!btrfs_is_zoned (block_group->fs_info)); +spin_lock (&ctl->tree_lock); entry =find_free_space (ctl, &offset, &bytes_search, block_group->full_stripe_len, max_extent_size);
@@ -3037,6 +3039,8 @@ u64 btrfs_alloc_from_cluster(struct btrfs_block_group *block_group,struct rb_node *node;u64 ret =0 ; +ASSERT (!btrfs_is_zoned (block_group->fs_info)); +spin_lock (&cluster->lock);if (bytes > cluster->max_size) goto out;
@@ -3813,6 +3817,8 @@ int btrfs_trim_block_group(struct btrfs_block_group *block_group,int ret;u64 rem =0 ; +ASSERT (!btrfs_is_zoned (block_group->fs_info)); + *trimmed =0 ;spin_lock (&block_group->lock);
Signature · 1 line
2.27.0
PATCH v12 15/41 btrfs: redirty released extent buffers in ZONED mode
In reply to Naohiro AotaTree manipulating operations like merging nodes often release once-allocated tree nodes. Btrfs cleans such nodes so that pages in the node are not uselessly written out. On ZONED volumes, however, such optimization blocks the following IOs as the cancellation of the write out of the freed blocks breaks the sequential write sequence expected by the device.
This patch introduces a list of clean and unwritten extent buffers that have been released in a transaction. Btrfs redirty the buffer so that btree_write_cache_pages() can send proper bios to the devices.
Besides it clears the entire content of the extent buffer not to confuse raw block scanners e.g. btrfsck. By clearing the content, csum_dirty_buffer() complains about bytenr mismatch, so avoid the checking and checksum using newly introduced buffer flag EXTENT_BUFFER_NO_CHECK.
--- fs/btrfs/disk-io.c | 8 ++++++++ fs/btrfs/extent-tree.c | 12 +++++++++++- fs/btrfs/extent_io.c | 4 ++++ fs/btrfs/extent_io.h | 2 ++ fs/btrfs/transaction.c | 10 ++++++++++ fs/btrfs/transaction.h | 3 +++ fs/btrfs/tree-log.c | 6 ++++++ fs/btrfs/zoned.c | 37 +++++++++++++++++++++++++++++++++++++ fs/btrfs/zoned.h | 7 +++++++ 9 files changed, 88 insertions(+), 1 deletion(-)
fs/btrfs/disk-io.c +8 -0
@@ -459,6 +459,12 @@ static int csum_dirty_buffer(struct btrfs_fs_info *fs_info, struct bio_vec *bvecreturn 0 ; found_start =btrfs_header_bytenr (eb); + +if (test_bit (EXTENT_BUFFER_NO_CHECK , &eb->bflags)) { +WARN_ON (found_start !=0 ); +return 0 ; + } +/* * Please do not consolidate these warnings into a single if. * It is useful to know what went wrong.
@@ -4697,6 +4703,8 @@ void btrfs_cleanup_one_transaction(struct btrfs_transaction *cur_trans, EXTENT_DIRTY);btrfs_destroy_pinned_extent (fs_info, &cur_trans->pinned_extents); +btrfs_free_redirty_list (cur_trans); + cur_trans->state =TRANS_STATE_COMPLETED ;wake_up (&cur_trans->commit_wait); }
fs/btrfs/extent-tree.c +11 -1
@@ -3374,8 +3374,10 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans,if (root->root_key.objectid !=BTRFS_TREE_LOG_OBJECTID ) { ret =check_ref_cleanup (trans, buf->start); -if (!ret) +if (!ret) { +btrfs_redirty_list_add (trans->transaction, buf); goto out; + } } pin =0 ;
@@ -3387,6 +3389,13 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans, goto out; } +if (btrfs_is_zoned (fs_info)) { +btrfs_redirty_list_add (trans->transaction, buf); +pin_down_extent (trans, cache, buf->start, buf->len,1 ); +btrfs_put_block_group (cache); + goto out; + } +WARN_ON (test_bit (EXTENT_BUFFER_DIRTY , &buf->bflags));btrfs_add_free_space (cache, buf->start, buf->len);
@@ -4726,6 +4735,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,__btrfs_tree_lock (buf, nest);btrfs_clean_tree_block (buf);clear_bit (EXTENT_BUFFER_STALE , &buf->bflags); +clear_bit (EXTENT_BUFFER_NO_CHECK , &buf->bflags);set_extent_buffer_uptodate (buf);
fs/btrfs/extent_io.c +4 -0
@@ -24,6 +24,7 @@#include "rcu-string.h" #include "backref.h" #include "disk-io.h" +#include "zoned.h" static struct kmem_cache *extent_state_cache;static struct kmem_cache *extent_buffer_cache;
@@ -5048,6 +5049,7 @@ __alloc_extent_buffer(struct btrfs_fs_info *fs_info, u64 start,btrfs_leak_debug_add (&fs_info->eb_leak_lock, &eb->leak_list, &fs_info->allocated_ebs); +INIT_LIST_HEAD (&eb->release_list);spin_lock_init (&eb->refs_lock);atomic_set (&eb->refs,1 );
@@ -5825,6 +5827,8 @@ void write_extent_buffer(const struct extent_buffer *eb, const void *srcv,char *src = (char *)srcv;unsigned long i =get_eb_page_index (start); +WARN_ON (test_bit (EXTENT_BUFFER_NO_CHECK , &eb->bflags)); +if (check_eb_range (eb, start, len))return ;
fs/btrfs/extent_io.h +2 -0
@@ -31,6 +31,7 @@ enum {EXTENT_BUFFER_IN_TREE ,/* write IO error */ EXTENT_BUFFER_WRITE_ERR , + EXTENT_BUFFER_NO_CHECK, };/* these are flags for __process_pages_contig */
@@ -93,6 +94,7 @@ struct extent_buffer {struct rw_semaphore lock;struct page *pages[INLINE_EXTENT_BUFFER_PAGES ]; +struct list_head release_list;#ifdef CONFIG_BTRFS_DEBUG struct list_head leak_list;#endif
fs/btrfs/transaction.c +10 -0
@@ -21,6 +21,7 @@#include "qgroup.h" #include "block-group.h" #include "space-info.h" +#include "zoned.h" #define BTRFS_ROOT_TRANS_TAG 0
@@ -375,6 +376,8 @@ static noinline int join_transaction(struct btrfs_fs_info *fs_info,spin_lock_init (&cur_trans->dirty_bgs_lock);INIT_LIST_HEAD (&cur_trans->deleted_bgs);spin_lock_init (&cur_trans->dropped_roots_lock); +INIT_LIST_HEAD (&cur_trans->releasing_ebs); +spin_lock_init (&cur_trans->releasing_ebs_lock);list_add_tail (&cur_trans->list, &fs_info->trans_list);extent_io_tree_init (fs_info, &cur_trans->dirty_pages,IO_TREE_TRANS_DIRTY_PAGES , fs_info->btree_inode);
@@ -2344,6 +2347,13 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) goto scrub_continue; } +/* +* At this point, we should have written all the tree blocks +* allocated in this transaction. So it's now safe to free the +* redirtyied extent buffers. +*/ +btrfs_free_redirty_list (cur_trans); + ret =write_all_supers (fs_info,0 );/* * the super is written, we can safely allow the tree-loggers
fs/btrfs/transaction.h +3 -0
@@ -92,6 +92,9 @@ struct btrfs_transaction {*/ atomic_t pending_ordered;wait_queue_head_t pending_wait; + +spinlock_t releasing_ebs_lock; +struct list_head releasing_ebs; };#define __TRANS_FREEZABLE (1U << 0)
fs/btrfs/tree-log.c +6 -0
@@ -19,6 +19,7 @@#include "qgroup.h" #include "block-group.h" #include "space-info.h" +#include "zoned.h" /* magic values for the inode_only field in btrfs_log_inode: *
@@ -2752,6 +2753,8 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans,free_extent_buffer (next);return ret; } +btrfs_redirty_list_add ( + trans->transaction, next); }else {if (test_and_clear_bit (EXTENT_BUFFER_DIRTY , &next->bflags))clear_extent_buffer_dirty (next);
@@ -3296,6 +3299,9 @@ static void free_log_tree(struct btrfs_trans_handle *trans,clear_extent_bits (&log->dirty_log_pages,0 , (u64)-1 ,EXTENT_DIRTY |EXTENT_NEW |EXTENT_NEED_WAIT );extent_io_tree_release (&log->log_csum_range); + +if (trans && log->node) +btrfs_redirty_list_add (trans->transaction, log->node);btrfs_put_root (log); }
fs/btrfs/zoned.c +37 -0
@@ -10,6 +10,7 @@#include "rcu-string.h" #include "disk-io.h" #include "block-group.h" +#include "transaction.h" /* Maximum number of zones to report per blkdev_report_zones() call */ #define BTRFS_REPORT_NR_ZONES 4096
@@ -1186,3 +1187,39 @@ void btrfs_calc_zone_unusable(struct btrfs_block_group *cache)*/ btrfs_free_excluded_extents (cache); } + +void btrfs_redirty_list_add (struct btrfs_transaction *trans, +struct extent_buffer *eb) +{ +struct btrfs_fs_info *fs_info = eb->fs_info; + +if (!btrfs_is_zoned (fs_info) || +btrfs_header_flag (eb,BTRFS_HEADER_FLAG_WRITTEN ) || + !list_empty (&eb->release_list)) +return ; + +set_extent_buffer_dirty (eb); +set_extent_bits_nowait (&trans->dirty_pages, eb->start, + eb->start + eb->len -1 ,EXTENT_DIRTY ); +memzero_extent_buffer (eb,0 , eb->len); +set_bit (EXTENT_BUFFER_NO_CHECK , &eb->bflags); + +spin_lock (&trans->releasing_ebs_lock); +list_add_tail (&eb->release_list, &trans->releasing_ebs); +spin_unlock (&trans->releasing_ebs_lock); +atomic_inc (&eb->refs); +} + +void btrfs_free_redirty_list (struct btrfs_transaction *trans) +{ +spin_lock (&trans->releasing_ebs_lock); +while (!list_empty (&trans->releasing_ebs)) { +struct extent_buffer *eb; + + eb =list_first_entry (&trans->releasing_ebs, + struct extent_buffer, release_list); +list_del_init (&eb->release_list); +free_extent_buffer (eb); + } +spin_unlock (&trans->releasing_ebs_lock); +}
fs/btrfs/zoned.h +7 -0
@@ -43,6 +43,9 @@ int btrfs_reset_device_zone(struct btrfs_device *device, u64 physical,int btrfs_ensure_empty_zones (struct btrfs_device *device,u64 start,u64 size);int btrfs_load_block_group_zone_info (struct btrfs_block_group *cache,bool new);void btrfs_calc_zone_unusable (struct btrfs_block_group *cache); +void btrfs_redirty_list_add (struct btrfs_transaction *trans, +struct extent_buffer *eb); +void btrfs_free_redirty_list (struct btrfs_transaction *trans);#else /* CONFIG_BLK_DEV_ZONED */ static inline int btrfs_get_dev_zone (struct btrfs_device *device,u64 pos,struct blk_zone *zone)
@@ -127,6 +130,10 @@ static inline int btrfs_load_block_group_zone_info(static inline void btrfs_calc_zone_unusable (struct btrfs_block_group *cache) { } +static inline void btrfs_redirty_list_add (struct btrfs_transaction *trans, +struct extent_buffer *eb) { } +static inline void btrfs_free_redirty_list (struct btrfs_transaction *trans) { } +#endif static inline bool btrfs_dev_is_sequential (struct btrfs_device *device,u64 pos)
Signature · 1 line
2.27.0
PATCH v12 16/41 btrfs: advance allocation pointer after tree log node
In reply to Naohiro AotaSince the allocation info of tree log node is not recorded to the extent tree, calculate_alloc_pointer() cannot detect the node, so the pointer can be over a tree node.
Replaying the log call btrfs_remove_free_space() for each node in the log tree. So, advance the pointer after the node.
--- fs/btrfs/free-space-cache.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
fs/btrfs/free-space-cache.c +15 -1
@@ -2616,8 +2616,22 @@ int btrfs_remove_free_space(struct btrfs_block_group *block_group,int ret;bool re_search = false; -if (btrfs_is_zoned (block_group->fs_info)) +if (btrfs_is_zoned (block_group->fs_info)) { +/* +* This can happen with conventional zones when replaying +* log. Since the allocation info of tree-log nodes are +* not recorded to the extent-tree, calculate_alloc_pointer() +* failed to advance the allocation pointer after last +* allocated tree log node blocks. +* +* This function is called from +* btrfs_pin_extent_for_log_replay() when replaying the +* log. Advance the pointer not to overwrite the tree-log nodes. +*/ +if (block_group->alloc_offset < offset + bytes) + block_group->alloc_offset = offset + bytes;return 0 ; + }spin_lock (&ctl->tree_lock);
Signature · 1 line
2.27.0
PATCH v12 17/41 btrfs: enable to mount ZONED incompat flag
In reply to Naohiro AotaThis final patch adds the ZONED incompat flag to BTRFS_FEATURE_INCOMPAT_SUPP and enables btrfs to mount ZONED flagged file system.
--- fs/btrfs/ctree.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/btrfs/ctree.h +2 -1
@@ -299,7 +299,8 @@ struct btrfs_super_block {BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA | \BTRFS_FEATURE_INCOMPAT_NO_HOLES | \BTRFS_FEATURE_INCOMPAT_METADATA_UUID | \ - BTRFS_FEATURE_INCOMPAT_RAID1C34) +BTRFS_FEATURE_INCOMPAT_RAID1C34 | \ + BTRFS_FEATURE_INCOMPAT_ZONED) #define BTRFS_FEATURE_INCOMPAT_SAFE_SET \ (BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF )
Signature · 1 line
2.27.0
PATCH v12 18/41 btrfs: reset zones of unused block groups
In reply to Naohiro AotaFor an ZONED volume, a block group maps to a zone of the device. For deleted unused block groups, the zone of the block group can be reset to rewind the zone write pointer at the start of the zone.
--- fs/btrfs/block-group.c | 8 ++++++-- fs/btrfs/extent-tree.c | 17 ++++++++++++----- fs/btrfs/zoned.h | 16 ++++++++++++++++ 3 files changed, 34 insertions(+), 7 deletions(-)
fs/btrfs/block-group.c +6 -2
@@ -1400,8 +1400,12 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info)if (!async_trim_enabled &&btrfs_test_opt (fs_info,DISCARD_ASYNC )) goto flip_async; -/* DISCARD can flip during remount */ - trimming =btrfs_test_opt (fs_info,DISCARD_SYNC ); +/* +* DISCARD can flip during remount. In ZONED mode, we need +* to reset sequential required zones. +*/ + trimming =btrfs_test_opt (fs_info,DISCARD_SYNC ) || +btrfs_is_zoned (fs_info);/* Implicit trim during transaction commit. */ if (trimming)
fs/btrfs/extent-tree.c +12 -5
@@ -1333,6 +1333,9 @@ int btrfs_discard_extent(struct btrfs_fs_info *fs_info, u64 bytenr, stripe = bbio->stripes;for (i =0 ; i < bbio->num_stripes; i++, stripe++) { +struct btrfs_device *dev = stripe->dev; +u64 physical = stripe->physical; +u64 length = stripe->length;u64 bytes;struct request_queue *req_q;
@@ -1340,14 +1343,18 @@ int btrfs_discard_extent(struct btrfs_fs_info *fs_info, u64 bytenr,ASSERT (btrfs_test_opt (fs_info,DEGRADED ));continue ; } + req_q =bdev_get_queue (stripe->dev->bdev); -if (!blk_queue_discard (req_q)) +/* Zone reset in ZONED mode */ +if (btrfs_can_zone_reset (dev, physical, length)) + ret =btrfs_reset_device_zone (dev, physical, + length, &bytes); +else if (blk_queue_discard (req_q)) + ret =btrfs_issue_discard (dev->bdev, physical, + length, &bytes); +else continue ; - ret =btrfs_issue_discard (stripe->dev->bdev, - stripe->physical, - stripe->length, - &bytes);if (!ret) { discarded_bytes += bytes; }else if (ret != -EOPNOTSUPP ) {
fs/btrfs/zoned.h +16 -0
@@ -210,4 +210,20 @@ static inline bool btrfs_check_super_location(struct btrfs_device *device, u64 p return device->zone_info == NULL || !btrfs_dev_is_sequential(device, pos); } +static inline bool btrfs_can_zone_reset (struct btrfs_device *device, +u64 physical,u64 length) +{ +u64 zone_size; + +if (!btrfs_dev_is_sequential (device, physical)) +return false; + + zone_size = device->zone_info->zone_size; +if (!IS_ALIGNED (physical, zone_size) || + !IS_ALIGNED (length, zone_size)) +return false; + +return true; +} +#endif
Signature · 1 line
2.27.0
PATCH v12 19/41 btrfs: extract page adding function
In reply to Naohiro AotaThis commit extract page adding to bio part from submit_extent_page(). The page is added only when bio_flags are the same, contiguous and the added page fits in the same stripe as pages in the bio.
Condition checkings are reordered to allow early return to avoid possibly heavy btrfs_bio_fits_in_stripe() calling.
--- fs/btrfs/extent_io.c | 57 ++++++++++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 15 deletions(-)
fs/btrfs/extent_io.c +42 -15
@@ -3061,6 +3061,45 @@ struct bio *btrfs_bio_clone_partial(struct bio *orig, int offset, int size)return bio; } +/** +* btrfs_bio_add_page - attempt to add a page to bio +* @bio: destination bio +* @page: page to add to the bio +* @logical: offset of the new bio or to check whether we are adding +* a contiguous page to the previous one +* @pg_offset: starting offset in the page +* @size: portion of page that we want to write +* @prev_bio_flags: flags of previous bio to see if we can merge the current one +* @bio_flags: flags of the current bio to see if we can merge them +* @return: true if page was added, false otherwise +* +* Attempt to add a page to bio considering stripe alignment etc. Return +* true if successfully page added. Otherwise, return false. +*/ +static bool btrfs_bio_add_page (struct bio *bio,struct page *page,u64 logical, +unsigned int size,unsigned int pg_offset, +unsigned long prev_bio_flags, +unsigned long bio_flags) +{ +sector_t sector = logical >>SECTOR_SHIFT ; +bool contig; + +if (prev_bio_flags != bio_flags) +return false; + +if (prev_bio_flags &EXTENT_BIO_COMPRESSED ) + contig = bio->bi_iter.bi_sector == sector; +else + contig =bio_end_sector (bio) == sector; +if (!contig) +return false; + +if (btrfs_bio_fits_in_stripe (page, size, bio, bio_flags)) +return false; + +return bio_add_page (bio, page, size, pg_offset) == size; +} +/* * @opf: bio REQ_OP_* and REQ_* flags as one value * @wbc: optional writeback control for io accounting
@@ -3089,27 +3128,15 @@ static int submit_extent_page(unsigned int opf,int ret =0 ;struct bio *bio;size_t io_size =min_t (size_t, size,PAGE_SIZE ); -sector_t sector = offset >>9 ;struct extent_io_tree *tree = &BTRFS_I (page->mapping->host)->io_tree;ASSERT (bio_ret);if (*bio_ret) { -bool contig; -bool can_merge = true; - bio = *bio_ret; -if (prev_bio_flags &EXTENT_BIO_COMPRESSED ) - contig = bio->bi_iter.bi_sector == sector; -else - contig =bio_end_sector (bio) == sector; - -if (btrfs_bio_fits_in_stripe (page, io_size, bio, bio_flags)) - can_merge = false; - -if (prev_bio_flags != bio_flags || !contig || !can_merge || - force_bio_submit || -bio_add_page (bio, page, io_size, pg_offset) < io_size) { +if (force_bio_submit || + !btrfs_bio_add_page (bio, page, offset, io_size, pg_offset, + prev_bio_flags, bio_flags)) { ret =submit_one_bio (bio, mirror_num, prev_bio_flags);if (ret <0 ) { *bio_ret =NULL ;
Signature · 1 line
2.27.0
Re: [PATCH v12 19/41] btrfs: extract page adding function
Quoted 64 lines · Naohiro Aota
This commit extract page adding to bio part from
submit_extent_page(). The page is added only whenbio_flagsare the same, contiguous and the added page fits in the same stripe as pages in the bio.Condition checkings are reordered to allow early return to avoid possibly heavy
btrfs_bio_fits_in_stripe()calling.Reviewed-by Josef Bacik <[email protected]>Signed-off-by Naohiro Aota <[email protected]>--- fs/btrfs/extent_io.c | 57 ++++++++++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 15 deletions(-)fs/btrfs/extent_io.c +39
-0@@ -3061,6 +3061,45 @@ struct bio *btrfs_bio_clone_partial(struct bio *orig, int offset, int size)return bio; } +/** +* btrfs_bio_add_page - attempt to add a page to bio +* @bio: destination bio +* @page: page to add to the bio +* @logical: offset of the new bio or to check whether we are adding +* a contiguous page to the previous one +* @pg_offset: starting offset in the page +* @size: portion of page that we want to write +* @prev_bio_flags: flags of previous bio to see if we can merge the current one +* @bio_flags: flags of the current bio to see if we can merge them +* @return: true if page was added, false otherwise +* +* Attempt to add a page to bio considering stripe alignment etc. Return +* true if successfully page added. Otherwise, return false. +*/ +static bool btrfs_bio_add_page (struct bio *bio,struct page *page,u64 logical, +unsigned int size,unsigned int pg_offset, +unsigned long prev_bio_flags, +unsigned long bio_flags) +{ +sector_t sector = logical >>SECTOR_SHIFT ; +bool contig; + +if (prev_bio_flags != bio_flags) +return false; + +if (prev_bio_flags &EXTENT_BIO_COMPRESSED ) + contig = bio->bi_iter.bi_sector == sector; +else + contig =bio_end_sector (bio) == sector; +if (!contig) +return false; + +if (btrfs_bio_fits_in_stripe (page, size, bio, bio_flags)) +return false; + +return bio_add_page (bio, page, size, pg_offset) == size; +} +/* * @opf: bio REQ_OP_* and REQ_* flags as one value * @wbc: optional writeback control for io accounting
fs/btrfs/extent_io.c static int submit_extent_page(unsigned int opf, · line 3092
Quoted 4 lines
fs/btrfs/extent_io.c +0
-1@@ -3089,27 +3128,15 @@ static int submit_extent_page(unsigned int opf,int ret =0 ;struct bio *bio;size_t io_size =min_t (size_t, size,PAGE_SIZE ); -sector_t sector = offset >>9 ;
offset has been renamed to disk_bytenr in misc-next, you'll need to refresh these patches against misc-next as this doesn't apply cleanly. Thanks,
Josef
PATCH v12 20/41 btrfs: use bio_add_zone_append_page for zoned btrfs
In reply to Naohiro AotaZoned device has its own hardware restrictions e.g. max_zone_append_size when using REQ_OP_ZONE_APPEND. To follow the restrictions, use bio_add_zone_append_page() instead of bio_add_page(). We need target device to use bio_add_zone_append_page(), so this commit reads the chunk information to memoize the target device to btrfs_io_bio(bio)->device.
Currently, zoned btrfs only supports SINGLE profile. In the feature, btrfs_io_bio can hold extent_map and check the restrictions for all the devices the bio will be mapped.
--- fs/btrfs/extent_io.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-)
fs/btrfs/extent_io.c +27 -3
@@ -3083,6 +3083,7 @@ static bool btrfs_bio_add_page(struct bio *bio, struct page *page, u64 logical, {sector_t sector = logical >>SECTOR_SHIFT ;bool contig; +int ret;if (prev_bio_flags != bio_flags)return false;
@@ -3097,7 +3098,12 @@ static bool btrfs_bio_add_page(struct bio *bio, struct page *page, u64 logical,if (btrfs_bio_fits_in_stripe (page, size, bio, bio_flags))return false; -return bio_add_page (bio, page, size, pg_offset) == size; +if (bio_op (bio) ==REQ_OP_ZONE_APPEND ) + ret =bio_add_zone_append_page (bio, page, size, pg_offset); +else + ret =bio_add_page (bio, page, size, pg_offset); + +return ret == size; }/*
@@ -3128,7 +3134,9 @@ static int submit_extent_page(unsigned int opf,int ret =0 ;struct bio *bio;size_t io_size =min_t (size_t, size,PAGE_SIZE ); -struct extent_io_tree *tree = &BTRFS_I (page->mapping->host)->io_tree; +struct btrfs_inode *inode =BTRFS_I (page->mapping->host); +struct extent_io_tree *tree = &inode->io_tree; +struct btrfs_fs_info *fs_info = inode->root->fs_info;ASSERT (bio_ret);
@@ -3159,11 +3167,27 @@ static int submit_extent_page(unsigned int opf,if (wbc) {struct block_device *bdev; - bdev =BTRFS_I (page->mapping->host)->root->fs_info->fs_devices->latest_bdev; + bdev = fs_info->fs_devices->latest_bdev;bio_set_dev (bio, bdev);wbc_init_bio (wbc, bio);wbc_account_cgroup_owner (wbc, page, io_size); } +if (btrfs_is_zoned (fs_info) && +bio_op (bio) ==REQ_OP_ZONE_APPEND ) { +struct extent_map *em; +struct map_lookup *map; + + em =btrfs_get_chunk_map (fs_info, offset, io_size); +if (IS_ERR (em)) +return PTR_ERR (em); + + map = em->map_lookup; +/* We only support SINGLE profile for now */ +ASSERT (map->num_stripes ==1 ); +btrfs_io_bio (bio)->device = map->stripes[0 ].dev; + +free_extent_map (em); + } *bio_ret = bio;
Signature · 1 line
2.27.0
Re: [PATCH v12 20/41] btrfs: use bio_add_zone_append_page for zoned btrfs
Quoted 59 lines · Naohiro Aota
Zoned device has its own hardware restrictions e.g.
max_zone_append_sizewhen usingREQ_OP_ZONE_APPEND. To follow the restrictions, usebio_add_zone_append_page()instead ofbio_add_page(). We need target device to usebio_add_zone_append_page(), so this commit reads the chunk information to memoize the target device to btrfs_io_bio(bio)->device.Currently, zoned btrfs only supports SINGLE profile. In the feature,
btrfs_io_biocan holdextent_mapand check the restrictions for all the devices the bio will be mapped.Reviewed-by Josef Bacik <[email protected]>Signed-off-by Naohiro Aota <[email protected]>--- fs/btrfs/extent_io.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-)fs/btrfs/extent_io.c +11
-3@@ -3083,6 +3083,7 @@ static bool btrfs_bio_add_page(struct bio *bio, struct page *page, u64 logical, {sector_t sector = logical >>SECTOR_SHIFT ;bool contig; +int ret;if (prev_bio_flags != bio_flags)return false;@@ -3097,7 +3098,12 @@ static bool btrfs_bio_add_page(struct bio *bio, struct page *page, u64 logical,if (btrfs_bio_fits_in_stripe (page, size, bio, bio_flags))return false; -return bio_add_page (bio, page, size, pg_offset) == size; +if (bio_op (bio) ==REQ_OP_ZONE_APPEND ) + ret =bio_add_zone_append_page (bio, page, size, pg_offset); +else + ret =bio_add_page (bio, page, size, pg_offset); + +return ret == size; }/* @@ -3128,7 +3134,9 @@ static int submit_extent_page(unsigned int opf,int ret =0 ;struct bio *bio;size_t io_size =min_t (size_t, size,PAGE_SIZE ); -struct extent_io_tree *tree = &BTRFS_I (page->mapping->host)->io_tree; +struct btrfs_inode *inode =BTRFS_I (page->mapping->host); +struct extent_io_tree *tree = &inode->io_tree; +struct btrfs_fs_info *fs_info = inode->root->fs_info;ASSERT (bio_ret);@@ -3159,11 +3167,27 @@ static int submit_extent_page(unsigned int opf,if (wbc) {struct block_device *bdev; - bdev =BTRFS_I (page->mapping->host)->root->fs_info->fs_devices->latest_bdev; + bdev = fs_info->fs_devices->latest_bdev;
fs/btrfs/extent_io.c static int submit_extent_page(unsigned int opf, · line 3180
Quoted 10 lines
fs/btrfs/extent_io.c +6
-0bio_set_dev (bio, bdev);wbc_init_bio (wbc, bio);wbc_account_cgroup_owner (wbc, page, io_size); } +if (btrfs_is_zoned (fs_info) && +bio_op (bio) ==REQ_OP_ZONE_APPEND ) { +struct extent_map *em; +struct map_lookup *map; + + em =btrfs_get_chunk_map (fs_info, offset, io_size);
Same goes for this, it fails to compile on misc-next. Thanks,
Josef
PATCH v12 21/41 btrfs: handle REQ_OP_ZONE_APPEND as writing
In reply to Naohiro AotaZONED btrfs uses REQ_OP_ZONE_APPEND bios for writing to actual devices. Let btrfs_end_bio() and btrfs_op be aware of it.
--- fs/btrfs/disk-io.c | 4 ++-- fs/btrfs/inode.c | 10 +++++----- fs/btrfs/volumes.c | 8 ++++---- fs/btrfs/volumes.h | 1 + 4 files changed, 12 insertions(+), 11 deletions(-)
fs/btrfs/disk-io.c +2 -2
@@ -652,7 +652,7 @@ static void end_workqueue_bio(struct bio *bio) fs_info = end_io_wq->info; end_io_wq->status = bio->bi_status; -if (bio_op (bio) ==REQ_OP_WRITE ) { +if (btrfs_op (bio) ==BTRFS_MAP_WRITE ) {if (end_io_wq->metadata ==BTRFS_WQ_ENDIO_METADATA ) wq = fs_info->endio_meta_write_workers;else if (end_io_wq->metadata ==BTRFS_WQ_ENDIO_FREE_SPACE )
@@ -828,7 +828,7 @@ blk_status_t btrfs_submit_metadata_bio(struct inode *inode, struct bio *bio,int async =check_async_write (fs_info,BTRFS_I (inode));blk_status_t ret; -if (bio_op (bio) !=REQ_OP_WRITE ) { +if (btrfs_op (bio) !=BTRFS_MAP_WRITE ) {/* * called for a read, do the setup so that checksum validation * can happen in the async kernel threads
fs/btrfs/inode.c +5 -5
@@ -2252,7 +2252,7 @@ blk_status_t btrfs_submit_data_bio(struct inode *inode, struct bio *bio,if (btrfs_is_free_space_inode (BTRFS_I (inode))) metadata =BTRFS_WQ_ENDIO_FREE_SPACE ; -if (bio_op (bio) !=REQ_OP_WRITE ) { +if (btrfs_op (bio) !=BTRFS_MAP_WRITE ) { ret =btrfs_bio_wq_end_io (fs_info, bio, metadata);if (ret) goto out;
@@ -7682,7 +7682,7 @@ static void btrfs_dio_private_put(struct btrfs_dio_private *dip)if (!refcount_dec_and_test (&dip->refs))return ; -if (bio_op (dip->dio_bio) ==REQ_OP_WRITE ) { +if (btrfs_op (dip->dio_bio) ==BTRFS_MAP_WRITE ) { __endio_write_update_ordered(BTRFS_I(dip->inode), dip->logical_offset, dip->bytes,
@@ -7850,7 +7850,7 @@ static inline blk_status_t btrfs_submit_dio_bio(struct bio *bio, {struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);struct btrfs_dio_private *dip = bio->bi_private; -bool write =bio_op (bio) ==REQ_OP_WRITE ; +bool write =btrfs_op (bio) ==BTRFS_MAP_WRITE ;blk_status_t ret;/* Check btrfs_submit_bio_hook() for rules about async submit. */
@@ -7900,7 +7900,7 @@ static struct btrfs_dio_private *btrfs_create_dio_private(struct bio *dio_bio, struct inode *inode, loff_t file_offset) { -const bool write = (bio_op (dio_bio) ==REQ_OP_WRITE ); +const bool write = (btrfs_op (dio_bio) ==BTRFS_MAP_WRITE );const bool csum = !(BTRFS_I (inode)->flags &BTRFS_INODE_NODATASUM );size_t dip_size;struct btrfs_dio_private *dip;
@@ -7930,7 +7930,7 @@ static struct btrfs_dio_private *btrfs_create_dio_private(struct bio *dio_bio,static blk_qc_t btrfs_submit_direct (struct inode *inode,struct iomap *iomap,struct bio *dio_bio,loff_t file_offset) { -const bool write = (bio_op (dio_bio) ==REQ_OP_WRITE ); +const bool write = (btrfs_op (dio_bio) ==BTRFS_MAP_WRITE );struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);const bool raid56 = (btrfs_data_alloc_profile (fs_info) &BTRFS_BLOCK_GROUP_RAID56_MASK );
fs/btrfs/volumes.c +4 -4
@@ -6455,7 +6455,7 @@ static void btrfs_end_bio(struct bio *bio)struct btrfs_device *dev =btrfs_io_bio (bio)->device;ASSERT (dev->bdev); -if (bio_op (bio) ==REQ_OP_WRITE ) +if (btrfs_op (bio) ==BTRFS_MAP_WRITE )btrfs_dev_stat_inc_and_print (dev,BTRFS_DEV_STAT_WRITE_ERRS );else if (!(bio->bi_opf &REQ_RAHEAD ))
@@ -6568,10 +6568,10 @@ blk_status_t btrfs_map_bio(struct btrfs_fs_info *fs_info, struct bio *bio,atomic_set (&bbio->stripes_pending, bbio->num_stripes);if ((bbio->map_type &BTRFS_BLOCK_GROUP_RAID56_MASK ) && - ((bio_op (bio) ==REQ_OP_WRITE ) || (mirror_num >1 ))) { + ((btrfs_op (bio) ==BTRFS_MAP_WRITE ) || (mirror_num >1 ))) {/* In this case, map_length has been set to the length of a single stripe; not the whole write */ -if (bio_op (bio) ==REQ_OP_WRITE ) { +if (btrfs_op (bio) ==BTRFS_MAP_WRITE ) { ret =raid56_parity_write (fs_info, bio, bbio, map_length); }else {
@@ -6594,7 +6594,7 @@ blk_status_t btrfs_map_bio(struct btrfs_fs_info *fs_info, struct bio *bio, dev = bbio->stripes[dev_nr].dev;if (!dev || !dev->bdev ||test_bit (BTRFS_DEV_STATE_MISSING , &dev->dev_state) || - (bio_op (first_bio) ==REQ_OP_WRITE && + (btrfs_op (first_bio) ==BTRFS_MAP_WRITE && !test_bit (BTRFS_DEV_STATE_WRITEABLE , &dev->dev_state))) {bbio_error (bbio, first_bio, logical);continue ;
fs/btrfs/volumes.h +1 -0
@@ -423,6 +423,7 @@ static inline enum btrfs_map_op btrfs_op(struct bio *bio)case REQ_OP_DISCARD :return BTRFS_MAP_DISCARD ;case REQ_OP_WRITE : +case REQ_OP_ZONE_APPEND :return BTRFS_MAP_WRITE ;default :WARN_ON_ONCE (1 );
Signature · 1 line
2.27.0
PATCH v12 22/41 btrfs: split ordered extent when bio is sent
In reply to Naohiro AotaFor a zone append write, the device decides the location the data is written to. Therefore we cannot ensure that two bios are written consecutively on the device. In order to ensure that a ordered extent maps to a contiguous region on disk, we need to maintain a "one bio == one ordered extent" rule.
This commit implements the splitting of an ordered extent and extent map on bio submission to adhere to the rule.
[testbot] made extract_ordered_extent static
--- fs/btrfs/inode.c | 91 +++++++++++++++++++++++++++++++++++++++++ fs/btrfs/ordered-data.c | 85 ++++++++++++++++++++++++++++++++++++++ fs/btrfs/ordered-data.h | 2 + 3 files changed, 178 insertions(+)
fs/btrfs/inode.c +91 -0
@@ -2217,6 +2217,88 @@ static blk_status_t btrfs_submit_bio_start(struct inode *inode, struct bio *bio,return btrfs_csum_one_bio (BTRFS_I (inode), bio,0 ,0 ); } +static int extract_ordered_extent (struct inode *inode,struct bio *bio, +loff_t file_offset) +{ +struct btrfs_ordered_extent *ordered; +struct extent_map *em =NULL , *em_new =NULL ; +struct extent_map_tree *em_tree = &BTRFS_I (inode)->extent_tree; +u64 start = (u64 )bio->bi_iter.bi_sector <<SECTOR_SHIFT ; +u64 len = bio->bi_iter.bi_size; +u64 end = start + len; +u64 ordered_end; +u64 pre, post; +int ret =0 ; + + ordered =btrfs_lookup_ordered_extent (BTRFS_I (inode), file_offset); +if (WARN_ON_ONCE (!ordered)) +return -EIO ; + +/* No need to split */ +if (ordered->disk_num_bytes == len) + goto out; + +/* We cannot split once end_bio'd ordered extent */ +if (WARN_ON_ONCE (ordered->bytes_left != ordered->disk_num_bytes)) { + ret = -EINVAL ; + goto out; + } + +/* We cannot split a compressed ordered extent */ +if (WARN_ON_ONCE (ordered->disk_num_bytes != ordered->num_bytes)) { + ret = -EINVAL ; + goto out; + } + +/* We cannot split a waited ordered extent */ +if (WARN_ON_ONCE (wq_has_sleeper (&ordered->wait))) { + ret = -EINVAL ; + goto out; + } + + ordered_end = ordered->disk_bytenr + ordered->disk_num_bytes; +/* bio must be in one ordered extent */ +if (WARN_ON_ONCE (start < ordered->disk_bytenr || end > ordered_end)) { + ret = -EINVAL ; + goto out; + } + +/* Checksum list should be empty */ +if (WARN_ON_ONCE (!list_empty (&ordered->list))) { + ret = -EINVAL ; + goto out; + } + + pre = start - ordered->disk_bytenr; + post = ordered_end - end; + + ret =btrfs_split_ordered_extent (ordered, pre, post); +if (ret) + goto out; + +read_lock (&em_tree->lock); + em =lookup_extent_mapping (em_tree, ordered->file_offset, len); +if (!em) { +read_unlock (&em_tree->lock); + ret = -EIO ; + goto out; + } +read_unlock (&em_tree->lock); + +ASSERT (!test_bit (EXTENT_FLAG_COMPRESSED , &em->flags)); + em_new =create_io_em (BTRFS_I (inode), em->start + pre, len, + em->start + pre, em->block_start + pre, len, + len, len,BTRFS_COMPRESS_NONE , +BTRFS_ORDERED_REGULAR ); +free_extent_map (em_new); + +out: +free_extent_map (em); +btrfs_put_ordered_extent (ordered); + +return ret; +} +/* * extent_io.c submission hook. This does the right thing for csum calculation * on write, or reading the csums from the tree before a read.
@@ -2252,6 +2334,15 @@ blk_status_t btrfs_submit_data_bio(struct inode *inode, struct bio *bio,if (btrfs_is_free_space_inode (BTRFS_I (inode))) metadata =BTRFS_WQ_ENDIO_FREE_SPACE ; +if (bio_op (bio) ==REQ_OP_ZONE_APPEND ) { +struct page *page =bio_first_bvec_all (bio)->bv_page; +loff_t file_offset =page_offset (page); + + ret =extract_ordered_extent (inode, bio, file_offset); +if (ret) + goto out; + } +if (btrfs_op (bio) !=BTRFS_MAP_WRITE ) { ret =btrfs_bio_wq_end_io (fs_info, bio, metadata);if (ret)
fs/btrfs/ordered-data.c +85 -0
91 lines not on this page · raw message
fs/btrfs/ordered-data.h +2 -0
@@ -190,6 +190,8 @@ void btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, u64 nr,void btrfs_lock_and_flush_ordered_range (struct btrfs_inode *inode,u64 start,u64 end,struct extent_state **cached_state); +int btrfs_split_ordered_extent (struct btrfs_ordered_extent *ordered,u64 pre, +u64 post);int __init ordered_data_init (void );void __cold ordered_data_exit (void );
Signature · 1 line
2.27.0
PATCH v12 23/41 btrfs: extend btrfs_rmap_block for specifying a device
In reply to Naohiro Aotabtrfs_rmap_block currently reverse-maps the physical addresses on all devices to the corresponding logical addresses.
This commit extends the function to match to a specified device. The old functionality of querying all devices is left intact by specifying NULL as target device.
We pass block_device instead of btrfs_device to __btrfs_rmap_block. This function is intended to reverse-map the result of bio, which only have block_device.
This commit also exports the function for later use.
--- fs/btrfs/block-group.c | 20 ++++++++++++++------ fs/btrfs/block-group.h | 8 +++----- fs/btrfs/tests/extent-map-tests.c | 2 +- 3 files changed, 18 insertions(+), 12 deletions(-)
fs/btrfs/block-group.c +14 -6
@@ -1576,8 +1576,11 @@ static void set_avail_alloc_bits(struct btrfs_fs_info *fs_info, u64 flags) }/** -* btrfs_rmap_block - Map a physical disk address to a list of logical addresses +* btrfs_rmap_block - Map a physical disk address to a list of logical +* addresses * @chunk_start: logical address of block group +* @bdev: physical device to resolve. Can be NULL to indicate any +* device. * @physical: physical address to map to logical addresses * @logical: return array of logical addresses which map to @physical * @naddrs: length of @logical
@@ -1587,9 +1590,9 @@ static void set_avail_alloc_bits(struct btrfs_fs_info *fs_info, u64 flags)* Used primarily to exclude those portions of a block group that contain super * block copies. */ -EXPORT_FOR_TESTS int btrfs_rmap_block (struct btrfs_fs_info *fs_info,u64 chunk_start, -u64 physical,u64 **logical,int *naddrs,int *stripe_len) +struct block_device *bdev,u64 physical,u64 **logical, +int *naddrs,int *stripe_len) {struct extent_map *em;struct map_lookup *map;
@@ -1607,6 +1610,7 @@ int btrfs_rmap_block(struct btrfs_fs_info *fs_info, u64 chunk_start, map = em->map_lookup; data_stripe_length = em->orig_block_len; io_stripe_size = map->stripe_len; + chunk_start = em->start;/* For RAID5/6 adjust to a full IO stripe length */ if (map->type &BTRFS_BLOCK_GROUP_RAID56_MASK )
@@ -1621,14 +1625,18 @@ int btrfs_rmap_block(struct btrfs_fs_info *fs_info, u64 chunk_start,for (i =0 ; i < map->num_stripes; i++) {bool already_inserted = false;u64 stripe_nr; +u64 offset;int j;if (!in_range (physical, map->stripes[i].physical, data_stripe_length))continue ; +if (bdev && map->stripes[i].dev->bdev != bdev) +continue ; + stripe_nr = physical - map->stripes[i].physical; - stripe_nr =div64_u64 (stripe_nr, map->stripe_len); + stripe_nr =div64_u64_rem (stripe_nr, map->stripe_len, &offset);if (map->type &BTRFS_BLOCK_GROUP_RAID10 ) { stripe_nr = stripe_nr * map->num_stripes + i;
@@ -1642,7 +1650,7 @@ int btrfs_rmap_block(struct btrfs_fs_info *fs_info, u64 chunk_start,* instead of map->stripe_len */ - bytenr = chunk_start + stripe_nr * io_stripe_size; + bytenr = chunk_start + stripe_nr * io_stripe_size + offset;/* Ensure we don't add duplicate addresses */ for (j =0 ; j < nr; j++) {
@@ -1684,7 +1692,7 @@ static int exclude_super_stripes(struct btrfs_block_group *cache)for (i =0 ; i <BTRFS_SUPER_MIRROR_MAX ; i++) { bytenr =btrfs_sb_offset (i); - ret =btrfs_rmap_block (fs_info, cache->start, + ret =btrfs_rmap_block (fs_info, cache->start,NULL , bytenr, &logical, &nr, &stripe_len);if (ret)return ret;
fs/btrfs/block-group.h +3 -5
@@ -277,6 +277,9 @@ void btrfs_put_block_group_cache(struct btrfs_fs_info *info);int btrfs_free_block_groups (struct btrfs_fs_info *info);void btrfs_wait_space_cache_v1_finished (struct btrfs_block_group *cache,struct btrfs_caching_control *caching_ctl); +int btrfs_rmap_block (struct btrfs_fs_info *fs_info,u64 chunk_start, +struct block_device *bdev,u64 physical,u64 **logical, +int *naddrs,int *stripe_len);static inline u64 btrfs_data_alloc_profile (struct btrfs_fs_info *fs_info) {
@@ -303,9 +306,4 @@ static inline int btrfs_block_group_done(struct btrfs_block_group *cache)void btrfs_freeze_block_group (struct btrfs_block_group *cache);void btrfs_unfreeze_block_group (struct btrfs_block_group *cache); -#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS -int btrfs_rmap_block (struct btrfs_fs_info *fs_info,u64 chunk_start, -u64 physical,u64 **logical,int *naddrs,int *stripe_len); -#endif -#endif /* BTRFS_BLOCK_GROUP_H */
fs/btrfs/tests/extent-map-tests.c +1 -1
@@ -507,7 +507,7 @@ static int test_rmap_block(struct btrfs_fs_info *fs_info, goto out_free; } - ret =btrfs_rmap_block (fs_info, em->start,btrfs_sb_offset (1 ), + ret =btrfs_rmap_block (fs_info, em->start,NULL ,btrfs_sb_offset (1 ), &logical, &out_ndaddrs, &out_stripe_len);if (ret || (out_ndaddrs ==0 && test->expected_mapped_addr)) { test_err("didn't rmap anything but expected %d",
Signature · 1 line
2.27.0
PATCH v12 24/41 btrfs: cache if block-group is on a sequential zone
In reply to Naohiro AotaFrom: Johannes Thumshirn <[email protected]>
In zoned mode, cache if a block-group is on a sequential write only zone. On sequential write only zones, we can use REQ_OP_ZONE_APPEND for writing of data, therefore provide btrfs_use_zone_append() to figure out if I/O is targeting a sequential write only zone and we can use said REQ_OP_ZONE_APPEND for data writing.
--- fs/btrfs/block-group.h | 2 ++ fs/btrfs/zoned.c | 29 +++++++++++++++++++++++++++++ fs/btrfs/zoned.h | 5 +++++ 3 files changed, 36 insertions(+)
fs/btrfs/block-group.h +2 -0
@@ -184,6 +184,8 @@ struct btrfs_block_group {/* Record locked full stripes for RAID5/6 block group */ struct btrfs_full_stripe_locks_tree full_stripe_locks_root; +/* Flag indicating this block-group is placed on a sequential zone */ +bool seq_zone;/* * Allocation offset for the block group to implement sequential * allocation. This is used only with ZONED mode enabled.
fs/btrfs/zoned.c +29 -0
@@ -1103,6 +1103,9 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new) } } +if (num_sequential >0 ) + cache->seq_zone = true; +if (num_conventional >0 ) {/* * Avoid calling calculate_alloc_pointer() for new BG. It
@@ -1223,3 +1226,29 @@ void btrfs_free_redirty_list(struct btrfs_transaction *trans) }spin_unlock (&trans->releasing_ebs_lock); } + +bool btrfs_use_zone_append (struct btrfs_inode *inode,struct extent_map *em) +{ +struct btrfs_fs_info *fs_info = inode->root->fs_info; +struct btrfs_block_group *cache; +bool ret = false; + +if (!btrfs_is_zoned (fs_info)) +return false; + +if (!fs_info->max_zone_append_size) +return false; + +if (!is_data_inode (&inode->vfs_inode)) +return false; + + cache =btrfs_lookup_block_group (fs_info, em->block_start); +ASSERT (cache); +if (!cache) +return false; + + ret = cache->seq_zone; +btrfs_put_block_group (cache); + +return ret; +}
fs/btrfs/zoned.h +5 -0
@@ -46,6 +46,7 @@ void btrfs_calc_zone_unusable(struct btrfs_block_group *cache);void btrfs_redirty_list_add (struct btrfs_transaction *trans,struct extent_buffer *eb);void btrfs_free_redirty_list (struct btrfs_transaction *trans); +bool btrfs_use_zone_append (struct btrfs_inode *inode,struct extent_map *em);#else /* CONFIG_BLK_DEV_ZONED */ static inline int btrfs_get_dev_zone (struct btrfs_device *device,u64 pos,struct blk_zone *zone)
@@ -134,6 +135,10 @@ static inline void btrfs_redirty_list_add(struct btrfs_transaction *trans, struct extent_buffer *eb) { }static inline void btrfs_free_redirty_list (struct btrfs_transaction *trans) { } +bool btrfs_use_zone_append (struct btrfs_inode *inode,struct extent_map *em) +{ +return false; +}#endif static inline bool btrfs_dev_is_sequential (struct btrfs_device *device,u64 pos)
Signature · 1 line
2.27.0
PATCH v12 25/41 btrfs: save irq flags when looking up an ordered extent
In reply to Naohiro AotaFrom: Johannes Thumshirn <[email protected]>
A following patch will add another caller of btrfs_lookup_ordered_extent() from a bio endio context.
btrfs_lookup_ordered_extent() uses spin_lock_irq() which unconditionally disables interrupts. Change this to spin_lock_irqsave() so interrupts aren't disabled and re-enabled unconditionally.
--- fs/btrfs/ordered-data.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/btrfs/ordered-data.c +3 -2
@@ -745,9 +745,10 @@ struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct btrfs_inode *inostruct btrfs_ordered_inode_tree *tree;struct rb_node *node;struct btrfs_ordered_extent *entry =NULL ; +unsigned long flags; tree = &inode->ordered_tree; -spin_lock_irq (&tree->lock); +spin_lock_irqsave (&tree->lock, flags); node =tree_search (tree, file_offset);if (!node) goto out;
@@ -758,7 +759,7 @@ struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct btrfs_inode *inoif (entry)refcount_inc (&entry->refs); out: -spin_unlock_irq (&tree->lock); +spin_unlock_irqrestore (&tree->lock, flags);return entry; }
Signature · 1 line
2.27.0
PATCH v12 26/41 btrfs: use ZONE_APPEND write for ZONED btrfs
In reply to Naohiro AotaThis commit enables zone append writing for zoned btrfs. When using zone append, a bio is issued to the start of a target zone and the device decides to place it inside the zone. Upon completion the device reports the actual written position back to the host.
Three parts are necessary to enable zone append in btrfs. First, modify the bio to use REQ_OP_ZONE_APPEND in btrfs_submit_bio_hook() and adjust the bi_sector to point the beginning of the zone.
Secondly, records the returned physical address (and disk/partno) to the ordered extent in end_bio_extent_writepage() after the bio has been completed. We cannot resolve the physical address to the logical address because we can neither take locks nor allocate a buffer in this end_bio context. So, we need to record the physical address to resolve it later in btrfs_finish_ordered_io().
And finally, rewrites the logical addresses of the extent mapping and checksum data according to the physical address (using __btrfs_rmap_block). If the returned address matches the originally allocated address, we can skip this rewriting process.
--- fs/btrfs/extent_io.c | 11 ++++++- fs/btrfs/file.c | 2 +- fs/btrfs/inode.c | 4 +++ fs/btrfs/ordered-data.c | 3 ++ fs/btrfs/ordered-data.h | 8 +++++ fs/btrfs/volumes.c | 15 +++++++++ fs/btrfs/zoned.c | 68 +++++++++++++++++++++++++++++++++++++++++ fs/btrfs/zoned.h | 12 ++++++++ 8 files changed, 121 insertions(+), 2 deletions(-)
fs/btrfs/extent_io.c +10 -1
@@ -2735,6 +2735,7 @@ static void end_bio_extent_writepage(struct bio *bio)u64 start;u64 end;struct bvec_iter_all iter_all; +bool first_bvec = true;ASSERT (!bio_flagged (bio,BIO_CLONED ));bio_for_each_segment_all (bvec, bio, iter_all) {
@@ -2761,6 +2762,11 @@ static void end_bio_extent_writepage(struct bio *bio) start =page_offset (page); end = start + bvec->bv_offset + bvec->bv_len -1 ; +if (first_bvec) { +btrfs_record_physical_zoned (inode, start, bio); + first_bvec = false; + } +end_extent_writepage (page, error, start, end);end_page_writeback (page); }
@@ -3580,6 +3586,7 @@ static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode,size_t blocksize;int ret =0 ;int nr =0 ; +int opf =REQ_OP_WRITE ;const unsigned int write_flags =wbc_to_write_flags (wbc);bool compressed;
@@ -3626,6 +3633,8 @@ static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode, offset = em->block_start + extent_offset; block_start = em->block_start; compressed =test_bit (EXTENT_FLAG_COMPRESSED , &em->flags); +if (btrfs_use_zone_append (inode, em)) + opf =REQ_OP_ZONE_APPEND ;free_extent_map (em); em =NULL ;
@@ -3652,7 +3661,7 @@ static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode, page->index, cur, end); } - ret = submit_extent_page(REQ_OP_WRITE | write_flags, wbc, + ret = submit_extent_page(opf | write_flags, wbc, page, offset, iosize, pg_offset, &epd->bio, end_bio_extent_writepage,
fs/btrfs/file.c +1 -1
@@ -2176,7 +2176,7 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)* the current transaction commits before the ordered extents complete * and a power failure happens right after that. */ -if (full_sync) { +if (full_sync ||btrfs_is_zoned (fs_info)) { ret =btrfs_wait_ordered_range (inode, start, len); }else {/*
fs/btrfs/inode.c +4 -0
@@ -50,6 +50,7 @@#include "delalloc-space.h" #include "block-group.h" #include "space-info.h" +#include "zoned.h" struct btrfs_iget_args {u64 ino;
@@ -2830,6 +2831,9 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)bool clear_reserved_extent = true;unsigned int clear_bits =EXTENT_DEFRAG ; +if (ordered_extent->disk) +btrfs_rewrite_logical_zoned (ordered_extent); + start = ordered_extent->file_offset; end = start + ordered_extent->num_bytes -1 ;
fs/btrfs/ordered-data.c +3 -0
@@ -199,6 +199,9 @@ static int __btrfs_add_ordered_extent(struct btrfs_inode *inode, u64 file_offset entry->compress_type = compress_type; entry->truncated_len = (u64)-1 ; entry->qgroup_rsv = ret; + entry->physical = (u64)-1 ; + entry->disk =NULL ; + entry->partno = (u8)-1 ;if (type !=BTRFS_ORDERED_IO_DONE && type !=BTRFS_ORDERED_COMPLETE )set_bit (type, &entry->flags);
fs/btrfs/ordered-data.h +8 -0
@@ -127,6 +127,14 @@ struct btrfs_ordered_extent {struct completion completion;struct btrfs_work flush_work;struct list_head work_list; + +/* +* used to reverse-map physical address returned from ZONE_APPEND +* write command in a workqueue context. +*/ +u64 physical; +struct gendisk *disk; +u8 partno; };/*
fs/btrfs/volumes.c +15 -0
@@ -6507,6 +6507,21 @@ static void submit_stripe_bio(struct btrfs_bio *bbio, struct bio *bio,btrfs_io_bio (bio)->device = dev; bio->bi_end_io = btrfs_end_bio; bio->bi_iter.bi_sector = physical >>9 ; +/* +* For zone append writing, bi_sector must point the beginning of the +* zone +*/ +if (bio_op (bio) ==REQ_OP_ZONE_APPEND ) { +if (btrfs_dev_is_sequential (dev, physical)) { +u64 zone_start =round_down (physical, + fs_info->zone_size); + + bio->bi_iter.bi_sector = zone_start >>SECTOR_SHIFT ; + }else { + bio->bi_opf &= ~REQ_OP_ZONE_APPEND ; + bio->bi_opf |=REQ_OP_WRITE ; + } + } btrfs_debug_in_rcu(fs_info, "btrfs_map_bio: rw %d 0x%x, sector=%llu, dev=%lu (%s id %llu), size=%u", bio_op(bio), bio->bi_opf, bio->bi_iter.bi_sector,
fs/btrfs/zoned.c +68 -0
71 lines not on this page · raw message
fs/btrfs/zoned.h +12 -0
@@ -47,6 +47,9 @@ void btrfs_redirty_list_add(struct btrfs_transaction *trans, struct extent_buffer *eb);void btrfs_free_redirty_list (struct btrfs_transaction *trans);bool btrfs_use_zone_append (struct btrfs_inode *inode,struct extent_map *em); +void btrfs_record_physical_zoned (struct inode *inode,u64 file_offset, +struct bio *bio); +void btrfs_rewrite_logical_zoned (struct btrfs_ordered_extent *ordered);#else /* CONFIG_BLK_DEV_ZONED */ static inline int btrfs_get_dev_zone (struct btrfs_device *device,u64 pos,struct blk_zone *zone)
@@ -139,6 +142,15 @@ bool btrfs_use_zone_append(struct btrfs_inode *inode, struct extent_map *em) {return false; } + +static inline void btrfs_record_physical_zoned (struct inode *inode, +u64 file_offset,struct bio *bio) +{ +} + +static inline void btrfs_rewrite_logical_zoned ( +struct btrfs_ordered_extent *ordered) { } +#endif static inline bool btrfs_dev_is_sequential (struct btrfs_device *device,u64 pos)
Signature · 1 line
2.27.0
PATCH v12 27/41 btrfs: enable zone append writing for direct IO
In reply to Naohiro AotaLikewise to buffered IO, enable zone append writing for direct IO when its used on a zoned block device.
--- fs/btrfs/inode.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
fs/btrfs/inode.c +17 -0
@@ -7708,6 +7708,9 @@ static int btrfs_dio_iomap_begin(struct inode *inode, loff_t start, iomap->bdev = fs_info->fs_devices->latest_bdev; iomap->length = len; +if (write &&btrfs_use_zone_append (BTRFS_I (inode), em)) + iomap->flags |=IOMAP_F_ZONE_APPEND ; +free_extent_map (em);return 0 ;
@@ -7936,6 +7939,8 @@ static void btrfs_end_dio_bio(struct bio *bio)if (err) dip->dio_bio->bi_status = err; +btrfs_record_physical_zoned (dip->inode, dip->logical_offset, bio); +bio_put (bio);btrfs_dio_private_put (dip); }
@@ -8088,6 +8093,18 @@ static blk_qc_t btrfs_submit_direct(struct inode *inode, struct iomap *iomap, bio->bi_end_io = btrfs_end_dio_bio;btrfs_io_bio (bio)->logical = file_offset; +WARN_ON_ONCE (write &&btrfs_is_zoned (fs_info) && + fs_info->max_zone_append_size && +bio_op (bio) !=REQ_OP_ZONE_APPEND ); + +if (bio_op (bio) ==REQ_OP_ZONE_APPEND ) { + ret =extract_ordered_extent (inode, bio, file_offset); +if (ret) { +bio_put (bio); + goto out_err; + } + } +ASSERT (submit_len >= clone_len); submit_len -= clone_len;
Signature · 1 line
2.27.0
PATCH v12 28/41 btrfs: introduce dedicated data write path for ZONED mode
In reply to Naohiro AotaIf more than one IO is issued for one file extent, these IO can be written to separate regions on a device. Since we cannot map one file extent to such a separate area, we need to follow the "one IO == one ordered extent" rule.
The Normal buffered, uncompressed, not pre-allocated write path (used by cow_file_range()) sometimes does not follow this rule. It can write a part of an ordered extent when specified a region to write e.g., when its called from fdatasync().
Introduces a dedicated (uncompressed buffered) data write path for ZONED mode. This write path will CoW the region and write it at once.
--- fs/btrfs/inode.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-)
fs/btrfs/inode.c +32 -2
@@ -1400,6 +1400,29 @@ static int cow_file_range_async(struct btrfs_inode *inode,return 0 ; } +static noinline int run_delalloc_zoned(struct btrfs_inode *inode, +struct page *locked_page,u64 start, +u64 end,int *page_started, +unsigned long *nr_written) +{ +int ret; + + ret =cow_file_range (inode, locked_page, start, end, + page_started, nr_written,0 ); +if (ret) +return ret; + +if (*page_started) +return 0 ; + +__set_page_dirty_nobuffers (locked_page); +account_page_redirty (locked_page); +extent_write_locked_range (&inode->vfs_inode, start, end,WB_SYNC_ALL ); + *page_started =1 ; + +return 0 ; +} + static noinline int csum_exist_in_range(struct btrfs_fs_info *fs_info,u64 bytenr,u64 num_bytes) {
@@ -1879,17 +1902,24 @@ int btrfs_run_delalloc_range(struct btrfs_inode *inode, struct page *locked_page {int ret;int force_cow =need_force_cow (inode, start, end); +const bool do_compress =inode_can_compress (inode) && +inode_need_compress (inode, start, end); +const bool zoned =btrfs_is_zoned (inode->root->fs_info);if (inode->flags &BTRFS_INODE_NODATACOW && !force_cow) { +ASSERT (!zoned); ret =run_delalloc_nocow (inode, locked_page, start, end, page_started,1 , nr_written); }else if (inode->flags &BTRFS_INODE_PREALLOC && !force_cow) { +ASSERT (!zoned); ret =run_delalloc_nocow (inode, locked_page, start, end, page_started,0 , nr_written); - }else if (!inode_can_compress (inode) || - !inode_need_compress (inode, start, end)) { + }else if (!do_compress && !zoned) { ret =cow_file_range (inode, locked_page, start, end, page_started, nr_written,1 ); + }else if (!do_compress && zoned) { + ret =run_delalloc_zoned (inode, locked_page, start, end, + page_started, nr_written); }else {set_bit (BTRFS_INODE_HAS_ASYNC_EXTENT , &inode->runtime_flags); ret = cow_file_range_async(inode, wbc, locked_page, start, end,
Signature · 1 line
2.27.0
PATCH v12 29/41 btrfs: serialize meta IOs on ZONED mode
In reply to Naohiro AotaWe cannot use zone append for writing metadata, because the B-tree nodes have references to each other using the logical address. Without knowing the address in advance, we cannot construct the tree in the first place. So we need to serialize write IOs for metadata.
We cannot add a mutex around allocation and submission because metadata blocks are allocated in an earlier stage to build up B-trees.
Add a zoned_meta_io_lock and hold it during metadata IO submission in btree_write_cache_pages() to serialize IOs. Furthermore, this add a per-block group metadata IO submission pointer "meta_write_pointer" to ensure sequential writing, which can be caused when writing back blocks in an unfinished transaction.
--- fs/btrfs/block-group.h | 1 + fs/btrfs/ctree.h | 1 + fs/btrfs/disk-io.c | 1 + fs/btrfs/extent_io.c | 25 ++++++++++++++++++++- fs/btrfs/zoned.c | 50 ++++++++++++++++++++++++++++++++++++++++++ fs/btrfs/zoned.h | 32 +++++++++++++++++++++++++++ 6 files changed, 109 insertions(+), 1 deletion(-)
fs/btrfs/block-group.h +1 -0
@@ -192,6 +192,7 @@ struct btrfs_block_group {*/ u64 alloc_offset;u64 zone_unusable; +u64 meta_write_pointer; };static inline u64 btrfs_block_group_end (struct btrfs_block_group *block_group)
fs/btrfs/ctree.h +1 -0
@@ -976,6 +976,7 @@ struct btrfs_fs_info {/* Max size to emit ZONE_APPEND write command */ u64 max_zone_append_size; +struct mutex zoned_meta_io_lock;#ifdef CONFIG_BTRFS_FS_REF_VERIFY spinlock_t ref_verify_lock;
fs/btrfs/disk-io.c +1 -0
@@ -2704,6 +2704,7 @@ void btrfs_init_fs_info(struct btrfs_fs_info *fs_info)mutex_init (&fs_info->delete_unused_bgs_mutex);mutex_init (&fs_info->reloc_mutex);mutex_init (&fs_info->delalloc_root_mutex); +mutex_init (&fs_info->zoned_meta_io_lock);seqlock_init (&fs_info->profiles_lock);INIT_LIST_HEAD (&fs_info->dirty_cowonly_roots);
fs/btrfs/extent_io.c +24 -1
@@ -25,6 +25,7 @@#include "backref.h" #include "disk-io.h" #include "zoned.h" +#include "block-group.h" static struct kmem_cache *extent_state_cache;static struct kmem_cache *extent_buffer_cache;
@@ -4073,6 +4074,7 @@ static int submit_eb_page(struct page *page, struct writeback_control *wbc, struct extent_buffer **eb_context) {struct address_space *mapping = page->mapping; +struct btrfs_block_group *cache =NULL ;struct extent_buffer *eb;int ret;
@@ -4105,13 +4107,31 @@ static int submit_eb_page(struct page *page, struct writeback_control *wbc,if (!ret)return 0 ; +if (!btrfs_check_meta_write_pointer (eb->fs_info, eb, &cache)) { +/* +* If for_sync, this hole will be filled with +* trasnsaction commit. +*/ +if (wbc->sync_mode ==WB_SYNC_ALL && !wbc->for_sync) + ret = -EAGAIN ; +else + ret =0 ; +free_extent_buffer (eb); +return ret; + } + *eb_context = eb; ret =lock_extent_buffer_for_io (eb, epd);if (ret <=0 ) { +btrfs_revert_meta_write_pointer (cache, eb); +if (cache) +btrfs_put_block_group (cache);free_extent_buffer (eb);return ret; } +if (cache) +btrfs_put_block_group (cache); ret =write_one_eb (eb, wbc, epd);free_extent_buffer (eb);if (ret <0 )
@@ -4157,6 +4177,7 @@ int btree_write_cache_pages(struct address_space *mapping, tag =PAGECACHE_TAG_TOWRITE ; else tag =PAGECACHE_TAG_DIRTY ; +btrfs_zoned_meta_io_lock (fs_info); retry:if (wbc->sync_mode ==WB_SYNC_ALL )tag_pages_for_writeback (mapping, index, end);
@@ -4197,7 +4218,7 @@ int btree_write_cache_pages(struct address_space *mapping, }if (ret <0 ) {end_write_bio (&epd, ret); -return ret; + goto out; }/* * If something went wrong, don't allow any metadata write bio to be
@@ -4232,6 +4253,8 @@ int btree_write_cache_pages(struct address_space *mapping, ret = -EROFS ;end_write_bio (&epd, ret); } +out: +btrfs_zoned_meta_io_unlock (fs_info);return ret; }
fs/btrfs/zoned.c +50 -0
59 lines not on this page · raw message
fs/btrfs/zoned.h +32 -0
@@ -50,6 +50,11 @@ bool btrfs_use_zone_append(struct btrfs_inode *inode, struct extent_map *em);void btrfs_record_physical_zoned (struct inode *inode,u64 file_offset,struct bio *bio);void btrfs_rewrite_logical_zoned (struct btrfs_ordered_extent *ordered); +bool btrfs_check_meta_write_pointer (struct btrfs_fs_info *fs_info, +struct extent_buffer *eb, +struct btrfs_block_group **cache_ret); +void btrfs_revert_meta_write_pointer (struct btrfs_block_group *cache, +struct extent_buffer *eb);#else /* CONFIG_BLK_DEV_ZONED */ static inline int btrfs_get_dev_zone (struct btrfs_device *device,u64 pos,struct blk_zone *zone)
@@ -151,6 +156,19 @@ static inline void btrfs_record_physical_zoned(struct inode *inode,static inline void btrfs_rewrite_logical_zoned (struct btrfs_ordered_extent *ordered) { } +static inline bool btrfs_check_meta_write_pointer (struct btrfs_fs_info *fs_info, +struct extent_buffer *eb, +struct btrfs_block_group **cache_ret) +{ +return true; +} + +static inline void btrfs_revert_meta_write_pointer ( +struct btrfs_block_group *cache, +struct extent_buffer *eb) +{ +} +#endif static inline bool btrfs_dev_is_sequential (struct btrfs_device *device,u64 pos)
@@ -243,4 +261,18 @@ static inline bool btrfs_can_zone_reset(struct btrfs_device *device, return true; } +static inline void btrfs_zoned_meta_io_lock (struct btrfs_fs_info *fs_info) +{ +if (!btrfs_is_zoned (fs_info)) +return ; +mutex_lock (&fs_info->zoned_meta_io_lock); +} + +static inline void btrfs_zoned_meta_io_unlock (struct btrfs_fs_info *fs_info) +{ +if (!btrfs_is_zoned (fs_info)) +return ; +mutex_unlock (&fs_info->zoned_meta_io_lock); +} +#endif
Signature · 1 line
2.27.0
PATCH v12 30/41 btrfs: wait existing extents before truncating
In reply to Naohiro AotaWhen truncating a file, file buffers which have already been allocated but not yet written may be truncated. Truncating these buffers could cause breakage of a sequential write pattern in a block group if the truncated blocks are for example followed by blocks allocated to another file. To avoid this problem, always wait for write out of all unwritten buffers before proceeding with the truncate execution.
--- fs/btrfs/inode.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/btrfs/inode.c +10 -0
@@ -5136,6 +5136,16 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr)btrfs_drew_write_unlock (&root->snapshot_lock);btrfs_end_transaction (trans); }else { +struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); + +if (btrfs_is_zoned (fs_info)) { + ret =btrfs_wait_ordered_range ( + inode, +ALIGN (newsize, fs_info->sectorsize), + (u64)-1 ); +if (ret) +return ret; + }/* * We're truncating a file that used to have good data down to
Signature · 1 line
2.27.0
PATCH v12 31/41 btrfs: avoid async metadata checksum on ZONED mode
In reply to Naohiro AotaIn ZONED, btrfs uses per-FS zoned_meta_io_lock to serialize the metadata write IOs.
Even with these serialization, write bios sent from btree_write_cache_pages can be reordered by async checksum workers as these workers are per CPU and not per zone.
To preserve write BIO ordering, we can disable async metadata checksum on ZONED. This does not result in lower performance with HDDs as a single CPU core is fast enough to do checksum for a single zone write stream with the maximum possible bandwidth of the device. If multiple zones are being written simultaneously, HDD seek overhead lowers the achievable maximum bandwidth, resulting again in a per zone checksum serialization not affecting performance.
--- fs/btrfs/disk-io.c | 2 ++ 1 file changed, 2 insertions(+)
fs/btrfs/disk-io.c +2 -0
@@ -814,6 +814,8 @@ static blk_status_t btree_submit_bio_start(struct inode *inode, struct bio *bio,static int check_async_write (struct btrfs_fs_info *fs_info,struct btrfs_inode *bi) { +if (btrfs_is_zoned (fs_info)) +return 0 ;if (atomic_read (&bi->sync_writers))return 0 ;if (test_bit (BTRFS_FS_CSUM_IMPL_FAST , &fs_info->flags))
Signature · 1 line
2.27.0
PATCH v12 32/41 btrfs: mark block groups to copy for device-replace
In reply to Naohiro AotaThis is the 1/4 patch to support device-replace in ZONED mode.
We have two types of I/Os during the device-replace process. One is an I/O to "copy" (by the scrub functions) all the device extents on the source device to the destination device. The other one is an I/O to "clone" (by handle_ops_on_dev_replace()) new incoming write I/Os from users to the source device into the target device.
Cloning incoming I/Os can break the sequential write rule in the target device. When writing is mapped in the middle of a block group, the I/O is directed in the middle of a target device zone, which breaks the sequential write rule.
However, the cloning function cannot be merely disabled since incoming I/Os targeting already copied device extents must be cloned so that the I/O is executed on the target device.
We cannot use dev_replace->cursor_{left,right} to determine whether bio is going to not yet copied region. Since we have a time gap between finishing btrfs_scrub_dev() and rewriting the mapping tree in btrfs_dev_replace_finishing(), we can have a newly allocated device extent which is never cloned nor copied.
So the point is to copy only already existing device extents. This patch introduces mark_block_group_to_copy() to mark existing block groups as a target of copying. Then, handle_ops_on_dev_replace() and dev-replace can check the flag to do their job.
--- fs/btrfs/block-group.h | 1 + fs/btrfs/dev-replace.c | 182 +++++++++++++++++++++++++++++++++++++++++ fs/btrfs/dev-replace.h | 3 + fs/btrfs/scrub.c | 17 ++++ 4 files changed, 203 insertions(+)
fs/btrfs/block-group.h +1 -0
@@ -95,6 +95,7 @@ struct btrfs_block_group { unsigned int iref:1; unsigned int has_caching_ctl:1; unsigned int removed:1; + unsigned int to_copy:1;int disk_cache_state;
fs/btrfs/dev-replace.c +182 -0
200 lines not on this page · raw message
fs/btrfs/dev-replace.h +3 -0
@@ -18,5 +18,8 @@ int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info);void btrfs_dev_replace_suspend_for_unmount (struct btrfs_fs_info *fs_info);int btrfs_resume_dev_replace_async (struct btrfs_fs_info *fs_info);int __pure btrfs_dev_replace_is_ongoing (struct btrfs_dev_replace *dev_replace); +bool btrfs_finish_block_group_to_copy (struct btrfs_device *srcdev, +struct btrfs_block_group *cache, +u64 physical);#endif
fs/btrfs/scrub.c +17 -0
@@ -3564,6 +3564,17 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx,if (!cache) goto skip; + +if (sctx->is_dev_replace &&btrfs_is_zoned (fs_info)) { +spin_lock (&cache->lock); +if (!cache->to_copy) { +spin_unlock (&cache->lock); + ro_set =0 ; + goto done; + } +spin_unlock (&cache->lock); + } +/* * Make sure that while we are scrubbing the corresponding block * group doesn't get its logical address and its device extents
@@ -3695,6 +3706,12 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx,scrub_pause_off (fs_info); +if (sctx->is_dev_replace && + !btrfs_finish_block_group_to_copy (dev_replace->srcdev, + cache, found_key.offset)) + ro_set =0 ; + +done:down_write (&dev_replace->rwsem); dev_replace->cursor_left = dev_replace->cursor_right; dev_replace->item_needs_writeback =1 ;
Signature · 1 line
2.27.0
PATCH v12 33/41 btrfs: implement cloning for ZONED device-replace
In reply to Naohiro AotaThis is 2/4 patch to implement device-replace for ZONED mode.
On zoned mode, a block group must be either copied (from the source device to the destination device) or cloned (to the both device).
This commit implements the cloning part. If a block group targeted by an IO is marked to copy, we should not clone the IO to the destination device, because the block group is eventually copied by the replace process.
This commit also handles cloning of device reset.
--- fs/btrfs/extent-tree.c | 57 +++++++++++++++++++++++++++++++----------- fs/btrfs/volumes.c | 33 ++++++++++++++++++++++-- fs/btrfs/zoned.c | 11 ++++++++ 3 files changed, 84 insertions(+), 17 deletions(-)
fs/btrfs/extent-tree.c +42 -15
@@ -35,6 +35,7 @@#include "discard.h" #include "rcu-string.h" #include "zoned.h" +#include "dev-replace.h" #undef SCRAMBLE_DELAYED_REFS
@@ -1300,6 +1301,46 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len,return ret; } +static int do_discard_extent (struct btrfs_bio_stripe *stripe,u64 *bytes) +{ +struct btrfs_device *dev = stripe->dev; +struct btrfs_fs_info *fs_info = dev->fs_info; +struct btrfs_dev_replace *dev_replace = &fs_info->dev_replace; +u64 phys = stripe->physical; +u64 len = stripe->length; +u64 discarded =0 ; +int ret =0 ; + +/* Zone reset in ZONED mode */ +if (btrfs_can_zone_reset (dev, phys, len)) { +u64 src_disc; + + ret =btrfs_reset_device_zone (dev, phys, len, &discarded); +if (ret) + goto out; + +if (!btrfs_dev_replace_is_ongoing (dev_replace) || + dev != dev_replace->srcdev) + goto out; + + src_disc = discarded; + +/* send to replace target as well */ + ret =btrfs_reset_device_zone (dev_replace->tgtdev, phys, len, + &discarded); + discarded += src_disc; + }else if (blk_queue_discard (bdev_get_queue (stripe->dev->bdev))) { + ret =btrfs_issue_discard (dev->bdev, phys, len, &discarded); + }else { + ret =0 ; + *bytes =0 ; + } + +out: + *bytes = discarded; +return ret; +} +int btrfs_discard_extent (struct btrfs_fs_info *fs_info,u64 bytenr,u64 num_bytes,u64 *actual_bytes) {
@@ -1333,28 +1374,14 @@ int btrfs_discard_extent(struct btrfs_fs_info *fs_info, u64 bytenr, stripe = bbio->stripes;for (i =0 ; i < bbio->num_stripes; i++, stripe++) { -struct btrfs_device *dev = stripe->dev; -u64 physical = stripe->physical; -u64 length = stripe->length;u64 bytes; -struct request_queue *req_q;if (!stripe->dev->bdev) {ASSERT (btrfs_test_opt (fs_info,DEGRADED ));continue ; } - req_q =bdev_get_queue (stripe->dev->bdev); -/* Zone reset in ZONED mode */ -if (btrfs_can_zone_reset (dev, physical, length)) - ret =btrfs_reset_device_zone (dev, physical, - length, &bytes); -else if (blk_queue_discard (req_q)) - ret =btrfs_issue_discard (dev->bdev, physical, - length, &bytes); -else -continue ; - + ret =do_discard_extent (stripe, &bytes);if (!ret) { discarded_bytes += bytes; }else if (ret != -EOPNOTSUPP ) {
fs/btrfs/volumes.c +31 -2
@@ -5973,9 +5973,29 @@ static int get_extra_mirror_from_replace(struct btrfs_fs_info *fs_info,return ret; } +static bool is_block_group_to_copy (struct btrfs_fs_info *fs_info,u64 logical) +{ +struct btrfs_block_group *cache; +bool ret; + +/* non-ZONED mode does not use "to_copy" flag */ +if (!btrfs_is_zoned (fs_info)) +return false; + + cache =btrfs_lookup_block_group (fs_info, logical); + +spin_lock (&cache->lock); + ret = cache->to_copy; +spin_unlock (&cache->lock); + +btrfs_put_block_group (cache); +return ret; +} +static void handle_ops_on_dev_replace (enum btrfs_map_op op,struct btrfs_bio **bbio_ret,struct btrfs_dev_replace *dev_replace, +u64 logical,int *num_stripes_ret,int *max_errors_ret) {struct btrfs_bio *bbio = *bbio_ret;
@@ -5988,6 +6008,15 @@ static void handle_ops_on_dev_replace(enum btrfs_map_op op,if (op ==BTRFS_MAP_WRITE ) {int index_where_to_add; +/* +* a block group which have "to_copy" set will +* eventually copied by dev-replace process. We can +* avoid cloning IO here. +*/ +if (is_block_group_to_copy (dev_replace->srcdev->fs_info, + logical)) +return ; +/* * duplicate the write operations while the dev replace * procedure is running. Since the copying of the old disk to
@@ -6383,8 +6412,8 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info,if (dev_replace_is_ongoing && dev_replace->tgtdev !=NULL &&need_full_stripe (op)) { -handle_ops_on_dev_replace (op, &bbio, dev_replace, &num_stripes, - &max_errors); +handle_ops_on_dev_replace (op, &bbio, dev_replace, logical, + &num_stripes, &max_errors); } *bbio_ret = bbio;
fs/btrfs/zoned.c +11 -0
@@ -11,6 +11,7 @@#include "disk-io.h" #include "block-group.h" #include "transaction.h" +#include "dev-replace.h" /* Maximum number of zones to report per blkdev_report_zones() call */ #define BTRFS_REPORT_NR_ZONES 4096
@@ -1039,6 +1040,8 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new)for (i =0 ; i < map->num_stripes; i++) {bool is_sequential;struct blk_zone zone; +struct btrfs_dev_replace *dev_replace = &fs_info->dev_replace; +int dev_replace_is_ongoing =0 ; device = map->stripes[i].dev; physical = map->stripes[i].physical;
@@ -1065,6 +1068,14 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new)*/ btrfs_dev_clear_zone_empty (device, physical); +down_read (&dev_replace->rwsem); + dev_replace_is_ongoing = +btrfs_dev_replace_is_ongoing (dev_replace); +if (dev_replace_is_ongoing && dev_replace->tgtdev !=NULL ) +btrfs_dev_clear_zone_empty (dev_replace->tgtdev, + physical); +up_read (&dev_replace->rwsem); +/* * The group is mapped to a sequential zone. Get the zone write * pointer to determine the allocation offset within the zone.
Signature · 1 line
2.27.0
PATCH v12 34/41 btrfs: implement copying for ZONED device-replace
In reply to Naohiro AotaThis is 3/4 patch to implement device-replace on ZONED mode.
This commit implement copying. So, it track the write pointer during device replace process. Device-replace's copying is smart to copy only used extents on source device, we have to fill the gap to honor the sequential write rule in the target device.
Device-replace process in ZONED mode must copy or clone all the extents in the source device exactly once. So, we need to use to ensure allocations started just before the dev-replace process to have their corresponding extent information in the B-trees. finish_extent_writes_for_zoned() implements that functionality, which basically is the removed code in the commit 042528f8d840 ("Btrfs: fix block group remaining RO forever after error during device replace").
--- fs/btrfs/scrub.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/btrfs/zoned.c | 12 +++++++ fs/btrfs/zoned.h | 8 +++++ 3 files changed, 106 insertions(+)
fs/btrfs/scrub.c +86 -0
@@ -166,6 +166,7 @@ struct scrub_ctx {int pages_per_rd_bio;int is_dev_replace; +u64 write_pointer;struct scrub_bio *wr_curr_bio;struct mutex wr_lock;
@@ -1619,6 +1620,25 @@ static int scrub_write_page_to_dev_replace(struct scrub_block *sblock,return scrub_add_page_to_wr_bio (sblock->sctx, spage); } +static int fill_writer_pointer_gap (struct scrub_ctx *sctx,u64 physical) +{ +int ret =0 ; +u64 length; + +if (!btrfs_is_zoned (sctx->fs_info)) +return 0 ; + +if (sctx->write_pointer < physical) { + length = physical - sctx->write_pointer; + + ret =btrfs_zoned_issue_zeroout (sctx->wr_tgtdev, + sctx->write_pointer, length); +if (!ret) + sctx->write_pointer = physical; + } +return ret; +} +static int scrub_add_page_to_wr_bio (struct scrub_ctx *sctx,struct scrub_page *spage) {
@@ -1641,6 +1661,13 @@ static int scrub_add_page_to_wr_bio(struct scrub_ctx *sctx,if (sbio->page_count ==0 ) {struct bio *bio; + ret =fill_writer_pointer_gap (sctx, + spage->physical_for_dev_replace); +if (ret) { +mutex_unlock (&sctx->wr_lock); +return ret; + } + sbio->physical = spage->physical_for_dev_replace; sbio->logical = spage->logical; sbio->dev = sctx->wr_tgtdev;
@@ -1705,6 +1732,10 @@ static void scrub_wr_submit(struct scrub_ctx *sctx)* doubled the write performance on spinning disks when measured * with Linux 3.5 */ btrfsic_submit_bio (sbio->bio); + +if (btrfs_is_zoned (sctx->fs_info)) + sctx->write_pointer = sbio->physical + + sbio->page_count *PAGE_SIZE ; }static void scrub_wr_bio_end_io (struct bio *bio)
@@ -3028,6 +3059,21 @@ static noinline_for_stack int scrub_raid56_parity(struct scrub_ctx *sctx,return ret <0 ? ret :0 ; } +static void sync_replace_for_zoned (struct scrub_ctx *sctx) +{ +if (!btrfs_is_zoned (sctx->fs_info)) +return ; + + sctx->flush_all_writes = true; +scrub_submit (sctx); +mutex_lock (&sctx->wr_lock); +scrub_wr_submit (sctx); +mutex_unlock (&sctx->wr_lock); + +wait_event (sctx->list_wait, +atomic_read (&sctx->bios_in_flight) ==0 ); +} + static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx, struct map_lookup *map, struct btrfs_device *scrub_dev,
@@ -3168,6 +3214,14 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,*/ blk_start_plug (&plug); +if (sctx->is_dev_replace && +btrfs_dev_is_sequential (sctx->wr_tgtdev, physical)) { +mutex_lock (&sctx->wr_lock); + sctx->write_pointer = physical; +mutex_unlock (&sctx->wr_lock); + sctx->flush_all_writes = true; + } +/* * now find all extents for each stripe and scrub them */
@@ -3356,6 +3410,9 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,if (ret) goto out; +if (sctx->is_dev_replace) +sync_replace_for_zoned (sctx); +if (extent_logical + extent_len < key.objectid + bytes) {if (map->type &BTRFS_BLOCK_GROUP_RAID56_MASK ) {
@@ -3478,6 +3535,25 @@ static noinline_for_stack int scrub_chunk(struct scrub_ctx *sctx,return ret; } +static int finish_extent_writes_for_zoned (struct btrfs_root *root, +struct btrfs_block_group *cache) +{ +struct btrfs_fs_info *fs_info = cache->fs_info; +struct btrfs_trans_handle *trans; + +if (!btrfs_is_zoned (fs_info)) +return 0 ; + +btrfs_wait_block_group_reservations (cache); +btrfs_wait_nocow_writers (cache); +btrfs_wait_ordered_roots (fs_info,U64_MAX , cache->start, cache->length); + + trans =btrfs_join_transaction (root); +if (IS_ERR (trans)) +return PTR_ERR (trans); +return btrfs_commit_transaction (trans); +} +static noinline_for_stack int scrub_enumerate_chunks(struct scrub_ctx *sctx,struct btrfs_device *scrub_dev,u64 start,u64 end)
@@ -3633,6 +3709,16 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx,* group is not RO. */ ret =btrfs_inc_block_group_ro (cache, sctx->is_dev_replace); +if (!ret && sctx->is_dev_replace) { + ret =finish_extent_writes_for_zoned (root, cache); +if (ret) { +btrfs_dec_block_group_ro (cache); +scrub_pause_off (fs_info); +btrfs_put_block_group (cache); +break ; + } + } +if (ret ==0 ) { ro_set =1 ; }else if (ret == -ENOSPC && !sctx->is_dev_replace) {
fs/btrfs/zoned.c +12 -0
@@ -1381,3 +1381,15 @@ void btrfs_revert_meta_write_pointer(struct btrfs_block_group *cache,ASSERT (cache->meta_write_pointer == eb->start + eb->len); cache->meta_write_pointer = eb->start; } + +int btrfs_zoned_issue_zeroout (struct btrfs_device *device,u64 physical, +u64 length) +{ +if (!btrfs_dev_is_sequential (device, physical)) +return -EOPNOTSUPP ; + +return blkdev_issue_zeroout (device->bdev, + physical >>SECTOR_SHIFT , + length >>SECTOR_SHIFT , +GFP_NOFS ,0 ); +}
fs/btrfs/zoned.h +8 -0
@@ -55,6 +55,8 @@ bool btrfs_check_meta_write_pointer(struct btrfs_fs_info *fs_info, struct btrfs_block_group **cache_ret);void btrfs_revert_meta_write_pointer (struct btrfs_block_group *cache,struct extent_buffer *eb); +int btrfs_zoned_issue_zeroout (struct btrfs_device *device,u64 physical, +u64 length);#else /* CONFIG_BLK_DEV_ZONED */ static inline int btrfs_get_dev_zone (struct btrfs_device *device,u64 pos,struct blk_zone *zone)
@@ -169,6 +171,12 @@ static inline void btrfs_revert_meta_write_pointer( { } +static inline int btrfs_zoned_issue_zeroout (struct btrfs_device *device, +u64 physical,u64 length) +{ +return -EOPNOTSUPP ; +} +#endif static inline bool btrfs_dev_is_sequential (struct btrfs_device *device,u64 pos)
Signature · 1 line
2.27.0
PATCH v12 35/41 btrfs: support dev-replace in ZONED mode
In reply to Naohiro AotaThis is 4/4 patch to implement device-replace on ZONED mode.
Even after the copying is done, the write pointers of the source device and the destination device may not be synchronized. For example, when the last allocated extent is freed before device-replace process, the extent is not copied, leaving a hole there.
This patch synchronize the write pointers by writing zeros to the destination device.
--- fs/btrfs/scrub.c | 39 +++++++++++++++++++++++++ fs/btrfs/zoned.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/btrfs/zoned.h | 9 ++++++ 3 files changed, 122 insertions(+)
fs/btrfs/scrub.c +39 -0
@@ -1628,6 +1628,9 @@ static int fill_writer_pointer_gap(struct scrub_ctx *sctx, u64 physical)if (!btrfs_is_zoned (sctx->fs_info))return 0 ; +if (!btrfs_dev_is_sequential (sctx->wr_tgtdev, physical)) +return 0 ; +if (sctx->write_pointer < physical) { length = physical - sctx->write_pointer;
@@ -3074,6 +3077,31 @@ static void sync_replace_for_zoned(struct scrub_ctx *sctx) atomic_read(&sctx->bios_in_flight) == 0); } +static int sync_write_pointer_for_zoned (struct scrub_ctx *sctx,u64 logical, +u64 physical,u64 physical_end) +{ +struct btrfs_fs_info *fs_info = sctx->fs_info; +int ret =0 ; + +if (!btrfs_is_zoned (fs_info)) +return 0 ; + +wait_event (sctx->list_wait,atomic_read (&sctx->bios_in_flight) ==0 ); + +mutex_lock (&sctx->wr_lock); +if (sctx->write_pointer < physical_end) { + ret =btrfs_sync_zone_write_pointer (sctx->wr_tgtdev, logical, + physical, + sctx->write_pointer); +if (ret) +btrfs_err (fs_info,"failed to recover write pointer" ); + } +mutex_unlock (&sctx->wr_lock); +btrfs_dev_clear_zone_empty (sctx->wr_tgtdev, physical); + +return ret; +} + static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx, struct map_lookup *map, struct btrfs_device *scrub_dev,
@@ -3480,6 +3508,17 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,blk_finish_plug (&plug);btrfs_free_path (path);btrfs_free_path (ppath); + +if (sctx->is_dev_replace && ret >=0 ) { +int ret2; + + ret2 =sync_write_pointer_for_zoned (sctx, base + offset, + map->stripes[num].physical, + physical_end); +if (ret2) + ret = ret2; + } +return ret <0 ? ret :0 ; }
fs/btrfs/zoned.c +74 -0
83 lines not on this page · raw message
fs/btrfs/zoned.h +9 -0
@@ -57,6 +57,8 @@ void btrfs_revert_meta_write_pointer(struct btrfs_block_group *cache, struct extent_buffer *eb);int btrfs_zoned_issue_zeroout (struct btrfs_device *device,u64 physical,u64 length); +int btrfs_sync_zone_write_pointer (struct btrfs_device *tgt_dev,u64 logical, +u64 physical_start,u64 physical_pos);#else /* CONFIG_BLK_DEV_ZONED */ static inline int btrfs_get_dev_zone (struct btrfs_device *device,u64 pos,struct blk_zone *zone)
@@ -177,6 +179,13 @@ static inline int btrfs_zoned_issue_zeroout(struct btrfs_device *device, return -EOPNOTSUPP; } +static inline int btrfs_sync_zone_write_pointer (struct btrfs_device *tgt_dev, +u64 logical,u64 physical_start, +u64 physical_pos) +{ +return -EOPNOTSUPP ; +} +#endif static inline bool btrfs_dev_is_sequential (struct btrfs_device *device,u64 pos)
Signature · 1 line
2.27.0
PATCH v12 36/41 btrfs: enable relocation in ZONED mode
In reply to Naohiro AotaTo serialize allocation and submit_bio, we introduced mutex around them. As a result, preallocation must be completely disabled to avoid a deadlock.
Since current relocation process relies on preallocation to move file data extents, it must be handled in another way. In ZONED mode, we just truncate the inode to the size that we wanted to pre-allocate. Then, we flush dirty pages on the file before finishing relocation process. run_delalloc_zoned() will handle all the allocation and submit IOs to the underlying layers.
--- fs/btrfs/relocation.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-)
fs/btrfs/relocation.c +32 -2
@@ -2553,6 +2553,31 @@ static noinline_for_stack int prealloc_file_extent_cluster(if (ret)return ret; +/* +* In ZONED mode, we cannot preallocate the file region. Instead, we +* dirty and fiemap_write the region. +*/ +if (btrfs_is_zoned (inode->root->fs_info)) { +struct btrfs_root *root = inode->root; +struct btrfs_trans_handle *trans; + + end = cluster->end - offset +1 ; + trans =btrfs_start_transaction (root,1 ); +if (IS_ERR (trans)) +return PTR_ERR (trans); + + inode->vfs_inode.i_ctime =current_time (&inode->vfs_inode); +i_size_write (&inode->vfs_inode, end); + ret =btrfs_update_inode (trans, root, inode); +if (ret) { +btrfs_abort_transaction (trans, ret); +btrfs_end_transaction (trans); +return ret; + } + +return btrfs_end_transaction (trans); + } +inode_lock (&inode->vfs_inode);for (nr =0 ; nr < cluster->nr; nr++) { start = cluster->boundary[nr] - offset;
@@ -2749,6 +2774,8 @@ static int relocate_file_extent_cluster(struct inode *inode, } }WARN_ON (nr != cluster->nr); +if (btrfs_is_zoned (fs_info) && !ret) + ret =btrfs_wait_ordered_range (inode,0 , (u64)-1 ); out:kfree (ra);return ret;
@@ -3384,8 +3411,12 @@ static int __insert_orphan_inode(struct btrfs_trans_handle *trans,struct btrfs_path *path;struct btrfs_inode_item *item;struct extent_buffer *leaf; +u64 flags =BTRFS_INODE_NOCOMPRESS |BTRFS_INODE_PREALLOC ;int ret; +if (btrfs_is_zoned (trans->fs_info)) + flags &= ~BTRFS_INODE_PREALLOC ; + path =btrfs_alloc_path ();if (!path)return -ENOMEM ;
@@ -3400,8 +3431,7 @@ static int __insert_orphan_inode(struct btrfs_trans_handle *trans,btrfs_set_inode_generation (leaf, item,1 );btrfs_set_inode_size (leaf, item,0 );btrfs_set_inode_mode (leaf, item,S_IFREG |0600 ); -btrfs_set_inode_flags (leaf, item,BTRFS_INODE_NOCOMPRESS | -BTRFS_INODE_PREALLOC ); +btrfs_set_inode_flags (leaf, item, flags);btrfs_mark_buffer_dirty (leaf); out:btrfs_free_path (path);
Signature · 1 line
2.27.0
PATCH v12 37/41 btrfs: relocate block group to repair IO failure in ZONED
In reply to Naohiro AotaWhen btrfs find a checksum error and if the file system has a mirror of the damaged data, btrfs read the correct data from the mirror and write the data to damaged blocks. This repairing, however, is against the sequential write required rule.
We can consider three methods to repair an IO failure in ZONED mode:
(1) Reset and rewrite the damaged zone
(2) Allocate new device extent and replace the damaged device extent to the new extent
(3) Relocate the corresponding block group
Method (1) is most similar to a behavior done with regular devices. However, it also wipes non-damaged data in the same device extent, and so it unnecessary degrades non-damaged data.
Method (2) is much like device replacing but done in the same device. It is safe because it keeps the device extent until the replacing finish. However, extending device replacing is non-trivial. It assumes "src_dev->physical == dst_dev->physical". Also, the extent mapping replacing function should be extended to support replacing device extent position in one device.
Method (3) invokes relocation of the damaged block group, so it is straightforward to implement. It relocates all the mirrored device extents, so it is, potentially, a more costly operation than method (1) or (2). But it relocates only using extents which reduce the total IO size.
Let's apply method (3) for now. In the future, we can extend device-replace and apply method (2).
For protecting a block group gets relocated multiple time with multiple IO errors, this commit introduces "relocating_repair" bit to show it's now relocating to repair IO failures. Also it uses a new kthread "btrfs-relocating-repair", not to block IO path with relocating process.
This commit also supports repairing in the scrub process.
--- fs/btrfs/block-group.h | 1 + fs/btrfs/extent_io.c | 3 ++ fs/btrfs/scrub.c | 3 ++ fs/btrfs/volumes.c | 71 ++++++++++++++++++++++++++++++++++++++++++ fs/btrfs/volumes.h | 1 + 5 files changed, 79 insertions(+)
fs/btrfs/block-group.h +1 -0
@@ -96,6 +96,7 @@ struct btrfs_block_group { unsigned int has_caching_ctl:1; unsigned int removed:1; unsigned int to_copy:1; + unsigned int relocating_repair:1;int disk_cache_state;
fs/btrfs/extent_io.c +3 -0
@@ -2260,6 +2260,9 @@ int repair_io_failure(struct btrfs_fs_info *fs_info, u64 ino, u64 start,ASSERT (!(fs_info->sb->s_flags &SB_RDONLY ));BUG_ON (!mirror_num); +if (btrfs_is_zoned (fs_info)) +return btrfs_repair_one_zone (fs_info, logical); + bio =btrfs_io_bio_alloc (1 ); bio->bi_iter.bi_size =0 ; map_length = length;
fs/btrfs/scrub.c +3 -0
@@ -857,6 +857,9 @@ static int scrub_handle_errored_block(struct scrub_block *sblock_to_check) have_csum = sblock_to_check->pagev[0 ]->have_csum; dev = sblock_to_check->pagev[0 ]->dev; +if (btrfs_is_zoned (fs_info) && !sctx->is_dev_replace) +return btrfs_repair_one_zone (fs_info, logical); +/* * We must use GFP_NOFS because the scrub task might be waiting for a * worker task executing this function and in turn a transaction commit
fs/btrfs/volumes.c +71 -0
74 lines not on this page · raw message
fs/btrfs/volumes.h +1 -0
@@ -597,5 +597,6 @@ void btrfs_scratch_superblocks(struct btrfs_fs_info *fs_info,int btrfs_bg_type_to_factor (u64 flags);const char *btrfs_bg_type_to_raid_name (u64 flags);int btrfs_verify_dev_extents (struct btrfs_fs_info *fs_info); +int btrfs_repair_one_zone (struct btrfs_fs_info *fs_info,u64 logical);#endif
Signature · 1 line
2.27.0
PATCH v12 38/41 btrfs: split alloc_log_tree()
In reply to Naohiro AotaThis is a preparation for the next patch. This commit split alloc_log_tree() to allocating tree structure part (remains in alloc_log_tree()) and allocating tree node part (moved in btrfs_alloc_log_tree_node()). The latter part is also exported to be used in the next patch.
--- fs/btrfs/disk-io.c | 33 +++++++++++++++++++++++++++------ fs/btrfs/disk-io.h | 2 ++ 2 files changed, 29 insertions(+), 6 deletions(-)
fs/btrfs/disk-io.c +27 -6
@@ -1197,7 +1197,6 @@ static struct btrfs_root *alloc_log_tree(struct btrfs_trans_handle *trans, struct btrfs_fs_info *fs_info) {struct btrfs_root *root; -struct extent_buffer *leaf; root =btrfs_alloc_root (fs_info,BTRFS_TREE_LOG_OBJECTID ,GFP_NOFS );if (!root)
@@ -1207,6 +1206,14 @@ static struct btrfs_root *alloc_log_tree(struct btrfs_trans_handle *trans, root->root_key.type =BTRFS_ROOT_ITEM_KEY ; root->root_key.offset =BTRFS_TREE_LOG_OBJECTID ; +return root; +} + +int btrfs_alloc_log_tree_node (struct btrfs_trans_handle *trans, +struct btrfs_root *root) +{ +struct extent_buffer *leaf; +/* * DON'T set SHAREABLE bit for log trees. *
@@ -1219,26 +1226,33 @@ static struct btrfs_root *alloc_log_tree(struct btrfs_trans_handle *trans, leaf =btrfs_alloc_tree_block (trans, root,0 ,BTRFS_TREE_LOG_OBJECTID ,NULL ,0 ,0 ,0 ,BTRFS_NESTING_NORMAL ); -if (IS_ERR (leaf)) { -btrfs_put_root (root); -return ERR_CAST (leaf); - } +if (IS_ERR (leaf)) +return PTR_ERR (leaf); root->node = leaf;btrfs_mark_buffer_dirty (root->node);btrfs_tree_unlock (root->node); -return root; + +return 0 ; }int btrfs_init_log_root_tree (struct btrfs_trans_handle *trans,struct btrfs_fs_info *fs_info) {struct btrfs_root *log_root; +int ret; log_root =alloc_log_tree (trans, fs_info);if (IS_ERR (log_root))return PTR_ERR (log_root); + + ret =btrfs_alloc_log_tree_node (trans, log_root); +if (ret) { +btrfs_put_root (log_root); +return ret; + } +WARN_ON (fs_info->log_root_tree); fs_info->log_root_tree = log_root;return 0 ;
@@ -1250,11 +1264,18 @@ int btrfs_add_log_tree(struct btrfs_trans_handle *trans,struct btrfs_fs_info *fs_info = root->fs_info;struct btrfs_root *log_root;struct btrfs_inode_item *inode_item; +int ret; log_root =alloc_log_tree (trans, fs_info);if (IS_ERR (log_root))return PTR_ERR (log_root); + ret =btrfs_alloc_log_tree_node (trans, log_root); +if (ret) { +btrfs_put_root (log_root); +return ret; + } + log_root->last_trans = trans->transid; log_root->root_key.offset = root->root_key.objectid;
fs/btrfs/disk-io.h +2 -0
@@ -120,6 +120,8 @@ blk_status_t btrfs_wq_submit_bio(struct inode *inode, struct bio *bio, extent_submit_bio_start_t *submit_bio_start);blk_status_t btrfs_submit_bio_done (void *private_data,struct bio *bio,int mirror_num); +int btrfs_alloc_log_tree_node (struct btrfs_trans_handle *trans, +struct btrfs_root *root);int btrfs_init_log_root_tree (struct btrfs_trans_handle *trans,struct btrfs_fs_info *fs_info); int btrfs_add_log_tree(struct btrfs_trans_handle *trans,
Signature · 1 line
2.27.0
PATCH v12 39/41 btrfs: extend zoned allocator to use dedicated tree-log block group
In reply to Naohiro AotaThis is the 1/3 patch to enable tree log on ZONED mode.
The tree-log feature does not work on ZONED mode as is. Blocks for a tree-log tree are allocated mixed with other metadata blocks, and btrfs writes and syncs the tree-log blocks to devices at the time of fsync(), which is different timing from a global transaction commit. As a result, both writing tree-log blocks and writing other metadata blocks become non-sequential writes that ZONED mode must avoid.
We can introduce a dedicated block group for tree-log blocks so that tree-log blocks and other metadata blocks can be separated write streams. As a result, each write stream can now be written to devices separately. "fs_info->treelog_bg" tracks the dedicated block group and btrfs assign "treelog_bg" on-demand on tree-log block allocation time.
This commit extends the zoned block allocator to use the block group.
--- fs/btrfs/block-group.c | 2 ++ fs/btrfs/ctree.h | 2 ++ fs/btrfs/disk-io.c | 1 + fs/btrfs/extent-tree.c | 75 +++++++++++++++++++++++++++++++++++++++--- fs/btrfs/zoned.h | 14 ++++++++ 5 files changed, 90 insertions(+), 4 deletions(-)
fs/btrfs/block-group.c +2 -0
@@ -902,6 +902,8 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,btrfs_return_cluster_to_free_space (block_group, cluster);spin_unlock (&cluster->refill_lock); +btrfs_clear_treelog_bg (block_group); + path =btrfs_alloc_path ();if (!path) { ret = -ENOMEM ;
fs/btrfs/ctree.h +2 -0
@@ -977,6 +977,8 @@ struct btrfs_fs_info {/* Max size to emit ZONE_APPEND write command */ u64 max_zone_append_size;struct mutex zoned_meta_io_lock; +spinlock_t treelog_bg_lock; +u64 treelog_bg;#ifdef CONFIG_BTRFS_FS_REF_VERIFY spinlock_t ref_verify_lock;
fs/btrfs/disk-io.c +1 -0
@@ -2722,6 +2722,7 @@ void btrfs_init_fs_info(struct btrfs_fs_info *fs_info)spin_lock_init (&fs_info->super_lock);spin_lock_init (&fs_info->buffer_lock);spin_lock_init (&fs_info->unused_bgs_lock); +spin_lock_init (&fs_info->treelog_bg_lock);rwlock_init (&fs_info->tree_mod_log_lock);mutex_init (&fs_info->unused_bg_unpin_mutex);mutex_init (&fs_info->delete_unused_bgs_mutex);
fs/btrfs/extent-tree.c +71 -4
159 lines not on this page · raw message
fs/btrfs/zoned.h +14 -0
@@ -7,6 +7,7 @@#include <linux/blkdev.h> #include "volumes.h" #include "disk-io.h" +#include "block-group.h" struct btrfs_zoned_device_info {/*
@@ -292,4 +293,17 @@ static inline void btrfs_zoned_meta_io_unlock(struct btrfs_fs_info *fs_info) mutex_unlock(&fs_info->zoned_meta_io_lock); } +static inline void btrfs_clear_treelog_bg (struct btrfs_block_group *bg) +{ +struct btrfs_fs_info *fs_info = bg->fs_info; + +if (!btrfs_is_zoned (fs_info)) +return ; + +spin_lock (&fs_info->treelog_bg_lock); +if (fs_info->treelog_bg == bg->start) + fs_info->treelog_bg =0 ; +spin_unlock (&fs_info->treelog_bg_lock); +} +#endif
Signature · 1 line
2.27.0
PATCH v12 40/41 btrfs: serialize log transaction on ZONED mode
In reply to Naohiro AotaThis is the 2/3 patch to enable tree-log on ZONED mode.
Since we can start more than one log transactions per subvolume simultaneously, nodes from multiple transactions can be allocated interleaved. Such mixed allocation results in non-sequential writes at the time of log transaction commit. The nodes of the global log root tree (fs_info->log_root_tree), also have the same mixed allocation problem.
This patch serializes log transactions by waiting for a committing transaction when someone tries to start a new transaction, to avoid the mixed allocation problem. We must also wait for running log transactions from another subvolume, but there is no easy way to detect which subvolume root is running a log transaction. So, this patch forbids starting a new log transaction when other subvolumes already allocated the global log root tree.
--- fs/btrfs/tree-log.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
fs/btrfs/tree-log.c +29 -0
@@ -105,6 +105,7 @@ static noinline int replay_dir_deletes(struct btrfs_trans_handle *trans,struct btrfs_root *log, struct btrfs_path *path, u64 dirid, int del_all); +static void wait_log_commit (struct btrfs_root *root,int transid);/* * tree logging is a special write ahead log used to make sure that
@@ -140,6 +141,7 @@ static int start_log_trans(struct btrfs_trans_handle *trans, {struct btrfs_fs_info *fs_info = root->fs_info;struct btrfs_root *tree_root = fs_info->tree_root; +const bool zoned =btrfs_is_zoned (fs_info);int ret =0 ;/*
@@ -160,12 +162,20 @@ static int start_log_trans(struct btrfs_trans_handle *trans,mutex_lock (&root->log_mutex); +again:if (root->log_root) { +int index = (root->log_transid +1 ) %2 ; +if (btrfs_need_log_full_commit (trans)) { ret = -EAGAIN ; goto out; } +if (zoned &&atomic_read (&root->log_commit[index])) { +wait_log_commit (root, root->log_transid -1 ); + goto again; + } +if (!root->log_start_pid) {clear_bit (BTRFS_ROOT_MULTI_LOG_TASKS , &root->state); root->log_start_pid = current->pid;
@@ -173,6 +183,17 @@ static int start_log_trans(struct btrfs_trans_handle *trans,set_bit (BTRFS_ROOT_MULTI_LOG_TASKS , &root->state); } }else { +if (zoned) { +mutex_lock (&fs_info->tree_log_mutex); +if (fs_info->log_root_tree) + ret = -EAGAIN ; +else + ret =btrfs_init_log_root_tree (trans, fs_info); +mutex_unlock (&fs_info->tree_log_mutex); + } +if (ret) + goto out; + ret =btrfs_add_log_tree (trans, root);if (ret) goto out;
@@ -201,14 +222,22 @@ static int start_log_trans(struct btrfs_trans_handle *trans,*/ static int join_running_log_trans (struct btrfs_root *root) { +const bool zoned =btrfs_is_zoned (root->fs_info);int ret = -ENOENT ;if (!test_bit (BTRFS_ROOT_HAS_LOG_TREE , &root->state))return ret;mutex_lock (&root->log_mutex); +again:if (root->log_root) { +int index = (root->log_transid +1 ) %2 ; + ret =0 ; +if (zoned &&atomic_read (&root->log_commit[index])) { +wait_log_commit (root, root->log_transid -1 ); + goto again; + }atomic_inc (&root->log_writers); }mutex_unlock (&root->log_mutex);
Signature · 1 line
2.27.0
PATCH v12 41/41 btrfs: reorder log node allocation
In reply to Naohiro AotaThis is the 3/3 patch to enable tree-log on ZONED mode.
The allocation order of nodes of "fs_info->log_root_tree" and nodes of "root->log_root" is not the same as the writing order of them. So, the writing causes unaligned write errors.
This patch reorders the allocation of them by delaying allocation of the root node of "fs_info->log_root_tree," so that the node buffers can go out sequentially to devices.
--- fs/btrfs/disk-io.c | 7 ------- fs/btrfs/tree-log.c | 24 ++++++++++++++++++------ 2 files changed, 18 insertions(+), 13 deletions(-)
fs/btrfs/disk-io.c +0 -7
@@ -1241,18 +1241,11 @@ int btrfs_init_log_root_tree(struct btrfs_trans_handle *trans, struct btrfs_fs_info *fs_info) {struct btrfs_root *log_root; -int ret; log_root =alloc_log_tree (trans, fs_info);if (IS_ERR (log_root))return PTR_ERR (log_root); - ret =btrfs_alloc_log_tree_node (trans, log_root); -if (ret) { -btrfs_put_root (log_root); -return ret; - } -WARN_ON (fs_info->log_root_tree); fs_info->log_root_tree = log_root;return 0 ;
fs/btrfs/tree-log.c +18 -6
@@ -3159,6 +3159,16 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,list_add_tail (&root_log_ctx.list, &log_root_tree->log_ctxs[index2]); root_log_ctx.log_transid = log_root_tree->log_transid; +mutex_lock (&fs_info->tree_log_mutex); +if (!log_root_tree->node) { + ret =btrfs_alloc_log_tree_node (trans, log_root_tree); +if (ret) { +mutex_unlock (&fs_info->tree_log_mutex); + goto out; + } + } +mutex_unlock (&fs_info->tree_log_mutex); +/* * Now we are safe to update the log_root_tree because we're under the * log_mutex, and we're a current writer so we're holding the commit
@@ -3317,12 +3327,14 @@ static void free_log_tree(struct btrfs_trans_handle *trans, .process_func = process_one_buffer }; - ret =walk_log_tree (trans, log, &wc); -if (ret) { -if (trans) -btrfs_abort_transaction (trans, ret); -else -btrfs_handle_fs_error (log->fs_info, ret,NULL ); +if (log->node) { + ret =walk_log_tree (trans, log, &wc); +if (ret) { +if (trans) +btrfs_abort_transaction (trans, ret); +else +btrfs_handle_fs_error (log->fs_info, ret,NULL ); + } } clear_extent_bits(&log->dirty_log_pages, 0, (u64)-1,
Signature · 1 line
2.27.0