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

Merge tag 'for-5.10/dm-fixes' of... 

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

Pull device mapper fixes from Mike Snitzer:

 - Fix DM's bio splitting changes that were made during v5.9. This
   restores splitting in terms of varied per-target ti->max_io_len
   rather than use block core's single stacked 'chunk_sectors' limit.

 - Like DM crypt, update DM integrity to not use crypto drivers that
   have CRYPTO_ALG_ALLOCATES_MEMORY set.

 - Fix DM writecache target's argument parsing and status display.

 - Remove needless BUG() from dm writecache's persistent_memory_claim()

 - Remove old gcc workaround in DM cache target's block_div() for ARM
   link errors now that gcc >= 4.9 is required.

 - Fix RCU locking in dm_blk_report_zones and dm_dax_zero_page_range.

 - Remove old, and now frowned upon, BUG_ON(in_interrupt()) in
   dm_table_event().

 - Remove invalid sparse annotations from dm_prepare_ioctl() and
   dm_unprepare_ioctl().

* tag 'for-5.10/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm: remove invalid sparse __acquires and __releases annotations
  dm: fix double RCU unlock in dm_dax_zero_page_range() error path
  dm: fix IO splitting
  dm writecache: remove BUG() and fail gracefully instead
  dm table: Remove BUG_ON(in_interrupt())
  dm: fix bug with RCU locking in dm_blk_report_zones
  Revert "dm cache: fix arm link errors with inline"
  dm writecache: fix the maximum number of arguments
  dm writecache: advance the number of arguments when reporting max_age
  dm integrity: don't use drivers that have CRYPTO_ALG_ALLOCATES_MEMORY
parents e87297fa bde3808b

block/blk-merge.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static struct bio *blk_bio_write_same_split(struct request_queue *q, 
static inline unsigned get_max_io_size(struct request_queue *q,

				       struct bio *bio)

{

	unsigned sectors = blk_max_size_offset(q, bio->bi_iter.bi_sector);

	unsigned sectors = blk_max_size_offset(q, bio->bi_iter.bi_sector, 0);

	unsigned max_sectors = sectors;

	unsigned pbs = queue_physical_block_size(q) >> SECTOR_SHIFT;

	unsigned lbs = queue_logical_block_size(q) >> SECTOR_SHIFT;

drivers/md/dm-cache-target.c

+0 −4
Original line number Diff line number Diff line
@@ -712,10 +712,6 @@ static bool block_size_is_power_of_two(struct cache *cache) 
	return cache->sectors_per_block_shift >= 0;

}



/* gcc on ARM generates spurious references to __udivdi3 and __umoddi3 */

#if defined(CONFIG_ARM) && __GNUC__ == 4 && __GNUC_MINOR__ <= 6

__always_inline

#endif

static dm_block_t block_div(dm_block_t b, uint32_t n)

{

	do_div(b, n);

drivers/md/dm-integrity.c

+2 −2
Original line number Diff line number Diff line
@@ -3462,7 +3462,7 @@ static int get_mac(struct crypto_shash **hash, struct alg_spec *a, char **error, 
	int r;



	if (a->alg_string) {

		*hash = crypto_alloc_shash(a->alg_string, 0, 0);

		*hash = crypto_alloc_shash(a->alg_string, 0, CRYPTO_ALG_ALLOCATES_MEMORY);

		if (IS_ERR(*hash)) {

			*error = error_alg;

			r = PTR_ERR(*hash);
@@ -3519,7 +3519,7 @@ static int create_journal(struct dm_integrity_c *ic, char **error) 
		struct journal_completion comp;



		comp.ic = ic;

		ic->journal_crypt = crypto_alloc_skcipher(ic->journal_crypt_alg.alg_string, 0, 0);

		ic->journal_crypt = crypto_alloc_skcipher(ic->journal_crypt_alg.alg_string, 0, CRYPTO_ALG_ALLOCATES_MEMORY);

		if (IS_ERR(ic->journal_crypt)) {

			*error = "Invalid journal cipher";

			r = PTR_ERR(ic->journal_crypt);

drivers/md/dm-table.c

+0 −11
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/mutex.h>

#include <linux/delay.h>

#include <linux/atomic.h>

#include <linux/lcm.h>

#include <linux/blk-mq.h>

#include <linux/mount.h>

#include <linux/dax.h>
@@ -1247,12 +1246,6 @@ void dm_table_event_callback(struct dm_table *t, 


void dm_table_event(struct dm_table *t)

{

	/*

	 * You can no longer call dm_table_event() from interrupt

	 * context, use a bottom half instead.

	 */

	BUG_ON(in_interrupt());



	mutex_lock(&_event_lock);

	if (t->event_fn)

		t->event_fn(t->event_context);
@@ -1455,10 +1448,6 @@ int dm_calculate_queue_limits(struct dm_table *table, 
			zone_sectors = ti_limits.chunk_sectors;

		}



		/* Stack chunk_sectors if target-specific splitting is required */

		if (ti->max_io_len)

			ti_limits.chunk_sectors = lcm_not_zero(ti->max_io_len,

							       ti_limits.chunk_sectors);

		/* Set I/O hints portion of queue limits */

		if (ti->type->io_hints)

			ti->type->io_hints(ti, &ti_limits);

drivers/md/dm-writecache.c

+4 −2
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static int persistent_memory_claim(struct dm_writecache *wc) 
#else

static int persistent_memory_claim(struct dm_writecache *wc)

{

	BUG();

	return -EOPNOTSUPP;

}

#endif
@@ -2041,7 +2041,7 @@ static int writecache_ctr(struct dm_target *ti, unsigned argc, char **argv) 
	struct wc_memory_superblock s;



	static struct dm_arg _args[] = {

		{0, 10, "Invalid number of feature args"},

		{0, 16, "Invalid number of feature args"},

	};



	as.argc = argc;
@@ -2479,6 +2479,8 @@ static void writecache_status(struct dm_target *ti, status_type_t type, 
			extra_args += 2;

		if (wc->autocommit_time_set)

			extra_args += 2;

		if (wc->max_age != MAX_AGE_UNSPECIFIED)

			extra_args += 2;

		if (wc->cleaner)

			extra_args++;

		if (wc->writeback_fua_set)