Commit ad163a7e authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring: move a few private types to local headers 



Commit 3a3d47fa9cfd ("io_uring: make io_uring_types.h public") moved
a bunch of io_uring types to a kernel wide header, so we could make
tracing a bit saner rather than pass in a ton of arguments.

However, there are a few types in there that are not really needed to
be system wide. Move the cancel data and mapped buffers back to the
appropriate io_uring local headers.

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 48863ffd

include/linux/io_uring_types.h

+0 −18
Original line number Diff line number Diff line
@@ -528,27 +528,9 @@ struct io_kiocb { 
	struct io_wq_work		work;

};



struct io_cancel_data {

	struct io_ring_ctx *ctx;

	union {

		u64 data;

		struct file *file;

	};

	u32 flags;

	int seq;

};



struct io_overflow_cqe {

	struct list_head list;

	struct io_uring_cqe cqe;

};



struct io_mapped_ubuf {

	u64		ubuf;

	u64		ubuf_end;

	unsigned int	nr_bvecs;

	unsigned long	acct_pages;

	struct bio_vec	bvec[];

};



#endif

io_uring/cancel.h

+13 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



#include <linux/io_uring_types.h>



struct io_cancel_data {

	struct io_ring_ctx *ctx;

	union {

		u64 data;

		struct file *file;

	};

	u32 flags;

	int seq;

};





int io_async_cancel_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);

int io_async_cancel(struct io_kiocb *req, unsigned int issue_flags);

io_uring/fdinfo.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include "sqpoll.h"

#include "fdinfo.h"

#include "cancel.h"

#include "rsrc.h"



#ifdef CONFIG_PROC_FS

static __cold int io_uring_show_cred(struct seq_file *m, unsigned int id,

io_uring/poll.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ int io_poll_add(struct io_kiocb *req, unsigned int issue_flags); 
int io_poll_remove_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);

int io_poll_remove(struct io_kiocb *req, unsigned int issue_flags);



struct io_cancel_data;

int io_poll_cancel(struct io_ring_ctx *ctx, struct io_cancel_data *cd,

		   unsigned issue_flags);

int io_arm_poll_handler(struct io_kiocb *req, unsigned issue_flags);

io_uring/rsrc.h

+8 −0
Original line number Diff line number Diff line
@@ -45,6 +45,14 @@ struct io_rsrc_node { 
	bool				done;

};



struct io_mapped_ubuf {

	u64		ubuf;

	u64		ubuf_end;

	unsigned int	nr_bvecs;

	unsigned long	acct_pages;

	struct bio_vec	bvec[];

};



void io_rsrc_put_work(struct work_struct *work);

void io_rsrc_refs_refill(struct io_ring_ctx *ctx);

void io_wait_rsrc_data(struct io_rsrc_data *data);