Commit d19b4634 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove bio_integrity_process 



Move the bvec interation into the generate/verify helpers to avoid a bit
of argument passing churn.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20240626045950.189758-6-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent df3c485e

block/bio-integrity.c

+2 −45
Original line number Diff line number Diff line
@@ -374,44 +374,6 @@ int bio_integrity_map_user(struct bio *bio, void __user *ubuf, ssize_t bytes, 
}

EXPORT_SYMBOL_GPL(bio_integrity_map_user);



/**

 * bio_integrity_process - Process integrity metadata for a bio

 * @bio:	bio to generate/verify integrity metadata for

 * @proc_iter:  iterator to process

 */

static blk_status_t bio_integrity_process(struct bio *bio,

		struct bvec_iter *proc_iter)

{

	struct blk_integrity *bi = blk_get_integrity(bio->bi_bdev->bd_disk);

	struct blk_integrity_iter iter;

	struct bvec_iter bviter;

	struct bio_vec bv;

	struct bio_integrity_payload *bip = bio_integrity(bio);

	blk_status_t ret = BLK_STS_OK;



	iter.disk_name = bio->bi_bdev->bd_disk->disk_name;

	iter.interval = 1 << bi->interval_exp;

	iter.seed = proc_iter->bi_sector;

	iter.prot_buf = bvec_virt(bip->bip_vec);



	__bio_for_each_segment(bv, bio, bviter, *proc_iter) {

		void *kaddr = bvec_kmap_local(&bv);



		iter.data_buf = kaddr;

		iter.data_size = bv.bv_len;

		if (bio_data_dir(bio) == WRITE)

			blk_integrity_generate(&iter, bi);

		else

			ret = blk_integrity_verify(&iter, bi);

		kunmap_local(kaddr);



		if (ret)

			break;



	}

	return ret;

}



/**

 * bio_integrity_prep - Prepare bio for integrity I/O

 * @bio:	bio to prepare
@@ -490,7 +452,7 @@ bool bio_integrity_prep(struct bio *bio) 


	/* Auto-generate integrity metadata if this is a write */

	if (bio_data_dir(bio) == WRITE)

		bio_integrity_process(bio, &bio->bi_iter);

		blk_integrity_generate(bio);

	else

		bip->bio_iter = bio->bi_iter;

	return true;
@@ -516,12 +478,7 @@ static void bio_integrity_verify_fn(struct work_struct *work) 
		container_of(work, struct bio_integrity_payload, bip_work);

	struct bio *bio = bip->bip_bio;



	/*

	 * At the moment verify is called bio's iterator was advanced

	 * during split and completion, we need to rewind iterator to

	 * it's original position.

	 */

	bio->bi_status = bio_integrity_process(bio, &bip->bio_iter);

	blk_integrity_verify(bio);

	bio_integrity_free(bio);

	bio_endio(bio);

}

block/blk.h

+2 −5
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <xen/xen.h>

#include "blk-crypto-internal.h"



struct blk_integrity_iter;

struct elevator_type;



/* Max future timer expiry for timeouts */
@@ -681,10 +680,8 @@ int bdev_open(struct block_device *bdev, blk_mode_t mode, void *holder, 
	      const struct blk_holder_ops *hops, struct file *bdev_file);

int bdev_permission(dev_t dev, blk_mode_t mode, void *holder);



void blk_integrity_generate(struct blk_integrity_iter *iter,

		struct blk_integrity *bi);

blk_status_t blk_integrity_verify(struct blk_integrity_iter *iter,

		struct blk_integrity *bi);

void blk_integrity_generate(struct bio *bio);

void blk_integrity_verify(struct bio *bio);

void blk_integrity_prepare(struct request *rq);

void blk_integrity_complete(struct request *rq, unsigned int nr_bytes);

block/t10-pi.c

+75 −22
Original line number Diff line number Diff line
@@ -13,6 +13,15 @@ 
#include <asm/unaligned.h>

#include "blk.h"



struct blk_integrity_iter {

	void			*prot_buf;

	void			*data_buf;

	sector_t		seed;

