| Message ID | 20241206015308.3342386-3-kbusch@meta.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | block write streams with nvme fdp | expand |
On 05/12/24 05:53PM, Keith Busch wrote: >From: Keith Busch <kbusch@kernel.org> > >diff --git a/io_uring/rw.c b/io_uring/rw.c >index 04e4467ab0ee8..a2987aefb2cec 100644 >--- a/io_uring/rw.c >+++ b/io_uring/rw.c >@@ -272,14 +272,14 @@ static inline void io_meta_restore(struct io_async_rw *io, struct kiocb *kiocb) > } > > static int io_prep_rw_pi(struct io_kiocb *req, struct io_rw *rw, int ddir, >- u64 attr_ptr, u64 attr_type_mask) >+ u64 *attr_ptr) > { > struct io_uring_attr_pi pi_attr; > struct io_async_rw *io; > int ret; > >- if (copy_from_user(&pi_attr, u64_to_user_ptr(attr_ptr), >- sizeof(pi_attr))) >+ if (copy_from_user(&pi_attr, u64_to_user_ptr(*attr_ptr), >+ sizeof(pi_attr))) > return -EFAULT; > > if (pi_attr.rsvd) >@@ -295,6 +295,7 @@ static int io_prep_rw_pi(struct io_kiocb *req, struct io_rw *rw, int ddir, > return ret; > rw->kiocb.ki_flags |= IOCB_HAS_METADATA; > io_meta_save_state(io); >+ *attr_ptr += sizeof(pi_attr); > return ret; > } > >@@ -335,8 +336,7 @@ static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe, > if (attr_type_mask) { > u64 attr_ptr; > >- /* only PI attribute is supported currently */ >- if (attr_type_mask != IORING_RW_ATTR_FLAG_PI) >+ if (attr_type_mask & ~IORING_RW_ATTR_FLAGS_SUPPORTED) > return -EINVAL; > > attr_ptr = READ_ONCE(sqe->attr_ptr); >-- Nit: Although the next patch does it, but the call to io_prep_rw_pi should pass a u64 pointer in this patch itself.
diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 38f0d6b10eaf7..5fa38467d6070 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -115,14 +115,16 @@ struct io_uring_sqe { #define IORING_RW_ATTR_FLAG_PI (1U << 0) /* PI attribute information */ struct io_uring_attr_pi { - __u16 flags; - __u16 app_tag; - __u32 len; - __u64 addr; - __u64 seed; - __u64 rsvd; + __u16 flags; + __u16 app_tag; + __u32 len; + __u64 addr; + __u64 seed; + __u64 rsvd; }; +#define IORING_RW_ATTR_FLAGS_SUPPORTED (IORING_RW_ATTR_FLAG_PI) + /* * If sqe->file_index is set to this for opcodes that instantiate a new * direct descriptor (like openat/openat2/accept), then io_uring will allocate diff --git a/io_uring/rw.c b/io_uring/rw.c index 04e4467ab0ee8..a2987aefb2cec 100644 --- a/io_uring/rw.c +++ b/io_uring/rw.c @@ -272,14 +272,14 @@ static inline void io_meta_restore(struct io_async_rw *io, struct kiocb *kiocb) } static int io_prep_rw_pi(struct io_kiocb *req, struct io_rw *rw, int ddir, - u64 attr_ptr, u64 attr_type_mask) + u64 *attr_ptr) { struct io_uring_attr_pi pi_attr; struct io_async_rw *io; int ret; - if (copy_from_user(&pi_attr, u64_to_user_ptr(attr_ptr), - sizeof(pi_attr))) + if (copy_from_user(&pi_attr, u64_to_user_ptr(*attr_ptr), + sizeof(pi_attr))) return -EFAULT; if (pi_attr.rsvd) @@ -295,6 +295,7 @@ static int io_prep_rw_pi(struct io_kiocb *req, struct io_rw *rw, int ddir, return ret; rw->kiocb.ki_flags |= IOCB_HAS_METADATA; io_meta_save_state(io); + *attr_ptr += sizeof(pi_attr); return ret; } @@ -335,8 +336,7 @@ static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe, if (attr_type_mask) { u64 attr_ptr; - /* only PI attribute is supported currently */ - if (attr_type_mask != IORING_RW_ATTR_FLAG_PI) + if (attr_type_mask & ~IORING_RW_ATTR_FLAGS_SUPPORTED) return -EINVAL; attr_ptr = READ_ONCE(sqe->attr_ptr);