Merge tag 'dm-3.4-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm

Pull device-mapper changes for 3.4 from Alasdair Kergon:

 - Update thin provisioning to support read-only external snapshot
   origins and discards.
 - A new target, dm verity, for device content validation.
 - Mark dm uevent and dm raid as no-longer-experimental.
 - Miscellaneous other fixes and clean-ups.

* tag 'dm-3.4-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm: (27 commits)
  dm: add verity target
  dm bufio: prefetch
  dm thin: add pool target flags to control discard
  dm thin: support discards
  dm thin: prepare to support discard
  dm thin: use dm_target_offset
  dm thin: support read only external snapshot origins
  dm thin: relax hard limit on the maximum size of a metadata device
  dm persistent data: remove space map ref_count entries if redundant
  dm thin: commit outstanding data every second
  dm: reject trailing characters in sccanf input
  dm raid: handle failed devices during start up
  dm thin metadata: pass correct space map to dm_sm_root_size
  dm persistent data: remove redundant value_size arg from value_ptr
  dm mpath: detect invalid map_context
  dm: clear bi_end_io on remapping failure
  dm table: simplify call to free_devices
  dm thin: correct comments
  dm raid: no longer experimental
  dm uevent: no longer experimental
  ...

1 files changed, 25 insertions, 21 deletions

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index db6b51639cee..3f06df59fd82 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -176,7 +176,6 @@ struct crypt_config {
 
 #define MIN_IOS        16
 #define MIN_POOL_PAGES 32
-#define MIN_BIO_PAGES  8
 
 static struct kmem_cache *_crypt_io_pool;
 
@@ -848,12 +847,11 @@ static struct bio *crypt_alloc_buffer(struct dm_crypt_io *io, unsigned size,
                 }
 
                 /*
-                 * if additional pages cannot be allocated without waiting,
-                 * return a partially allocated bio, the caller will then try
-                 * to allocate additional bios while submitting this partial bio
+                 * If additional pages cannot be allocated without waiting,
+                 * return a partially-allocated bio.  The caller will then try
+                 * to allocate more bios while submitting this partial bio.
                  */
-                if (i == (MIN_BIO_PAGES - 1))
-                        gfp_mask = (gfp_mask | __GFP_NOWARN) & ~__GFP_WAIT;
+                gfp_mask = (gfp_mask | __GFP_NOWARN) & ~__GFP_WAIT;
 
                 len = (size > PAGE_SIZE) ? PAGE_SIZE : size;
 
@@ -1046,16 +1044,14 @@ static void kcryptd_queue_io(struct dm_crypt_io *io)
         queue_work(cc->io_queue, &io->work);
 }
 
-static void kcryptd_crypt_write_io_submit(struct dm_crypt_io *io,
-                                          int error, int async)
+static void kcryptd_crypt_write_io_submit(struct dm_crypt_io *io, int async)
 {
         struct bio *clone = io->ctx.bio_out;
         struct crypt_config *cc = io->target->private;
 
-        if (unlikely(error < 0)) {
+        if (unlikely(io->error < 0)) {
                 crypt_free_buffer_pages(cc, clone);
                 bio_put(clone);
-                io->error = -EIO;
                 crypt_dec_pending(io);
                 return;
         }
@@ -1106,12 +1102,16 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io)
                 sector += bio_sectors(clone);
 
                 crypt_inc_pending(io);
+
                 r = crypt_convert(cc, &io->ctx);
+                if (r < 0)
+                        io->error = -EIO;
+
                 crypt_finished = atomic_dec_and_test(&io->ctx.pending);
 
                 /* Encryption was already finished, submit io now */
                 if (crypt_finished) {
-                        kcryptd_crypt_write_io_submit(io, r, 0);
+                        kcryptd_crypt_write_io_submit(io, 0);
 
                         /*
                          * If there was an error, do not try next fragments.
@@ -1162,11 +1162,8 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io)
         crypt_dec_pending(io);
 }
 
-static void kcryptd_crypt_read_done(struct dm_crypt_io *io, int error)
+static void kcryptd_crypt_read_done(struct dm_crypt_io *io)
 {
-        if (unlikely(error < 0))
-                io->error = -EIO;
-
         crypt_dec_pending(io);
 }
 
@@ -1181,9 +1178,11 @@ static void kcryptd_crypt_read_convert(struct dm_crypt_io *io)
                            io->sector);
 
         r = crypt_convert(cc, &io->ctx);
+        if (r < 0)
+                io->error = -EIO;
 
         if (atomic_dec_and_test(&io->ctx.pending))
-                kcryptd_crypt_read_done(io, r);
+                kcryptd_crypt_read_done(io);
 
         crypt_dec_pending(io);
 }
@@ -1204,15 +1203,18 @@ static void kcryptd_async_done(struct crypto_async_request *async_req,
         if (!error && cc->iv_gen_ops && cc->iv_gen_ops->post)
                 error = cc->iv_gen_ops->post(cc, iv_of_dmreq(cc, dmreq), dmreq);
 
+        if (error < 0)
+                io->error = -EIO;
+
         mempool_free(req_of_dmreq(cc, dmreq), cc->req_pool);
 
         if (!atomic_dec_and_test(&ctx->pending))
                 return;
 
         if (bio_data_dir(io->base_bio) == READ)
-                kcryptd_crypt_read_done(io, error);
+                kcryptd_crypt_read_done(io);
         else
-                kcryptd_crypt_write_io_submit(io, error, 1);
+                kcryptd_crypt_write_io_submit(io, 1);
 }
 
 static void kcryptd_crypt(struct work_struct *work)
@@ -1413,6 +1415,7 @@ static int crypt_ctr_cipher(struct dm_target *ti,
         char *tmp, *cipher, *chainmode, *ivmode, *ivopts, *keycount;
         char *cipher_api = NULL;
         int cpu, ret = -EINVAL;
+        char dummy;
 
         /* Convert to crypto api definition? */
         if (strchr(cipher_in, '(')) {
@@ -1434,7 +1437,7 @@ static int crypt_ctr_cipher(struct dm_target *ti,
 
         if (!keycount)
                 cc->tfms_count = 1;
-        else if (sscanf(keycount, "%u", &cc->tfms_count) != 1 ||
+        else if (sscanf(keycount, "%u%c", &cc->tfms_count, &dummy) != 1 ||
                  !is_power_of_2(cc->tfms_count)) {
                 ti->error = "Bad cipher key count specification";
                 return -EINVAL;
@@ -1579,6 +1582,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         int ret;
         struct dm_arg_set as;
         const char *opt_string;
+        char dummy;
 
         static struct dm_arg _args[] = {
                 {0, 1, "Invalid number of feature args"},
@@ -1636,7 +1640,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         }
 
         ret = -EINVAL;
-        if (sscanf(argv[2], "%llu", &tmpll) != 1) {
+        if (sscanf(argv[2], "%llu%c", &tmpll, &dummy) != 1) {
                 ti->error = "Invalid iv_offset sector";
                 goto bad;
         }
@@ -1647,7 +1651,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 goto bad;
         }
 
-        if (sscanf(argv[4], "%llu", &tmpll) != 1) {
+        if (sscanf(argv[4], "%llu%c", &tmpll, &dummy) != 1) {
                 ti->error = "Invalid device sector";
                 goto bad;
         }