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

bdi: replace BDI_CAP_STABLE_WRITES with a queue and a sb flag 



The BDI_CAP_STABLE_WRITES is one of the few bits of information in the
backing_dev_info shared between the block drivers and the writeback code.
To help untangling the dependency replace it with a queue flag and a
superblock flag derived from it.  This also helps with the case of e.g.
a file system requiring stable writes due to its own checksumming, but
not forcing it on other users of the block device like the swap code.

One downside is that we an't support the stable_pages_required bdi
attribute in sysfs anymore.  It is replaced with a queue attribute which
also is writable for easier testing.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 5115db10

block/blk-integrity.c

+2 −2
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ void blk_integrity_register(struct gendisk *disk, struct blk_integrity *template 
	bi->tuple_size = template->tuple_size;

	bi->tag_size = template->tag_size;



	disk->queue->backing_dev_info->capabilities |= BDI_CAP_STABLE_WRITES;

	blk_queue_flag_set(QUEUE_FLAG_STABLE_WRITES, disk->queue);



#ifdef CONFIG_BLK_INLINE_ENCRYPTION

	if (disk->queue->ksm) {
@@ -428,7 +428,7 @@ EXPORT_SYMBOL(blk_integrity_register); 
 */

void blk_integrity_unregister(struct gendisk *disk)

{

	disk->queue->backing_dev_info->capabilities &= ~BDI_CAP_STABLE_WRITES;

	blk_queue_flag_clear(QUEUE_FLAG_STABLE_WRITES, disk->queue);

	memset(&disk->queue->integrity, 0, sizeof(struct blk_integrity));

}

EXPORT_SYMBOL(blk_integrity_unregister);

block/blk-mq-debugfs.c

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ static const char *const blk_queue_flag_name[] = { 
	QUEUE_FLAG_NAME(SAME_FORCE),

	QUEUE_FLAG_NAME(DEAD),

	QUEUE_FLAG_NAME(INIT_DONE),

	QUEUE_FLAG_NAME(STABLE_WRITES),

	QUEUE_FLAG_NAME(POLL),

	QUEUE_FLAG_NAME(WC),

	QUEUE_FLAG_NAME(FUA),

block/blk-sysfs.c

+3 −0
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ queue_##name##_store(struct request_queue *q, const char *page, size_t count) \ 
QUEUE_SYSFS_BIT_FNS(nonrot, NONROT, 1);

QUEUE_SYSFS_BIT_FNS(random, ADD_RANDOM, 0);

QUEUE_SYSFS_BIT_FNS(iostats, IO_STAT, 0);

QUEUE_SYSFS_BIT_FNS(stable_writes, STABLE_WRITES, 0);

#undef QUEUE_SYSFS_BIT_FNS



static ssize_t queue_zoned_show(struct request_queue *q, char *page)
@@ -613,6 +614,7 @@ static struct queue_sysfs_entry queue_hw_sector_size_entry = { 
QUEUE_RW_ENTRY(queue_nonrot, "rotational");

QUEUE_RW_ENTRY(queue_iostats, "iostats");

QUEUE_RW_ENTRY(queue_random, "add_random");

QUEUE_RW_ENTRY(queue_stable_writes, "stable_writes");



static struct attribute *queue_attrs[] = {

	&queue_requests_entry.attr,
@@ -645,6 +647,7 @@ static struct attribute *queue_attrs[] = { 
	&queue_nomerges_entry.attr,

	&queue_rq_affinity_entry.attr,

	&queue_iostats_entry.attr,

	&queue_stable_writes_entry.attr,

	&queue_random_entry.attr,

	&queue_poll_entry.attr,

	&queue_wc_entry.attr,

drivers/block/rbd.c

+1 −1
Original line number Diff line number Diff line
@@ -5022,7 +5022,7 @@ static int rbd_init_disk(struct rbd_device *rbd_dev) 
	}



	if (!ceph_test_opt(rbd_dev->rbd_client->client, NOCRC))

		q->backing_dev_info->capabilities |= BDI_CAP_STABLE_WRITES;

		blk_queue_flag_set(QUEUE_FLAG_STABLE_WRITES, q);



	/*

	 * disk_release() expects a queue ref from add_disk() and will

drivers/block/zram/zram_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -1955,7 +1955,7 @@ static int zram_add(void) 
	if (ZRAM_LOGICAL_BLOCK_SIZE == PAGE_SIZE)

		blk_queue_max_write_zeroes_sectors(zram->disk->queue, UINT_MAX);



	zram->disk->queue->backing_dev_info->capabilities |= BDI_CAP_STABLE_WRITES;

	blk_queue_flag_set(QUEUE_FLAG_STABLE_WRITES, zram->disk->queue);

	device_add_disk(NULL, zram->disk, zram_disk_attr_groups);



	strlcpy(zram->compressor, default_compressor, sizeof(zram->compressor));