Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 929254d8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull device-mapper updates from Mike Snitzer:
 "I rebased the DM tree ontop of linux-block.git's 'for-3.18/core' at
  the beginning of October because DM core now depends on the newly
  introduced bioset_create_nobvec() interface.

  Summary:

   - fix DM's long-standing excessive use of memory by leveraging the
     new bioset_create_nobvec() interface when creating the DM's bioset

   - fix a few bugs in dm-bufio and dm-log-userspace

   - add DM core support for a DM multipath use-case that requires
     loading DM tables that contain devices that have failed (by
     allowing active and inactive DM tables to share dm_devs)

   - add discard support to the DM raid target; like MD raid456 the user
     must opt-in to raid456 discard support be specifying the
     devices_handle_discard_safely=Y module param"

* tag 'dm-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm log userspace: fix memory leak in dm_ulog_tfr_init failure path
  dm bufio: when done scanning return from __scan immediately
  dm bufio: update last_accessed when relinking a buffer
  dm raid: add discard support for RAID levels 4, 5 and 6
  dm raid: add discard support for RAID levels 1 and 10
  dm: allow active and inactive tables to share dm_devs
  dm mpath: stop queueing IO when no valid paths exist
  dm: use bioset_create_nobvec()
  dm: remove nr_iovecs parameter from alloc_tio()
parents e75437fb 56ec16cb

drivers/md/dm-bufio.c

+3 −2
Original line number Diff line number Diff line
@@ -465,6 +465,7 @@ static void __relink_lru(struct dm_buffer *b, int dirty) 
	c->n_buffers[dirty]++;

	b->list_mode = dirty;

	list_move(&b->lru_list, &c->lru[dirty]);

	b->last_accessed = jiffies;

}



/*----------------------------------------------------------------
@@ -1471,10 +1472,10 @@ static long __scan(struct dm_bufio_client *c, unsigned long nr_to_scan, 
		list_for_each_entry_safe_reverse(b, tmp, &c->lru[l], lru_list) {

			freed += __cleanup_old_buffer(b, gfp_mask, 0);

			if (!--nr_to_scan)

				break;

		}

				return freed;

			dm_bufio_cond_resched();

		}

	}

	return freed;

}

drivers/md/dm-ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -1418,7 +1418,7 @@ static void retrieve_deps(struct dm_table *table, 
	deps->count = count;

	count = 0;

	list_for_each_entry (dd, dm_table_get_devices(table), list)

		deps->dev[count++] = huge_encode_dev(dd->dm_dev.bdev->bd_dev);

		deps->dev[count++] = huge_encode_dev(dd->dm_dev->bdev->bd_dev);



	param->data_size = param->data_start + needed;

}

drivers/md/dm-log-userspace-transfer.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ int dm_ulog_tfr_init(void) 


	r = cn_add_callback(&ulog_cn_id, "dmlogusr", cn_ulog_callback);

	if (r) {

		cn_del_callback(&ulog_cn_id);

		kfree(prealloced_cn_msg);

		return r;

	}

drivers/md/dm-mpath.c

+3 −1
Original line number Diff line number Diff line
@@ -317,8 +317,10 @@ static void __choose_pgpath(struct multipath *m, size_t nr_bytes) 
	struct priority_group *pg;

	unsigned bypassed = 1;



	if (!m->nr_valid_paths)

	if (!m->nr_valid_paths) {

		m->queue_io = 0;

		goto failed;

	}



	/* Were we instructed to switch PG? */

	if (m->next_pg) {

drivers/md/dm-raid.c

+58 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010-2011 Neil Brown

 * Copyright (C) 2010-2011 Red Hat, Inc. All rights reserved.

 * Copyright (C) 2010-2014 Red Hat, Inc. All rights reserved.

 *

 * This file is released under the GPL.

 */
@@ -18,6 +18,8 @@ 


#define DM_MSG_PREFIX "raid"



static bool devices_handle_discard_safely = false;



/*

 * The following flags are used by dm-raid.c to set up the array state.

 * They must be cleared before md_run is called.
@@ -475,6 +477,8 @@ too_many: 
 *                                      will form the "stripe"

 *    [[no]sync]			Force or prevent recovery of the

 *                                      entire array

 *    [devices_handle_discard_safely]	Allow discards on RAID4/5/6; useful if RAID

 *					member device(s) properly support TRIM/UNMAP

 *    [rebuild <idx>]			Rebuild the drive indicated by the index

 *    [daemon_sleep <ms>]		Time between bitmap daemon work to

 *                                      clear bits
@@ -1149,6 +1153,49 @@ static int analyse_superblocks(struct dm_target *ti, struct raid_set *rs) 
	return 0;

}



/*

 * Enable/disable discard support on RAID set depending on

 * RAID level and discard properties of underlying RAID members.

 */

static void configure_discard_support(struct dm_target *ti, struct raid_set *rs)

{

	int i;

	bool raid456;



	/* Assume discards not supported until after checks below. */

	ti->discards_supported = false;



	/* RAID level 4,5,6 require discard_zeroes_data for data integrity! */

	raid456 = (rs->md.level == 4 || rs->md.level == 5 || rs->md.level == 6);



	for (i = 0; i < rs->md.raid_disks; i++) {

		struct request_queue *q = bdev_get_queue(rs->dev[i].rdev.bdev);



		if (!q || !blk_queue_discard(q))

			return;



		if (raid456) {

			if (!q->limits.discard_zeroes_data)

				return;

			if (!devices_handle_discard_safely) {

				DMERR("raid456 discard support disabled due to discard_zeroes_data uncertainty.");

				DMERR("Set dm-raid.devices_handle_discard_safely=Y to override.");

				return;

			}

		}

	}



	/* All RAID members properly support discards */

	ti->discards_supported = true;



	/*

	 * RAID1 and RAID10 personalities require bio splitting,

	 * RAID0/4/5/6 don't and process large discard bios properly.

	 */

	ti->split_discard_bios = !!(rs->md.level == 1 || rs->md.level == 10);

	ti->num_discard_bios = 1;

}



/*

 * Construct a RAID4/5/6 mapping:

 * Args:
@@ -1231,6 +1278,11 @@ static int raid_ctr(struct dm_target *ti, unsigned argc, char **argv) 
	ti->private = rs;

	ti->num_flush_bios = 1;



	/*

	 * Disable/enable discard support on RAID set.

	 */

	configure_discard_support(ti, rs);



	mutex_lock(&rs->md.reconfig_mutex);

	ret = md_run(&rs->md);

	rs->md.in_sync = 0; /* Assume already marked dirty */
@@ -1652,7 +1704,7 @@ static void raid_resume(struct dm_target *ti) 


static struct target_type raid_target = {

	.name = "raid",

	.version = {1, 5, 2},

	.version = {1, 6, 0},

	.module = THIS_MODULE,

	.ctr = raid_ctr,

	.dtr = raid_dtr,
@@ -1683,6 +1735,10 @@ static void __exit dm_raid_exit(void) 
module_init(dm_raid_init);

module_exit(dm_raid_exit);



module_param(devices_handle_discard_safely, bool, 0644);

MODULE_PARM_DESC(devices_handle_discard_safely,

		 "Set to Y if all devices in each array reliably return zeroes on reads from discarded regions");



MODULE_DESCRIPTION(DM_NAME " raid4/5/6 target");

MODULE_ALIAS("dm-raid1");

MODULE_ALIAS("dm-raid10");