Skip to content

Commit d7f06fe

Browse files
isilenceaxboe
authored andcommitted
io_uring: move non aligned field to the end
Move not cache aligned fields down in io_ring_ctx, should change anything, but makes further refactoring easier. Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Link: https://lore.kernel.org/r/518e95d7888e9d481b2c5968dcf3f23db9ea47a5.1692916914.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 2af89ab commit d7f06fe

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

include/linux/io_uring_types.h

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -270,24 +270,6 @@ struct io_ring_ctx {
270270
struct io_alloc_cache netmsg_cache;
271271
} ____cacheline_aligned_in_smp;
272272

273-
/* IRQ completion list, under ->completion_lock */
274-
struct io_wq_work_list locked_free_list;
275-
unsigned int locked_free_nr;
276-
277-
const struct cred *sq_creds; /* cred used for __io_sq_thread() */
278-
struct io_sq_data *sq_data; /* if using sq thread polling */
279-
280-
struct wait_queue_head sqo_sq_wait;
281-
struct list_head sqd_list;
282-
283-
unsigned long check_cq;
284-
285-
unsigned int file_alloc_start;
286-
unsigned int file_alloc_end;
287-
288-
struct xarray personalities;
289-
u32 pers_next;
290-
291273
struct {
292274
/*
293275
* We cache a range of free CQEs we can use, once exhausted it
@@ -332,6 +314,24 @@ struct io_ring_ctx {
332314
unsigned cq_last_tm_flush;
333315
} ____cacheline_aligned_in_smp;
334316

317+
/* IRQ completion list, under ->completion_lock */
318+
struct io_wq_work_list locked_free_list;
319+
unsigned int locked_free_nr;
320+
321+
const struct cred *sq_creds; /* cred used for __io_sq_thread() */
322+
struct io_sq_data *sq_data; /* if using sq thread polling */
323+
324+
struct wait_queue_head sqo_sq_wait;
325+
struct list_head sqd_list;
326+
327+
unsigned long check_cq;
328+
329+
unsigned int file_alloc_start;
330+
unsigned int file_alloc_end;
331+
332+
struct xarray personalities;
333+
u32 pers_next;
334+
335335
/* Keep this last, we don't need it for the fast path */
336336
struct wait_queue_head poll_wq;
337337
struct io_restriction restrictions;

0 commit comments

Comments
 (0)