Commit fefc1d97 authored by Pankaj Gupta's avatar Pankaj Gupta Committed by Dan Williams
Browse files

libnvdimm: add dax_dev sync flag 



This patch adds 'DAXDEV_SYNC' flag which is set
for nd_region doing synchronous flush. This later
is used to disable MAP_SYNC functionality for
ext4 & xfs filesystem for devices don't support
synchronous flush.

Signed-off-by: default avatarPankaj Gupta <pagupta@redhat.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 6e84200c

drivers/dax/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ struct dev_dax *__devm_create_dev_dax(struct dax_region *dax_region, int id, 
	 * No 'host' or dax_operations since there is no access to this

	 * device outside of mmap of the resulting character device.

	 */

	dax_dev = alloc_dax(dev_dax, NULL, NULL);

	dax_dev = alloc_dax(dev_dax, NULL, NULL, DAXDEV_F_SYNC);

	if (!dax_dev)

		goto err;

drivers/dax/super.c

+18 −1
Original line number Diff line number Diff line
@@ -195,6 +195,8 @@ enum dax_device_flags { 
	DAXDEV_ALIVE,

	/* gate whether dax_flush() calls the low level flush routine */

	DAXDEV_WRITE_CACHE,

	/* flag to check if device supports synchronous flush */

	DAXDEV_SYNC,

};



/**
@@ -372,6 +374,18 @@ bool dax_write_cache_enabled(struct dax_device *dax_dev) 
}

EXPORT_SYMBOL_GPL(dax_write_cache_enabled);



bool __dax_synchronous(struct dax_device *dax_dev)

{

	return test_bit(DAXDEV_SYNC, &dax_dev->flags);

}

EXPORT_SYMBOL_GPL(__dax_synchronous);



void __set_dax_synchronous(struct dax_device *dax_dev)

{

	set_bit(DAXDEV_SYNC, &dax_dev->flags);

}

EXPORT_SYMBOL_GPL(__set_dax_synchronous);



bool dax_alive(struct dax_device *dax_dev)

{

	lockdep_assert_held(&dax_srcu);
@@ -526,7 +540,7 @@ static void dax_add_host(struct dax_device *dax_dev, const char *host) 
}



struct dax_device *alloc_dax(void *private, const char *__host,

		const struct dax_operations *ops)

		const struct dax_operations *ops, unsigned long flags)

{

	struct dax_device *dax_dev;

	const char *host;
@@ -549,6 +563,9 @@ struct dax_device *alloc_dax(void *private, const char *__host, 
	dax_add_host(dax_dev, host);

	dax_dev->ops = ops;

	dax_dev->private = private;

	if (flags & DAXDEV_F_SYNC)

		set_dax_synchronous(dax_dev);



	return dax_dev;



 err_dev:

drivers/md/dm.c

+2 −1
Original line number Diff line number Diff line
@@ -1991,7 +1991,8 @@ static struct mapped_device *alloc_dev(int minor) 
	sprintf(md->disk->disk_name, "dm-%d", minor);



	if (IS_ENABLED(CONFIG_DAX_DRIVER)) {

		md->dax_dev = alloc_dax(md, md->disk->disk_name, &dm_dax_ops);

		md->dax_dev = alloc_dax(md, md->disk->disk_name,

					&dm_dax_ops, 0);

		if (!md->dax_dev)

			goto bad;

	}

drivers/nvdimm/pmem.c

+4 −1
Original line number Diff line number Diff line
@@ -376,6 +376,7 @@ static int pmem_attach_disk(struct device *dev, 
	struct gendisk *disk;

	void *addr;

	int rc;

	unsigned long flags = 0UL;



	pmem = devm_kzalloc(dev, sizeof(*pmem), GFP_KERNEL);

	if (!pmem)
@@ -474,7 +475,9 @@ static int pmem_attach_disk(struct device *dev, 
	nvdimm_badblocks_populate(nd_region, &pmem->bb, &bb_res);

	disk->bb = &pmem->bb;



	dax_dev = alloc_dax(pmem, disk->disk_name, &pmem_dax_ops);

	if (is_nvdimm_sync(nd_region))

		flags = DAXDEV_F_SYNC;

	dax_dev = alloc_dax(pmem, disk->disk_name, &pmem_dax_ops, flags);

	if (!dax_dev) {

		put_disk(disk);

		return -ENOMEM;

drivers/nvdimm/region_devs.c

+7 −0
Original line number Diff line number Diff line
@@ -1211,6 +1211,13 @@ int nvdimm_has_cache(struct nd_region *nd_region) 
}

EXPORT_SYMBOL_GPL(nvdimm_has_cache);



bool is_nvdimm_sync(struct nd_region *nd_region)

{

	return is_nd_pmem(&nd_region->dev) &&

		!test_bit(ND_REGION_ASYNC, &nd_region->flags);

}

EXPORT_SYMBOL_GPL(is_nvdimm_sync);



struct conflict_context {

	struct nd_region *nd_region;

	resource_size_t start, size;

CRA Git | Maintained and supported by SUSTech CRA and CCSE