From patchwork Tue Aug 6 02:22:57 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: 13754327 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 D4B76C3DA7F for ; Tue, 6 Aug 2024 02:18:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 61F4E6B00A8; Mon, 5 Aug 2024 22:18:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5DB7B6B00AA; Mon, 5 Aug 2024 22:18:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3AE2E6B00AB; Mon, 5 Aug 2024 22:18:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 14CE46B00A8 for ; Mon, 5 Aug 2024 22:18:35 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C16CA40512 for ; Tue, 6 Aug 2024 02:18:34 +0000 (UTC) X-FDA: 82420211748.03.9E468AB Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf23.hostedemail.com (Postfix) with ESMTP id 2E073140010 for ; Tue, 6 Aug 2024 02:18:32 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=O01JxTsF; spf=pass (imf23.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=1722910664; 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=iWgbOZ2QAxS+P952aw1NkEslEDRfDsVglr2/2vNMBu8=; b=C3PcfDPGOOqiz02HyfGarl0CWGv5hdGb6XZrkw0mC8ohJyx4qaDOyu9qieQqEinWfIdrRj KKW+4BjXuuAjoAfoX12auibYxhpWaOAfKKQ8c7APXbCLlpoIwBCSZq4KBWvrJeciMUqrjp F7k3Rlg8C9TFvsnrRJF4MwbTScDX7vo= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=O01JxTsF; spf=pass (imf23.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=1722910664; a=rsa-sha256; cv=none; b=FxwSnIrvPyk7ROEa7vctTvySDNF2yFyCXi8ER5ByT0usmVMansTJPCHe9CzwrWoBhu6uH8 MWAYB9dOyYZlaaqhS1BMk6kU/O3VW3wmVjon9jtLOCrrvLtgmSWLw8f5j5/HZ60wGuHCeG UD5q+88qP66LSExqLSgMXDVqYqC4TYo= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 67D9360ED8; Tue, 6 Aug 2024 02:18:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13C64C32782; Tue, 6 Aug 2024 02:18:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722910712; bh=jd//d/JKjS/cL1w5x1hSjGz2Vv8a8C5I3yz/l4s7SBA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O01JxTsFcnRCOHKuPEnby1tCq8aWX74P/c0exfYMK/J/CPxNyd8q5/bPamjiRPu/D Jbdq5g/rE4MKhzhnGw6Y+VEGx66ZKCcPQDJlAoDr/Ho7DFKt3N+Ej0/Y+xm+s8hkZ1 2pbU44Dg9XOKAaX+Ya+IpbEvo2BwfU0yv8ESApwHCdGk424aYgHyqyBtoK8f/UUPay XPT+/plQr4/OmfpRfFVDj3hPa3nI0wbRBKhBeb0/doYypbQPMnKCJu4N90NLDyF7ER gCMoDrX+hji7qleXNI8IYn1jvUXVJzmAni/q1ZINV1LIEht6CBgEA6xQtXk/vEztSv 0Xwt2TumKKccg== 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 v5 10/21] mm/zsmalloc: add zpdesc_is_isolated()/zpdesc_zone() helper for zs_page_migrate() Date: Tue, 6 Aug 2024 10:22:57 +0800 Message-ID: <20240806022311.3924442-11-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240806022311.3924442-1-alexs@kernel.org> References: <20240806022143.3924396-1-alexs@kernel.org> <20240806022311.3924442-1-alexs@kernel.org> MIME-Version: 1.0 X-Stat-Signature: i9y8uw6mpaxebzok3hfqbg8mk4oduc1w X-Rspam-User: X-Rspamd-Queue-Id: 2E073140010 X-Rspamd-Server: rspam02 X-HE-Tag: 1722910712-246390 X-HE-Meta: U2FsdGVkX19yqkPzLHEzH3FqvdoZ2TPWRBTV+P7uGGEnE8Fz8FWLsD619CPWY2U/AKRuz6uTuI37RFrObN6fj8NpeGbjaUIII7CeI6/FoW7KOdFa+gWwuS1XLxyChMqw0XCRipZhfjKRrqWh1s4rGUTdTWvgLEtrpcdRTfpO5MCiGq042mirQH0jYUbt8l/4+QujCA0gBTPf7kiULqmMN48HJiv7BMtcU9z4YvhsdJ/Zs3wgNJmEvNUbJ8NBzZQV2YnWp9O7NtTsZtSfewZwysDrnH8jWfR/cXlUbIVQ+rDSE6IpJkSDA/Ool9o5O4pXHN4FtWdvGAA5mBdX8tyMYyFh2ixKN/dZSOs4FWaY9AxXMv3udD4DKJ9/Z1tQXqsTi0JHkjzcq+/fXHwHWLKvQfXTcGVfk15Og0poguuPsEvqxnARfOssyY3i+4kQw+Tb0VfbZZI4vA4lBpbi4WESle4mzOYa1xjIXuwynvav1SrRhvZt+y/0S55StbQfKTsaecWMJtRwSm69tJAJe7zbM4tJOno4jOjg8CLK5jDg6r08EcDnH2A5bBqOp1bdXoaGDF2syqUaZKU3kjaE7pEWmvd18pkGBKjjXMdhOiNbWUEQBEcwfgFGc5khi2x5hl3M3BtrtDkmtv6cP+R6x0dda/oMhELIxhR566agntswvyybJWC5SeeeNOtuV58vFzvO8BuA78aZcK3SIagImpBBnv232p+xQpFSFVihQfC6u17/Q5pZRs2izg/7l2BGkHlJFAz4GJ23OIJR8QJvUX2dFV+YrKGw3mRArbw3d/nMpYnXWIB2l5Jiogb/WGPf3drDCJnONlbBXXKyX9dmoUQcoP61Re+1DAjZN6YPtsSKRUKFCL8DMXT0tjAgWmLNb2Xwur90KZbg6h6m2dehrlUOBa1a2jE4968ri87+N3HUurRrkDkH1jwSWDb6pfBUo2ROnzjTttDeM2Utc+4BnTm H75aczll wBzZ8WmZNi4XwLsFzt32XLV755d4ewJJzhF+MDg2TDewDsX+DX48Su+/FX/OIe1G/5JnYO83jUpwKG6k4Sor1Qo+zX8mW5kGEIMUAYxkmr3oiB2asCIydYYYmmV0mMXYAZoI3GCKo2cMj8wuaqQT8zmPv0Do4nocBAlFY7BKdnz0hhV2TQJGfTweNKVnS0qvB+59gMwVN/ras32lQoq0qllh11OLHSXTRoTd1pF4f4y9x9X4hghcz5VuTV6A7M8+pKdEGw8eP2E5HWxCXosxln5A2SbVKgLOOboOfrcCdg82BcMdGzHh4rdmoT17PIb7FNgyQ8LReiw1LsiZk8H3Zem3IBjYP/bWYM/Y4h15W4BkriNORNGThNKNp/Rz369yd7yx5 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: Hyeonggon Yoo <42.hyeyoo@gmail.com> To convert page to zpdesc in zs_page_migrate(), we added zpdesc_is_isolated()/zpdesc_zone() helpers. No functional change. Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Signed-off-by: Alex Shi --- mm/zpdesc.h | 11 +++++++++++ mm/zsmalloc.c | 30 ++++++++++++++++-------------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/mm/zpdesc.h b/mm/zpdesc.h index 6a01e09e4beb..20881e7e42be 100644 --- a/mm/zpdesc.h +++ b/mm/zpdesc.h @@ -113,4 +113,15 @@ static inline void __zpdesc_set_movable(struct zpdesc *zpdesc, { __SetPageMovable(zpdesc_page(zpdesc), mops); } + +static inline bool zpdesc_is_isolated(struct zpdesc *zpdesc) +{ + return PageIsolated(zpdesc_page(zpdesc)); +} + +static inline struct zone *zpdesc_zone(struct zpdesc *zpdesc) +{ + return page_zone(zpdesc_page(zpdesc)); +} + #endif diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 5fac2bb436f8..398b602a3b4d 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1810,19 +1810,21 @@ static int zs_page_migrate(struct page *newpage, struct page *page, struct size_class *class; struct zspage *zspage; struct zpdesc *dummy; + struct zpdesc *newzpdesc = page_zpdesc(newpage); + struct zpdesc *zpdesc = page_zpdesc(page); void *s_addr, *d_addr, *addr; unsigned int offset; unsigned long handle; unsigned long old_obj, new_obj; unsigned int obj_idx; - VM_BUG_ON_PAGE(!PageIsolated(page), page); + VM_BUG_ON_PAGE(!zpdesc_is_isolated(zpdesc), zpdesc_page(zpdesc)); /* We're committed, tell the world that this is a Zsmalloc page. */ - __SetPageZsmalloc(newpage); + __SetPageZsmalloc(zpdesc_page(newzpdesc)); /* The page is locked, so this pointer must remain valid */ - zspage = get_zspage(page); + zspage = get_zspage(zpdesc_page(zpdesc)); pool = zspage->pool; /* @@ -1839,30 +1841,30 @@ static int zs_page_migrate(struct page *newpage, struct page *page, /* the migrate_write_lock protects zpage access via zs_map_object */ migrate_write_lock(zspage); - offset = get_first_obj_offset(page); - s_addr = kmap_atomic(page); + offset = get_first_obj_offset(zpdesc_page(zpdesc)); + s_addr = zpdesc_kmap_atomic(zpdesc); /* * Here, any user cannot access all objects in the zspage so let's move. */ - d_addr = kmap_atomic(newpage); + d_addr = zpdesc_kmap_atomic(newzpdesc); copy_page(d_addr, s_addr); kunmap_atomic(d_addr); for (addr = s_addr + offset; addr < s_addr + PAGE_SIZE; addr += class->size) { - if (obj_allocated(page_zpdesc(page), addr, &handle)) { + if (obj_allocated(zpdesc, addr, &handle)) { old_obj = handle_to_obj(handle); obj_to_location(old_obj, &dummy, &obj_idx); - new_obj = (unsigned long)location_to_obj(newpage, + new_obj = (unsigned long)location_to_obj(zpdesc_page(newzpdesc), obj_idx); record_obj(handle, new_obj); } } kunmap_atomic(s_addr); - replace_sub_page(class, zspage, page_zpdesc(newpage), page_zpdesc(page)); + replace_sub_page(class, zspage, newzpdesc, zpdesc); /* * Since we complete the data copy and set up new zspage structure, * it's okay to release migration_lock. @@ -1871,14 +1873,14 @@ static int zs_page_migrate(struct page *newpage, struct page *page, spin_unlock(&class->lock); migrate_write_unlock(zspage); - get_page(newpage); - if (page_zone(newpage) != page_zone(page)) { - dec_zone_page_state(page, NR_ZSPAGES); - inc_zone_page_state(newpage, NR_ZSPAGES); + zpdesc_get(newzpdesc); + if (zpdesc_zone(newzpdesc) != zpdesc_zone(zpdesc)) { + zpdesc_dec_zone_page_state(zpdesc); + zpdesc_inc_zone_page_state(newzpdesc); } reset_page(page); - put_page(page); + zpdesc_put(zpdesc); return MIGRATEPAGE_SUCCESS; }