lustre/kernel_patches/patches/block-bio-integrity-Advance-seed-correctly-for-large.patch

   1 From b13e0c71856817fca67159b11abac350e41289f5 Mon Sep 17 00:00:00 2001
   2 From: "Martin K. Petersen" <martin.petersen@oracle.com>
   3 Date: Thu, 3 Feb 2022 22:42:09 -0500
   4 Subject: [PATCH] block: bio-integrity: Advance seed correctly for larger
   5  interval sizes
   6
   7 Commit 309a62fa3a9e ("bio-integrity: bio_integrity_advance must update
   8 integrity seed") added code to update the integrity seed value when
   9 advancing a bio. However, it failed to take into account that the
  10 integrity interval might be larger than the 512-byte block layer
  11 sector size. This broke bio splitting on PI devices with 4KB logical
  12 blocks.
  13
  14 The seed value should be advanced by bio_integrity_intervals() and not
  15 the number of sectors.
  16
  17 Cc: Dmitry Monakhov <dmonakhov@openvz.org>
  18 Cc: stable@vger.kernel.org
  19 Fixes: 309a62fa3a9e ("bio-integrity: bio_integrity_advance must update integrity seed")
  20 Tested-by: Dmitry Ivanov <dmitry.ivanov2@hpe.com>
  21 Reported-by: Alexey Lyashkov <alexey.lyashkov@hpe.com>
  22 Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
  23 Link: https://lore.kernel.org/r/20220204034209.4193-1-martin.petersen@oracle.com
  24 Signed-off-by: Jens Axboe <axboe@kernel.dk>
  25 ---
  26  block/bio-integrity.c | 2 +-
  27  1 file changed, 1 insertion(+), 1 deletion(-)
  28
  29 diff --git a/block/bio-integrity.c b/block/bio-integrity.c
  30 index d25114715459..0827b19820c5 100644
  31 --- a/block/bio-integrity.c
  32 +++ b/block/bio-integrity.c
  33 @@ -373,7 +373,7 @@ void bio_integrity_advance(struct bio *bio, unsigned int bytes_done)
  34         struct blk_integrity *bi = blk_get_integrity(bio->bi_bdev->bd_disk);
  35         unsigned bytes = bio_integrity_bytes(bi, bytes_done >> 9);
  36
  37 -       bip->bip_iter.bi_sector += bytes_done >> 9;
  38 +       bip->bip_iter.bi_sector += bio_integrity_intervals(bi, bytes_done >> 9);
  39         bvec_iter_advance(bip->bip_vec, &bip->bip_iter, bytes);
  40  }
  41
  42 --
  43 2.39.0
  44