From patchwork Fri Jul 19 09:33:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 13737062 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 E4F33C3DA59 for ; Fri, 19 Jul 2024 09:37:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 730E56B00A1; Fri, 19 Jul 2024 05:37:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6B9206B00A2; Fri, 19 Jul 2024 05:37:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 581026B00A3; Fri, 19 Jul 2024 05:37:20 -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 363EB6B00A1 for ; Fri, 19 Jul 2024 05:37:20 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id CD0BF120541 for ; Fri, 19 Jul 2024 09:37:19 +0000 (UTC) X-FDA: 82355998998.15.6DECB69 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf16.hostedemail.com (Postfix) with ESMTP id 6E860180009 for ; Fri, 19 Jul 2024 09:37:17 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf16.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721381804; a=rsa-sha256; cv=none; b=nfHf6AEgqbpWSgCNyi9YpOuTRXAy0aEt7P0JaS/4YiKxtNi9rRDymDUTjw1xJixHJAE/HG l1YGnX0MNG8HlFs1JzBWG1FAtP+DuZfno5qF8PshqBIpQodhUJi5hVUiw0TkgEzBxJulnS hyz+4Oz3WR4691MGpYga1RZ01QNV/2A= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf16.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.188 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=1721381804; 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=jfUdQ/piobmYpzL1Z8EK3kptBtuDg3qKeC+jHcu33EU=; b=dpIt/fNgWD89mrPQldii1X8yEjtpnzoNy8fzXAWiUCM3EYpeycFbLhNwVJWHtqjBbSAcln wlN4uxHGvgll6Ys1d9NKOiLuBMZjlrSZZYh10nD0qJpZ8D1nE6twI9dR4oyNTjLl+eaK1q /cyTaLbRizBuE/rFCUa1cHTgVkzO8+g= Received: from mail.maildlp.com (unknown [172.19.88.105]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4WQPfp0vF1zdjHW; Fri, 19 Jul 2024 17:35:30 +0800 (CST) Received: from dggpemf200006.china.huawei.com (unknown [7.185.36.61]) by mail.maildlp.com (Postfix) with ESMTPS id CBF561400C9; Fri, 19 Jul 2024 17:37:14 +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; Fri, 19 Jul 2024 17:37:14 +0800 From: Yunsheng Lin To: , , CC: , , Yunsheng Lin , Alexander Duyck , Andrew Morton , Subject: [RFC v11 08/14] mm: page_frag: some minor refactoring before adding new API Date: Fri, 19 Jul 2024 17:33:32 +0800 Message-ID: <20240719093338.55117-9-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240719093338.55117-1-linyunsheng@huawei.com> References: <20240719093338.55117-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: rspam12 X-Rspamd-Queue-Id: 6E860180009 X-Stat-Signature: ogy5abiabtekpjsxoizgjby7zrogiddp X-Rspam-User: X-HE-Tag: 1721381837-123527 X-HE-Meta: U2FsdGVkX1+yB4eqwminNHwR7fiqnIm1hPUEXApM9J7pC56QslUwEhQ0MA/6I0tyJBUxmc5O7jokb+jROMbCrvVoKvUkw1FXa/a2EniIY8SkclAkPApnWJ/9gjk3+YnOgLYEYiTBlTZ2zvo9rCCW4e2FWtkLdMrn19VqR/isbHs4OcZoKssIb/NYiFKV+t/H3yBqJJZp0FWrrTq92ObfKwcc9qhuD3GL/P+ZYSjZIL2gLy8PQ01nlKhvAYFklYr8TKoj9+M9YfEKGXyXEouXiOWjEeOnD7eex+wSQQggtsjR0JP4AIUuiG9dAdWyI8RWyqKZhSkexFTnIimL8wB/txgReB8yhsuuoPZxvIa4qa3BIZY/6J7IRKTE6zv978nqMuHL/qYPQfPnd5r2E7SdimwmteSYCeBxJ2Nm+g2aw/L4Uv0yT+If9EJ/gX8jBSil7zzIRVjXVOfRqIa9dxEhzRc2Hc1WdbQQTjky/qUrclsv8VcvrykR8bGLXXNGN74kEYDDOZjXBArNJ91zP7M3NIJVhDlo2+lD+6Y5ic6r7SEK6MnBWoJhp3ZsnZ7qW5fmy7P5sIk4IldQLeo0NnItmeNO8SOmk8qx+NKec7ijsLKmlQHMicYwmPGJEVQONgD1UxORKb/XBgVJIdTrTU40WjwfviIvfDhJ5NSPKBgtEvhQYurbEtFojI/6hXzUtiOP+D4sNY3wq/nVSyG5+cj22Mwo7dobym3pol9ojplf8TFUAhLEtR9Bc2egQiyk+wYgxqiYb5vZzB+kiDrSEsDmbyo/1aaPdJRQ0ooJ/xd6Iw+fNUv4CODiTIvYY8ZhyHOdre4mmasyV0mirUVkT82GIXiW9qVF8HKIVNOoFfTdaGhE+NheRyg2XhGVgUxAC6Z1xs63SEKPJt1gaGRHueyKUtaJz07cXriTTOOyhGWdPNRfZz+pwYhPcH4Sj9ZFfl8EFDSChrb47ST3cGFeh33 TTuy5ck0 HC0meV4pB01kZh3Be5iocriQ39oacydlFVR4sDLwjsModqsclwvq1bXRuBeBMYfWbQ4Vf3OoUBNEw4axGACuppkPa8zkXGIM1OIJi2xec4E/1YsuD4KYUvDXWA486fas+yiPgNXbStkFKxuo3PT4L8NN7NjMYh+TFxBl/kGri2LqIkbhdWBS3oLb0EIWLRY+nt06yDzIujOM7GDnmgu07r0P4S2G7Gldj0tC00A9nDc/+tL5YnYiMTzaw0p0YNsgCMiDSYXCa9WurxVW5qSm/MgQ6z+1YNjKx0UF1 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 | 93 +++++++++++++++++---------------- 2 files changed, 49 insertions(+), 46 deletions(-) diff --git a/include/linux/page_frag_cache.h b/include/linux/page_frag_cache.h index 12a16f8e8ad0..5aa45de7a9a5 100644 --- a/include/linux/page_frag_cache.h +++ b/include/linux/page_frag_cache.h @@ -50,7 +50,7 @@ static inline void *encoded_page_address(unsigned long encoded_va) 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 7928e5d50711..d9c9cad17af7 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,31 +112,9 @@ 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; - unsigned int size, remaining; - 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); + unsigned int remaining = nc->remaining & align_mask; - /* 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); - remaining = nc->remaining & align_mask; if (unlikely(remaining < fragsz)) { if (unlikely(fragsz > PAGE_SIZE)) { /* @@ -111,32 +129,17 @@ void *__page_frag_alloc_va_align(struct page_frag_cache *nc, return NULL; } - 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); - - /* reset page count bias and remaining to start of new frag */ - nc->pagecnt_bias = PAGE_FRAG_CACHE_MAX_SIZE + 1; - nc->remaining = size; + if (unlikely(!__page_frag_cache_refill(nc, gfp_mask))) + return NULL; + size = page_frag_cache_page_size(nc->encoded_va); remaining = size; } nc->pagecnt_bias--; nc->remaining = remaining - fragsz; - return encoded_page_address(encoded_va) + (size - remaining); + return encoded_page_address(nc->encoded_va) + (size - remaining); } EXPORT_SYMBOL(__page_frag_alloc_va_align);