From patchwork Sat Sep 28 02:16:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sridhar, Kanchana P" X-Patchwork-Id: 13814600 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 5ADB9CF6493 for ; Sat, 28 Sep 2024 02:16:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 370226B0166; Fri, 27 Sep 2024 22:16:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2A96A6B0167; Fri, 27 Sep 2024 22:16:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0E4D36B0168; Fri, 27 Sep 2024 22:16:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id C25E46B0167 for ; Fri, 27 Sep 2024 22:16:31 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 6293C817F8 for ; Sat, 28 Sep 2024 02:16:31 +0000 (UTC) X-FDA: 82612532982.23.4239D6C Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) by imf30.hostedemail.com (Postfix) with ESMTP id 364B780008 for ; Sat, 28 Sep 2024 02:16:29 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=YxgLkKUg; spf=pass (imf30.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 192.198.163.13 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1727489626; 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=dt+cTcWb+BAD2IHzMoYkxqsN3zKB5Ajsbz/YRJhcXic=; b=TQIg+pSAQHZHbr7QSab+bFPqb2vw4KyYS4QNaWkzOw2v8881n/1sUvKze6qdUd0UHfgCQx C3VKwiijntkOytHsLD6ZUCvEV0dvS0PW0k+hklOxCwG3vIQREYQcBHTstyJpe6m5stmPka D5XvAXNFRsqUTRSQnaqyGRkqohG0xeY= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=YxgLkKUg; spf=pass (imf30.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 192.198.163.13 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1727489626; a=rsa-sha256; cv=none; b=FZw/omjLtGXSFJyfrM5GU9XEY40vbN0o8xwYCHv/rgVBTHAL+Oby9vvpwC8cP80Txz7GIX 9fs9dG0DRU1+tdmMOOV8dOxpSlBfossJRUw8AU+fZxSRqcDpZ4g999yq2S9y6x26T/7hv7 t9fjcxdU/ycc5aT24kafgysa86D1ZnY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727489789; x=1759025789; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7AZStRs4Lxum8UQacAgZWzRz8QxxXzYiQ2pEjwK5j3g=; b=YxgLkKUgNuaR4dNtSWwzHLAO5pmYc/GDh6znyQV4YmR2o7XEPRmvJFcZ PkyauOTGXSppZu0hmisQUUitZ9x9H/rKkuPzb4maJ+CSICJy99GQpkgNK LLCoyxaQAdOagEaoddEyd/Pr1V4QduNtGvAVehM7LhlgLNZvyxorffHXo mN8vww+yMQyiEAFt+b59TY2UZ6fNgORBzmoJJhhkw0yUp4DhAZPF/AyBC NlVlYse0/n3dDi2VcfDYMiOmOEvc1hcPzLdRpZ5p2KDWAGFI6GsSB7+N1 7sfL0acWj9vFQ8SywSpTVe9B7aYzlN4mXI7SmZ322A5xknragVScs+3LO w==; X-CSE-ConnectionGUID: VcVZkhMdSEC4XbSmIVUMCg== X-CSE-MsgGUID: hDzKICUQTLqMfR1TyHMWMw== X-IronPort-AV: E=McAfee;i="6700,10204,11208"; a="29526895" X-IronPort-AV: E=Sophos;i="6.11,160,1725346800"; d="scan'208";a="29526895" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Sep 2024 19:16:21 -0700 X-CSE-ConnectionGUID: mDT8is80RWObT6fFc36rng== X-CSE-MsgGUID: ugrimwV2TuCBBwZcCwdPzw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,160,1725346800"; d="scan'208";a="73507127" Received: from jf5300-b11a338t.jf.intel.com ([10.242.51.6]) by orviesa008.jf.intel.com with ESMTP; 27 Sep 2024 19:16:21 -0700 From: Kanchana P Sridhar To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, hannes@cmpxchg.org, yosryahmed@google.com, nphamcs@gmail.com, chengming.zhou@linux.dev, usamaarif642@gmail.com, shakeel.butt@linux.dev, ryan.roberts@arm.com, ying.huang@intel.com, 21cnbao@gmail.com, akpm@linux-foundation.org Cc: nanhai.zou@intel.com, wajdi.k.feghali@intel.com, vinodh.gopal@intel.com, kanchana.p.sridhar@intel.com Subject: [PATCH v8 5/8] mm: zswap: Modify zswap_stored_pages to be atomic_long_t. Date: Fri, 27 Sep 2024 19:16:17 -0700 Message-Id: <20240928021620.8369-6-kanchana.p.sridhar@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240928021620.8369-1-kanchana.p.sridhar@intel.com> References: <20240928021620.8369-1-kanchana.p.sridhar@intel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 364B780008 X-Stat-Signature: qr1zyinhxynezr35yq8ajwmyt1thznqc X-Rspam-User: X-HE-Tag: 1727489789-89113 X-HE-Meta: U2FsdGVkX1/kyV2P7N8qbDjok72810GMrEeZJhWVjeUJD62eHeojLvLWGtzYD0h7YFiHa/8IJKlZxdZz4WPP2BrQqi8HNVHO48MLGaG5Na1BXmabZcrbx9UGUaKCsLWxzkzzU3csZFbXDD71g7liRKVxR5vdmZxcqhBvbunTPFNI4LNz0NahiaojtCV+n+hD0ic683FpaNnR4sniA/bDfpodSToeXpPljs1oXiStggkzTfyg4BmARZLick0VDDWmuJUA8Do2d5DFH35OGrRWU8gz4qt9pfXBGeDH5EEEXELWMm898HWYdgpXVTrT6srEbL85yzxqHfBj1pWY9aqTKtJYweLi8bplDkrZ2yiy+TnZHhMib+wP9jxTkAqhFAqyise2RNc0c0vvYpkstcjG8uDqJ9ylVxWRhnXLKMpmgbPSbAclzRjgODLikvdkEW6UChklHEUzn4wryEiusZ5M/4KDT/ghyjFVKnGFd6b3tnOpQ0lg0a8VQUi4IY79xa8yXp3syRTB3yIHxOZt4/zC8j9ZxGVFgOgu02Udmk+epxW/JBKk6wPivGMGtQ2rL439RrwiLRNeubQYCngtEb8DZNz1sOS4K9P57YCO1mzQ/TsX+S/36Cp4PMF76cvSwRSojn1TJTBpwOVfWWfnpr4vERemwN0FZSqRlxHvC6rsUNHl0BznGdS67GywfFizrUl1dBZHvh9nd660js5cfNBLGyPksM7VnxI+we2PgmPnNn9NJ2ztnwQdCXFvagd/Ipccv3lNHuVnM39HtOJgPVP3DXV6dzIkfn4rJU+9z6/Khc9eLOEy3b4enp5IgWDTNLL3VjdVaSf0ay1LQwMuHUo26Ks3sNt00mGbjaTrOFrDuRdCEoD6iICM8p4GtEzFTumQP2TzqExt6bmKTGq9g0vh0RkqsnWuutAv67vjVIckdOci25ydLYqytRnwmokLEzM350QPl3jYoY/SkZfebEu bdm31wHI 93u4HIgUsdbGoJ1Y4DrDvFT+Fw5A4gvg85w3trfjrT9EHhZhKy4rMPgpGGubyRA/6GOVdUjrjzJ3vQDqZZAmwoyYGTUTwP77Rs6hFNneo3qYcnLI5DIiL9p/Ax7Of6IDiMS9RJWoIUrX78Mxk8lGSo9Oxf6LeQnqBE95jHXKk7e8qIhdx3SRPhwYV/uwjMmrTDZBPW2T/y7/arB6pyW/QKBg0Nip9HcTrZfOM95BuB+/EWtk= 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: For zswap_store() to support large folios, we need to be able to do a batch update of zswap_stored_pages upon successful store of all pages in the folio. For this, we need to add folio_nr_pages(), which returns a long, to zswap_stored_pages. Signed-off-by: Kanchana P Sridhar --- fs/proc/meminfo.c | 2 +- include/linux/zswap.h | 2 +- mm/zswap.c | 19 +++++++++++++------ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index 245171d9164b..8ba9b1472390 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -91,7 +91,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) #ifdef CONFIG_ZSWAP show_val_kb(m, "Zswap: ", zswap_total_pages()); seq_printf(m, "Zswapped: %8lu kB\n", - (unsigned long)atomic_read(&zswap_stored_pages) << + (unsigned long)atomic_long_read(&zswap_stored_pages) << (PAGE_SHIFT - 10)); #endif show_val_kb(m, "Dirty: ", diff --git a/include/linux/zswap.h b/include/linux/zswap.h index 9cd1beef0654..d961ead91bf1 100644 --- a/include/linux/zswap.h +++ b/include/linux/zswap.h @@ -7,7 +7,7 @@ struct lruvec; -extern atomic_t zswap_stored_pages; +extern atomic_long_t zswap_stored_pages; #ifdef CONFIG_ZSWAP diff --git a/mm/zswap.c b/mm/zswap.c index 0f281e50a034..43e4e216db41 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -43,7 +43,7 @@ * statistics **********************************/ /* The number of compressed pages currently stored in zswap */ -atomic_t zswap_stored_pages = ATOMIC_INIT(0); +atomic_long_t zswap_stored_pages = ATOMIC_INIT(0); /* * The statistics below are not protected from concurrent access for @@ -802,7 +802,7 @@ static void zswap_entry_free(struct zswap_entry *entry) obj_cgroup_put(entry->objcg); } zswap_entry_cache_free(entry); - atomic_dec(&zswap_stored_pages); + atomic_long_dec(&zswap_stored_pages); } /********************************* @@ -1232,7 +1232,7 @@ static unsigned long zswap_shrinker_count(struct shrinker *shrinker, nr_stored = memcg_page_state(memcg, MEMCG_ZSWAPPED); } else { nr_backing = zswap_total_pages(); - nr_stored = atomic_read(&zswap_stored_pages); + nr_stored = atomic_long_read(&zswap_stored_pages); } if (!nr_stored) @@ -1501,7 +1501,7 @@ bool zswap_store(struct folio *folio) } /* update stats */ - atomic_inc(&zswap_stored_pages); + atomic_long_inc(&zswap_stored_pages); count_vm_event(ZSWPOUT); return true; @@ -1650,6 +1650,13 @@ static int debugfs_get_total_size(void *data, u64 *val) } DEFINE_DEBUGFS_ATTRIBUTE(total_size_fops, debugfs_get_total_size, NULL, "%llu\n"); +static int debugfs_get_stored_pages(void *data, u64 *val) +{ + *val = atomic_long_read(&zswap_stored_pages); + return 0; +} +DEFINE_DEBUGFS_ATTRIBUTE(stored_pages_fops, debugfs_get_stored_pages, NULL, "%llu\n"); + static int zswap_debugfs_init(void) { if (!debugfs_initialized()) @@ -1673,8 +1680,8 @@ static int zswap_debugfs_init(void) zswap_debugfs_root, &zswap_written_back_pages); debugfs_create_file("pool_total_size", 0444, zswap_debugfs_root, NULL, &total_size_fops); - debugfs_create_atomic_t("stored_pages", 0444, - zswap_debugfs_root, &zswap_stored_pages); + debugfs_create_file("stored_pages", 0444, + zswap_debugfs_root, NULL, &stored_pages_fops); return 0; }