From patchwork Wed Feb 28 09:30:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 13575102 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 0F547C54E41 for ; Wed, 28 Feb 2024 09:32:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A10256B00A0; Wed, 28 Feb 2024 04:32:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9C0BB6B00A2; Wed, 28 Feb 2024 04:32:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8AFEC6B00A3; Wed, 28 Feb 2024 04:32:03 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 7B4786B00A0 for ; Wed, 28 Feb 2024 04:32:03 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 568C680F20 for ; Wed, 28 Feb 2024 09:32:03 +0000 (UTC) X-FDA: 81840696126.26.2E95314 Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) by imf27.hostedemail.com (Postfix) with ESMTP id 716C340010 for ; Wed, 28 Feb 2024 09:32:00 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf27.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709112721; a=rsa-sha256; cv=none; b=iBVkjZKiBrA3jeV+yGl6JJIzjka9GNc5zeFh8xOioWaDLyCwj2+GVK3UTo1GAFAlXo96rX CcXOhMEQNOKYxp2PMt/9iVD/bN3hW2bW1HAEG+zvdA0RsVN/wbvsjev+wwNzHQaJx4G3Pb IakyijCvwD6PJ8Z5tex4Zrv2NCL+S60= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf27.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.32 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=1709112721; 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=fsCym9aHBeJvlUtY57kt8x1IP0isH1vXizI9Lm8sOsM=; b=BN0Kp/KidNZ9EeZ/GTm/FYbIn7icXgUqe2LFteTWUdZjRwnXQqvNYDihxX7kPTuA1YfLK5 8P67mwCegYmoZpssgfM36+GoNQtwmTfbRzPMInT+Ec9A8hSnEkqxdYEuqZ6EQvViUehig+ 3pqhbGrRVfnfsUAJAqqTU3iN6F5VHjo= Received: from mail.maildlp.com (unknown [172.19.163.17]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4Tl8HW1WW4zqjHD; Wed, 28 Feb 2024 17:31:19 +0800 (CST) Received: from dggpemm500005.china.huawei.com (unknown [7.185.36.74]) by mail.maildlp.com (Postfix) with ESMTPS id 5F7F01A0172; Wed, 28 Feb 2024 17:31:56 +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_256_GCM_SHA384) id 15.1.2507.35; Wed, 28 Feb 2024 17:31:56 +0800 From: Yunsheng Lin To: , , CC: , , Yunsheng Lin , Alexander Duyck , Andrew Morton , Eric Dumazet , Subject: [PATCH net-next v6 1/5] mm/page_alloc: modify page_frag_alloc_align() to accept align as an argument Date: Wed, 28 Feb 2024 17:30:08 +0800 Message-ID: <20240228093013.8263-2-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240228093013.8263-1-linyunsheng@huawei.com> References: <20240228093013.8263-1-linyunsheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500005.china.huawei.com (7.185.36.74) X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 716C340010 X-Stat-Signature: w8dp3kzhycnpgudwhknw1f5necuqqigj X-Rspam-User: X-HE-Tag: 1709112720-405809 X-HE-Meta: U2FsdGVkX1/AZADzXxo+SUN5InTyl9FjnEsQ9WvdAe0Y3tsg8KSIbqHd36CpmCBtqIMzzWgwW3snazfv4LenpnTH25bnWIMK6UgC8Osn+WcHzgQIjVjmzmU7d06yd8S4R9UWH8jaXxOniQnfvWAcNkDO14eW6sGqwZHi5sZ1OART/Z/+6OSWZ5oy5eXbQQ1ZW+WtyrcOPkFaw/kpBpwTz5sI2mAGWHuqck0b+on9GywYtdIIj3PUWY+KOc1bFE0OKL2DtzSXUNLCwH11adPk8HnWqNYqqgLmTKpA/w/XKK0paGPrLyNlb/CTQY1bdPbjex4fjvZLbrF7HmxuiOH318IFuWujX5jFnXgFJ2loAYsgV6rW+rQTFdaKXpnntNZfpe5FBsz3I1RFCdUaN/mk2nKvQZirVDem1VhyzMpgS9LyJbbOZ6KBJVu0ripluo2wWFxIp1P37eYynymGmHm+gKOy+klp9/hBUfzHQBUaIaaP9R+HyxDvAy3Y8f8jrwaeqUCjXXGfIyXqdWgq0qoy1heogYPRiGy/0Qs+VvK+9GX7zgbQRkgKS6ZZQY2NFJFOOQVo2rg0BBA/+KfLYVIFOqhjUOQ5/XpNeoonWHG2tLzmPRyDwqjHQAHo9i4Q/rTWy48YxCd5UVQxettU7Xlx/lsurEuUQNu/nxgoP4pMPBXfGFtKqaAkunEXRHm7I5s1DHeYmS5KG3/BS174mDkyz1wY914+5hkTVAr6EE7E8WuM+9OaHB7ZvG+i3JL9fzuUtzAnkVNQP2+pcXmVsV3GooeKCJalGeM899PdCLPvD4gTpNoIGDGHxU4e29LtmcnNbn67wpYN6eeMT03XHmm0AUlMl36dd+fLtES7wkpSH3PmxvkgVa3UHYgwPCtxyN28zawSXnldKCEA7Nwkwphm0fwhZDMzykX6v6IhhbCzkZYDDmz08tVmjnt+11t6psXgoabGN5Jv+WEchWoGfrE V7A== 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 1f918e602bc4..43d7fc150acc 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -315,7 +315,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); @@ -327,13 +328,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;