diff mbox series

[RFC,3/8] io_uring: check legacy layout of struct io_uring_sqe with BUILD_BUG_SQE_LEGACY*

Message ID f8fbaaff66246111ec0469ecb6da5d833d3af618.1660291547.git.metze@samba.org (mailing list archive)
State New
Headers show
Series cleanup struct io_uring_sqe layout | expand

Commit Message

Stefan Metzmacher Aug. 12, 2022, 8:34 a.m. UTC 
This makes the next changes easier.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
---
 io_uring/io_uring.c | 88 +++++++++++++++++++++++----------------------
 1 file changed, 46 insertions(+), 42 deletions(-)
diff mbox series

Patch

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 427dde7dfbd1..60426265ee9f 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -3908,6 +3908,10 @@  static int __init io_uring_init(void)
 #define BUILD_BUG_SQE_ALIAS(eoffset, etype, ename, aname) \
 	__BUILD_BUG_VERIFY_ALIAS(struct io_uring_sqe, eoffset, sizeof(etype), ename, aname)
 
+#define BUILD_BUG_SQE_LEGACY(eoffset, etype, lname) \
+	__BUILD_BUG_VERIFY_OFFSET_SIZE(struct io_uring_sqe, eoffset, sizeof(etype), lname)
+#define BUILD_BUG_SQE_LEGACY_SIZE(eoffset, esize, lname) \
+	__BUILD_BUG_VERIFY_OFFSET_SIZE(struct io_uring_sqe, eoffset, esize, lname)
 #define BUILD_BUG_SQE_LEGACY_ALIAS(eoffset, etype, ename, lname) \
 	__BUILD_BUG_VERIFY_ALIAS(struct io_uring_sqe, eoffset, sizeof(etype), ename, lname)
 
@@ -3941,48 +3945,48 @@  static int __init io_uring_init(void)
 	BUILD_BUG_SQE_ELEM(48, __u64,  u64_ofs48);
 	BUILD_BUG_SQE_ELEM(56, __u64,  u64_ofs56);
 	/* Legacy layout */
