Commit f0b2769a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-6.3/dm-changes' of... 

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

Pull device mapper updates from Mike Snitzer:

 - Fix DM cache target to free background tracker work items, otherwise
   slab BUG will occur when kmem_cache_destroy() is called.

 - Improve 2 of DM's shrinker names to reflect their use.

 - Fix the DM flakey target to not corrupt the zero page. Fix dm-flakey
   on 32-bit hughmem systems by using bvec_kmap_local instead of
   page_address. Also, fix logic used when imposing the
   "corrupt_bio_byte" feature.

 - Stop using WQ_UNBOUND for DM verity target's verify_wq because it
   causes significant Android latencies on ARM64 (and doesn't show real
   benefit on other architectures).

 - Add negative check to catch simple case of a DM table referencing
   itself. More complex scenarios that use intermediate devices to
   self-reference still need to be avoided/handled in userspace.

 - Fix DM core's resize to only send one uevent instead of two. This
   fixes a race with udev, that if udev wins, will cause udev to miss
   uevents (which caused premature unmount attempts by systemd).

 - Add cond_resched() to workqueue functions in DM core, dn-thin and
   dm-cache so that their loops aren't the cause of unintended cpu
   scheduling fairness issues.

 - Fix all of DM's checkpatch errors and warnings (famous last words).
   Various other small cleanups.

* tag 'for-6.3/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: (62 commits)
  dm: remove unnecessary (void*) conversion in event_callback()
  dm ioctl: remove unnecessary check when using dm_get_mdptr()
  dm ioctl: assert _hash_lock is held in __hash_remove
  dm cache: add cond_resched() to various workqueue loops
  dm thin: add cond_resched() to various workqueue loops
  dm: add cond_resched() to dm_wq_requeue_work()
  dm: add cond_resched() to dm_wq_work()
  dm sysfs: make kobj_type structure constant
  dm: update targets using system workqueues to use a local workqueue
  dm: remove flush_scheduled_work() during local_exit()
  dm clone: prefer kvmalloc_array()
  dm: declare variables static when sensible
  dm: fix suspect indent whitespace
  dm ioctl: prefer strscpy() instead of strlcpy()
  dm: avoid void function return statements
  dm integrity: change macros min/max() -> min_t/max_t where appropriate
  dm: fix use of sizeof() macro
  dm: avoid 'do {} while(0)' loop in single statement macros
  dm log: avoid multiple line dereference
  dm log: avoid trailing semicolon in macro
  ...
parents 23064dfe d695e441

drivers/md/dm-audit.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// SPDX-License-Identifier: GPL-2.0-only

