From patchwork Mon Aug 19 02:16:21 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: 13767726 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 37DB3C531DF for ; Mon, 19 Aug 2024 02:16:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CFA156B008C; Sun, 18 Aug 2024 22:16:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BE3E86B0092; Sun, 18 Aug 2024 22:16:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A38926B0095; Sun, 18 Aug 2024 22:16:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 6711F6B008C for ; Sun, 18 Aug 2024 22:16:29 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 22115A873B for ; Mon, 19 Aug 2024 02:16:29 +0000 (UTC) X-FDA: 82467380898.05.B8142A9 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by imf28.hostedemail.com (Postfix) with ESMTP id 0184FC000F for ; Mon, 19 Aug 2024 02:16:26 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=hmUL5Qdy; spf=pass (imf28.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 198.175.65.9 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=1724033710; 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=OPBEYLfNaOw1f4NX9PtVSyPiQ1Xr1wZvUu5S5eRpF9c=; b=zP/yVIENMEIsar4g70ctIWZHLPD80BDOWIr6SB8AjZD40EXnNK1uzzufqsZXW+NihxD0LR 3H9PdNZo6ASDHc9Qyr2DkNdvxp91hehQ03Z7v3i9Wo8Ay6+gW+CejJxyaFx6XxZw+RERYG mjiMzyBPTWjNF/n7QomEEIUAqhUA5Xg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724033710; a=rsa-sha256; cv=none; b=ZoUCe3/T3UBGiHyCUQ6s9wn6y/9q30JMq3V7vKDZbeyCXgsL84uZt/KRJWFAA6GgBOPiUZ S905cF0ZV3yh1/OTekr741AjDr3/KY0R+NHkakkOb7iG4wCi3u/624rcMF0mYKhgh87U0m 33jpd4La1yoF/BKX2YiyClCu8qxOUjQ= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=hmUL5Qdy; spf=pass (imf28.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 198.175.65.9 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com; dmarc=pass (policy=none) header.from=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1724033787; x=1755569787; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=e4dJeIMpZ7zVkmYhUNqheK2yMfNN01J1RMy+uwUX+JE=; b=hmUL5Qdy2y1jb8jpOUBu3NrsUCd/sP8mR7/QozxCEbnlwkhYG1QEXyaV 7ijpVQ+jPOxny04ETH/CcQgd4nNoH3Vpjfjg9WkTLi7pumDSawMOvrnc2 fVW/ahiIRBDawL1jDIcmaiI1ZgwhxIe+/Jervp/v9H5LA8P4gNIByZ9pM 4pmcE+mZnHoGuEMcm543m/kz1d3C9juvLniIaZ5A2wCEw4TYZcB5j+5G2 7YRgUeJ2fEQDMESMLsQ9NSEHR0PuMgh19BAn5MSakB/wOnK2AY6K5s9qf hC9yThvKXttMgi6jw8o2nzv5nqOpXCvE9IGBDucS+5CVgCVHMwPA3XEJ9 A==; X-CSE-ConnectionGUID: sXHgo2gVRwin8m2BTdjqUg== X-CSE-MsgGUID: JbChkcpXSFG3BzLzZ+zFVg== X-IronPort-AV: E=McAfee;i="6700,10204,11168"; a="44782981" X-IronPort-AV: E=Sophos;i="6.10,158,1719903600"; d="scan'208";a="44782981" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Aug 2024 19:16:24 -0700 X-CSE-ConnectionGUID: Q7fqm6iGRiq5vh7mK/HcfA== X-CSE-MsgGUID: BTCZqOyyTrukqBfPvkuwiA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,158,1719903600"; d="scan'208";a="64610280" Received: from jf5300-b11a338t.jf.intel.com ([10.242.51.6]) by fmviesa005.fm.intel.com with ESMTP; 18 Aug 2024 19:16:23 -0700 From: Kanchana P Sridhar To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, hannes@cmpxchg.org, yosryahmed@google.com, nphamcs@gmail.com, 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 v4 4/4] mm: swap: Count successful mTHP ZSWAP stores in sysfs mTHP stats. Date: Sun, 18 Aug 2024 19:16:21 -0700 Message-Id: <20240819021621.29125-5-kanchana.p.sridhar@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240819021621.29125-1-kanchana.p.sridhar@intel.com> References: <20240819021621.29125-1-kanchana.p.sridhar@intel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 0184FC000F X-Stat-Signature: tw4c185uaigfr4a4jr6h5j961r9jxym3 X-HE-Tag: 1724033786-567999 X-HE-Meta: U2FsdGVkX1+iBnfn/PMdrteGiCN0syJFU2ScVGJcLw5qG3jWNAlEZ4+F8Ep0pPvHmsEs8g7O9Q0dtSgQwMaV7kyGbqto+E8WZwYIUlxP55+/FdERL11zs8f+QUMVjMD+AGOPCoBVTEZUkuiHGp1MLStEmwVV5SA18Yt/5UcCj2lUAXgDC8nO3v1LxCnwuWG5dp01C+w4zfxyuOh9DX7cQiAL1i2dQjaguPu8qoOJE/WxFlTgJmwg0fZTV61006/kdMGMA6GSOovxr96llYxp5QFy29gkkeJZHq0EvDi/lgSYGl04tvpEblkuzJuQyWH0fYLJN+pPOof4LLsicUg+6YMTBCdiML0fJdL+fXBxMkAICVRkaRyZE65ZXrbxdJHjcd4EiwykRLNn2a3WOolXahr4AYnIxPGKXk4ngVPzypKrwFNNwMRhFwziZMmW7gZbpvdd+ZS+H+HabvEuMyaSNTKc/vkDSaNOoEoi3D72Hv8992NwVubgKYOcy173NFHGQoFhO/BZHBJqQYbC5R97e2NTPNps9iXg/xEaWRHBBL3yrXsZ9+yNcqNwHag8LNS24a1JuyQmKG40XLX/A2CQjzDOqcUb5suGjlR+DwthhOITQ6SP6xrVXfcspuuxXrD2qDuQXb+LALRucIr/zN88l8ou2hxPxH1gkFVt9anu0dMGFGQudz6+ng/Al3ie8WI4n1gCh0Z6jSdrOWvTB3GMq1Inlk78FxMhhw8flbVPe/VWExeM3U8WRt6ktN3D5BvPr33UBD4DDkpi18A1mjz31RT0MC/8oKytmUDyEnURFmGgDonY+PHKIMPDsX5kXiYzyi8ISH2F/b+7hAsUVjvDbxvMZzEPtXst1X0GURcEau/dQJegt+NBge8PZOBwhav7Vu5VMNGutqJDzJTjDlMEMU4dKz7NqOgbQDeUPmcMwmv0d7IDePobmI+23RUvTCpsDf9KybOs4CDBP7A4DI5 +3cg/l+m M4EqgRD6gqUqeEvMZ7/gSf5QMTrzjYdgXN0d2KZmcMj4o15fnq1kSak8GqFnvStOo6JNhynhEi3vIYmMkfZoYSed9etJsrMcXpfqDluZW4+NWCOaKzy5nN9kR5++Fxd6llaiSbGxkl9LTO6/zp58a+OrUtw== 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: If zswap_store() successfully swaps out an mTHP, it will be counted under the per-order sysfs "zswpout" stats: /sys/kernel/mm/transparent_hugepage/hugepages-*kB/stats/zswpout Other block dev/fs mTHP swap-out events will be counted under the existing sysfs "swpout" stats: /sys/kernel/mm/transparent_hugepage/hugepages-*kB/stats/swpout Based on changes made in commit 61e751c01466ffef5dc72cb64349454a691c6bfe ("mm: cleanup count_mthp_stat() definition"), this patch also moves the call to count_mthp_stat() in count_swpout_vm_event() to be outside the "ifdef CONFIG_TRANSPARENT_HUGEPAGE". Signed-off-by: Kanchana P Sridhar --- mm/page_io.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/page_io.c b/mm/page_io.c index a00e2f615118..ac5954149eb9 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -196,6 +196,7 @@ int swap_writepage(struct page *page, struct writeback_control *wbc) return ret; } if (zswap_store(folio)) { + count_mthp_stat(folio_order(folio), MTHP_STAT_ZSWPOUT); folio_unlock(folio); return 0; } @@ -215,8 +216,8 @@ static inline void count_swpout_vm_event(struct folio *folio) count_memcg_folio_events(folio, THP_SWPOUT, 1); count_vm_event(THP_SWPOUT); } - count_mthp_stat(folio_order(folio), MTHP_STAT_SWPOUT); #endif + count_mthp_stat(folio_order(folio), MTHP_STAT_SWPOUT); count_vm_events(PSWPOUT, folio_nr_pages(folio)); }