From patchwork Wed Jun 5 13:32:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 13686907 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 028E0C27C53 for ; Wed, 5 Jun 2024 13:36:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5409D6B009A; Wed, 5 Jun 2024 09:36:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4F20A6B009C; Wed, 5 Jun 2024 09:36:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 36CF06B009D; Wed, 5 Jun 2024 09:36:28 -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 067AA6B009A for ; Wed, 5 Jun 2024 09:36:28 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B7AA11C253B for ; Wed, 5 Jun 2024 13:36:27 +0000 (UTC) X-FDA: 82196934414.28.C9C03C2 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf14.hostedemail.com (Postfix) with ESMTP id 539FC100010 for ; Wed, 5 Jun 2024 13:36:24 +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.189 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=1717594586; 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=1pdm9htmyggMxEWZN2tsXxEoWBHZYMVStyWtOzDyjJw=; b=jhuEw0lacMeYh2lZ0W6BYUjkBClmImOOnxiQrXQn5WIRQVgQGP/ivLefyAs95hbYOy816z dPoDIrcbSagpAZ5HrReI8itKwIbCrFQzIfCklU5FEFzPdVt8ZG9g0yIl7rN8hcoOk+z5H4 9tKvXy7ezNbNVRU7Sl9q24LDYvuFKr0= 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.189 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717594586; a=rsa-sha256; cv=none; b=Bd6hc/eoTE3KgupR6nwUihL2EpzGgL9836MTE3tznTTLsgUS8Rsy+tRlk2+rd4Sa5U8iYj g36F+ucnGbn/cKljJRF9jlLfwOq2e3fYQr7jOAY2MKRl56oCSj++71tNeCn2AGF4TJVBm7 I5HunINeY0c4ISJTu15XJhDwlH+Nh2g= Received: from mail.maildlp.com (unknown [172.19.163.48]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4VvT1F1JlYzPpHw; Wed, 5 Jun 2024 21:33:05 +0800 (CST) Received: from dggpemm500005.china.huawei.com (unknown [7.185.36.74]) by mail.maildlp.com (Postfix) with ESMTPS id B480518007A; Wed, 5 Jun 2024 21:36:22 +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.39; Wed, 5 Jun 2024 21:36:22 +0800 From: Yunsheng Lin To: , , CC: , , Yunsheng Lin , Alexander Duyck , Andrew Morton , Subject: [PATCH net-next v6 09/15] mm: page_frag: some minor refactoring before adding new API Date: Wed, 5 Jun 2024 21:32:59 +0800 Message-ID: <20240605133306.11272-10-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240605133306.11272-1-linyunsheng@huawei.com> References: <20240605133306.11272-1-linyunsheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500005.china.huawei.com (7.185.36.74) X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 539FC100010 X-Stat-Signature: oiqsncsrkgsqteuuttgdmbpofyyuupyc X-Rspam-User: X-HE-Tag: 1717594584-951520 X-HE-Meta: U2FsdGVkX1/j9xbSd6LE3fjrF/KmpVS8nUdAzVNuS3s6so+iwrnEsn5Bzh1+ZIdViEDH7z7vFwXJaB2xvkxnBvSYLR4ZP8Uge9sK8FltT5cRmGMKAftrtTa3vXXEC7q4yh2cQgPgzHLfhLt9qEqz8izK4BVqYraxx5zMCDdF3/1GdVoN6T3FGd/yspCz9ariOEW1XIxVxhQatPQFqH4HHkciVkbQ8DbsBa8E47Gw33kO8RLwueoTmbuPFTzf8thsWh/6izTals+6m5Ws4RZmIL2cuExHY7dAnYUiMU7KCpLDtCrmXpr+buoOjhjJGsWUeb6L+KlosVumaLdgcQgxJPZlLnI8RiYN3XPg/QzBIdR+TreB4v+NhnvnXqNCwP6dj9YttbW4GJz5h82HQV8NyZHDRtAGfuQEFW1StmoCUoucMFaBUarTp9B1wdoU8sBYezvC/UMDOPg3vIQPpO95lm3v5pIBcJDJhMnAK5a0LCay/bTqbEFtnAddBAB78g6wxAon6u/zpIyiwQdHf6e6QlmbcFSbJCapTVHSiaKz67lRZbI/cPf3ahRiCeFf6b6SuQfuKDT5Br8xxbcVMQ1nSorvotvYpiG15yLtSrtoYLo7PJ4qjT2FMgAqHekbwBLPbvq/2YMjYlmhTim+zZA9m4AWFelDz3gajeCLqA4ZzhZCmOTKM8V+d1XEv3nzV1Q0UITPZEQCMU1G+cGQuKozOC0X5/ZhLZ+s0jFb77x3CvC8gJtzpffAv6Xhm3xDZ/cQV33uyoyPnOd0ZjgNXrLhTjLhXltzbkfLCKnhIAtCgIjeDqslp8t7WAd6C9VD8Unoclm6/E9aDpZwapH3gZA4iwtmloNBTNzBsOkDqCoc/gx0x1iMpMEnhrOWnn/ZUeAee/IxrSsqaOJ/jKoZ2thUDZiX7yW/+7s19+sYC+179+8MuU+EybTb3xnWFafUp9L96cpWHQrVJHfn4QToURq iXqB5DzT LEPjmYjbKHUjuNfJhje8eza7AsGvgyLqZM/Bg4NdmFb+3aJPR4BT3lO8DQbBy6Bs9062vmMsSzcaBr+vZrg4l8/Fh7vcOY4kh3m1b9bQA9V1yQp+PAWJZLLibqeHf0wCqpFCFl0jMLMESq2jnniI3E7rFIu392zVDk79inRDWEgBhLxcybEcIRYIrZNk9/NNR+h9iLVIFr1eMVGnhPrLazG9SEM37IdnZT32/2LZaBaMd9rUGERtt3HjbmHvY3OHNK45dCzdBJcprIY4NgY/7U6LTvxOReKW4y3x6 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 --- mm/page_frag_cache.c | 61 ++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/mm/page_frag_cache.c b/mm/page_frag_cache.c index 756ef68cce21..b5ad6e9d316d 100644 --- a/mm/page_frag_cache.c +++ b/mm/page_frag_cache.c @@ -29,10 +29,36 @@ static void *page_frag_cache_current_va(struct page_frag_cache *nc) static struct page *__page_frag_cache_refill(struct page_frag_cache *nc, gfp_t gfp_mask) { - struct page *page = NULL; + struct encoded_va *encoded_va = nc->encoded_va; gfp_t gfp = gfp_mask; unsigned int order; + struct page *page; + + if (unlikely(!encoded_va)) + goto alloc; + + page = virt_to_page(encoded_va); + if (!page_ref_sub_and_test(page, nc->pagecnt_bias)) + goto alloc; + + 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 alloc; + } + + /* 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 of new frag */ + nc->pagecnt_bias = PAGE_FRAG_CACHE_MAX_SIZE + 1; + nc->remaining = page_frag_cache_page_size(encoded_va); + + return page; +alloc: + page = NULL; #if (PAGE_SIZE < PAGE_FRAG_CACHE_MAX_SIZE) /* Ensure free_unref_page() can be used to free the page fragment */ BUILD_BUG_ON(PAGE_FRAG_CACHE_MAX_ORDER > PAGE_ALLOC_COSTLY_ORDER); @@ -92,40 +118,15 @@ void *__page_frag_alloc_va_align(struct page_frag_cache *nc, unsigned int fragsz, gfp_t gfp_mask, unsigned int align_mask) { - struct encoded_va *encoded_va = nc->encoded_va; - struct page *page; - int remaining; + int remaining = nc->remaining & align_mask; void *va; - if (unlikely(!encoded_va)) { -refill: - if (unlikely(!__page_frag_cache_refill(nc, gfp_mask))) - return NULL; - - encoded_va = nc->encoded_va; - } - - remaining = nc->remaining & align_mask; remaining -= fragsz; if (unlikely(remaining < 0)) { - page = virt_to_page(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 (unlikely(!__page_frag_cache_refill(nc, gfp_mask))) + return NULL; - /* reset page count bias and remaining of new frag */ - nc->pagecnt_bias = PAGE_FRAG_CACHE_MAX_SIZE + 1; - nc->remaining = remaining = page_frag_cache_page_size(encoded_va); - remaining -= fragsz; + remaining = nc->remaining - fragsz; if (unlikely(remaining < 0)) { /* * The caller is trying to allocate a fragment