From patchwork Tue Jan 30 11:37:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 13537369 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 D6C3EC48285 for ; Tue, 30 Jan 2024 11:38:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 507476B0081; Tue, 30 Jan 2024 06:38:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4B7566B0085; Tue, 30 Jan 2024 06:38:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 359C86B008C; Tue, 30 Jan 2024 06:38:09 -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 25BE56B0081 for ; Tue, 30 Jan 2024 06:38:09 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D519F1A07E8 for ; Tue, 30 Jan 2024 11:38:08 +0000 (UTC) X-FDA: 81735778656.08.C14098C Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) by imf25.hostedemail.com (Postfix) with ESMTP id 01095A0007 for ; Tue, 30 Jan 2024 11:38:05 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf25.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=1706614687; a=rsa-sha256; cv=none; b=jQVYNFumiFDwHwE11aqEkcOfFxdkeG2yBQxSJYnLpDPU9zWHuwhSIedqNDodKoNAltBRs5 ECVPmtxDB3kwFwHXJTLA4Z/Lii45Q8YkneEufithk5ceIpNjhxbc5c3KH2Tu86m3rsLHKk n3dcOP9J8yhap3u7gjPNIqsvHpTJZG0= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf25.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=1706614687; 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=Nx3W3AbRHATaBu6Xj/hr+ojBJlJZiofIFCqrk92OYE4=; b=hWaXBDbZkquA/vDdcMZTrB1g4iEusZUOJUcZzKTKrHCLk8Xn1zJIksJhepF72W2MgCQgqn KKH2ke8sYPGr7g6X6nmwLZHe+b6UqSbrvhsAUh5SVY6gw19x5X6N0LgCQbQxR2r6NkgUCm iEv+afnp0vaJV7YAlIJWoFH5wFAzSHQ= Received: from mail.maildlp.com (unknown [172.19.88.214]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4TPNQx3VyMz29km6; Tue, 30 Jan 2024 19:36:09 +0800 (CST) Received: from dggpemm500005.china.huawei.com (unknown [7.185.36.74]) by mail.maildlp.com (Postfix) with ESMTPS id 19FB01A016B; Tue, 30 Jan 2024 19:37:59 +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; Tue, 30 Jan 2024 19:37:58 +0800 From: Yunsheng Lin To: , , CC: , , Yunsheng Lin , Alexander Duyck , Andrew Morton , Eric Dumazet , Subject: [PATCH net-next v4 1/5] mm/page_alloc: modify page_frag_alloc_align() to accept align as an argument Date: Tue, 30 Jan 2024 19:37:06 +0800 Message-ID: <20240130113710.34511-2-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240130113710.34511-1-linyunsheng@huawei.com> References: <20240130113710.34511-1-linyunsheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpemm500005.china.huawei.com (7.185.36.74) X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 01095A0007 X-Stat-Signature: mutqbyrgwthaadicjynq3qzn9ubdggmc X-Rspam-User: X-HE-Tag: 1706614685-475362 X-HE-Meta: U2FsdGVkX1+YAjCeDHERHAlJSw11K2Tya0cDe6JUbreWNSjEaMI50+IJX39YWjQv/X1l1chk2rHbg2jbNnM7UBeAU2mN7JXnGR7zh+9kMTWoQuZEuwUqucdSN8FTsvcg9+Vwpf6a667O71RgQwZKEA2G4BznVEBljBWFidp5lUx95V02fSt6FXjeWE8O923Cu07zQTVksidJaeZOpA/T/JK+ZLRNByuIGlyvKK8KSCwjBC44DrXaSxOJhQP4wesyR4OTBtEqs7U3xxAvagtKTHr3MVYGPf/rQUVIW3owUfrpr36BWiTyRWG+z9kzN95+zuMuo/cr7Rp4flo66nWMOpavk9FIE1MhwKZhPFdvKnT00qQafC0QqyZTcdWAaYFFP6Scsex1wJMhWSOtsEFWHt4F+JyrZPaBvYemWL3dzdm4ZbG1Lj+4tCBkiNfsPZYA+mEhE1myrfDGE4Bnppa286MLc/v3+E1hJXjRqgjvuq/tbJ06y9BwSLf/18sHUk7qPI3QsZ+0IPABLR6YCbIoryHT2Q1CFzy9yG/tVyveoINxmrMQEHbqfjKHAXu7Y9iZXcJlESofQ7U20DbzCNt8qY3XeAeK+NPlQ90S6l+I4gnwmZHrlwyUg/aixdaDvqxdiVrhwko+BBeUFTLchLboEbCtSANeYiilD4T5LixQav0VGo3zSURCpD0QvbFVWAqhpQ5TKwBwYT7DKEEDR1W7GPtDALBwgjX3a59XFWxD2P0a/3NDoNI/l7wiDMjU9Wm+ylcHoXC/uNf4fpIuyWb2jfMpI5Q4HH3NSCptSlu9WLGJu+CcvT7ZjwaLZzphSzbRRGUIHT103RR4lxyDX9Gm8mHFYhreaFCjWxFWUEdh+Klj9kS7dWUT2qgkM2hqFD4RBlWqdzO6z24e8Lr4C/IJVIKgw/6+qLxTxrCFrj7cOzT69Gp0nSafIguiG9ARVNKLJwNy+sifRRUSg7134o4 wTQT/f5d A4yuW7vQbyMBCqVJsQ+VJ9lpRBQniUgDsjovJApbAu+luG3RWs3qYmG1ZVCMVUlVhEhHxhyhrTfyBoVy8O1sKLyw/b5LWvXPtZG+2ytVlPJaQ/3JoiDKsWmtUj20MAd9lV7kuEAs/nzbIpDHH2Tu01eQ4ISosND9ZrN5oXnvHNu4aH5djtQt2LYrpFLpD/W6lWEqnls2Bt/VFCAC63BB4zHoKI/oyEPvWk8BsDWsGxpYLLjpYEbMq3uJ8pjGo9Si2IAtPQcmRd8jUIKc4HwPjHExF8uhwtQaDTKSk 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 | 6 +++--- 3 files changed, 18 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..bc8f3858bc1c 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -297,7 +297,7 @@ 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 +309,13 @@ 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;