Commit 99a1dec7 authored by Mel Gorman's avatar Mel Gorman Committed by Linus Torvalds
Browse files

net: introduce sk_gfp_atomic() to allow addition of GFP flags depending on the individual socket 



Introduce sk_gfp_atomic(), this function allows to inject sock specific
flags to each sock related allocation.  It is only used on allocation
paths that may be required for writing pages back to network storage.

[davem@davemloft.net: Use sk_gfp_atomic only when necessary]
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarMel Gorman <mgorman@suse.de>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: Neil Brown <neilb@suse.de>
Cc: Mike Christie <michaelc@cs.wisc.edu>
Cc: Eric B Munson <emunson@mgebm.net>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Christoph Lameter <cl@linux.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 183f6371

include/net/sock.h

+5 −0
Original line number Diff line number Diff line
@@ -658,6 +658,11 @@ static inline bool sock_flag(const struct sock *sk, enum sock_flags flag) 
	return test_bit(flag, &sk->sk_flags);

}



static inline gfp_t sk_gfp_atomic(struct sock *sk, gfp_t gfp_mask)

{

	return GFP_ATOMIC;

}



static inline void sk_acceptq_removed(struct sock *sk)

{

	sk->sk_ack_backlog--;

net/ipv4/tcp_output.c

+7 −5
Original line number Diff line number Diff line
@@ -2045,7 +2045,8 @@ void __tcp_push_pending_frames(struct sock *sk, unsigned int cur_mss, 
	if (unlikely(sk->sk_state == TCP_CLOSE))

		return;



	if (tcp_write_xmit(sk, cur_mss, nonagle, 0, GFP_ATOMIC))

	if (tcp_write_xmit(sk, cur_mss, nonagle, 0,

			   sk_gfp_atomic(sk, GFP_ATOMIC)))

		tcp_check_probe_timer(sk);

}
@@ -2666,7 +2667,8 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst, 


	if (cvp != NULL && cvp->s_data_constant && cvp->s_data_desired)

		s_data_desired = cvp->s_data_desired;

	skb = alloc_skb(MAX_TCP_HEADER + 15 + s_data_desired, GFP_ATOMIC);

	skb = alloc_skb(MAX_TCP_HEADER + 15 + s_data_desired,

			sk_gfp_atomic(sk, GFP_ATOMIC));

	if (unlikely(!skb)) {

		dst_release(dst);

		return NULL;
@@ -3064,7 +3066,7 @@ void tcp_send_ack(struct sock *sk) 
	 * tcp_transmit_skb() will set the ownership to this

	 * sock.

	 */

	buff = alloc_skb(MAX_TCP_HEADER, GFP_ATOMIC);

	buff = alloc_skb(MAX_TCP_HEADER, sk_gfp_atomic(sk, GFP_ATOMIC));

	if (buff == NULL) {

		inet_csk_schedule_ack(sk);

		inet_csk(sk)->icsk_ack.ato = TCP_ATO_MIN;
@@ -3079,7 +3081,7 @@ void tcp_send_ack(struct sock *sk) 


	/* Send it off, this clears delayed acks for us. */

	TCP_SKB_CB(buff)->when = tcp_time_stamp;

	tcp_transmit_skb(sk, buff, 0, GFP_ATOMIC);

	tcp_transmit_skb(sk, buff, 0, sk_gfp_atomic(sk, GFP_ATOMIC));

}



/* This routine sends a packet with an out of date sequence
@@ -3099,7 +3101,7 @@ static int tcp_xmit_probe_skb(struct sock *sk, int urgent) 
	struct sk_buff *skb;



	/* We don't queue it, tcp_transmit_skb() sets ownership. */

	skb = alloc_skb(MAX_TCP_HEADER, GFP_ATOMIC);

	skb = alloc_skb(MAX_TCP_HEADER, sk_gfp_atomic(sk, GFP_ATOMIC));

	if (skb == NULL)

		return -1;

net/ipv6/tcp_ipv6.c

+5 −3
Original line number Diff line number Diff line
@@ -1299,7 +1299,8 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb, 
	/* Clone pktoptions received with SYN */

	newnp->pktoptions = NULL;

	if (treq->pktopts != NULL) {

		newnp->pktoptions = skb_clone(treq->pktopts, GFP_ATOMIC);

		newnp->pktoptions = skb_clone(treq->pktopts,

					      sk_gfp_atomic(sk, GFP_ATOMIC));

		consume_skb(treq->pktopts);

		treq->pktopts = NULL;

		if (newnp->pktoptions)
@@ -1349,7 +1350,8 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb, 
		 * across. Shucks.

		 */

		tcp_md5_do_add(newsk, (union tcp_md5_addr *)&newnp->daddr,

			       AF_INET6, key->key, key->keylen, GFP_ATOMIC);

			       AF_INET6, key->key, key->keylen,

			       sk_gfp_atomic(sk, GFP_ATOMIC));

	}

#endif
@@ -1442,7 +1444,7 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) 
					       --ANK (980728)

	 */

	if (np->rxopt.all)

		opt_skb = skb_clone(skb, GFP_ATOMIC);

		opt_skb = skb_clone(skb, sk_gfp_atomic(sk, GFP_ATOMIC));



	if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */

		sock_rps_save_rxhash(sk, skb);

CRA Git | Maintained and supported by SUSTech CRA and CCSE