From patchwork Mon Apr 15 13:19:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 13630030 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 1445AC4345F for ; Mon, 15 Apr 2024 13:22:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 00BC06B0099; Mon, 15 Apr 2024 09:22:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E5EC86B009B; Mon, 15 Apr 2024 09:22:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CD6E96B009C; Mon, 15 Apr 2024 09:22:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id A802F6B0099 for ; Mon, 15 Apr 2024 09:22:10 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 67957A0622 for ; Mon, 15 Apr 2024 13:22:10 +0000 (UTC) X-FDA: 82011829620.20.CD02518 Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) by imf14.hostedemail.com (Postfix) with ESMTP id DC119100015 for ; Mon, 15 Apr 2024 13:22:07 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf14.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=1713187328; 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=qoJUf0glv70tXACV63b3D2nCCUXIOqXrCeqRZX72hzw=; b=ToKRohoc4+5a/NE2eoNa3vPe8Oj9ktycW/kngBfQJ4XhMa/lU55AathB7jXvED7t2BXCRJ pNX7FWQvSTxXH2EzHOqB4Z/p1B49P4EVEMWLhNiZ1+vCimqYi8eXcsZlwNlGiGWxODzrBi jjJYHGTp0C7gx04KI7MwKR6fo5rZREY= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf14.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=1713187328; a=rsa-sha256; cv=none; b=J8yPDcb2V0jELStM9xsaYOR9QwV6sadut/+PMb8+IVjVgkxzU9Qt2rQ0bzEwJXu/EXiojI 8BRlK9SetpBWTcEIuQ7dQmnSeV/uS117gtLzaLXDVJlRR44GAD2qm53jMFmNxj0f6HjtZl qbQBd5KdNt+Hs6JDG+R7c4PtC6WT9As= Received: from mail.maildlp.com (unknown [172.19.163.17]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4VJ77M08hvz1yp2X; Mon, 15 Apr 2024 21:19:43 +0800 (CST) Received: from dggpemm500005.china.huawei.com (unknown [7.185.36.74]) by mail.maildlp.com (Postfix) with ESMTPS id 45FFA1A0188; Mon, 15 Apr 2024 21:22:04 +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; Mon, 15 Apr 2024 21:22:03 +0800 From: Yunsheng Lin To: , , CC: , , Yunsheng Lin , Alexander Duyck , Andrew Morton , Eric Dumazet , David Howells , Marc Dionne , , Subject: [PATCH net-next v2 06/15] mm: page_frag: change page_frag_alloc_* API to accept align param Date: Mon, 15 Apr 2024 21:19:31 +0800 Message-ID: <20240415131941.51153-7-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240415131941.51153-1-linyunsheng@huawei.com> References: <20240415131941.51153-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-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: DC119100015 X-Stat-Signature: 8z7rzdcubbd9kpy3hzbr4x6smbmry33c X-HE-Tag: 1713187327-795296 X-HE-Meta: U2FsdGVkX1/SHvhPlXD47qi/mq2bshc/OVvdyJlJS7pu1v/VsDqqDazOhqeNT4DHxBUQK1W5ngkZkFkAj5dy9cXlNVXHpkeql4wBUNLHvQ10NSB1HOSWcVjM/PKhGY9Lv1MWOEN2VQQpvMeorTUmzjOig2yDaFFRKQz07LuWoAAuY+Y/lVL1CNG27npqREKLg9ipRgdkzw63sV0AAKgxX9fgrD3YiAPDZqf6LvjeW1Mq3EkYFQOp+u0qZokrW1oiZtNEDui2rkT2tu+iyHpwffNt1A3aC+K13L5UE3/1vhBsYVkAvC0S1c/E1PXc1mNyoCB/5liE3ZhiKYA7/DIFX4NQaE1NFT0EjTaYBo0C0RbCw6WrFEbQKwhVvB3/DPnb3pN8wWfJ9D4kjzteNZe71pwXbr5GXQR4xyd4rWNBS6MwYn8DDjzsxORj9l+xzIWu9jW5cGcaFsFjlT/cy8OPfGBXdCOD+OwGp8qbuErOEVx3TtcGxSxFj2ujJ1sDaYJbT84SeYpwyVK0N2tAJFGM8Qc77fTNKZk87r1YbRbqdqB7Q2uB/JuQXaeFWJo+pqseY5gAy2P/pro2q5QMDPFPJA6nt+Mj6Lws0NEfFa8I+EWlI2YAgewNdh6jvY13MCdnbNp1U0XJGBSq/SeC+hCngi90a+TsADaPP3Ur0VZB8xTNddslnvauZ5OhovdtTLsJXYoz36unSI0igwBJ3AlTTrFfqHaPayoWiyILs6VTM8dH0d/fFkUEX6uRHOBS9sSpN+PUYNYrgKTZ3w+DMkO6N/u61zpzOA5JS/5NW9st2Jidjd29OqB7KB6WrT8zelZq9c8+qCEMEAWIaUI2Q56rOwxQndUPTApM+DRJ8oXqY5PtOK/ctDbkEnJ5lK/uHIsr6rfiAiPn8mBiakQZFkQHpBiQiBIml8AZKQ9L4M3ruEeLONebr5lHjzA+abwRTVz99nCf5NiBfF+BYxzJGD4 tbvgA162 Deq9DLzhfeOfBbHVddJloO90/YfEcO7JGPrzrgmO8ep6eGV8AmYF8kNoKmrxfEvnCauL3zehmF3pF00oiSg8/gCH8QIJlHbugyHFvr4pa2xdtfNwGSmcdxcPQRgH+BK3ZQzyntIZyEQ/XyEvL4uBulaz4TgYj1ChmPbYvAkXN5s/5DqMFHyi6udWuraiyTXpKU/8dEj1zyAgS9UtsQ8mf1SEdxIShtaITehhLkwiL5OVbkK1EgYwLIiUj9uTSsCTjOY3zwoCd9ErBn40= 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: When page_frag_alloc_* API doesn't need data alignment, the ALIGN() operation is unnecessary, so change page_frag_alloc_* API to accept align param instead of align_mask param, and do the ALIGN()'ing in the inline helper when needed. Signed-off-by: Yunsheng Lin --- include/linux/page_frag_cache.h | 20 ++++++++++++-------- include/linux/skbuff.h | 12 ++++++------ mm/page_frag_cache.c | 9 ++++----- net/core/skbuff.c | 12 +++++------- net/rxrpc/txbuf.c | 5 +++-- 5 files changed, 30 insertions(+), 28 deletions(-) diff --git a/include/linux/page_frag_cache.h b/include/linux/page_frag_cache.h index 04810d8d6a7d..cc0ede0912f3 100644 --- a/include/linux/page_frag_cache.h +++ b/include/linux/page_frag_cache.h @@ -25,21 +25,25 @@ struct page_frag_cache { void page_frag_cache_drain(struct page_frag_cache *nc); void __page_frag_cache_drain(struct page *page, unsigned int count); -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(struct page_frag_cache *nc, unsigned int fragsz, + gfp_t gfp_mask); + +static inline void *__page_frag_alloc_align(struct page_frag_cache *nc, + unsigned int fragsz, gfp_t gfp_mask, + unsigned int align) +{ + nc->offset = ALIGN(nc->offset, align); + + return page_frag_alloc(nc, fragsz, gfp_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, align); } void page_frag_free(void *addr); diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index f2dc1f735c79..43c704589deb 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -3268,7 +3268,7 @@ static inline void skb_queue_purge(struct sk_buff_head *list) unsigned int skb_rbtree_purge(struct rb_root *root); void skb_errqueue_purge(struct sk_buff_head *list); -void *__netdev_alloc_frag_align(unsigned int fragsz, unsigned int align_mask); +void *__netdev_alloc_frag_align(unsigned int fragsz, unsigned int align); /** * netdev_alloc_frag - allocate a page fragment @@ -3279,14 +3279,14 @@ void *__netdev_alloc_frag_align(unsigned int fragsz, unsigned int align_mask); */ static inline void *netdev_alloc_frag(unsigned int fragsz) { - return __netdev_alloc_frag_align(fragsz, ~0u); + return __netdev_alloc_frag_align(fragsz, 1u); } static inline void *netdev_alloc_frag_align(unsigned int fragsz, unsigned int align) { WARN_ON_ONCE(!is_power_of_2(align)); - return __netdev_alloc_frag_align(fragsz, -align); + return __netdev_alloc_frag_align(fragsz, align); } struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int length, @@ -3346,18 +3346,18 @@ static inline void skb_free_frag(void *addr) page_frag_free(addr); } -void *__napi_alloc_frag_align(unsigned int fragsz, unsigned int align_mask); +void *__napi_alloc_frag_align(unsigned int fragsz, unsigned int align); static inline void *napi_alloc_frag(unsigned int fragsz) { - return __napi_alloc_frag_align(fragsz, ~0u); + return __napi_alloc_frag_align(fragsz, 1u); } static inline void *napi_alloc_frag_align(unsigned int fragsz, unsigned int align) { WARN_ON_ONCE(!is_power_of_2(align)); - return __napi_alloc_frag_align(fragsz, -align); + return __napi_alloc_frag_align(fragsz, align); } struct sk_buff *napi_alloc_skb(struct napi_struct *napi, unsigned int length); diff --git a/mm/page_frag_cache.c b/mm/page_frag_cache.c index dc864ee09536..b4408187e1ab 100644 --- a/mm/page_frag_cache.c +++ b/mm/page_frag_cache.c @@ -61,9 +61,8 @@ 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(struct page_frag_cache *nc, unsigned int fragsz, + gfp_t gfp_mask) { unsigned int size, offset; struct page *page; @@ -92,7 +91,7 @@ void *__page_frag_alloc_align(struct page_frag_cache *nc, size = PAGE_SIZE; #endif - offset = ALIGN(nc->offset, -align_mask); + offset = nc->offset; if (unlikely(offset + fragsz > size)) { page = virt_to_page(nc->va); @@ -129,7 +128,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); /* * 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 ea052fa710d8..676e2d857f02 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -306,18 +306,17 @@ void napi_get_frags_check(struct napi_struct *napi) local_bh_enable(); } -void *__napi_alloc_frag_align(unsigned int fragsz, unsigned int align_mask) +void *__napi_alloc_frag_align(unsigned int fragsz, unsigned int align) { struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache); 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); } EXPORT_SYMBOL(__napi_alloc_frag_align); -void *__netdev_alloc_frag_align(unsigned int fragsz, unsigned int align_mask) +void *__netdev_alloc_frag_align(unsigned int fragsz, unsigned int align) { void *data; @@ -325,15 +324,14 @@ 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); } 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); + align); local_bh_enable(); } return data; diff --git a/net/rxrpc/txbuf.c b/net/rxrpc/txbuf.c index e0679658d9de..eb640875bf07 100644 --- a/net/rxrpc/txbuf.c +++ b/net/rxrpc/txbuf.c @@ -32,9 +32,10 @@ struct rxrpc_txbuf *rxrpc_alloc_data_txbuf(struct rxrpc_call *call, size_t data_ hoff = round_up(sizeof(*whdr), data_align) - sizeof(*whdr); total = hoff + sizeof(*whdr) + data_size; + data_align = max_t(size_t, data_align, L1_CACHE_BYTES); mutex_lock(&call->conn->tx_data_alloc_lock); - buf = __page_frag_alloc_align(&call->conn->tx_data_alloc, total, gfp, - ~(data_align - 1) & ~(L1_CACHE_BYTES - 1)); + buf = page_frag_alloc_align(&call->conn->tx_data_alloc, total, gfp, + data_align); mutex_unlock(&call->conn->tx_data_alloc_lock); if (!buf) { kfree(txb);