From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 695CAC4167B for ; Mon, 11 Dec 2023 03:53:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D850A6B008C; Sun, 10 Dec 2023 22:53:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D34E56B00A0; Sun, 10 Dec 2023 22:53:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BAD5F6B009E; Sun, 10 Dec 2023 22:53:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id A73B86B0089 for ; Sun, 10 Dec 2023 22:53:37 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 78472A0621 for ; Mon, 11 Dec 2023 03:53:37 +0000 (UTC) X-FDA: 81553168074.30.7BA19BB Received: from mail-io1-f45.google.com (mail-io1-f45.google.com [209.85.166.45]) by imf23.hostedemail.com (Postfix) with ESMTP id 92C98140015 for ; Mon, 11 Dec 2023 03:53:35 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Ejl7sFAl; spf=pass (imf23.hostedemail.com: domain of liangchen.linux@gmail.com designates 209.85.166.45 as permitted sender) smtp.mailfrom=liangchen.linux@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702266815; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ZVUa6NcsCdWv7jZCGAOsNgtw6R7wscnm5fcwcGKxQ5Q=; b=lVSbSVcYUT0A3BgGNMYdOLY2pZlR8GayJn6Phng1rYOQPbT6w7bmQYFPYdaZinp7+N+lvM dvfje0QFRWGFQKii+idu2u0O1/ucfW884xV+zgHpPWc1YvgrJDGogsX2cPc2ZCOohI6o8Z K7v8eBsTG9IQEuFOE1dSPurUOJiIbmY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702266815; a=rsa-sha256; cv=none; b=u0HFjs4ei4M5B6f+Irdd8FF2OWPBkBjtDmBvRTJ5YomMyXQhY53oVX8wP9pJnNcAaZPKQt qS6+onfTmRF9CQ8F7Tq35oLQFCBoYeprgejn/7ga+FvygM7HlTWZc57y/YOmr3KNBOwLVE yleLZndd/0RbHH+rOuqU2j5X0QDWHl4= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Ejl7sFAl; spf=pass (imf23.hostedemail.com: domain of liangchen.linux@gmail.com designates 209.85.166.45 as permitted sender) smtp.mailfrom=liangchen.linux@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-io1-f45.google.com with SMTP id ca18e2360f4ac-7b6f19f3af9so179745739f.3 for ; Sun, 10 Dec 2023 19:53:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702266814; x=1702871614; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZVUa6NcsCdWv7jZCGAOsNgtw6R7wscnm5fcwcGKxQ5Q=; b=Ejl7sFAlV/UMI/dRUzDvd/9J7m7AekGGtfRhat1qclSIgWHFaRo5YViznDiTKQYBe3 41NpcbZauC73PWpGfTwE82eoAjXAhQ9m/e4hlmIqeW68T475q5MjzDFsI7XLOaiUO5eP 9FSTj7G7JHeQliR+pbr4e69wfAhFBl7otssGxOtdF73YbdRm4Z6bCq38ONAMh8InA/i2 3VE+AQKJ3WG8c/lkT72wm/DO3lYIwGWu3qVzUUd2vyV9Ml+0VsSjWVT9OV+gLvcYiL/n W0quZ7Sit7M/bBQG2yq383E5hQaCIXMo/4O3npQLnlQbSOrL5wxm7P5f9aiAufVPCcXt aSSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702266814; x=1702871614; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZVUa6NcsCdWv7jZCGAOsNgtw6R7wscnm5fcwcGKxQ5Q=; b=qnn0RNd4qZp1icCPJamrt1/h+WjBQktS45lRhjsE8sjzV3M7LjvMeq37RjFOJODEEH L9XiW7DDBbPqraSEY+1UPnofkEb4SPEx5kuFFQP7SgH3CwwxveGpoVJIB3VNSGsS8ho7 1dtAxAH4KquCsilqeQYf7y718fUKxkJu6AEBJmTqbxkSyvRCpc4jEa4VakRQ77EKd39e aElNccUBIN3Axghf2JjV1cJWUM1Qx/vnwQDKu9mAENAM90z33IbWRy9rKGSwVRcvel5P MDVBQDzLZ/qXW3p8MFr/gGWOyw/IxoryCO+/LZTbJRemJDkvAe/up5SIx1smn6f/jcp/ a03Q== X-Gm-Message-State: AOJu0Ywzb3rZoFfc7d8QKnJjU+BOdwEDTqiR7pAwpDVfneW3MmKBprnP KwpqTNDESQ7pex04JTFl1rVnlmeO5pE= X-Google-Smtp-Source: AGHT+IFdjnKcGXA1RGpVDmqmZBCacHeqjUYLhgaJubLPawvL/tu4PXYUQAsrkLCPyQemnmeb07fCSA== X-Received: by 2002:a92:ca4b:0:b0:35d:4f54:a9f0 with SMTP id q11-20020a92ca4b000000b0035d4f54a9f0mr7270958ilo.32.1702266814686; Sun, 10 Dec 2023 19:53:34 -0800 (PST) Received: from localhost.localdomain ([89.187.161.180]) by smtp.gmail.com with ESMTPSA id b8-20020a170903228800b001d052d1aaf2sm5411491plh.101.2023.12.10.19.53.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 19:53:33 -0800 (PST) From: Liang Chen To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, hawk@kernel.org, ilias.apalodimas@linaro.org, linyunsheng@huawei.com Cc: netdev@vger.kernel.org, linux-mm@kvack.org, jasowang@redhat.com, almasrymina@google.com, liangchen.linux@gmail.com Subject: [PATCH net-next v8 4/4] skbuff: Optimization of SKB coalescing for page pool Date: Mon, 11 Dec 2023 11:52:43 +0800 Message-Id: <20231211035243.15774-5-liangchen.linux@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20231211035243.15774-1-liangchen.linux@gmail.com> References: <20231211035243.15774-1-liangchen.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 3iueez5girhnfw4jcyzn75fpk9z8xkdu X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 92C98140015 X-Rspam-User: X-HE-Tag: 1702266815-322430 X-HE-Meta: U2FsdGVkX18L6n0fhbtWO6qvuFqghbYap7EHsYp1HZpSEKriTtpXwoaA0FGoxGzxAVJprS/aiEvL7phfki6FadM5GBgOi4YkfV4FHu1o46M+KoeO4ayktaMbfcWG/NzbQnlvl7moI3YIaFh0IHDdOj8J8MdUw7f21OwiBckjB7xGFWc5yNUzWuP0rKy+Yn+mL2VgYV/pbza3ykBqRycFqNS3A1OiHOyqnaucaZ2XE89g9RyirCib3kqdTXRYP8X1aATWrqb6Ue3x3RsJbfKz2XLc0GSY4/PHUjwN2GXzwPprtBugG/CdmCAy88lG2Y/iWki6bL3sQAgUJWGS7/KrTvr+zmc9W1KSFbOH98cyvSVaTyEVS+OgbB5FRfe/M75w4b9xRQgoCIw+MVLSs2GqveZW9swBbFVSsLvvGAZxu6ixPtEoER2yUMtA0kUg5AXMwSU4zFdVHKlVSFUBPCLBgxbLh6cGxXeznDB6zj6Ec1ZrpueJCqdZuxNKj2dM+2XU95LGqTJ3DwGNi/a3gkCk+mB769L2d4n6JubAbVBpcqgUMfvrVEdAc59r9wCCf6er+g7GjZsdix773esZ3NIgUn9MqKo8U/L/TdGjeYTRcKhQ23Tx0tjFIjiy+Aji6mophiuIO6B2sOTWl2Ofc+LqjScSLB9yErmeyVkxWFVQWZibCxmOGYl7YzWZQhtURdnPFU9+dOHArPIKMcuEKz2U51q5eIwMEXB7udobesASfqScoeC5cLeL/JFxwnsOZQYnWeDfJXO6lDoXehrCKyxKbfJuX/LpneqFmTR0pXHYLBZRMhhVZ2ciAInaKCMLHxSUESQxN4taTwA1WckWj0KnIPsDc7helowRSbzglJbgI0GSyLNf/CCFFpwVZVAONLH5WbSU6QuVEQ70GhwO7mLjre4RbLKFlK2amVxmofjw8R0panv+oXfGPEKJ7eFXRdZdqsXGiPx2GvxX0MHTaPo 1ijlLiGE XvXFuC9u4xFxuAbvraefy09xTPxgAJfMjtgBKO+hNsBts5q+qdWwG+bwi4w8jdchpQfMD/DR2JP6Z59KN7HYd3jdRRfk+jELDlDnurzqNCr6XV4NErQR0pXb3O2rNL2I+ucPbpBu9tCgfdy6IxwSQNVs7UY0gj6BiAXf4dfK2zxD2wLJYom6UM4dHRPtTITyPoTYjD6suk8UP46hqH8I4PmG+rnxOPVihGkAfqfODETkOALcMgw4t+75wE9agYIhVQEFeNEZ2s5LnDTr4RZ9TD5n68zMa4uvGqbrsXrDLUSdTFS2xeOL85kOAoKDVGPpdPHTx0+PJXTBR/Y/7z88e0bzzGwz7/ZJjx1XAg1Y3jtSlJATZ6XeHqy0pMEs8tfusA03ZgEaEH2PI0j+OdAExKvaIVnmANj/6HmsQjBoo7PiyYolwVoG3X9uAZaWqLYwZJy5oAIFskDqyiP5HeBMR8SKMeO2njSczPcSXYmSNnbpXANzo7l2ljwOwE66KShJ6s7KJEzttOwueRjL87S53/gSplLQnGTaiMKro5X6i0fctYGkIEV4I3RQEpdFnuhW+mC4EAv6eP6DB8efAUDVP8UZEdg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: In order to address the issues encountered with commit 1effe8ca4e34 ("skbuff: fix coalescing for page_pool fragment recycling"), the combination of the following condition was excluded from skb coalescing: from->pp_recycle = 1 from->cloned = 1 to->pp_recycle = 1 However, with page pool environments, the aforementioned combination can be quite common(ex. NetworkMananger may lead to the additional packet_type being registered, thus the cloning). In scenarios with a higher number of small packets, it can significantly affect the success rate of coalescing. For example, considering packets of 256 bytes size, our comparison of coalescing success rate is as follows: Without page pool: 70% With page pool: 13% Consequently, this has an impact on performance: Without page pool: 2.57 Gbits/sec With page pool: 2.26 Gbits/sec Therefore, it seems worthwhile to optimize this scenario and enable coalescing of this particular combination. To achieve this, we need to ensure the correct increment of the "from" SKB page's page pool reference count (pp_ref_count). Following this optimization, the success rate of coalescing measured in our environment has improved as follows: With page pool: 60% This success rate is approaching the rate achieved without using page pool, and the performance has also been improved: With page pool: 2.52 Gbits/sec Below is the performance comparison for small packets before and after this optimization. We observe no impact to packets larger than 4K. packet size before after improved (bytes) (Gbits/sec) (Gbits/sec) 128 1.19 1.27 7.13% 256 2.26 2.52 11.75% 512 4.13 4.81 16.50% 1024 6.17 6.73 9.05% 2048 14.54 15.47 6.45% 4096 25.44 27.87 9.52% Signed-off-by: Liang Chen Reviewed-by: Yunsheng Lin Suggested-by: Jason Wang --- include/net/page_pool/helpers.h | 5 ++++ net/core/skbuff.c | 41 +++++++++++++++++++++++---------- 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/include/net/page_pool/helpers.h b/include/net/page_pool/helpers.h index d0c5e7e6857a..0dc8fab43bef 100644 --- a/include/net/page_pool/helpers.h +++ b/include/net/page_pool/helpers.h @@ -281,6 +281,11 @@ static inline long page_pool_unref_page(struct page *page, long nr) return ret; } +static inline void page_pool_ref_page(struct page *page) +{ + atomic_long_inc(&page->pp_ref_count); +} + static inline bool page_pool_is_last_ref(struct page *page) { /* If page_pool_unref_page() returns 0, we were the last user */ diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 7e26b56cda38..3c2515a29376 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -947,6 +947,24 @@ static bool skb_pp_recycle(struct sk_buff *skb, void *data, bool napi_safe) return napi_pp_put_page(virt_to_page(data), napi_safe); } +/** + * skb_pp_frag_ref() - Increase fragment reference count of a page + * @page: page of the fragment on which to increase a reference + * + * Increase fragment reference count (pp_ref_count) on a page, but if it is + * not a page pool page, fallback to increase a reference(_refcount) on a + * normal page. + */ +static void skb_pp_frag_ref(struct page *page) +{ + struct page *head_page = compound_head(page); + + if (likely(is_pp_page(head_page))) + page_pool_ref_page(head_page); + else + page_ref_inc(head_page); +} + static void skb_kfree_head(void *head, unsigned int end_offset) { if (end_offset == SKB_SMALL_HEAD_HEADROOM) @@ -5769,17 +5787,12 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, return false; /* In general, avoid mixing page_pool and non-page_pool allocated - * pages within the same SKB. Additionally avoid dealing with clones - * with page_pool pages, in case the SKB is using page_pool fragment - * references (page_pool_alloc_frag()). Since we only take full page - * references for cloned SKBs at the moment that would result in - * inconsistent reference counts. - * In theory we could take full references if @from is cloned and - * !@to->pp_recycle but its tricky (due to potential race with - * the clone disappearing) and rare, so not worth dealing with. + * pages within the same SKB. In theory we could take full + * references if @from is cloned and !@to->pp_recycle but its + * tricky (due to potential race with the clone disappearing) and + * rare, so not worth dealing with. */ - if (to->pp_recycle != from->pp_recycle || - (from->pp_recycle && skb_cloned(from))) + if (to->pp_recycle != from->pp_recycle) return false; if (len <= skb_tailroom(to)) { @@ -5836,8 +5849,12 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, /* if the skb is not cloned this does nothing * since we set nr_frags to 0. */ - for (i = 0; i < from_shinfo->nr_frags; i++) - __skb_frag_ref(&from_shinfo->frags[i]); + if (from->pp_recycle) + for (i = 0; i < from_shinfo->nr_frags; i++) + skb_pp_frag_ref(skb_frag_page(&from_shinfo->frags[i])); + else + for (i = 0; i < from_shinfo->nr_frags; i++) + __skb_frag_ref(&from_shinfo->frags[i]); to->truesize += delta; to->len += len; -- 2.31.1