Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1452701pxb; Wed, 10 Feb 2021 08:39:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzJ+zPpqjqlDhj27sAxhOdXoMskb+lCWX9jFV52eRQ/p8xM/Tjpgm6hVGiOyH472Po9Q8Kw X-Received: by 2002:aa7:d8da:: with SMTP id k26mr3926113eds.364.1612975140958; Wed, 10 Feb 2021 08:39:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612975140; cv=none; d=google.com; s=arc-20160816; b=mKeHXn2JvDYOEjxKKPVoDbF4BQ4qvHwhFFb+EN/svjOKjLj3+8zmXSex1s1ZOAipx2 f0aPfGj93u0Kq3IiXtO2x0rkMwmbd55PjDQJ1ECDt3xARMf5dmzk6AcUIqPIhFWlTIp2 g7JUiBcEEl6MTrsbVF6LyjvzkJW/ujmGuuLE8WsGfB18qXot632X3L0MmA0jBFEunzLa CH4wJ17CpnJktb6LGLxWLLPky6B41doVMyjvFmA7KH293fHRBV7mT/63sbjyGe0WAhnT FcRy1qV91e0ApPsbG75CbPpJ96d8XlTkNN4QxzqDhlhtYk0wO0cD1LUkT12YTwHTh+Co HwFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:reply-to:cc:from:to :dkim-signature:date; bh=1ZV3MU5hm/yFjfHuP1nAedRaPlzwJRc6+iABOHDpkjs=; b=0ciwe8pXTA2+w4v+y2JxWPMUIvzYHJ0UM2FxXBw8ZSdzqZE6RNPRkBaDboyx3TUt+u I5aSwQdW6TJDCRAzpMpHeavxIg3oBtjvjdoxT9vMzPm/FpajZ9Mfi5ZLqw2T1EjIjQOp CX9fpU7N6drVVIfwaaaTjNlsrmkrMBAZo19cuDOIqFgDCXL0l6NflYdzu8ZqEp51ReSg 4klWzYMYkFem90Y1cnRSMQKoPXUTiF0fpbIPlcDtxBRTNzjdQynp/iMavRBNzBMA5dLT f3IwVqaBzkjsDjANg8pgGVIFyEd5eMLGEbwbUo5Ho6XUmnwf3/Fvk3Rz74/MLw3HIMPC gJCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pm.me header.s=protonmail header.b=Fk22STln; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=pm.me Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hr35si1614472ejc.274.2021.02.10.08.38.37; Wed, 10 Feb 2021 08:39:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@pm.me header.s=protonmail header.b=Fk22STln; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=pm.me Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232414AbhBJQf5 (ORCPT + 99 others); Wed, 10 Feb 2021 11:35:57 -0500 Received: from mail-40136.protonmail.ch ([185.70.40.136]:20594 "EHLO mail-40136.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232574AbhBJQbS (ORCPT ); Wed, 10 Feb 2021 11:31:18 -0500 Date: Wed, 10 Feb 2021 16:30:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail; t=1612974648; bh=1ZV3MU5hm/yFjfHuP1nAedRaPlzwJRc6+iABOHDpkjs=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=Fk22STlnmZbcQinLN0RWEHztMBRSvRCr/YY2hJLvMmnQ4yCcvnjQ7wS2eZLpZ0ZFO Okk/5rqp8eQxwIFo3kZC9+A0KKOOX3ElintYQHYAE94L2TXSwrVpxtyMCPqa3p4rqr JKrpzR6McJfP3snSHtOYJ96D6vhvwKR8O8TUVZsNnte/sjWNfldORZcrCxUoz8SBt1 XZheXN+ccIZCuqyf5iUO78V1AlET3KntLwNr5/QwjG6j4Z4T+AiJmQiGqn72pBNQBL rIpzSGNILOprRhNMnmue4lbg804eu3MHeM8sc0D9ZtGFYI/vFNf21PUBAB7+QHzpRK RqIaJoVFdMGSg== To: "David S. Miller" , Jakub Kicinski From: Alexander Lobakin Cc: Jonathan Lemon , Eric Dumazet , Dmitry Vyukov , Willem de Bruijn , Alexander Lobakin , Randy Dunlap , Kevin Hao , Pablo Neira Ayuso , Jakub Sitnicki , Marco Elver , Dexuan Cui , Paolo Abeni , Jesper Dangaard Brouer , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Taehee Yoo , Cong Wang , =?utf-8?Q?Bj=C3=B6rn_T=C3=B6pel?= , Miaohe Lin , Guillaume Nault , Yonghong Song , zhudi , Michal Kubecek , Marcelo Ricardo Leitner , Dmitry Safonov <0x7f454c46@gmail.com>, Yang Yingliang , Florian Westphal , Edward Cree , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Reply-To: Alexander Lobakin Subject: [PATCH v4 net-next 09/11] skbuff: allow to optionally use NAPI cache from __alloc_skb() Message-ID: <20210210162732.80467-10-alobakin@pm.me> In-Reply-To: <20210210162732.80467-1-alobakin@pm.me> References: <20210210162732.80467-1-alobakin@pm.me> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Reuse the old and forgotten SKB_ALLOC_NAPI to add an option to get an skbuff_head from the NAPI cache instead of inplace allocation inside __alloc_skb(). This implies that the function is called from softirq or BH-off context, not for allocating a clone or from a distant node. Signed-off-by: Alexander Lobakin --- net/core/skbuff.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 9e1a8ded4acc..750fa1825b28 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -397,15 +397,20 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t = gfp_mask, =09struct sk_buff *skb; =09u8 *data; =09bool pfmemalloc; +=09bool clone; =20 -=09cache =3D (flags & SKB_ALLOC_FCLONE) -=09=09? skbuff_fclone_cache : skbuff_head_cache; +=09clone =3D !!(flags & SKB_ALLOC_FCLONE); +=09cache =3D clone ? skbuff_fclone_cache : skbuff_head_cache; =20 =09if (sk_memalloc_socks() && (flags & SKB_ALLOC_RX)) =09=09gfp_mask |=3D __GFP_MEMALLOC; =20 =09/* Get the HEAD */ -=09skb =3D kmem_cache_alloc_node(cache, gfp_mask & ~__GFP_DMA, node); +=09if (!clone && (flags & SKB_ALLOC_NAPI) && +=09 likely(node =3D=3D NUMA_NO_NODE || node =3D=3D numa_mem_id())) +=09=09skb =3D napi_skb_cache_get(); +=09else +=09=09skb =3D kmem_cache_alloc_node(cache, gfp_mask & ~GFP_DMA, node); =09if (unlikely(!skb)) =09=09return NULL; =09prefetchw(skb); @@ -436,7 +441,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gf= p_mask, =09__build_skb_around(skb, data, 0); =09skb->pfmemalloc =3D pfmemalloc; =20 -=09if (flags & SKB_ALLOC_FCLONE) { +=09if (clone) { =09=09struct sk_buff_fclones *fclones; =20 =09=09fclones =3D container_of(skb, struct sk_buff_fclones, skb1); --=20 2.30.1