From patchwork Tue Jul 9 13:27:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 13727978 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 036C3C2BD09 for ; Tue, 9 Jul 2024 13:31:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 196516B00C4; Tue, 9 Jul 2024 09:31:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 145F76B00C5; Tue, 9 Jul 2024 09:31:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F29FC6B00C6; Tue, 9 Jul 2024 09:31:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id D06536B00C4 for ; Tue, 9 Jul 2024 09:31:21 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 9814B1418E8 for ; Tue, 9 Jul 2024 13:31:21 +0000 (UTC) X-FDA: 82320300762.09.13E0750 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf07.hostedemail.com (Postfix) with ESMTP id 0296B40034 for ; Tue, 9 Jul 2024 13:31:18 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; spf=pass (imf07.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=1720531864; 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=3bHVN1ugZa45wGLj92zG9u0SDB/xqJER2gWmKF4RCQ0=; b=MDlylIUVAXTEtgCmkfZ2bVdbdbhOuiHQwr9iHDCbJd2pa1p+mlaGW9b3QZlrbIcCRMWopT tp403ss2rjSjk6HY5XrFdj9aCFQaWuuhenNKZKKysVmKHixsaf/mFKfWUj0UsGURu9tazZ aA8S1hUycPUkLXqYWrAUoQ1x5lUV+Kw= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; spf=pass (imf07.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720531864; a=rsa-sha256; cv=none; b=rC2D5gbT1E0+P+HX5cJnfyjDy0wRufMv/b2sgO88uuoALbLplbEGawzmYa0frg71ftIHJG 5AOnXkuBaJQuVaYEJm3W+ovs7sHeLEtlX625aPCsVdhsr/cc3CnzvcW9u4BYbLY5dnIk7v UuAL57E5c0hNgC+djcLzDQNr10trRt8= Received: from mail.maildlp.com (unknown [172.19.163.174]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4WJMLw68S9zcpK6; Tue, 9 Jul 2024 21:30:48 +0800 (CST) Received: from dggpemf200006.china.huawei.com (unknown [7.185.36.61]) by mail.maildlp.com (Postfix) with ESMTPS id 0B10C140258; Tue, 9 Jul 2024 21:31:15 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by dggpemf200006.china.huawei.com (7.185.36.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Tue, 9 Jul 2024 21:31:14 +0800 From: Yunsheng Lin To: , , CC: , , Yunsheng Lin , Alexander Duyck , Andrew Morton , Subject: [PATCH net-next v10 08/15] mm: page_frag: some minor refactoring before adding new API Date: Tue, 9 Jul 2024 21:27:33 +0800 Message-ID: <20240709132741.47751-9-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240709132741.47751-1-linyunsheng@huawei.com> References: <20240709132741.47751-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 dggpemf200006.china.huawei.com (7.185.36.61) X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 0296B40034 X-Stat-Signature: 6gq58jxmn513ejh3n7pkezhup4y18rm3 X-HE-Tag: 1720531878-885568 X-HE-Meta: U2FsdGVkX19OtMj2RFNGC4bCo8VdHLmijyHvawGeJqnwMt3PVu4fCk2KLObVm3YdJ1qegfexxc4Pphvo14QkrZkvvsQWlQ45nLBGts9CD1OcTuZc950FOzsx+TIkXYPlKQyZNqxJjqcFC2uSJCWuSslJsBdzeWqRFqOhHifzqUyyBo7fzVKFk8E6fqHYidPJnldY2Zw3Zi1Cd5RHAAMGa8j/+ZrBbjVMwejjUVIOkwO1oSrPXH5aUAR6tisCsAAUX1tfKeFmg+DG+d4rX1dNaNThSVHd5mPntNM9Js/U7lHyLr6rsq+UAbprPClSbGp/7PtELuk0PHdDlKdL6lRex+XDlW7IiXBeTf7+COnhRq2mU7oGYYcN6lvMDIF0PmQddYBldTPCRbpMKdaHHIZxWrKWny3qxStevxIN107w54RDhp4sN7HeYlQXi9f/QE4esrFIUHdCPOtFsEc3GS7WXEi+JJJeN+UZRSnh/cteU1DmbHNDJJUGg0I3r85cGDf0bT1WH/D4COF5LNICqi9IBaFq8k65Gjt0siUzLFj4I7HKvynnZ47je//6CTSoTLhIRLGwlEv2UIcaXW1PZmuzO2pQtcn0z7602lwRXOg3/Psla+idIyZ0OAthbAC3bQ0noon5MzcUDSn20TyMc5l0TuKO0he29vGSi+2pxkfIiIgi9UpQUh8Ypa05zuEhbysDxOQpri58U5G16EDvGNQKHwjvV9DWx+IL2R4clF7arrvtnSKuHaKpRMqRysw4hQQO9wqfpEqgGPSBNe/72MmgJ3gGh1HeHVNNdUz01JNAoXg4r0eo+rzoBClb04Xq4FYFvC5Ig/NPziC9tqduRv+9MpQg2tGg5nSo98Wz23IsSv/EaQt6f3rPIRa9TqbjeoIvOhHgZV9cSNTE604g32dZZJP8Vbz+tgdEJVAgJMr6K8oSkbA3sQ5afff7R//ImVTRRV0zx5ckxPMrsKJ1yIg dLS4PMRs LKAhQtbqSe7tmr7YgulvleFah7IKwlMPwz8IqO/IIdlNugpFsGC+/3ReMm6eeJsyQlwlsJvH8aOMscyGmGEMT7gDb0cbAlfnWLXwH2G6zeQoxXsici17w60S/SjlOf0JLwi6C+akl9ptsqJoiduI1UhVjBB/Bjl/W0YaNX+wsSZmHw9ic0H5YJ3b0sdNNbycgmEW+dS/xRVXTjLflxF+B7T4HPv0HRU4Jz1DXHWY/coZdIWrP6VTgWWkcY6k7itnMFU8/h4cOmASS1KpMKnkZAPU6uIXeg2dk3gT4 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: Refactor common codes from __page_frag_alloc_va_align() to __page_frag_cache_refill(), so that the new API can make use of them. CC: Alexander Duyck Signed-off-by: Yunsheng Lin --- include/linux/page_frag_cache.h | 2 +- mm/page_frag_cache.c | 96 +++++++++++++++++---------------- 2 files changed, 50 insertions(+), 48 deletions(-) diff --git a/include/linux/page_frag_cache.h b/include/linux/page_frag_cache.h index 87c3eb728f95..71e08db1eb2f 100644 --- a/include/linux/page_frag_cache.h +++ b/include/linux/page_frag_cache.h @@ -68,7 +68,7 @@ struct page_frag_cache { static inline void page_frag_cache_init(struct page_frag_cache *nc) { - nc->encoded_va = 0; + memset(nc, 0, sizeof(*nc)); } static inline bool page_frag_cache_is_pfmemalloc(struct page_frag_cache *nc) diff --git a/mm/page_frag_cache.c b/mm/page_frag_cache.c index 02e4ec92f948..73164d2482f8 100644 --- a/mm/page_frag_cache.c +++ b/mm/page_frag_cache.c @@ -19,6 +19,28 @@ #include #include "internal.h" +static struct page *__page_frag_cache_recharge(struct page_frag_cache *nc) +{ + unsigned long encoded_va = nc->encoded_va; + struct page *page; + + page = virt_to_page((void *)encoded_va); + if (!page_ref_sub_and_test(page, nc->pagecnt_bias)) + return NULL; + + if (unlikely(encoded_page_pfmemalloc(encoded_va))) { + VM_BUG_ON(compound_order(page) != + encoded_page_order(encoded_va)); + free_unref_page(page, encoded_page_order(encoded_va)); + return NULL; + } + + /* OK, page count is 0, we can safely set it */ + set_page_count(page, PAGE_FRAG_CACHE_MAX_SIZE + 1); + + return page; +} + static struct page *__page_frag_cache_refill(struct page_frag_cache *nc, gfp_t gfp_mask) { @@ -26,6 +48,14 @@ static struct page *__page_frag_cache_refill(struct page_frag_cache *nc, struct page *page = NULL; gfp_t gfp = gfp_mask; + if (likely(nc->encoded_va)) { + page = __page_frag_cache_recharge(nc); + if (page) { + order = encoded_page_order(nc->encoded_va); + goto out; + } + } + #if (PAGE_SIZE < PAGE_FRAG_CACHE_MAX_SIZE) gfp_mask = (gfp_mask & ~__GFP_DIRECT_RECLAIM) | __GFP_COMP | __GFP_NOWARN | __GFP_NORETRY | __GFP_NOMEMALLOC; @@ -35,7 +65,7 @@ static struct page *__page_frag_cache_refill(struct page_frag_cache *nc, if (unlikely(!page)) { page = alloc_pages_node(NUMA_NO_NODE, gfp, 0); if (unlikely(!page)) { - nc->encoded_va = 0; + memset(nc, 0, sizeof(*nc)); return NULL; } @@ -45,6 +75,16 @@ static struct page *__page_frag_cache_refill(struct page_frag_cache *nc, nc->encoded_va = encode_aligned_va(page_address(page), order, page_is_pfmemalloc(page)); + /* Even if we own the page, we do not use atomic_set(). + * This would break get_page_unless_zero() users. + */ + page_ref_add(page, PAGE_FRAG_CACHE_MAX_SIZE); + +out: + /* reset page count bias and remaining to start of new frag */ + nc->pagecnt_bias = PAGE_FRAG_CACHE_MAX_SIZE + 1; + nc->remaining = PAGE_SIZE << order; + return page; } @@ -55,7 +95,7 @@ void page_frag_cache_drain(struct page_frag_cache *nc) __page_frag_cache_drain(virt_to_head_page((void *)nc->encoded_va), nc->pagecnt_bias); - nc->encoded_va = 0; + memset(nc, 0, sizeof(*nc)); } EXPORT_SYMBOL(page_frag_cache_drain); @@ -72,53 +112,15 @@ void *__page_frag_alloc_va_align(struct page_frag_cache *nc, unsigned int fragsz, gfp_t gfp_mask, unsigned int align_mask) { - unsigned long encoded_va = nc->encoded_va; - int aligned_remaining, remaining; - unsigned int size; - struct page *page; - - if (unlikely(!encoded_va)) { -refill: - page = __page_frag_cache_refill(nc, gfp_mask); - if (!page) - return NULL; - - encoded_va = nc->encoded_va; - size = page_frag_cache_page_size(encoded_va); + unsigned int size = page_frag_cache_page_size(nc->encoded_va); + int aligned_remaining = nc->remaining & align_mask; + int remaining = aligned_remaining - fragsz; - /* Even if we own the page, we do not use atomic_set(). - * This would break get_page_unless_zero() users. - */ - page_ref_add(page, PAGE_FRAG_CACHE_MAX_SIZE); - - /* reset page count bias and remaining to start of new frag */ - nc->pagecnt_bias = PAGE_FRAG_CACHE_MAX_SIZE + 1; - nc->remaining = size; - } - - size = page_frag_cache_page_size(encoded_va); - - aligned_remaining = nc->remaining & align_mask; - remaining = aligned_remaining - fragsz; if (unlikely(remaining < 0)) { - page = virt_to_page((void *)encoded_va); - - if (!page_ref_sub_and_test(page, nc->pagecnt_bias)) - goto refill; - - if (unlikely(encoded_page_pfmemalloc(encoded_va))) { - VM_BUG_ON(compound_order(page) != - encoded_page_order(encoded_va)); - free_unref_page(page, encoded_page_order(encoded_va)); - goto refill; - } - - /* OK, page count is 0, we can safely set it */ - set_page_count(page, PAGE_FRAG_CACHE_MAX_SIZE + 1); + if (!__page_frag_cache_refill(nc, gfp_mask)) + return NULL; - /* reset page count bias and remaining to start of new frag */ - nc->pagecnt_bias = PAGE_FRAG_CACHE_MAX_SIZE + 1; - nc->remaining = size; + size = page_frag_cache_page_size(nc->encoded_va); aligned_remaining = size; remaining = aligned_remaining - fragsz; @@ -139,7 +141,7 @@ void *__page_frag_alloc_va_align(struct page_frag_cache *nc, nc->pagecnt_bias--; nc->remaining = remaining; - return encoded_page_address(encoded_va) + (size - aligned_remaining); + return encoded_page_address(nc->encoded_va) + (size - aligned_remaining); } EXPORT_SYMBOL(__page_frag_alloc_va_align);