Commit eeadd68e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove bounce buffering support 



The block layer bounce buffering support is unused now, remove it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20250505081138.3435992-7-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent a9437f6a

arch/mips/configs/gcw0_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ CONFIG_MIPS_CMDLINE_DTB_EXTEND=y 
CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BOUNCE is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

block/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ obj-y := bdev.o fops.o bio.o elevator.o blk-core.o blk-sysfs.o \ 
			genhd.o ioprio.o badblocks.o partitions/ blk-rq-qos.o \

			disk-events.o blk-ia-ranges.o early-lookup.o



obj-$(CONFIG_BOUNCE)		+= bounce.o

obj-$(CONFIG_BLK_DEV_BSG_COMMON) += bsg.o

obj-$(CONFIG_BLK_DEV_BSGLIB)	+= bsg-lib.o

obj-$(CONFIG_BLK_CGROUP)	+= blk-cgroup.o

block/blk-map.c

+1 −4
Original line number Diff line number Diff line
@@ -556,8 +556,6 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq, 


	if (map_data)

		copy = true;

	else if (blk_queue_may_bounce(q))

		copy = true;

	else if (iov_iter_alignment(iter) & align)

		copy = true;

	else if (iov_iter_is_bvec(iter))
@@ -713,8 +711,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf, 
	if (!len || !kbuf)

		return -EINVAL;



	if (!blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf) ||

	    blk_queue_may_bounce(q))

	if (!blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf))

		bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);

	else

		bio = bio_map_kern(q, kbuf, len, gfp_mask);

block/blk-mq.c

+0 −2
Original line number Diff line number Diff line
@@ -3144,8 +3144,6 @@ void blk_mq_submit_bio(struct bio *bio) 
		goto new_request;

	}



	bio = blk_queue_bounce(bio, q);



	/*

	 * The cached request already holds a q_usage_counter reference and we

	 * don't have to acquire a new one if we use it.

block/blk-settings.c

+0 −5
Original line number Diff line number Diff line
@@ -124,11 +124,6 @@ static int blk_validate_integrity_limits(struct queue_limits *lim) 
		return 0;

	}



	if (lim->features & BLK_FEAT_BOUNCE_HIGH) {

		pr_warn("no bounce buffer support for integrity metadata\n");

		return -EINVAL;

	}



	if (!IS_ENABLED(CONFIG_BLK_DEV_INTEGRITY)) {

		pr_warn("integrity support disabled.\n");

		return -EINVAL;