Commit 20cf903a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-6.0/dm-changes-2' of... 

Merge tag 'for-6.0/dm-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

Pull more device mapper updates from Mike Snitzer:

 - Add flags argument to dm_bufio_client_create and introduce
   DM_BUFIO_CLIENT_NO_SLEEP flag to have dm-bufio use spinlock rather
   than mutex for its locking.

 - Add optional "try_verify_in_tasklet" feature to DM verity target.
   This feature gives users the option to improve IO latency by using a
   tasklet to verify, using hashes in bufio's cache, rather than wait to
   schedule a work item via workqueue. But if there is a bufio cache
   miss, or an error, then the tasklet will fallback to using workqueue.

 - Incremental changes to both dm-bufio and the DM verity target to use
   jump_label to minimize cost of branching associated with the niche
   "try_verify_in_tasklet" feature. DM-bufio in particular is used by
   quite a few other DM targets so it doesn't make sense to incur
   additional bufio cost in those targets purely for the benefit of this
   niche verity feature if the feature isn't ever used.

 - Optimize verity_verify_io, which is used by both workqueue and
   tasklet based verification, if FEC is not configured or tasklet based
   verification isn't used.

 - Remove DM verity target's verify_wq's use of the WQ_CPU_INTENSIVE
   flag since it uses WQ_UNBOUND. Also, use the WQ_HIGHPRI flag if
   "try_verify_in_tasklet" is specified.

* tag 'for-6.0/dm-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm verity: have verify_wq use WQ_HIGHPRI if "try_verify_in_tasklet"
  dm verity: remove WQ_CPU_INTENSIVE flag since using WQ_UNBOUND
  dm verity: only copy bvec_iter in verity_verify_io if in_tasklet
  dm verity: optimize verity_verify_io if FEC not configured
  dm verity: conditionally enable branching for "try_verify_in_tasklet"
  dm bufio: conditionally enable branching for DM_BUFIO_CLIENT_NO_SLEEP
  dm verity: allow optional args to alter primary args handling
  dm verity: Add optional "try_verify_in_tasklet" feature
  dm bufio: Add DM_BUFIO_CLIENT_NO_SLEEP flag
  dm bufio: Add flags argument to dm_bufio_client_create
parents c993e07b 12907efd

drivers/md/dm-bufio.c

+28 −4
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/module.h>

#include <linux/rbtree.h>

#include <linux/stacktrace.h>

#include <linux/jump_label.h>



#define DM_MSG_PREFIX "bufio"
@@ -81,6 +82,8 @@ 
 */

struct dm_bufio_client {

	struct mutex lock;

	spinlock_t spinlock;

	unsigned long spinlock_flags;



	struct list_head lru[LIST_SIZE];

