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

net: have do_accept() take a struct proto_accept_arg argument

Browse Source 
In preparation for passing in more information via this API, change
do_accept() to take a proto_accept_arg struct pointer rather than just
the file flags separately.

No functional changes in this patch.

Acked-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2024-05-09 09:31:05 -06:00
parent 92ef0fd55a
commit 0645fbe760
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/socket.h
View File

@ -16,6 +16,7 @@ struct cred;
struct socket; struct socket;
struct sock; struct sock;
struct sk_buff; struct sk_buff;
struct proto_accept_arg;
#define __sockaddr_check_size(size) \ #define __sockaddr_check_size(size) \
BUILD_BUG_ON(((size) > sizeof(struct __kernel_sockaddr_storage))) BUILD_BUG_ON(((size) > sizeof(struct __kernel_sockaddr_storage)))
@ -433,7 +434,7 @@ extern int __sys_recvfrom(int fd, void __user *ubuf, size_t size,
extern int __sys_sendto(int fd, void __user *buff, size_t len, extern int __sys_sendto(int fd, void __user *buff, size_t len,
unsigned int flags, struct sockaddr __user *addr, unsigned int flags, struct sockaddr __user *addr,
int addr_len); int addr_len);
extern struct file *do_accept(struct file *file, unsigned file_flags, extern struct file *do_accept(struct file *file, struct proto_accept_arg *arg,
struct sockaddr __user *upeer_sockaddr, struct sockaddr __user *upeer_sockaddr,
int __user *upeer_addrlen, int flags); int __user *upeer_addrlen, int flags);
extern int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr, extern int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr,

6
io_uring/net.c
View File

@ -1528,8 +1528,10 @@ int io_accept(struct io_kiocb *req, unsigned int issue_flags)
{ {
struct io_accept *accept = io_kiocb_to_cmd(req, struct io_accept); struct io_accept *accept = io_kiocb_to_cmd(req, struct io_accept);
bool force_nonblock = issue_flags & IO_URING_F_NONBLOCK; bool force_nonblock = issue_flags & IO_URING_F_NONBLOCK;
unsigned int file_flags = force_nonblock ? O_NONBLOCK : 0;
bool fixed = !!accept->file_slot; bool fixed = !!accept->file_slot;
struct proto_accept_arg arg = {
.flags = force_nonblock ? O_NONBLOCK : 0,
};
struct file *file; struct file *file;
int ret, fd; int ret, fd;
@ -1543,7 +1545,7 @@ int io_accept(struct io_kiocb *req, unsigned int issue_flags)
if (unlikely(fd < 0)) if (unlikely(fd < 0))
return fd; return fd;
} }
file = do_accept(req->file, file_flags, accept->addr, accept->addr_len, file = do_accept(req->file, &arg, accept->addr, accept->addr_len,
accept->flags); accept->flags);
if (IS_ERR(file)) { if (IS_ERR(file)) {
if (!fixed) if (!fixed)

12
net/socket.c
View File

@ -1890,7 +1890,7 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
return __sys_listen(fd, backlog); return __sys_listen(fd, backlog);
} }
struct file *do_accept(struct file *file, unsigned file_flags, struct file *do_accept(struct file *file, struct proto_accept_arg *arg,
struct sockaddr __user *upeer_sockaddr, struct sockaddr __user *upeer_sockaddr,
int __user *upeer_addrlen, int flags) int __user *upeer_addrlen, int flags)
{ {
@ -1898,9 +1898,6 @@ struct file *do_accept(struct file *file, unsigned file_flags,
struct file *newfile; struct file *newfile;
int err, len; int err, len;
struct sockaddr_storage address; struct sockaddr_storage address;
struct proto_accept_arg arg = {
.flags = file_flags,
};
const struct proto_ops *ops; const struct proto_ops *ops;
sock = sock_from_file(file); sock = sock_from_file(file);
@ -1929,8 +1926,8 @@ struct file *do_accept(struct file *file, unsigned file_flags,
if (err) if (err)
goto out_fd; goto out_fd;
arg.flags |= sock->file->f_flags; arg->flags |= sock->file->f_flags;
err = ops->accept(sock, newsock, &arg); err = ops->accept(sock, newsock, arg);
if (err < 0) if (err < 0)
goto out_fd; goto out_fd;
@ -1956,6 +1953,7 @@ struct file *do_accept(struct file *file, unsigned file_flags,
static int __sys_accept4_file(struct file *file, struct sockaddr __user *upeer_sockaddr, static int __sys_accept4_file(struct file *file, struct sockaddr __user *upeer_sockaddr,
int __user *upeer_addrlen, int flags) int __user *upeer_addrlen, int flags)
{ {
struct proto_accept_arg arg = { };
struct file *newfile; struct file *newfile;
int newfd; int newfd;
@ -1969,7 +1967,7 @@ static int __sys_accept4_file(struct file *file, struct sockaddr __user *upeer_s
if (unlikely(newfd < 0)) if (unlikely(newfd < 0))
return newfd; return newfd;
newfile = do_accept(file, 0, upeer_sockaddr, upeer_addrlen, newfile = do_accept(file, &arg, upeer_sockaddr, upeer_addrlen,
flags); flags);
if (IS_ERR(newfile)) { if (IS_ERR(newfile)) {
put_unused_fd(newfd); put_unused_fd(newfd);