Commit c3ca015f authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Mike Snitzer
Browse files

dax: remove the pmem_dax_ops->flush abstraction 



Commit abebfbe2 ("dm: add ->flush() dax operation support") is
buggy. A DM device may be composed of multiple underlying devices and
all of them need to be flushed. That commit just routes the flush
request to the first device and ignores the other devices.

It could be fixed by adding more complex logic to the device mapper. But
there is only one implementation of the method pmem_dax_ops->flush - that
is pmem_dax_flush() - and it calls arch_wb_cache_pmem(). Consequently, we
don't need the pmem_dax_ops->flush abstraction at all, we can call
arch_wb_cache_pmem() directly from dax_flush() because dax_dev->ops->flush
can't ever reach anything different from arch_wb_cache_pmem().

It should be also pointed out that for some uses of persistent memory it
is needed to flush only a very small amount of data (such as 1 cacheline),
and it would be overkill if we go through that device mapper machinery for
a single flushed cache line.

Fix this by removing the pmem_dax_ops->flush abstraction and call
arch_wb_cache_pmem() directly from dax_flush(). Also, remove the device
mapper code that forwards the flushes.

Fixes: abebfbe2 ("dm: add ->flush() dax operation support")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent b5e8ad92

drivers/dax/super.c

+14 −7
Original line number Diff line number Diff line
@@ -189,8 +189,10 @@ static umode_t dax_visible(struct kobject *kobj, struct attribute *a, int n) 
	if (!dax_dev)

		return 0;



	if (a == &dev_attr_write_cache.attr && !dax_dev->ops->flush)

#ifndef CONFIG_ARCH_HAS_PMEM_API

	if (a == &dev_attr_write_cache.attr)

		return 0;

#endif

	return a->mode;

}
@@ -255,18 +257,23 @@ size_t dax_copy_from_iter(struct dax_device *dax_dev, pgoff_t pgoff, void *addr, 
}

EXPORT_SYMBOL_GPL(dax_copy_from_iter);



void dax_flush(struct dax_device *dax_dev, pgoff_t pgoff, void *addr,

		size_t size)

#ifdef CONFIG_ARCH_HAS_PMEM_API

void arch_wb_cache_pmem(void *addr, size_t size);

void dax_flush(struct dax_device *dax_dev, void *addr, size_t size)

{

	if (!dax_alive(dax_dev))

	if (unlikely(!dax_alive(dax_dev)))

		return;



	if (!test_bit(DAXDEV_WRITE_CACHE, &dax_dev->flags))

	if (unlikely(!test_bit(DAXDEV_WRITE_CACHE, &dax_dev->flags)))

		return;



	if (dax_dev->ops->flush)

		dax_dev->ops->flush(dax_dev, pgoff, addr, size);

	arch_wb_cache_pmem(addr, size);

}

#else

void dax_flush(struct dax_device *dax_dev, void *addr, size_t size)

{

}

#endif

EXPORT_SYMBOL_GPL(dax_flush);



void dax_write_cache(struct dax_device *dax_dev, bool wc)

drivers/md/dm-linear.c

+0 −15
Original line number Diff line number Diff line
@@ -184,20 +184,6 @@ static size_t linear_dax_copy_from_iter(struct dm_target *ti, pgoff_t pgoff, 
	return dax_copy_from_iter(dax_dev, pgoff, addr, bytes, i);

}



static void linear_dax_flush(struct dm_target *ti, pgoff_t pgoff, void *addr,

		size_t size)

{

	struct linear_c *lc = ti->private;

	struct block_device *bdev = lc->dev->bdev;

	struct dax_device *dax_dev = lc->dev->dax_dev;

	sector_t dev_sector, sector = pgoff * PAGE_SECTORS;



	dev_sector = linear_map_sector(ti, sector);

	if (bdev_dax_pgoff(bdev, dev_sector, ALIGN(size, PAGE_SIZE), &pgoff))

		return;

	dax_flush(dax_dev, pgoff, addr, size);

}



