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 17EC2CD128A for ; Thu, 28 Mar 2024 13:40:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5C2126B0087; Thu, 28 Mar 2024 09:40:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 572AC6B0088; Thu, 28 Mar 2024 09:40:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 43AC76B0089; Thu, 28 Mar 2024 09:40:52 -0400 (EDT) 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 2BEB06B0087 for ; Thu, 28 Mar 2024 09:40:52 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id F2C9AA148D for ; Thu, 28 Mar 2024 13:40:51 +0000 (UTC) X-FDA: 81946558302.06.A573470 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf19.hostedemail.com (Postfix) with ESMTP id 7F07C1A0004 for ; Thu, 28 Mar 2024 13:40:49 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; spf=pass (imf19.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711633250; 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=w3eutPa8+J3GtGWmS2jAMzEFzjhLyhM72IWycQnj/E4=; b=v4sA7n0RxISWxsIo5Gc++xpMujuHZ1ifierYN2B3DE3mmMI0iaeqvMWedm54a0g6UNZ//L UaeBxFNXYCaa3Tv0H4NeA2IN6GWbm+sDBrePjNQYVoddL36uBzbzsi8Ku8gYp0D43hQKZ2 7VgPHIrCc/11555SDPMdASqPu97nOXI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711633250; a=rsa-sha256; cv=none; b=0CARkY5zBOvzuP+B+7CBxCUvVQGXmlJVJ73zzoWDOmGl0eCLTZaKjjw8pWHBbnhSe5Pp3G mA5lSIAlvP3ulbWnvG87tOpUvyRRQARy23pn1NVy/iyIGnjp10Ma3p/H0gwGjOfe6+ft8d fQ+XnrZzoWIc0Tbo1k+QhovLvI1+A68= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; spf=pass (imf19.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.174]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4V54Qx0XM7zPpdT; Thu, 28 Mar 2024 21:39:53 +0800 (CST) Received: from dggpemm500005.china.huawei.com (unknown [7.185.36.74]) by mail.maildlp.com (Postfix) with ESMTPS id 690D61400CD; Thu, 28 Mar 2024 21:40:45 +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; Thu, 28 Mar 2024 21:40:45 +0800 From: Yunsheng Lin To: , , CC: , , Yunsheng Lin , Andrew Morton , Eric Dumazet , David Howells , Marc Dionne , , Subject: [PATCH RFC 03/10] mm: page_frag: change page_frag_alloc_* API to accept align param Date: Thu, 28 Mar 2024 21:38:32 +0800 Message-ID: <20240328133839.13620-4-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240328133839.13620-1-linyunsheng@huawei.com> References: <20240328133839.13620-1-linyunsheng@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500005.china.huawei.com (7.185.36.74) X-Rspamd-Queue-Id: 7F07C1A0004 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 4f64abtbsq5roe6wks9baa1ppkshs6yr X-HE-Tag: 1711633249-550481 X-HE-Meta: U2FsdGVkX1+FMcSbaWVsRIXzGmLaivKNCx/fInpAbA4ceVKF53T0/hbrtrhkolwHtM7lF46utrhKeLp5BbZTk2w9t9Ykru9u7AaIG0mu2MWbiTbWV0nto5u7DIyHLO8AeV1ayR336L6h0IQljEsDZLD2yhfTfT35JLFsNR/kD5JDGu8HgYho6CIzqkItVatyflar0X9mTrPhFJ4ohFv9LTXuxDTlTMrLo8zJfm/I54IJaCssi9j5xxIdJax7EWbu3lWJxY9Q4EZOW+tLNZ48Z3rWFNCL3467boOUBd2c/IqVhBjBGdwIyEjU5Y/k78b0f0GQOEjuiRPvHs8z+qxvIONSsAmcmELCoJaMKrdg5Eiwn0oYvqK0SLs+Ejuob1DgHF8rWzggoQ31E/S7Cjf3MFvH5odIIgxx47aTBMv5lagVHxdGJUE9XG1NSPFY53ijGkloOrGI90XtNDvv21eKKIMBySYOkJ0hN4iDlCwjTXdt20+Hg5oGuviYs3SxMQ9VW/U8ydAvH/Wpb65nNojWGvIM30QLrcItoZ24HnwGdGLkeObhg/mntusoJ8a8Aq71ekqFET5XAti/quzBUCSL1F6K0JEsZxZOAkrybBC6AaqTDznNNESyyw/V4Z0U8T1HXh23K8S9v1rMoVrwviAJKD379meRDs5sB6/rfVldnkHmAtdMNZx7RT2FTOKyytzZKz4b0BSlmIlCMZ8eKyq4c7IGvjzVM4DnIMQ3DFLs3QrNX7YwV9k08j3oROYKx8W2ox5gm3jyLfqpL7m1PS8a7dLztt34HkS/xRohEHbBxpWCYJ+TwEYJIpnyxAAxaroIeAi2YU6njpbMZFt267+xNxO0XkLiETcyrUuBxtD9yiCQoY1opusupLwxN3s7yjgVmcp6I/ZwqrioFlvmiJOza8fXMHvJlQymXEvPgYLDjxfSgbHGvtS252ixY0UwtYKWssorxc9771IXSH71ZbE 8Pafg+yP jR43DUdOC2hfa6zoTOaGiAUSh4WAy1B2Tg5zdyGd0YC3+DpyoKWlPZSiiX1UuZVsuvTHTc/I3U51zzXDPcs/6K47TkWnkKzJ9imC9DB9KEIxMjOA0rNk5YPFw5ivZAR2TwJUdJ/HBxpSAPgnxKTeVlLBXBZOfEt4eATeCMe4FWYEJwtj2QqvnMcnkRY0Bm24Ukgga 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_alloc.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 7f68199fee34..074cdd29f782 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -3264,7 +3264,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 @@ -3275,14 +3275,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, @@ -3342,18 +3342,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, diff --git a/mm/page_frag_alloc.c b/mm/page_frag_alloc.c index 3e3e88d9af90..39c744c892ed 100644 --- a/mm/page_frag_alloc.c +++ b/mm/page_frag_alloc.c @@ -63,9 +63,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; @@ -94,7 +93,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); @@ -131,7 +130,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 17617c29be2d..4c88d7f541e4 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -305,18 +305,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; @@ -324,15 +323,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); -- 2.33.0