From patchwork Wed Jul 3 04:05:56 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: 13721076 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 AD63EC2BD09 for ; Wed, 3 Jul 2024 04:01:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E20976B0096; Wed, 3 Jul 2024 00:01:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D83736B0098; Wed, 3 Jul 2024 00:01:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B60EC6B0099; Wed, 3 Jul 2024 00:01:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 8F8036B0096 for ; Wed, 3 Jul 2024 00:01:34 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 52FF0120721 for ; Wed, 3 Jul 2024 04:01:34 +0000 (UTC) X-FDA: 82297092108.08.15C958C Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf20.hostedemail.com (Postfix) with ESMTP id B1C7D1C000F for ; Wed, 3 Jul 2024 04:01:32 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=bQm+Zd9Y; spf=pass (imf20.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=1719979280; 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=eXV+ekf1LWeDPFA3tZsyPnYFsQnE5JjnSGGA6NuHJJI=; b=b7KR0vGnO3NcTRZQ7UM6ZBaOhIxs9hM+yJMdDta6DN7oObr2CadH3qpnvi2SxW5cTu2mA9 EG+hyN6u25ruGHy/Cx0H2KOkbxs4TtJGzsnetsxUZBYIdn2667d51Lu6zVxe/nT8znwPEq GrzrK1+sGzVsjxkdCgCrYwRRZQLFgC8= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=bQm+Zd9Y; spf=pass (imf20.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719979280; a=rsa-sha256; cv=none; b=52ae4IZfrdMtCecVvSRcQ3xFC6qiDeYKc+NyM6WPqiHXdr+jCuAj5ljBW2C690WK9g3Vjf aPPCuI6Y++MY1f2I8pAGB4jz3wD4bpWtDDbXYSX/FMhD+SG458I2vmdqOgznFbnmWwfKBL XIaUCpQN5vkV6om6bagO615nr18NREY= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id C579C620BD; Wed, 3 Jul 2024 04:01:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36A9CC32781; Wed, 3 Jul 2024 04:01:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719979291; bh=m9lqRC5WWSzScStlN5X+B3diMObK1z5QGj5Hed/vEuU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bQm+Zd9YsHA7+waQJ9X7qV3qEMjqCA8PuU6zGGx7EbaQLrn0Z+sWBiSbppZR2r5bD LZDiDUol0LFVFAj9f2gYKmMmmtQRa2wpvDhYnj8wo/VVVTm2pDoxJqY5AXqvRybYfp /kEvQmIraoSve7GzxVmDHK86iW15DsKP6dxmqedX/nC1gyopT0TfYbPlSnVRpLij98 zK7Vk450yQjq6BWnE+jvYCgwVw2NEV5p927PMkRf7B6bi+F3gXNc8S8tuywT89ogWu 8D3yW0XPH1bmSAbY+NsLVDPdVHF9X2oldOzo+EYZKFWL37gWVhFwFhsZYgwT5wkgvX aH2nAR6XEr3oA== 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 v2 06/20] mm/zsmalloc: convert create_page_chain() and its users to use zpdesc Date: Wed, 3 Jul 2024 12:05:56 +0800 Message-ID: <20240703040613.681396-7-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240703040613.681396-1-alexs@kernel.org> References: <20240703040613.681396-1-alexs@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: B1C7D1C000F X-Stat-Signature: pxet5scnwbpbrb4of5dcn6y8qjsarx5j X-Rspam-User: X-HE-Tag: 1719979292-881847 X-HE-Meta: U2FsdGVkX1+mtNgFV5PhSuov/gBJKfYBC/5C8/YoovkfAJiQINLg4Hihjk8u50vt4q2MO+6BaNeTsdmpd4al7psDnZXOBYsB9RvbW6EcnOSHG/TlF/uwQx746yuNbZXMpOa6wjFf7/cRFae4lnyZuFDYwMA2crwIv1qAzeu/Lj98JPrnnwrUm0qfra5wVVLL9yN9tdtPPgEsqUqywndyzqsDMWP0s9xlHZPNymMC4PtdxEUbBV2XISViWTph4b8sRM3r+bRNxoShbZoOVlktaiHa49kQ0uv0HoRUDlzwJo5l5jWwKYLEnOYdPfGVaDYkpPyDJiab9He6rJ0yD9kYhqzVDjSCQ2lPWIzZcTmn19k9kln7ezVpbyyB3LMeIlZpizpaY3x1sJTyFUPYJ7oNdJFI6/P+CekHdNrivEH+YJol8mhJZVUgdR641d07IJ0kd2cTUQnpyOtQTxIYKusD1Uf3ztUKbF1i58uQRPcx6qzyMTIxWLS1A84R2hx7zkEiyUxLZURoUlXdrlxj8Rh7FJhMlOZITOQcxefckWEBHOhJ1tyaoOTQf7G2qhBxIM6ygMCfC4W3F0/fTBywmB88uuckvmWwhpuGjVOqLjN+7GtD7nyydKJuBhaodNXO51rtaKdNhL0cXaBGy59eVwlRDabZDejn6u96yBDlmicPenAaQbFy4c0qp+afZYdQ+0aD8En0sHpGGb+gKIRffMUEUKySao93Dc8Vw8ARodhLqiYLahShkQCm9l5laeFsg8fbZMEazrArmTFFDCKnOMs+un523ZH28dxjVkUEwpBPDPcuLl4HHTj+1cJQkh/n454jWF8lcgb2cpiyzkCI+VdxCrzSDjtzfIa5bIFF+MddPiJuVRjaDA2c5vNtJ89Aaie7ZicjUiWb/62K3Ap8k1n9tEf/FIy2h8DROPr8Utt/+XjMhgmrXvbKYwth8wB8VpeT3JGOyl1JoFkVLKsjfbs Fc3MptXF hYlGNp+8sCIf34I7oYvUdRBnByONHT2dx6pKJihuZJcAJwo6CAiJRscHg376DfYBOv9Ml+hN4JD/xhnPnclN1cdr5S8D7sgPtreP4l7ZrqDhEBSq4ip1NUbsyaJP9ctegwAdszRRB9B7pWDhbE2UZj/8IJLqMrx1gKM4kymxqzhEYYAZ7WKq+yD04OsTPB/GUPCrXF9zL4siOv2lUp5eN54Qt/PVlWlBcFk39bVHAwbg1QN1AZJLSjyIVeQQuK0V0fLLKDuqSNdq09L0mqW7uF/cI/zkcKR8UWZR21jckjKDf+fPe+ZfQ80GftR7307dm+c4U59A9PAidVRdkT8z56KJQX2VhjoHWwXx0gGHb6sMEHIzV8ZKPKWmcfrFfdOEsqDtz 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 96b9ce80ea49..a2e320f24dd4 100644 --- a/mm/zpdesc.h +++ b/mm/zpdesc.h @@ -100,4 +100,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.