From patchwork Mon Sep 2 07:21:21 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: 13786834 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 1BFDACD3427 for ; Mon, 2 Sep 2024 07:17:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A52008D008D; Mon, 2 Sep 2024 03:17:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D9998D002D; Mon, 2 Sep 2024 03:17:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 854638D008D; Mon, 2 Sep 2024 03:17:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 66CEE8D002D for ; Mon, 2 Sep 2024 03:17:10 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 29A08AB0AD for ; Mon, 2 Sep 2024 07:17:10 +0000 (UTC) X-FDA: 82518941820.26.CF90951 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf06.hostedemail.com (Postfix) with ESMTP id 8869C18000C for ; Mon, 2 Sep 2024 07:17:08 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=rkUy6HuW; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf06.hostedemail.com: domain of alexs@kernel.org designates 147.75.193.91 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=1725261324; 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=5ZvvNvc5kYv4dXMGIZPc07KpLduPDQMRbytcG5AX0T4=; b=S+l3quA9CcMnv8l0S8z2ZGoLWoGbmt5jzfTwjMlAhxVIHn3SGwAwFaCc0AkZdfjUneCoIm lUcbl1d7oQhtu358O54vA6SVENeXqeqI5L/NcMWxDSVjnJMyj/MhIIluoNUjQASzfBe84s qKr9n83yb06T444Tbys95TE5jheabvA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725261324; a=rsa-sha256; cv=none; b=7kdYlj0QrhoSXKt8+zfTahZbSl9+sTlgJgv5+yihzR6jaj2ZCRtR1bjh9i6k23FT/QP6ST Q+KAKy3sgnuB2d4vhU8FV7rp2FR+w6PsTxWwtR/Td7lOdRKf9lZ+5xPEH5D//m3vKih0Th ELmx/Uz8nWeHo9O28tJ/+T5denokiEc= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=rkUy6HuW; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf06.hostedemail.com: domain of alexs@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=alexs@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id C6501A41722; Mon, 2 Sep 2024 07:17:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C8A34C4CEC8; Mon, 2 Sep 2024 07:17:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725261427; bh=oCzUVJExiVdlJN3ac9k05YJBYpT4iWle/rruJLC4yF4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rkUy6HuWPoGU4zFzaR50FOgnKCKF9Tv5JOIFvN6EGC+Wo0ag94CXHRxJhF/CSJ7Qq cDZxI3rBPwkmIZ4vAujby84oFn+WBybmfq1QQgNg+9K/3edwYfXgwyuzm6jDI1bVyQ y3m4XjueWEln4Vb7BgU/ODrYz9R0Sfj9cnTbhQaG8sPmEE/xrMSmTsdr+lb1yds84+ eGBorMA2OYL0Idrh4/9Eol5VGZ1XidpF+qyqo4xROKcLJtzGYV0iU40pCRuQQ7OenL gSHTH5L8jd9BzD/QVi97ByljTvtkpMyZLlNKKpOfgytuIfhVQ0LiRbgPi/doqJx79o RJnhD2a/uTqEA== 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 v7 10/21] mm/zsmalloc: add zpdesc_is_isolated()/zpdesc_zone() helper for zs_page_migrate() Date: Mon, 2 Sep 2024 15:21:21 +0800 Message-ID: <20240902072136.578720-11-alexs@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240902072136.578720-1-alexs@kernel.org> References: <20240902072136.578720-1-alexs@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 8869C18000C X-Stat-Signature: mzo7dkcci5qkag95ojhs85z1fwsdfmz6 X-Rspam-User: X-HE-Tag: 1725261428-667237 X-HE-Meta: U2FsdGVkX191yaddHdSY53nk3N4LF4MdmgRbC+11GANe9m25o0GfWXMnoHTIwkEF2Jytk9zuthI8MmvaQnJOJ8NWGwswpLimEksveR//350XECtJNXnuK3MgDNsH55h7pa6Zz64A8AhCmSWTqywX2Bpz9huMmuDvko8JiFFQjTWZykYoJf29NP+tbBX4pVg8zk+DpFWfWo0rRz+C2S/C5uuD2sJIiIcN5E/QnFxXD0lGmI9i7UJ4LnbIhDPOxhmJhxRKBPouH/PGwVgSucoJAYI4InX/fqnMJPx5ZaqQCVosKk/FOeuAJKcss+x4lldfXV7oqwtTCAZmjj4IQc0eR2x1XCVjU1vtUSc/3k3ter982oJWZ5Lu430FwWqtp3f9NzrchCPdgvpDmfntMRWJkpFHrggS6NTmufXu6RhtD7HNETcaPAMapF/Swk2AJme1pYdF+pvMWuOfvGnT3bn5QMphy3AOqJIV1jVDz3PpqZoJETwdkO6R5yaET7wbMhXJa2o6zEW3AimTdg9KB+pYpI5KxlJ597UGjccG65klNC1dZEbJgxO9KUgeQMy+Di3fkJMbKlJIUEMh8AXgyyE5itGOwHKqO6K50KWLzjyAh9nyWT5j4tIGQCU32nFBReMuDaGLKiVvYYx+YLAlPLqdAdhJqzwnT8yxvjFzm3lJuoW6ZldbthFC/chFVHZgmkamqB7MFcRR6AwJ3PrQqyExbhd0stxh2oDWPOVJUNsfsdxCpaVc+HRdsT4LX5LQdlxVvAiVBXauUNeLhKm2z8G6aFTNjFajRRn4hwaGaBtcV6Lr/UY3SbYXIGqSs3jZZMTmV/Cj+A7a4x6yxbIGx297VUCEy/ncQamlY1rSmiSIEk8jKOPH8KTm3lwTFIfzS0MmU5Tz1sqPwB65RdSXx5yxiJShDHHUmB5QHkQ3zHHjL/DCuh20UqTKVzJghPeIxME5ylGP18MHKHIcABLRtrb 1EMF3VSH wjCcxLRvbgh5wfM/5dT4a+jea3Iv/slrvr52nQYYZDlIaL++cufasY2fOiNO7V78ue5l8bWdBLs5ju+hz+v/WlceSbFteqh5ihqKWELM+yYM0ItK9MPEneRTDiHyZBj+cbBSq0C0gkHA2qZv77pHMEyoN9KXaiL+kxieAjvdj6NYg2GT6lEvI3lWdppmgf5ya4ANnKzmJ1XhtcvF+6jqQZfbROQc6ycsOcP3GXW9jlfEVxdhldmX/8MgeqkGcZrF3ic0ku7Eb2ZPk/qStz7CjWdr7P4jhIGKJa9vJ0WNvkJy7ZYa9WfsFFidDpoqL6YVQ06eRPPutmgY3U7OwJus2yEyDjJR1zw5DYacSjEVPz24CEETjHbrBCwFO4A== 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 3a65a7d494b7..4b42d8517fcb 100644 --- a/mm/zpdesc.h +++ b/mm/zpdesc.h @@ -114,4 +114,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 90d93cdc5df6..caa4a7883ab8 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1817,19 +1817,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; /* @@ -1846,30 +1848,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. @@ -1878,14 +1880,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; }