Commit 7f75285c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.12/dm-fixes-3' of... 

Merge tag 'for-5.12/dm-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

Pull device mapper fix from Mike Snitzer:
 "Fix DM verity target FEC support's RS roots IO to always be aligned.

  This fixes a previous stable@ fix that overcorrected for a different
  configuration that also resulted in misaligned roots IO"

* tag 'for-5.12/dm-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm verity fec: fix misaligned RS roots IO
parents 8e2e0104 8ca7cab8

drivers/md/dm-verity-fec.c

+8 −3
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static u8 *fec_read_parity(struct dm_verity *v, u64 rsb, int index, 
	u8 *res;



	position = (index + rsb) * v->fec->roots;

	block = div64_u64_rem(position, v->fec->roots << SECTOR_SHIFT, &rem);

	block = div64_u64_rem(position, v->fec->io_size, &rem);

	*offset = (unsigned)rem;



	res = dm_bufio_read(v->fec->bufio, block, buf);
@@ -154,7 +154,7 @@ static int fec_decode_bufs(struct dm_verity *v, struct dm_verity_fec_io *fio, 


		/* read the next block when we run out of parity bytes */

		offset += v->fec->roots;

		if (offset >= v->fec->roots << SECTOR_SHIFT) {

		if (offset >= v->fec->io_size) {

			dm_bufio_release(buf);



			par = fec_read_parity(v, rsb, block_offset, &offset, &buf);
@@ -742,8 +742,13 @@ int verity_fec_ctr(struct dm_verity *v) 
		return -E2BIG;

	}



	if ((f->roots << SECTOR_SHIFT) & ((1 << v->data_dev_block_bits) - 1))

		f->io_size = 1 << v->data_dev_block_bits;

	else

		f->io_size = v->fec->roots << SECTOR_SHIFT;



	f->bufio = dm_bufio_client_create(f->dev->bdev,

					  f->roots << SECTOR_SHIFT,

					  f->io_size,

					  1, 0, NULL, NULL);

	if (IS_ERR(f->bufio)) {

		ti->error = "Cannot initialize FEC bufio client";

drivers/md/dm-verity-fec.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ struct dm_verity_fec { 
	struct dm_dev *dev;	/* parity data device */

	struct dm_bufio_client *data_bufio;	/* for data dev access */

	struct dm_bufio_client *bufio;		/* for parity data access */

	size_t io_size;		/* IO size for roots */

	sector_t start;		/* parity data start in blocks */

	sector_t blocks;	/* number of blocks covered */

	sector_t rounds;	/* number of interleaving rounds */