From patchwork Wed Nov 10 18:54:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Minchan Kim X-Patchwork-Id: 12612575 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12908C433F5 for ; Wed, 10 Nov 2021 18:54:44 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B98BD61241 for ; Wed, 10 Nov 2021 18:54:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B98BD61241 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id B7F296B0075; Wed, 10 Nov 2021 13:54:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B2E2D6B0078; Wed, 10 Nov 2021 13:54:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 95AD96B007B; Wed, 10 Nov 2021 13:54:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0109.hostedemail.com [216.40.44.109]) by kanga.kvack.org (Postfix) with ESMTP id 889886B0075 for ; Wed, 10 Nov 2021 13:54:41 -0500 (EST) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 4F24D184C0539 for ; Wed, 10 Nov 2021 18:54:41 +0000 (UTC) X-FDA: 78793921920.27.A943F52 Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by imf19.hostedemail.com (Postfix) with ESMTP id 49CE6B0000B0 for ; Wed, 10 Nov 2021 18:54:32 +0000 (UTC) Received: by mail-pg1-f182.google.com with SMTP id p17so3067471pgj.2 for ; Wed, 10 Nov 2021 10:54:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kC/56Ya4Hy08TY47euDNcmijGnAL9dRakpvg+/T3EFo=; b=EqW+6uRFr9Jb9RyHt+1FK33UEl+Kq5oJQRKdD2oOPaLn/p321Ukema/Ju53u1A7jtt Z8Xn/I+zbzhiHx4j5DyGG9Q1PonOtAc7sXVpQrKiJahOM9Qoly0RENaCeKt4Af6vsNkL aw9DtFEezTZADYZ9FlmDLKlH8hQyymQXRB1p7Xu0T+uLyG17sbSAJLUO7wtU0kd2nPWO j9L/bLSSGoli9s8nXQwmI6vzCNT1znkqf9VY0B105cLmXO3SXvRYWSwR2SHCjSH11AO3 d8i2kxrIllkCmr+MrF5j8zsdN9SnphRg8I+1Q1gB8Gj5k6d52FXSnCNxcLFvQRxV6Swa WUVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=kC/56Ya4Hy08TY47euDNcmijGnAL9dRakpvg+/T3EFo=; b=UgM8CnGcheEA+wMh+mvNKIn0qwsh01isHlB1izdyy2wcFA5//x4khcjmvOHv0R/pnv s9fxp/Dx3+2xtYH929o0zbg7D2rP606wAchwIG0voF3iPwzlhRuz4Z98wmlXcVbSSH6N pU4e/ETIWwJyeakLZpGmCskA90+Ar+lBbh7c5q6NiBemFf91rsHdPiAQz+jdbM85ghHG Xzs/fs+AhAwhSurHgZ1wYNgAu3DE3MoxWaGc1s/wRrzSKoyKXJU7fwugOHK0vSU6Lvjp jzLlQQLp5PsAN33tpykvGUjCdQeoqBkDUyOSS+EMQeWQr7m7q4PdmsXTPLjJAAcaiV7A 8x0g== X-Gm-Message-State: AOAM533HaYUp1KxJWoxO3pajAjINaMAjmrxxGgoDraT+0tvVrNKzcLBj LJ0OQQwjsH4ab7Hhdm1B7+w= X-Google-Smtp-Source: ABdhPJwsfj98F1c1BikXkxOctQBfi4eTUL2Y4akyk9ZBER6ex4w8z4shWaFFpkjYuaSR+Mdf68/HAA== X-Received: by 2002:a63:455f:: with SMTP id u31mr710829pgk.206.1636570480000; Wed, 10 Nov 2021 10:54:40 -0800 (PST) Received: from bbox-1.mtv.corp.google.com ([2620:15c:211:201:11d4:2de3:ab82:be64]) by smtp.gmail.com with ESMTPSA id g13sm325253pjc.39.2021.11.10.10.54.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 10:54:39 -0800 (PST) From: Minchan Kim To: Andrew Morton Cc: Sergey Senozhatsky , linux-mm , Minchan Kim , Minchan Kim Subject: [PATCH 2/8] zsmalloc: rename zs_stat_type to class_stat_type Date: Wed, 10 Nov 2021 10:54:27 -0800 Message-Id: <20211110185433.1981097-3-minchan@kernel.org> X-Mailer: git-send-email 2.34.0.rc1.387.gb447b232ab-goog In-Reply-To: <20211110185433.1981097-1-minchan@kernel.org> References: <20211110185433.1981097-1-minchan@kernel.org> MIME-Version: 1.0 Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=EqW+6uRF; spf=pass (imf19.hostedemail.com: domain of minchan.kim@gmail.com designates 209.85.215.182 as permitted sender) smtp.mailfrom=minchan.kim@gmail.com; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=kernel.org (policy=none) X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 49CE6B0000B0 X-Stat-Signature: yq3fjz9yr79a4a69g8kd7xkbx5o4tz6p X-HE-Tag: 1636570472-923497 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000096, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Minchan Kim The stat aims for class stat, not zspage so rename it. Signed-off-by: Minchan Kim --- mm/zsmalloc.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index be02db164477..0b073becb91c 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -158,7 +158,7 @@ enum fullness_group { NR_ZS_FULLNESS, }; -enum zs_stat_type { +enum class_stat_type { CLASS_EMPTY, CLASS_ALMOST_EMPTY, CLASS_ALMOST_FULL, @@ -549,21 +549,21 @@ static int get_size_class_index(int size) return min_t(int, ZS_SIZE_CLASSES - 1, idx); } -/* type can be of enum type zs_stat_type or fullness_group */ -static inline void zs_stat_inc(struct size_class *class, +/* type can be of enum type class_stat_type or fullness_group */ +static inline void class_stat_inc(struct size_class *class, int type, unsigned long cnt) { class->stats.objs[type] += cnt; } -/* type can be of enum type zs_stat_type or fullness_group */ -static inline void zs_stat_dec(struct size_class *class, +/* type can be of enum type class_stat_type or fullness_group */ +static inline void class_stat_dec(struct size_class *class, int type, unsigned long cnt) { class->stats.objs[type] -= cnt; } -/* type can be of enum type zs_stat_type or fullness_group */ +/* type can be of enum type class_stat_type or fullness_group */ static inline unsigned long zs_stat_get(struct size_class *class, int type) { @@ -725,7 +725,7 @@ static void insert_zspage(struct size_class *class, { struct zspage *head; - zs_stat_inc(class, fullness, 1); + class_stat_inc(class, fullness, 1); head = list_first_entry_or_null(&class->fullness_list[fullness], struct zspage, list); /* @@ -750,7 +750,7 @@ static void remove_zspage(struct size_class *class, VM_BUG_ON(is_zspage_isolated(zspage)); list_del_init(&zspage->list); - zs_stat_dec(class, fullness, 1); + class_stat_dec(class, fullness, 1); } /* @@ -964,7 +964,7 @@ static void __free_zspage(struct zs_pool *pool, struct size_class *class, cache_free_zspage(pool, zspage); - zs_stat_dec(class, OBJ_ALLOCATED, class->objs_per_zspage); + class_stat_dec(class, OBJ_ALLOCATED, class->objs_per_zspage); atomic_long_sub(class->pages_per_zspage, &pool->pages_allocated); } @@ -1394,7 +1394,7 @@ static unsigned long obj_malloc(struct size_class *class, kunmap_atomic(vaddr); mod_zspage_inuse(zspage, 1); - zs_stat_inc(class, OBJ_USED, 1); + class_stat_inc(class, OBJ_USED, 1); obj = location_to_obj(m_page, obj); @@ -1458,7 +1458,7 @@ unsigned long zs_malloc(struct zs_pool *pool, size_t size, gfp_t gfp) record_obj(handle, obj); atomic_long_add(class->pages_per_zspage, &pool->pages_allocated); - zs_stat_inc(class, OBJ_ALLOCATED, class->objs_per_zspage); + class_stat_inc(class, OBJ_ALLOCATED, class->objs_per_zspage); /* We completely set up zspage so mark them as movable */ SetZsPageMovable(pool, zspage); @@ -1489,7 +1489,7 @@ static void obj_free(struct size_class *class, unsigned long obj) kunmap_atomic(vaddr); set_freeobj(zspage, f_objidx); mod_zspage_inuse(zspage, -1); - zs_stat_dec(class, OBJ_USED, 1); + class_stat_dec(class, OBJ_USED, 1); } void zs_free(struct zs_pool *pool, unsigned long handle)