From patchwork Tue Aug 13 08:45:52 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: 13761555 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 43E7EC52D7C for ; Tue, 13 Aug 2024 08:41:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CE4696B00A5; Tue, 13 Aug 2024 04:41:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C6B9D6B00A6; Tue, 13 Aug 2024 04:41:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AE6526B00A7; Tue, 13 Aug 2024 04:41:33 -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 8972B6B00A5 for ; Tue, 13 Aug 2024 04:41:33 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id A08C51C3110 for ; Tue, 13 Aug 2024 08:41:32 +0000 (UTC) X-FDA: 82446578424.05.421334B Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf11.hostedemail.com (Postfix) with ESMTP id E5F8F40023 for ; Tue, 13 Aug 2024 08:41:30 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=LRJGVXPM; spf=pass (imf11.hostedemail.com: domain of alexs@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=alexs@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723538420; 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=hUQv6/Qaa84Jd44DFKs+zhut+z945vtrMEIZ5kVxxCY=; b=giyo8j2p+/CU/HaaPwhYKPeenZZ98aJVT1rOwQ7woG/l/gmtwNpkkTy62bV7+8Y9TmaLtq dg+IRzc8mt98Kwq+Q5qjTOIdgHE4DCpJ6AXPgiCmXovcPbhOnsl4Pdoz2xhXeiplWDGfmc e4rtZ2EkD12/zxhQLoLuee1RILH1BFY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723538420; a=rsa-sha256; cv=none; b=jCkn3chqtHecJdRuSTGIqUtEuNElFr79tL8JFmkAaO3UgIWa0P+zxElfezXGlqpogr87k/ T3Q7S33zCpWpVNtN8jqGSVr+hqJW905KC5kTtt67nbA8qocQ3YIuJJqw1U5Zfm+7sZjXc4 2I6iA4gL8H02PdB57BQ3OidUAKhxpBw= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=LRJGVXPM; spf=pass (imf11.hostedemail.com: domain of alexs@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=alexs@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 306B7615B7; Tue, 13 Aug 2024 08:41:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A4125C4AF12; Tue, 13 Aug 2024 08:41:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723538490; bh=It08fyjD3QWexpsDd5b4wIE8APHhPnH+kLBEpOpVbWw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LRJGVXPMQpMirOcEYCVJ2PjrlSaeIZMkPeyEPqRJc10lEEzZG1mk7YLd4+e8qKzBQ o+Ow6SJpIAgPPpCi2JYGfEien/wgKV9DzVRW0yBRlAjzhSfnKVh0AP5vkUP9EBi8Dv T2GbJPU+PD3E9Dogt/B2sRCEr4oJj9vL6ea4uj/yRIl+IcPUd40hS1VvLQ88r2ZGnO qRx7IntvucBBuag5ICIL0WOK+kUcWoswWW78NdodJ0NSaO+BzQVOzg8FjyThLefxm5 7PqoaEF3XnjvBO+M8yHMz1UiYC81gAqB8xZxjI4tSaVrJ0BV3dQj7leBEYGsEuIhBT rYsAKQBs+LbLA== 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 v6 06/21] mm/zsmalloc: convert create_page_chain() and its users to use zpdesc Date: Tue, 13 Aug 2024 16:45:52 +0800 Message-ID: <20240813084611.4122571-7-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813084611.4122571-1-alexs@kernel.org> References: <20240813084611.4122571-1-alexs@kernel.org> MIME-Version: 1.0 X-Stat-Signature: s978r5eaz4su6bpd11djobhqnyb4k17n X-Rspamd-Queue-Id: E5F8F40023 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1723538490-361940 X-HE-Meta: U2FsdGVkX1+DR37ImX5ZEFH1B9wIfgSayCCHzbpQuk49zRjpu1lx0SlOFVxJ0LAApdUgO3Utvm66FnU/ncnI5XDLSG8QRzK9zf3RvnUDToNKrCcWg5NMjVyuPfoTNxaENA+dJCLbDNIA35ev1/BUNld6sxM//MUnCyPSqIympe666q48qUWUj25yBI/v4qYaj4kaWT8IQg6OCT3eWZ9SVFpD30R6X9lsfZ1UzEdJDLFR1nGOj2ltRbaU7kYqBdyaNlU1SGkt/8E+Z6GrSi6gWe0wxyy7zLioDR97t4AeMK6fSOAMzbqCUFdGzTxJUOFD2r8gSZI8gIjOK54QRa+pj/UzhdaLidChHsX2TADsMFGPnUmoeMBeNeo2kywAKvsS2aAMOEHxk7FelFcLXmYWF5WAVbENjZXn5O23IXMi8OOYErFVnlN2HRn8xCazxljC5vdurnwZGYPHmk3VsvIaEjNl7dt+kZS4sIC/jZLCMOH+R0bv/vrdWLMYEBHvFMzbIrmmLnhVh1in7zAvi9jgFKRYT6eUhwkBKDY/sepTChzvozhVkScb2LMFPRzr2fLoc3sjIjrDhXaxVi+l2Paz64V85QHqP7Fi5x8x/8rP4bw7FulZh0CgRWpeLXCYueCA2g7VSnY7vVWxE3cBp0kidFLU9pryCv2jlM3PYS24m3OwhhThFWzSwd6E549Xm+WIejZZ6RR5olekoIjl1iAq0tMGfs/HH12E76WvtRJLtSimbn6VJu5aeZyMWNlSM186NRsVYlmS3ZtzuqF2D5pIBeCTO1JMG3kw0sQKG0I+0DLbjUv6a5ckyxvJ3uQ6rQpTh9J+ojh/Al76UsTGfNEtqvkQEiUzGU7eqwkwRatCMWJ8DyrtU+bT7O/1df8l3sDlL1va3OxQNtsSXQU9BvqFTZX254MCCgDTChmHry+oRbAwQ0sfHRVhwh8CvtKliS3zQTu708o1vpjZVdCRjnP 4Cswrm7U sK/prLxB+cIbqsXtEMen/Z62E9QbLKnf7KKwvYWIz2PP43yQTCgCFhBh25C5u3uy7JJFmzUr01/dwR4xBtokyVIPIWAmjZkyGzYXy4OJJvi17uW+R3MmoP8obVHZ44NsuYvfD4gj3psfO8WiEl67NumRG7Isxw7cJjxzNW+IAipklA3m/YrV7KJMKPbGBbs72hTh310qKWTyPg1PoiHivKB5+B5Lzt6M77jymivJNDGFhB6JlNXz6vvOHavtliIcgeROZQl42jqd1OlkRuEwTwc3mMgARvO1K8SUQtHaBfPoQv6ZahjKoFODPqVD3RWjpvhmWmKa+ITR1uuJ97VaBeExomY2XUSYf49Nw6slHZIJiItSlrniNAzTQpdje/y6RuAfT 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 | 109 ++++++++++++++++++++++++++++++++------------------ 2 files changed, 76 insertions(+), 39 deletions(-) diff --git a/mm/zpdesc.h b/mm/zpdesc.h index 11083a1c2464..3a65a7d494b7 100644 --- a/mm/zpdesc.h +++ b/mm/zpdesc.h @@ -108,4 +108,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 7421d7678880..2d0f3d9011ac 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -248,6 +248,35 @@ static inline void *zpdesc_kmap_atomic(struct zpdesc *zpdesc) return kmap_atomic(zpdesc_page(zpdesc)); } +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 +983,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->zspage = 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 +1023,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 +1033,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 +1782,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 +1876,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.