From: Al Viro <viro@ZenIV.linux.org.uk>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [RFC PATCH 62/62] coallocate socket->wq with socket itself
Date: Tue, 16 Apr 2019 18:53:40 +0100 [thread overview]
Message-ID: <20190416175340.21068-62-viro@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20190416175340.21068-1-viro@ZenIV.linux.org.uk>
From: Al Viro <viro@zeniv.linux.org.uk>
socket->wq is assign-once, set when we are initializing both
struct socket it's in and struct socket_wq it points to. As the
matter of fact, the only reason for separate allocation was the
ability to RCU-delay freeing of socket_wq. RCU-delaying the
freeing of socket itself gets rid of that need, so we can just
fold struct socket_wq into the end of struct socket and simplify
the life both for sock_alloc_inode() (one allocation instead of
two) and for tun/tap oddballs, where we used to embed struct socket
and struct socket_wq into the same structure (now - embedding just
the struct socket).
Note that reference to struct socket_wq in struct sock does remain
a reference - that's unchanged.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
drivers/net/tap.c | 5 ++---
drivers/net/tun.c | 8 +++-----
include/linux/if_tap.h | 1 -
include/linux/net.h | 4 ++--
include/net/sock.h | 4 ++--
net/core/sock.c | 2 +-
net/socket.c | 19 +++++--------------
7 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/drivers/net/tap.c b/drivers/net/tap.c
index 2ea9b4976f4a..249bfd85b65c 100644
--- a/drivers/net/tap.c
+++ b/drivers/net/tap.c
@@ -519,8 +519,7 @@ static int tap_open(struct inode *inode, struct file *file)
goto err;
}
- RCU_INIT_POINTER(q->sock.wq, &q->wq);
- init_waitqueue_head(&q->wq.wait);
+ init_waitqueue_head(&q->sock.wq.wait);
q->sock.type = SOCK_RAW;
q->sock.state = SS_CONNECTED;
q->sock.file = file;
@@ -578,7 +577,7 @@ static __poll_t tap_poll(struct file *file, poll_table *wait)
goto out;
mask = 0;
- poll_wait(file, &q->wq.wait, wait);
+ poll_wait(file, &q->sock.wq.wait, wait);
if (!ptr_ring_empty(&q->ring))
mask |= EPOLLIN | EPOLLRDNORM;
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index e9ca1c088d0b..f404d1588e9c 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -169,7 +169,6 @@ struct tun_pcpu_stats {
struct tun_file {
struct sock sk;
struct socket socket;
- struct socket_wq wq;
struct tun_struct __rcu *tun;
struct fasync_struct *fasync;
/* only used for fasnyc */
@@ -2174,7 +2173,7 @@ static void *tun_ring_recv(struct tun_file *tfile, int noblock, int *err)
goto out;
}
- add_wait_queue(&tfile->wq.wait, &wait);
+ add_wait_queue(&tfile->socket.wq.wait, &wait);
while (1) {
set_current_state(TASK_INTERRUPTIBLE);
@@ -2194,7 +2193,7 @@ static void *tun_ring_recv(struct tun_file *tfile, int noblock, int *err)
}
__set_current_state(TASK_RUNNING);
- remove_wait_queue(&tfile->wq.wait, &wait);
+ remove_wait_queue(&tfile->socket.wq.wait, &wait);
out:
*err = error;
@@ -3417,8 +3416,7 @@ static int tun_chr_open(struct inode *inode, struct file * file)
tfile->flags = 0;
tfile->ifindex = 0;
- init_waitqueue_head(&tfile->wq.wait);
- RCU_INIT_POINTER(tfile->socket.wq, &tfile->wq);
+ init_waitqueue_head(&tfile->socket.wq.wait);
tfile->socket.file = file;
tfile->socket.ops = &tun_socket_ops;
diff --git a/include/linux/if_tap.h b/include/linux/if_tap.h
index 8e66866c11be..915a187cfabd 100644
--- a/include/linux/if_tap.h
+++ b/include/linux/if_tap.h
@@ -62,7 +62,6 @@ struct tap_dev {
struct tap_queue {
struct sock sk;
struct socket sock;
- struct socket_wq wq;
int vnet_hdr_sz;
struct tap_dev __rcu *tap;
struct file *file;
diff --git a/include/linux/net.h b/include/linux/net.h
index c606c72311d0..6979057c7c86 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -120,11 +120,11 @@ struct socket {
unsigned long flags;
- struct socket_wq *wq;
-
struct file *file;
struct sock *sk;
const struct proto_ops *ops;
+
+ struct socket_wq wq;
};
struct vm_area_struct;
diff --git a/include/net/sock.h b/include/net/sock.h
index 8de5ee258b93..0e1975b6202f 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1811,7 +1811,7 @@ static inline void sock_graft(struct sock *sk, struct socket *parent)
{
WARN_ON(parent->sk);
write_lock_bh(&sk->sk_callback_lock);
- rcu_assign_pointer(sk->sk_wq, parent->wq);
+ rcu_assign_pointer(sk->sk_wq, &parent->wq);
parent->sk = sk;
sk_set_socket(sk, parent);
sk->sk_uid = SOCK_INODE(parent)->i_uid;
@@ -2095,7 +2095,7 @@ static inline void sock_poll_wait(struct file *filp, struct socket *sock,
poll_table *p)
{
if (!poll_does_not_wait(p)) {
- poll_wait(filp, &sock->wq->wait, p);
+ poll_wait(filp, &sock->wq.wait, p);
/* We need to be sure we are in sync with the
* socket flags modification.
*
diff --git a/net/core/sock.c b/net/core/sock.c
index 782343bb925b..11af1ee7d542 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2842,7 +2842,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
if (sock) {
sk->sk_type = sock->type;
- RCU_INIT_POINTER(sk->sk_wq, sock->wq);
+ RCU_INIT_POINTER(sk->sk_wq, &sock->wq);
sock->sk = sk;
sk->sk_uid = SOCK_INODE(sock)->i_uid;
} else {
diff --git a/net/socket.c b/net/socket.c
index 6953a049fb82..7d3d043fc56f 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -239,20 +239,13 @@ static struct kmem_cache *sock_inode_cachep __ro_after_init;
static struct inode *sock_alloc_inode(struct super_block *sb)
{
struct socket_alloc *ei;
- struct socket_wq *wq;
ei = kmem_cache_alloc(sock_inode_cachep, GFP_KERNEL);
if (!ei)
return NULL;
- wq = kmalloc(sizeof(*wq), GFP_KERNEL);
- if (!wq) {
- kmem_cache_free(sock_inode_cachep, ei);
- return NULL;
- }
- init_waitqueue_head(&wq->wait);
- wq->fasync_list = NULL;
- wq->flags = 0;
- ei->socket.wq = wq;
+ init_waitqueue_head(&ei->socket.wq.wait);
+ ei->socket.wq.fasync_list = NULL;
+ ei->socket.wq.flags = 0;
ei->socket.state = SS_UNCONNECTED;
ei->socket.flags = 0;
@@ -268,7 +261,6 @@ static void sock_free_inode(struct inode *inode)
struct socket_alloc *ei;
ei = container_of(inode, struct socket_alloc, vfs_inode);
- kfree(ei->socket.wq);
kmem_cache_free(sock_inode_cachep, ei);
}
@@ -604,7 +596,7 @@ static void __sock_release(struct socket *sock, struct inode *inode)
module_put(owner);
}
- if (sock->wq->fasync_list)
+ if (sock->wq.fasync_list)
pr_err("%s: fasync list not empty!\n", __func__);
if (!sock->file) {
@@ -1263,13 +1255,12 @@ static int sock_fasync(int fd, struct file *filp, int on)
{
struct socket *sock = filp->private_data;
struct sock *sk = sock->sk;
- struct socket_wq *wq;
+ struct socket_wq *wq = &sock->wq;
if (sk == NULL)
return -EINVAL;
lock_sock(sk);
- wq = sock->wq;
fasync_helper(fd, filp, on, &wq->fasync_list);
if (!wq->fasync_list)
--
2.11.0
next prev parent reply other threads:[~2019-04-16 17:54 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-16 17:49 [RFC][PATCHSET] sorting out RCU-delayed stuff in ->destroy_inode() Al Viro
2019-04-16 17:52 ` [RFC PATCH 01/62] securityfs: fix use-after-free on symlink traversal Al Viro
2019-04-16 17:52 ` [RFC PATCH 02/62] apparmorfs: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 03/62] new inode method: ->free_inode() Al Viro
2019-04-16 17:52 ` [RFC PATCH 04/62] spufs: switch to ->free_inode() Al Viro
2019-04-16 17:52 ` [RFC PATCH 05/62] erofs: " Al Viro
2019-04-18 14:01 ` Gao Xiang
2019-04-16 17:52 ` [RFC PATCH 06/62] 9p: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 07/62] adfs: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 08/62] affs: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 09/62] befs: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 10/62] bfs: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 11/62] bdev: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 12/62] cifs: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 13/62] debugfs: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 14/62] efs: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 15/62] ext2: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 16/62] f2fs: " Al Viro
2019-04-20 2:52 ` Chao Yu
2019-04-16 17:52 ` [RFC PATCH 17/62] fat: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 18/62] freevxfs: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 19/62] gfs2: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 20/62] hfs: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 21/62] hfsplus: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 22/62] hostfs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 23/62] hpfs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 24/62] isofs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 25/62] jffs2: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 26/62] minix: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 27/62] nfs{,4}: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 28/62] nilfs2: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 29/62] dlmfs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 30/62] ocfs2: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 31/62] openpromfs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 32/62] procfs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 33/62] qnx4: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 34/62] qnx6: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 35/62] reiserfs: convert " Al Viro
2019-04-16 17:53 ` [RFC PATCH 36/62] romfs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 37/62] squashfs: switch " Al Viro
2019-04-16 17:53 ` [RFC PATCH 38/62] ubifs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 39/62] udf: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 40/62] sysv: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 41/62] coda: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 42/62] ufs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 43/62] mqueue: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 44/62] bpf: " Al Viro
2019-04-16 18:07 ` Alexei Starovoitov
2019-04-16 21:34 ` Song Liu
2019-04-16 17:53 ` [RFC PATCH 45/62] rpcpipe: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 46/62] apparmor: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 47/62] securityfs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 48/62] ntfs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 49/62] dax: make use of ->free_inode() Al Viro
2019-04-18 12:16 ` Jan Kara
2019-04-18 16:58 ` Dan Williams
2019-04-16 17:53 ` [RFC PATCH 50/62] afs: switch to " Al Viro
2019-04-16 17:53 ` [RFC PATCH 51/62] btrfs: use ->free_inode() Al Viro
2019-04-16 17:53 ` [RFC PATCH 52/62] ceph: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 53/62] ecryptfs: make use of ->free_inode() Al Viro
2019-04-16 17:53 ` [RFC PATCH 54/62] ext4: " Al Viro
2019-04-18 12:10 ` Jan Kara
2019-04-16 17:53 ` [RFC PATCH 55/62] fuse: switch to ->free_inode() Al Viro
2019-04-16 17:53 ` [RFC PATCH 56/62] jfs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 57/62] overlayfs: make use of ->free_inode() Al Viro
2019-04-16 17:53 ` [RFC PATCH 58/62] hugetlb: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 59/62] shmem: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 60/62] orangefs: " Al Viro
2019-04-22 21:14 ` Mike Marshall
2019-04-22 21:56 ` Linus Torvalds
2019-04-22 23:10 ` Al Viro
2019-04-22 23:17 ` Mike Marshall
2019-04-16 17:53 ` [RFC PATCH 61/62] sockfs: switch to ->free_inode() Al Viro
2019-04-16 17:53 ` Al Viro [this message]
2019-04-16 18:01 ` [RFC][PATCHSET] sorting out RCU-delayed stuff in ->destroy_inode() Linus Torvalds
2019-04-30 3:09 ` Al Viro
[not found] ` <CAHk-=wiMvCR0iENUVorfU-3EMC7G8RNSeHSQrz9tndP1uSg2BQ@mail.gmail.com>
2019-04-30 4:00 ` Al Viro
2019-05-01 1:59 ` Al Viro
2019-04-30 4:18 ` Andreas Dilger
2019-04-30 4:26 ` Al Viro
2019-04-30 5:26 ` Andreas Dilger
2019-04-17 15:55 ` David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190416175340.21068-62-viro@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).