	unsigned long n_buffers[LIST_SIZE];
@@ -90,6 +93,7 @@ struct dm_bufio_client { 
	s8 sectors_per_block_bits;

	void (*alloc_callback)(struct dm_buffer *);

	void (*write_callback)(struct dm_buffer *);

	bool no_sleep;



	struct kmem_cache *slab_buffer;

	struct kmem_cache *slab_cache;
@@ -161,22 +165,33 @@ struct dm_buffer { 
#endif

};



static DEFINE_STATIC_KEY_FALSE(no_sleep_enabled);



/*----------------------------------------------------------------*/



#define dm_bufio_in_request()	(!!current->bio_list)



static void dm_bufio_lock(struct dm_bufio_client *c)

{

	if (static_branch_unlikely(&no_sleep_enabled) && c->no_sleep)

		spin_lock_irqsave_nested(&c->spinlock, c->spinlock_flags, dm_bufio_in_request());

	else

		mutex_lock_nested(&c->lock, dm_bufio_in_request());

}



static int dm_bufio_trylock(struct dm_bufio_client *c)

{

	if (static_branch_unlikely(&no_sleep_enabled) && c->no_sleep)

		return spin_trylock_irqsave(&c->spinlock, c->spinlock_flags);

	else

		return mutex_trylock(&c->lock);

}



static void dm_bufio_unlock(struct dm_bufio_client *c)

{

	if (static_branch_unlikely(&no_sleep_enabled) && c->no_sleep)

		spin_unlock_irqrestore(&c->spinlock, c->spinlock_flags);

	else

		mutex_unlock(&c->lock);

}
@@ -1715,7 +1730,8 @@ static unsigned long dm_bufio_shrink_count(struct shrinker *shrink, struct shrin 
struct dm_bufio_client *dm_bufio_client_create(struct block_device *bdev, unsigned block_size,

					       unsigned reserved_buffers, unsigned aux_size,

					       void (*alloc_callback)(struct dm_buffer *),

					       void (*write_callback)(struct dm_buffer *))

					       void (*write_callback)(struct dm_buffer *),

					       unsigned int flags)

{

	int r;

	struct dm_bufio_client *c;
@@ -1745,12 +1761,18 @@ struct dm_bufio_client *dm_bufio_client_create(struct block_device *bdev, unsign 
	c->alloc_callback = alloc_callback;

	c->write_callback = write_callback;



	if (flags & DM_BUFIO_CLIENT_NO_SLEEP) {

		c->no_sleep = true;

		static_branch_inc(&no_sleep_enabled);

	}



	for (i = 0; i < LIST_SIZE; i++) {

		INIT_LIST_HEAD(&c->lru[i]);

		c->n_buffers[i] = 0;

	}



	mutex_init(&c->lock);

	spin_lock_init(&c->spinlock);

	INIT_LIST_HEAD(&c->reserved_buffers);

	c->need_reserved_buffers = reserved_buffers;
@@ -1877,6 +1899,8 @@ void dm_bufio_client_destroy(struct dm_bufio_client *c) 
	kmem_cache_destroy(c->slab_buffer);

	dm_io_client_destroy(c->dm_io);

	mutex_destroy(&c->lock);

	if (c->no_sleep)

		static_branch_dec(&no_sleep_enabled);

	kfree(c);

}

EXPORT_SYMBOL_GPL(dm_bufio_client_destroy);

drivers/md/dm-ebs-target.c

+2 −1
Original line number Diff line number Diff line
@@ -313,7 +313,8 @@ static int ebs_ctr(struct dm_target *ti, unsigned int argc, char **argv) 
		goto bad;

	}



	ec->bufio = dm_bufio_client_create(ec->dev->bdev, to_bytes(ec->u_bs), 1, 0, NULL, NULL);

	ec->bufio = dm_bufio_client_create(ec->dev->bdev, to_bytes(ec->u_bs), 1,

					   0, NULL, NULL, 0);

	if (IS_ERR(ec->bufio)) {

		ti->error = "Cannot create dm bufio client";

		r = PTR_ERR(ec->bufio);

drivers/md/dm-integrity.c

+1 −1
Original line number Diff line number Diff line
@@ -4439,7 +4439,7 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned argc, char **argv) 
	}



	ic->bufio = dm_bufio_client_create(ic->meta_dev ? ic->meta_dev->bdev : ic->dev->bdev,

			1U << (SECTOR_SHIFT + ic->log2_buffer_sectors), 1, 0, NULL, NULL);

			1U << (SECTOR_SHIFT + ic->log2_buffer_sectors), 1, 0, NULL, NULL, 0);

	if (IS_ERR(ic->bufio)) {

		r = PTR_ERR(ic->bufio);

		ti->error = "Cannot initialize dm-bufio";

drivers/md/dm-snap-persistent.c

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ static int read_exceptions(struct pstore *ps, 


	client = dm_bufio_client_create(dm_snap_cow(ps->store->snap)->bdev,

					ps->store->chunk_size << SECTOR_SHIFT,

					1, 0, NULL, NULL);

					1, 0, NULL, NULL, 0);



	if (IS_ERR(client))

		return PTR_ERR(client);

drivers/md/dm-verity-fec.c

+2 −2
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ int verity_fec_ctr(struct dm_verity *v) 


	f->bufio = dm_bufio_client_create(f->dev->bdev,

					  f->io_size,

					  1, 0, NULL, NULL);

					  1, 0, NULL, NULL, 0);

	if (IS_ERR(f->bufio)) {

		ti->error = "Cannot initialize FEC bufio client";

		return PTR_ERR(f->bufio);
@@ -765,7 +765,7 @@ int verity_fec_ctr(struct dm_verity *v) 


	f->data_bufio = dm_bufio_client_create(v->data_dev->bdev,

					       1 << v->data_dev_block_bits,

					       1, 0, NULL, NULL);

					       1, 0, NULL, NULL, 0);

	if (IS_ERR(f->data_bufio)) {

		ti->error = "Cannot initialize FEC data bufio client";

		return PTR_ERR(f->data_bufio);