From: SeongJae Park <sjpark@amazon.com>
To: <davem@davemloft.net>
Cc: <viro@zeniv.linux.org.uk>, <kuba@kernel.org>,
<gregkh@linuxfoundation.org>, <edumazet@google.com>,
<sj38.park@gmail.com>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, SeongJae Park <sjpark@amazon.de>
Subject: [PATCH net v2 2/2] Revert "sockfs: switch to ->free_inode()"
Date: Tue, 5 May 2020 10:10:35 +0200 [thread overview]
Message-ID: <20200505081035.7436-3-sjpark@amazon.com> (raw)
In-Reply-To: <20200505081035.7436-1-sjpark@amazon.com>
From: SeongJae Park <sjpark@amazon.de>
This reverts commit 6d7855c54e1e269275d7c504f8f62a0b7a5b3f18.
The commit 6d7855c54e1e ("sockfs: switch to ->free_inode()") made the
deallocation of 'socket_alloc' to be done asynchronously using RCU, as
same to 'sock.wq'.
The change made 'socket_alloc' live longer than before. As a result,
user programs intensively repeating allocations and deallocations of
sockets could cause memory pressure on recent kernels.
To avoid the problem, this commit reverts the change.
Fixes: 6d7855c54e1e ("sockfs: switch to ->free_inode()")
Fixes: 333f7909a857 ("coallocate socket_sq with socket itself")
Signed-off-by: SeongJae Park <sjpark@amazon.de>
---
net/socket.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/socket.c b/net/socket.c
index e274ae4b45e4..27174021f47f 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -273,12 +273,12 @@ static struct inode *sock_alloc_inode(struct super_block *sb)
return &ei->vfs_inode;
}
-static void sock_free_inode(struct inode *inode)
+static void sock_destroy_inode(struct inode *inode)
{
struct socket_alloc *ei;
ei = container_of(inode, struct socket_alloc, vfs_inode);
- kfree(ei->socket.wq);
+ kfree_rcu(ei->socket.wq, rcu);
kmem_cache_free(sock_inode_cachep, ei);
}
@@ -303,7 +303,7 @@ static void init_inodecache(void)
static const struct super_operations sockfs_ops = {
.alloc_inode = sock_alloc_inode,
- .free_inode = sock_free_inode,
+ .destroy_inode = sock_destroy_inode,
.statfs = simple_statfs,
};
--
2.17.1
next prev parent reply other threads:[~2020-05-05 8:11 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-05 8:10 [PATCH net v2 0/2] Revert the 'socket_alloc' life cycle change SeongJae Park
2020-05-05 8:10 ` [PATCH net v2 1/2] Revert "coallocate socket_wq with socket itself" SeongJae Park
2020-05-06 4:55 ` kbuild test robot
2020-05-05 8:10 ` SeongJae Park [this message]
2020-05-05 11:54 ` [PATCH net v2 0/2] Revert the 'socket_alloc' life cycle change SeongJae Park
2020-05-05 12:31 ` Nuernberger, Stefan
2020-05-05 14:53 ` Eric Dumazet
2020-05-05 15:07 ` SeongJae Park
2020-05-05 15:20 ` Eric Dumazet
2020-05-05 15:46 ` SeongJae Park
2020-05-05 16:00 ` Eric Dumazet
2020-05-05 16:13 ` SeongJae Park
2020-05-05 16:25 ` Eric Dumazet
2020-05-05 16:31 ` Eric Dumazet
2020-05-05 16:37 ` Eric Dumazet
2020-05-05 17:05 ` SeongJae Park
2020-05-05 17:30 ` Paul E. McKenney
2020-05-05 17:56 ` SeongJae Park
2020-05-05 18:17 ` Paul E. McKenney
2020-05-05 18:34 ` SeongJae Park
2020-05-05 18:49 ` Paul E. McKenney
2020-05-06 12:59 ` SeongJae Park
2020-05-06 14:33 ` Eric Dumazet
2020-05-06 14:41 ` Paul E. McKenney
2020-05-06 15:20 ` SeongJae Park
2020-05-05 17:28 ` Paul E. McKenney
2020-05-05 18:11 ` SeongJae Park
2020-05-05 17:23 ` Paul E. McKenney
2020-05-05 17:49 ` SeongJae Park
2020-05-05 18:27 ` Paul E. McKenney
2020-05-05 18:40 ` SeongJae Park
2020-05-05 18:48 ` Paul E. McKenney
2020-05-05 16:26 ` Al Viro
2020-05-05 18:48 ` David Miller
2020-05-05 19:00 ` David Miller
2020-05-06 6:24 ` SeongJae Park
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=20200505081035.7436-3-sjpark@amazon.com \
--to=sjpark@amazon.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sj38.park@gmail.com \
--cc=sjpark@amazon.de \
--cc=viro@zeniv.linux.org.uk \
/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).