Commit abd792f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dm-6.7/dm-fixes-2' of... 

Merge tag 'dm-6.7/dm-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

Pull device mapper fixes from Mike Snitzer:

 - Fix DM verity target's FEC support to always initialize IO before it
   frees it. Also fix alignment of struct dm_verity_fec_io within the
   per-bio-data

 - Fix DM verity target to not FEC failed readahead IO

 - Update DM flakey target to use MAX_ORDER rather than MAX_ORDER - 1

* tag 'dm-6.7/dm-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm-flakey: start allocating with MAX_ORDER
  dm-verity: align struct dm_verity_fec_io properly
  dm verity: don't perform FEC for failed readahead IO
  dm verity: initialize fec io before freeing it
parents ff4a9f49 41e05548

drivers/md/dm-flakey.c

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ static struct bio *clone_bio(struct dm_target *ti, struct flakey_c *fc, struct b 


	remaining_size = size;



	order = MAX_ORDER - 1;

	order = MAX_ORDER;

	while (remaining_size) {

		struct page *pages;

		unsigned size_to_add, to_copy;

drivers/md/dm-verity-fec.c

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ bool verity_fec_is_enabled(struct dm_verity *v) 
 */

static inline struct dm_verity_fec_io *fec_io(struct dm_verity_io *io)

{

	return (struct dm_verity_fec_io *) verity_io_digest_end(io->v, io);

	return (struct dm_verity_fec_io *)

		((char *)io + io->v->ti->per_io_data_size - sizeof(struct dm_verity_fec_io));

}



/*

drivers/md/dm-verity-target.c

+5 −2
Original line number Diff line number Diff line
@@ -642,7 +642,6 @@ static void verity_work(struct work_struct *w) 


	io->in_tasklet = false;



	verity_fec_init_io(io);

	verity_finish_io(io, errno_to_blk_status(verity_verify_io(io)));

}
@@ -668,7 +667,9 @@ static void verity_end_io(struct bio *bio) 
	struct dm_verity_io *io = bio->bi_private;



	if (bio->bi_status &&

	    (!verity_fec_is_enabled(io->v) || verity_is_system_shutting_down())) {

	    (!verity_fec_is_enabled(io->v) ||

	     verity_is_system_shutting_down() ||

	     (bio->bi_opf & REQ_RAHEAD))) {

		verity_finish_io(io, bio->bi_status);

		return;

	}
@@ -792,6 +793,8 @@ static int verity_map(struct dm_target *ti, struct bio *bio) 
	bio->bi_private = io;

	io->iter = bio->bi_iter;



	verity_fec_init_io(io);



	verity_submit_prefetch(v, io);



	submit_bio_noacct(bio);

drivers/md/dm-verity.h

+0 −6
Original line number Diff line number Diff line
@@ -115,12 +115,6 @@ static inline u8 *verity_io_want_digest(struct dm_verity *v, 
	return (u8 *)(io + 1) + v->ahash_reqsize + v->digest_size;

}



static inline u8 *verity_io_digest_end(struct dm_verity *v,

				       struct dm_verity_io *io)

{

	return verity_io_want_digest(v, io) + v->digest_size;

}



extern int verity_for_bv_block(struct dm_verity *v, struct dm_verity_io *io,

			       struct bvec_iter *iter,

			       int (*process)(struct dm_verity *v,