	unsigned int		data_size;

	unsigned short		interval;

	const char		*disk_name;

};



static __be16 t10_pi_csum(__be16 csum, void *data, unsigned int len,

		unsigned char csum_type)

{
@@ -364,33 +373,77 @@ static void ext_pi_type1_complete(struct request *rq, unsigned int nr_bytes) 
	}

}



void blk_integrity_generate(struct blk_integrity_iter *iter,

		struct blk_integrity *bi)

void blk_integrity_generate(struct bio *bio)

{

	struct blk_integrity *bi = blk_get_integrity(bio->bi_bdev->bd_disk);

	struct bio_integrity_payload *bip = bio_integrity(bio);

	struct blk_integrity_iter iter;

	struct bvec_iter bviter;

	struct bio_vec bv;



	iter.disk_name = bio->bi_bdev->bd_disk->disk_name;

	iter.interval = 1 << bi->interval_exp;

	iter.seed = bio->bi_iter.bi_sector;

	iter.prot_buf = bvec_virt(bip->bip_vec);

	bio_for_each_segment(bv, bio, bviter) {

		void *kaddr = bvec_kmap_local(&bv);



		iter.data_buf = kaddr;

		iter.data_size = bv.bv_len;

		switch (bi->csum_type) {

		case BLK_INTEGRITY_CSUM_CRC64:

		ext_pi_crc64_generate(iter, bi);

			ext_pi_crc64_generate(&iter, bi);

			break;

		case BLK_INTEGRITY_CSUM_CRC:

		case BLK_INTEGRITY_CSUM_IP:

		t10_pi_generate(iter, bi);

			t10_pi_generate(&iter, bi);

			break;

		default:

			break;

		}

		kunmap_local(kaddr);

	}

}



blk_status_t blk_integrity_verify(struct blk_integrity_iter *iter,

		struct blk_integrity *bi)

void blk_integrity_verify(struct bio *bio)

{

	struct blk_integrity *bi = blk_get_integrity(bio->bi_bdev->bd_disk);

	struct bio_integrity_payload *bip = bio_integrity(bio);

	struct blk_integrity_iter iter;

	struct bvec_iter bviter;

	struct bio_vec bv;



	/*

	 * At the moment verify is called bi_iter has been advanced during split

	 * and completion, so use the copy created during submission here.

	 */

	iter.disk_name = bio->bi_bdev->bd_disk->disk_name;

	iter.interval = 1 << bi->interval_exp;

	iter.seed = bip->bio_iter.bi_sector;

	iter.prot_buf = bvec_virt(bip->bip_vec);

	__bio_for_each_segment(bv, bio, bviter, bip->bio_iter) {

		void *kaddr = bvec_kmap_local(&bv);

		blk_status_t ret = BLK_STS_OK;



		iter.data_buf = kaddr;

		iter.data_size = bv.bv_len;

		switch (bi->csum_type) {

		case BLK_INTEGRITY_CSUM_CRC64:

		return ext_pi_crc64_verify(iter, bi);

			ret = ext_pi_crc64_verify(&iter, bi);

			break;

		case BLK_INTEGRITY_CSUM_CRC:

		case BLK_INTEGRITY_CSUM_IP:

		return t10_pi_verify(iter, bi);

			ret = t10_pi_verify(&iter, bi);

			break;

		default:

		return BLK_STS_OK;

			break;

		}

		kunmap_local(kaddr);



		if (ret) {

			bio->bi_status = ret;

			return;

		}

	}

}

include/linux/blk-integrity.h

+0 −9
Original line number Diff line number Diff line
@@ -14,15 +14,6 @@ enum blk_integrity_flags { 
	BLK_INTEGRITY_STACKED		= 1 << 4,

};



struct blk_integrity_iter {

	void			*prot_buf;

	void			*data_buf;

	sector_t		seed;

	unsigned int		data_size;

	unsigned short		interval;

	const char		*disk_name;

};



const char *blk_integrity_profile_name(struct blk_integrity *bi);

bool queue_limits_stack_integrity(struct queue_limits *t,

		struct queue_limits *b);