From patchwork Wed Jan 13 13:37:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Lobakin X-Patchwork-Id: 12016821 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8AECFC433E9 for ; Wed, 13 Jan 2021 13:38:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3FE09233FB for ; Wed, 13 Jan 2021 13:38:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726852AbhAMNiP (ORCPT ); Wed, 13 Jan 2021 08:38:15 -0500 Received: from mail-40136.protonmail.ch ([185.70.40.136]:17434 "EHLO mail-40136.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726222AbhAMNiP (ORCPT ); Wed, 13 Jan 2021 08:38:15 -0500 Date: Wed, 13 Jan 2021 13:37:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail; t=1610545052; bh=q+0EE369dr2h9X/gAhh7q0i4CdC3yGGoUz33tMS3zRg=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=JjOso4hKWYW+3zksOpVBtrjglv3v/DlT8/WAyovGt1tf1EJjVeijNX1S/CfhBuD/e OJDuZqLkG/A7KLlO6ow4Y5t7c0Mwi9F6xTiXNIb+NdQ5+VnF5OnUfLOMNmB59HASx3 lPoBCyuexpmXAgFCBSiYWHGv7KgZfXML0y1V0+GYw0GsLJYW4fGc8zuRFwCualGcjE f57n8B9UApeLSxcPtRPTukeI4hk8w4D9Ij3zvAywLUALGvt4Z5jXYfDNwohYX6IjxT 2Rn+3JomIlO+vT//HHaI7z6ilgZCLSh6vKmViO6AKP19vHjclnyJmLIPit+nqi73gN O8oJBJccyVaqQ== To: "David S. Miller" , Jakub Kicinski From: Alexander Lobakin Cc: Eric Dumazet , Edward Cree , Jonathan Lemon , Willem de Bruijn , Miaohe Lin , Alexander Lobakin , Steffen Klassert , Guillaume Nault , Yadu Kishore , Al Viro , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Reply-To: Alexander Lobakin Subject: [PATCH v2 net-next 3/3] skbuff: recycle GRO_MERGED_FREE skbs into NAPI skb cache Message-ID: <20210113133635.39402-3-alobakin@pm.me> In-Reply-To: <20210113133635.39402-1-alobakin@pm.me> References: <20210113133523.39205-1-alobakin@pm.me> <20210113133635.39402-1-alobakin@pm.me> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Instead of immediate freeing, recycle GRO_MERGED_FREE skbs into NAPI skb cache. This is safe, because napi_gro_receive() and napi_gro_frags() are called only inside NAPI softirq context. 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 7a057b1f1eb8..507f1598e446 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -2888,6 +2888,7 @@ void napi_consume_skb(struct sk_buff *skb, int budget); void __kfree_skb_flush(void); void __kfree_skb_defer(struct sk_buff *skb); +void napi_skb_free_stolen_head(struct sk_buff *skb); /** * __dev_alloc_pages - allocate page for network Rx diff --git a/net/core/dev.c b/net/core/dev.c index e4d77c8abe76..c28f0d601378 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -6054,13 +6054,6 @@ struct packet_offload *gro_find_complete_by_type(__be16 type) } EXPORT_SYMBOL(gro_find_complete_by_type); -static void napi_skb_free_stolen_head(struct sk_buff *skb) -{ - skb_dst_drop(skb); - skb_ext_put(skb); - kmem_cache_free(skbuff_head_cache, skb); -} - static gro_result_t napi_skb_finish(struct napi_struct *napi, struct sk_buff *skb, gro_result_t ret) @@ -6074,7 +6067,7 @@ static gro_result_t napi_skb_finish(struct napi_struct *napi, if (NAPI_GRO_CB(skb)->free == NAPI_GRO_FREE_STOLEN_HEAD) napi_skb_free_stolen_head(skb); else - __kfree_skb(skb); + __kfree_skb_defer(skb); break; case GRO_HELD: diff --git a/net/core/skbuff.c b/net/core/skbuff.c index f42a3a04b918..bf6f92f1f4c7 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -902,9 +902,6 @@ static void napi_skb_cache_put(struct sk_buff *skb) { struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache); - /* drop skb->head and call any destructors for packet */ - skb_release_all(skb); - nc->skb_cache[nc->skb_count++] = skb; if (unlikely(nc->skb_count == NAPI_SKB_CACHE_SIZE)) { @@ -916,6 +913,14 @@ static void napi_skb_cache_put(struct sk_buff *skb) void __kfree_skb_defer(struct sk_buff *skb) { + skb_release_all(skb); + napi_skb_cache_put(skb); +} + +void napi_skb_free_stolen_head(struct sk_buff *skb) +{ + skb_dst_drop(skb); + skb_ext_put(skb); napi_skb_cache_put(skb); } @@ -941,6 +946,7 @@ void napi_consume_skb(struct sk_buff *skb, int budget) return; } + skb_release_all(skb); napi_skb_cache_put(skb); } EXPORT_SYMBOL(napi_consume_skb);