From patchwork Fri Nov 18 18:24:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 13048569 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 47CDFC433FE for ; Fri, 18 Nov 2022 18:24:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6CB076B0078; Fri, 18 Nov 2022 13:24:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 605908E0001; Fri, 18 Nov 2022 13:24:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 396FA6B007D; Fri, 18 Nov 2022 13:24:16 -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 1DCBF6B0078 for ; Fri, 18 Nov 2022 13:24:16 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id E8F3016048F for ; Fri, 18 Nov 2022 18:24:15 +0000 (UTC) X-FDA: 80147387670.03.8A943DC Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf02.hostedemail.com (Postfix) with ESMTP id 911BB8000A for ; Fri, 18 Nov 2022 18:24:15 +0000 (UTC) Received: by mail-pl1-f181.google.com with SMTP id io19so5268545plb.8 for ; Fri, 18 Nov 2022 10:24:15 -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=+nOnhYHcTkk9/NzeLLNRVXEnZ77Tqa2lTVIFHU0KWSM=; b=MggomevQAHa406kdroPp0BE2cDvQIay2Gb8NdQCWaLxdg4h8AQot1ASw4tHnrl7FLd 56+aica0cqemAuYdQspMkeDpWecDQelDR9Gc9qbXdKo1TguX0YVwNP11Jvcbka9DyMf+ cORxRCKMhXQ7OyYFD2CRDeypFzgvstHAfqBBEM6IA+kdMR1ocfxwFRlEe0sxcoWY3i8D 59gaHU51TAmpnx0iN7dZYwT7Xy8bComPIQp3m/pze4CX4XMOM9l/S9jx3itXvUzIFRhB NOpaB2oc7zutl+sPpv4XDKz1Jng9/0SSFGfSAH3pYZiUBDrD1YeHDg+r4oh4Zt/0o3/c qM/Q== 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=+nOnhYHcTkk9/NzeLLNRVXEnZ77Tqa2lTVIFHU0KWSM=; b=P7qqqaBOUm70zMef/WDEKrVuqLjVAxhrLpElTlbDP9K2CYRgMzZSfj8y5kDZFpXAsP wjARWPAyG3D7Sr5DjotexFcIeGIGi3wTksr7WTAs6mjDtAOuqO1T+zTVkKTswZHRDi/X iTxoiS33xs8BR3KRPymrnTSuGgzFg97tjW8aYursJ4vC37tYVKZwb3Lkz23x92mAA/9O Xlm3QYvkxl3YLYBcUzZtOE4Qot8VkH7a9WACc2iOGgXrhTAZDkIM+honAjnLGERHPSPb 9TE6GQYr5YpX550EIy7trPKoiuz/XFluUOXEp/i3W/xYw61DnHVvmENpJMmKHuHbtk7R ADGQ== X-Gm-Message-State: ANoB5pnCES4aEN/2geXNgAWgEVkaSnz6eIlPHOwllxurrwJX69fSU9dO GaAzYOe6Pt7i8RYwHmPJXzI= X-Google-Smtp-Source: AA0mqf48DEa51obS+EvE6ftvWMRXSztSatZcDXYbQx5zerFRPZyQr+ZS273CdSAY1gjS6r1rDwBE9w== X-Received: by 2002:a17:90a:6343:b0:213:b853:5e45 with SMTP id v3-20020a17090a634300b00213b8535e45mr14994881pjs.97.1668795854724; Fri, 18 Nov 2022 10:24:14 -0800 (PST) Received: from localhost (fwdproxy-prn-010.fbsv.net. [2a03:2880:ff:a::face:b00c]) by smtp.gmail.com with ESMTPSA id rj6-20020a17090b3e8600b00217cdc4b0a5sm5671207pjb.16.2022.11.18.10.24.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Nov 2022 10:24:14 -0800 (PST) From: Nhat Pham To: akpm@linux-foundation.org Cc: hannes@cmpxchg.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, minchan@kernel.org, ngupta@vflare.org, senozhatsky@chromium.org, sjenning@redhat.com, ddstreet@ieee.org, vitaly.wool@konsulko.com Subject: [PATCH v5 4/6] zsmalloc: Add a LRU to zs_pool to keep track of zspages in LRU order Date: Fri, 18 Nov 2022 10:24:05 -0800 Message-Id: <20221118182407.82548-5-nphamcs@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221118182407.82548-1-nphamcs@gmail.com> References: <20221118182407.82548-1-nphamcs@gmail.com> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1668795855; a=rsa-sha256; cv=none; b=NW9iwfptgrhqbbR5reC62R1fIc+SCQUUQCYgiW5K9UCc9kg0VRx3SAmN3URPYVmeYpNIjA uPAoRF7qO0I+M65SfLNOulaIUC0hjUF6AOsvHX7rtndccT+1cpklrQqFjKKYNBLrZ4QnpL 4j1Hlxn8gKzg+UTvRKnldEj5jnrdGTk= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=MggomevQ; spf=pass (imf02.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=nphamcs@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=1668795855; 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=+nOnhYHcTkk9/NzeLLNRVXEnZ77Tqa2lTVIFHU0KWSM=; b=ZnlC5RgYTRjHFCvlNmCpY6ldTV4Xyote90r4dEmX8SiFnyQgvcvqF5Hv4uVCYuOm7sCEtX fl2oO6/+7N7M0CVYe2539phV95gStvwTuk0LCsRgLcGB9VQrcp9WDpG2+YEZjMg1VSrU3b yNyVCnR/THjl6IoKBSth/Yw2zGIizA0= X-Stat-Signature: 5zfqpteukooxo13f8pohkd48pi6r4b7m X-Rspamd-Queue-Id: 911BB8000A Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=MggomevQ; spf=pass (imf02.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1668795855-923691 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000997, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: This helps determines the coldest zspages as candidates for writeback. Signed-off-by: Nhat Pham --- mm/zsmalloc.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) -- 2.30.2 diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 326faa751f0a..9e7b54324181 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -239,6 +239,11 @@ struct zs_pool { /* Compact classes */ struct shrinker shrinker; +#ifdef CONFIG_ZPOOL + /* List tracking the zspages in LRU order by most recently added object */ + struct list_head lru; +#endif + #ifdef CONFIG_ZSMALLOC_STAT struct dentry *stat_dentry; #endif @@ -260,6 +265,12 @@ struct zspage { unsigned int freeobj; struct page *first_page; struct list_head list; /* fullness list */ + +#ifdef CONFIG_ZPOOL + /* links the zspage to the lru list in the pool */ + struct list_head lru; +#endif + struct zs_pool *pool; #ifdef CONFIG_COMPACTION rwlock_t lock; @@ -352,6 +363,18 @@ static void cache_free_zspage(struct zs_pool *pool, struct zspage *zspage) kmem_cache_free(pool->zspage_cachep, zspage); } +#ifdef CONFIG_ZPOOL +/* Moves the zspage to the front of the zspool's LRU */ +static void move_to_front(struct zs_pool *pool, struct zspage *zspage) +{ + assert_spin_locked(&pool->lock); + + if (!list_empty(&zspage->lru)) + list_del(&zspage->lru); + list_add(&zspage->lru, &pool->lru); +} +#endif + /* pool->lock(which owns the handle) synchronizes races */ static void record_obj(unsigned long handle, unsigned long obj) { @@ -953,6 +976,9 @@ static void free_zspage(struct zs_pool *pool, struct size_class *class, } remove_zspage(class, zspage, ZS_EMPTY); +#ifdef CONFIG_ZPOOL + list_del(&zspage->lru); +#endif __free_zspage(pool, class, zspage); } @@ -998,6 +1024,10 @@ static void init_zspage(struct size_class *class, struct zspage *zspage) off %= PAGE_SIZE; } +#ifdef CONFIG_ZPOOL + INIT_LIST_HEAD(&zspage->lru); +#endif + set_freeobj(zspage, 0); } @@ -1418,9 +1448,8 @@ unsigned long zs_malloc(struct zs_pool *pool, size_t size, gfp_t gfp) fix_fullness_group(class, zspage); record_obj(handle, obj); class_stat_inc(class, OBJ_USED, 1); - spin_unlock(&pool->lock); - return handle; + goto out; } spin_unlock(&pool->lock); @@ -1444,6 +1473,11 @@ unsigned long zs_malloc(struct zs_pool *pool, size_t size, gfp_t gfp) /* We completely set up zspage so mark them as movable */ SetZsPageMovable(pool, zspage); +out: +#ifdef CONFIG_ZPOOL + /* Move the zspage to front of pool's LRU */ + move_to_front(pool, zspage); +#endif spin_unlock(&pool->lock); return handle; @@ -1967,6 +2001,9 @@ static void async_free_zspage(struct work_struct *work) VM_BUG_ON(fullness != ZS_EMPTY); class = pool->size_class[class_idx]; spin_lock(&pool->lock); +#ifdef CONFIG_ZPOOL + list_del(&zspage->lru); +#endif __free_zspage(pool, class, zspage); spin_unlock(&pool->lock); } @@ -2278,6 +2315,10 @@ struct zs_pool *zs_create_pool(const char *name) */ zs_register_shrinker(pool); +#ifdef CONFIG_ZPOOL + INIT_LIST_HEAD(&pool->lru); +#endif + return pool; err: