From patchwork Thu Jul 13 04:20:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hyeonggon Yoo <42.hyeyoo@gmail.com> X-Patchwork-Id: 13311277 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 4F340C001E0 for ; Thu, 13 Jul 2023 04:21:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DE3668E0008; Thu, 13 Jul 2023 00:21:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D42118E0001; Thu, 13 Jul 2023 00:21:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BBB998E0008; Thu, 13 Jul 2023 00:21:34 -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 A8BF18E0001 for ; Thu, 13 Jul 2023 00:21:34 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 7ABC840010 for ; Thu, 13 Jul 2023 04:21:34 +0000 (UTC) X-FDA: 81005289708.07.A53DF1F Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by imf13.hostedemail.com (Postfix) with ESMTP id AAFC820008 for ; Thu, 13 Jul 2023 04:21:32 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="SOG/K/Xb"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf13.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.210.175 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689222092; 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=/AkKYYKmxj7TQUeJqlTJNcjNKZ3qt8jEQhquu79OlOQ=; b=UI7XmIOh0mqdNL1gcnYx2K85rqjXGActgfIhmbLX5dxOCUwam90PywY1x5/BdBRHY1PAKD 33vh9wiw9vAqiFvpKf2AGAra+ruKDADcQtCc8MAg7aU3aVagrxWe20cvYxqcrP2VPMMVnO LWrFWnt6T0D9mqkcbO/R7Y357/EG3Rk= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="SOG/K/Xb"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf13.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.210.175 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689222092; a=rsa-sha256; cv=none; b=ggzQSf4Uh3a2En/RDWOW6TvTCl+TcC1TwQlU0MiV2r/79GkJdDDW+k8ggOJjFGpcLU1Exv fD1Ui2mFe7FGJ88hVIO2vzzwfXw24vHFRHvVjdwDThby9864o7J9G3OpVNowAl91H79dVB ZdDv+hodz8A5J6FV3icIzs/t2Pzo484= Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-666e6541c98so297320b3a.2 for ; Wed, 12 Jul 2023 21:21:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689222091; x=1691814091; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/AkKYYKmxj7TQUeJqlTJNcjNKZ3qt8jEQhquu79OlOQ=; b=SOG/K/XbNRTO8yeNVcrdEC9e85SmT5W+OelcxVnc+JYMVci8hbXGxUYc9gd4vbQ2aL xOYh108uhhE78bp3NscDM2bw1DQiku+bU2BJUvJwhf/cLuc89t2LiJ99VfukWcEdbUUM Dxx22mtv8Q6wYTu9gryeEOpcL2K8Ed+Wysz6APUHSMO/AfNgDP49TuqaGCDDqcNvngN0 aCs+TpmkeOONH2ObDHcVHT7ixWldKRp5t9CINzRwaO5RxB7E2aRhf0+ndlCQXbbT1iqP 79ze97f7s33kR3eBFqX4rM5CpMfOgksc2n2rzkSLzFC2wlYkLTUZ7OTkxbkFZoS3qWDr RlDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689222091; x=1691814091; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/AkKYYKmxj7TQUeJqlTJNcjNKZ3qt8jEQhquu79OlOQ=; b=CS5G1AeY+fCY3pHWHMCzIE6Ph9aKT3qGP5hqknbSO3evldewd6H4Ai8zDCmlHfrLtW jndT8J6P8KMMQwpy+aFFKHhO5UXyID/rmHoShGfqbesiBf1OGSwunmYVNDPyBAekK1Nq bF0GWCtCmk7lk+OpjgyK/UQ7a/F6npr9DBT9+sLrtdPmKjA8YGFtfr6BJiqohw02B72E qYP3mgo3dpiHcnQjVDNvzaJ384Tnh7ae8frlK3FP9Mkj5SVliWWuHj8VDgA424Xqdut7 w1QxB5xrgGI1JiyDJHJGqY9YnPlYwmgn7QeT0TpmLkwEH+/4bjIH7GPJJ7fIlX81Jx4J OByA== X-Gm-Message-State: ABy/qLZYXKNQrOP6BSzVapbWaWAagvn9XlKnLp+6SLN9LEKGEuemiejm i6cMnzcNKeZD0Ug+5Hy1J7g= X-Google-Smtp-Source: APBJJlEjl5B7pAx+psP3HeXUMoWINVPRy39+miBs80ttFtJlPDOsP+1gCYRlrL/q07+KyucCY6JJCQ== X-Received: by 2002:a05:6a00:2d8d:b0:680:98c:c595 with SMTP id fb13-20020a056a002d8d00b00680098cc595mr731083pfb.13.1689222091506; Wed, 12 Jul 2023 21:21:31 -0700 (PDT) Received: from fedora.. ([1.245.179.104]) by smtp.gmail.com with ESMTPSA id u18-20020aa78392000000b006827c26f147sm4346601pfm.138.2023.07.12.21.21.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jul 2023 21:21:31 -0700 (PDT) From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Minchan Kim , Sergey Senozhatsky Cc: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Matthew Wilcox , Mike Rapoport , Hyeonggon Yoo <42.hyeyoo@gmail.com> Subject: [RFC PATCH v2 13/21] mm/zsmalloc: convert reset_page() to reset_zsdesc() Date: Thu, 13 Jul 2023 13:20:28 +0900 Message-ID: <20230713042037.980211-14-42.hyeyoo@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230713042037.980211-1-42.hyeyoo@gmail.com> References: <20230713042037.980211-1-42.hyeyoo@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: 8mkhqjemn73xzp5rtpegd87cyx5yn4fc X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: AAFC820008 X-HE-Tag: 1689222092-55668 X-HE-Meta: U2FsdGVkX19c3cqxIgbKZCfQJOBAWsDxl6NIDyDFZauoZI+ZrdkEtmOF4MnqMk7boPknSEa9UWD90qOW1YJoEH18Tqx3TGBh577lCo8CBvrxuycgdvcsq/uHdPVrSdeve73Tg/6y2Z76trhkr68nTvZYNcMyOTPTIkm26nT66ADqGs1rBZjeRkVaGdCNb9YS5L4y4sqf7RkeID2FVWje33KCe36ef0YXp6xrw51gkNdcibUs305IDBgGyvfbLVyTgkELHDyGXfsWetris8lGubMk6xEU1FGQ8ic/eKpMIngRTas17Fnp8hzZwRbUfsS0nBAqoduTZB7JjXq6yafH7PGTf/q176E9KqtBELRwHy27PtBKCOSZA0fsPvN59kBwFqU3wOQzXHMhJwpSfUHO/Dhpva4lG3UPiJ4eVCDFCLKf3TkgSaIjdqiQ/pBq/cMlYiVEoqP35fjLXAFvh0Hu1OGOAxdJ+m7gFIW0a78An0MrABBmcXjDxUxynBwXIaUsWDQc8v64KtlpUBVZMfKhdrWlzyv6ypG+fEkFr136LAfRY+nkZG1UlEYufq2CeYdqa92w9cj2zkH6ookpnnoqT4XIUmWtKFMHH6BIdjWSPDIr0W77p+SqHMKItcxZl12D/kj/Qw0lDzhKu/jpRe4BdebdA1lMVV1Mz6wT5JxW94YSwDNB6LEKjfzmhMOak9Z4FGcebm2dpQN17uzhHuduVJd1Mz5vMQsYzgYBMZ+O2PKeUPcxAoqAQBPMHlB4gASQ6f73881OylT8iCzJ2iNGCe9ZEHwSSq8hidRyI/cqpOWMfI6qkP0WrekhfvRHPgRc3g5OQOlf71tezSntHcPDLLf47FZuy9f71TI+zymDUWFXgxt6AoaWkVjSA6iJtlUGgdAV8BBeVwgn7rk8aNMWVhzFFuqEtGjRBLl+o6TXMIUCWEkbieNTHpKD2/UXx/x0zjQNdmzrVPD1wg8jv3Q f1t2gbFj bYAdqnsNdKLLlfZ/ShVLw+0G7zlc+PUN3THilVaGJsJVjICGuHlswwT2vRcC3PS+vqpDSNvC0P7dkWXYb1YvO0xmvGHuXK9TUwU7nURyAJqZ/xFTHYOwDY0TgXuomK0RHvNwJNJ4bG6nmsCZ8A1f2NO0mT5u+xmhjhWCP9lgb8PpZxh0szgOQ50GoFZBZQskuSR7e52phMKyz8snBdvcfn2/Dn2SDzLs9Qmg6AKIW1o7p35CTb+Ur0W51XSQe8kdokJldzWdoxU64K0W6nQaQ36LBLJeiHDZFYvHBuCK5TNvuitzViKf9Mek9CqbkMC+8S7OWnL2Mh8g8ZP7Dt2EDt+/3r6moVl7zSUK50hew5k1YBgnKN5fnJc/8feCMSFESivaF7TrkKGRPMqoQQXt+BHqFuIVhs0/fNv4cmCvnYIZXuGGuAfXD1jnTdWqexl351+W3C9sZDHzABxz0BAZOltigG05Z3GCfOZwf7oRJxVa1ZBQyjOL7OYhqHDFiNraI6anuL23mSXPhI6N4cmhEqzhVP4IW0OP3o4xGgTYhGqWq/1xWvHpKtsrvByV7se1VhbknJP2W5vC4tP00dSW2xf6mig== 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: reset_page() is called prior to freeing base pages of a zspage. As it's closely associated with details of struct page, rename it to reset_zsdesc() and move closer to newly added zsdesc helper functions. Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> --- mm/zsmalloc.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 5141a0c72c61..085f5c791a03 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -388,6 +388,17 @@ static inline void free_zsdesc(struct zsdesc *zsdesc) __free_page(page); } +static void reset_zsdesc(struct zsdesc *zsdesc) +{ + struct page *page = zsdesc_page(zsdesc); + + __ClearPageMovable(page); + ClearPagePrivate(page); + set_page_private(page, 0); + page_mapcount_reset(page); + page->index = 0; +} + /* huge object: pages_per_zspage == 1 && maxobj_per_zspage == 1 */ static void SetZsHugePage(struct zspage *zspage) { @@ -962,15 +973,6 @@ static inline bool obj_allocated(struct zsdesc *zsdesc, void *obj, return true; } -static void reset_page(struct page *page) -{ - __ClearPageMovable(page); - ClearPagePrivate(page); - set_page_private(page, 0); - page_mapcount_reset(page); - page->index = 0; -} - static int trylock_zspage(struct zspage *zspage) { struct zsdesc *cursor, *fail; @@ -1010,7 +1012,7 @@ static void __free_zspage(struct zs_pool *pool, struct size_class *class, do { VM_BUG_ON_PAGE(!PageLocked(page), page); next = get_next_page(page); - reset_page(page); + reset_zsdesc(page_zsdesc(page)); unlock_page(page); dec_zone_page_state(page, NR_ZSPAGES); put_page(page); @@ -2016,7 +2018,7 @@ static int zs_page_migrate(struct page *newpage, struct page *page, inc_zone_page_state(newpage, NR_ZSPAGES); } - reset_page(page); + reset_zsdesc(page_zsdesc(page)); put_page(page); return MIGRATEPAGE_SUCCESS;