From patchwork Mon Feb 20 13:22:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Harry (Hyeonggon) Yoo" <42.hyeyoo@gmail.com> X-Patchwork-Id: 13146448 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 E9331C05027 for ; Mon, 20 Feb 2023 13:23:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8C2C46B0096; Mon, 20 Feb 2023 08:23:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 84B566B0098; Mon, 20 Feb 2023 08:23:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 64F036B0099; Mon, 20 Feb 2023 08:23:31 -0500 (EST) 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 54BC26B0096 for ; Mon, 20 Feb 2023 08:23:31 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 2A9521A03D7 for ; Mon, 20 Feb 2023 13:23:31 +0000 (UTC) X-FDA: 80487737022.11.E8E0007 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by imf03.hostedemail.com (Postfix) with ESMTP id 4F55920021 for ; Mon, 20 Feb 2023 13:23:29 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=Mt4IlRK1; spf=pass (imf03.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.216.45 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676899409; 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=C5IUaL/geH4eySXyalPV/SSldT4sistEiDMldLKMCrw=; b=DdaH5DdAZpmUinZLiEvM4CpF1ASmb1v9gL/0SNiwqPobutb5pA3uzlYwnQFwi+C+gA3dJD BYwlo8NysUdj2ZUL/oF7H9XRZNkZCVxb6N/oJgri12zNd5lL+x5tZWLbF0+g7yZHBaelAH euEa8FW7s9h7hpWSpwq5/OUMGGpjTGY= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=Mt4IlRK1; spf=pass (imf03.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.216.45 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676899409; a=rsa-sha256; cv=none; b=71HqT8+ooTZSoPJxfkb5hD5qOUOZtGvEvt1Z9alVw5jAOvVphlDB39voxZeK+VULatBZUj kf7MqpIQSAqnttckIxXDZgi6zPAEWTSgE/m7FkiMNEp5dvq8UC290cUx15k69JvsWmzQ4z fR07SckVnmCvoDwD7XDkMER8f8d/674= Received: by mail-pj1-f45.google.com with SMTP id il18-20020a17090b165200b0023127b2d602so1444874pjb.2 for ; Mon, 20 Feb 2023 05:23:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=C5IUaL/geH4eySXyalPV/SSldT4sistEiDMldLKMCrw=; b=Mt4IlRK1Bv5G2q1nnUbtT7QUFXJRMoFYqy4PPYLB2hFZVjyuEZbdkYv3z9mtjV7ehr TmnBcuh5O66LzU9ltlrbSht93Pha8SCD4+sBcmtuSwT+jOnX2NPaJQmWltK64b/mX8ZZ ZadpOFVlxLALZs6ZsqLPtmrK0Xf2o8Kb6umtAq6V9JRnloC/dEECR2bUBe67SMRIJI6G 6FkPKcma/fZKU1gibcO45aSaXwwjCfTY2DAiOEQhtNsQ4AbZRCGWmuyfYZw/7mLxDAj3 SS8PpYq0aW/pLwa25Pi+0I0JMx58X8ZEtaF4fMY21Se4GJFbXWO1wRyqrciL0n+CP3ge 5+sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=C5IUaL/geH4eySXyalPV/SSldT4sistEiDMldLKMCrw=; b=qUaoT/TD66rWOu0UCoiq3unRBG6afhuOJCsJJ7Aa3az2PecA3mTvtnrmYqOrq/fEoq TPqiRX58e40DxUYSkK0PRaxVKZRY11eExK3sq7w9mt+MTyCR1u5S6BvDDBCRx4L4Mny5 wFCBx4uMMa6INvk23Ci36Rsm8AhswAOf23Zf68tL9slYO1TI4P5KPS37WfkvRnikVyA0 AasLmcWWPloLIZwFFafEUNJ1OkWbKATmMZ4Pc9cXHVgH3y25Jwwcn6rng0Gq1eBZMMXK GixnMczIs1Xsk/+NnGmE6NjH1YrHtVBCHKp4I/qDhvpslo0ntlnwsZXWMM2NvyIAiSvK EbBw== X-Gm-Message-State: AO0yUKXlEnVdwyX4sy7zvghbveUWz5oh9r5nzLuXtaA+75pjEJw1lk7b oiAYwbQHw2fWlEW4azpAjaw= X-Google-Smtp-Source: AK7set+S8fPdn/7npwZuUtc+YEMKktETU36plCi5njdU2DDCMZj6Y3YcR4ncdfSj/d04Afgvsp7zfg== X-Received: by 2002:a17:902:cf45:b0:198:f0ec:18ad with SMTP id e5-20020a170902cf4500b00198f0ec18admr2438912plg.60.1676899408183; Mon, 20 Feb 2023 05:23:28 -0800 (PST) Received: from test-ha.kr-central-1.c.kakaoi.io ([210.109.63.229]) by smtp.gmail.com with ESMTPSA id x2-20020a170902fe8200b0019c13d032d8sm6125436plm.253.2023.02.20.05.23.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 05:23:27 -0800 (PST) From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Minchan Kim , Sergey Senozhatsky , Matthew Wilcox Cc: Andrew Morton , linux-mm@kvack.org, Hyeonggon Yoo <42.hyeyoo@gmail.com> Subject: [RFC PATCH 20/25] mm/zsmalloc: convert get_zspage() to take zsdesc Date: Mon, 20 Feb 2023 13:22:13 +0000 Message-Id: <20230220132218.546369-21-42.hyeyoo@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230220132218.546369-1-42.hyeyoo@gmail.com> References: <20230220132218.546369-1-42.hyeyoo@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: ssr39ag87agt5jpaxjj674ser8a6jesi X-Rspamd-Queue-Id: 4F55920021 X-HE-Tag: 1676899409-93834 X-HE-Meta: U2FsdGVkX1/s4ql4Y7x1Vr4Ow/oACYADyFKEkAk16xBoz5adSrIhG6y+yC3cqXR+AW3xGZ+kWvCMtJRxOsAasR9MyGfDCX+KHz/VgAzfVUEYNuFP/b7lAaeomsCRNvChuyToB9vSB3MfwcIUMNxdT1IEY50rv0eXIoe47HPGbXgu64Xs5iY8c5bCrg4YBxxQDa//kANQYg1JrzZZoaF8NgcXwJEuWL44mESyzkWS7n1zv/mWCeKCp793ZADSR1td9jfTpC6hyHNogmp/nLWnv5Do6GPW07X68awt+y9y8RpW4v9SpoFP3w2I8VUoKLEyXn+TXD0le/5Hy8T56uwz0mz14dbLJQ0H9E23c8Sz8VNlZ7Rv1FaFp9+c4FkN+RSGsCMLuxovBAeLruTsVUmMKxOfJB77HWXJS6kwUA+KHgIASFRVxVMQfql1SUYG+761Tx6qVkHHubyTZ9f8h/bnLb8FNmBI0KZbDjA7uCKHeVpBeby+u5UN39L6SMs2DZsYGPNN/8xtI6D8CGRAuGUIxIyQLt+74j3S13NtI1xv2bZP0NDDL4uVqOFEdmxQttc+QKElnWTgXDy66oval+W/5G8e0X0kwqE5VXRqrJr42oDJed4nMCEYFrzIUJ5s+r0tS1CkbkYWiPgO23y2wNx6yy2dwYkHRihLc08XXp1+iRdUXhHvxbNKOWf3KcWXDFZrdBrYPmYNlzFo2ew+FOzSbk5CFQKQQpEf8nUxxvBgQopohf2G4SUYuxBAMT9LYXOW9xCTN/t3knHe54h+8ey/uTfmOldcWkf62zbq41n3Rlcoyt/l9t8tOPLt+B4xFq7bKbHEXcHj9vAvniawIEjKjsNUUdnDnJcEbPPxZXx5C1RGqgNOeUtwi1HEK9pjEdcra9Y6t8ZS2A+7rcSS7l2naTXKJ+1lD0vTu0vYvIIITN6+FxoOIGN+U8x/2PO9Pw8Ps5WSmU3lsywjR2Y9YAy cx5oBuXp QIwHWHI3uw6a5daPPPBC3Qwvq7einqn0aWBEVXNGEAK9XcDG1gbusQPudvWb9239ai/G9STQyDqqkiyxH5XiebQCOFmR2MTSGHITIhflBVyHHfB2gvX9f9XuY24P9C+18pHobtUV6G43LL9C887m6Zo61TUiS/keI/bmB8GSkF9Ni0dM5gk9QRzuMtmKOM6PLSv69Xsdb0HZ8j1qxvEuspIiRH06ngnsA7EM1kZHrcDW2EJahzIkl2tbAXCYZRwM/TSMGfrqxQaF8IeAbKyT4RBLdw/jOBDb8Q4Pe/v76tMHxPNA+gYa60yftAYb/FL3Eb1Rx7AgPGz75Qtr/2MUJr66Zx7RHfMcPhzu5Q1p1MAdWNPVbrr2Gs6G44zXicaJ4ZRH2zNk/JB6/ktXRltqpyES0lLfxVq/wJ+ZRo0KzN8n6q8oERT8aNQ1KQPIEFVQkHCwA9EnjXwEuVHwfCX5Dy0eg463wOHfZTICRNmQncItddm8L+858oYlSy+1hfAz4CveIklWYEQ0hMst+/SJgVizm/XZq52ztWYtqJ4KxEe/8M12bphlJU8Xf6pITjkW2zyIfo8Yu2NGVTMvrJzEwQL0ElME553TLQPsj 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: Now that all users except get_next_page() (which will be removed in later patch) use zsdesc, convert get_zspage() to take zsdesc instead of page. Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> --- mm/zsmalloc.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 488dc570d660..5af0fee6e3ed 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -989,9 +989,9 @@ static enum fullness_group fix_fullness_group(struct size_class *class, return newfg; } -static struct zspage *get_zspage(struct page *page) +static struct zspage *get_zspage(struct zsdesc *zsdesc) { - struct zspage *zspage = (struct zspage *)page_private(page); + struct zspage *zspage = zsdesc->zspage; BUG_ON(zspage->magic != ZSPAGE_MAGIC); return zspage; @@ -999,7 +999,7 @@ static struct zspage *get_zspage(struct page *page) static __maybe_unused struct page *get_next_page(struct page *page) { - struct zspage *zspage = get_zspage(page); + struct zspage *zspage = get_zspage(page_zsdesc(page)); if (unlikely(ZsHugePage(zspage))) return NULL; @@ -1009,7 +1009,7 @@ static __maybe_unused struct page *get_next_page(struct page *page) static __maybe_unused struct zsdesc *get_next_zsdesc(struct zsdesc *zsdesc) { - struct zspage *zspage = get_zspage(zsdesc_page(zsdesc)); + struct zspage *zspage = get_zspage(zsdesc); if (unlikely(ZsHugePage(zspage))) return NULL; @@ -1062,7 +1062,7 @@ static bool obj_tagged(struct zsdesc *zsdesc, void *obj, unsigned long *phandle, int tag) { unsigned long handle; - struct zspage *zspage = get_zspage(zsdesc_page(zsdesc)); + struct zspage *zspage = get_zspage(zsdesc); if (unlikely(ZsHugePage(zspage))) { VM_BUG_ON_PAGE(!is_first_zsdesc(zsdesc), zsdesc_page(zsdesc)); @@ -1518,7 +1518,7 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle, spin_lock(&pool->lock); obj = handle_to_obj(handle); obj_to_location(obj, &zsdesc, &obj_idx); - zspage = get_zspage(zsdesc_page(zsdesc)); + zspage = get_zspage(zsdesc); #ifdef CONFIG_ZPOOL /* @@ -1593,7 +1593,7 @@ void zs_unmap_object(struct zs_pool *pool, unsigned long handle) obj = handle_to_obj(handle); obj_to_location(obj, &zsdesc, &obj_idx); - zspage = get_zspage(zsdesc_page(zsdesc)); + zspage = get_zspage(zsdesc); class = zspage_class(pool, zspage); off = (class->size * obj_idx) & ~PAGE_MASK; @@ -1757,7 +1757,7 @@ static void obj_free(int class_size, unsigned long obj, unsigned long *handle) obj_to_location(obj, &f_zsdesc, &f_objidx); f_offset = (class_size * f_objidx) & ~PAGE_MASK; - zspage = get_zspage(zsdesc_page(f_zsdesc)); + zspage = get_zspage(f_zsdesc); vaddr = zsdesc_kmap_atomic(f_zsdesc); link = (struct link_free *)(vaddr + f_offset); @@ -1804,7 +1804,7 @@ void zs_free(struct zs_pool *pool, unsigned long handle) spin_lock(&pool->lock); obj = handle_to_obj(handle); obj_to_zsdesc(obj, &f_zsdesc); - zspage = get_zspage(zsdesc_page(f_zsdesc)); + zspage = get_zspage(f_zsdesc); class = zspage_class(pool, zspage); class_stat_dec(class, OBJ_USED, 1); @@ -1987,13 +1987,13 @@ static int migrate_zspage(struct zs_pool *pool, struct size_class *class, } /* Stop if there is no more space */ - if (zspage_full(class, get_zspage(zsdesc_page(d_zsdesc)))) { + if (zspage_full(class, get_zspage(d_zsdesc))) { ret = -ENOMEM; break; } used_obj = handle_to_obj(handle); - free_obj = obj_malloc(pool, get_zspage(zsdesc_page(d_zsdesc)), handle); + free_obj = obj_malloc(pool, get_zspage(d_zsdesc), handle); zs_object_copy(class, free_obj, used_obj); obj_idx++; record_obj(handle, free_obj); @@ -2189,7 +2189,7 @@ static bool zs_page_isolate(struct page *page, isolate_mode_t mode) */ VM_BUG_ON_PAGE(zsdesc_is_isolated(zsdesc), zsdesc_page(zsdesc)); - zspage = get_zspage(zsdesc_page(zsdesc)); + zspage = get_zspage(zsdesc); migrate_write_lock(zspage); inc_zspage_isolation(zspage); migrate_write_unlock(zspage); @@ -2223,7 +2223,7 @@ static int zs_page_migrate(struct page *newpage, struct page *page, VM_BUG_ON_PAGE(!zsdesc_is_isolated(zsdesc), zsdesc_page(zsdesc)); /* The page is locked, so this pointer must remain valid */ - zspage = get_zspage(zsdesc_page(zsdesc)); + zspage = get_zspage(zsdesc); pool = zspage->pool; /* @@ -2287,7 +2287,7 @@ static void zs_page_putback(struct page *page) VM_BUG_ON_PAGE(!zsdesc_is_isolated(zsdesc), zsdesc_page(zsdesc)); - zspage = get_zspage(zsdesc_page(zsdesc)); + zspage = get_zspage(zsdesc); migrate_write_lock(zspage); dec_zspage_isolation(zspage); migrate_write_unlock(zspage);