diff options
author | Eric Dumazet <edumazet@google.com> | 2015-03-20 20:15:19 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-20 21:36:53 -0400 |
commit | d3593b5cef76db45c864de23c599b58198879e8c (patch) | |
tree | 42f490bda04e13334233dae5b6039fdd8eae4d2b /security/selinux/hooks.c | |
parent | f6877fcf229b4e3d396cbd5199e040b4ea1362eb (diff) |
Revert "selinux: add a skb_owned_by() hook"
This reverts commit ca10b9e9a8ca7342ee07065289cbe74ac128c169.
No longer needed after commit eb8895debe1baba41fcb62c78a16f0c63c21662a
("tcp: tcp_make_synack() should use sock_wmalloc")
When under SYNFLOOD, we build lot of SYNACK and hit false sharing
because of multiple modifications done on sk_listener->sk_wmem_alloc
Since tcp_make_synack() uses sock_wmalloc(), there is no need
to call skb_set_owner_w() again, as this adds two atomic operations.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'security/selinux/hooks.c')
-rw-r--r-- | security/selinux/hooks.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 4d1a54190388..edc66de39f2e 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -51,7 +51,6 @@ | |||
51 | #include <linux/tty.h> | 51 | #include <linux/tty.h> |
52 | #include <net/icmp.h> | 52 | #include <net/icmp.h> |
53 | #include <net/ip.h> /* for local_port_range[] */ | 53 | #include <net/ip.h> /* for local_port_range[] */ |
54 | #include <net/sock.h> | ||
55 | #include <net/tcp.h> /* struct or_callable used in sock_rcv_skb */ | 54 | #include <net/tcp.h> /* struct or_callable used in sock_rcv_skb */ |
56 | #include <net/inet_connection_sock.h> | 55 | #include <net/inet_connection_sock.h> |
57 | #include <net/net_namespace.h> | 56 | #include <net/net_namespace.h> |
@@ -4652,11 +4651,6 @@ static void selinux_inet_conn_established(struct sock *sk, struct sk_buff *skb) | |||
4652 | selinux_skb_peerlbl_sid(skb, family, &sksec->peer_sid); | 4651 | selinux_skb_peerlbl_sid(skb, family, &sksec->peer_sid); |
4653 | } | 4652 | } |
4654 | 4653 | ||
4655 | static void selinux_skb_owned_by(struct sk_buff *skb, struct sock *sk) | ||
4656 | { | ||
4657 | skb_set_owner_w(skb, sk); | ||
4658 | } | ||
4659 | |||
4660 | static int selinux_secmark_relabel_packet(u32 sid) | 4654 | static int selinux_secmark_relabel_packet(u32 sid) |
4661 | { | 4655 | { |
4662 | const struct task_security_struct *__tsec; | 4656 | const struct task_security_struct *__tsec; |
@@ -6041,7 +6035,6 @@ static struct security_operations selinux_ops = { | |||
6041 | .tun_dev_attach_queue = selinux_tun_dev_attach_queue, | 6035 | .tun_dev_attach_queue = selinux_tun_dev_attach_queue, |
6042 | .tun_dev_attach = selinux_tun_dev_attach, | 6036 | .tun_dev_attach = selinux_tun_dev_attach, |
6043 | .tun_dev_open = selinux_tun_dev_open, | 6037 | .tun_dev_open = selinux_tun_dev_open, |
6044 | .skb_owned_by = selinux_skb_owned_by, | ||
6045 | 6038 | ||
6046 | #ifdef CONFIG_SECURITY_NETWORK_XFRM | 6039 | #ifdef CONFIG_SECURITY_NETWORK_XFRM |
6047 | .xfrm_policy_alloc_security = selinux_xfrm_policy_alloc, | 6040 | .xfrm_policy_alloc_security = selinux_xfrm_policy_alloc, |