From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753230AbbF2NHO (ORCPT ); Mon, 29 Jun 2015 09:07:14 -0400 Received: from frisell.zx2c4.com ([192.95.5.64]:58140 "EHLO frisell.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750992AbbF2NHF (ORCPT ); Mon, 29 Jun 2015 09:07:05 -0400 From: "Jason A. Donenfeld" To: "David S. Miller" , Eric Dumazet , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "Jason A. Donenfeld" Subject: [PATCH] sock: honor GFP_ATOMIC when allocating send skbs Date: Mon, 29 Jun 2015 15:06:56 +0200 Message-Id: <1435583216-19877-1-git-send-email-Jason@zx2c4.com> X-Mailer: git-send-email 2.4.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some sockets set sock->sk->sk_allocation = GFP_ATOMIC. In spite of this, functions that call sock_alloc_send_skb will then call sock_alloc_send_pskb, which very often results in sleeping. Since the intention of callers setting sk_allocation = GFP_ATOMIC might be to be able to send from atomic context, we need to honor this and not sleep. Signed-off-by: Jason A. Donenfeld --- net/core/sock.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/core/sock.c b/net/core/sock.c index 1e1fe9a..f00e691 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1804,34 +1804,37 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len, unsigned long data_len, int noblock, int *errcode, int max_page_order) { struct sk_buff *skb; long timeo; int err; timeo = sock_sndtimeo(sk, noblock); for (;;) { err = sock_error(sk); if (err != 0) goto failure; err = -EPIPE; if (sk->sk_shutdown & SEND_SHUTDOWN) goto failure; + if (sk->sk_allocation & GFP_ATOMIC) + break; + if (sk_wmem_alloc_get(sk) < sk->sk_sndbuf) break; set_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags); set_bit(SOCK_NOSPACE, &sk->sk_socket->flags); err = -EAGAIN; if (!timeo) goto failure; if (signal_pending(current)) goto interrupted; timeo = sock_wait_for_wmem(sk, timeo); } skb = alloc_skb_with_frags(header_len, data_len, max_page_order, errcode, sk->sk_allocation); if (skb) skb_set_owner_w(skb, sk); return skb; -- 2.4.2