2005-04-16 22:20:36 +00:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2001-2003 Sistina Software (UK) Limited.
|
|
|
|
*
|
|
|
|
* This file is released under the GPL.
|
|
|
|
*/
|
|
|
|
|
2013-09-06 15:36:01 +00:00
|
|
|
#include "dm.h"
|
2008-10-21 16:44:59 +00:00
|
|
|
#include <linux/device-mapper.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/blkdev.h>
|
|
|
|
#include <linux/bio.h>
|
|
|
|
#include <linux/slab.h>
|
2007-10-19 21:38:44 +00:00
|
|
|
#include <linux/log2.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-06-26 07:27:35 +00:00
|
|
|
#define DM_MSG_PREFIX "striped"
|
2008-02-08 02:11:22 +00:00
|
|
|
#define DM_IO_ERROR_THRESHOLD 15
|
2006-06-26 07:27:35 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
struct stripe {
|
|
|
|
struct dm_dev *dev;
|
|
|
|
sector_t physical_start;
|
2008-02-08 02:11:22 +00:00
|
|
|
|
|
|
|
atomic_t error_count;
|
2005-04-16 22:20:36 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct stripe_c {
|
|
|
|
uint32_t stripes;
|
2010-08-12 03:14:21 +00:00
|
|
|
int stripes_shift;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* The size of this target / num. stripes */
|
|
|
|
sector_t stripe_width;
|
|
|
|
|
2012-07-27 14:08:01 +00:00
|
|
|
uint32_t chunk_size;
|
2012-07-27 14:08:02 +00:00
|
|
|
int chunk_size_shift;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-02-08 02:11:22 +00:00
|
|
|
/* Needed for handling events */
|
|
|
|
struct dm_target *ti;
|
|
|
|
|
|
|
|
/* Work struct used for triggering events*/
|
2011-01-13 19:59:57 +00:00
|
|
|
struct work_struct trigger_event;
|
2008-02-08 02:11:22 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
struct stripe stripe[0];
|
|
|
|
};
|
|
|
|
|
2008-02-08 02:11:22 +00:00
|
|
|
/*
|
|
|
|
* An event is triggered whenever a drive
|
|
|
|
* drops out of a stripe volume.
|
|
|
|
*/
|
|
|
|
static void trigger_event(struct work_struct *work)
|
|
|
|
{
|
2011-01-13 19:59:57 +00:00
|
|
|
struct stripe_c *sc = container_of(work, struct stripe_c,
|
|
|
|
trigger_event);
|
2008-02-08 02:11:22 +00:00
|
|
|
dm_table_event(sc->ti->table);
|
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
static inline struct stripe_c *alloc_context(unsigned int stripes)
|
|
|
|
{
|
|
|
|
size_t len;
|
|
|
|
|
2008-10-21 16:44:57 +00:00
|
|
|
if (dm_array_too_big(sizeof(struct stripe_c), sizeof(struct stripe),
|
|
|
|
stripes))
|
2005-04-16 22:20:36 +00:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
len = sizeof(struct stripe_c) + (sizeof(struct stripe) * stripes);
|
|
|
|
|
|
|
|
return kmalloc(len, GFP_KERNEL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Parse a single <dev> <sector> pair
|
|
|
|
*/
|
|
|
|
static int get_stripe(struct dm_target *ti, struct stripe_c *sc,
|
|
|
|
unsigned int stripe, char **argv)
|
|
|
|
{
|
2006-03-27 09:17:48 +00:00
|
|
|
unsigned long long start;
|
dm: reject trailing characters in sccanf input
Device mapper uses sscanf to convert arguments to numbers. The problem is that
the way we use it ignores additional unmatched characters in the scanned string.
For example, this `if (sscanf(string, "%d", &number) == 1)' will match a number,
but also it will match number with some garbage appended, like "123abc".
As a result, device mapper accepts garbage after some numbers. For example
the command `dmsetup create vg1-new --table "0 16384 linear 254:1bla 34816bla"'
will pass without an error.
This patch fixes all sscanf uses in device mapper. It appends "%c" with
a pointer to a dummy character variable to every sscanf statement.
The construct `if (sscanf(string, "%d%c", &number, &dummy) == 1)' succeeds
only if string is a null-terminated number (optionally preceded by some
whitespace characters). If there is some character appended after the number,
sscanf matches "%c", writes the character to the dummy variable and returns 2.
We check the return value for 1 and consequently reject numbers with some
garbage appended.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Acked-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
2012-03-28 17:41:26 +00:00
|
|
|
char dummy;
|
2015-07-31 13:20:36 +00:00
|
|
|
int ret;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
dm: reject trailing characters in sccanf input
Device mapper uses sscanf to convert arguments to numbers. The problem is that
the way we use it ignores additional unmatched characters in the scanned string.
For example, this `if (sscanf(string, "%d", &number) == 1)' will match a number,
but also it will match number with some garbage appended, like "123abc".
As a result, device mapper accepts garbage after some numbers. For example
the command `dmsetup create vg1-new --table "0 16384 linear 254:1bla 34816bla"'
will pass without an error.
This patch fixes all sscanf uses in device mapper. It appends "%c" with
a pointer to a dummy character variable to every sscanf statement.
The construct `if (sscanf(string, "%d%c", &number, &dummy) == 1)' succeeds
only if string is a null-terminated number (optionally preceded by some
whitespace characters). If there is some character appended after the number,
sscanf matches "%c", writes the character to the dummy variable and returns 2.
We check the return value for 1 and consequently reject numbers with some
garbage appended.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Acked-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
2012-03-28 17:41:26 +00:00
|
|
|
if (sscanf(argv[1], "%llu%c", &start, &dummy) != 1)
|
2005-04-16 22:20:36 +00:00
|
|
|
return -EINVAL;
|
|
|
|
|
2015-07-31 13:20:36 +00:00
|
|
|
ret = dm_get_device(ti, argv[0], dm_table_get_mode(ti->table),
|
|
|
|
&sc->stripe[stripe].dev);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
sc->stripe[stripe].physical_start = start;
|
2008-02-08 02:11:22 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Construct a striped mapping.
|
2012-07-27 14:08:01 +00:00
|
|
|
* <number of stripes> <chunk size> [<dev_path> <offset>]+
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
|
|
|
static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
|
|
|
|
{
|
|
|
|
struct stripe_c *sc;
|
2013-05-10 13:37:14 +00:00
|
|
|
sector_t width, tmp_len;
|
2005-04-16 22:20:36 +00:00
|
|
|
uint32_t stripes;
|
|
|
|
uint32_t chunk_size;
|
|
|
|
int r;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
if (argc < 2) {
|
2006-06-26 07:27:35 +00:00
|
|
|
ti->error = "Not enough arguments";
|
2005-04-16 22:20:36 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2012-07-27 14:07:59 +00:00
|
|
|
if (kstrtouint(argv[0], 10, &stripes) || !stripes) {
|
2006-06-26 07:27:35 +00:00
|
|
|
ti->error = "Invalid stripe count";
|
2005-04-16 22:20:36 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2012-07-27 14:08:01 +00:00
|
|
|
if (kstrtouint(argv[1], 10, &chunk_size) || !chunk_size) {
|
2012-07-27 14:08:01 +00:00
|
|
|
ti->error = "Invalid chunk_size";
|
2005-04-16 22:20:36 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2012-07-27 14:08:01 +00:00
|
|
|
width = ti->len;
|
2013-05-10 13:37:14 +00:00
|
|
|
if (sector_div(width, stripes)) {
|
2006-06-26 07:27:35 +00:00
|
|
|
ti->error = "Target length not divisible by "
|
2013-05-10 13:37:14 +00:00
|
|
|
"number of stripes";
|
2006-03-17 07:04:03 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2013-05-10 13:37:14 +00:00
|
|
|
tmp_len = width;
|
|
|
|
if (sector_div(tmp_len, chunk_size)) {
|
2006-06-26 07:27:35 +00:00
|
|
|
ti->error = "Target length not divisible by "
|
2013-05-10 13:37:14 +00:00
|
|
|
"chunk size";
|
2005-04-16 22:20:36 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Do we have enough arguments for that many stripes ?
|
|
|
|
*/
|
|
|
|
if (argc != (2 + 2 * stripes)) {
|
2006-06-26 07:27:35 +00:00
|
|
|
ti->error = "Not enough destinations "
|
2005-04-16 22:20:36 +00:00
|
|
|
"specified";
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
sc = alloc_context(stripes);
|
|
|
|
if (!sc) {
|
2006-06-26 07:27:35 +00:00
|
|
|
ti->error = "Memory allocation for striped context "
|
2005-04-16 22:20:36 +00:00
|
|
|
"failed";
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
2011-01-13 19:59:57 +00:00
|
|
|
INIT_WORK(&sc->trigger_event, trigger_event);
|
2008-02-08 02:11:22 +00:00
|
|
|
|
|
|
|
/* Set pointer to dm target; used in trigger_event */
|
|
|
|
sc->ti = ti;
|
2005-04-16 22:20:36 +00:00
|
|
|
sc->stripes = stripes;
|
|
|
|
sc->stripe_width = width;
|
2010-08-12 03:14:21 +00:00
|
|
|
|
|
|
|
if (stripes & (stripes - 1))
|
|
|
|
sc->stripes_shift = -1;
|
2012-07-27 14:08:00 +00:00
|
|
|
else
|
|
|
|
sc->stripes_shift = __ffs(stripes);
|
2010-08-12 03:14:21 +00:00
|
|
|
|
2012-07-27 14:08:00 +00:00
|
|
|
r = dm_set_target_max_io_len(ti, chunk_size);
|
2014-10-10 15:19:46 +00:00
|
|
|
if (r) {
|
|
|
|
kfree(sc);
|
2012-07-27 14:08:00 +00:00
|
|
|
return r;
|
2014-10-10 15:19:46 +00:00
|
|
|
}
|
2012-07-27 14:08:00 +00:00
|
|
|
|
2013-03-01 22:45:47 +00:00
|
|
|
ti->num_flush_bios = stripes;
|
|
|
|
ti->num_discard_bios = stripes;
|
|
|
|
ti->num_write_same_bios = stripes;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2012-07-27 14:08:01 +00:00
|
|
|
sc->chunk_size = chunk_size;
|
2012-07-27 14:08:02 +00:00
|
|
|
if (chunk_size & (chunk_size - 1))
|
|
|
|
sc->chunk_size_shift = -1;
|
|
|
|
else
|
|
|
|
sc->chunk_size_shift = __ffs(chunk_size);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Get the stripe destinations.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < stripes; i++) {
|
|
|
|
argv += 2;
|
|
|
|
|
|
|
|
r = get_stripe(ti, sc, i, argv);
|
|
|
|
if (r < 0) {
|
2006-06-26 07:27:35 +00:00
|
|
|
ti->error = "Couldn't parse stripe destination";
|
2005-04-16 22:20:36 +00:00
|
|
|
while (i--)
|
|
|
|
dm_put_device(ti, sc->stripe[i].dev);
|
|
|
|
kfree(sc);
|
|
|
|
return r;
|
|
|
|
}
|
2008-02-08 02:11:22 +00:00
|
|
|
atomic_set(&(sc->stripe[i].error_count), 0);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ti->private = sc;
|
2008-02-08 02:11:22 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void stripe_dtr(struct dm_target *ti)
|
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
struct stripe_c *sc = (struct stripe_c *) ti->private;
|
|
|
|
|
|
|
|
for (i = 0; i < sc->stripes; i++)
|
|
|
|
dm_put_device(ti, sc->stripe[i].dev);
|
|
|
|
|
2012-08-20 21:51:24 +00:00
|
|
|
flush_work(&sc->trigger_event);
|
2005-04-16 22:20:36 +00:00
|
|
|
kfree(sc);
|
|
|
|
}
|
|
|
|
|
2010-08-12 03:14:14 +00:00
|
|
|
static void stripe_map_sector(struct stripe_c *sc, sector_t sector,
|
|
|
|
uint32_t *stripe, sector_t *result)
|
|
|
|
{
|
2012-07-27 14:08:01 +00:00
|
|
|
sector_t chunk = dm_target_offset(sc->ti, sector);
|
2012-07-27 14:08:02 +00:00
|
|
|
sector_t chunk_offset;
|
|
|
|
|
|
|
|
if (sc->chunk_size_shift < 0)
|
|
|
|
chunk_offset = sector_div(chunk, sc->chunk_size);
|
|
|
|
else {
|
|
|
|
chunk_offset = chunk & (sc->chunk_size - 1);
|
|
|
|
chunk >>= sc->chunk_size_shift;
|
|
|
|
}
|
2010-08-12 03:14:14 +00:00
|
|
|
|
2010-08-12 03:14:21 +00:00
|
|
|
if (sc->stripes_shift < 0)
|
|
|
|
*stripe = sector_div(chunk, sc->stripes);
|
|
|
|
else {
|
2012-07-27 14:08:00 +00:00
|
|
|
*stripe = chunk & (sc->stripes - 1);
|
2010-08-12 03:14:21 +00:00
|
|
|
chunk >>= sc->stripes_shift;
|
|
|
|
}
|
|
|
|
|
2012-07-27 14:08:02 +00:00
|
|
|
if (sc->chunk_size_shift < 0)
|
|
|
|
chunk *= sc->chunk_size;
|
|
|
|
else
|
|
|
|
chunk <<= sc->chunk_size_shift;
|
|
|
|
|
|
|
|
*result = chunk + chunk_offset;
|
2010-08-12 03:14:14 +00:00
|
|
|
}
|
|
|
|
|
2010-08-12 03:14:26 +00:00
|
|
|
static void stripe_map_range_sector(struct stripe_c *sc, sector_t sector,
|
|
|
|
uint32_t target_stripe, sector_t *result)
|
|
|
|
{
|
|
|
|
uint32_t stripe;
|
|
|
|
|
|
|
|
stripe_map_sector(sc, sector, &stripe, result);
|
|
|
|
if (stripe == target_stripe)
|
|
|
|
return;
|
2012-07-27 14:08:01 +00:00
|
|
|
|
|
|
|
/* round down */
|
|
|
|
sector = *result;
|
2012-07-27 14:08:02 +00:00
|
|
|
if (sc->chunk_size_shift < 0)
|
|
|
|
*result -= sector_div(sector, sc->chunk_size);
|
|
|
|
else
|
|
|
|
*result = sector & ~(sector_t)(sc->chunk_size - 1);
|
2012-07-27 14:08:01 +00:00
|
|
|
|
2010-08-12 03:14:26 +00:00
|
|
|
if (target_stripe < stripe)
|
2012-07-27 14:08:01 +00:00
|
|
|
*result += sc->chunk_size; /* next chunk */
|
2010-08-12 03:14:26 +00:00
|
|
|
}
|
|
|
|
|
2012-12-21 20:23:41 +00:00
|
|
|
static int stripe_map_range(struct stripe_c *sc, struct bio *bio,
|
|
|
|
uint32_t target_stripe)
|
2010-08-12 03:14:26 +00:00
|
|
|
{
|
|
|
|
sector_t begin, end;
|
|
|
|
|
2013-10-11 22:44:27 +00:00
|
|
|
stripe_map_range_sector(sc, bio->bi_iter.bi_sector,
|
|
|
|
target_stripe, &begin);
|
2012-09-25 22:05:12 +00:00
|
|
|
stripe_map_range_sector(sc, bio_end_sector(bio),
|
2010-08-12 03:14:26 +00:00
|
|
|
target_stripe, &end);
|
|
|
|
if (begin < end) {
|
|
|
|
bio->bi_bdev = sc->stripe[target_stripe].dev->bdev;
|
2013-10-11 22:44:27 +00:00
|
|
|
bio->bi_iter.bi_sector = begin +
|
|
|
|
sc->stripe[target_stripe].physical_start;
|
|
|
|
bio->bi_iter.bi_size = to_bytes(end - begin);
|
2010-08-12 03:14:26 +00:00
|
|
|
return DM_MAPIO_REMAPPED;
|
|
|
|
} else {
|
|
|
|
/* The range doesn't map to the target stripe */
|
2015-07-20 13:29:37 +00:00
|
|
|
bio_endio(bio);
|
2010-08-12 03:14:26 +00:00
|
|
|
return DM_MAPIO_SUBMITTED;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-12-21 20:23:41 +00:00
|
|
|
static int stripe_map(struct dm_target *ti, struct bio *bio)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2010-08-12 03:14:14 +00:00
|
|
|
struct stripe_c *sc = ti->private;
|
2009-06-22 09:12:22 +00:00
|
|
|
uint32_t stripe;
|
2013-03-01 22:45:47 +00:00
|
|
|
unsigned target_bio_nr;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2016-08-05 21:35:16 +00:00
|
|
|
if (bio->bi_opf & REQ_PREFLUSH) {
|
2013-03-01 22:45:47 +00:00
|
|
|
target_bio_nr = dm_bio_get_target_bio_nr(bio);
|
|
|
|
BUG_ON(target_bio_nr >= sc->stripes);
|
|
|
|
bio->bi_bdev = sc->stripe[target_bio_nr].dev->bdev;
|
2009-06-22 09:12:22 +00:00
|
|
|
return DM_MAPIO_REMAPPED;
|
|
|
|
}
|
2016-06-05 19:32:04 +00:00
|
|
|
if (unlikely(bio_op(bio) == REQ_OP_DISCARD) ||
|
|
|
|
unlikely(bio_op(bio) == REQ_OP_WRITE_SAME)) {
|
2013-03-01 22:45:47 +00:00
|
|
|
target_bio_nr = dm_bio_get_target_bio_nr(bio);
|
|
|
|
BUG_ON(target_bio_nr >= sc->stripes);
|
|
|
|
return stripe_map_range(sc, bio, target_bio_nr);
|
2010-08-12 03:14:26 +00:00
|
|
|
}
|
2009-06-22 09:12:22 +00:00
|
|
|
|
2013-10-11 22:44:27 +00:00
|
|
|
stripe_map_sector(sc, bio->bi_iter.bi_sector,
|
|
|
|
&stripe, &bio->bi_iter.bi_sector);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2013-10-11 22:44:27 +00:00
|
|
|
bio->bi_iter.bi_sector += sc->stripe[stripe].physical_start;
|
2005-04-16 22:20:36 +00:00
|
|
|
bio->bi_bdev = sc->stripe[stripe].dev->bdev;
|
2010-08-12 03:14:14 +00:00
|
|
|
|
2006-12-08 10:41:06 +00:00
|
|
|
return DM_MAPIO_REMAPPED;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2016-06-24 18:23:30 +00:00
|
|
|
static long stripe_direct_access(struct dm_target *ti, sector_t sector,
|
libnvdimm for 4.8
1/ Replace pcommit with ADR / directed-flushing:
The pcommit instruction, which has not shipped on any product, is
deprecated. Instead, the requirement is that platforms implement either
ADR, or provide one or more flush addresses per nvdimm. ADR
(Asynchronous DRAM Refresh) flushes data in posted write buffers to the
memory controller on a power-fail event. Flush addresses are defined in
ACPI 6.x as an NVDIMM Firmware Interface Table (NFIT) sub-structure:
"Flush Hint Address Structure". A flush hint is an mmio address that
when written and fenced assures that all previous posted writes
targeting a given dimm have been flushed to media.
2/ On-demand ARS (address range scrub):
Linux uses the results of the ACPI ARS commands to track bad blocks
in pmem devices. When latent errors are detected we re-scrub the media
to refresh the bad block list, userspace can also request a re-scrub at
any time.
3/ Support for the Microsoft DSM (device specific method) command format.
4/ Support for EDK2/OVMF virtual disk device memory ranges.
5/ Various fixes and cleanups across the subsystem.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJXmXBsAAoJEB7SkWpmfYgCEwwP/1IOt9ocP+iHLMDH9KE7VaTZ
NmUDR+Zy6g5cRQM7SgcuU5BXUcx+OsSrSrUTVF1cW994o9Gbz1mFotkv0ZAsPcYY
ZVRQxo2oqHrssyOcg+PsgKWiXn68rJOCgmpEyzaJywl5qTMst7pzsT1s1f7rSh6h
trCf4VaJJwxZR8fARGtlHUnnhPe2Orp99EZRKEWprAsIv2kPuWpPHSjRjuEgN1JG
KW8AYwWqFTtiLRUk86I4KBB0wcDrfctsjgN9Ogd6+aHyQBRnVSr2U+vDCFkC8KLu
qiDCpYp+yyxBjclnljz7tRRT3GtzfCUWd4v2KVWqgg2IaobUc0Lbukp/rmikUXQP
WLikT2OCQ994eFK5OX3Q3cIU/4j459TQnof8q14yVSpjAKrNUXVSR5puN7Hxa+V7
41wKrAsnsyY1oq+Yd/rMR8VfH7PHx3bFkrmRCGZCufLX1UQm4aYj+sWagDKiV3yA
DiudghbOnhfurfGsnXUVw7y7GKs+gNWNBmB6ndAD6ZEHmKoGUhAEbJDLCc3DnANl
b/2mv1MIdIcC1DlCmnbbcn6fv6bICe/r8poK3VrCK3UgOq/EOvKIWl7giP+k1JuC
6DdVYhlNYIVFXUNSLFAwz8OkLu8byx7WDm36iEqrKHtPw+8qa/2bWVgOU6OBgpjV
cN3edFVIdxvZeMgM5Ubq
=xCBG
-----END PGP SIGNATURE-----
Merge tag 'libnvdimm-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm updates from Dan Williams:
- Replace pcommit with ADR / directed-flushing.
The pcommit instruction, which has not shipped on any product, is
deprecated. Instead, the requirement is that platforms implement
either ADR, or provide one or more flush addresses per nvdimm.
ADR (Asynchronous DRAM Refresh) flushes data in posted write buffers
to the memory controller on a power-fail event.
Flush addresses are defined in ACPI 6.x as an NVDIMM Firmware
Interface Table (NFIT) sub-structure: "Flush Hint Address Structure".
A flush hint is an mmio address that when written and fenced assures
that all previous posted writes targeting a given dimm have been
flushed to media.
- On-demand ARS (address range scrub).
Linux uses the results of the ACPI ARS commands to track bad blocks
in pmem devices. When latent errors are detected we re-scrub the
media to refresh the bad block list, userspace can also request a
re-scrub at any time.
- Support for the Microsoft DSM (device specific method) command
format.
- Support for EDK2/OVMF virtual disk device memory ranges.
- Various fixes and cleanups across the subsystem.
* tag 'libnvdimm-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: (41 commits)
libnvdimm-btt: Delete an unnecessary check before the function call "__nd_device_register"
nfit: do an ARS scrub on hitting a latent media error
nfit: move to nfit/ sub-directory
nfit, libnvdimm: allow an ARS scrub to be triggered on demand
libnvdimm: register nvdimm_bus devices with an nd_bus driver
pmem: clarify a debug print in pmem_clear_poison
x86/insn: remove pcommit
Revert "KVM: x86: add pcommit support"
nfit, tools/testing/nvdimm/: unify shutdown paths
libnvdimm: move ->module to struct nvdimm_bus_descriptor
nfit: cleanup acpi_nfit_init calling convention
nfit: fix _FIT evaluation memory leak + use after free
tools/testing/nvdimm: add manufacturing_{date|location} dimm properties
tools/testing/nvdimm: add virtual ramdisk range
acpi, nfit: treat virtual ramdisk SPA as pmem region
pmem: kill __pmem address space
pmem: kill wmb_pmem()
libnvdimm, pmem: use nvdimm_flush() for namespace I/O writes
fs/dax: remove wmb_pmem()
libnvdimm, pmem: flush posted-write queues on shutdown
...
2016-07-29 00:22:07 +00:00
|
|
|
void **kaddr, pfn_t *pfn, long size)
|
2016-06-24 18:23:30 +00:00
|
|
|
{
|
|
|
|
struct stripe_c *sc = ti->private;
|
|
|
|
uint32_t stripe;
|
|
|
|
struct block_device *bdev;
|
|
|
|
struct blk_dax_ctl dax = {
|
|
|
|
.size = size,
|
|
|
|
};
|
|
|
|
long ret;
|
|
|
|
|
|
|
|
stripe_map_sector(sc, sector, &stripe, &dax.sector);
|
|
|
|
|
|
|
|
dax.sector += sc->stripe[stripe].physical_start;
|
|
|
|
bdev = sc->stripe[stripe].dev->bdev;
|
|
|
|
|
|
|
|
ret = bdev_direct_access(bdev, &dax);
|
|
|
|
*kaddr = dax.addr;
|
|
|
|
*pfn = dax.pfn;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-02-08 02:11:24 +00:00
|
|
|
/*
|
|
|
|
* Stripe status:
|
|
|
|
*
|
|
|
|
* INFO
|
|
|
|
* #stripes [stripe_name <stripe_name>] [group word count]
|
|
|
|
* [error count 'A|D' <error count 'A|D'>]
|
|
|
|
*
|
|
|
|
* TABLE
|
|
|
|
* #stripes [stripe chunk size]
|
|
|
|
* [stripe_name physical_start <stripe_name physical_start>]
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2013-03-01 22:45:44 +00:00
|
|
|
static void stripe_status(struct dm_target *ti, status_type_t type,
|
|
|
|
unsigned status_flags, char *result, unsigned maxlen)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct stripe_c *sc = (struct stripe_c *) ti->private;
|
2008-02-08 02:11:24 +00:00
|
|
|
char buffer[sc->stripes + 1];
|
2005-04-16 22:20:36 +00:00
|
|
|
unsigned int sz = 0;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
switch (type) {
|
|
|
|
case STATUSTYPE_INFO:
|
2008-02-08 02:11:24 +00:00
|
|
|
DMEMIT("%d ", sc->stripes);
|
|
|
|
for (i = 0; i < sc->stripes; i++) {
|
|
|
|
DMEMIT("%s ", sc->stripe[i].dev->name);
|
|
|
|
buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
|
|
|
|
'D' : 'A';
|
|
|
|
}
|
|
|
|
buffer[i] = '\0';
|
|
|
|
DMEMIT("1 %s", buffer);
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case STATUSTYPE_TABLE:
|
2006-03-27 09:17:48 +00:00
|
|
|
DMEMIT("%d %llu", sc->stripes,
|
2012-07-27 14:08:01 +00:00
|
|
|
(unsigned long long)sc->chunk_size);
|
2005-04-16 22:20:36 +00:00
|
|
|
for (i = 0; i < sc->stripes; i++)
|
2006-03-27 09:17:48 +00:00
|
|
|
DMEMIT(" %s %llu", sc->stripe[i].dev->name,
|
|
|
|
(unsigned long long)sc->stripe[i].physical_start);
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-12-21 20:23:41 +00:00
|
|
|
static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
|
2008-02-08 02:11:22 +00:00
|
|
|
{
|
|
|
|
unsigned i;
|
|
|
|
char major_minor[16];
|
|
|
|
struct stripe_c *sc = ti->private;
|
|
|
|
|
|
|
|
if (!error)
|
|
|
|
return 0; /* I/O complete */
|
|
|
|
|
2016-08-05 21:35:16 +00:00
|
|
|
if ((error == -EWOULDBLOCK) && (bio->bi_opf & REQ_RAHEAD))
|
2008-02-08 02:11:22 +00:00
|
|
|
return error;
|
|
|
|
|
|
|
|
if (error == -EOPNOTSUPP)
|
|
|
|
return error;
|
|
|
|
|
|
|
|
memset(major_minor, 0, sizeof(major_minor));
|
|
|
|
sprintf(major_minor, "%d:%d",
|
2008-09-03 07:01:48 +00:00
|
|
|
MAJOR(disk_devt(bio->bi_bdev->bd_disk)),
|
|
|
|
MINOR(disk_devt(bio->bi_bdev->bd_disk)));
|
2008-02-08 02:11:22 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Test to see which stripe drive triggered the event
|
|
|
|
* and increment error count for all stripes on that device.
|
|
|
|
* If the error count for a given device exceeds the threshold
|
|
|
|
* value we will no longer trigger any further events.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < sc->stripes; i++)
|
|
|
|
if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
|
|
|
|
atomic_inc(&(sc->stripe[i].error_count));
|
|
|
|
if (atomic_read(&(sc->stripe[i].error_count)) <
|
|
|
|
DM_IO_ERROR_THRESHOLD)
|
2011-01-13 19:59:57 +00:00
|
|
|
schedule_work(&sc->trigger_event);
|
2008-02-08 02:11:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2009-06-22 09:12:33 +00:00
|
|
|
static int stripe_iterate_devices(struct dm_target *ti,
|
|
|
|
iterate_devices_callout_fn fn, void *data)
|
|
|
|
{
|
|
|
|
struct stripe_c *sc = ti->private;
|
|
|
|
int ret = 0;
|
|
|
|
unsigned i = 0;
|
|
|
|
|
2009-07-23 19:30:42 +00:00
|
|
|
do {
|
2009-06-22 09:12:33 +00:00
|
|
|
ret = fn(ti, sc->stripe[i].dev,
|
2009-07-23 19:30:42 +00:00
|
|
|
sc->stripe[i].physical_start,
|
|
|
|
sc->stripe_width, data);
|
|
|
|
} while (!ret && ++i < sc->stripes);
|
2009-06-22 09:12:33 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2009-09-04 19:40:25 +00:00
|
|
|
static void stripe_io_hints(struct dm_target *ti,
|
|
|
|
struct queue_limits *limits)
|
|
|
|
{
|
|
|
|
struct stripe_c *sc = ti->private;
|
2012-07-27 14:08:01 +00:00
|
|
|
unsigned chunk_size = sc->chunk_size << SECTOR_SHIFT;
|
2009-09-04 19:40:25 +00:00
|
|
|
|
|
|
|
blk_limits_io_min(limits, chunk_size);
|
2009-09-11 19:54:52 +00:00
|
|
|
blk_limits_io_opt(limits, chunk_size * sc->stripes);
|
2009-09-04 19:40:25 +00:00
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
static struct target_type stripe_target = {
|
|
|
|
.name = "striped",
|
2016-06-24 18:23:30 +00:00
|
|
|
.version = {1, 6, 0},
|
2005-04-16 22:20:36 +00:00
|
|
|
.module = THIS_MODULE,
|
|
|
|
.ctr = stripe_ctr,
|
|
|
|
.dtr = stripe_dtr,
|
|
|
|
.map = stripe_map,
|
2008-02-08 02:11:22 +00:00
|
|
|
.end_io = stripe_end_io,
|
2005-04-16 22:20:36 +00:00
|
|
|
.status = stripe_status,
|
2009-06-22 09:12:33 +00:00
|
|
|
.iterate_devices = stripe_iterate_devices,
|
2009-09-04 19:40:25 +00:00
|
|
|
.io_hints = stripe_io_hints,
|
2016-06-24 18:23:30 +00:00
|
|
|
.direct_access = stripe_direct_access,
|
2005-04-16 22:20:36 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
int __init dm_stripe_init(void)
|
|
|
|
{
|
|
|
|
int r;
|
|
|
|
|
|
|
|
r = dm_register_target(&stripe_target);
|
2015-04-27 20:29:36 +00:00
|
|
|
if (r < 0)
|
2006-06-26 07:27:35 +00:00
|
|
|
DMWARN("target registration failed");
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
void dm_stripe_exit(void)
|
|
|
|
{
|
2009-01-06 03:04:58 +00:00
|
|
|
dm_unregister_target(&stripe_target);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|