/*

 * Creating audit records for mapped devices.

 *

drivers/md/dm-bio-prison-v1.c

+10 −9
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (C) 2012 Red Hat, Inc.

 *
@@ -285,14 +286,14 @@ EXPORT_SYMBOL_GPL(dm_cell_promote_or_release); 


struct dm_deferred_entry {

	struct dm_deferred_set *ds;

	unsigned count;

	unsigned int count;

	struct list_head work_items;

};



struct dm_deferred_set {

	spinlock_t lock;

	unsigned current_entry;

	unsigned sweeper;

	unsigned int current_entry;

	unsigned int sweeper;

	struct dm_deferred_entry entries[DEFERRED_SET_SIZE];

};
@@ -338,7 +339,7 @@ struct dm_deferred_entry *dm_deferred_entry_inc(struct dm_deferred_set *ds) 
}

EXPORT_SYMBOL_GPL(dm_deferred_entry_inc);



static unsigned ds_next(unsigned index)

static unsigned int ds_next(unsigned int index)

{

	return (index + 1) % DEFERRED_SET_SIZE;

}
@@ -373,7 +374,7 @@ EXPORT_SYMBOL_GPL(dm_deferred_entry_dec); 
int dm_deferred_set_add_work(struct dm_deferred_set *ds, struct list_head *work)

{

	int r = 1;

	unsigned next_entry;

	unsigned int next_entry;



	spin_lock_irq(&ds->lock);

	if ((ds->sweeper == ds->current_entry) &&

drivers/md/dm-bio-prison-v1.h

+1 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (C) 2011-2017 Red Hat, Inc.

 *

drivers/md/dm-bio-prison-v2.c

+8 −7
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (C) 2012-2017 Red Hat, Inc.

 *
@@ -148,7 +149,7 @@ static bool __find_or_insert(struct dm_bio_prison_v2 *prison, 


static bool __get(struct dm_bio_prison_v2 *prison,

		  struct dm_cell_key_v2 *key,

		  unsigned lock_level,

		  unsigned int lock_level,

		  struct bio *inmate,

		  struct dm_bio_prison_cell_v2 *cell_prealloc,

		  struct dm_bio_prison_cell_v2 **cell)
@@ -171,7 +172,7 @@ static bool __get(struct dm_bio_prison_v2 *prison, 


bool dm_cell_get_v2(struct dm_bio_prison_v2 *prison,

		    struct dm_cell_key_v2 *key,

		    unsigned lock_level,

		    unsigned int lock_level,

		    struct bio *inmate,

		    struct dm_bio_prison_cell_v2 *cell_prealloc,

		    struct dm_bio_prison_cell_v2 **cell_result)
@@ -224,7 +225,7 @@ EXPORT_SYMBOL_GPL(dm_cell_put_v2); 


static int __lock(struct dm_bio_prison_v2 *prison,

		  struct dm_cell_key_v2 *key,

		  unsigned lock_level,

		  unsigned int lock_level,

		  struct dm_bio_prison_cell_v2 *cell_prealloc,

		  struct dm_bio_prison_cell_v2 **cell_result)

{
@@ -255,7 +256,7 @@ static int __lock(struct dm_bio_prison_v2 *prison, 


int dm_cell_lock_v2(struct dm_bio_prison_v2 *prison,

		    struct dm_cell_key_v2 *key,

		    unsigned lock_level,

		    unsigned int lock_level,

		    struct dm_bio_prison_cell_v2 *cell_prealloc,

		    struct dm_bio_prison_cell_v2 **cell_result)

{
@@ -291,7 +292,7 @@ EXPORT_SYMBOL_GPL(dm_cell_quiesce_v2); 


static int __promote(struct dm_bio_prison_v2 *prison,

		     struct dm_bio_prison_cell_v2 *cell,

		     unsigned new_lock_level)

		     unsigned int new_lock_level)

{

	if (!cell->exclusive_lock)

		return -EINVAL;
@@ -302,7 +303,7 @@ static int __promote(struct dm_bio_prison_v2 *prison, 


int dm_cell_lock_promote_v2(struct dm_bio_prison_v2 *prison,

			    struct dm_bio_prison_cell_v2 *cell,

			    unsigned new_lock_level)

			    unsigned int new_lock_level)

{

	int r;

drivers/md/dm-bio-prison-v2.h

+6 −5
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (C) 2011-2017 Red Hat, Inc.

 *
@@ -44,8 +45,8 @@ struct dm_cell_key_v2 { 
struct dm_bio_prison_cell_v2 {

	// FIXME: pack these

	bool exclusive_lock;

	unsigned exclusive_level;

	unsigned shared_count;

	unsigned int exclusive_level;

	unsigned int shared_count;

	struct work_struct *quiesce_continuation;



	struct rb_node node;
@@ -86,7 +87,7 @@ void dm_bio_prison_free_cell_v2(struct dm_bio_prison_v2 *prison, 
 */

bool dm_cell_get_v2(struct dm_bio_prison_v2 *prison,

		    struct dm_cell_key_v2 *key,

		    unsigned lock_level,

		    unsigned int lock_level,

		    struct bio *inmate,

		    struct dm_bio_prison_cell_v2 *cell_prealloc,

		    struct dm_bio_prison_cell_v2 **cell_result);
@@ -114,7 +115,7 @@ bool dm_cell_put_v2(struct dm_bio_prison_v2 *prison, 
 */

int dm_cell_lock_v2(struct dm_bio_prison_v2 *prison,

		    struct dm_cell_key_v2 *key,

		    unsigned lock_level,

		    unsigned int lock_level,

		    struct dm_bio_prison_cell_v2 *cell_prealloc,

		    struct dm_bio_prison_cell_v2 **cell_result);
@@ -132,7 +133,7 @@ void dm_cell_quiesce_v2(struct dm_bio_prison_v2 *prison, 
 */

int dm_cell_lock_promote_v2(struct dm_bio_prison_v2 *prison,

			    struct dm_bio_prison_cell_v2 *cell,

			    unsigned new_lock_level);

			    unsigned int new_lock_level);



/*

 * Adds any held bios to the bio list.