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 /include/linux/security.h | |
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 'include/linux/security.h')
-rw-r--r-- | include/linux/security.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index a1b7dbd127ff..25a079a7c3b3 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
@@ -1716,7 +1716,6 @@ struct security_operations { | |||
1716 | int (*tun_dev_attach_queue) (void *security); | 1716 | int (*tun_dev_attach_queue) (void *security); |
1717 | int (*tun_dev_attach) (struct sock *sk, void *security); | 1717 | int (*tun_dev_attach) (struct sock *sk, void *security); |
1718 | int (*tun_dev_open) (void *security); | 1718 | int (*tun_dev_open) (void *security); |
1719 | void (*skb_owned_by) (struct sk_buff *skb, struct sock *sk); | ||
1720 | #endif /* CONFIG_SECURITY_NETWORK */ | 1719 | #endif /* CONFIG_SECURITY_NETWORK */ |
1721 | 1720 | ||
1722 | #ifdef CONFIG_SECURITY_NETWORK_XFRM | 1721 | #ifdef CONFIG_SECURITY_NETWORK_XFRM |
@@ -2735,8 +2734,6 @@ int security_tun_dev_attach_queue(void *security); | |||
2735 | int security_tun_dev_attach(struct sock *sk, void *security); | 2734 | int security_tun_dev_attach(struct sock *sk, void *security); |
2736 | int security_tun_dev_open(void *security); | 2735 | int security_tun_dev_open(void *security); |
2737 | 2736 | ||
2738 | void security_skb_owned_by(struct sk_buff *skb, struct sock *sk); | ||
2739 | |||
2740 | #else /* CONFIG_SECURITY_NETWORK */ | 2737 | #else /* CONFIG_SECURITY_NETWORK */ |
2741 | static inline int security_unix_stream_connect(struct sock *sock, | 2738 | static inline int security_unix_stream_connect(struct sock *sock, |
2742 | struct sock *other, | 2739 | struct sock *other, |
@@ -2928,11 +2925,6 @@ static inline int security_tun_dev_open(void *security) | |||
2928 | { | 2925 | { |
2929 | return 0; | 2926 | return 0; |
2930 | } | 2927 | } |
2931 | |||
2932 | static inline void security_skb_owned_by(struct sk_buff *skb, struct sock *sk) | ||
2933 | { | ||
2934 | } | ||
2935 | |||
2936 | #endif /* CONFIG_SECURITY_NETWORK */ | 2928 | #endif /* CONFIG_SECURITY_NETWORK */ |
2937 | 2929 | ||
2938 | #ifdef CONFIG_SECURITY_NETWORK_XFRM | 2930 | #ifdef CONFIG_SECURITY_NETWORK_XFRM |