From patchwork Fri Jun 28 03:11:25 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: 13715396 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 64C2DC2BD09 for ; Fri, 28 Jun 2024 03:07:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AFBE46B00A9; Thu, 27 Jun 2024 23:07:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A84CA6B00AA; Thu, 27 Jun 2024 23:07:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8895D6B00AB; Thu, 27 Jun 2024 23:07:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 640F56B00A9 for ; Thu, 27 Jun 2024 23:07:29 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 1D1BFC0247 for ; Fri, 28 Jun 2024 03:07:29 +0000 (UTC) X-FDA: 82278811818.28.58D9F56 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf30.hostedemail.com (Postfix) with ESMTP id 7154480002 for ; Fri, 28 Jun 2024 03:07:27 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=OYpxeUZE; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf30.hostedemail.com: domain of alexs@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=alexs@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719544033; a=rsa-sha256; cv=none; b=wQ9ox3EAtQw92KEKYXYSuALaWrzGbfXhvbC4ktp28MTZZmkNQt5F3QArFly9b6FfNh8jRJ 4wxNPsgyfOKWrIfI4nEak2Q6VjCgLaFgDineMzoEt+aJ0tfK/b0gCmynyIKFAA6X/23FHF 8JA2lPGBVouP4COiXiT6BibWALR3DaI= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=OYpxeUZE; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf30.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=1719544033; 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=Zp7iN0uNl5MAM0ZdjSNPiBNHzo5CmutgpOndgveZu3Q=; b=vCN3alahFqD6Hr1GYah0Kq9u+EiDZYF3s21t9ErYXI83qM2L1Vl9o340jEcnX9NnnWRr8e K++quA5TCJDLFkMRFwQl993K93KRo59jJ8lIpkigTT6s0MID8Lfa1VRqrwQAK/2fWq8GrX zkctZCY5LRSwOOPUbemAyLDnfWRQ4V8= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 986906204C; Fri, 28 Jun 2024 03:07:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3DA8BC116B1; Fri, 28 Jun 2024 03:07:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719544046; bh=lrAcBtSPY8wF6yEhTYORr+zHxr4lEQSsuXyA2QNdVVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OYpxeUZEAarVD5SnSCfgAbdk57grg3isCoQNmyTfbmHWGcxRADl1KA0GOLSwNsskB 1LQ/VpAl4JEWfjQiJXUpI80DZ98V1A82SK/ZeiZy4Dik+eGYGzuIR5W4BVCiaZ3uT6 Bp4+4/OlTxkjz2cxCoEmrLAnnozkhD8LBnhHpPn+mBir2MUoS3t31oZxuqRGdiXY9+ 7YHLfuEPWLEtKBZLqm2gMIR/DXTs7xnUEYLYYZ5m6qjLL0rczZzWptVCpk7eykyEof 41Hd/z51hpHJWSSAZXHTHQuNpIjqUI+MH33JNtZgqR8PQmPy0us8dObV2536bZ6yNP 03ZYClyRuJqKg== 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 Cc: Alex Shi Subject: [PATCH 10/20] mm/zsmalloc: add zpdesc_is_isolated/zpdesc_zone helper for zs_page_migrate Date: Fri, 28 Jun 2024 11:11:25 +0800 Message-ID: <20240628031138.429622-11-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240628031138.429622-1-alexs@kernel.org> References: <20240628031138.429622-1-alexs@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 7154480002 X-Stat-Signature: eyzbfauen7jwjawdx6g9619ptqkzophc X-Rspam-User: X-HE-Tag: 1719544047-388195 X-HE-Meta: U2FsdGVkX18y4dy1vh/jtwpu3zoIxDrZ5wh7SLaWoq/DjXwmRZg1pordI+67GG7LivbhzomYfUOV+wiqFNmy5bgQOw59OCZHJ24/K/xxr3yeEKlsVzESCnu5IiCIg4gsgGgGvSWAuBaoxg4jBK3JM9PIIcsSMifY+6pGGqRbtGYB1MVHhwQ5TUVKYSIN9u+/nEfgfo3sstic6ZFjYXJX6uY65W266DM+M8L15TwqWPWsKzqRmrxJyo7sOFr91Sq4yHFDis5/yW/wOLY35R8GeyiUJBVYKyF9oZvOHlK/InfiidnkVg/i2cwdAfFtENDHL5jM56YOliBmESGz+J9QRJ6aUl3OEvFio77TyCXMppcTmUcqibdpVaKEMknpqhJU8O8vHAcapsRYg7xmsb/Le9BQiXRE1RAp6S+hgS1mJYAGqVwJVtQbLWZriey3vuD0xidPFX73MxTe2UTfHF9QGkq6TZj6g08zXczrnqfjc5nCxrcgJP2ZDO806mJHhsilN+d48XKLvP0w2cdPbJOscoXqG0hcm7j2KPLvnqsDix4SiWben1A05cp81vmODmt69k/+fCL/gD5woZRgRAOf2aifakeNOBJw+5EP7SUIcCqILzLsUind3hU/N2l+rBksDgYd278dIW+wWpyJiURIWj2FfqPvPta1Jlx4tQ9ooT81q2Fo7+Idti/iOf6asGzJjf6wncFGaDfo+Tc+UDj7BgjkP62/48VgoHyKgH2C4d/4kY2lwUkSjHiVYlQXxSCnbO0o6Q+SY5hCqG434+/JE+uEkMeRIvHFRTnRoX3bGPHexJ4bZIKFtpHrKBwtzrZo+s6bBd26AtRsFPGjmcZQx/dqleryC0Mmi1sYWMVQiMujE2LbwCF8O8rxHFw1K8q/GURBFJ9oywfxL4gZlqUwSkWl0kE+J4UVka9U1yE2I+rzIMeDh3+m4F/TUYTG0xxCQ08pSAVXwkA3NgS+oW5 iLjlwcbk j0k7zLCF9bzTA+WLJW6viBSh19dY/JXz2ur8dJIjPK+MLV1jYitYkCV0GU3UoJhKLYzUj0aCnvojw4KpdPwstnFxww279KeLaX88J3HPB0IbGUZW3XA2OWR4QzLKuL57AZsDrm8gkvOEU+4SNyBwvmwcUbvaSqdEUUWxjkzLX/DdXurk9wVo4pwo32FVE6hb22D9eFuFAzPHPBvY51CzYVPZsvngoLiPxa/1vgr+hi0nE6hTMEe/ZBU0fcwVJ7YwWeeiPNQwetEGnk4paT6us6w3Hx/5mHEmspgF7JJDw4rRS5YEytMKqAy4PINzps2eX0k56cV48d49FSu4T+lti7UiabZ0jcgaZtyZixyBxoSn/2b4Nw3qo0JVy6g== 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 f998d65c59d6..2e35b8220e05 100644 --- a/mm/zpdesc.h +++ b/mm/zpdesc.h @@ -98,4 +98,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 3ef8e13fb9e6..251a6e63e58a 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1835,19 +1835,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; /* @@ -1864,30 +1866,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. @@ -1896,14 +1898,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; }