From patchwork Mon Feb 5 12:45:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 13545465 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 01EB3C4828D for ; Mon, 5 Feb 2024 12:46:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 618EC6B009C; Mon, 5 Feb 2024 07:46:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5C9256B00A0; Mon, 5 Feb 2024 07:46:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4BA756B00A1; Mon, 5 Feb 2024 07:46:06 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 3C1C46B009C for ; Mon, 5 Feb 2024 07:46:06 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 113BA1A0438 for ; Mon, 5 Feb 2024 12:46:06 +0000 (UTC) X-FDA: 81757722732.19.06BFD65 Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) by imf17.hostedemail.com (Postfix) with ESMTP id AE45240019 for ; Mon, 5 Feb 2024 12:46:02 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf17.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.190 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707137164; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Wkd2OepaMjTzlB5F2KrAOreMEtIW1aTfnZzX2XDDQ4o=; b=JM4rC2NcKurJ+BfS3bd9Co1Y1a/h9nAY97/+rjQ3a4Zjgjp8mG2BhZVcgjNVbABNkyNPk6 WuRV8is0xlADHbm8vtZHbrGpp7JZQvefNCkbnlrg8DnwUMhSp/0/rLoRZh6083h8D4v44z Kii9+htIsddBGXg2C3flR3tIxqyDG28= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf17.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.190 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707137164; a=rsa-sha256; cv=none; b=EF3vCTyV06PABlcmqBldnAhw2nv88AqeZN2BVRpWvUmBsPhPyS+RsX2grcyAb8jps5LH+c kvC4ggJFsJ9IOjEJr+2sxGX1+WTZZ1exexQRHENKt2hn3KTir4hoI8y903I/swkDI4M0ph qaslnaJKDLi6nYEfhT3T5KbgLnKm0iY= Received: from mail.maildlp.com (unknown [172.19.88.163]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4TT5gS3XPkz1xnGT; Mon, 5 Feb 2024 20:44:52 +0800 (CST) Received: from dggpemm500005.china.huawei.com (unknown [7.185.36.74]) by mail.maildlp.com (Postfix) with ESMTPS id ECC2F180060; Mon, 5 Feb 2024 20:45:57 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by dggpemm500005.china.huawei.com (7.185.36.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 5 Feb 2024 20:45:57 +0800 From: Yunsheng Lin To: , , CC: , , Yunsheng Lin , Alexander Duyck , Andrew Morton , Eric Dumazet , Subject: [PATCH net-next v5 1/5] mm/page_alloc: modify page_frag_alloc_align() to accept align as an argument Date: Mon, 5 Feb 2024 20:45:01 +0800 Message-ID: <20240205124506.57670-2-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240205124506.57670-1-linyunsheng@huawei.com> References: <20240205124506.57670-1-linyunsheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500005.china.huawei.com (7.185.36.74) X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: AE45240019 X-Stat-Signature: pt7ci7wwqx5idpsqzjyj539po6joesuc X-Rspam-User: X-HE-Tag: 1707137162-376967 X-HE-Meta: U2FsdGVkX19JmhwAQqMP8G/xL1Q3dQm6tHKb3R/cM4iGc1BZsKwWVGD8Jypg1eZ3dxgzO6FYKNkaOGki3cAzyuhZP0UnkxjiXgszGDG3cyTyMhSyGXQyBDZXIeSuB3q3rMsLABr5B5P1wvNhciz2ZOW58cAoAGgtHDqMZOxX7OAPCocM38bRvNiIuY0QPoiH8uciwIiWak9IJnC/XYet7ng8Pl5qK/ZSmqmT5IA8hKAPT9TSLUMXKkHrf7QpsxGYcKjASM1usUikY3BTtOIDgAwpHVNtfvU+Oac2lkTfrkvQUuEHlp5UVFQSVYzw2g4d4V9amrQRehqOobrU3Q3lPbBXXfp81hFLcyI0G7BNRLlF6xVd//LkDbPacv6demKSyu5l9/FmulDEtvt4FziP95c6c/kPMFsYGfkInRECpua+kZW3hSF9p/6mbU/Yvh4kTgJsT6vGPkwiAfb5Zm1R3tjDhVY//ecc/bBepf49oGltWNJ0spnkI5P3xS2gZ/TkqZuEz6VIUBje7rYGLeXTELCtqi/l4Oq3Qcg4+dTt8gVgh6sgdGqxktOgIXMREc/kaKE9WbRJMdmWh5pmDj8Va1zdP5FizQwIH+itqfJPIi2h6ViKFduszKkt9Z6+XGP2tG07K6TmZabgLJ735e3LNTevZKuL2Gbtq3AAVB7cSFt/8UeS/8TaS3whxcVD3AJF+/OOiaTlX43SpRT1nYffETB84FG58cCX0oOes69i/WruNXCoNKPs65eAP2S0G0KpzYy5H2x0qtb9/qOy/Svo30iFlp6XGMV1dFCOOaLLjZRNwICc7Na152QZOVNlbIi8Zxs6Iy5AKPOA6dcTomXLbKI1OoIbj5MnT8tmmcCzqikckEcko6ap4YXEPwTHeKEiBptNHkaj5d1WvJdNDrpZwhqcVjUjfmqMJpbYv6chRrvmJLhFX0mDGTTVPthshLtCUVbUz58t5+0CuWgNr97 QuUzr4zx rGV/tG2Z212baHrLg+nAT7dd0H08/4mMGc1+NPk0wOlBWPawanr5bTirkexS0I0SzFdReCbqZVz8e27aSvFOSNnBRoKworc8MiLjkLUnAbwFOeEtvg0djYfwXO23WM737ibQdKEOWIav8gJlB7WwkxRV3RSvfheQmth4AAcgpOPMABBTkCmuySk/182uIxIDDLBfJUoypMWPVlgnjtFU7DMF12MetAyjne6lbVeaA6mSej+bWOHQCCJsdS45urM4pQvC943VfBpCGYhexO4e9zaE+a4ZDAT/R+OYW 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: napi_alloc_frag_align() and netdev_alloc_frag_align() accept align as an argument, and they are thin wrappers around the __napi_alloc_frag_align() and __netdev_alloc_frag_align() APIs doing the alignment checking and align mask conversion, in order to call page_frag_alloc_align() directly. The intention here is to keep the alignment checking and the alignmask conversion in in-line wrapper to avoid those kind of operations during execution time since it can usually be handled during compile time. We are going to use page_frag_alloc_align() in vhost_net.c, it need the same kind of alignment checking and alignmask conversion, so split up page_frag_alloc_align into an inline wrapper doing the above operation, and add __page_frag_alloc_align() which is passed with the align mask the original function expected as suggested by Alexander. Signed-off-by: Yunsheng Lin CC: Alexander Duyck --- include/linux/gfp.h | 15 +++++++++++---- mm/page_alloc.c | 8 ++++---- net/core/skbuff.c | 9 ++++++--- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index de292a007138..28aea17fa59b 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -312,14 +312,21 @@ extern void free_pages(unsigned long addr, unsigned int order); struct page_frag_cache; extern void __page_frag_cache_drain(struct page *page, unsigned int count); -extern void *page_frag_alloc_align(struct page_frag_cache *nc, - unsigned int fragsz, gfp_t gfp_mask, - unsigned int align_mask); +void *__page_frag_alloc_align(struct page_frag_cache *nc, unsigned int fragsz, + gfp_t gfp_mask, unsigned int align_mask); + +static inline void *page_frag_alloc_align(struct page_frag_cache *nc, + unsigned int fragsz, gfp_t gfp_mask, + unsigned int align) +{ + WARN_ON_ONCE(!is_power_of_2(align)); + return __page_frag_alloc_align(nc, fragsz, gfp_mask, -align); +} static inline void *page_frag_alloc(struct page_frag_cache *nc, unsigned int fragsz, gfp_t gfp_mask) { - return page_frag_alloc_align(nc, fragsz, gfp_mask, ~0u); + return __page_frag_alloc_align(nc, fragsz, gfp_mask, ~0u); } extern void page_frag_free(void *addr); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 150d4f23b010..c0f7e67c4250 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -4708,9 +4708,9 @@ void __page_frag_cache_drain(struct page *page, unsigned int count) } EXPORT_SYMBOL(__page_frag_cache_drain); -void *page_frag_alloc_align(struct page_frag_cache *nc, - unsigned int fragsz, gfp_t gfp_mask, - unsigned int align_mask) +void *__page_frag_alloc_align(struct page_frag_cache *nc, + unsigned int fragsz, gfp_t gfp_mask, + unsigned int align_mask) { unsigned int size = PAGE_SIZE; struct page *page; @@ -4779,7 +4779,7 @@ void *page_frag_alloc_align(struct page_frag_cache *nc, return nc->va + offset; } -EXPORT_SYMBOL(page_frag_alloc_align); +EXPORT_SYMBOL(__page_frag_alloc_align); /* * Frees a page fragment allocated out of either a compound or order 0 page. diff --git a/net/core/skbuff.c b/net/core/skbuff.c index edbbef563d4d..5b858128463f 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -297,7 +297,8 @@ void *__napi_alloc_frag_align(unsigned int fragsz, unsigned int align_mask) fragsz = SKB_DATA_ALIGN(fragsz); - return page_frag_alloc_align(&nc->page, fragsz, GFP_ATOMIC, align_mask); + return __page_frag_alloc_align(&nc->page, fragsz, GFP_ATOMIC, + align_mask); } EXPORT_SYMBOL(__napi_alloc_frag_align); @@ -309,13 +310,15 @@ void *__netdev_alloc_frag_align(unsigned int fragsz, unsigned int align_mask) if (in_hardirq() || irqs_disabled()) { struct page_frag_cache *nc = this_cpu_ptr(&netdev_alloc_cache); - data = page_frag_alloc_align(nc, fragsz, GFP_ATOMIC, align_mask); + data = __page_frag_alloc_align(nc, fragsz, GFP_ATOMIC, + align_mask); } else { struct napi_alloc_cache *nc; local_bh_disable(); nc = this_cpu_ptr(&napi_alloc_cache); - data = page_frag_alloc_align(&nc->page, fragsz, GFP_ATOMIC, align_mask); + data = __page_frag_alloc_align(&nc->page, fragsz, GFP_ATOMIC, + align_mask); local_bh_enable(); } return data;