sd: Honor block layer integrity handling flags

A set of flags introduced in the block layer enable better control over
how protection information is handled. These flags are useful for both
error injection and data recovery purposes. Checking can be enabled and
disabled for controller and disk, and the guard tag format is now a
per-I/O property.

Update sd_protect_op to communicate the relevant information to the
low-level device driver via a set of flags in scsi_cmnd.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>

1 files changed, 24 insertions, 9 deletions

diff --git a/include/linux/bio.h b/include/linux/bio.h
index 14bff3fe56d4..ce6b75964b71 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -292,6 +292,14 @@ static inline unsigned bio_segments(struct bio *bio)
  */
 #define bio_get(bio)    atomic_inc(&(bio)->bi_cnt)
 
+enum bip_flags {
+        BIP_BLOCK_INTEGRITY     = 1 << 0, /* block layer owns integrity data */
+        BIP_MAPPED_INTEGRITY    = 1 << 1, /* ref tag has been remapped */
+        BIP_CTRL_NOCHECK        = 1 << 2, /* disable HBA integrity checking */
+        BIP_DISK_NOCHECK        = 1 << 3, /* disable disk integrity checking */
+        BIP_IP_CHECKSUM         = 1 << 4, /* IP checksum */
+};
+
 #if defined(CONFIG_BLK_DEV_INTEGRITY)
 
 static inline struct bio_integrity_payload *bio_integrity(struct bio *bio)
@@ -323,13 +331,15 @@ struct bio_integrity_payload {
         struct bio_vec          bip_inline_vecs[0];/* embedded bvec array */
 };
 
-enum bip_flags {
-        BIP_BLOCK_INTEGRITY     = 1 << 0, /* block layer owns integrity data */
-        BIP_MAPPED_INTEGRITY    = 1 << 1, /* ref tag has been remapped */
-        BIP_CTRL_NOCHECK        = 1 << 2, /* disable HBA integrity checking */
-        BIP_DISK_NOCHECK        = 1 << 3, /* disable disk integrity checking */
-        BIP_IP_CHECKSUM         = 1 << 4, /* IP checksum */
-};
+static inline bool bio_integrity_flagged(struct bio *bio, enum bip_flags flag)
+{
+        struct bio_integrity_payload *bip = bio_integrity(bio);
+
+        if (bip)
+                return bip->bip_flags & flag;
+
+        return false;
+}
 
 static inline sector_t bip_get_seed(struct bio_integrity_payload *bip)
 {
@@ -701,9 +711,9 @@ extern void bio_integrity_init(void);
 
 #else /* CONFIG_BLK_DEV_INTEGRITY */
 
-static inline int bio_integrity(struct bio *bio)
+static inline void *bio_integrity(struct bio *bio)
 {
-        return 0;
+        return NULL;
 }
 
 static inline bool bio_integrity_enabled(struct bio *bio)
@@ -754,6 +764,11 @@ static inline void bio_integrity_init(void)
         return;
 }
 
+static inline bool bio_integrity_flagged(struct bio *bio, enum bip_flags flag)
+{
+        return false;
+}
+
 #endif /* CONFIG_BLK_DEV_INTEGRITY */
 
 #endif /* CONFIG_BLOCK */