From: Ying Xue <ying.xue@windriver.com>
To: <netdev@vger.kernel.org>
Cc: <cwang@twopensource.com>, <herbert@gondor.apana.org.au>,
<xemul@openvz.org>, <davem@davemloft.net>,
<eric.dumazet@gmail.com>, <ebiederm@xmission.com>,
<maxk@qti.qualcomm.com>, <stephen@networkplumber.org>,
<tgraf@suug.ch>, <nicolas.dichtel@6wind.com>,
<tom@herbertland.com>, <jchapman@katalix.com>,
<erik.hugne@ericsson.com>, <jon.maloy@ericsson.com>,
<horms@verge.net.au>
Subject: [RFC PATCH net-next 10/11] tipc: remove sk_change_net interface
Date: Thu, 7 May 2015 16:52:49 +0800 [thread overview]
Message-ID: <1430988770-28907-11-git-send-email-ying.xue@windriver.com> (raw)
In-Reply-To: <1430988770-28907-1-git-send-email-ying.xue@windriver.com>
Until now all callers of sk_change_net() don't rely on it to create
kernel sockets, so now it's an appropriate time to purge it completely.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
---
include/net/sock.h | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/include/net/sock.h b/include/net/sock.h
index 3a4898e..586e352 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -2192,22 +2192,6 @@ void sock_net_set(struct sock *sk, struct net *net)
write_pnet(&sk->sk_net, net);
}
-/*
- * Kernel sockets, f.e. rtnl or icmp_socket, are a part of a namespace.
- * They should not hold a reference to a namespace in order to allow
- * to stop it.
- * Sockets after sk_change_net should be released using sk_release_kernel
- */
-static inline void sk_change_net(struct sock *sk, struct net *net)
-{
- struct net *current_net = sock_net(sk);
-
- if (!net_eq(current_net, net)) {
- put_net(current_net);
- sock_net_set(sk, net);
- }
-}
-
static inline struct sock *skb_steal_sock(struct sk_buff *skb)
{
if (skb->sk) {
--
1.7.9.5
next prev parent reply other threads:[~2015-05-07 8:55 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-07 8:52 [RFC PATCH net-next 00/11] netns: don't switch namespace while creating kernel sockets Ying Xue
2015-05-07 8:52 ` [RFC PATCH net-next 01/11] netns: Fix race between put_net() and netlink_kernel_create() Ying Xue
2015-05-07 9:04 ` Herbert Xu
2015-05-07 17:19 ` Cong Wang
2015-05-07 17:28 ` Eric W. Biederman
2015-05-08 11:20 ` Eric W. Biederman
2015-05-08 11:20 ` Ying Xue
2015-05-07 8:52 ` [RFC PATCH net-next 02/11] netlink: avoid unnecessary namespace switch when create netlink kernel sockets Ying Xue
2015-05-07 8:52 ` [RFC PATCH net-next 03/11] tun: avoid unnecessary namespace switch during kernel socket creation Ying Xue
2015-05-07 8:52 ` [RFC PATCH net-next 04/11] inet: " Ying Xue
2015-05-07 8:52 ` [RFC PATCH net-next 05/11] udp_tunnel: avoid to switch namespace for tunnel socket Ying Xue
2015-05-07 8:52 ` [RFC PATCH net-next 06/11] ip6_udp_tunnel: " Ying Xue
2015-05-07 8:52 ` [RFC PATCH net-next 07/11] l2tp: avoid to switch namespace for l2tp " Ying Xue
2015-05-07 8:52 ` [RFC PATCH net-next 08/11] ipvs: avoid to switch namespace for ipvs kernel socket Ying Xue
2015-05-07 8:52 ` [RFC PATCH net-next 09/11] tipc: fix net leak issue Ying Xue
2015-05-07 8:52 ` Ying Xue [this message]
2015-05-07 8:52 ` [RFC PATCH net-next 11/11] net: change behaviours of functions of creating and releasing kernel sockets Ying Xue
2015-05-07 16:14 ` [RFC PATCH net-next 00/11] netns: don't switch namespace while creating " Eric W. Biederman
2015-05-07 18:19 ` Cong Wang
2015-05-07 18:26 ` Eric W. Biederman
2015-05-07 18:53 ` Cong Wang
2015-05-07 18:58 ` Eric W. Biederman
2015-05-07 19:29 ` Cong Wang
2015-05-07 20:01 ` Eric W. Biederman
2015-05-08 9:10 ` Ying Xue
2015-05-08 11:15 ` Eric W. Biederman
2015-05-08 8:50 ` Ying Xue
2015-05-08 9:25 ` Ying Xue
2015-05-08 11:07 ` Eric W. Biederman
2015-05-08 16:33 ` Cong Wang
2015-05-08 14:07 ` Herbert Xu
2015-05-08 17:36 ` Eric W. Biederman
2015-05-08 20:27 ` Cong Wang
2015-05-08 21:13 ` Cong Wang
2015-05-08 22:08 ` Eric W. Biederman
2015-05-09 1:13 ` Herbert Xu
2015-05-09 1:53 ` Eric W. Biederman
2015-05-09 2:05 ` [PATCH 0/6] Cleanup the " Eric W. Biederman
2015-05-09 2:07 ` [PATCH 1/6] tun: Utilize the normal socket network namespace refcounting Eric W. Biederman
2015-05-09 2:08 ` [PATCH 2/6] net: Add a struct net parameter to sock_create_kern Eric W. Biederman
2015-05-12 8:24 ` David Laight
2015-05-12 8:55 ` Eric W. Biederman
2015-05-12 11:48 ` David Laight
2015-05-12 12:28 ` Nicolas Dichtel
2015-05-12 13:16 ` David Laight
2015-05-12 14:15 ` Nicolas Dichtel
2015-05-12 15:58 ` Eric W. Biederman
2015-05-12 14:45 ` David Miller
2015-05-09 2:09 ` [PATCH 3/6] net: Pass kern from net_proto_family.create to sk_alloc Eric W. Biederman
2015-05-09 16:51 ` Eric Dumazet
2015-05-09 17:31 ` Eric W. Biederman
2015-05-09 2:10 ` [PATCH 4/6] net: Modify sk_alloc to not reference count the netns of kernel sockets Eric W. Biederman
2015-05-09 2:11 ` [PATCH 5/6] netlink: Create kernel netlink sockets in the proper network namespace Eric W. Biederman
2015-05-09 2:12 ` [PATCH 6/6] net: kill sk_change_net and sk_release_kernel Eric W. Biederman
2015-05-09 2:38 ` [PATCH 0/6] Cleanup the kernel sockets Herbert Xu
2015-05-11 14:53 ` David Miller
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=1430988770-28907-11-git-send-email-ying.xue@windriver.com \
--to=ying.xue@windriver.com \
--cc=cwang@twopensource.com \
--cc=davem@davemloft.net \
--cc=ebiederm@xmission.com \
--cc=eric.dumazet@gmail.com \
--cc=erik.hugne@ericsson.com \
--cc=herbert@gondor.apana.org.au \
--cc=horms@verge.net.au \
--cc=jchapman@katalix.com \
--cc=jon.maloy@ericsson.com \
--cc=maxk@qti.qualcomm.com \
--cc=netdev@vger.kernel.org \
--cc=nicolas.dichtel@6wind.com \
--cc=stephen@networkplumber.org \
--cc=tgraf@suug.ch \
--cc=tom@herbertland.com \
--cc=xemul@openvz.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).