store a pointer to the block_device in struct bio (again)
Subsystems (26)
Christoph Hellwig
maintainerHi Jens,
this series switches back from storing the gendisk + partno to storing a block_device pointer in struct bio. The reason is two fold: for one the new struct block_device actually is always available, removing the need to avoid originally. Second the merge struct block_device is much more useful than the old one, as storing it avoids the need for looking up what used to be hd_struct during partition remapping and I/O accounting.
Note that this series depends on the posted but not merged "block tracepoint cleanups" series.
A git tree is also available:
git://git.infradead.org/users/hch/block.git bi_bdev
Gitweb:
http://git.infradead.org/users/hch/block.git/shortlog/refs/heads/bi_bdev
Diffstat:
arch/m68k/emu/nfblock.c | 2 arch/xtensa/platforms/iss/simdisk.c | 2 block/bio-integrity.c | 18 +- block/bio.c | 31 +--- block/blk-cgroup.c | 7 block/blk-core.c | 99 ++++++------- block/blk-crypto-fallback.c | 2 block/blk-crypto.c | 2 block/blk-merge.c | 17 +- block/blk-mq.c | 2 block/blk-settings.c | 2 block/blk-throttle.c | 2 block/blk.h | 9 - block/bounce.c | 2 block/genhd.c | 261 +++--------------------------------- block/partitions/core.c | 31 ---- drivers/block/brd.c | 8 - drivers/block/drbd/drbd_int.h | 4 drivers/block/drbd/drbd_req.c | 2 drivers/block/null_blk_main.c | 2 drivers/block/pktcdvd.c | 4 drivers/block/ps3vram.c | 2 drivers/block/rsxx/dev.c | 2 drivers/block/umem.c | 2 drivers/block/zram/zram_drv.c | 2 drivers/lightnvm/pblk-init.c | 2 drivers/md/bcache/debug.c | 2 drivers/md/bcache/request.c | 39 +++-- drivers/md/dm-bio-record.h | 9 - drivers/md/dm-raid1.c | 10 - drivers/md/dm.c | 14 - drivers/md/md-linear.c | 2 drivers/md/md.c | 10 - drivers/md/md.h | 6 drivers/md/raid1.c | 6 drivers/md/raid10.c | 12 - drivers/md/raid5.c | 2 drivers/nvdimm/blk.c | 4 drivers/nvdimm/btt.c | 4 drivers/nvdimm/pmem.c | 4 drivers/nvme/host/core.c | 6 drivers/nvme/host/lightnvm.c | 3 drivers/nvme/host/multipath.c | 6 drivers/nvme/host/rdma.c | 2 drivers/s390/block/dasd.c | 26 --- drivers/s390/block/dcssblk.c | 6 drivers/s390/block/xpram.c | 2 fs/btrfs/check-integrity.c | 10 - fs/btrfs/raid56.c | 7 fs/btrfs/scrub.c | 2 fs/direct-io.c | 2 fs/f2fs/data.c | 12 - include/linux/bio.h | 18 +- include/linux/blk_types.h | 3 include/linux/blkdev.h | 20 -- include/linux/genhd.h | 21 -- kernel/trace/blktrace.c | 16 +- mm/page_io.c | 2 58 files changed, 251 insertions(+), 556 deletions(-)
Christoph Hellwig
maintainerPATCH 1/9 brd: remove the end of device check in brd_do_bvec
The block layer already checks for this conditions in bio_check_eod before calling the driver.
--- drivers/block/brd.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/block/brd.c +1 -5
@@ -285,14 +285,10 @@ static int brd_do_bvec(struct brd_device *brd, struct page *page,static blk_qc_t brd_submit_bio (struct bio *bio) {struct brd_device *brd = bio->bi_disk->private_data; +sector_t sector = bio->bi_iter.bi_sector;struct bio_vec bvec; -sector_t sector;struct bvec_iter iter; - sector = bio->bi_iter.bi_sector; -if (bio_end_sector (bio) >get_capacity (bio->bi_disk)) - goto io_error; -bio_for_each_segment (bvec, bio, iter) {unsigned int len = bvec.bv_len;int err;
Signature · 1 line
2.29.2
Re: [PATCH 1/9] brd: remove the end of device check in brd_do_bvec
Quoted 4 lines · Christoph Hellwig
The block layer already checks for this conditions in
bio_check_eodbefore calling the driver.Signed-off-by Christoph Hellwig <[email protected]>
Thanks.
Signature · 6 lines
tejun -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
Christoph Hellwig
maintainerPATCH 2/9 dcssblk: remove the end of device check in brd_do_bvec
In reply to Christoph HellwigThe block layer already checks for this conditions in bio_check_eod before calling the driver.
--- drivers/s390/block/dcssblk.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/s390/block/dcssblk.c +0 -4
@@ -886,10 +886,6 @@ dcssblk_submit_bio(struct bio *bio) (bio->bi_iter.bi_size & 4095) != 0)/* Request is not page-aligned. */ goto fail; -if (bio_end_sector (bio) >get_capacity (bio->bi_disk)) { -/* Request beyond end of DCSS segment. */ - goto fail; - }/* verify data transfer direction */ if (dev_info->is_shared) {switch (dev_info->segment_type) {
Signature · 1 line
2.29.2
Re: [PATCH 2/9] dcssblk: remove the end of device check in brd_do_bvec
Quoted 4 lines · Christoph Hellwig
The block layer already checks for this conditions in
bio_check_eodbefore calling the driver.Signed-off-by Christoph Hellwig <[email protected]>
Thanks.
Signature · 6 lines
tejun -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
Christoph Hellwig
maintainerPATCH 3/9 block: store a block_device pointer in struct bio
In reply to Christoph HellwigReplace the gendisk pointer in struct bio with a pointer to the newly improved struct block device. From that the gendisk can be trivially accessed with an extra indirection, but it also allows to directly look up all information related to partition remapping.
--- arch/m68k/emu/nfblock.c | 2 +- arch/xtensa/platforms/iss/simdisk.c | 2 +- block/bio-integrity.c | 18 +++++++-------- block/bio.c | 31 +++++++++---------------- block/blk-cgroup.c | 7 +++--- block/blk-core.c | 36 +++++++++++++---------------- block/blk-crypto-fallback.c | 2 +- block/blk-crypto.c | 2 +- block/blk-merge.c | 17 +++++++------- block/blk-mq.c | 2 +- block/blk-throttle.c | 2 +- block/blk.h | 6 ++--- block/bounce.c | 2 +- block/genhd.c | 2 +- drivers/block/brd.c | 2 +- drivers/block/drbd/drbd_int.h | 4 ++-- drivers/block/drbd/drbd_req.c | 2 +- drivers/block/null_blk_main.c | 2 +- drivers/block/pktcdvd.c | 4 ++-- drivers/block/ps3vram.c | 2 +- drivers/block/rsxx/dev.c | 2 +- drivers/block/umem.c | 2 +- drivers/block/zram/zram_drv.c | 2 +- drivers/lightnvm/pblk-init.c | 2 +- drivers/md/bcache/debug.c | 2 +- drivers/md/bcache/request.c | 7 +++--- drivers/md/dm-bio-record.h | 9 +++----- drivers/md/dm-raid1.c | 10 ++++---- drivers/md/dm.c | 14 +++++------ drivers/md/md-linear.c | 2 +- drivers/md/md.c | 2 +- drivers/md/md.h | 6 ++--- drivers/md/raid1.c | 6 ++--- drivers/md/raid10.c | 12 +++++----- drivers/md/raid5.c | 2 +- drivers/nvdimm/blk.c | 4 ++-- drivers/nvdimm/btt.c | 4 ++-- drivers/nvdimm/pmem.c | 4 ++-- drivers/nvme/host/core.c | 6 ++--- drivers/nvme/host/lightnvm.c | 3 +-- drivers/nvme/host/multipath.c | 6 ++--- drivers/nvme/host/rdma.c | 2 +- drivers/s390/block/dcssblk.c | 2 +- drivers/s390/block/xpram.c | 2 +- fs/btrfs/check-integrity.c | 10 ++++---- fs/btrfs/raid56.c | 7 ++---- fs/btrfs/scrub.c | 2 +- fs/direct-io.c | 2 +- fs/f2fs/data.c | 12 +--------- include/linux/bio.h | 18 +++++++-------- include/linux/blk_types.h | 3 +-- include/linux/blkdev.h | 5 ++-- kernel/trace/blktrace.c | 16 +++++++------ mm/page_io.c | 2 +- 54 files changed, 153 insertions(+), 184 deletions(-)
arch/m68k/emu/nfblock.c +1 -1
@@ -61,7 +61,7 @@ struct nfhd_device {static blk_qc_t nfhd_submit_bio (struct bio *bio) { -struct nfhd_device *dev = bio->bi_disk->private_data; +struct nfhd_device *dev = bio->bi_bdev->bd_disk->private_data;struct bio_vec bvec;struct bvec_iter iter;int dir, len, shift;
arch/xtensa/platforms/iss/simdisk.c +1 -1
@@ -103,7 +103,7 @@ static void simdisk_transfer(struct simdisk *dev, unsigned long sector,static blk_qc_t simdisk_submit_bio (struct bio *bio) { -struct simdisk *dev = bio->bi_disk->private_data; +struct simdisk *dev = bio->bi_bdev->bd_disk->private_data;struct bio_vec bvec;struct bvec_iter iter;sector_t sector = bio->bi_iter.bi_sector;
block/bio-integrity.c +9 -9
@@ -140,7 +140,7 @@ int bio_integrity_add_page(struct bio *bio, struct page *page, iv = bip->bip_vec + bip->bip_vcnt;if (bip->bip_vcnt && -bvec_gap_to_prev (bio->bi_disk->queue, +bvec_gap_to_prev (bio->bi_bdev->bd_disk->queue, &bip->bip_vec[bip->bip_vcnt -1 ], offset))return 0 ;
@@ -162,7 +162,7 @@ EXPORT_SYMBOL(bio_integrity_add_page);static blk_status_t bio_integrity_process (struct bio *bio,struct bvec_iter *proc_iter,integrity_processing_fn *proc_fn) { -struct blk_integrity *bi =blk_get_integrity (bio->bi_disk); +struct blk_integrity *bi =blk_get_integrity (bio->bi_bdev->bd_disk);struct blk_integrity_iter iter;struct bvec_iter bviter;struct bio_vec bv;
@@ -171,7 +171,7 @@ static blk_status_t bio_integrity_process(struct bio *bio,void *prot_buf =page_address (bip->bip_vec->bv_page) + bip->bip_vec->bv_offset; - iter.disk_name = bio->bi_disk->disk_name; + iter.disk_name = bio->bi_bdev->bd_disk->disk_name; iter.interval =1 << bi->interval_exp; iter.seed = proc_iter->bi_sector; iter.prot_buf = prot_buf;
@@ -208,8 +208,8 @@ static blk_status_t bio_integrity_process(struct bio *bio,bool bio_integrity_prep (struct bio *bio) {struct bio_integrity_payload *bip; -struct blk_integrity *bi =blk_get_integrity (bio->bi_disk); -struct request_queue *q = bio->bi_disk->queue; +struct blk_integrity *bi =blk_get_integrity (bio->bi_bdev->bd_disk); +struct request_queue *q = bio->bi_bdev->bd_disk->queue;void *buf;unsigned long start, end;unsigned int len, nr_pages;
@@ -329,7 +329,7 @@ static void bio_integrity_verify_fn(struct work_struct *work)struct bio_integrity_payload *bip = container_of(work, struct bio_integrity_payload, bip_work);struct bio *bio = bip->bip_bio; -struct blk_integrity *bi =blk_get_integrity (bio->bi_disk); +struct blk_integrity *bi =blk_get_integrity (bio->bi_bdev->bd_disk);/* * At the moment verify is called bio's iterator was advanced
@@ -355,7 +355,7 @@ static void bio_integrity_verify_fn(struct work_struct *work)*/ bool __bio_integrity_endio (struct bio *bio) { -struct blk_integrity *bi =blk_get_integrity (bio->bi_disk); +struct blk_integrity *bi =blk_get_integrity (bio->bi_bdev->bd_disk);struct bio_integrity_payload *bip =bio_integrity (bio); if (bio_op(bio) == REQ_OP_READ && !bio->bi_status &&
@@ -381,7 +381,7 @@ bool __bio_integrity_endio(struct bio *bio)void bio_integrity_advance (struct bio *bio,unsigned int bytes_done) {struct bio_integrity_payload *bip =bio_integrity (bio); -struct blk_integrity *bi =blk_get_integrity (bio->bi_disk); +struct blk_integrity *bi =blk_get_integrity (bio->bi_bdev->bd_disk);unsigned bytes =bio_integrity_bytes (bi, bytes_done >>9 ); bip->bip_iter.bi_sector += bytes_done >>9 ;
@@ -397,7 +397,7 @@ void bio_integrity_advance(struct bio *bio, unsigned int bytes_done)void bio_integrity_trim (struct bio *bio) {struct bio_integrity_payload *bip =bio_integrity (bio); -struct blk_integrity *bi =blk_get_integrity (bio->bi_disk); +struct blk_integrity *bi =blk_get_integrity (bio->bi_bdev->bd_disk); bip->bip_iter.bi_size =bio_integrity_bytes (bi,bio_sectors (bio)); }
block/bio.c +11 -20
@@ -607,16 +607,7 @@ void bio_truncate(struct bio *bio, unsigned new_size)*/ void guard_bio_eod (struct bio *bio) { -sector_t maxsector; -struct block_device *part; - -rcu_read_lock (); - part =__disk_get_part (bio->bi_disk, bio->bi_partno); -if (part) - maxsector =bdev_nr_sectors (part); -else - maxsector =get_capacity (bio->bi_disk); -rcu_read_unlock (); +sector_t maxsector =bdev_nr_sectors (bio->bi_bdev);if (!maxsector)return ;
@@ -676,11 +667,10 @@ void __bio_clone_fast(struct bio *bio, struct bio *bio_src)BUG_ON (bio->bi_pool &&BVEC_POOL_IDX (bio));/* -* most users will be overriding ->bi_disk with a new target, +* most users will be overriding ->bi_bdev with a new target, * so we don't set nor calculate new physical/hw segment counts here */ - bio->bi_disk = bio_src->bi_disk; - bio->bi_partno = bio_src->bi_partno; + bio->bi_bdev = bio_src->bi_bdev;bio_set_flag (bio,BIO_CLONED );if (bio_flagged (bio_src,BIO_THROTTLED ))bio_set_flag (bio,BIO_THROTTLED );
@@ -730,7 +720,7 @@ EXPORT_SYMBOL(bio_clone_fast);const char *bio_devname (struct bio *bio,char *buf) { -return disk_name (bio->bi_disk, bio->bi_partno, buf); +return bdevname (bio->bi_bdev, buf); }EXPORT_SYMBOL (bio_devname);
@@ -1037,7 +1027,7 @@ static int __bio_iov_append_get_pages(struct bio *bio, struct iov_iter *iter) {unsigned short nr_pages = bio->bi_max_vecs - bio->bi_vcnt;unsigned short entries_left = bio->bi_max_vecs - bio->bi_vcnt; -struct request_queue *q = bio->bi_disk->queue; +struct request_queue *q = bio->bi_bdev->bd_disk->queue;unsigned int max_append_sectors =queue_max_zone_append_sectors (q);struct bio_vec *bv = bio->bi_io_vec + bio->bi_vcnt;struct page **pages = (struct page **)bv;
@@ -1145,7 +1135,8 @@ static void submit_bio_wait_endio(struct bio *bio)*/ int submit_bio_wait (struct bio *bio) { -DECLARE_COMPLETION_ONSTACK_MAP (done, bio->bi_disk->lockdep_map); +DECLARE_COMPLETION_ONSTACK_MAP (done, + bio->bi_bdev->bd_disk->lockdep_map);unsigned long hang_check; bio->bi_private = &done;
@@ -1422,8 +1413,8 @@ void bio_endio(struct bio *bio)if (!bio_integrity_endio (bio))return ; -if (bio->bi_disk) -rq_qos_done_bio (bio->bi_disk->queue, bio); +if (bio->bi_bdev) +rq_qos_done_bio (bio->bi_bdev->bd_disk->queue, bio);/* * Need to have a real endio function for chained bios, otherwise
@@ -1438,8 +1429,8 @@ void bio_endio(struct bio *bio) goto again; } -if (bio->bi_disk &&bio_flagged (bio,BIO_TRACE_COMPLETION )) { -trace_block_bio_complete (bio->bi_disk->queue, bio); +if (bio->bi_bdev &&bio_flagged (bio,BIO_TRACE_COMPLETION )) { +trace_block_bio_complete (bio->bi_bdev->bd_disk->queue, bio);bio_clear_flag (bio,BIO_TRACE_COMPLETION ); }
block/blk-cgroup.c +4 -3
@@ -1800,7 +1800,8 @@ static inline struct blkcg_gq *blkg_tryget_closest(struct bio *bio,struct blkcg_gq *blkg, *ret_blkg =NULL ;rcu_read_lock (); - blkg =blkg_lookup_create (css_to_blkcg (css), bio->bi_disk->queue); + blkg =blkg_lookup_create (css_to_blkcg (css), + bio->bi_bdev->bd_disk->queue);while (blkg) {if (blkg_tryget (blkg)) { ret_blkg = blkg;
@@ -1836,8 +1837,8 @@ void bio_associate_blkg_from_css(struct bio *bio,if (css && css->parent) { bio->bi_blkg =blkg_tryget_closest (bio, css); }else { -blkg_get (bio->bi_disk->queue->root_blkg); - bio->bi_blkg = bio->bi_disk->queue->root_blkg; +blkg_get (bio->bi_bdev->bd_disk->queue->root_blkg); + bio->bi_blkg = bio->bi_bdev->bd_disk->queue->root_blkg; } }EXPORT_SYMBOL_GPL (bio_associate_blkg_from_css);
block/blk-core.c +16 -20
@@ -475,7 +475,7 @@ int blk_queue_enter(struct request_queue *q, blk_mq_req_flags_t flags)static inline int bio_queue_enter (struct bio *bio) { -struct request_queue *q = bio->bi_disk->queue; +struct request_queue *q = bio->bi_bdev->bd_disk->queue;bool nowait = bio->bi_opf &REQ_NOWAIT ;int ret;
@@ -713,7 +713,7 @@ static inline bool bio_check_ro(struct bio *bio, struct block_device *part) static noinline int should_fail_bio(struct bio *bio) { -if (should_fail_request (bio->bi_disk->part0, bio->bi_iter.bi_size)) +if (should_fail_request (bdev_whole (bio->bi_bdev), bio->bi_iter.bi_size))return -EIO ;return 0 ; }
@@ -742,13 +742,9 @@ static inline int bio_check_eod(struct bio *bio, sector_t maxsector)*/ static inline int blk_partition_remap (struct bio *bio) { -struct block_device *p; +struct block_device *p = bio->bi_bdev;int ret = -EIO ; -rcu_read_lock (); - p =__disk_get_part (bio->bi_disk, bio->bi_partno); -if (unlikely (!p)) - goto out;if (unlikely (should_fail_request (p, bio->bi_iter.bi_size))) goto out;if (unlikely (bio_check_ro (bio, p)))
@@ -762,10 +758,8 @@ static inline int blk_partition_remap(struct bio *bio) bio->bi_iter.bi_sector - p->bd_start_sect); } - bio->bi_partno =0 ; ret =0 ; out: -rcu_read_unlock ();return ret; }
@@ -806,7 +800,8 @@ static inline blk_status_t blk_check_zone_append(struct request_queue *q, static noinline_for_stack bool submit_bio_checks(struct bio *bio) { -struct request_queue *q = bio->bi_disk->queue; +struct block_device *bdev = bio->bi_bdev; +struct request_queue *q = bdev->bd_disk->queue;blk_status_t status =BLK_STS_IOERR ;struct blk_plug *plug;
@@ -826,13 +821,13 @@ static noinline_for_stack bool submit_bio_checks(struct bio *bio)if (should_fail_bio (bio)) goto end_io; -if (bio->bi_partno) { +if (bio->bi_bdev->bd_partno) {if (unlikely (blk_partition_remap (bio))) goto end_io; }else { -if (unlikely (bio_check_ro (bio, bio->bi_disk->part0))) +if (unlikely (bio_check_ro (bio,bdev_whole (bdev)))) goto end_io; -if (unlikely (bio_check_eod (bio,get_capacity (bio->bi_disk)))) +if (unlikely (bio_check_eod (bio,get_capacity (bdev->bd_disk)))) goto end_io; }
@@ -925,7 +920,7 @@ static noinline_for_stack bool submit_bio_checks(struct bio *bio)static blk_qc_t __submit_bio (struct bio *bio) { -struct gendisk *disk = bio->bi_disk; +struct gendisk *disk = bio->bi_bdev->bd_disk;blk_qc_t ret =BLK_QC_T_NONE ;if (blk_crypto_bio_prep (&bio)) {
@@ -967,7 +962,7 @@ static blk_qc_t __submit_bio_noacct(struct bio *bio) current->bio_list = bio_list_on_stack; do { - struct request_queue *q = bio->bi_disk->queue; + struct request_queue *q = bio->bi_bdev->bd_disk->queue; struct bio_list lower, same; if (unlikely(bio_queue_enter(bio) != 0))
@@ -988,7 +983,7 @@ static blk_qc_t __submit_bio_noacct(struct bio *bio)bio_list_init (&lower);bio_list_init (&same);while ((bio =bio_list_pop (&bio_list_on_stack[0 ])) !=NULL ) -if (q == bio->bi_disk->queue) +if (q == bio->bi_bdev->bd_disk->queue)bio_list_add (&same, bio);else bio_list_add (&lower, bio);
@@ -1013,7 +1008,7 @@ static blk_qc_t __submit_bio_noacct_mq(struct bio *bio) current->bio_list = bio_list; do { - struct gendisk *disk = bio->bi_disk; + struct gendisk *disk = bio->bi_bdev->bd_disk; if (unlikely(bio_queue_enter(bio) != 0)) continue;
@@ -1056,7 +1051,7 @@ blk_qc_t submit_bio_noacct(struct bio *bio)return BLK_QC_T_NONE ; } -if (!bio->bi_disk->fops->submit_bio) +if (!bio->bi_bdev->bd_disk->fops->submit_bio)return __submit_bio_noacct_mq (bio);return __submit_bio_noacct (bio); }
@@ -1068,7 +1063,7 @@ EXPORT_SYMBOL(submit_bio_noacct);* * submit_bio() is used to submit I/O requests to block devices. It is passed a * fully set up &struct bio that describes the I/O that needs to be done. The -* bio will be send to the device described by the bi_disk and bi_partno fields. +* bio will be send to the device described by the bi_bdev field. * * The success/failure status of the request, along with notification of * completion, is delivered asynchronously through the ->bi_end_io() callback
@@ -1088,7 +1083,8 @@ blk_qc_t submit_bio(struct bio *bio)unsigned int count;if (unlikely (bio_op (bio) ==REQ_OP_WRITE_SAME )) - count =queue_logical_block_size (bio->bi_disk->queue) >>9 ; + count =queue_logical_block_size ( + bio->bi_bdev->bd_disk->queue) >>9 ;else count =bio_sectors (bio);
block/blk-crypto-fallback.c +1 -1
@@ -167,7 +167,7 @@ static struct bio *blk_crypto_clone_bio(struct bio *bio_src) bio =bio_alloc_bioset (GFP_NOIO ,bio_segments (bio_src),NULL );if (!bio)return NULL ; - bio->bi_disk = bio_src->bi_disk; + bio->bi_bdev = bio_src->bi_bdev; bio->bi_opf = bio_src->bi_opf; bio->bi_ioprio = bio_src->bi_ioprio; bio->bi_write_hint = bio_src->bi_write_hint;
block/blk-crypto.c +1 -1
@@ -280,7 +280,7 @@ bool __blk_crypto_bio_prep(struct bio **bio_ptr)* Success if device supports the encryption context, or if we succeeded * in falling back to the crypto API. */ -if (blk_ksm_crypto_cfg_supported (bio->bi_disk->queue->ksm, +if (blk_ksm_crypto_cfg_supported (bio->bi_bdev->bd_disk->queue->ksm, &bc_key->crypto_cfg))return true;
block/blk-merge.c +8 -9
@@ -290,14 +290,13 @@ static struct bio *blk_bio_segment_split(struct request_queue *q,* Split a bio into two bios, chain the two bios, submit the second half and * store a pointer to the first half in *@bio. If the second bio is still too * big it will be split by a recursive call to this function. Since this -* function may allocate a new bio from @bio->bi_disk->queue->bio_split, it is -* the responsibility of the caller to ensure that -* @bio->bi_disk->queue->bio_split is only released after processing of the -* split bio has finished. +* function may allocate a new bio from q->bio_split, it is the responsibility +* of the caller to ensure that q->bio_split is only released after processing +* of the split bio has finished. */ void __blk_queue_split (struct bio **bio,unsigned int *nr_segs) { -struct request_queue *q = (*bio)->bi_disk->queue; +struct request_queue *q = (*bio)->bi_bdev->bd_disk->queue;struct bio *split =NULL ;switch (bio_op (*bio)) {
@@ -350,9 +349,9 @@ void __blk_queue_split(struct bio **bio, unsigned int *nr_segs)* * Split a bio into two bios, chains the two bios, submit the second half and * store a pointer to the first half in *@bio. Since this function may allocate -* a new bio from @bio->bi_disk->queue->bio_split, it is the responsibility of -* the caller to ensure that @bio->bi_disk->queue->bio_split is only released -* after processing of the split bio has finished. +* a new bio from q->bio_split, it is the responsibility of the caller to ensure +* that q->bio_split is only released after processing of the split bio has +* finished. */ void blk_queue_split (struct bio **bio) {
@@ -858,7 +857,7 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio)return false;/* must be same device */ -if (rq->rq_disk != bio->bi_disk) +if (rq->rq_disk != bio->bi_bdev->bd_disk)return false;/* only merge integrity protected bio into ditto rq */
block/blk-mq.c +1 -1
@@ -2146,7 +2146,7 @@ static void blk_add_rq_to_plug(struct blk_plug *plug, struct request *rq)*/ blk_qc_t blk_mq_submit_bio (struct bio *bio) { -struct request_queue *q = bio->bi_disk->queue; +struct request_queue *q = bio->bi_bdev->bd_disk->queue;const int is_sync =op_is_sync (bio->bi_opf);const int is_flush_fua =op_is_flush (bio->bi_opf);struct blk_mq_alloc_data data = {
block/blk-throttle.c +1 -1
@@ -2172,7 +2172,7 @@ static inline void throtl_update_latency_buckets(struct throtl_data *td)bool blk_throtl_bio (struct bio *bio) { -struct request_queue *q = bio->bi_disk->queue; +struct request_queue *q = bio->bi_bdev->bd_disk->queue;struct blkcg_gq *blkg = bio->bi_blkg;struct throtl_qnode *qn =NULL ;struct throtl_grp *tg =blkg_to_tg (blkg);
block/blk.h +2 -4
@@ -99,8 +99,8 @@ static inline void blk_rq_bio_prep(struct request *rq, struct bio *bio, rq->bio = rq->biotail = bio; rq->ioprio =bio_prio (bio); -if (bio->bi_disk) - rq->rq_disk = bio->bi_disk; +if (bio->bi_bdev) + rq->rq_disk = bio->bi_bdev->bd_disk; }#ifdef CONFIG_BLK_DEV_INTEGRITY
@@ -215,8 +215,6 @@ static inline void elevator_exit(struct request_queue *q,__elevator_exit (q, e); } -struct block_device *__disk_get_part (struct gendisk *disk,int partno); -ssize_t part_size_show (struct device *dev,struct device_attribute *attr,char *buf); ssize_t part_stat_show(struct device *dev, struct device_attribute *attr,
block/bounce.c +1 -1
@@ -246,7 +246,7 @@ static struct bio *bounce_clone_bio(struct bio *bio_src, gfp_t gfp_mask, bio =bio_alloc_bioset (gfp_mask,bio_segments (bio_src), bs);if (!bio)return NULL ; - bio->bi_disk = bio_src->bi_disk; + bio->bi_bdev = bio_src->bi_bdev; bio->bi_opf = bio_src->bi_opf; bio->bi_ioprio = bio_src->bi_ioprio; bio->bi_write_hint = bio_src->bi_write_hint;
block/genhd.c +1 -1
@@ -159,7 +159,7 @@ static void part_in_flight_rw(struct block_device *part, inflight[1 ] =0 ; } -struct block_device *__disk_get_part (struct gendisk *disk,int partno) +static struct block_device *__disk_get_part (struct gendisk *disk,int partno) {struct disk_part_tbl *ptbl =rcu_dereference (disk->part_tbl);
drivers/block/brd.c +1 -1
@@ -284,7 +284,7 @@ static int brd_do_bvec(struct brd_device *brd, struct page *page,static blk_qc_t brd_submit_bio (struct bio *bio) { -struct brd_device *brd = bio->bi_disk->private_data; +struct brd_device *brd = bio->bi_bdev->bd_disk->private_data;sector_t sector = bio->bi_iter.bi_sector;struct bio_vec bvec;struct bvec_iter iter;
drivers/block/drbd/drbd_int.h +2 -2
@@ -1579,8 +1579,8 @@ static inline void drbd_submit_bio_noacct(struct drbd_device *device, int fault_type, struct bio *bio) {__release (local ); -if (!bio->bi_disk) { -drbd_err (device,"drbd_submit_bio_noacct: bio->bi_disk == NULL\n" ); +if (!bio->bi_bdev) { +drbd_err (device,"drbd_submit_bio_noacct: bio->bi_bdev == NULL\n" ); bio->bi_status =BLK_STS_IOERR ;bio_endio (bio);return ;
drivers/block/drbd/drbd_req.c +1 -1
@@ -1595,7 +1595,7 @@ void do_submit(struct work_struct *ws)blk_qc_t drbd_submit_bio (struct bio *bio) { -struct drbd_device *device = bio->bi_disk->private_data; +struct drbd_device *device = bio->bi_bdev->bd_disk->private_data;unsigned long start_jif;blk_queue_split (&bio);
drivers/block/null_blk_main.c +1 -1
@@ -1418,7 +1418,7 @@ static blk_qc_t null_submit_bio(struct bio *bio) {sector_t sector = bio->bi_iter.bi_sector;sector_t nr_sectors =bio_sectors (bio); -struct nullb *nullb = bio->bi_disk->private_data; +struct nullb *nullb = bio->bi_bdev->bd_disk->private_data;struct nullb_queue *nq =nullb_to_queue (nullb);struct nullb_cmd *cmd;
drivers/block/pktcdvd.c +2 -2
@@ -2374,7 +2374,7 @@ static blk_qc_t pkt_submit_bio(struct bio *bio)blk_queue_split (&bio); - pd = bio->bi_disk->queue->queuedata; + pd = bio->bi_bdev->bd_disk->queue->queuedata;if (!pd) {pr_err ("%s incorrect request queue\n" ,bio_devname (bio, b)); goto end_io;
@@ -2418,7 +2418,7 @@ static blk_qc_t pkt_submit_bio(struct bio *bio) split = bio; } -pkt_make_request_write (bio->bi_disk->queue, split); +pkt_make_request_write (bio->bi_bdev->bd_disk->queue, split); }while (split != bio);return BLK_QC_T_NONE ;
drivers/block/ps3vram.c +1 -1
@@ -581,7 +581,7 @@ static struct bio *ps3vram_do_bio(struct ps3_system_bus_device *dev,static blk_qc_t ps3vram_submit_bio (struct bio *bio) { -struct ps3_system_bus_device *dev = bio->bi_disk->private_data; +struct ps3_system_bus_device *dev = bio->bi_bdev->bd_disk->private_data;struct ps3vram_priv *priv =ps3_system_bus_get_drvdata (dev);int busy;
drivers/block/rsxx/dev.c +1 -1
@@ -122,7 +122,7 @@ static void bio_dma_done_cb(struct rsxx_cardinfo *card,static blk_qc_t rsxx_submit_bio (struct bio *bio) { -struct rsxx_cardinfo *card = bio->bi_disk->private_data; +struct rsxx_cardinfo *card = bio->bi_bdev->bd_disk->private_data;struct rsxx_bio_meta *bio_meta;blk_status_t st =BLK_STS_IOERR ;
drivers/block/umem.c +1 -1
@@ -521,7 +521,7 @@ static int mm_check_plugged(struct cardinfo *card)static blk_qc_t mm_submit_bio (struct bio *bio) { -struct cardinfo *card = bio->bi_disk->private_data; +struct cardinfo *card = bio->bi_bdev->bd_disk->private_data; pr_debug("mm_make_request %llu %u\n", (unsigned long long)bio->bi_iter.bi_sector,
drivers/block/zram/zram_drv.c +1 -1
@@ -1581,7 +1581,7 @@ static void __zram_make_request(struct zram *zram, struct bio *bio)*/ static blk_qc_t zram_submit_bio (struct bio *bio) { -struct zram *zram = bio->bi_disk->private_data; +struct zram *zram = bio->bi_bdev->bd_disk->private_data;if (!valid_io_request (zram, bio->bi_iter.bi_sector, bio->bi_iter.bi_size)) {
drivers/lightnvm/pblk-init.c +1 -1
@@ -49,7 +49,7 @@ struct bio_set pblk_bio_set;static blk_qc_t pblk_submit_bio (struct bio *bio) { -struct pblk *pblk = bio->bi_disk->queue->queuedata; +struct pblk *pblk = bio->bi_bdev->bd_disk->queue->queuedata;if (bio_op (bio) ==REQ_OP_DISCARD ) {pblk_discard (pblk, bio);
drivers/md/bcache/debug.c +1 -1
@@ -114,7 +114,7 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio) check =bio_kmalloc (GFP_NOIO ,bio_segments (bio));if (!check)return ; - check->bi_disk = bio->bi_disk; + check->bi_bdev = bio->bi_bdev; check->bi_opf =REQ_OP_READ ; check->bi_iter.bi_sector = bio->bi_iter.bi_sector; check->bi_iter.bi_size = bio->bi_iter.bi_size;
drivers/md/bcache/request.c +4 -3
@@ -894,7 +894,8 @@ static int cached_dev_cache_miss(struct btree *b, struct search *s, !(bio->bi_opf & (REQ_META|REQ_PRIO)) && s->iop.c->gc_stats.in_use < CUTOFF_CACHE_READA) reada =min_t (sector_t, dc->readahead >>9 , -get_capacity (bio->bi_disk) -bio_end_sector (bio)); +get_capacity (bio->bi_bdev->bd_disk) - +bio_end_sector (bio)); s->insert_bio_sectors =min (sectors,bio_sectors (bio) + reada);
@@ -1167,7 +1168,7 @@ static void quit_max_writeback_rate(struct cache_set *c,blk_qc_t cached_dev_submit_bio (struct bio *bio) {struct search *s; -struct bcache_device *d = bio->bi_disk->private_data; +struct bcache_device *d = bio->bi_bdev->bd_disk->private_data; struct cached_dev *dc = container_of(d, struct cached_dev, disk);int rw =bio_data_dir (bio);
@@ -1274,7 +1275,7 @@ blk_qc_t flash_dev_submit_bio(struct bio *bio) {struct search *s;struct closure *cl; -struct bcache_device *d = bio->bi_disk->private_data; +struct bcache_device *d = bio->bi_bdev->bd_disk->private_data;if (unlikely (d->c &&test_bit (CACHE_SET_IO_DISABLE , &d->c->flags))) { bio->bi_status =BLK_STS_IOERR ;
drivers/md/dm-bio-record.h +3 -6
@@ -18,8 +18,7 @@*/ struct dm_bio_details { -struct gendisk *bi_disk; -u8 bi_partno; +struct block_device *bi_bdev;int __bi_remaining;unsigned long bi_flags;struct bvec_iter bi_iter;
@@ -31,8 +30,7 @@ struct dm_bio_details {static inline void dm_bio_record (struct dm_bio_details *bd,struct bio *bio) { - bd->bi_disk = bio->bi_disk; - bd->bi_partno = bio->bi_partno; + bd->bi_bdev = bio->bi_bdev; bd->bi_flags = bio->bi_flags; bd->bi_iter = bio->bi_iter; bd->__bi_remaining =atomic_read (&bio->__bi_remaining);
@@ -44,8 +42,7 @@ static inline void dm_bio_record(struct dm_bio_details *bd, struct bio *bio)static inline void dm_bio_restore (struct dm_bio_details *bd,struct bio *bio) { - bio->bi_disk = bd->bi_disk; - bio->bi_partno = bd->bi_partno; + bio->bi_bdev = bd->bi_bdev; bio->bi_flags = bd->bi_flags; bio->bi_iter = bd->bi_iter;atomic_set (&bio->__bi_remaining, bd->__bi_remaining);
drivers/md/dm-raid1.c +5 -5
@@ -145,7 +145,7 @@ static void dispatch_bios(void *context, struct bio_list *bio_list)struct dm_raid1_bio_record {struct mirror *m; -/* if details->bi_disk == NULL, details were not saved */ +/* if details->bi_bdev == NULL, details were not saved */ struct dm_bio_details details;region_t write_region; };
@@ -1190,7 +1190,7 @@ static int mirror_map(struct dm_target *ti, struct bio *bio)struct dm_raid1_bio_record *bio_record =dm_per_bio_data (bio,sizeof (struct dm_raid1_bio_record )); - bio_record->details.bi_disk =NULL ; + bio_record->details.bi_bdev =NULL ;if (rw ==WRITE ) {/* Save region for mirror_end_io() handler */
@@ -1257,7 +1257,7 @@ static int mirror_end_io(struct dm_target *ti, struct bio *bio, goto out;if (unlikely (*error)) { -if (!bio_record->details.bi_disk) { +if (!bio_record->details.bi_bdev) {/* * There wasn't enough memory to record necessary * information for a retry or there was no other
@@ -1282,7 +1282,7 @@ static int mirror_end_io(struct dm_target *ti, struct bio *bio, bd = &bio_record->details;dm_bio_restore (bd, bio); - bio_record->details.bi_disk =NULL ; + bio_record->details.bi_bdev =NULL ; bio->bi_status =0 ;queue_bio (ms, bio, rw);
@@ -1292,7 +1292,7 @@ static int mirror_end_io(struct dm_target *ti, struct bio *bio, } out: - bio_record->details.bi_disk =NULL ; + bio_record->details.bi_bdev =NULL ;return DM_ENDIO_DONE ; }
drivers/md/dm.c +7 -7
@@ -977,16 +977,17 @@ static void clone_endio(struct bio *bio)struct mapped_device *md = tio->io->md;dm_endio_fn endio = tio->ti->type->end_io;struct bio *orig_bio = io->orig_bio; +struct request_queue *q = bio->bi_bdev->bd_disk->queue;if (unlikely (error ==BLK_STS_TARGET )) {if (bio_op (bio) ==REQ_OP_DISCARD && - !bio->bi_disk->queue->limits.max_discard_sectors) + !q->limits.max_discard_sectors)disable_discard (md);else if (bio_op (bio) ==REQ_OP_WRITE_SAME && - !bio->bi_disk->queue->limits.max_write_same_sectors) + !q->limits.max_write_same_sectors)disable_write_same (md);else if (bio_op (bio) ==REQ_OP_WRITE_ZEROES && - !bio->bi_disk->queue->limits.max_write_zeroes_sectors) + !q->limits.max_write_zeroes_sectors)disable_write_zeroes (md); }
@@ -996,7 +997,7 @@ static void clone_endio(struct bio *bio)*/ if (bio_op (orig_bio) ==REQ_OP_ZONE_APPEND ) {sector_t written_sector = bio->bi_iter.bi_sector; -struct request_queue *q = orig_bio->bi_disk->queue; +struct request_queue *q = orig_bio->bi_bdev->bd_disk->queue;u64 mask = (u64 )blk_queue_zone_sectors (q) -1 ; orig_bio->bi_iter.bi_sector += written_sector & mask;
@@ -1421,8 +1422,7 @@ static int __send_empty_flush(struct clone_info *ci)*/ bio_init (&flush_bio,NULL ,0 ); flush_bio.bi_opf =REQ_OP_WRITE |REQ_PREFLUSH |REQ_SYNC ; - flush_bio.bi_disk = ci->io->md->disk; -bio_associate_blkg (&flush_bio); +bio_set_dev (&flush_bio, ci->io->md->disk->part0); ci->bio = &flush_bio; ci->sector_count =0 ;
@@ -1625,7 +1625,7 @@ static blk_qc_t __split_and_process_bio(struct mapped_device *md,static blk_qc_t dm_submit_bio (struct bio *bio) { -struct mapped_device *md = bio->bi_disk->private_data; +struct mapped_device *md = bio->bi_bdev->bd_disk->private_data;blk_qc_t ret =BLK_QC_T_NONE ;int srcu_idx;struct dm_table *map;
drivers/md/md-linear.c +1 -1
@@ -252,7 +252,7 @@ static bool linear_make_request(struct mddev *mddev, struct bio *bio) start_sector + data_offset;if (unlikely ((bio_op (bio) ==REQ_OP_DISCARD ) && - !blk_queue_discard (bio->bi_disk->queue))) { + !blk_queue_discard (bio->bi_bdev->bd_disk->queue))) {/* Just ignore it */ bio_endio (bio); }else {
drivers/md/md.c +1 -1
@@ -486,7 +486,7 @@ static void md_end_io(struct bio *bio)static blk_qc_t md_submit_bio (struct bio *bio) {const int rw =bio_data_dir (bio); -struct mddev *mddev = bio->bi_disk->private_data; +struct mddev *mddev = bio->bi_bdev->bd_disk->private_data;if (mddev ==NULL || mddev->pers ==NULL ) {bio_io_error (bio);
drivers/md/md.h +3 -3
@@ -556,7 +556,7 @@ static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectstatic inline void md_sync_acct_bio (struct bio *bio,unsigned long nr_sectors) { -atomic_add (nr_sectors, &bio->bi_disk->sync_io); +md_sync_acct (bio->bi_bdev, nr_sectors); }struct md_personality
@@ -795,14 +795,14 @@ static inline void mddev_clear_unsupported_flags(struct mddev *mddev,static inline void mddev_check_writesame (struct mddev *mddev,struct bio *bio) {if (bio_op (bio) ==REQ_OP_WRITE_SAME && - !bio->bi_disk->queue->limits.max_write_same_sectors) + !bio->bi_bdev->bd_disk->queue->limits.max_write_same_sectors) mddev->queue->limits.max_write_same_sectors =0 ; }static inline void mddev_check_write_zeroes (struct mddev *mddev,struct bio *bio) {if (bio_op (bio) ==REQ_OP_WRITE_ZEROES && - !bio->bi_disk->queue->limits.max_write_zeroes_sectors) + !bio->bi_bdev->bd_disk->queue->limits.max_write_zeroes_sectors) mddev->queue->limits.max_write_zeroes_sectors =0 ; }
drivers/md/raid1.c +3 -3
@@ -794,13 +794,13 @@ static void flush_bio_list(struct r1conf *conf, struct bio *bio)while (bio) {/* submit pending writes */ struct bio *next = bio->bi_next; -struct md_rdev *rdev = (void *)bio->bi_disk; +struct md_rdev *rdev = (void *)bio->bi_bdev; bio->bi_next =NULL ;bio_set_dev (bio, rdev->bdev);if (test_bit (Faulty, &rdev->flags)) {bio_io_error (bio); }else if (unlikely ((bio_op (bio) ==REQ_OP_DISCARD ) && - !blk_queue_discard (bio->bi_disk->queue))) + !blk_queue_discard (bio->bi_bdev->bd_disk->queue)))/* Just ignore it */ bio_endio (bio);else
@@ -1520,7 +1520,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,trace_block_bio_remap (mbio,disk_devt (mddev->gendisk), r1_bio->sector);/* flush_pending_writes() needs access to the rdev so...*/ - mbio->bi_disk = (void *)conf->mirrors[i].rdev; + mbio->bi_bdev = (void *)conf->mirrors[i].rdev; cb =blk_check_plugged (raid1_unplug, mddev,sizeof (*plug));if (cb)
drivers/md/raid10.c +6 -6
@@ -881,13 +881,13 @@ static void flush_pending_writes(struct r10conf *conf)while (bio) {/* submit pending writes */ struct bio *next = bio->bi_next; -struct md_rdev *rdev = (void *)bio->bi_disk; +struct md_rdev *rdev = (void *)bio->bi_bdev; bio->bi_next =NULL ;bio_set_dev (bio, rdev->bdev);if (test_bit (Faulty, &rdev->flags)) {bio_io_error (bio); }else if (unlikely ((bio_op (bio) ==REQ_OP_DISCARD ) && - !blk_queue_discard (bio->bi_disk->queue))) + !blk_queue_discard (bio->bi_bdev->bd_disk->queue)))/* Just ignore it */ bio_endio (bio);else
@@ -1074,13 +1074,13 @@ static void raid10_unplug(struct blk_plug_cb *cb, bool from_schedule)while (bio) {/* submit pending writes */ struct bio *next = bio->bi_next; -struct md_rdev *rdev = (void *)bio->bi_disk; +struct md_rdev *rdev = (void *)bio->bi_bdev; bio->bi_next =NULL ;bio_set_dev (bio, rdev->bdev);if (test_bit (Faulty, &rdev->flags)) {bio_io_error (bio); }else if (unlikely ((bio_op (bio) ==REQ_OP_DISCARD ) && - !blk_queue_discard (bio->bi_disk->queue))) + !blk_queue_discard (bio->bi_bdev->bd_disk->queue)))/* Just ignore it */ bio_endio (bio);else
@@ -1252,7 +1252,7 @@ static void raid10_write_one_disk(struct mddev *mddev, struct r10bio *r10_bio,trace_block_bio_remap (mbio,disk_devt (conf->mddev->gendisk), r10_bio->sector);/* flush_pending_writes() needs access to the rdev so...*/ - mbio->bi_disk = (void *)rdev; + mbio->bi_bdev = (void *)rdev;atomic_inc (&r10_bio->remaining);
@@ -3311,7 +3311,7 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,/* Again, very different code for resync and recovery. * Both must result in an r10bio with a list of bios that -* have bi_end_io, bi_sector, bi_disk set, +* have bi_end_io, bi_sector, bi_bdev set, * and bi_private set to the r10bio. * For recovery, we may actually create several r10bios * with 2 bios in each, that correspond to the bios in the main one.
drivers/md/raid5.c +1 -1
@@ -5310,7 +5310,7 @@ static int in_chunk_boundary(struct mddev *mddev, struct bio *bio)unsigned int chunk_sectors;unsigned int bio_sectors =bio_sectors (bio); -WARN_ON_ONCE (bio->bi_partno); +WARN_ON_ONCE (bio->bi_bdev->bd_partno); chunk_sectors =min (conf->chunk_sectors, conf->prev_chunk_sectors); return chunk_sectors >=
drivers/nvdimm/blk.c +2 -2
@@ -165,7 +165,7 @@ static int nsblk_do_bvec(struct nd_namespace_blk *nsblk,static blk_qc_t nd_blk_submit_bio (struct bio *bio) {struct bio_integrity_payload *bip; -struct nd_namespace_blk *nsblk = bio->bi_disk->private_data; +struct nd_namespace_blk *nsblk = bio->bi_bdev->bd_disk->private_data;struct bvec_iter iter;unsigned long start;struct bio_vec bvec;
@@ -177,7 +177,7 @@ static blk_qc_t nd_blk_submit_bio(struct bio *bio) bip =bio_integrity (bio); rw =bio_data_dir (bio); - do_acct =blk_queue_io_stat (bio->bi_disk->queue); + do_acct =blk_queue_io_stat (bio->bi_bdev->bd_disk->queue);if (do_acct) start =bio_start_io_acct (bio);bio_for_each_segment (bvec, bio, iter) {
drivers/nvdimm/btt.c +2 -2
@@ -1442,7 +1442,7 @@ static int btt_do_bvec(struct btt *btt, struct bio_integrity_payload *bip,static blk_qc_t btt_submit_bio (struct bio *bio) {struct bio_integrity_payload *bip =bio_integrity (bio); -struct btt *btt = bio->bi_disk->private_data; +struct btt *btt = bio->bi_bdev->bd_disk->private_data;struct bvec_iter iter;unsigned long start;struct bio_vec bvec;
@@ -1452,7 +1452,7 @@ static blk_qc_t btt_submit_bio(struct bio *bio)if (!bio_integrity_prep (bio))return BLK_QC_T_NONE ; - do_acct =blk_queue_io_stat (bio->bi_disk->queue); + do_acct =blk_queue_io_stat (bio->bi_bdev->bd_disk->queue);if (do_acct) start =bio_start_io_acct (bio);bio_for_each_segment (bvec, bio, iter) {
drivers/nvdimm/pmem.c +2 -2
@@ -197,13 +197,13 @@ static blk_qc_t pmem_submit_bio(struct bio *bio)unsigned long start;struct bio_vec bvec;struct bvec_iter iter; -struct pmem_device *pmem = bio->bi_disk->private_data; +struct pmem_device *pmem = bio->bi_bdev->bd_disk->private_data;struct nd_region *nd_region =to_region (pmem);if (bio->bi_opf &REQ_PREFLUSH ) ret =nvdimm_flush (nd_region, bio); - do_acct =blk_queue_io_stat (bio->bi_disk->queue); + do_acct =blk_queue_io_stat (bio->bi_bdev->bd_disk->queue);if (do_acct) start =bio_start_io_acct (bio);bio_for_each_segment (bvec, bio, iter) {
drivers/nvme/host/core.c +3 -3
@@ -1050,7 +1050,7 @@ static int nvme_submit_user_cmd(struct request_queue *q, {bool write =nvme_is_write (cmd);struct nvme_ns *ns = q->queuedata; -struct gendisk *disk = ns ? ns->disk :NULL ; +struct block_device *bdev = ns ? ns->disk->part0 :NULL ;struct request *req;struct bio *bio =NULL ;void *meta =NULL ;
@@ -1069,8 +1069,8 @@ static int nvme_submit_user_cmd(struct request_queue *q,if (ret) goto out; bio = req->bio; - bio->bi_disk = disk; -if (disk && meta_buffer && meta_len) { + bio->bi_bdev = bdev; +if (bdev && meta_buffer && meta_len) { meta =nvme_add_user_metadata (bio, meta_buffer, meta_len, meta_seed, write);if (IS_ERR (meta)) {
drivers/nvme/host/lightnvm.c +1 -2
@@ -757,7 +757,6 @@ static int nvme_nvm_submit_user_cmd(struct request_queue *q, {bool write =nvme_is_write ((struct nvme_command *)vcmd);struct nvm_dev *dev = ns->ndev; -struct gendisk *disk = ns->disk;struct request *rq;struct bio *bio =NULL ;__le64 *ppa_list =NULL ;
@@ -817,7 +816,7 @@ static int nvme_nvm_submit_user_cmd(struct request_queue *q, vcmd->ph_rw.metadata =cpu_to_le64 (metadata_dma); } - bio->bi_disk = disk; + bio->bi_bdev = ns->disk->part0; }blk_execute_rq (q,NULL , rq,0 );
drivers/nvme/host/multipath.c +3 -3
@@ -294,7 +294,7 @@ static bool nvme_available_path(struct nvme_ns_head *head)blk_qc_t nvme_ns_head_submit_bio (struct bio *bio) { -struct nvme_ns_head *head = bio->bi_disk->private_data; +struct nvme_ns_head *head = bio->bi_bdev->bd_disk->private_data;struct device *dev =disk_to_dev (head->disk);struct nvme_ns *ns;blk_qc_t ret =BLK_QC_T_NONE ;
@@ -310,7 +310,7 @@ blk_qc_t nvme_ns_head_submit_bio(struct bio *bio) srcu_idx =srcu_read_lock (&head->srcu); ns =nvme_find_path (head);if (likely (ns)) { - bio->bi_disk = ns->disk; + bio->bi_bdev = ns->disk->part0; bio->bi_opf |=REQ_NVME_MPATH ;trace_block_bio_remap (bio,disk_devt (ns->head->disk), bio->bi_iter.bi_sector);
@@ -350,7 +350,7 @@ static void nvme_requeue_work(struct work_struct *work)* Reset disk to the mpath node and resubmit to select a new * path. */ - bio->bi_disk = head->disk; + bio->bi_bdev = head->disk->part0;submit_bio_noacct (bio); } }
drivers/nvme/host/rdma.c +1 -1
@@ -1461,7 +1461,7 @@ static int nvme_rdma_map_sg_pi(struct nvme_rdma_queue *queue,if (unlikely (nr)) goto mr_put; -nvme_rdma_set_sig_attrs (blk_get_integrity (bio->bi_disk), c, +nvme_rdma_set_sig_attrs (blk_get_integrity (bio->bi_bdev->bd_disk), c, req->mr->sig_attrs, ns->pi_type);nvme_rdma_set_prot_checks (c, &req->mr->sig_attrs->check_mask);
drivers/s390/block/dcssblk.c +1 -1
@@ -879,7 +879,7 @@ dcssblk_submit_bio(struct bio *bio)blk_queue_split (&bio); bytes_done =0 ; - dev_info = bio->bi_disk->private_data; + dev_info = bio->bi_bdev->bd_disk->private_data;if (dev_info ==NULL ) goto fail; if ((bio->bi_iter.bi_sector & 7) != 0 ||
drivers/s390/block/xpram.c +1 -1
@@ -184,7 +184,7 @@ static unsigned long xpram_highest_page_index(void)*/ static blk_qc_t xpram_submit_bio (struct bio *bio) { -xpram_device_t *xdev = bio->bi_disk->private_data; +xpram_device_t *xdev = bio->bi_bdev->bd_disk->private_data;struct bio_vec bvec;struct bvec_iter iter;unsigned int index;
fs/btrfs/check-integrity.c +5 -5
@@ -2677,7 +2677,7 @@ static void __btrfsic_submit_bio(struct bio *bio)mutex_lock (&btrfsic_mutex);/* since btrfsic_submit_bio() is also called before * btrfsic_mount(), this might return NULL */ - dev_state =btrfsic_dev_state_lookup (bio_dev (bio) + bio->bi_partno); + dev_state =btrfsic_dev_state_lookup (bio->bi_bdev->bd_dev);if (NULL != dev_state && (bio_op (bio) ==REQ_OP_WRITE ) &&bio_has_data (bio)) {unsigned int i =0 ;
@@ -2693,10 +2693,10 @@ static void __btrfsic_submit_bio(struct bio *bio) bio_is_patched =0 ;if (dev_state->state->print_mask &BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH ) -pr_info ("submit_bio(rw=%d,0x%x, bi_vcnt=%u, bi_sector=%llu (bytenr %llu), bi_disk=%p)\n" , +pr_info ("submit_bio(rw=%d,0x%x, bi_vcnt=%u, bi_sector=%llu (bytenr %llu), bi_bdev=%p)\n" ,bio_op (bio), bio->bi_opf, segs, (unsigned long long )bio->bi_iter.bi_sector, - dev_bytenr, bio->bi_disk); + dev_bytenr, bio->bi_bdev); mapped_datav =kmalloc_array (segs,sizeof (*mapped_datav),GFP_NOFS );
@@ -2725,8 +2725,8 @@ static void __btrfsic_submit_bio(struct bio *bio) }else if (NULL != dev_state && (bio->bi_opf &REQ_PREFLUSH )) {if (dev_state->state->print_mask &BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH ) -pr_info ("submit_bio(rw=%d,0x%x FLUSH, disk=%p)\n" , -bio_op (bio), bio->bi_opf, bio->bi_disk); +pr_info ("submit_bio(rw=%d,0x%x FLUSH, bdev=%p)\n" , +bio_op (bio), bio->bi_opf, bio->bi_bdev);if (!dev_state->dummy_block_for_bio_bh_flush.is_iodone) { if ((dev_state->state->print_mask & (BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH |
fs/btrfs/raid56.c +2 -5
@@ -1105,8 +1105,7 @@ static int rbio_add_io_page(struct btrfs_raid_bio *rbio,* devices or if they are not contiguous */ if (last_end == disk_start && !last->bi_status && - last->bi_disk == stripe->dev->bdev->bd_disk && - last->bi_partno == stripe->dev->bdev->bd_partno) { + last->bi_bdev == stripe->dev->bdev) { ret =bio_add_page (last, page,PAGE_SIZE ,0 );if (ret ==PAGE_SIZE )return 0 ;
@@ -1357,9 +1356,7 @@ static int find_bio_stripe(struct btrfs_raid_bio *rbio,for (i =0 ; i < rbio->bbio->num_stripes; i++) { stripe = &rbio->bbio->stripes[i];if (in_range (physical, stripe->physical, rbio->stripe_len) && - stripe->dev->bdev && - bio->bi_disk == stripe->dev->bdev->bd_disk && - bio->bi_partno == stripe->dev->bdev->bd_partno) { + stripe->dev->bdev && bio->bi_bdev == stripe->dev->bdev) {return i; } }
fs/btrfs/scrub.c +1 -1
@@ -1698,7 +1698,7 @@ static void scrub_wr_submit(struct scrub_ctx *sctx) sbio = sctx->wr_curr_bio; sctx->wr_curr_bio =NULL ; -WARN_ON (!sbio->bio->bi_disk); +WARN_ON (!sbio->bio->bi_bdev);scrub_pending_bio_inc (sctx);/* process all writes in a single worker thread. Then the block layer * orders the requests before sending them to the driver which
fs/direct-io.c +1 -1
@@ -434,7 +434,7 @@ static inline void dio_bio_submit(struct dio *dio, struct dio_submit *sdio)if (dio->is_async && dio->op ==REQ_OP_READ && dio->should_dirty)bio_set_pages_dirty (bio); - dio->bio_disk = bio->bi_disk; + dio->bio_disk = bio->bi_bdev->bd_disk;if (sdio->submit_io) { sdio->submit_io (bio, dio->inode, sdio->logical_offset_in_bio);
fs/f2fs/data.c +1 -11
@@ -427,16 +427,6 @@ int f2fs_target_device_index(struct f2fs_sb_info *sbi, block_t blkaddr)return 0 ; } -/* -* Return true, if pre_bio's bdev is same as its target device. -*/ -static bool __same_bdev (struct f2fs_sb_info *sbi, -block_t blk_addr,struct bio *bio) -{ -struct block_device *b =f2fs_target_device (sbi, blk_addr,NULL ); -return bio->bi_disk == b->bd_disk && bio->bi_partno == b->bd_partno; -} -static struct bio *__bio_alloc (struct f2fs_io_info *fio,int npages) {struct f2fs_sb_info *sbi = fio->sbi;
@@ -738,7 +728,7 @@ static bool page_is_mergeable(struct f2fs_sb_info *sbi, struct bio *bio, {if (last_blkaddr +1 != cur_blkaddr)return false; -return __same_bdev (sbi, cur_blkaddr, bio); +return bio->bi_bdev ==f2fs_target_device (sbi, cur_blkaddr,NULL ); } static bool io_type_is_mergeable(struct f2fs_bio_info *io,
include/linux/bio.h +8 -10
@@ -470,24 +470,22 @@ extern void bvec_free(mempool_t *, struct bio_vec *, unsigned int);extern unsigned int bvec_nr_vecs (unsigned short idx);extern const char *bio_devname (struct bio *bio,char *buffer); -#define bio_set_dev (bio, bdev) \ -do { \ - if ((bio)->bi_disk != (bdev)->bd_disk) \ - bio_clear_flag(bio, BIO_THROTTLED);\ - (bio)->bi_disk = (bdev)->bd_disk; \ - (bio)->bi_partno = (bdev)->bd_partno; \ - bio_associate_blkg(bio); \ +#define bio_set_dev (bio, bdev) \ +do { \ + if ((bio)->bi_bdev != (bdev)) \ + bio_clear_flag(bio, BIO_THROTTLED); \ + (bio)->bi_bdev = (bdev); \ + bio_associate_blkg(bio); \ } while (0)#define bio_copy_dev (dst, src) \ do { \ - (dst)->bi_disk = (src)->bi_disk; \ - (dst)->bi_partno = (src)->bi_partno; \ + (dst)->bi_bdev = (src)->bi_bdev; \ bio_clone_blkg_association(dst, src); \ } while (0)#define bio_dev (bio) \ - disk_devt((bio)->bi_disk) + disk_devt((bio)->bi_bdev->bd_disk)#ifdef CONFIG_BLK_CGROUP void bio_associate_blkg (struct bio *bio);
include/linux/blk_types.h +1 -2
@@ -222,7 +222,7 @@ static inline void bio_issue_init(struct bio_issue *issue,*/ struct bio {struct bio *bi_next;/* request queue link */ -struct gendisk *bi_disk; +struct block_device *bi_bdev;unsigned int bi_opf;/* bottom bits req flags, * top bits REQ_OP. Use * accessors.
@@ -231,7 +231,6 @@ struct bio {unsigned short bi_ioprio;unsigned short bi_write_hint;blk_status_t bi_status; -u8 bi_partno;atomic_t __bi_remaining;struct bvec_iter bi_iter;
include/linux/blkdev.h +3 -2
@@ -1956,7 +1956,8 @@ void part_end_io_acct(struct block_device *part, struct bio *bio,*/ static inline unsigned long bio_start_io_acct (struct bio *bio) { -return disk_start_io_acct (bio->bi_disk,bio_sectors (bio),bio_op (bio)); +return disk_start_io_acct (bio->bi_bdev->bd_disk,bio_sectors (bio), +bio_op (bio)); }/**
@@ -1966,7 +1967,7 @@ static inline unsigned long bio_start_io_acct(struct bio *bio)*/ static inline void bio_end_io_acct (struct bio *bio,unsigned long start_time) { -return disk_end_io_acct (bio->bi_disk,bio_op (bio), start_time); +return disk_end_io_acct (bio->bi_bdev->bd_disk,bio_op (bio), start_time); }int bdev_read_only (struct block_device *bdev);
kernel/trace/blktrace.c +9 -7
@@ -903,7 +903,7 @@ static void blk_add_trace_bio(struct request_queue *q, struct bio *bio,static void blk_add_trace_bio_bounce (void *ignore,struct bio *bio) { -blk_add_trace_bio (bio->bi_disk->queue, bio,BLK_TA_BOUNCE ,0 ); +blk_add_trace_bio (bio->bi_bdev->bd_disk->queue, bio,BLK_TA_BOUNCE ,0 ); } static void blk_add_trace_bio_complete(void *ignore,
@@ -915,22 +915,24 @@ static void blk_add_trace_bio_complete(void *ignore,static void blk_add_trace_bio_backmerge (void *ignore,struct bio *bio) { -blk_add_trace_bio (bio->bi_disk->queue, bio,BLK_TA_BACKMERGE ,0 ); +blk_add_trace_bio (bio->bi_bdev->bd_disk->queue, bio,BLK_TA_BACKMERGE , +0 ); }static void blk_add_trace_bio_frontmerge (void *ignore,struct bio *bio) { -blk_add_trace_bio (bio->bi_disk->queue, bio,BLK_TA_FRONTMERGE ,0 ); +blk_add_trace_bio (bio->bi_bdev->bd_disk->queue, bio,BLK_TA_FRONTMERGE , +0 ); }static void blk_add_trace_bio_queue (void *ignore,struct bio *bio) { -blk_add_trace_bio (bio->bi_disk->queue, bio,BLK_TA_QUEUE ,0 ); +blk_add_trace_bio (bio->bi_bdev->bd_disk->queue, bio,BLK_TA_QUEUE ,0 ); }static void blk_add_trace_getrq (void *ignore,struct bio *bio) { -blk_add_trace_bio (bio->bi_disk->queue, bio,BLK_TA_GETRQ ,0 ); +blk_add_trace_bio (bio->bi_bdev->bd_disk->queue, bio,BLK_TA_GETRQ ,0 ); }static void blk_add_trace_plug (void *ignore,struct request_queue *q)
@@ -967,7 +969,7 @@ static void blk_add_trace_unplug(void *ignore, struct request_queue *q,static void blk_add_trace_split (void *ignore,struct bio *bio,unsigned int pdu) { -struct request_queue *q = bio->bi_disk->queue; +struct request_queue *q = bio->bi_bdev->bd_disk->queue;struct blk_trace *bt;rcu_read_lock ();
@@ -997,7 +999,7 @@ static void blk_add_trace_split(void *ignore, struct bio *bio, unsigned int pdu)static void blk_add_trace_bio_remap (void *ignore,struct bio *bio,dev_t dev,sector_t from) { -struct request_queue *q = bio->bi_disk->queue; +struct request_queue *q = bio->bi_bdev->bd_disk->queue;struct blk_trace *bt;struct blk_io_trace_remap r;
mm/page_io.c +1 -1
@@ -431,7 +431,7 @@ int swap_readpage(struct page *page, bool synchronous) ret = -ENOMEM ; goto out; } - disk = bio->bi_disk; + disk = bio->bi_bdev->bd_disk;/* * Keep this task valid during swap readpage because the oom killer may * attempt to access it in the page fault retry time check.
Signature · 1 line
2.29.2
Re: [PATCH 3/9] block: store a block_device pointer in struct bio
Quoted 6 lines · Christoph Hellwig
Replace the gendisk pointer in struct bio with a pointer to the newly improved struct block device. From that the gendisk can be trivially accessed with an extra indirection, but it also allows to directly look up all information related to partition remapping.
Signed-off-by Christoph Hellwig <[email protected]>
Thanks.
Signature · 1 line
tejun
Re: [PATCH 3/9] block: store a block_device pointer in struct bio
In reply to Christoph HellwigQuoted 4 lines · Christoph Hellwig
Replace the gendisk pointer in struct bio with a pointer to the newly improved struct block device. From that the gendisk can be trivially accessed with an extra indirection, but it also allows to directly look up all information related to partition remapping.
The extra indirection is often done in fast path, so just wondering why you don't consider to embed gendisk into block_device? Then the extra indirection can be avoided.
Thanks,
Ming
--
dm-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/dm-devel
Re: [PATCH 3/9] block: store a block_device pointer in struct bio
Quoted 9 lines · Ming Lei
Quoted 4 lines · Christoph Hellwig
Replace the gendisk pointer in struct bio with a pointer to the newly improved struct block device. From that the gendisk can be trivially accessed with an extra indirection, but it also allows to directly look up all information related to partition remapping.
The extra indirection is often done in fast path, so just wondering why you don't consider to embed gendisk into
block_device? Then the extra indirection can be avoided.
oops, that is only possible for disk, and indirection is still needed for partitions.
Thanks,
Ming
--
dm-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/dm-devel
Christoph Hellwig
maintainerRe: [PATCH 3/9] block: store a block_device pointer in struct bio
Quoted 7 lines · Ming Lei
Quoted 6 lines · Ming Lei
Quoted 4 lines · Christoph Hellwig
Replace the gendisk pointer in struct bio with a pointer to the newly improved struct block device. From that the gendisk can be trivially accessed with an extra indirection, but it also allows to directly look up all information related to partition remapping.
Quoted 6 lines
Quoted 3 lines
The extra indirection is often done in fast path, so just wondering why you don't consider to embed gendisk into
block_device? Then the extra indirection can be avoided.oops, that is only possible for disk, and indirection is still needed for partitions.
I looked into that, but given that the block device is allocated as part of the inode we'd need to tell ->alloc_inode if we want to allocate the small inode without the gendisk, or the large one with it which doesn't work with the current interface. Beause the hd_struct is gone we're still not using more structures in the I/O path than we did before.
Re: [PATCH 3/9] block: store a block_device pointer in struct bio
Quoted 12 lines · Christoph Hellwig
Quoted 11 lines · Ming Lei
Quoted 9 lines · Ming Lei
Quoted 4 lines · Christoph Hellwig
Replace the gendisk pointer in struct bio with a pointer to the newly improved struct block device. From that the gendisk can be trivially accessed with an extra indirection, but it also allows to directly look up all information related to partition remapping.
The extra indirection is often done in fast path, so just wondering why you don't consider to embed gendisk into
block_device? Then the extra indirection can be avoided.
Quoted 7 lines
Quoted 2 lines
oops, that is only possible for disk, and indirection is still needed for partitions.
I looked into that, but given that the block device is allocated as part of the inode we'd need to tell ->alloc_inode if we want to allocate the small inode without the gendisk, or the large one with it which doesn't work with the current interface.
I guess it could be done without fs code change, because now block device is always allocated by bdev_alloc() since 22ae8ce8b892("block: simplify bdev/disk lookup in blkdev_get"). And one manual inode allocation with a bit duplication from new_inode_pseudo() should be fine:
allocate big inode for disk, and small for partition
inode_init_always(sb, inode);
if (inode) {
spin_lock(&inode->i_lock);
inode->i_state = 0;
spin_unlock(&inode->i_lock);
INIT_LIST_HEAD(&inode->i_sb_list);
inode_sb_list_add(inode);
}Quoted 2 lines
Beause the
hd_structis gone we're
still not using more structures in the I/O path than we did before.
Indeed, and block_device instance is often cached in IO path.
thanks,
Ming
Keith Busch
maintainerRe: [PATCH 3/9] block: store a block_device pointer in struct bio
In reply to Christoph Hellwigblock/blk.h static inline void blk_rq_bio_prep(struct request *rq, struct bio *bio, · line 104
Quoted 13 lines · Christoph Hellwig
block/blk.h +2
-2@@ -99,8 +99,8 @@ static inline void blk_rq_bio_prep(struct request *rq, struct bio *bio, rq->bio = rq->biotail = bio; rq->ioprio =bio_prio (bio); -if (bio->bi_disk) - rq->rq_disk = bio->bi_disk; +if (bio->bi_bdev) + rq->rq_disk = bio->bi_bdev->bd_disk; }
Just fyi, this function has been relocated to include/linux/blk-mq.h
Christoph Hellwig
maintainerPATCH 4/9 block: simplify submit_bio_checks a bit
In reply to Christoph HellwigMerge a few checks for whole devices vs partitions to streamline the sanity checks.
--- block/blk-core.c | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-)
block/blk-core.c +14 -26
@@ -691,11 +691,9 @@ static inline bool should_fail_request(struct block_device *part,#endif /* CONFIG_FAIL_MAKE_REQUEST */ -static inline bool bio_check_ro (struct bio *bio,struct block_device *part) +static inline bool bio_check_ro (struct bio *bio) { -const int op =bio_op (bio); - -if (part->bd_read_only &&op_is_write (op)) { +if (op_is_write (bio_op (bio)) && bio->bi_bdev->bd_read_only) {char b[BDEVNAME_SIZE ];if (op_is_flush (bio->bi_opf) && !bio_sectors (bio))
@@ -703,7 +701,7 @@ static inline bool bio_check_ro(struct bio *bio, struct block_device *part)WARN_ONCE (1 ,"Trying to write to read-only block-device %s (partno %d)\n" , -bio_devname (bio, b), part->bd_partno); +bio_devname (bio, b), bio->bi_bdev->bd_partno);/* Older lvm-tools actually trigger this */ return false; }
@@ -724,8 +722,9 @@ ALLOW_ERROR_INJECTION(should_fail_bio, ERRNO);* This may well happen - the kernel calls bread() without checking the size of * the device, e.g., when mounting a file system. */ -static inline int bio_check_eod (struct bio *bio,sector_t maxsector) +static inline int bio_check_eod (struct bio *bio) { +sector_t maxsector =bdev_nr_sectors (bio->bi_bdev);unsigned int nr_sectors =bio_sectors (bio); if (nr_sectors && maxsector &&
@@ -740,27 +739,20 @@ static inline int bio_check_eod(struct bio *bio, sector_t maxsector)/* * Remap block n of partition p to block n+start(p) of the disk. */ -static inline int blk_partition_remap (struct bio *bio) +static int blk_partition_remap (struct bio *bio) {struct block_device *p = bio->bi_bdev; -int ret = -EIO ;if (unlikely (should_fail_request (p, bio->bi_iter.bi_size))) - goto out; -if (unlikely (bio_check_ro (bio, p))) - goto out; +return -EIO ;if (bio_sectors (bio)) { -if (bio_check_eod (bio,bdev_nr_sectors (p))) - goto out; bio->bi_iter.bi_sector += p->bd_start_sect;trace_block_bio_remap (bio, p->bd_dev, bio->bi_iter.bi_sector - p->bd_start_sect); } - ret =0 ; -out: -return ret; +return 0 ; }/*
@@ -820,16 +812,12 @@ static noinline_for_stack bool submit_bio_checks(struct bio *bio)if (should_fail_bio (bio)) goto end_io; - -if (bio->bi_bdev->bd_partno) { -if (unlikely (blk_partition_remap (bio))) - goto end_io; - }else { -if (unlikely (bio_check_ro (bio,bdev_whole (bdev)))) - goto end_io; -if (unlikely (bio_check_eod (bio,get_capacity (bdev->bd_disk)))) - goto end_io; - } +if (unlikely (bio_check_ro (bio))) + goto end_io; +if (unlikely (bio_check_eod (bio))) + goto end_io; +if (bio->bi_bdev->bd_partno &&unlikely (blk_partition_remap (bio))) + goto end_io;/* * Filter flush bio's early so that bio based drivers without flush
Signature · 1 line
2.29.2
Re: [PATCH 4/9] block: simplify submit_bio_checks a bit
Quoted 4 lines · Christoph Hellwig
Merge a few checks for whole devices vs partitions to streamline the sanity checks.
Signed-off-by Christoph Hellwig <[email protected]>
Signature · 6 lines
tejun -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
Christoph Hellwig
maintainerPATCH 5/9 block: use ->bi_bdev for bio based I/O accounting
In reply to Christoph HellwigRework the I/O accounting for bio based drivers to use ->bi_bdev. This means all drivers can now simply use bio_start_io_acct to start accounting, and it will take partitions into account automatically. To end I/O account either bio_end_io_acct can be used if the driver never remaps I/O to a different device, or bio_end_io_acct_remapped if the driver did remap the I/O.
--- block/blk-core.c | 23 +++++++++++++---------- drivers/md/bcache/request.c | 34 +++++++++++++++++++++------------- drivers/md/md.c | 8 ++++---- include/linux/blkdev.h | 21 ++++----------------- 4 files changed, 42 insertions(+), 44 deletions(-)
block/blk-core.c +13 -10
@@ -1319,14 +1319,17 @@ static unsigned long __part_start_io_acct(struct block_device *part,return now; } -unsigned long part_start_io_acct (struct gendisk *disk,struct block_device **part, -struct bio *bio) +/** +* bio_start_io_acct - start I/O accounting for bio based drivers +* @bio: bio to start account for +* +* Returns the start time that should be passed back to bio_end_io_acct(). +*/ +unsigned long bio_start_io_acct (struct bio *bio) { - *part =disk_map_sector_rcu (disk, bio->bi_iter.bi_sector); - -return __part_start_io_acct (*part,bio_sectors (bio),bio_op (bio)); +return __part_start_io_acct (bio->bi_bdev,bio_sectors (bio),bio_op (bio)); } -EXPORT_SYMBOL_GPL (part_start_io_acct); +EXPORT_SYMBOL_GPL (bio_start_io_acct);unsigned long disk_start_io_acct (struct gendisk *disk,unsigned int sectors,unsigned int op)
@@ -1349,12 +1352,12 @@ static void __part_end_io_acct(struct block_device *part, unsigned int op,part_stat_unlock (); } -void part_end_io_acct (struct block_device *part,struct bio *bio, -unsigned long start_time) +void bio_end_io_acct_remapped (struct bio *bio,unsigned long start_time, +struct block_device *orig_bdev) { -__part_end_io_acct (part,bio_op (bio), start_time); +__part_end_io_acct (orig_bdev,bio_op (bio), start_time); } -EXPORT_SYMBOL_GPL (part_end_io_acct); +EXPORT_SYMBOL_GPL (bio_end_io_acct_remapped);void disk_end_io_acct (struct gendisk *disk,unsigned int op,unsigned long start_time)
drivers/md/bcache/request.c +21 -13
@@ -475,7 +475,7 @@ struct search { unsigned int read_dirty_data:1; unsigned int cache_missed:1; -struct block_device *part; +struct block_device *orig_bdev;unsigned long start_time;struct btree_op op;
@@ -670,8 +670,8 @@ static void bio_complete(struct search *s) {if (s->orig_bio) {/* Count on bcache device */ -part_end_io_acct (s->part, s->orig_bio, s->start_time); - +bio_end_io_acct_remapped (s->orig_bio, s->start_time, + s->orig_bdev);trace_bcache_request_end (s->d, s->orig_bio); s->orig_bio->bi_status = s->iop.status;bio_endio (s->orig_bio);
@@ -714,7 +714,8 @@ static void search_free(struct closure *cl) }static inline struct search *search_alloc (struct bio *bio, -struct bcache_device *d) +struct bcache_device *d,struct block_device *orig_bdev, +unsigned long start_time) {struct search *s;
@@ -732,7 +733,8 @@ static inline struct search *search_alloc(struct bio *bio, s->write =op_is_write (bio_op (bio)); s->read_dirty_data =0 ;/* Count on the bcache device */ - s->start_time =part_start_io_acct (d->disk, &s->part, bio); + s->orig_bdev = orig_bdev; + s->start_time = start_time; s->iop.c = d->c; s->iop.bio =NULL ; s->iop.inode = d->id;
@@ -1074,7 +1076,7 @@ struct detached_dev_io_private {unsigned long start_time;bio_end_io_t *bi_end_io;void *bi_private; -struct block_device *part; +struct block_device *orig_bdev; };static void detached_dev_end_io (struct bio *bio)
@@ -1086,7 +1088,7 @@ static void detached_dev_end_io(struct bio *bio) bio->bi_private = ddip->bi_private;/* Count on the bcache device */ -part_end_io_acct (ddip->part, bio, ddip->start_time); +bio_end_io_acct_remapped (bio, ddip->start_time, ddip->orig_bdev);if (bio->bi_status) { struct cached_dev *dc = container_of(ddip->d,
@@ -1099,7 +1101,8 @@ static void detached_dev_end_io(struct bio *bio) bio->bi_end_io (bio); } -static void detached_dev_do_request (struct bcache_device *d,struct bio *bio) +static void detached_dev_do_request (struct bcache_device *d,struct bio *bio, +struct block_device *orig_bdev,unsigned long start_time) {struct detached_dev_io_private *ddip; struct cached_dev *dc = container_of(d, struct cached_dev, disk);
@@ -1112,7 +1115,8 @@ static void detached_dev_do_request(struct bcache_device *d, struct bio *bio) ddip =kzalloc (sizeof (struct detached_dev_io_private ),GFP_NOIO ); ddip->d = d;/* Count on the bcache device */ - ddip->start_time =part_start_io_acct (d->disk, &ddip->part, bio); + ddip->orig_bdev = orig_bdev; + ddip->start_time = start_time; ddip->bi_end_io = bio->bi_end_io; ddip->bi_private = bio->bi_private; bio->bi_end_io = detached_dev_end_io;
@@ -1168,8 +1172,10 @@ static void quit_max_writeback_rate(struct cache_set *c,blk_qc_t cached_dev_submit_bio (struct bio *bio) {struct search *s; -struct bcache_device *d = bio->bi_bdev->bd_disk->private_data; +struct block_device *orig_bdev = bio->bi_bdev; +struct bcache_device *d = orig_bdev->bd_disk->private_data; struct cached_dev *dc = container_of(d, struct cached_dev, disk); +unsigned long start_time;int rw =bio_data_dir (bio); if (unlikely((d->c && test_bit(CACHE_SET_IO_DISABLE, &d->c->flags)) ||
@@ -1194,11 +1200,13 @@ blk_qc_t cached_dev_submit_bio(struct bio *bio) } } + start_time =bio_start_io_acct (bio); +bio_set_dev (bio, dc->bdev); bio->bi_iter.bi_sector += dc->sb.data_offset;if (cached_dev_get (dc)) { - s =search_alloc (bio, d); + s =search_alloc (bio, d, orig_bdev, start_time);trace_bcache_request_start (s->d, bio);if (!bio->bi_iter.bi_size) {
@@ -1219,7 +1227,7 @@ blk_qc_t cached_dev_submit_bio(struct bio *bio) } }else /* I/O request sent to backing device */ -detached_dev_do_request (d, bio); +detached_dev_do_request (d, bio, orig_bdev, start_time);return BLK_QC_T_NONE ; }
@@ -1283,7 +1291,7 @@ blk_qc_t flash_dev_submit_bio(struct bio *bio)return BLK_QC_T_NONE ; } - s =search_alloc (bio, d); + s =search_alloc (bio, d, bio->bi_bdev,bio_start_io_acct (bio)); cl = &s->cl; bio = &s->bio.bio;
drivers/md/md.c +4 -4
@@ -463,8 +463,8 @@ struct md_io {struct mddev *mddev;bio_end_io_t *orig_bi_end_io;void *orig_bi_private; +struct block_device *orig_bi_bdev;unsigned long start_time; -struct block_device *part; };static void md_end_io (struct bio *bio)
@@ -472,7 +472,7 @@ static void md_end_io(struct bio *bio)struct md_io *md_io = bio->bi_private;struct mddev *mddev = md_io->mddev; -part_end_io_acct (md_io->part, bio, md_io->start_time); +bio_end_io_acct_remapped (bio, md_io->start_time, md_io->orig_bi_bdev); bio->bi_end_io = md_io->orig_bi_end_io; bio->bi_private = md_io->orig_bi_private;
@@ -514,12 +514,12 @@ static blk_qc_t md_submit_bio(struct bio *bio) md_io->mddev = mddev; md_io->orig_bi_end_io = bio->bi_end_io; md_io->orig_bi_private = bio->bi_private; + md_io->orig_bi_bdev = bio->bi_bdev; bio->bi_end_io = md_end_io; bio->bi_private = md_io; - md_io->start_time =part_start_io_acct (mddev->gendisk, - &md_io->part, bio); + md_io->start_time =bio_start_io_acct (bio); }/* bio could be mergeable after passing to underlayer */
include/linux/blkdev.h +4 -17
@@ -1943,22 +1943,9 @@ unsigned long disk_start_io_acct(struct gendisk *disk, unsigned int sectors,void disk_end_io_acct (struct gendisk *disk,unsigned int op,unsigned long start_time); -unsigned long part_start_io_acct (struct gendisk *disk, -struct block_device **part,struct bio *bio); -void part_end_io_acct (struct block_device *part,struct bio *bio, -unsigned long start_time); - -/** -* bio_start_io_acct - start I/O accounting for bio based drivers -* @bio: bio to start account for -* -* Returns the start time that should be passed back to bio_end_io_acct(). -*/ -static inline unsigned long bio_start_io_acct (struct bio *bio) -{ -return disk_start_io_acct (bio->bi_bdev->bd_disk,bio_sectors (bio), -bio_op (bio)); -} +unsigned long bio_start_io_acct (struct bio *bio); +void bio_end_io_acct_remapped (struct bio *bio,unsigned long start_time, +struct block_device *orig_bdev);/** * bio_end_io_acct - end I/O accounting for bio based drivers
@@ -1967,7 +1954,7 @@ static inline unsigned long bio_start_io_acct(struct bio *bio)*/ static inline void bio_end_io_acct (struct bio *bio,unsigned long start_time) { -return disk_end_io_acct (bio->bi_bdev->bd_disk,bio_op (bio), start_time); +return bio_end_io_acct_remapped (bio, start_time, bio->bi_bdev); }int bdev_read_only (struct block_device *bdev);
Signature · 1 line
2.29.2
Re: [PATCH 5/9] block: use ->bi_bdev for bio based I/O accounting
Quoted 8 lines · Christoph Hellwig
Rework the I/O accounting for bio based drivers to use ->bi_bdev. This means all drivers can now simply use
bio_start_io_acctto start accounting, and it will take partitions into account automatically. To end I/O account eitherbio_end_io_acctcan be used if the driver never remaps I/O to a different device, orbio_end_io_acct_remappedif the driver did remap the I/O.Signed-off-by Christoph Hellwig <[email protected]>
Signature · 6 lines
tejun -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
Christoph Hellwig
maintainerPATCH 6/9 blk-mq: use ->bi_bdev for I/O accounting
In reply to Christoph HellwigRemove the reverse map from a sector to a partition for I/O accounting by simply using ->bi_bdev.
--- block/blk-core.c | 6 +++++- block/blk.h | 2 -- block/genhd.c | 48 ------------------------------------------------ 3 files changed, 5 insertions(+), 51 deletions(-)
block/blk-core.c +5 -1
@@ -1296,7 +1296,11 @@ void blk_account_io_start(struct request *rq)if (!blk_do_io_stat (rq))return ; - rq->part =disk_map_sector_rcu (rq->rq_disk,blk_rq_pos (rq)); +/* passthrough requests can hold bios that do not have ->bi_bdev set */ +if (rq->bio && rq->bio->bi_bdev) + rq->part = rq->bio->bi_bdev; +else + rq->part = rq->rq_disk->part0;part_stat_lock ();update_io_ticks (rq->part, jiffies, false);
block/blk.h +0 -2
@@ -346,8 +346,6 @@ void blk_queue_free_zone_bitmaps(struct request_queue *q);static inline void blk_queue_free_zone_bitmaps (struct request_queue *q) {}#endif -struct block_device *disk_map_sector_rcu (struct gendisk *disk,sector_t sector); -int blk_alloc_devt (struct block_device *part,dev_t *devt);void blk_free_devt (dev_t devt);char *disk_name (struct gendisk *hd,int partno,char *buf);
block/genhd.c +0 -48
54 lines not on this page · raw message
Signature · 1 line
2.29.2
Re: [PATCH 6/9] blk-mq: use ->bi_bdev for I/O accounting
Quoted 4 lines · Christoph Hellwig
Remove the reverse map from a sector to a partition for I/O accounting by simply using ->bi_bdev.
Signed-off-by Christoph Hellwig <[email protected]>
Signature · 6 lines
tejun -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
Christoph Hellwig
maintainerPATCH 7/9 block: add a disk_uevent helper
In reply to Christoph HellwigAdd a helper to call kobject_uevent for the disk and all partitions, and unexport the disk_part_iter_* helpers that are now only used in the core block code.
--- block/genhd.c | 27 ++++++++++++++------------- drivers/s390/block/dasd.c | 26 +++++--------------------- include/linux/genhd.h | 2 ++ 3 files changed, 21 insertions(+), 34 deletions(-)
block/genhd.c +14 -13
@@ -201,7 +201,6 @@ void disk_part_iter_init(struct disk_part_iter *piter, struct gendisk *disk,rcu_read_unlock (); } -EXPORT_SYMBOL_GPL (disk_part_iter_init);/** * disk_part_iter_next - proceed iterator to the next partition and return it
@@ -261,7 +260,6 @@ struct block_device *disk_part_iter_next(struct disk_part_iter *piter)return piter->part; } -EXPORT_SYMBOL_GPL (disk_part_iter_next);/** * disk_part_iter_exit - finish up partition iteration
@@ -278,7 +276,6 @@ void disk_part_iter_exit(struct disk_part_iter *piter)bdput (piter->part); piter->part =NULL ; } -EXPORT_SYMBOL_GPL (disk_part_iter_exit);/** * disk_has_partitions
@@ -550,6 +547,18 @@ static char *bdevt_str(dev_t devt, char *buf)return buf; } +void disk_uevent (struct gendisk *disk,enum kobject_action action) +{ +struct disk_part_iter piter; +struct block_device *part; + +disk_part_iter_init (&piter, disk,DISK_PITER_INCL_PART0 ); +while ((part =disk_part_iter_next (&piter))) +kobject_uevent (bdev_kobj (part), action); +disk_part_iter_exit (&piter); +} +EXPORT_SYMBOL_GPL (disk_uevent); +static void disk_scan_partitions (struct gendisk *disk) {struct block_device *bdev;
@@ -567,8 +576,6 @@ static void register_disk(struct device *parent, struct gendisk *disk, const struct attribute_group **groups) {struct device *ddev =disk_to_dev (disk); -struct disk_part_iter piter; -struct block_device *part;int err; ddev->parent = parent;
@@ -611,15 +618,9 @@ static void register_disk(struct device *parent, struct gendisk *disk,disk_scan_partitions (disk); -/* announce disk after possible partitions are created */ +/* announce the disk and partitions after all partitions are created */ dev_set_uevent_suppress (ddev,0 ); -kobject_uevent (&ddev->kobj,KOBJ_ADD ); - -/* announce possible partitions */ -disk_part_iter_init (&piter, disk,0 ); -while ((part =disk_part_iter_next (&piter))) -kobject_uevent (bdev_kobj (part),KOBJ_ADD ); -disk_part_iter_exit (&piter); +disk_uevent (disk,KOBJ_ADD );if (disk->queue->backing_dev_info->dev) { err = sysfs_create_link(&ddev->kobj,
drivers/s390/block/dasd.c +5 -21
@@ -430,23 +430,15 @@ static int dasd_state_unfmt_to_basic(struct dasd_device *device)static int dasd_state_ready_to_online (struct dasd_device * device) { -struct gendisk *disk; -struct disk_part_iter piter; -struct block_device *part; - device->state =DASD_STATE_ONLINE ;if (device->block) {dasd_schedule_block_bh (device->block);if ((device->features &DASD_FEATURE_USERAW )) { - disk = device->block->gdp; -kobject_uevent (&disk_to_dev (disk)->kobj,KOBJ_CHANGE ); +kobject_uevent (&disk_to_dev (device->block->gdp)->kobj, +KOBJ_CHANGE );return 0 ; } - disk = device->block->bdev->bd_disk; -disk_part_iter_init (&piter, disk,DISK_PITER_INCL_PART0 ); -while ((part =disk_part_iter_next (&piter))) -kobject_uevent (bdev_kobj (part),KOBJ_CHANGE ); -disk_part_iter_exit (&piter); +disk_uevent (device->block->bdev->bd_disk,KOBJ_CHANGE ); }return 0 ; }
@@ -457,9 +449,6 @@ dasd_state_ready_to_online(struct dasd_device * device)static int dasd_state_online_to_ready (struct dasd_device *device) {int rc; -struct gendisk *disk; -struct disk_part_iter piter; -struct block_device *part;if (device->discipline->online_to_ready) { rc = device->discipline->online_to_ready (device);
@@ -468,13 +457,8 @@ static int dasd_state_online_to_ready(struct dasd_device *device) } device->state =DASD_STATE_READY ; -if (device->block && !(device->features &DASD_FEATURE_USERAW )) { - disk = device->block->bdev->bd_disk; -disk_part_iter_init (&piter, disk,DISK_PITER_INCL_PART0 ); -while ((part =disk_part_iter_next (&piter))) -kobject_uevent (bdev_kobj (part),KOBJ_CHANGE ); -disk_part_iter_exit (&piter); - } +if (device->block && !(device->features &DASD_FEATURE_USERAW )) +disk_uevent (device->block->bdev->bd_disk,KOBJ_CHANGE );return 0 ; }
include/linux/genhd.h +2 -0
@@ -212,6 +212,8 @@ static inline dev_t disk_devt(struct gendisk *disk)return MKDEV (disk->major, disk->first_minor); } +void disk_uevent (struct gendisk *disk,enum kobject_action action); +/* * Smarter partition iterator without context limits. */
Signature · 1 line
2.29.2
Re: [PATCH 7/9] block: add a disk_uevent helper
Quoted 5 lines · Christoph Hellwig
Add a helper to call
kobject_ueventfor the disk and all partitions, and unexport the disk_part_iter_* helpers that are now only used in the core block code.Signed-off-by Christoph Hellwig <[email protected]>
Thanks.
Signature · 6 lines
tejun -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
Christoph Hellwig
maintainerPATCH 8/9 block: remove DISK_PITER_REVERSE
In reply to Christoph HellwigThere is good reason to iterate backwards when deleting all partitions in del_gendisk, just like we don't in blk_drop_partitions.
--- block/genhd.c | 34 ++++------------------------------ include/linux/genhd.h | 1 - 2 files changed, 4 insertions(+), 31 deletions(-)
block/genhd.c +4 -30
@@ -182,24 +182,13 @@ static struct block_device *__disk_get_part(struct gendisk *disk, int partno)void disk_part_iter_init (struct disk_part_iter *piter,struct gendisk *disk,unsigned int flags) { -struct disk_part_tbl *ptbl; - -rcu_read_lock (); - ptbl =rcu_dereference (disk->part_tbl); - piter->disk = disk; piter->part =NULL ; - -if (flags &DISK_PITER_REVERSE ) - piter->idx = ptbl->len -1 ; -else if (flags & (DISK_PITER_INCL_PART0 |DISK_PITER_INCL_EMPTY_PART0 )) +if (flags & (DISK_PITER_INCL_PART0 |DISK_PITER_INCL_EMPTY_PART0 )) piter->idx =0 ;else piter->idx =1 ; - piter->flags = flags; - -rcu_read_unlock (); }/**
@@ -214,7 +203,6 @@ void disk_part_iter_init(struct disk_part_iter *piter, struct gendisk *disk,struct block_device *disk_part_iter_next (struct disk_part_iter *piter) {struct disk_part_tbl *ptbl; -int inc, end;/* put the last partition */ disk_part_iter_exit (piter);
@@ -223,21 +211,8 @@ struct block_device *disk_part_iter_next(struct disk_part_iter *piter)rcu_read_lock (); ptbl =rcu_dereference (piter->disk->part_tbl); -/* determine iteration parameters */ -if (piter->flags &DISK_PITER_REVERSE ) { - inc =-1 ; -if (piter->flags & (DISK_PITER_INCL_PART0 | -DISK_PITER_INCL_EMPTY_PART0 )) - end =-1 ; -else - end =0 ; - }else { - inc =1 ; - end = ptbl->len; - } -/* iterate to the next partition */ -for (; piter->idx != end; piter->idx += inc) { +for (; piter->idx != ptbl->len; piter->idx +=1 ) {struct block_device *part; part =rcu_dereference (ptbl->part[piter->idx]);
@@ -252,7 +227,7 @@ struct block_device *disk_part_iter_next(struct disk_part_iter *piter) piter->part =bdgrab (part);if (!piter->part)continue ; - piter->idx += inc; + piter->idx +=1 ;break ; }
@@ -776,8 +751,7 @@ void del_gendisk(struct gendisk *disk)down_write (&bdev_lookup_sem);/* invalidate stuff */ -disk_part_iter_init (&piter, disk, -DISK_PITER_INCL_EMPTY |DISK_PITER_REVERSE ); +disk_part_iter_init (&piter, disk,DISK_PITER_INCL_EMPTY );while ((part =disk_part_iter_next (&piter))) {invalidate_partition (part);delete_partition (part);
include/linux/genhd.h +0 -1
@@ -217,7 +217,6 @@ void disk_uevent(struct gendisk *disk, enum kobject_action action);/* * Smarter partition iterator without context limits. */ -#define DISK_PITER_REVERSE (1 << 0)/* iterate in the reverse direction */ #define DISK_PITER_INCL_EMPTY (1 << 1)/* include 0-sized parts */ #define DISK_PITER_INCL_PART0 (1 << 2)/* include partition 0 */ #define DISK_PITER_INCL_EMPTY_PART0 (1 << 3)/* include empty partition 0 */
Signature · 1 line
2.29.2
Re: [PATCH 8/9] block: remove DISK_PITER_REVERSE
Quoted 4 lines · Christoph Hellwig
There is good reason to iterate backwards when deleting all partitions in
del_gendisk, just like we don't inblk_drop_partitions.Signed-off-by Christoph Hellwig <[email protected]>
Yeah, I was blindly keeping the iteration order. Can't find any explicit explanation why it was that way. The reverse iteration there goes back to the initial git import. But yeah, I can't think of any meaningful difference which can come out of it.
Thanks.
Signature · 6 lines
tejun -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
Christoph Hellwig
maintainerPATCH 9/9 block: use an xarray for disk->part_tbl
In reply to Christoph HellwigNow that no fast path lookups in the partition table are left, there is no point in micro-optimizing the data structure for it. Just use a bog standard xarray.
--- block/blk-settings.c | 2 +- block/blk.h | 1 - block/genhd.c | 156 +++------------------------------------- block/partitions/core.c | 31 ++------ include/linux/genhd.h | 18 +---- 5 files changed, 21 insertions(+), 187 deletions(-)
block/blk-settings.c +1 -1
@@ -849,7 +849,7 @@ void blk_queue_set_zoned(struct gendisk *disk, enum blk_zoned_model model)* we do nothing special as far as the block layer is concerned. */ if (!IS_ENABLED (CONFIG_BLK_DEV_ZONED ) || -disk_has_partitions (disk)) + !xa_empty (&disk->part_tbl)) model =BLK_ZONED_NONE ;break ;case BLK_ZONED_NONE :
block/blk.h +0 -1
@@ -358,7 +358,6 @@ int bdev_add_partition(struct block_device *bdev, int partno,int bdev_del_partition (struct block_device *bdev,int partno);int bdev_resize_partition (struct block_device *bdev,int partno,sector_t start,sector_t length); -int disk_expand_part_tbl (struct gendisk *disk,int target); int bio_add_hw_page(struct request_queue *q, struct bio *bio, struct page *page, unsigned int len, unsigned int offset,
block/genhd.c +11 -145
225 lines not on this page · raw message
block/partitions/core.c +6 -25
@@ -286,13 +286,7 @@ struct device_type part_type = {*/ void delete_partition (struct block_device *part) { -struct gendisk *disk = part->bd_disk; -struct disk_part_tbl *ptbl = -rcu_dereference_protected (disk->part_tbl,1 ); - -rcu_assign_pointer (ptbl->part[part->bd_partno],NULL ); -rcu_assign_pointer (ptbl->last_lookup,NULL ); - +xa_erase (&part->bd_disk->part_tbl, part->bd_partno);kobject_put (part->bd_holder_dir);device_del (&part->bd_device);
@@ -324,7 +318,6 @@ static struct block_device *add_partition(struct gendisk *disk, int partno,struct device *ddev =disk_to_dev (disk);struct device *pdev;struct block_device *bdev; -struct disk_part_tbl *ptbl;const char *dname;int err;
@@ -346,12 +339,7 @@ static struct block_device *add_partition(struct gendisk *disk, int partno,break ; } - err =disk_expand_part_tbl (disk, partno); -if (err) -return ERR_PTR (err); - ptbl =rcu_dereference_protected (disk->part_tbl,1 ); - -if (ptbl->part[partno]) +if (xa_load (&disk->part_tbl, partno))return ERR_PTR (-EBUSY ); bdev =bdev_alloc (disk, partno);
@@ -405,8 +393,10 @@ static struct block_device *add_partition(struct gendisk *disk, int partno, }/* everything is up and running, commence */ + err =xa_insert (&disk->part_tbl, partno, bdev,GFP_KERNEL ); +if (err) + goto out_del;bdev_add (bdev, devt); -rcu_assign_pointer (ptbl->part[partno], bdev);/* suppress uevent if the disk suppresses it */ if (!dev_get_uevent_suppress (ddev))
@@ -612,7 +602,7 @@ static bool blk_add_partition(struct gendisk *disk, struct block_device *bdev,int blk_add_partitions (struct gendisk *disk,struct block_device *bdev) {struct parsed_partitions *state; -int ret = -EAGAIN , p, highest; +int ret = -EAGAIN , p;if (!disk_part_scan_enabled (disk))return 0 ;
@@ -660,15 +650,6 @@ int blk_add_partitions(struct gendisk *disk, struct block_device *bdev)/* tell userspace that the media / partition table may have changed */ kobject_uevent (&disk_to_dev (disk)->kobj,KOBJ_CHANGE ); -/* -* Detect the highest partition number and preallocate disk->part_tbl. -* This is an optimization and not strictly necessary. -*/ -for (p =1 , highest =0 ; p < state->limit; p++) -if (state->parts[p].size) - highest = p; -disk_expand_part_tbl (disk, highest); -for (p =1 ; p < state->limit; p++)if (!blk_add_partition (disk, bdev, state, p)) goto out_free_state;
include/linux/genhd.h +3 -15
@@ -32,6 +32,7 @@ extern struct class block_class;#include <linux/string.h> #include <linux/fs.h> #include <linux/workqueue.h> +#include <linux/xarray.h> #define PARTITION_META_INFO_VOLNAMELTH 64/*
@@ -116,13 +117,6 @@ enum { DISK_EVENT_FLAG_UEVENT = 1 << 1, }; -struct disk_part_tbl { -struct rcu_head rcu_head; -int len; -struct block_device __rcu *last_lookup; -struct block_device __rcu *part[]; -}; -struct disk_events ;struct badblocks ;
@@ -148,12 +142,7 @@ struct gendisk {unsigned short events;/* supported events */ unsigned short event_flags;/* flags related to event processing */ -/* Array of pointers to partitions indexed by partno. -* Protected with matching bdev lock but stat and other -* non-critical accesses use RCU. Always access through -* helpers. -*/ -struct disk_part_tbl __rcu *part_tbl; +struct xarray part_tbl;struct block_device *part0;const struct block_device_operations *fops;
@@ -224,7 +213,7 @@ void disk_uevent(struct gendisk *disk, enum kobject_action action);struct disk_part_iter {struct gendisk *disk;struct block_device *part; -int idx; +unsigned long idx;unsigned int flags; };
@@ -232,7 +221,6 @@ extern void disk_part_iter_init(struct disk_part_iter *piter, struct gendisk *disk, unsigned int flags);struct block_device *disk_part_iter_next (struct disk_part_iter *piter);extern void disk_part_iter_exit (struct disk_part_iter *piter); -extern bool disk_has_partitions (struct gendisk *disk);/* block/genhd.c */ extern void device_add_disk(struct device *parent, struct gendisk *disk,
Signature · 1 line
2.29.2
Re: [PATCH 9/9] block: use an xarray for disk->part_tbl
Quoted 5 lines · Christoph Hellwig
Now that no fast path lookups in the partition table are left, there is no point in micro-optimizing the data structure for it. Just use a bog standard xarray.
Signed-off-by Christoph Hellwig <[email protected]>
Thanks!
Signature · 6 lines
tejun -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
Tejun Heo
maintainerQuoted 10 lines · Christoph Hellwig
Hi Jens,
this series switches back from storing the gendisk + partno to storing a
block_devicepointer in struct bio. The reason is two fold: for one the new structblock_deviceactually is always available, removing the need to avoid originally. Second the merge structblock_deviceis much more useful than the old one, as storing it avoids the need for looking up what used to behd_structduring partition remapping and I/O accounting.
Quoted 2 lines
Note that this series depends on the posted but not merged "block tracepoint cleanups" series.
I'm late but everything looks good to me. So much better than the mess we had before. Thank you.
The only thing I noticed is that blkdev_get_no_open() can now use kobject_get() instead of kobject_get_unless_zero() as bdev lookup is synchronously disabled before device_del().
Signature · 6 lines
tejun -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
Tejun Heo
maintainerQuoted 14 lines · Tejun Heo
Quoted 10 lines · Christoph Hellwig
Hi Jens,
this series switches back from storing the gendisk + partno to storing a
block_devicepointer in struct bio. The reason is two fold: for one the new structblock_deviceactually is always available, removing the need to avoid originally. Second the merge structblock_deviceis much more useful than the old one, as storing it avoids the need for looking up what used to behd_structduring partition remapping and I/O accounting.Quoted 2 lines
Note that this series depends on the posted but not merged "block tracepoint cleanups" series.
Quoted 6 lines
I'm late but everything looks good to me. So much better than the mess we had before. Thank you.
The only thing I noticed is that
blkdev_get_no_open()can now usekobject_get()instead ofkobject_get_unless_zero()as bdev lookup is synchronously disabled beforedevice_del().
Oops, sorry, this was supposed to be a reply to the earlier hd_struct removal patchset. Reviewing this patchset now.
Thanks.
Signature · 6 lines
tejun -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
Quoted 10 lines · Christoph Hellwig
Hi Jens,
this series switches back from storing the gendisk + partno to storing a
block_devicepointer in struct bio. The reason is two fold: for one the new structblock_deviceactually is always available, removing the need to avoid originally. Second the merge structblock_deviceis much more useful than the old one, as storing it avoids the need for looking up what used to behd_structduring partition remapping and I/O accounting.
Quoted 2 lines
Note that this series depends on the posted but not merged "block tracepoint cleanups" series.
Applied, thanks.
Signature · 1 line
Jens Axboe
Quoted 10 lines · Christoph Hellwig
Hi Jens,
this series switches back from storing the gendisk + partno to storing a
block_devicepointer in struct bio. The reason is two fold: for one the new structblock_deviceactually is always available, removing the need to avoid originally. Second the merge structblock_deviceis much more useful than the old one, as storing it avoids the need for looking up what used to behd_structduring partition remapping and I/O accounting.
Quoted 2 lines
Note that this series depends on the posted but not merged "block tracepoint cleanups" series.
Reverting this patchset on the top of today's linux-next fixed data corruptions everywhere, i.e.,
$ git revert --no-edit a54895fa057c..4498a8536c81 (with a trivial conflict resolution with the commit "block: move blk_rq_bio_prep() to linux/blk-mq.h")
.config (if ever matters and also happened on POWER9 NV):
https://cailca.coding.net/public/linux/mm/git/files/master/x86.config
== XFS failed to mount ==
[ 55.116279][ T1507] XFS (dm-0): Mounting V5 Filesystem [ 55.144671][ T1507] XFS (dm-0): Corruption warning: Metadata has LSN (3:70242) ahead of current LSN (3:66504). Please unmount and run xfs_repair (>= v4.3) to resolve. [ 55.159965][ T1507] XFS (dm-0): log mount/recovery failed: error -22 [ 55.288632][ T1507] XFS (dm-0): log mount failed
In this case, it is not possible to mount the XFS rootfs anymore, and it can be repaired with "-L". However, we could lost vital files. Then, I have to re- install the system.
systemd[1]: System cannot boot: Missing /etc/machine-id and /etc is mounted read-only. systemd[1]: Booting up is supported only when:
systemd[1]: 1) /etc/machine-id exists and is populated.
systemd[1]: 2) /etc/machine-id exists and is empty.
systemd[1]: 3) /etc/machine-id is missing and /etc is writable.
lvm2-activation-generator: lvmconfig failed
systemd[1]: Failed to populate /etc with preset unit settings, ignoring: No such file or directory
== systemd core dump ==
[ 46.124485][ T1028] Process 1028(systemd-coredum) has RLIMIT_CORE set to 1 [ 46.131434][ T1028] Aborting core [ 46.143366][ T1027] systemd-cgroups (1027) used greatest stack depth: 23512 bytes left [ 46.384430][ T1] printk: systemd: 20 output lines suppressed due to ratelimiting [ 46.447620][ T1] traps: systemd[1] trap invalid opcode ip:7f44c485fee6 sp:7ffee96e6960 error:0 in libm-2.28.so[7f44c481a000+181000] [ 46.492643][ T1029] traps: systemd-coredum[1029] trap invalid opcode ip:7f2f60471ee6 sp:7ffd58f76e00 error:0 in libm-2.28.so[7f2f6042c000+181000] [ 46.505968][ T1029] Process 1029(systemd-coredum) has RLIMIT_CORE set to 1 [ 46.512900][ T1029] Aborting core [ 46.520024][ T1] Kernel panic - not syncing: Attempted to kill init! exitcode=0x00000084 [ 46.528437][ T1] CPU: 32 PID: 1 Comm: systemd Not tainted 5.10.0-rc6-next-20201207 #1 [ 46.536581][ T1] Hardware name: HPE ProLiant DL385 Gen10/ProLiant DL385 Gen10, BIOS A40 07/10/2019 [ 46.545860][ T1] Call Trace: [ 46.549038][ T1] dump_stack+0x99/0xcb [ 46.553082][ T1] panic+0x20c/0x48b [ 46.556860][ T1] ? print_oops_end_marker.cold.10+0x10/0x10 [ 46.562739][ T1] ? do_signal_stop+0x690/0x690 [ 46.567478][ T1] ? do_exit+0x226/0x2410 [ 46.571690][ T1] do_exit.cold.38+0x1de/0x1e5 [ 46.576346][ T1] ? rcu_read_lock_sched_held+0xa1/0xd0 [ 46.581782][ T1] ? rcu_read_lock_bh_held+0xb0/0xb0 [ 46.586955][ T1] ? mm_update_next_owner+0x750/0x750 [ 46.592215][ T1] ? get_signal+0x80f/0x1f90 [ 46.596688][ T1] do_group_exit+0xf0/0x2e0 [ 46.601076][ T1] get_signal+0x35a/0x1f90 [ 46.605380][ T1] ? finish_task_switch+0x1bb/0xa80 [ 46.610468][ T1] arch_do_signal_or_restart+0x1d8/0x690 [ 46.615993][ T1] ? __setup_rt_frame.isra.15+0x1830/0x1830 [ 46.621781][ T1] ? __sched_text_start+0x8/0x8 [ 46.626521][ T1] ? asm_exc_invalid_op+0xa/0x20 [ 46.631347][ T1] exit_to_user_mode_prepare+0xde/0x170 [ 46.636782][ T1] irqentry_exit_to_user_mode+0x5/0x30 [ 46.642129][ T1] asm_exc_invalid_op+0x12/0x20 [ 46.646868][ T1] RIP: 0033:0x7f44c485fee6 [ 46.651171][ T1] Code: 6d 6e 6f 70 71 72 73 74 75 76 77 78 79 7a 0a 00 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 55 56 57 58 59 5a <61> 62 63 64 65 66 67 68 6a 69 6b 6c 6d 6e 6f 70 71 72 73 74 75 76 [ 46.670757][ T1] RSP: 002b:00007ffee96e6960 EFLAGS: 00010202 [ 46.676719][ T1] RAX: 00007f44c481c780 RBX: 00007f44c4825e78 RCX: 0000000000000000 [ 46.684600][ T1] RDX: 00007ffee96e6a90 RSI: 0000000000000000 RDI: 00007f44c481c780 [ 46.692480][ T1] RBP: 00007ffee96e6a90 R08: 00007f44c85d88a8 R09: 00007f44c85d88a8 [ 46.700360][ T1] R10: 00007f44ca38e4f0 R11: 00007f44c481a000 R12: 00007f44c481c780 [ 46.708241][ T1] R13: 00007f44c4826088 R14: 00007f44c4b9b128 R15: 00007f44ca38e4f0 [ 46.716523][ T1] Kernel Offset: 0x11000000 from 0xffffffff81000000 (relocation range: 0xffffffff80000000-0xffffffffbfffffff) [ 46.728244][ T1] ---[ end Kernel panic - not syncing: Attempted to kill init! exitcode=0x00000084 ]---
== git coredump ==
# coredumpctl dump
PID: 1906 (git)
UID: 0 (root)
GID: 0 (root)
Signal: 11 (SEGV)
Timestamp: Mon 2020-12-07 10:10:36 EST (34s ago)
Boot ID: 5dd9e21b02e4487f96d2ffeed3140f22
Machine ID: 00f60cae470d4f54a377e935638619c5
Storage: /var/lib/systemd/coredump/core.git.0.5dd9e21b02e4487f96d2ffeed3140f22.1906.1607353836000000.lz4
Message: Process 1906 (git) of user 0 dumped core. Stack trace of thread 1906:
#0 0x00007fff845af9dc _dl_relocate_object (/usr/lib64/ld-2.28.so)
#1 0x00007fff845a6664 dl_main (/usr/lib64/ld-2.28.so)
#2 0x00007fff845c0448 _dl_sysdep_start (/usr/lib64/ld-2.28.so)
#3 0x00007fff845a1cbc _dl_start_final (/usr/lib64/ld-2.28.so)
#4 0x00007fff845a2dbc _dl_start (/usr/lib64/ld-2.28.so)
#5 0x00007fff845a1458 _start (/usr/lib64/ld-2.28.so)Quoted 70 lines
A git tree is also available:
git://git.infradead.org/users/hch/block.gitbi_bdevGitweb:
http://git.infradead.org/users/hch/block.git/shortlog/refs/heads/bi_bdev
Diffstat:
arch/m68k/emu/nfblock.c | 2 arch/xtensa/platforms/iss/simdisk.c | 2 block/bio-integrity.c | 18 +- block/bio.c | 31 +--- block/blk-cgroup.c | 7 block/blk-core.c | 99 ++++++------- block/blk-crypto-fallback.c | 2 block/blk-crypto.c | 2 block/blk-merge.c | 17 +- block/blk-mq.c | 2 block/blk-settings.c | 2 block/blk-throttle.c | 2 block/blk.h | 9 - block/bounce.c | 2 block/genhd.c | 261 +++------------------------------- -- block/partitions/core.c | 31 ---- drivers/block/brd.c | 8 - drivers/block/drbd/drbd_int.h | 4 drivers/block/drbd/drbd_req.c | 2 drivers/block/null_blk_main.c | 2 drivers/block/pktcdvd.c | 4 drivers/block/ps3vram.c | 2 drivers/block/rsxx/dev.c | 2 drivers/block/umem.c | 2 drivers/block/zram/zram_drv.c | 2 drivers/lightnvm/pblk-init.c | 2 drivers/md/bcache/debug.c | 2 drivers/md/bcache/request.c | 39 +++-- drivers/md/dm-bio-record.h | 9 - drivers/md/dm-raid1.c | 10 - drivers/md/dm.c | 14 - drivers/md/md-linear.c | 2 drivers/md/md.c | 10 - drivers/md/md.h | 6 drivers/md/raid1.c | 6 drivers/md/raid10.c | 12 - drivers/md/raid5.c | 2 drivers/nvdimm/blk.c | 4 drivers/nvdimm/btt.c | 4 drivers/nvdimm/pmem.c | 4 drivers/nvme/host/core.c | 6 drivers/nvme/host/lightnvm.c | 3 drivers/nvme/host/multipath.c | 6 drivers/nvme/host/rdma.c | 2 drivers/s390/block/dasd.c | 26 --- drivers/s390/block/dcssblk.c | 6 drivers/s390/block/xpram.c | 2 fs/btrfs/check-integrity.c | 10 - fs/btrfs/raid56.c | 7 fs/btrfs/scrub.c | 2 fs/direct-io.c | 2 fs/f2fs/data.c | 12 - include/linux/bio.h | 18 +- include/linux/blk_types.h | 3 include/linux/blkdev.h | 20 -- include/linux/genhd.h | 21 -- kernel/trace/blktrace.c | 16 +- mm/page_io.c | 2 58 files changed, 251 insertions(+), 556 deletions(-)
Christoph Hellwig
maintainerThanks for the report.
Jens, can you revert the series for now? I think waiting any longer with a report like this is not helpful. I'll look into it with Qian in the meantime.
--
dm-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/dm-devel
Jens Axboe
maintainerQuoted 5 lines · Christoph Hellwig
Thanks for the report.
Jens, can you revert the series for now? I think waiting any longer with a report like this is not helpful. I'll look into it with Qian in the meantime.
Agree, I reverted it.
Signature · 6 lines
Jens Axboe -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
Christoph Hellwig
maintainerHi Qian,
can you send me details of your device mapper setup, e.g. which targets are used, are they used on top of whole device or partitions. Do you use partitions on top of the dm devices? Are any other stacking devices involved?
Quoted 98 lines · Qian Cai
Quoted 10 lines · Christoph Hellwig
Hi Jens,
this series switches back from storing the gendisk + partno to storing a
block_devicepointer in struct bio. The reason is two fold: for one the new structblock_deviceactually is always available, removing the need to avoid originally. Second the merge structblock_deviceis much more useful than the old one, as storing it avoids the need for looking up what used to behd_structduring partition remapping and I/O accounting.Quoted 2 lines
Note that this series depends on the posted but not merged "block tracepoint cleanups" series.
Reverting this patchset on the top of today's linux-next fixed data corruptions everywhere, i.e.,
$ git revert --no-edit a54895fa057c..4498a8536c81 (with a trivial conflict resolution with the commit "block: move blk_rq_bio_prep() to linux/blk-mq.h").config (if ever matters and also happened on POWER9 NV):
https://cailca.coding.net/public/linux/mm/git/files/master/x86.config== XFS failed to mount ==
[ 55.116279][ T1507] XFS (dm-0): Mounting V5 Filesystem [ 55.144671][ T1507] XFS (dm-0): Corruption warning: Metadata has LSN (3:70242) ahead of current LSN (3:66504). Please unmount and run xfs_repair (>= v4.3) to resolve. [ 55.159965][ T1507] XFS (dm-0): log mount/recovery failed: error -22 [ 55.288632][ T1507] XFS (dm-0): log mount failedIn this case, it is not possible to mount the XFS rootfs anymore, and it can be repaired with "-L". However, we could lost vital files. Then, I have to re- install the system.
systemd[1]: System cannot boot: Missing
/etc/machine-idand /etc is mounted read-only. systemd[1]: Booting up is supported only when:
systemd[1]: 1)/etc/machine-idexists and is populated.
systemd[1]: 2)/etc/machine-idexists and is empty.
systemd[1]: 3)/etc/machine-idis missing and /etc is writable.
lvm2-activation-generator: lvmconfig failed
systemd[1]: Failed to populate /etc with preset unit settings, ignoring: No such file or directory== systemd core dump ==
[ 46.124485][ T1028] Process 1028(systemd-coredum) has RLIMIT_CORE set to 1 [ 46.131434][ T1028] Aborting core [ 46.143366][ T1027] systemd-cgroups (1027) used greatest stack depth: 23512 bytes left [ 46.384430][ T1] printk: systemd: 20 output lines suppressed due to ratelimiting [ 46.447620][ T1] traps: systemd[1] trap invalid opcode ip:7f44c485fee6 sp:7ffee96e6960 error:0 in libm-2.28.so[7f44c481a000+181000] [ 46.492643][ T1029] traps: systemd-coredum[1029] trap invalid opcode ip:7f2f60471ee6 sp:7ffd58f76e00 error:0 in libm-2.28.so[7f2f6042c000+181000] [ 46.505968][ T1029] Process 1029(systemd-coredum) has RLIMIT_CORE set to 1 [ 46.512900][ T1029] Aborting core [ 46.520024][ T1] Kernel panic - not syncing: Attempted to kill init! exitcode=0x00000084 [ 46.528437][ T1] CPU: 32 PID: 1 Comm: systemd Not tainted 5.10.0-rc6-next-20201207 #1 [ 46.536581][ T1] Hardware name: HPE ProLiant DL385 Gen10/ProLiant DL385 Gen10, BIOS A40 07/10/2019 [ 46.545860][ T1] Call Trace: [ 46.549038][ T1] dump_stack+0x99/0xcb [ 46.553082][ T1] panic+0x20c/0x48b [ 46.556860][ T1] ? print_oops_end_marker.cold.10+0x10/0x10 [ 46.562739][ T1] ? do_signal_stop+0x690/0x690 [ 46.567478][ T1] ? do_exit+0x226/0x2410 [ 46.571690][ T1] do_exit.cold.38+0x1de/0x1e5 [ 46.576346][ T1] ? rcu_read_lock_sched_held+0xa1/0xd0 [ 46.581782][ T1] ? rcu_read_lock_bh_held+0xb0/0xb0 [ 46.586955][ T1] ? mm_update_next_owner+0x750/0x750 [ 46.592215][ T1] ? get_signal+0x80f/0x1f90 [ 46.596688][ T1] do_group_exit+0xf0/0x2e0 [ 46.601076][ T1] get_signal+0x35a/0x1f90 [ 46.605380][ T1] ? finish_task_switch+0x1bb/0xa80 [ 46.610468][ T1] arch_do_signal_or_restart+0x1d8/0x690 [ 46.615993][ T1] ? __setup_rt_frame.isra.15+0x1830/0x1830 [ 46.621781][ T1] ? __sched_text_start+0x8/0x8 [ 46.626521][ T1] ? asm_exc_invalid_op+0xa/0x20 [ 46.631347][ T1] exit_to_user_mode_prepare+0xde/0x170 [ 46.636782][ T1] irqentry_exit_to_user_mode+0x5/0x30 [ 46.642129][ T1] asm_exc_invalid_op+0x12/0x20 [ 46.646868][ T1] RIP: 0033:0x7f44c485fee6 [ 46.651171][ T1] Code: 6d 6e 6f 70 71 72 73 74 75 76 77 78 79 7a 0a 00 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 55 56 57 58 59 5a <61> 62 63 64 65 66 67 68 6a 69 6b 6c 6d 6e 6f 70 71 72 73 74 75 76 [ 46.670757][ T1] RSP: 002b:00007ffee96e6960 EFLAGS: 00010202 [ 46.676719][ T1] RAX: 00007f44c481c780 RBX: 00007f44c4825e78 RCX: 0000000000000000 [ 46.684600][ T1] RDX: 00007ffee96e6a90 RSI: 0000000000000000 RDI: 00007f44c481c780 [ 46.692480][ T1] RBP: 00007ffee96e6a90 R08: 00007f44c85d88a8 R09: 00007f44c85d88a8 [ 46.700360][ T1] R10: 00007f44ca38e4f0 R11: 00007f44c481a000 R12: 00007f44c481c780 [ 46.708241][ T1] R13: 00007f44c4826088 R14: 00007f44c4b9b128 R15: 00007f44ca38e4f0 [ 46.716523][ T1] Kernel Offset: 0x11000000 from 0xffffffff81000000 (relocation range: 0xffffffff80000000-0xffffffffbfffffff) [ 46.728244][ T1] ---[ end Kernel panic - not syncing: Attempted to kill init! exitcode=0x00000084 ]---== git coredump ==
# coredumpctl dump PID: 1906 (git) UID: 0 (root) GID: 0 (root) Signal: 11 (SEGV) Timestamp: Mon 2020-12-07 10:10:36 EST (34s ago) Boot ID: 5dd9e21b02e4487f96d2ffeed3140f22 Machine ID: 00f60cae470d4f54a377e935638619c5 Storage: /var/lib/systemd/coredump/core.git.0.5dd9e21b02e4487f96d2ffeed3140f22.1906.1607353836000000.lz4 Message: Process 1906 (git) of user 0 dumped core.
Quoted 78 lines
Stack trace of thread 1906: #0 0x00007fff845af9dc _dl_relocate_object (/usr/lib64/ld-2.28.so) #1 0x00007fff845a6664 dl_main (/usr/lib64/ld-2.28.so) #2 0x00007fff845c0448 _dl_sysdep_start (/usr/lib64/ld-2.28.so) #3 0x00007fff845a1cbc _dl_start_final (/usr/lib64/ld-2.28.so) #4 0x00007fff845a2dbc _dl_start (/usr/lib64/ld-2.28.so) #5 0x00007fff845a1458 _start (/usr/lib64/ld-2.28.so)Quoted 70 lines
A git tree is also available:
git://git.infradead.org/users/hch/block.gitbi_bdevGitweb:
http://git.infradead.org/users/hch/block.git/shortlog/refs/heads/bi_bdev
Diffstat:
arch/m68k/emu/nfblock.c | 2 arch/xtensa/platforms/iss/simdisk.c | 2 block/bio-integrity.c | 18 +- block/bio.c | 31 +--- block/blk-cgroup.c | 7 block/blk-core.c | 99 ++++++------- block/blk-crypto-fallback.c | 2 block/blk-crypto.c | 2 block/blk-merge.c | 17 +- block/blk-mq.c | 2 block/blk-settings.c | 2 block/blk-throttle.c | 2 block/blk.h | 9 - block/bounce.c | 2 block/genhd.c | 261 +++------------------------------- -- block/partitions/core.c | 31 ---- drivers/block/brd.c | 8 - drivers/block/drbd/drbd_int.h | 4 drivers/block/drbd/drbd_req.c | 2 drivers/block/null_blk_main.c | 2 drivers/block/pktcdvd.c | 4 drivers/block/ps3vram.c | 2 drivers/block/rsxx/dev.c | 2 drivers/block/umem.c | 2 drivers/block/zram/zram_drv.c | 2 drivers/lightnvm/pblk-init.c | 2 drivers/md/bcache/debug.c | 2 drivers/md/bcache/request.c | 39 +++-- drivers/md/dm-bio-record.h | 9 - drivers/md/dm-raid1.c | 10 - drivers/md/dm.c | 14 - drivers/md/md-linear.c | 2 drivers/md/md.c | 10 - drivers/md/md.h | 6 drivers/md/raid1.c | 6 drivers/md/raid10.c | 12 - drivers/md/raid5.c | 2 drivers/nvdimm/blk.c | 4 drivers/nvdimm/btt.c | 4 drivers/nvdimm/pmem.c | 4 drivers/nvme/host/core.c | 6 drivers/nvme/host/lightnvm.c | 3 drivers/nvme/host/multipath.c | 6 drivers/nvme/host/rdma.c | 2 drivers/s390/block/dasd.c | 26 --- drivers/s390/block/dcssblk.c | 6 drivers/s390/block/xpram.c | 2 fs/btrfs/check-integrity.c | 10 - fs/btrfs/raid56.c | 7 fs/btrfs/scrub.c | 2 fs/direct-io.c | 2 fs/f2fs/data.c | 12 - include/linux/bio.h | 18 +- include/linux/blk_types.h | 3 include/linux/blkdev.h | 20 -- include/linux/genhd.h | 21 -- kernel/trace/blktrace.c | 16 +- mm/page_io.c | 2 58 files changed, 251 insertions(+), 556 deletions(-)
---end quoted text---
--
dm-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/dm-devel
Quoted 4 lines · Christoph Hellwig
can you send me details of your device mapper setup, e.g. which targets are used, are they used on top of whole device or partitions. Do you use partitions on top of the dm devices? Are any other stacking devices involved?
It is a standard RHEL8 installation using "autopart", so I don't think it uses any particular targets. It is just a plain LVM backed by ahci (sda2 and sdb1. Some other affected systems use smartpqi/NVM). The kernel has only dm-mirror enabled but I don't think it uses it anyway.
# grep -i _DM_ .config | grep -v ^# CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_DM_MIRROR=m CONFIG_DM_UEVENT=y
# lvdisplay --- Logical volume --- LV Path /dev/rhel_ibm-p9wr-10/home LV Name home VG Name rhel_ibm-p9wr-10 LV UUID ETS2PI-yedc-7AJ6-NUP2-uAYD-6api-bp9nqv LV Write Access read/write LV Status available # open 1 LV Size <3.57 TiB Current LE 934662 Segments 2 Allocation inherit Read ahead sectors auto - currently set to 8192 Block device 254:2
--- Logical volume ---
LV Path /dev/rhel_ibm-p9wr-10/root LV Name root VG Name rhel_ibm-p9wr-10 LV UUID ozakb8-2DWE-YBI9-4nnc-gwk8-mMuf-s3EPsB LV Write Access read/write LV Status available # open 1 LV Size 70.00 GiB Current LE 17920 Segments 1 Allocation inherit Read ahead sectors auto - currently set to 8192 Block device 254:0
# pvdisplay --- Physical volume --- PV Name /dev/sda2 VG Name rhel_ibm-p9wr-10 PV Size <1.82 TiB / not usable 4.00 MiB Allocatable yes (but full) PE Size 4.00 MiB Total PE 476675 Free PE 0 Allocated PE 476675 PV UUID 0Tv2Az-vx7S-HLPd-66Ff-tH6H-dte1-tjSZ7i
--- Physical volume ---
PV Name /dev/sdb1 VG Name rhel_ibm-p9wr-10 PV Size <1.82 TiB / not usable 4.00 MiB Allocatable yes (but full) PE Size 4.00 MiB Total PE 476931 Free PE 0 Allocated PE 476931 PV UUID 4LfZJN-NxbJ-39OC-VBKP-jv5P-hciK-BOdiML
# lsblk NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINT sda 8:0 1 1.8T 0 disk ├─sda1 8:1 1 1G 0 part /boot └─sda2 8:2 1 1.8T 0 part ├─rhel_ibm--p9wr--10-root 254:0 0 70G 0 lvm / └─rhel_ibm--p9wr--10-home 254:2 0 3.6T 0 lvm /home sdb 8:16 1 1.8T 0 disk └─sdb1 8:17 1 1.8T 0 part └─rhel_ibm--p9wr--10-home 254:2 0 3.6T 0 lvm /home
Quoted 4 lines · Christoph Hellwig
can you send me details of your device mapper setup, e.g. which targets are used, are they used on top of whole device or partitions. Do you use partitions on top of the dm devices? Are any other stacking devices involved?
FWIW, I tried linux-next yesterday and got the root fs (btrfs) corrupted. It is a very simple setup, just plain FS on SCSI device.
Jens Axboe
maintainerQuoted 6 lines · Christoph Hellwig
Hi Qian,
can you send me details of your device mapper setup, e.g. which targets are used, are they used on top of whole device or partitions. Do you use partitions on top of the dm devices? Are any other stacking devices involved?
Don't think this needs anything fancy at all - I know Pavel got his test box corrupted, and mine did as well. Looks like it pretty much affected everyone that got unlucky enough to try it, not great...
Mine is just ext4 root on nvme.
Signature · 6 lines
Jens Axboe -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel