[PATCH 11/12] block: invert the BLK_INTEGRITY_{GENERATE,VERIFY} flags

Christoph Hellwig
2024-06-05T06:31:14Z

Invert the flags so that user set values will be able to persist
revalidating the integrity information once we switch the integrity
information to queue_limits.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/bio-integrity.c | 4 ++--
block/blk-integrity.c | 19 ++++++++++---------
include/linux/blk-integrity.h | 4 ++--
3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 5966a65edcd10e..3d6f6a63888f2e 100644
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -450,10 +450,10 @@ bool bio_integrity_prep(struct bio *bio)
return true;

if (bio_data_dir(bio) == READ) {
- if (!(bi->flags & BLK_INTEGRITY_VERIFY))
+ if (bi->flags & BLK_INTEGRITY_NOVERIFY)
return true;
} else {
- if (!(bi->flags & BLK_INTEGRITY_GENERATE))
+ if (bi->flags & BLK_INTEGRITY_NOGENERATE)
return true;
}

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index fbb0bd467eedbf..9a126c8d08f1d8 100644
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -255,10 +255,11 @@ static ssize_t flag_store(struct device *dev, struct device_attribute *attr,
if (err)
return err;

+ /* the flags are inverted vs the values in the sysfs files */
if (val)
- bi->flags |= flag;
- else
bi->flags &= ~flag;
+ else
+ bi->flags |= flag;
return count;
}

@@ -267,7 +268,9 @@ static ssize_t flag_show(struct device *dev, struct device_attribute *attr,
{
struct blk_integrity *bi = dev_to_bi(dev);

- return sysfs_emit(page, "%d\n", !!(bi->flags & flag));
+ return sysfs_emit(page, "%d\n",
+ (bi->csum_type != BLK_INTEGRITY_CSUM_NONE &&
+ !(bi->flags & flag)));
}

static ssize_t format_show(struct device *dev, struct device_attribute *attr,
@@ -302,26 +305,26 @@ static ssize_t read_verify_store(struct device *dev,
struct device_attribute *attr,
const char *page, size_t count)
{
- return flag_store(dev, attr, page, count, BLK_INTEGRITY_VERIFY);
+ return flag_store(dev, attr, page, count, BLK_INTEGRITY_NOVERIFY);
}

static ssize_t read_verify_show(struct device *dev,
struct device_attribute *attr, char *page)
{
- return flag_show(dev, attr, page, BLK_INTEGRITY_VERIFY);
+ return flag_show(dev, attr, page, BLK_INTEGRITY_NOVERIFY);
}

static ssize_t write_generate_store(struct device *dev,
struct device_attribute *attr,
const char *page, size_t count)
{
- return flag_store(dev, attr, page, count, BLK_INTEGRITY_GENERATE);
+ return flag_store(dev, attr, page, count, BLK_INTEGRITY_NOGENERATE);
}

static ssize_t write_generate_show(struct device *dev,
struct device_attribute *attr, char *page)
{
- return flag_show(dev, attr, page, BLK_INTEGRITY_GENERATE);
+ return flag_show(dev, attr, page, BLK_INTEGRITY_NOGENERATE);
}

static ssize_t device_is_integrity_capable_show(struct device *dev,
@@ -373,8 +376,6 @@ void blk_integrity_register(struct gendisk *disk, struct blk_integrity *template

bi->csum_type = template->csum_type;
bi->flags = template->flags;
- if (bi->csum_type != BLK_INTEGRITY_CSUM_NONE)
- bi->flags |= BLK_INTEGRITY_VERIFY | BLK_INTEGRITY_GENERATE;
bi->interval_exp = template->interval_exp ? :
ilog2(queue_logical_block_size(disk->queue));
bi->tuple_size = template->tuple_size;
diff --git a/include/linux/blk-integrity.h b/include/linux/blk-integrity.h
index dea0fdebc3bdc7..a4bf2c78776c06 100644
--- a/include/linux/blk-integrity.h
+++ b/include/linux/blk-integrity.h
@@ -7,8 +7,8 @@
struct request;

enum blk_integrity_flags {
- BLK_INTEGRITY_VERIFY = 1 << 0,
- BLK_INTEGRITY_GENERATE = 1 << 1,
+ BLK_INTEGRITY_NOVERIFY = 1 << 0,
+ BLK_INTEGRITY_NOGENERATE = 1 << 1,
BLK_INTEGRITY_DEVICE_CAPABLE = 1 << 2,
BLK_INTEGRITY_REF_TAG = 1 << 3,
};
--
2.43.0