From patchwork Mon Jul 29 11:25:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexs@kernel.org X-Patchwork-Id: 13744729 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 1DA83C3DA61 for ; Mon, 29 Jul 2024 11:20:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AA0206B009D; Mon, 29 Jul 2024 07:20:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A4FBF6B009E; Mon, 29 Jul 2024 07:20:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 917286B009F; Mon, 29 Jul 2024 07:20:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 70BEB6B009D for ; Mon, 29 Jul 2024 07:20:40 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 2BBEE4029B for ; Mon, 29 Jul 2024 11:20:40 +0000 (UTC) X-FDA: 82392547440.16.5C7FA21 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf03.hostedemail.com (Postfix) with ESMTP id 776F320011 for ; Mon, 29 Jul 2024 11:20:38 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=CHDQSHaQ; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf03.hostedemail.com: domain of alexs@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=alexs@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1722251979; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=MXKib2VKKtWSPN2wud0WRC/YoxbugN+potuqXfgPPvA=; b=dR4D08CQ/HkUvx3iKeP29uqMgJIjPXa4t+pwrLKLdLKZl/OQoe7LAWDE1G4N5KRBQs4cgF nwUH9HKQB9Yw+ys2y4A7CzgoVyO6Td9TlDEFKhkTaTQf9NJ6H672Pzqwq6kLpDD5A4BaYr jqLPwflyP4+/wm3a7Nn0BYD9vgLKb+M= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722251979; a=rsa-sha256; cv=none; b=MUDYctTzoV7SHelak3cP0C5CfTka1EGY1QoL6N1e4hsGBBUHD6yxmB5j/yQ/FpO88hOHdY JkIsdpdQwIa01/ZDyu/M6vHAvGXEl7vidfCzxil0GbsLrIscD70Sjciab05U4jAMB4EIBx eYRM24eAMDH+Bez7zCrFgO9hYAPX2E0= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=CHDQSHaQ; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf03.hostedemail.com: domain of alexs@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=alexs@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 92EAE617A5; Mon, 29 Jul 2024 11:20:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9DF16C32786; Mon, 29 Jul 2024 11:20:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722252037; bh=4GoIroOrsiTuTdQywHvfrAqEQ0msvRBa8bIywcf/abg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CHDQSHaQ7YakefYJHb5Fg8lwtzCCaRG0VB351O0fHGxYrATxRQrDZhI6rXJ3dYnNK Cs/mmOJEmxG2Aa1cu/6/PsIqH4iL7wmLNMzzgMSyyw6nxdlJ7TUkJefkCoFSJ2U4XS IMEeeC0++d0mDQXFOPSmTGpPyQZyQAKDz/oPl24dNOK4QRKxHMwM0ex8RFI3nGBYJw pknR9QDjYq8runDJIu6KXyqIB3Ocw+VmQeuFt5ONCeMIVGQmaQGQYkBstduSvvwdHA ncnyZj0t/SqxNDRf721evVt/lqIhGFRrvpfpJa6Vz1uJAWL6rzHStGwxIs063ARWFF exuUydPFMljvw== From: alexs@kernel.org To: Vitaly Wool , Miaohe Lin , Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org, minchan@kernel.org, willy@infradead.org, senozhatsky@chromium.org, david@redhat.com, 42.hyeyoo@gmail.com, Yosry Ahmed , nphamcs@gmail.com Cc: Alex Shi Subject: [PATCH v4 06/22] mm/zsmalloc: convert create_page_chain() and its users to use zpdesc Date: Mon, 29 Jul 2024 19:25:18 +0800 Message-ID: <20240729112534.3416707-7-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240729112534.3416707-1-alexs@kernel.org> References: <20240729112534.3416707-1-alexs@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 776F320011 X-Stat-Signature: ap6iof9gugxbsp3z1neiiggd46ctjrxw X-Rspam-User: X-HE-Tag: 1722252038-310680 X-HE-Meta: U2FsdGVkX1+Lu0XNds0/DE3ZHCjCljg4uDmzsrTMOruvJszk2aH4yQw9U7AzpxN91X1rE8jyEa/iCpeANApj2kAAC1epl8jCxKdTot+ofwQFoAt1FG/9xnrM+u5BMb5q3u/sVg4m4qPNWyniwV9t6veBvA2lp+W+u9HrPZYqznE2tTAIxVb2SKgXNHbuqepjGDESsQJTmyRNiztoL7tY/cM8Qb+SsT00wmtKI2B7uTOYlTD3WBhDR0ppVbO5tJUgT4C2uj1yyMI7YP9zvSXvoN7IgWJ43wQlO7WK5wSQmZshDBIiFz/XN6O555BQGodiPP3z4iGCq524YO4P+MLXuL27NDfugT+icc44QYLGW6lqrIz3FydQ16LmNezfmoc7iWRt+2qO17H0NV3HgIkN+i9AEw9KnZ5CeucIQ7lvKXCyKRnV+puzHiCXpSEK7Motjneaa2fnQZMbt9WiLiDyHkKTgdevmZCQbxnvuI9+rfZFjcftvQoW0NPcEdkkH5wBhHBnth6oLX0RTVuCO+5nP9Utj4Onlu6HDN9TdBUafleAaL1czeTPE/1XyH7z5h5BI+iYskF30uQd/voyK/CPUxgJRfxPNpwwOQcNGgSz2McZ6vRBtHoOG6+VAg/dTsqE/f3sGWTXDh6ToDezFiPUHBpeaIDLl30zSxFLUEi8CecTazoPv0qjqDQFvhkflTaSQFYTML404/dWMVbS8dONFmtWFoLlML8arsUxlei7LyMUvWYI+szTX31CifMcq3+gLutkQ+slQw/r/LsjOyCwoNgGyEXAqZ2gtuNeLvk8WDTNNITAwue8bG5kpaOVePO9VjWe4oqskgAOCSu0CmUJEo0Esfghls4Mz/4veD4KRsp2KlEcTDcj0ih1skvfud33WPzbUqg4b1j2phxxtxuw/kUv2ocphg1BbN6OYFyyX1BgLiwaVCV72hfdfOPa5DaE33RpCOmiHhqhw4pLyeJ Zisa0rnt 3hvQatC7pEEY8t0XMCTqstJT6jtW4oI5o4dZSIWlXERnpECRNRkMf/yXEZCJh7iL94p9MjMKwFYoClShZzH8UqmOTIe1ved5/95PPohNTnMSa2dR989ZoSuxUB+WiLNt5l3ydLReXdixYS99x4mXAigucZ6NR61L9qrHLWWQ/TUB/tJqULCZCEyzlcILTiYyRMWVfe+OyINRckD+bY+Hgt3eNb85hvISOXnRETPancrxqsY4jmoigDTPcmgycpp/CGHhllm8rHDCDBndu3FrgrRXHUeosQn3Uo4M0gZ7WLCbe21X/h9ebzUCOZRPy8QMREdtjLZNhqJEtjfy1QWAktx+YkXxnTumaSM8FMy1FzAKPyWLR84pt0vM4JiCceIll6BuS 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: From: Alex Shi Introduce a few helper functions for conversion to convert create_page_chain() to use zpdesc, then use zpdesc in replace_sub_page() too. Originally-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Signed-off-by: Alex Shi --- mm/zpdesc.h | 6 +++ mm/zsmalloc.c | 115 +++++++++++++++++++++++++++++++++----------------- 2 files changed, 82 insertions(+), 39 deletions(-) diff --git a/mm/zpdesc.h b/mm/zpdesc.h index 79ec40b03956..2293453f5d57 100644 --- a/mm/zpdesc.h +++ b/mm/zpdesc.h @@ -102,4 +102,10 @@ static inline struct zpdesc *pfn_zpdesc(unsigned long pfn) { return page_zpdesc(pfn_to_page(pfn)); } + +static inline void __zpdesc_set_movable(struct zpdesc *zpdesc, + const struct movable_operations *mops) +{ + __SetPageMovable(zpdesc_page(zpdesc), mops); +} #endif diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index bbc165cb587d..a8f390beeab8 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -248,6 +248,41 @@ static inline void *zpdesc_kmap_atomic(struct zpdesc *zpdesc) return kmap_atomic(zpdesc_page(zpdesc)); } +static inline void zpdesc_set_zspage(struct zpdesc *zpdesc, + struct zspage *zspage) +{ + zpdesc->zspage = zspage; +} + +static inline void zpdesc_set_first(struct zpdesc *zpdesc) +{ + SetPagePrivate(zpdesc_page(zpdesc)); +} + +static inline void zpdesc_inc_zone_page_state(struct zpdesc *zpdesc) +{ + inc_zone_page_state(zpdesc_page(zpdesc), NR_ZSPAGES); +} + +static inline void zpdesc_dec_zone_page_state(struct zpdesc *zpdesc) +{ + dec_zone_page_state(zpdesc_page(zpdesc), NR_ZSPAGES); +} + +static inline struct zpdesc *alloc_zpdesc(gfp_t gfp) +{ + struct page *page = alloc_page(gfp); + + return page_zpdesc(page); +} + +static inline void free_zpdesc(struct zpdesc *zpdesc) +{ + struct page *page = zpdesc_page(zpdesc); + + __free_page(page); +} + struct zspage { struct { unsigned int huge:HUGE_BITS; @@ -954,35 +989,35 @@ static void init_zspage(struct size_class *class, struct zspage *zspage) } static void create_page_chain(struct size_class *class, struct zspage *zspage, - struct page *pages[]) + struct zpdesc *zpdescs[]) { int i; - struct page *page; - struct page *prev_page = NULL; - int nr_pages = class->pages_per_zspage; + struct zpdesc *zpdesc; + struct zpdesc *prev_zpdesc = NULL; + int nr_zpdescs = class->pages_per_zspage; /* * Allocate individual pages and link them together as: - * 1. all pages are linked together using page->index - * 2. each sub-page point to zspage using page->private + * 1. all pages are linked together using zpdesc->next + * 2. each sub-page point to zspage using zpdesc->zspage * - * we set PG_private to identify the first page (i.e. no other sub-page + * we set PG_private to identify the first zpdesc (i.e. no other zpdesc * has this flag set). */ - for (i = 0; i < nr_pages; i++) { - page = pages[i]; - set_page_private(page, (unsigned long)zspage); - page->index = 0; + for (i = 0; i < nr_zpdescs; i++) { + zpdesc = zpdescs[i]; + zpdesc_set_zspage(zpdesc, zspage); + zpdesc->next = NULL; if (i == 0) { - zspage->first_zpdesc = page_zpdesc(page); - SetPagePrivate(page); + zspage->first_zpdesc = zpdesc; + zpdesc_set_first(zpdesc); if (unlikely(class->objs_per_zspage == 1 && class->pages_per_zspage == 1)) SetZsHugePage(zspage); } else { - prev_page->index = (unsigned long)page; + prev_zpdesc->next = zpdesc; } - prev_page = page; + prev_zpdesc = zpdesc; } } @@ -994,7 +1029,7 @@ static struct zspage *alloc_zspage(struct zs_pool *pool, gfp_t gfp) { int i; - struct page *pages[ZS_MAX_PAGES_PER_ZSPAGE]; + struct zpdesc *zpdescs[ZS_MAX_PAGES_PER_ZSPAGE]; struct zspage *zspage = cache_alloc_zspage(pool, gfp); if (!zspage) @@ -1004,25 +1039,25 @@ static struct zspage *alloc_zspage(struct zs_pool *pool, migrate_lock_init(zspage); for (i = 0; i < class->pages_per_zspage; i++) { - struct page *page; + struct zpdesc *zpdesc; - page = alloc_page(gfp); - if (!page) { + zpdesc = alloc_zpdesc(gfp); + if (!zpdesc) { while (--i >= 0) { - dec_zone_page_state(pages[i], NR_ZSPAGES); - __ClearPageZsmalloc(pages[i]); - __free_page(pages[i]); + zpdesc_dec_zone_page_state(zpdescs[i]); + __ClearPageZsmalloc(zpdesc_page(zpdescs[i])); + free_zpdesc(zpdescs[i]); } cache_free_zspage(pool, zspage); return NULL; } - __SetPageZsmalloc(page); + __SetPageZsmalloc(zpdesc_page(zpdesc)); - inc_zone_page_state(page, NR_ZSPAGES); - pages[i] = page; + zpdesc_inc_zone_page_state(zpdesc); + zpdescs[i] = zpdesc; } - create_page_chain(class, zspage, pages); + create_page_chain(class, zspage, zpdescs); init_zspage(class, zspage); zspage->pool = pool; zspage->class = class->index; @@ -1753,26 +1788,28 @@ static void migrate_write_unlock(struct zspage *zspage) static const struct movable_operations zsmalloc_mops; static void replace_sub_page(struct size_class *class, struct zspage *zspage, - struct page *newpage, struct page *oldpage) + struct zpdesc *newzpdesc, struct zpdesc *oldzpdesc) { - struct page *page; - struct page *pages[ZS_MAX_PAGES_PER_ZSPAGE] = {NULL, }; + struct zpdesc *zpdesc; + struct zpdesc *zpdescs[ZS_MAX_PAGES_PER_ZSPAGE] = {NULL, }; + unsigned int first_obj_offset; int idx = 0; - page = get_first_page(zspage); + zpdesc = get_first_zpdesc(zspage); do { - if (page == oldpage) - pages[idx] = newpage; + if (zpdesc == oldzpdesc) + zpdescs[idx] = newzpdesc; else - pages[idx] = page; + zpdescs[idx] = zpdesc; idx++; - } while ((page = get_next_page(page)) != NULL); + } while ((zpdesc = get_next_zpdesc(zpdesc)) != NULL); - create_page_chain(class, zspage, pages); - set_first_obj_offset(newpage, get_first_obj_offset(oldpage)); + create_page_chain(class, zspage, zpdescs); + first_obj_offset = get_first_obj_offset(zpdesc_page(oldzpdesc)); + set_first_obj_offset(zpdesc_page(newzpdesc), first_obj_offset); if (unlikely(ZsHugePage(zspage))) - newpage->index = oldpage->index; - __SetPageMovable(newpage, &zsmalloc_mops); + newzpdesc->handle = oldzpdesc->handle; + __zpdesc_set_movable(newzpdesc, &zsmalloc_mops); } static bool zs_page_isolate(struct page *page, isolate_mode_t mode) @@ -1845,7 +1882,7 @@ static int zs_page_migrate(struct page *newpage, struct page *page, } kunmap_atomic(s_addr); - replace_sub_page(class, zspage, newpage, page); + replace_sub_page(class, zspage, page_zpdesc(newpage), page_zpdesc(page)); /* * Since we complete the data copy and set up new zspage structure, * it's okay to release migration_lock.