From patchwork Tue Feb 20 11:44:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 13563908 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 6B8C4C48BC4 for ; Tue, 20 Feb 2024 11:44:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CA1E16B0088; Tue, 20 Feb 2024 06:44:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C27086B0089; Tue, 20 Feb 2024 06:44:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A7E116B008A; Tue, 20 Feb 2024 06:44:48 -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 8EA106B0088 for ; Tue, 20 Feb 2024 06:44:48 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 62AAD80642 for ; Tue, 20 Feb 2024 11:44:48 +0000 (UTC) X-FDA: 81812000256.26.B99760B Received: from out-184.mta1.migadu.com (out-184.mta1.migadu.com [95.215.58.184]) by imf12.hostedemail.com (Postfix) with ESMTP id 7EF3F4000E for ; Tue, 20 Feb 2024 11:44:46 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=sFquOSfJ; spf=pass (imf12.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.184 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=1708429486; a=rsa-sha256; cv=none; b=PXlEZD+laHomUNKc5aFpru0/2sGi9hrNXBv4PiY7r5ApCPb3t3XMWF7QBEUFL4MQy+YVig Ul7Eb7hbHK2lzrurAwgiXaKhNTGNeCUe1g1zl6NxvBxd/cl6rg+9mQvlsgKKXj77v/HtRl Y62ap1LDK2GbrhZ5Gqw5tVIE/g8fiNI= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=sFquOSfJ; spf=pass (imf12.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.184 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=1708429486; 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=ci79DiUWa7UnDzkerNUYQl6snYV1NrEQXPg7SGeMzMg=; b=n0vBNPXqi6a/pzZCUDPHxikZYXschs7taB7nta2V22L+F0C4SNxViOBK7jtlTGKURPLPRf TrXLDz8V+I8qOq5TKHEHQqFH39rVc0WU5LiavgAI/4FJzQbuDxGwW8FwqAHVVfwvCVnKlF fpEySGYOLV2ER/FQv/tQIB5A31rBmjY= 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=1708429485; 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=ci79DiUWa7UnDzkerNUYQl6snYV1NrEQXPg7SGeMzMg=; b=sFquOSfJAfNaMCcn09Pz5sjO2zdozOZHHOKnWpE+LDSMzXP7F23EP9QanRL77oXcAT277F FC0SYpH2l+d3i9aCwXkf2Azx5DhAJIYgQhIpB19q7jstT7MPGibYDvOKlG4K6U8vBu87Ju bRtPc7aXmlSDbI5CnxSzfSZECVV6PY8= From: Chengming Zhou Date: Tue, 20 Feb 2024 11:44:31 +0000 Subject: [PATCH RESEND 3/3] mm/zsmalloc: remove get_zspage_mapping() MIME-Version: 1.0 Message-Id: <20240220-b4-zsmalloc-cleanup-v1-3-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=2848; i=chengming.zhou@linux.dev; s=20240220; h=from:subject:message-id; bh=Xgdlm55CLoh7bhkT80TmmQFtvDTRQ4HP1+zxTxJBYgU=; b=6L4Rze0bnsKiqR9+QLqh2qD7BDtQUhtZu8ueGs9RPgzByahXpM+6pkTSsBD1omm7SA3abUFN5 ZTBlKgut6b+DoJxWVUkh0tjpPfx/6AV6Utfx4wSudSlGuNzInKTxDcM X-Developer-Key: i=chengming.zhou@linux.dev; a=ed25519; pk=5+68Wfci+T30FoQos5RH+hfToF6SlC+S9LMPSPBFWuw= X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 7EF3F4000E X-Stat-Signature: a66cy43rz4hgqzmt5kr6z1t5fgb9nyj5 X-Rspam-User: X-HE-Tag: 1708429486-386972 X-HE-Meta: U2FsdGVkX196BvxqGiSnlQdWHaWJZT6V7ZXP+5nCl7qFEG+mUUyo/KH6BSpSieE5V4mrhrOKsuYVBI+iaQbi+PkIgP1GcoozVefl2y7INdSKsd+4Sg0u8lbA5ME1nOEKdBtJCTB4Nhqmwo32yLPRmvKS5QrDP8uD698q7Cw4TueSJj0mo1D+b760ZB/BUdMjQuKMMfco7KLJASxT2thNksAeQa8XKYdsMPsY2HN66xeYpVRtpvtVEFyEpSLTY7WeNJnopcBabsoW0hLB5mF+rmoG1beYn3kjlMMKm8HpEWv1NFd/cDMPPf3ms3wQoPHrfysejV2LWB2aleBZ4c7sLQpuaFIl57Ly9nyZnrssGvPW7xP9tSPif8Q0+xPtiAk4tlzNtrfh1n8qzamFvLfyf+W6UqAdPjilWLmdrGW7L7XmdCdXIZEtPdhFkK8d6ki/0XeI/OU1uwW84NViMQXB+IrQluFerO0L+KaXtz7sbJBxVMyiClshtA9Lg2qTmprA07+hZ9lSs31IwXeQJGouKXB4X50yb5uL7QySXFp27fe4sBybGwKpBHo+fcFPsOnT2A/CMhR+Tj1SxKxgmmXa925//k3+98tf7XyUqs13H7EqibRz1w9H6AAjDZo6MwTrMVPrRn6j2y9mEmUN8fj7brkLwqOuRTtGC6+zPU7SE7bLRZmuF14V3IJRvMcRW4lFAYtUkJwX+OEnfOfeBDguyS/M2lUCu8ucrbRO36axlRPi79Oh9sIEtLjL+BrZpDnc4aXaYmHQfershSTqs/BF0L3iNcJIIQ8RT1AZ7wk8u3gbkTFNMgRLmT1amdm8shxTTVJN+xgRIumBcl7N4BWJXlpytQnR1JCvYpJK5OLRwa1n4aeCG0LjJtYYxUV+MmJ6b1au5yrsuQwo0rlrwfI77jIH1lTVbXPKdqiNFk44c8I+cGN1Xs1sMILJ8aDF1vy0dzem5M6C6qugs3o+ajk O3Nj4Cfx 29x08W/2rnn8zVboSGgcuTYzjmkOzKIoibrXuTBTdXUtGZ63/+8PAGXKq7ch0+CpefzZJP7GxbgN8pNSvVE93Sq7oej19AaMbiiPHDDKBtC8SqNdFPaFq7WLBF2NmBdN1GIqqIYA8mMnaZnbnnDFKm5jRXrwRfKkHxKVVYtP/H5103xc6fF3MgNZCP+dhJIz7KX96 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 Actually we seldom use the class_idx returned from get_zspage_mapping(), only the zspage->fullness is useful, just use zspage->fullness to remove this helper. Note zspage->fullness is not stable outside pool->lock, remove redundant "VM_BUG_ON(fullness != ZS_INUSE_RATIO_0)" in async_free_zspage() since we already have the same VM_BUG_ON() in __free_zspage(), which is safe to access zspage->fullness with pool->lock held. Signed-off-by: Chengming Zhou Reviewed-by: Sergey Senozhatsky --- mm/zsmalloc.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index c39fac9361d7..63ec385cd670 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -470,16 +470,6 @@ static inline void set_freeobj(struct zspage *zspage, unsigned int obj) zspage->freeobj = obj; } -static void get_zspage_mapping(struct zspage *zspage, - unsigned int *class_idx, - int *fullness) -{ - BUG_ON(zspage->magic != ZSPAGE_MAGIC); - - *fullness = zspage->fullness; - *class_idx = zspage->class; -} - static struct size_class *zspage_class(struct zs_pool *pool, struct zspage *zspage) { @@ -708,12 +698,10 @@ static void remove_zspage(struct size_class *class, struct zspage *zspage) */ static int fix_fullness_group(struct size_class *class, struct zspage *zspage) { - int class_idx; - int currfg, newfg; + int newfg; - get_zspage_mapping(zspage, &class_idx, &currfg); newfg = get_fullness_group(class, zspage); - if (newfg == currfg) + if (newfg == zspage->fullness) goto out; remove_zspage(class, zspage); @@ -835,15 +823,11 @@ static void __free_zspage(struct zs_pool *pool, struct size_class *class, struct zspage *zspage) { struct page *page, *next; - int fg; - unsigned int class_idx; - - get_zspage_mapping(zspage, &class_idx, &fg); assert_spin_locked(&pool->lock); VM_BUG_ON(get_zspage_inuse(zspage)); - VM_BUG_ON(fg != ZS_INUSE_RATIO_0); + VM_BUG_ON(zspage->fullness != ZS_INUSE_RATIO_0); next = page = get_first_page(zspage); do { @@ -1857,8 +1841,6 @@ static void async_free_zspage(struct work_struct *work) { int i; struct size_class *class; - unsigned int class_idx; - int fullness; struct zspage *zspage, *tmp; LIST_HEAD(free_pages); struct zs_pool *pool = container_of(work, struct zs_pool, @@ -1879,10 +1861,8 @@ static void async_free_zspage(struct work_struct *work) list_del(&zspage->list); lock_zspage(zspage); - get_zspage_mapping(zspage, &class_idx, &fullness); - VM_BUG_ON(fullness != ZS_INUSE_RATIO_0); - class = pool->size_class[class_idx]; spin_lock(&pool->lock); + class = zspage_class(pool, zspage); __free_zspage(pool, class, zspage); spin_unlock(&pool->lock); }