Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-01 10:45:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

io_uring: make io_uring_types.h public

Browse Source 
Move io_uring types to linux/include, need them public so tracing can
see the definitions and we can clean trace/events/io_uring.h

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/a15f12e8cb7289b2de0deaddcc7518d98a132d17.1655384063.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2022-06-16 13:57:19 +01:00 committed by Jens Axboe
parent 27a9d66fec
commit ab1c84d855
5 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
io_uring/io_uring_types.h → include/linux/io_uring_types.h
View File

@ -6,8 +6,32 @@
#include <linux/bitmap.h> #include <linux/bitmap.h>
#include <uapi/linux/io_uring.h> #include <uapi/linux/io_uring.h>
#include "io-wq.h" struct io_wq_work_node {
#include "filetable.h" struct io_wq_work_node *next;
};
struct io_wq_work_list {
struct io_wq_work_node *first;
struct io_wq_work_node *last;
};
struct io_wq_work {
struct io_wq_work_node list;
unsigned flags;
/* place it here instead of io_kiocb as it fills padding and saves 4B */
int cancel_seq;
};
struct io_fixed_file {
/* file * with additional FFS_* flags */
unsigned long file_ptr;
};
struct io_file_table {
struct io_fixed_file *files;
unsigned long *bitmap;
unsigned int alloc_hint;
};
struct io_hash_bucket { struct io_hash_bucket {
spinlock_t lock; spinlock_t lock;

11
io_uring/filetable.h
View File

@ -22,17 +22,6 @@ struct io_kiocb;
#endif #endif
#define FFS_MASK ~(FFS_NOWAIT|FFS_ISREG|FFS_SCM) #define FFS_MASK ~(FFS_NOWAIT|FFS_ISREG|FFS_SCM)
struct io_fixed_file {
/* file * with additional FFS_* flags */
unsigned long file_ptr;
};
struct io_file_table {
struct io_fixed_file *files;
unsigned long *bitmap;
unsigned int alloc_hint;
};
bool io_alloc_file_tables(struct io_file_table *table, unsigned nr_files); bool io_alloc_file_tables(struct io_file_table *table, unsigned nr_files);
void io_free_file_tables(struct io_file_table *table); void io_free_file_tables(struct io_file_table *table);

17
io_uring/io-wq.h
View File

@ -2,6 +2,7 @@
#define INTERNAL_IO_WQ_H #define INTERNAL_IO_WQ_H
#include <linux/refcount.h> #include <linux/refcount.h>
#include <linux/io_uring_types.h>
struct io_wq; struct io_wq;
@ -20,15 +21,6 @@ enum io_wq_cancel {
IO_WQ_CANCEL_NOTFOUND, /* work not found */ IO_WQ_CANCEL_NOTFOUND, /* work not found */
}; };
struct io_wq_work_node {
struct io_wq_work_node *next;
};
struct io_wq_work_list {
struct io_wq_work_node *first;
struct io_wq_work_node *last;
};
#define wq_list_for_each(pos, prv, head) \ #define wq_list_for_each(pos, prv, head) \
for (pos = (head)->first, prv = NULL; pos; prv = pos, pos = (pos)->next) for (pos = (head)->first, prv = NULL; pos; prv = pos, pos = (pos)->next)
@ -152,13 +144,6 @@ struct io_wq_work_node *wq_stack_extract(struct io_wq_work_node *stack)
return node; return node;
} }
struct io_wq_work {
struct io_wq_work_node list;
unsigned flags;
/* place it here instead of io_kiocb as it fills padding and saves 4B */
int cancel_seq;
};
static inline struct io_wq_work *wq_next_work(struct io_wq_work *work) static inline struct io_wq_work *wq_next_work(struct io_wq_work *work)
{ {
if (!work->list.next) if (!work->list.next)

4
io_uring/io_uring.h
View File

@ -3,7 +3,9 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/lockdep.h> #include <linux/lockdep.h>
#include "io_uring_types.h" #include <linux/io_uring_types.h>
#include "io-wq.h"
#include "filetable.h"
#ifndef CREATE_TRACE_POINTS #ifndef CREATE_TRACE_POINTS
#include <trace/events/io_uring.h> #include <trace/events/io_uring.h>

2
io_uring/refs.h
View File

@ -2,7 +2,7 @@
#define IOU_REQ_REF_H #define IOU_REQ_REF_H
#include <linux/atomic.h> #include <linux/atomic.h>
#include "io_uring_types.h" #include <linux/io_uring_types.h>
/* /*
* Shamelessly stolen from the mm implementation of page reference checking, * Shamelessly stolen from the mm implementation of page reference checking,