Commit 2c0487d8 authored by Anuj Gupta's avatar Anuj Gupta Committed by Jens Axboe
Browse files

block: introduce BIP_CHECK_GUARD/REFTAG/APPTAG bip_flags 



This patch introduces BIP_CHECK_GUARD/REFTAG/APPTAG bip_flags which
indicate how the hardware should check the integrity payload.
BIP_CHECK_GUARD/REFTAG are conversion of existing semantics, while
BIP_CHECK_APPTAG is a new flag. The driver can now just rely on block
layer flags, and doesn't need to know the integrity source. Submitter
of PI decides which tags to check. This would also give us a unified
interface for user and kernel generated integrity.

Signed-off-by: default avatarAnuj Gupta <anuj20.g@samsung.com>
Signed-off-by: default avatarKanchan Joshi <joshi.k@samsung.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Link: https://lore.kernel.org/r/20241128112240.8867-8-anuj20.g@samsung.com


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

block/bio-integrity.c

+5 −0
Original line number Diff line number Diff line
@@ -434,6 +434,11 @@ bool bio_integrity_prep(struct bio *bio) 
	if (bi->csum_type == BLK_INTEGRITY_CSUM_IP)

		bip->bip_flags |= BIP_IP_CHECKSUM;



	/* describe what tags to check in payload */

	if (bi->csum_type)

		bip->bip_flags |= BIP_CHECK_GUARD;

	if (bi->flags & BLK_INTEGRITY_REF_TAG)

		bip->bip_flags |= BIP_CHECK_REFTAG;

	if (bio_integrity_add_page(bio, virt_to_page(buf), len,

			offset_in_page(buf)) < len) {

		printk(KERN_ERR "could not attach integrity payload\n");

drivers/nvme/host/core.c

+3 −8
Original line number Diff line number Diff line
@@ -1017,18 +1017,13 @@ static inline blk_status_t nvme_setup_rw(struct nvme_ns *ns, 
			control |= NVME_RW_PRINFO_PRACT;

		}



		switch (ns->head->pi_type) {

		case NVME_NS_DPS_PI_TYPE3:

		if (bio_integrity_flagged(req->bio, BIP_CHECK_GUARD))

			control |= NVME_RW_PRINFO_PRCHK_GUARD;

			break;

		case NVME_NS_DPS_PI_TYPE1:

		case NVME_NS_DPS_PI_TYPE2:

			control |= NVME_RW_PRINFO_PRCHK_GUARD |

					NVME_RW_PRINFO_PRCHK_REF;

		if (bio_integrity_flagged(req->bio, BIP_CHECK_REFTAG)) {

			control |= NVME_RW_PRINFO_PRCHK_REF;

			if (op == nvme_cmd_zone_append)

				control |= NVME_RW_APPEND_PIREMAP;

			nvme_set_ref_tag(ns, cmnd, req);

			break;

		}

	}

include/linux/bio-integrity.h

+5 −1
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ enum bip_flags { 
	BIP_DISK_NOCHECK	= 1 << 3, /* disable disk integrity checking */

	BIP_IP_CHECKSUM		= 1 << 4, /* IP checksum */

	BIP_COPY_USER		= 1 << 5, /* Kernel bounce buffer in use */

	BIP_CHECK_GUARD		= 1 << 6, /* guard check */

	BIP_CHECK_REFTAG	= 1 << 7, /* reftag check */

	BIP_CHECK_APPTAG	= 1 << 8, /* apptag check */

};



struct bio_integrity_payload {
@@ -31,7 +34,8 @@ struct bio_integrity_payload { 
};



#define BIP_CLONE_FLAGS (BIP_MAPPED_INTEGRITY | BIP_CTRL_NOCHECK | \

			 BIP_DISK_NOCHECK | BIP_IP_CHECKSUM)

			 BIP_DISK_NOCHECK | BIP_IP_CHECKSUM | \

			 BIP_CHECK_GUARD | BIP_CHECK_REFTAG | BIP_CHECK_APPTAG)



#ifdef CONFIG_BLK_DEV_INTEGRITY