static struct target_type linear_target = {

	.name   = "linear",

	.version = {1, 4, 0},
@@ -212,7 +198,6 @@ static struct target_type linear_target = { 
	.iterate_devices = linear_iterate_devices,

	.direct_access = linear_dax_direct_access,

	.dax_copy_from_iter = linear_dax_copy_from_iter,

	.dax_flush = linear_dax_flush,

};



int __init dm_linear_init(void)

drivers/md/dm-stripe.c

+0 −20
Original line number Diff line number Diff line
@@ -351,25 +351,6 @@ static size_t stripe_dax_copy_from_iter(struct dm_target *ti, pgoff_t pgoff, 
	return dax_copy_from_iter(dax_dev, pgoff, addr, bytes, i);

}



static void stripe_dax_flush(struct dm_target *ti, pgoff_t pgoff, void *addr,

		size_t size)

{

	sector_t dev_sector, sector = pgoff * PAGE_SECTORS;

	struct stripe_c *sc = ti->private;

	struct dax_device *dax_dev;

	struct block_device *bdev;

	uint32_t stripe;



	stripe_map_sector(sc, sector, &stripe, &dev_sector);

	dev_sector += sc->stripe[stripe].physical_start;

	dax_dev = sc->stripe[stripe].dev->dax_dev;

	bdev = sc->stripe[stripe].dev->bdev;



	if (bdev_dax_pgoff(bdev, dev_sector, ALIGN(size, PAGE_SIZE), &pgoff))

		return;

	dax_flush(dax_dev, pgoff, addr, size);

}



/*

 * Stripe status:

 *
@@ -491,7 +472,6 @@ static struct target_type stripe_target = { 
	.io_hints = stripe_io_hints,

	.direct_access = stripe_dax_direct_access,

	.dax_copy_from_iter = stripe_dax_copy_from_iter,

	.dax_flush = stripe_dax_flush,

};



int __init dm_stripe_init(void)

drivers/md/dm.c

+0 −19
Original line number Diff line number Diff line
@@ -987,24 +987,6 @@ static size_t dm_dax_copy_from_iter(struct dax_device *dax_dev, pgoff_t pgoff, 
	return ret;

}



static void dm_dax_flush(struct dax_device *dax_dev, pgoff_t pgoff, void *addr,

		size_t size)

{

	struct mapped_device *md = dax_get_private(dax_dev);

	sector_t sector = pgoff * PAGE_SECTORS;

	struct dm_target *ti;

	int srcu_idx;



	ti = dm_dax_get_live_target(md, sector, &srcu_idx);



	if (!ti)

		goto out;

	if (ti->type->dax_flush)

		ti->type->dax_flush(ti, pgoff, addr, size);

 out:

	dm_put_live_table(md, srcu_idx);

}



/*

 * A target may call dm_accept_partial_bio only from the map routine.  It is

 * allowed for all bio types except REQ_PREFLUSH.
@@ -2992,7 +2974,6 @@ static const struct block_device_operations dm_blk_dops = { 
static const struct dax_operations dm_dax_ops = {

	.direct_access = dm_dax_direct_access,

	.copy_from_iter = dm_dax_copy_from_iter,

	.flush = dm_dax_flush,

};



/*

drivers/nvdimm/pmem.c

+0 −7
Original line number Diff line number Diff line
@@ -243,16 +243,9 @@ static size_t pmem_copy_from_iter(struct dax_device *dax_dev, pgoff_t pgoff, 
	return copy_from_iter_flushcache(addr, bytes, i);

}



static void pmem_dax_flush(struct dax_device *dax_dev, pgoff_t pgoff,

		void *addr, size_t size)

{

	arch_wb_cache_pmem(addr, size);

}



static const struct dax_operations pmem_dax_ops = {

	.direct_access = pmem_dax_direct_access,

	.copy_from_iter = pmem_copy_from_iter,

	.flush = pmem_dax_flush,

};



static const struct attribute_group *pmem_attribute_groups[] = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE