ublk: set UBLK_IO_F_INTEGRITY in ublksrv_io_desc

Indicate to the ublk server when an incoming request has integrity data
by setting UBLK_IO_F_INTEGRITY in the ublksrv_io_desc's op_flags field.

Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index a4d62e8e4f6b86810d870eb44605c76dfe1e18f6..fc7de2985a20565609a782770af2a433d9e7ceb0 100644 (file)
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -1113,6 +1113,9 @@ static inline unsigned int ublk_req_build_flags(struct request *req)
        if (req->cmd_flags & REQ_SWAP)
                flags |= UBLK_IO_F_SWAP;
 
+       if (blk_integrity_rq(req))
+               flags |= UBLK_IO_F_INTEGRITY;
+
        return flags;
 }
 

diff --git a/include/uapi/linux/ublk_cmd.h b/include/uapi/linux/ublk_cmd.h
index 4c141d7e4710223223fc4c61f7156d41281ef967..dfde4aee39eb2f83eeceb91d7478e6b70a045c0b 100644 (file)
--- a/include/uapi/linux/ublk_cmd.h
+++ b/include/uapi/linux/ublk_cmd.h
@@ -414,6 +414,8 @@ struct ublksrv_ctrl_dev_info {
  * passed in.
  */
 #define                UBLK_IO_F_NEED_REG_BUF          (1U << 17)
+/* Request has an integrity data buffer */
+#define                UBLK_IO_F_INTEGRITY             (1UL << 18)
 
 /*
  * io cmd is described by this structure, and stored in share memory, indexed