Merge "net: add SOCK_RCU_FREE socket flag" (2be8fc81) · Commits · e / devices / android_kernel_sony_msm8998

include/net/sock.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -457,6 +457,7 @@ struct sock {
		int (sk_backlog_rcv)(struct sock sk,
		struct sk_buff *skb);
		void (sk_destruct)(struct sock sk);
		struct rcu_head sk_rcu;
		};

		#define __sk_user_data(sk) ((((void __rcu *)&(sk)->sk_user_data)))
		@@ -739,6 +740,7 @@ enum sock_flags {
		*/
		SOCK_FILTER_LOCKED, /* Filter cannot be changed anymore */
		SOCK_SELECT_ERR_QUEUE, /* Wake select on error queue */
		SOCK_RCU_FREE, /* wait rcu grace period in sk_destruct() */
		};

		#define SK_FLAGS_TIMESTAMP ((1UL << SOCK_TIMESTAMP) \| (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE))

+13 −1

Original line number	Diff line number	Diff line
		@@ -1439,8 +1439,12 @@ struct sock sk_alloc(struct net net, int family, gfp_t priority,
		}
		EXPORT_SYMBOL(sk_alloc);

		void sk_destruct(struct sock *sk)
		/* Sockets having SOCK_RCU_FREE will call this function after one RCU
		* grace period. This is the case for UDP sockets and TCP listeners.
		*/
		static void __sk_destruct(struct rcu_head *head)
		{
		struct sock *sk = container_of(head, struct sock, sk_rcu);
		struct sk_filter *filter;

		if (sk->sk_destruct)
		@@ -1467,6 +1471,14 @@ void sk_destruct(struct sock *sk)
		sk_prot_free(sk->sk_prot_creator, sk);
		}

		void sk_destruct(struct sock *sk)
		{
		if (sock_flag(sk, SOCK_RCU_FREE))
		call_rcu(&sk->sk_rcu, __sk_destruct);
		else
		__sk_destruct(&sk->sk_rcu);
		}

		static void __sk_free(struct sock *sk)
		{
		if (unlikely(sock_diag_has_destroy_listeners(sk) && sk->sk_net_refcnt))