Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp909388pxb; Tue, 9 Feb 2021 16:20:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJz8dgpPyq2cTvulcT+DIpgMkOHRPS+4JT+o8eb8H6bC6GX4g/WFSoMjPmO0tUi7wr1JZZxK X-Received: by 2002:a05:6402:402:: with SMTP id q2mr756563edv.116.1612916450415; Tue, 09 Feb 2021 16:20:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612916450; cv=none; d=google.com; s=arc-20160816; b=WoTiyULC+DwxUgeUS46UcgPL9zBgESBFEGSs1/33aHbUddp/PH3kRfIS2GGFZti9XR hF94TVKnl6nM8ppl6jWG5huwHCrFr8QCet738YHvppuaitroe8a+Gihb17RoIQLz583H mCKMZWUfGo0zChsfymrbpHbPKY5TUwjic84GG92ipoIVP/qSS2uoxokFNHQau1uk+ycB /ua/fY1q3mZT2MN2eDWqcmpxM2wK4S3F3T3R+kYnFUEDZdSqXw48kltGId8QNRxbSc2+ mJPxqYsMaZ3fyF+KoGNx0FTBtvAi1rWAuiZe5Gq2AYeByvaWXsWbEUbO+WI47XVrl/HG kpAA== 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=hDcvm3I1usK8Mp4wrfq9qJ216nYvewc8ajVIpsly8xw=; b=iJDU+mGON2le75rBSh8F95Yd7hMtDbuoepGtnsEjCvWHUfxmQxPr/NzWkskTOCRr/+ BVe6CAvmXzIhKYVZ2ldWcNZDaBfHINrJiBRdlS6SFsAXfrAZOT0eywn+yl22KT+nCF8Q as3WJKQ2a+lpLXHfaoR/d/GbcdA6CZcEVu5Ef469c3LJsJHbgRuUZjREC1WicNO9DaOa kx8+eyGl8wzwUHBOWlR4Fi4q/lrlK4oMk29uWQYN6MnV3VlwU0ZHiZU5gRQdyFrdlpCI wZ5Vmj71AOPViKSJHKjbYM6VyyffbaA4OjDUKHJN7w3jWeMqY+mBrzWuug/4N/bsjL48 Lkkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pm.me header.s=protonmail header.b=Q1r9YNcK; 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 mf22si191315ejb.46.2021.02.09.16.20.27; Tue, 09 Feb 2021 16:20:50 -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=Q1r9YNcK; 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 S234742AbhBJASI (ORCPT + 99 others); Tue, 9 Feb 2021 19:18:08 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:14072 "EHLO mail-40131.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234072AbhBIUuU (ORCPT ); Tue, 9 Feb 2021 15:50:20 -0500 Date: Tue, 09 Feb 2021 20:49:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail; t=1612903778; bh=hDcvm3I1usK8Mp4wrfq9qJ216nYvewc8ajVIpsly8xw=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=Q1r9YNcKYVYQN30xsJRU37z3WfBhThWeGyroYTGTYZsFOS8Bowbel0iNEptyiJ4x9 h/jKzie6Rx0DIezVZLUdJCAc/U8ooUMMCEV6sityGhDGGNrpDMvrYqdRZyoEzxCh1h 0XMD8/XjF0RaHmEBvkzbVUNuguv7mRTQLV4qC3roT3VZg3nM62COwkqcWTB+gWOtib v8K1gyqD5VC9B10akYBpbxSOxYe3eRLiH5swFlB+yFq/hCcVq8Gr/z6PbHLR5EEyv7 0DadsEajDkH96mqsg0YOZnkqKRhTx63xworLuuPc5NAxC37Rp4EYHBlLGnZs5hgWmA /hs8LvwwTaPYA== 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 , 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 , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Reply-To: Alexander Lobakin Subject: [v3 net-next 10/10] skbuff: queue NAPI_MERGED_FREE skbs into NAPI cache instead of freeing Message-ID: <20210209204533.327360-11-alobakin@pm.me> In-Reply-To: <20210209204533.327360-1-alobakin@pm.me> References: <20210209204533.327360-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 napi_frags_finish() and napi_skb_finish() can only be called inside NAPI Rx context, so we can feed NAPI cache with skbuff_heads that got NAPI_MERGED_FREE verdict instead of immediate freeing. Replace __kfree_skb() with __kfree_skb_defer() in napi_skb_finish() and move napi_skb_free_stolen_head() to skbuff.c, so it can drop skbs to NAPI cache. As many drivers call napi_alloc_skb()/napi_get_frags() on their receive path, this becomes especially useful. Signed-off-by: Alexander Lobakin --- include/linux/skbuff.h | 1 + net/core/dev.c | 9 +-------- net/core/skbuff.c | 12 +++++++++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 5bb443d37bf4..f8737ad91cc7 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -2919,6 +2919,7 @@ static inline struct sk_buff *napi_alloc_skb(struct n= api_struct *napi, } void napi_consume_skb(struct sk_buff *skb, int budget); =20 +void napi_skb_free_stolen_head(struct sk_buff *skb); void __kfree_skb_defer(struct sk_buff *skb); =20 /** diff --git a/net/core/dev.c b/net/core/dev.c index 135d46c0c3c7..68ad03382f6a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -6056,13 +6056,6 @@ struct packet_offload *gro_find_complete_by_type(__b= e16 type) } EXPORT_SYMBOL(gro_find_complete_by_type); =20 -static void napi_skb_free_stolen_head(struct sk_buff *skb) -{ -=09skb_dst_drop(skb); -=09skb_ext_put(skb); -=09kmem_cache_free(skbuff_head_cache, skb); -} - static gro_result_t napi_skb_finish(struct napi_struct *napi, =09=09=09=09 struct sk_buff *skb, =09=09=09=09 gro_result_t ret) @@ -6076,7 +6069,7 @@ static gro_result_t napi_skb_finish(struct napi_struc= t *napi, =09=09if (NAPI_GRO_CB(skb)->free =3D=3D NAPI_GRO_FREE_STOLEN_HEAD) =09=09=09napi_skb_free_stolen_head(skb); =09=09else -=09=09=09__kfree_skb(skb); +=09=09=09__kfree_skb_defer(skb); =09=09break; =20 =09case GRO_HELD: diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 8850086f8605..6dbc486c1d68 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -872,9 +872,6 @@ static void napi_skb_cache_put(struct sk_buff *skb) =09struct napi_alloc_cache *nc =3D this_cpu_ptr(&napi_alloc_cache); =09u32 i; =20 -=09/* drop skb->head and call any destructors for packet */ -=09skb_release_all(skb); - =09kasan_poison_object_data(skbuff_head_cache, skb); =09nc->skb_cache[nc->skb_count++] =3D skb; =20 @@ -891,6 +888,14 @@ static void napi_skb_cache_put(struct sk_buff *skb) =20 void __kfree_skb_defer(struct sk_buff *skb) { +=09skb_release_all(skb); +=09napi_skb_cache_put(skb); +} + +void napi_skb_free_stolen_head(struct sk_buff *skb) +{ +=09skb_dst_drop(skb); +=09skb_ext_put(skb); =09napi_skb_cache_put(skb); } =20 @@ -916,6 +921,7 @@ void napi_consume_skb(struct sk_buff *skb, int budget) =09=09return; =09} =20 +=09skb_release_all(skb); =09napi_skb_cache_put(skb); } EXPORT_SYMBOL(napi_consume_skb); --=20 2.30.0