From patchwork Tue Feb 20 11:44:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 13563906 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 57373C54788 for ; Tue, 20 Feb 2024 11:44:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2B3496B0078; Tue, 20 Feb 2024 06:44:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2748D6B007D; Tue, 20 Feb 2024 06:44:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 102F16B0083; Tue, 20 Feb 2024 06:44:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 00BA76B0078 for ; Tue, 20 Feb 2024 06:44:43 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C6DD940642 for ; Tue, 20 Feb 2024 11:44:43 +0000 (UTC) X-FDA: 81812000046.26.479F509 Received: from out-179.mta1.migadu.com (out-179.mta1.migadu.com [95.215.58.179]) by imf19.hostedemail.com (Postfix) with ESMTP id 014C61A0019 for ; Tue, 20 Feb 2024 11:44:41 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=cwrTmA0s; spf=pass (imf19.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.179 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708429482; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=VdP64AtdS178q4SDQJio0KmQ+nTJNdPzbvzklfYy4hs=; b=zg7r5aecSPROUvxAa0nRCSwcMb9BFVxpihMYVA5fGwfK/RPsNsZzbHbQlyQCW7QvUax5eo fEuO4oOyu035oPUEruvvH7hiCj6TVg5qn4W4N9EfiAhFLbLCipm6C4M7+ZEKfP/KmBuADE MbHzVcqLO49QQH1DUQBujyNLD0VGW1c= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=cwrTmA0s; spf=pass (imf19.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.179 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708429482; a=rsa-sha256; cv=none; b=AHjeStob4Jh/UBHqW8jRHwH668yxYMq38JEqvX1qXAqh/CxZPXxi2bm7Rqf/6VvrkbMDsB mD9zvO6rBztUmLaqXo6I24qyAmDcpQxwrIele7sOyTIl4BxnTdrC1ersEdVL5MIlOnasCE 7mk+L9PE2uPRVBVuEJ6wuHnx23uheUQ= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1708429480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VdP64AtdS178q4SDQJio0KmQ+nTJNdPzbvzklfYy4hs=; b=cwrTmA0sPvnMUtwA1woeElKaxcGZpRmNkxQyoQlraw0/zO68U4jf0+tF/GGDIFjo092brD MbMMc1y0eiy8oqd6A3oW0hX1mpmoCKUB5Ic238upKw/66Sq9v557RCnf7Zuci8Fb/6+ktp Mi3mbziPE2AVdaVY3GIzj8PWB9dDJpQ= From: Chengming Zhou Date: Tue, 20 Feb 2024 11:44:29 +0000 Subject: [PATCH RESEND 1/3] mm/zsmalloc: remove set_zspage_mapping() MIME-Version: 1.0 Message-Id: <20240220-b4-zsmalloc-cleanup-v1-1-b7e9cbab9541@linux.dev> References: <20240220-b4-zsmalloc-cleanup-v1-0-b7e9cbab9541@linux.dev> In-Reply-To: <20240220-b4-zsmalloc-cleanup-v1-0-b7e9cbab9541@linux.dev> To: hannes@cmpxchg.org, Andrew Morton , Sergey Senozhatsky , nphamcs@gmail.com, yosryahmed@google.com, Minchan Kim Cc: linux-mm@kvack.org, Chengming Zhou , linux-kernel@vger.kernel.org X-Developer-Signature: v=1; a=ed25519-sha256; t=1708429476; l=2317; i=chengming.zhou@linux.dev; s=20240220; h=from:subject:message-id; bh=cqkPrPVAWUs+Ao8dP81X35doam5/5XwHmrqtbfkzja8=; b=fJGX+bZSZ9DmHcZLQStOZiyYVufKsK8+b2cCFX9z5c6zB+JgATrPXCCxaEuuk1J57ChPoEPcs Y8dHZRV9xLBDyR4EYl5pMCg/yarVPtVH/ac7GQz0+x5knNUdq0ZOH7g X-Developer-Key: i=chengming.zhou@linux.dev; a=ed25519; pk=5+68Wfci+T30FoQos5RH+hfToF6SlC+S9LMPSPBFWuw= X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 014C61A0019 X-Rspam-User: X-Stat-Signature: 1zwtyg44oehgitii8euq4bwaw6exu14s X-Rspamd-Server: rspam01 X-HE-Tag: 1708429481-425877 X-HE-Meta: U2FsdGVkX1+ufPLgnChSjbX0m0A/rz7YO99eLPLcy/hNg5QBIVNpVhY0UzcHjRCrhl+BgQTfsSHs9k8VTOX6lYSYiUn84gRYDtCKBcnum4gWqkuX/tZsWg6jkeE58LucwryVKVUb9F5hcW0Cicrm/h2R6+Lhk3Rai6MGCKF0MNNIvc2JJNLjoVptJsNfK7zGR7jpXnlF7h8Msh/mzL3r9AujGaFPxqafSFvQU3bVB3Lvza2S1iVa2JyQgLwXaJj6U/H3X02oDFbfNBb1c5dJhREduzg5rIaVMRGGquEOw4Bpliy1zZOAiOE8TrBiONu9q1YUND2Xc8hGv+TbeiGjJlDvwCQp3I0SG9B2/PTXpLbubtjYT2O3x4YO73/ZUwg0fUUElWA9jFlBG2NZPlkB0hnfYsLPxwGTs3J4YZ0svNUWTGS+6fAEKMrWVhw0ob3yyzrs9d3H0Vg3Rc4Zk0cNxHDGTJsHSdW0oVYN1SO8l6+imESJfG4rjSUwdNgJBuRmZFk25zll3NnC/wg04mmlSXAkn1ta6G/l5OIFcLak1BLVMoYdOPkLJ4sObZtSq+27yxYruWdCCUWIoihv/stC2lj6x8h9l36m8+91l59StjS2ZwQIidDCAnYKae3TMsDYd/Axk6kghlmXgBZclSLHPeQbdGFBKByOn2zcsCW/FrVn88JCmr7xRC6g341NVC8+edLa8i10NbdEZx9xD0TAFtI2DVemLZADbTNWoBx0YhPAgLXE+tAMv8HAmIDoLkRTHJaLsd8xQCZGl422FBcS5HjKnq8awXkvdUuA7vfYJG3yTzup5BN7uxxVnjm2w4iblohQ7u4euOfPhBwXX+SXUdRmnZ7IjEpuJ3j8gnPXZr64zLk8uQPDFbcTGT+S5h0aql9US+3y5y+04zsiVVQcrXU8tv27CHmkH/i+dLwTh2ueTxwFjV3SdstJ/gM2n/ZQuMQ1kzlP/H+7VHM7hNP PUVy2ym/ 0wYiQtt79qJjq2PGV8a47zc70+BNLu5nH/6ddxdnjBMQmzwgVt+E5Hqm2SQ9bwhiDD+M3K8Fj9S2mNcj0v8RBvodaYq1R3d02YS0dM3SsDA55xQJfd5IJ/90ljbzHjbq6dk9JRUaTGQ5MXY0PDSW/oo/WtGKn9JOvYHV70uqibXG7/Y2momWYsOXM3F8Kf++wxMc3 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: Chengming Zhou We only need to update zspage->fullness when insert_zspage(), since zspage->class is never changed after allocated. Signed-off-by: Chengming Zhou Reviewed-by: Sergey Senozhatsky --- mm/zsmalloc.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index a48f4651d143..a6653915bf17 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -486,14 +486,6 @@ static struct size_class *zspage_class(struct zs_pool *pool, return pool->size_class[zspage->class]; } -static void set_zspage_mapping(struct zspage *zspage, - unsigned int class_idx, - int fullness) -{ - zspage->class = class_idx; - zspage->fullness = fullness; -} - /* * zsmalloc divides the pool into various size classes where each * class maintains a list of zspages where each zspage is divided @@ -688,6 +680,7 @@ static void insert_zspage(struct size_class *class, { class_stat_inc(class, fullness, 1); list_add(&zspage->list, &class->fullness_list[fullness]); + zspage->fullness = fullness; } /* @@ -725,7 +718,6 @@ static int fix_fullness_group(struct size_class *class, struct zspage *zspage) remove_zspage(class, zspage, currfg); insert_zspage(class, zspage, newfg); - set_zspage_mapping(zspage, class_idx, newfg); out: return newfg; } @@ -1005,6 +997,7 @@ static struct zspage *alloc_zspage(struct zs_pool *pool, create_page_chain(class, zspage, pages); init_zspage(class, zspage); zspage->pool = pool; + zspage->class = class->index; return zspage; } @@ -1397,7 +1390,6 @@ unsigned long zs_malloc(struct zs_pool *pool, size_t size, gfp_t gfp) obj = obj_malloc(pool, zspage, handle); newfg = get_fullness_group(class, zspage); insert_zspage(class, zspage, newfg); - set_zspage_mapping(zspage, class->index, newfg); record_obj(handle, obj); atomic_long_add(class->pages_per_zspage, &pool->pages_allocated); class_stat_inc(class, ZS_OBJS_ALLOCATED, class->objs_per_zspage); @@ -1655,7 +1647,6 @@ static int putback_zspage(struct size_class *class, struct zspage *zspage) fullness = get_fullness_group(class, zspage); insert_zspage(class, zspage, fullness); - set_zspage_mapping(zspage, class->index, fullness); return fullness; }