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

Pull device mapper updates from Mike Snitzer:

 - Improve DM snapshot target's scalability by using finer grained
   locking. Requires some list_bl interface improvements.

 - Add ability for DM integrity to use a bitmap mode, that tracks
   regions where data and metadata are out of sync, instead of using a
   journal.

 - Improve DM thin provisioning target to not write metadata changes to
   disk if the thin-pool and associated thin devices are merely
   activated but not used. This avoids metadata corruption due to
   concurrent activation of thin devices across different OS instances
   (e.g. split brain scenarios, which ultimately would be avoided if
   proper device filters were used -- but not having proper filtering
   has proven a very common configuration mistake)

 - Fix missing call to path selector type->end_io in DM multipath. This
   fixes reported performance problems due to inaccurate path selector
   IO accounting causing an imbalance of IO (e.g. avoiding issuing IO to
   particular path due to it seemingly being heavily used).

 - Fix bug in DM cache metadata's loading of its discard bitset that
   could lead to all cache blocks being discarded if the very first
   cache block was discarded (thankfully in practice the first cache
   block is generally in use; be it FS superblock, partition table, disk
   label, etc).

 - Add testing-only DM dust target which simulates a device that has
   failing sectors and/or read failures.

 - Fix a DM init error path reference count hang that caused boot hangs
   if user supplied malformed input on kernel commandline.

 - Fix a couple issues with DM crypt target's logging being overly
   verbose or lacking context.

 - Various other small fixes to DM init, DM multipath, DM zoned, and DM
   crypt.

* tag 'for-5.2/dm-changes-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: (42 commits)
  dm: fix a couple brace coding style issues
  dm crypt: print device name in integrity error message
  dm crypt: move detailed message into debug level
  dm ioctl: fix hang in early create error condition
  dm integrity: whitespace, coding style and dead code cleanup
  dm integrity: implement synchronous mode for reboot handling
  dm integrity: handle machine reboot in bitmap mode
  dm integrity: add a bitmap mode
  dm integrity: introduce a function add_new_range_and_wait()
  dm integrity: allow large ranges to be described
  dm ingerity: pass size to dm_integrity_alloc_page_list()
  dm integrity: introduce rw_journal_sectors()
  dm integrity: update documentation
  dm integrity: don't report unused options
  dm integrity: don't check null pointer before kvfree and vfree
  dm integrity: correctly calculate the size of metadata area
  dm dust: Make dm_dust_init and dm_dust_exit static
  dm dust: remove redundant unsigned comparison to less than zero
  dm mpath: always free attached_handler_name in parse_path()
  dm init: fix max devices/targets checks
  ...

