Merge "bdi: introduce BDI_CAP_SYNCHRONOUS_IO" (b2408928) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/block/brd.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#include <linux/radix-tree.h>
		#include <linux/fs.h>
		#include <linux/slab.h>
		#include <linux/backing-dev.h>
		#ifdef CONFIG_BLK_DEV_RAM_DAX
		#include <linux/pfn_t.h>
		#include <linux/dax.h>
		@@ -449,6 +450,7 @@ static struct brd_device *brd_alloc(int i)
		disk->flags = GENHD_FL_EXT_DEVT;
		sprintf(disk->disk_name, "ram%d", i);
		set_capacity(disk, rd_size * 2);
		disk->queue->backing_dev_info->capabilities \|= BDI_CAP_SYNCHRONOUS_IO;

		#ifdef CONFIG_BLK_DEV_RAM_DAX
		queue_flag_set_unlocked(QUEUE_FLAG_DAX, brd->brd_queue);

drivers/block/zram/zram_drv.c

+6 −10

Original line number	Diff line number	Diff line
		@@ -122,14 +122,6 @@ static inline bool is_partial_io(struct bio_vec *bvec)
		}
		#endif

		static void zram_revalidate_disk(struct zram *zram)
		{
		revalidate_disk(zram->disk);
		/* revalidate_disk reset the BDI_CAP_STABLE_WRITES so set again */
		zram->disk->queue->backing_dev_info->capabilities \|=
		BDI_CAP_STABLE_WRITES;
		}

		/*
		* Check if request is within bounds and aligned on zram logical blocks.
		*/
		@@ -1373,7 +1365,8 @@ static ssize_t disksize_store(struct device *dev,
		zram->comp = comp;
		zram->disksize = disksize;
		set_capacity(zram->disk, zram->disksize >> SECTOR_SHIFT);
		zram_revalidate_disk(zram);

		revalidate_disk(zram->disk);
		up_write(&zram->init_lock);

		return len;
		@@ -1420,7 +1413,7 @@ static ssize_t reset_store(struct device *dev,
		/* Make sure all the pending I/O are finished */
		fsync_bdev(bdev);
		zram_reset_device(zram);
		zram_revalidate_disk(zram);
		revalidate_disk(zram->disk);
		bdput(bdev);

		mutex_lock(&bdev->bd_mutex);
		@@ -1539,6 +1532,7 @@ static int zram_add(void)
		/* zram devices sort of resembles non-rotational disks */
		queue_flag_set_unlocked(QUEUE_FLAG_NONROT, zram->disk->queue);
		queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, zram->disk->queue);

		/*
		* To ensure that we always get PAGE_SIZE aligned
		* and n*PAGE_SIZED sized I/O requests.
		@@ -1563,6 +1557,8 @@ 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 \| BDI_CAP_SYNCHRONOUS_IO);
		add_disk(zram->disk);

		ret = sysfs_create_group(&disk_to_dev(zram->disk)->kobj,

drivers/nvdimm/btt.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#include <linux/ndctl.h>
		#include <linux/fs.h>
		#include <linux/nd.h>
		#include <linux/backing-dev.h>
		#include "btt.h"
		#include "nd.h"

		@@ -1535,6 +1536,8 @@ static int btt_blk_init(struct btt *btt)
		btt->btt_disk->private_data = btt;
		btt->btt_disk->queue = btt->btt_queue;
		btt->btt_disk->flags = GENHD_FL_EXT_DEVT;
		btt->btt_disk->queue->backing_dev_info->capabilities \|=
		BDI_CAP_SYNCHRONOUS_IO;

		blk_queue_make_request(btt->btt_queue, btt_make_request);
		blk_queue_logical_block_size(btt->btt_queue, btt->sector_size);

drivers/nvdimm/pmem.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@
		#include <linux/uio.h>
		#include <linux/dax.h>
		#include <linux/nd.h>
		#include <linux/backing-dev.h>
		#include "pmem.h"
		#include "pfn.h"
		#include "nd.h"
		@@ -394,6 +395,7 @@ static int pmem_attach_disk(struct device *dev,
		disk->fops = &pmem_fops;
		disk->queue = q;
		disk->flags = GENHD_FL_EXT_DEVT;
		disk->queue->backing_dev_info->capabilities \|= BDI_CAP_SYNCHRONOUS_IO;
		nvdimm_namespace_disk_name(ndns, disk->disk_name);
		set_capacity(disk, (pmem->size - pmem->pfn_pad - pmem->data_offset)
		/ 512);

include/linux/backing-dev.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -124,6 +124,8 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio);
		* BDI_CAP_STRICTLIMIT: Keep number of dirty pages below bdi threshold.
		*
		* BDI_CAP_CGROUP_WRITEBACK: Supports cgroup-aware writeback.
		* BDI_CAP_SYNCHRONOUS_IO: Device is so fast that asynchronous IO would be
		* inefficient.
		*/
		#define BDI_CAP_NO_ACCT_DIRTY 0x00000001
		#define BDI_CAP_NO_WRITEBACK 0x00000002
		@@ -131,6 +133,7 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio);
		#define BDI_CAP_STABLE_WRITES 0x00000008
		#define BDI_CAP_STRICTLIMIT 0x00000010
		#define BDI_CAP_CGROUP_WRITEBACK 0x00000020
		#define BDI_CAP_SYNCHRONOUS_IO 0x00000040

		#define BDI_CAP_NO_ACCT_AND_WRITEBACK \
		(BDI_CAP_NO_WRITEBACK \| BDI_CAP_NO_ACCT_DIRTY \| BDI_CAP_NO_ACCT_WB)
		@@ -178,6 +181,11 @@ long wait_iff_congested(struct pglist_data *pgdat, int sync, long timeout);
		int pdflush_proc_obsolete(struct ctl_table *table, int write,
		void __user buffer, size_t lenp, loff_t *ppos);

		static inline bool bdi_cap_synchronous_io(struct backing_dev_info *bdi)
		{
		return bdi->capabilities & BDI_CAP_SYNCHRONOUS_IO;
		}

		static inline bool bdi_cap_stable_pages_required(struct backing_dev_info *bdi)
		{
		return bdi->capabilities & BDI_CAP_STABLE_WRITES;