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

Christoph Hellwig
2024-06-13T08:49:19Z

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>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
---
block/bio-integrity.c | 4 ++--
block/blk-integrity.c | 18 +++++++++---------
include/linux/blk-integrity.h | 4 ++--
3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 31dbc2853f92e3..173ffd4d623788 100644
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -448,10 +448,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 bec0d1df387ce9..b37b8855eed147 100644
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -254,10 +254,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;
}

@@ -266,7 +267,7 @@ 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->flags & flag));
}

static ssize_t format_show(struct device *dev, struct device_attribute *attr,
@@ -301,26 +302,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,
@@ -371,8 +372,7 @@ void blk_integrity_register(struct gendisk *disk, struct blk_integrity *template
struct blk_integrity *bi = &disk->queue->integrity;

bi->csum_type = template->csum_type;
- bi->flags = BLK_INTEGRITY_VERIFY | BLK_INTEGRITY_GENERATE |
- template->flags;
+ bi->flags = template->flags;
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 56ce1ae355805d..bafa01d4e7f95b 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