1 files changed, 15 insertions, 11 deletions

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 7f6462f74ac8..1b16d34bb785 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -946,6 +946,7 @@ static int crypt_integrity_ctr(struct crypt_config *cc, struct dm_target *ti)
 {
 #ifdef CONFIG_BLK_DEV_INTEGRITY
         struct blk_integrity *bi = blk_get_integrity(cc->dev->bdev->bd_disk);
+        struct mapped_device *md = dm_table_get_md(ti->table);
 
         /* From now we require underlying device with our integrity profile */
         if (!bi || strcasecmp(bi->profile->name, "DM-DIF-EXT-TAG")) {
@@ -965,7 +966,7 @@ static int crypt_integrity_ctr(struct crypt_config *cc, struct dm_target *ti)
 
         if (crypt_integrity_aead(cc)) {
                 cc->integrity_tag_size = cc->on_disk_tag_size - cc->integrity_iv_size;
-                DMINFO("Integrity AEAD, tag size %u, IV size %u.",
+                DMDEBUG("%s: Integrity AEAD, tag size %u, IV size %u.", dm_device_name(md),
                        cc->integrity_tag_size, cc->integrity_iv_size);
 
                 if (crypto_aead_setauthsize(any_tfm_aead(cc), cc->integrity_tag_size)) {
@@ -973,7 +974,7 @@ static int crypt_integrity_ctr(struct crypt_config *cc, struct dm_target *ti)
                         return -EINVAL;
                 }
         } else if (cc->integrity_iv_size)
-                DMINFO("Additional per-sector space %u bytes for IV.",
+                DMDEBUG("%s: Additional per-sector space %u bytes for IV.", dm_device_name(md),
                        cc->integrity_iv_size);
 
         if ((cc->integrity_tag_size + cc->integrity_iv_size) != bi->tag_size) {
@@ -1031,11 +1032,11 @@ static u8 *org_iv_of_dmreq(struct crypt_config *cc,
         return iv_of_dmreq(cc, dmreq) + cc->iv_size;
 }
 
-static uint64_t *org_sector_of_dmreq(struct crypt_config *cc,
+static __le64 *org_sector_of_dmreq(struct crypt_config *cc,
                        struct dm_crypt_request *dmreq)
 {
         u8 *ptr = iv_of_dmreq(cc, dmreq) + cc->iv_size + cc->iv_size;
-        return (uint64_t*) ptr;
+        return (__le64 *) ptr;
 }
 
 static unsigned int *org_tag_of_dmreq(struct crypt_config *cc,
@@ -1071,7 +1072,7 @@ static int crypt_convert_block_aead(struct crypt_config *cc,
         struct bio_vec bv_out = bio_iter_iovec(ctx->bio_out, ctx->iter_out);
         struct dm_crypt_request *dmreq;
         u8 *iv, *org_iv, *tag_iv, *tag;
-        uint64_t *sector;
+        __le64 *sector;
         int r = 0;
 
         BUG_ON(cc->integrity_iv_size && cc->integrity_iv_size != cc->iv_size);
@@ -1143,9 +1144,11 @@ static int crypt_convert_block_aead(struct crypt_config *cc,
                 r = crypto_aead_decrypt(req);
         }
 
-        if (r == -EBADMSG)
-                DMERR_LIMIT("INTEGRITY AEAD ERROR, sector %llu",
+        if (r == -EBADMSG) {
+                char b[BDEVNAME_SIZE];
+                DMERR_LIMIT("%s: INTEGRITY AEAD ERROR, sector %llu", bio_devname(ctx->bio_in, b),
                             (unsigned long long)le64_to_cpu(*sector));
+        }
 
         if (!r && cc->iv_gen_ops && cc->iv_gen_ops->post)
                 r = cc->iv_gen_ops->post(cc, org_iv, dmreq);
@@ -1166,7 +1169,7 @@ static int crypt_convert_block_skcipher(struct crypt_config *cc,
         struct scatterlist *sg_in, *sg_out;
         struct dm_crypt_request *dmreq;
         u8 *iv, *org_iv, *tag_iv;
-        uint64_t *sector;
+        __le64 *sector;
         int r = 0;
 
         /* Reject unexpected unaligned bio. */
@@ -1788,7 +1791,8 @@ static void kcryptd_async_done(struct crypto_async_request *async_req,
                 error = cc->iv_gen_ops->post(cc, org_iv_of_dmreq(cc, dmreq), dmreq);
 
         if (error == -EBADMSG) {
-                DMERR_LIMIT("INTEGRITY AEAD ERROR, sector %llu",
+                char b[BDEVNAME_SIZE];
+                DMERR_LIMIT("%s: INTEGRITY AEAD ERROR, sector %llu", bio_devname(ctx->bio_in, b),
                             (unsigned long long)le64_to_cpu(*org_sector_of_dmreq(cc, dmreq)));
                 io->error = BLK_STS_PROTECTION;
         } else if (error < 0)
@@ -1887,7 +1891,7 @@ static int crypt_alloc_tfms_skcipher(struct crypt_config *cc, char *ciphermode)
          * algorithm implementation is used.  Help people debug performance
          * problems by logging the ->cra_driver_name.
          */
-        DMINFO("%s using implementation \"%s\"", ciphermode,
+        DMDEBUG_LIMIT("%s using implementation \"%s\"", ciphermode,
                crypto_skcipher_alg(any_tfm(cc))->base.cra_driver_name);
         return 0;
 }
@@ -1907,7 +1911,7 @@ static int crypt_alloc_tfms_aead(struct crypt_config *cc, char *ciphermode)
                 return err;
         }
 
-        DMINFO("%s using implementation \"%s\"", ciphermode,
+        DMDEBUG_LIMIT("%s using implementation \"%s\"", ciphermode,
                crypto_aead_alg(any_tfm_aead(cc))->base.cra_driver_name);
         return 0;
 }