Add a new ioctl, FS_IOC_GETPICAP, to query protection info (PI) capabilities. This ioctl returns information about the files integrity profile. This is useful for userspace applications to understand a files end-to-end data protection support and configure the I/O accordingly. For now this interface is only supported by block devices. However the design and placement of this ioctl in generic FS ioctl space allows us to extend it to work over files as well. This maybe useful when filesystems start supporting PI-aware layouts. A new structure struct fs_pi_cap is introduced, which contains the following fields: 1. flags: Bitmask of capability flags. 2. interval: the data block interval (in bytes) for which the protection information is generated. 3. csum type: type of checksum used. 4. tuple_size: size (in bytes) of the protection information tuple. 5. tag_size: size (in bytes) of tag information. 6. pi_offset: offset of protection info within the tuple. 7. rsvd: reserved for future use. The internal logic to fetch the capability is encapsulated in a helper function blk_get_pi_cap(), which uses the blk_integrity profile associated with the device. The ioctl returns -EOPNOTSUPP, if CONFIG_BLK_DEV_INTEGRITY is not enabled. Signed-off-by: Anuj Gupta <anuj20.g@xxxxxxxxxxx> Signed-off-by: Kanchan Joshi <joshi.k@xxxxxxxxxxx> --- block/blk-integrity.c | 24 ++++++++++++++++++++++++ block/ioctl.c | 3 +++ include/linux/blk-integrity.h | 6 ++++++ include/uapi/linux/fs.h | 25 +++++++++++++++++++++++++ 4 files changed, 58 insertions(+) diff --git a/block/blk-integrity.c b/block/blk-integrity.c index a1678f0a9f81..81c25b7ec1eb 100644 --- a/block/blk-integrity.c +++ b/block/blk-integrity.c @@ -54,6 +54,30 @@ int blk_rq_count_integrity_sg(struct request_queue *q, struct bio *bio) return segments; } +int blk_get_pi_cap(struct block_device *bdev, struct fs_pi_cap __user *argp) +{ + struct blk_integrity *bi = blk_get_integrity(bdev->bd_disk); + struct fs_pi_cap pi_cap = {}; + + if (!bi) + goto out; + + if (bi->flags & BLK_INTEGRITY_DEVICE_CAPABLE) + pi_cap.flags |= FILE_PI_CAP_INTEGRITY; + if (bi->flags & BLK_INTEGRITY_REF_TAG) + pi_cap.flags |= FILE_PI_CAP_REFTAG; + pi_cap.csum_type = bi->csum_type; + pi_cap.tuple_size = bi->tuple_size; + pi_cap.tag_size = bi->tag_size; + pi_cap.interval = 1 << bi->interval_exp; + pi_cap.pi_offset = bi->pi_offset; + +out: + if (copy_to_user(argp, &pi_cap, sizeof(struct fs_pi_cap))) + return -EFAULT; + return 0; +} + /** * blk_rq_map_integrity_sg - Map integrity metadata into a scatterlist * @rq: request to map diff --git a/block/ioctl.c b/block/ioctl.c index e472cc1030c6..53b35bf3e6fa 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -13,6 +13,7 @@ #include <linux/uaccess.h> #include <linux/pagemap.h> #include <linux/io_uring/cmd.h> +#include <linux/blk-integrity.h> #include <uapi/linux/blkdev.h> #include "blk.h" #include "blk-crypto-internal.h" @@ -643,6 +644,8 @@ static int blkdev_common_ioctl(struct block_device *bdev, blk_mode_t mode, return blkdev_pr_preempt(bdev, mode, argp, true); case IOC_PR_CLEAR: return blkdev_pr_clear(bdev, mode, argp); + case FS_IOC_GETPICAP: + return blk_get_pi_cap(bdev, argp); default: return -ENOIOCTLCMD; } diff --git a/include/linux/blk-integrity.h b/include/linux/blk-integrity.h index c7eae0bfb013..6118a0c28605 100644 --- a/include/linux/blk-integrity.h +++ b/include/linux/blk-integrity.h @@ -29,6 +29,7 @@ int blk_rq_map_integrity_sg(struct request *, struct scatterlist *); int blk_rq_count_integrity_sg(struct request_queue *, struct bio *); int blk_rq_integrity_map_user(struct request *rq, void __user *ubuf, ssize_t bytes); +int blk_get_pi_cap(struct block_device *bdev, struct fs_pi_cap __user *argp); static inline bool blk_integrity_queue_supports_integrity(struct request_queue *q) @@ -92,6 +93,11 @@ static inline struct bio_vec rq_integrity_vec(struct request *rq) rq->bio->bi_integrity->bip_iter); } #else /* CONFIG_BLK_DEV_INTEGRITY */ +static inline int blk_get_pi_cap(struct block_device *bdev, + struct fs_pi_cap __user *argp) +{ + return -EOPNOTSUPP; +} static inline int blk_rq_count_integrity_sg(struct request_queue *q, struct bio *b) { diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h index e762e1af650c..32383efca896 100644 --- a/include/uapi/linux/fs.h +++ b/include/uapi/linux/fs.h @@ -91,6 +91,29 @@ struct fs_sysfs_path { __u8 name[128]; }; +#define FILE_PI_CAP_INTEGRITY (1 << 0) +#define FILE_PI_CAP_REFTAG (1 << 1) + +/* + * struct fs_pi_cap - protection information(PI) capability descriptor + * @flags: Bitmask of capability flags + * @interval: Number of bytes of data per PI tuple + * @csum_type: Checksum type + * @tuple_size: Size in bytes of the PI tuple + * @tag_size: Size of the tag area within the tuple + * @pi_offset: Offset in bytes of the PI metadata within the tuple + * @rsvd: Reserved for future use + */ +struct fs_pi_cap { + __u32 flags; + __u16 interval; + __u8 csum_type; + __u8 tuple_size; + __u8 tag_size; + __u8 pi_offset; + __u8 rsvd[6]; +}; + /* extent-same (dedupe) ioctls; these MUST match the btrfs ioctl definitions */ #define FILE_DEDUPE_RANGE_SAME 0 #define FILE_DEDUPE_RANGE_DIFFERS 1 @@ -247,6 +270,8 @@ struct fsxattr { * also /sys/kernel/debug/ for filesystems with debugfs exports */ #define FS_IOC_GETFSSYSFSPATH _IOR(0x15, 1, struct fs_sysfs_path) +/* Get protection info capability details */ +#define FS_IOC_GETPICAP _IOR('f', 3, struct fs_pi_cap) /* * Inode flags (FS_IOC_GETFLAGS / FS_IOC_SETFLAGS) -- 2.25.1