-	BUILD_BUG_SQE_ELEM(0,  __u8,   opcode);
-	BUILD_BUG_SQE_ELEM(1,  __u8,   flags);
-	BUILD_BUG_SQE_ELEM(2,  __u16,  ioprio);
-	BUILD_BUG_SQE_ELEM(4,  __s32,  fd);
-	BUILD_BUG_SQE_ELEM(8,  __u64,  off);
-	BUILD_BUG_SQE_ELEM(8,  __u64,  addr2);
-	BUILD_BUG_SQE_ELEM(8,  __u32,  cmd_op);
-	BUILD_BUG_SQE_ELEM(12, __u32, __pad1);
-	BUILD_BUG_SQE_ELEM(16, __u64,  addr);
-	BUILD_BUG_SQE_ELEM(16, __u64,  splice_off_in);
-	BUILD_BUG_SQE_ELEM(24, __u32,  len);
-	BUILD_BUG_SQE_ELEM(28,     __kernel_rwf_t, rw_flags);
-	BUILD_BUG_SQE_ELEM(28, /* compat */   int, rw_flags);
-	BUILD_BUG_SQE_ELEM(28, /* compat */ __u32, rw_flags);
-	BUILD_BUG_SQE_ELEM(28, __u32,  fsync_flags);
-	BUILD_BUG_SQE_ELEM(28, /* compat */ __u16,  poll_events);
-	BUILD_BUG_SQE_ELEM(28, __u32,  poll32_events);
-	BUILD_BUG_SQE_ELEM(28, __u32,  sync_range_flags);
-	BUILD_BUG_SQE_ELEM(28, __u32,  msg_flags);
-	BUILD_BUG_SQE_ELEM(28, __u32,  timeout_flags);
-	BUILD_BUG_SQE_ELEM(28, __u32,  accept_flags);
-	BUILD_BUG_SQE_ELEM(28, __u32,  cancel_flags);
-	BUILD_BUG_SQE_ELEM(28, __u32,  open_flags);
-	BUILD_BUG_SQE_ELEM(28, __u32,  statx_flags);
-	BUILD_BUG_SQE_ELEM(28, __u32,  fadvise_advice);
-	BUILD_BUG_SQE_ELEM(28, __u32,  splice_flags);
-	BUILD_BUG_SQE_ELEM(28, __u32,  rename_flags);
-	BUILD_BUG_SQE_ELEM(28, __u32,  unlink_flags);
-	BUILD_BUG_SQE_ELEM(28, __u32,  hardlink_flags);
-	BUILD_BUG_SQE_ELEM(28, __u32,  xattr_flags);
-	BUILD_BUG_SQE_ELEM(28, __u32,  msg_ring_flags);
-	BUILD_BUG_SQE_ELEM(32, __u64,  user_data);
-	BUILD_BUG_SQE_ELEM(40, __u16,  buf_index);
-	BUILD_BUG_SQE_ELEM(40, __u16,  buf_group);
-	BUILD_BUG_SQE_ELEM(42, __u16,  personality);
-	BUILD_BUG_SQE_ELEM(44, __s32,  splice_fd_in);
-	BUILD_BUG_SQE_ELEM(44, __u32,  file_index);
-	BUILD_BUG_SQE_ELEM(44, __u16,  notification_idx);
-	BUILD_BUG_SQE_ELEM(46, __u16,  addr_len);
-	BUILD_BUG_SQE_ELEM(48, __u64,  addr3);
-	BUILD_BUG_SQE_ELEM_SIZE(48, 0, cmd);
-	BUILD_BUG_SQE_ELEM(56, __u64,  __pad2);
+	BUILD_BUG_SQE_LEGACY(0,  __u8,   opcode);
+	BUILD_BUG_SQE_LEGACY(1,  __u8,   flags);
+	BUILD_BUG_SQE_LEGACY(2,  __u16,  ioprio);
+	BUILD_BUG_SQE_LEGACY(4,  __s32,  fd);
+	BUILD_BUG_SQE_LEGACY(8,  __u64,  off);
+	BUILD_BUG_SQE_LEGACY(8,  __u64,  addr2);
+	BUILD_BUG_SQE_LEGACY(8,  __u32,  cmd_op);
+	BUILD_BUG_SQE_LEGACY(12, __u32, __pad1);
+	BUILD_BUG_SQE_LEGACY(16, __u64,  addr);
+	BUILD_BUG_SQE_LEGACY(16, __u64,  splice_off_in);
+	BUILD_BUG_SQE_LEGACY(24, __u32,  len);
+	BUILD_BUG_SQE_LEGACY(28,     __kernel_rwf_t, rw_flags);
+	BUILD_BUG_SQE_LEGACY(28, /* compat */   int, rw_flags);
+	BUILD_BUG_SQE_LEGACY(28, /* compat */ __u32, rw_flags);
+	BUILD_BUG_SQE_LEGACY(28, __u32,  fsync_flags);
+	BUILD_BUG_SQE_LEGACY(28, /* compat */ __u16,  poll_events);
+	BUILD_BUG_SQE_LEGACY(28, __u32,  poll32_events);
+	BUILD_BUG_SQE_LEGACY(28, __u32,  sync_range_flags);
+	BUILD_BUG_SQE_LEGACY(28, __u32,  msg_flags);
+	BUILD_BUG_SQE_LEGACY(28, __u32,  timeout_flags);
+	BUILD_BUG_SQE_LEGACY(28, __u32,  accept_flags);
+	BUILD_BUG_SQE_LEGACY(28, __u32,  cancel_flags);
+	BUILD_BUG_SQE_LEGACY(28, __u32,  open_flags);
+	BUILD_BUG_SQE_LEGACY(28, __u32,  statx_flags);
+	BUILD_BUG_SQE_LEGACY(28, __u32,  fadvise_advice);
+	BUILD_BUG_SQE_LEGACY(28, __u32,  splice_flags);
+	BUILD_BUG_SQE_LEGACY(28, __u32,  rename_flags);
+	BUILD_BUG_SQE_LEGACY(28, __u32,  unlink_flags);
+	BUILD_BUG_SQE_LEGACY(28, __u32,  hardlink_flags);
+	BUILD_BUG_SQE_LEGACY(28, __u32,  xattr_flags);
+	BUILD_BUG_SQE_LEGACY(28, __u32,  msg_ring_flags);
+	BUILD_BUG_SQE_LEGACY(32, __u64,  user_data);
+	BUILD_BUG_SQE_LEGACY(40, __u16,  buf_index);
+	BUILD_BUG_SQE_LEGACY(40, __u16,  buf_group);
+	BUILD_BUG_SQE_LEGACY(42, __u16,  personality);
+	BUILD_BUG_SQE_LEGACY(44, __s32,  splice_fd_in);
+	BUILD_BUG_SQE_LEGACY(44, __u32,  file_index);
+	BUILD_BUG_SQE_LEGACY(44, __u16,  notification_idx);
+	BUILD_BUG_SQE_LEGACY(46, __u16,  addr_len);
+	BUILD_BUG_SQE_LEGACY(48, __u64,  addr3);
+	BUILD_BUG_SQE_LEGACY_SIZE(48, 0, cmd);
+	BUILD_BUG_SQE_LEGACY(56, __u64,  __pad2);
 
 	BUILD_BUG_ON(sizeof(struct io_uring_files_update) !=
 		     sizeof(struct io_uring_rsrc_update));