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 C6DC6C4332F for ; Tue, 12 Dec 2023 04:47:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4A2296B0284; Mon, 11 Dec 2023 23:47:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 451AD6B0285; Mon, 11 Dec 2023 23:47:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2F3B86B0286; Mon, 11 Dec 2023 23:47:17 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 1B2CF6B0284 for ; Mon, 11 Dec 2023 23:47:17 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id DBFA71C11B4 for ; Tue, 12 Dec 2023 04:47:16 +0000 (UTC) X-FDA: 81556932072.23.88596D0 Received: from mail-yw1-f179.google.com (mail-yw1-f179.google.com [209.85.128.179]) by imf09.hostedemail.com (Postfix) with ESMTP id 12B4E140003 for ; Tue, 12 Dec 2023 04:47:14 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=kRkkvr8h; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf09.hostedemail.com: domain of liangchen.linux@gmail.com designates 209.85.128.179 as permitted sender) smtp.mailfrom=liangchen.linux@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702356435; 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=sFWemhcq3iWkKRI6tn/zqc4e/tC1iGvS7MPKFXTRkH8=; b=uM7P3Exq0rvrdqXwSS8QCLFzptHVGpM+b8nJDAZQH2Y0Scwbq50boUwK6ZkgnDl+cIhf/j F/w3kjn0z0y0Qpt8bKfsSFrwNR/xLlcV1Jdz+kDd8kpKBadQHhLzi9F9kczyVjdrPv9FCl 5Sp4gbd0SfKusKNqgV9pey+FCfMwqOo= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=kRkkvr8h; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf09.hostedemail.com: domain of liangchen.linux@gmail.com designates 209.85.128.179 as permitted sender) smtp.mailfrom=liangchen.linux@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702356435; a=rsa-sha256; cv=none; b=QR594skGYumVBhz8wKXbH6h+hqeNefRCDb3EP1mF7pIzTzANzH5ztP6eVYXkYCPEmoBldp JEFhYGkerzdDCpKajV+4mkUrKupJDCtBXgpAE26mjSFlKvlqCtrYgk0DipcyCdC2SDwrMB U5lHWq18xk4xymQKt1vxUtIGrC71xQY= Received: by mail-yw1-f179.google.com with SMTP id 00721157ae682-5d74186170fso46638437b3.3 for ; Mon, 11 Dec 2023 20:47:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702356434; x=1702961234; 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=sFWemhcq3iWkKRI6tn/zqc4e/tC1iGvS7MPKFXTRkH8=; b=kRkkvr8hq7jU0cA07jC3TKWuzCpadagz5X8Aw0ahz0lMl4TGiwcjeOvU8Nry91RCUF L95Z9RcYfMP/stJAv8dfo/s/J/G4+cqI4fTI+MEGACgrJalCwIOSxQtW1+UkAN88H7y+ OZXXrRvMLpf8DCyfKjLscFQFweQB+DL+l3mJ7GO8rCR5pxlLc+VPaw/nRj1LXvVxCxNF 9A95mU/5zzCzTMqR7xe1BdnyUn9z4ZrhmQguzEXvY3eYthYEwakuNqXtLTprRVFeLyHb GlINtNK6VIHXDe+UA6oRXnND3F0gIPITAvlu1vKa/NU2M49tp5TCJ79u51wCbBoaJ0ed IYjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702356434; x=1702961234; 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=sFWemhcq3iWkKRI6tn/zqc4e/tC1iGvS7MPKFXTRkH8=; b=kfuYijqBU0W/kT+DvFuAWa3tdmNFoQlMBWxODGHeoWVNhSrKH3HFQiy9LPtrcvGLXy g4wBZZ02HKG/btLpBuNOjQISKuxS5vzu5i2bfY1/TCUJlWx7XHflu92I9c99ZJD3kF/H nzO0dzuVENGASk8WJmH93O1NmeGvth+6v8DvV35optrBbN2Kgu+l0GLSlgBD0vc5GxgR PKkvW3i4fjLXgKaGwGsX+2rgh7KY+pOHpOnn8u6NmcszumAyBe5bjNyavhOpXEYugvhe jNEB6TlxHmgFz0gmEFc5z2M8NfyiZYLxXspMXoRQo4V0dmY7zQhvL41MVB/cUf7QffSJ 097g== X-Gm-Message-State: AOJu0YzgcCAqfTYiOiiqlgIrPOAKf9tIH2GbGe+EIo8OnAfPMMHCjsyU ZQlcJ8VfNdPwDW0Gp2p3HrzAsAkH9mohzw== X-Google-Smtp-Source: AGHT+IHzrYMNGS990OVpZeccdIFHJ3aA/asumUK1WJAgqD5HD7+Ei5kNU/2+qXlJ0rbhtv3Loc2p4A== X-Received: by 2002:a0d:f486:0:b0:5d7:1940:7d85 with SMTP id d128-20020a0df486000000b005d719407d85mr4186163ywf.92.1702356433985; Mon, 11 Dec 2023 20:47:13 -0800 (PST) Received: from localhost.localdomain ([89.187.161.180]) by smtp.gmail.com with ESMTPSA id c3-20020a170902848300b001d33e6521b9sm36143plo.14.2023.12.11.20.47.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 20:47:13 -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 v9 4/4] skbuff: Optimization of SKB coalescing for page pool Date: Tue, 12 Dec 2023 12:46:14 +0800 Message-Id: <20231212044614.42733-5-liangchen.linux@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20231212044614.42733-1-liangchen.linux@gmail.com> References: <20231212044614.42733-1-liangchen.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: cbq6d945fd8ctqptpmu9aa9kcjkcoezj X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 12B4E140003 X-HE-Tag: 1702356434-623809 X-HE-Meta: U2FsdGVkX19CL+5p0hAO3SZYVXPmuP35EBr5tSTyUnCdjZgMMP+mSeBc/tlTch4VnkfsN1dH+YnxKzsGvbpOO4z1smtuyt4jo+PQLWxuEH3OUL8KTVCWz6oHNsE7bKG+sME4mlyUg/7dK7lUvFYCAW5JE4x3edFN9kkMhwwB09zHCrvpbcMfJanq7lIxPAglQus9lM/4zj5YmLUYLkr7ZRNrZEsQIm/KXif2JbaCaH5UFBEx8AtjiAFBdkMrWwh2Grjh6R+snyOJrlsQ6qo/Q0AQ5f7zH9lnAG4fYzdCFf9wp99SjJP8BSAWrLB3xGYLGlXatS+qxPwUzNiOaD0O1PMp02QFHrWIpJS37m/pB75aE8vyXFCrQSm+t7I9PmDGVn2vOEFOrSgApHh6KPGQ+Ek7h0lTdnD8cm9ZvoI/COIFPm+ZRBZsaQzpXe6MiDksUshWHqH2ECEcGW7TnFYybEUb5MLqgJoOY7nqVyTkB5nVHQQ2gkNuulrnbKBeE3JC54WkAbiqRvVBONAGe2Z+9YIDz2Jk8MD//p+yaXGQO9g7Ah7FbZjufxPsxo/VH/pfIxYioo8UdGWBzHRBLROiX1p++tDgb56seE4lW4ICp6YQWu4N17nPVADBlpZtyXQRhnyNcPr+RguZCQz4+XbSSrte1O/vVC1vfZexHDeQSfx8EiB7NzP+fcJqCGB0f3MxdaxQfahPfHWlRMDJqPnP4BsIS+uIBo+FgDVdU8j6ZAvWx8ggCDw0ogZEq7grVknlbIZseOzU2O+VMRsgqPNrwpZ/FM/hGzRpYrFR21hmVOo/kQMLNL0hTSUSVY9WEeHzjS6FsdCKrSLNMrouccZxgDgkbZbGhNTLcohfyqmbD/Mq1SlZsXeJRsrgq16QE+UfJraqK1Gek8WxNWnsvR+IdiRlAKwl8EZBWgOIhK1Yu5Ou8ePNOyPpidqB+0YHxbLvdOtsKaC3qI5evizhbCp vm7O5FBe euuZR3pYtz6CV/rEpSQVBfOYuCvlfrB0qf2fzNohHdg0uSn3QyE4bk5FQeQ/16suqFq0sL6sVtT1oL6000Y20LZN2YLDdgeppU4LMC/XhCdJ1T8hIo5xm+bbPOBRT6XazLZIGdZrVqPVBQpHN+zTql7bhylcq/nXURM2s/+MHJEWjJuTRWGzDvIftLvXZSNd9oWBksx9y8mzYHea//+qllEfLdDVVzvdSlvA1xkazaqVHyanpo/nJBsmA4GqLvOvj4WJhRoZbWk7yTfMQE6SjurE3jKjzoOcizMBUTD/YvQtmaB0WrRdO5EmzJ3dKRmrZBvHhB3xacUcFFLzt37NDaovdIEiMf2M1Ead5W5HH9uPn5C8U5yWEhKHkDlpA492RLuNSy7ZQ8RgAn/8vvCQbo21YJQ4GV8WjxgOXhi3g3bTni7DH3QKVIE1LGGi4/zymickf4uht8Gbr+0KOeaM73bV9hCVttnddRpUlcnGa7KsgheqauZs/zHibg23o2w1I8PO9OXdVWa4giAH8CK246q9nCNPnz6tmrii7EQiVLMF5xJpHkFKuhv/RcFmy7mhU0hgnBXcpQh+f5crxbZybecLkEAhqNCDrrCy/ 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 | 43 ++++++++++++++++++++++++--------- 2 files changed, 36 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..783a04733109 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -947,6 +947,26 @@ 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 the fragment reference count (pp_ref_count) of a page. This is + * intended to gain a fragment reference only for page pool aware skbs, + * i.e. when skb->pp_recycle is true, and not for fragments in a + * non-pp-recycling skb. It has a fallback to increase a reference on a + * normal page, as page pool aware skbs may also have normal page fragments. + */ +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 +5789,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 +5851,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