From patchwork Fri Aug 16 05:48:02 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: 13765454 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 5F19EC531DC for ; Fri, 16 Aug 2024 05:48:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E14EB8D004A; Fri, 16 Aug 2024 01:48:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D9C778D002B; Fri, 16 Aug 2024 01:48:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C16798D004A; Fri, 16 Aug 2024 01:48:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id A318C8D002B for ; Fri, 16 Aug 2024 01:48:12 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 4A33BA18F3 for ; Fri, 16 Aug 2024 05:48:12 +0000 (UTC) X-FDA: 82457028024.04.3C7415D Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by imf22.hostedemail.com (Postfix) with ESMTP id 31362C0015 for ; Fri, 16 Aug 2024 05:48:08 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=nVztWFNH; spf=pass (imf22.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 198.175.65.11 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=1723787253; a=rsa-sha256; cv=none; b=w2F7dcCANofERjMAyamAxx2pan3oHhetgn5JdnRTEvCUmOrHb+q9CH2Raqg/1uWK4MMNmn n8h8kdH5NLWRwSYIjLQRlQgOWUac0M1Yn0QAItFHJMhqX0wtTR5vykf2c5XEdZfpXi1/aj NfcOkbt8TB8ap0ZYWV+N1WLH7QK0ZYA= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=nVztWFNH; spf=pass (imf22.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 198.175.65.11 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=1723787253; 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=naruCmolxM1VTIhLrUrisUJHcgVK8pYYLgjjkbmUCc0=; b=0foX0RNTPefar2fT9cS84o+4kJ/PiyGucw2sYjAd2/n8UfsbxJveFS7nw32meIYaMLUPYy nIu5UaMPVRMUs8ISHEmhm27OiCZ7Vz6Yx0GWR1n1ftIei/2Zo1T3jd/7+Yw69ZjBhpGC7y BZwr6GFLgMtTYOF35xhnUhavRVvT7Fc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723787289; x=1755323289; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8aJTLnzMPmjHtUmt/CSvhY9AKnZREM8rFjycd3MYym0=; b=nVztWFNHcL/Kg/+KiTHCbifsGxqY8QtDNC31vzPaSvZUSpZtiPHdDNSO upTXzV9iTprH9lmaaVnBJ/37AipSVnMBIbW4A2X4FXcYLMkDHOoyfLVRu uPY2IZ9CdjmpfR2nHMUlvB5Y55u1QibxMhnrBUIjMxEW3nsuLLboGs6Gj lZtcf+HSPmMyvEUzjOTX0v3SKVYcGp6yTMsLBW7GnmQ6/00nBPj7v85zM WOZ5O7BuFR2Vc9br0EtXGRJ3TCa48XMDiIwU3+bcPxYUXZtu9DUEhsUDz tP7B1K3MpnmlS5z+FR/UpUjC94NYCsoZz2w2CDvuEKDM0ohRJ2tj36qGf A==; X-CSE-ConnectionGUID: 8Ca4U244TYWOekdqu9w6Mg== X-CSE-MsgGUID: xCuVg4P/QC+WNQaYfw4OUQ== X-IronPort-AV: E=McAfee;i="6700,10204,11165"; a="32648115" X-IronPort-AV: E=Sophos;i="6.10,150,1719903600"; d="scan'208";a="32648115" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Aug 2024 22:48:07 -0700 X-CSE-ConnectionGUID: CmHiJCcuQdavnb7D8MPHOQ== X-CSE-MsgGUID: 39CNgtIxREOwdGxpX5wumw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,150,1719903600"; d="scan'208";a="59415332" Received: from jf5300-b11a338t.jf.intel.com ([10.242.51.6]) by orviesa010.jf.intel.com with ESMTP; 15 Aug 2024 22:48:06 -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 v2 1/4] mm: zswap: zswap_is_folio_same_filled() takes an index in the folio. Date: Thu, 15 Aug 2024 22:48:02 -0700 Message-Id: <20240816054805.5201-2-kanchana.p.sridhar@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240816054805.5201-1-kanchana.p.sridhar@intel.com> References: <20240816054805.5201-1-kanchana.p.sridhar@intel.com> MIME-Version: 1.0 X-Stat-Signature: tbtps53dby9pt7k9x5nqg8oj4ebx5yki X-Rspamd-Queue-Id: 31362C0015 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1723787288-746188 X-HE-Meta: U2FsdGVkX18niiUgeyfCoZOuLLWtVJrIT6gdGFrNa5XLdmx68Rd3KjH/B6LsConde4KC/cC7Yxf79JUOellHwrGYYBbYfWe7k8tqTY59rParC1XSWdrPjAWrhqbDR4BWED9bEOkis8DT3uaAeyS0Jcj5iy8YiJ7Kgp5twfK3fRb7jMEniiSgLP9DXqRqOhZcBGcKAk44P5gdwSoHBMPuvQhS2ryJOpPB9WPTF9GCIjp8K9loV1c8UmTRDlIi1uxj3WwX9bH6cemEMTzteTQ9KPFYtFChq80oXNkHcaHS0JSbZhjP7dNpTJ512GuadA8fRmI8brGGgRbiOCmmnIBKDJ+tPQKQCUOeGd6JBxZWryl6hvGX1Nsad451iJIXnIQvVj2HGCiIeBWXEFDUA3c8t15Vl0HwqZY1005C2rHWpYJgwE+Sz3YFym0pO6Vmt2t9AukxWFKSu8WtYR6TeVQphAxyomK7oyqlw+2cdbEjNTBgGysoCPflFHr8v+lF7fBk4JROAxcAuUiiT9gxOzGCr/tJlqM63lC+ItrtmBkZXlxcU1MXOnw2HhWd+xnfct+ueYBSCnl/cNZaIulfnnA3iNJcSwS90N4ueLHQ0xNnk/geQFkSasI3Q2PYBp06s7iLYdMvp2qFcR5a5tQiW9T4TnDXvG+LauFHkUoc4a6XfqEHTvqUoxUF6SehIgo1wfK4iyDJ+kDxT1D1d0nmze8YKr8xXM2gMzRzpMqSVaaCQ4gX6QN6IkE5cIwyHnVjy3aJ1B0mfBA5sl4EtjSDYej8uIzYis8z2qthPv1Eu3GLJ2ccuwC99/mhC5JlK2Vrus+1YCUV9hrZFJ0GjWAu1micaozjPWDmKIIu/RfeAAj9T7cHqZnsS96mSb5SbD8w+Cgh1BgGdVpAtW0IVKaJcxa9PioLa7CL/yWqWm74ak5s7ViewiTuc4ERdYa3qJloCclxFeRGBRtX/s9TxtyxHdt oEAPy5kT RlOkW9T2xgafa+sc92JqNeFQmtzQHqA1hgQUoJC8kJfrEfvt1fQDpavXrwTt8hS/PPE7R5yoM1VASPvh5b4zLJLBbPtwg6OnJshuxm1oC8V3yecxfmPb97eyWun+8PFJjSDTLPmkOnQ9EmhYFo+vZzJYr73DRHM8DDQfb0caFns6X92aSJoLqc02qm6ZkNh7zcUNpM7BORzYWoXg= 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: This change is being made so that zswap_store can process mTHP folios. Modified zswap_is_folio_same_filled() to work for any-order folios, by accepting an additional "index" parameter to arrive at the page within the folio to run the same-filled page check. Signed-off-by: Kanchana P Sridhar --- mm/zswap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index adeaf9c97fde..6c5c656ec282 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -1358,14 +1358,14 @@ static void shrink_worker(struct work_struct *w) /********************************* * same-filled functions **********************************/ -static bool zswap_is_folio_same_filled(struct folio *folio, unsigned long *value) +static bool zswap_is_folio_same_filled(struct folio *folio, long index, unsigned long *value) { unsigned long *data; unsigned long val; unsigned int pos, last_pos = PAGE_SIZE / sizeof(*data) - 1; bool ret = false; - data = kmap_local_folio(folio, 0); + data = kmap_local_folio(folio, index * PAGE_SIZE); val = data[0]; if (val != data[last_pos]) @@ -1435,7 +1435,7 @@ bool zswap_store(struct folio *folio) goto reject; } - if (zswap_is_folio_same_filled(folio, &value)) { + if (zswap_is_folio_same_filled(folio, 0, &value)) { entry->length = 0; entry->value = value; atomic_inc(&zswap_same_filled_pages); From patchwork Fri Aug 16 05:48:03 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: 13765457 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 0A4DCC531DC for ; Fri, 16 Aug 2024 05:48:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C94E48D004D; Fri, 16 Aug 2024 01:48:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BD6998D004E; Fri, 16 Aug 2024 01:48:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9A8E88D004D; Fri, 16 Aug 2024 01:48:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 6F0F18D002B for ; Fri, 16 Aug 2024 01:48:17 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 19CA34197B for ; Fri, 16 Aug 2024 05:48:17 +0000 (UTC) X-FDA: 82457028234.10.0BEFC7B Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by imf22.hostedemail.com (Postfix) with ESMTP id EB9B9C0018 for ; Fri, 16 Aug 2024 05:48:14 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=NHvxhyvO; spf=pass (imf22.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 198.175.65.11 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=1723787258; a=rsa-sha256; cv=none; b=D/SWjpD73NFYGrdN388EkxDmUaHERlMFnyHM56lcGcPCCxMJQuhR6aFGY8Q+cXNpnXK9zE E6b8+UxDLTToVco2OuTx8s3+UF6iHtCCEVGwVc04ECBxJVAuRurkquxSq4iDtUkBc40oTE wGK0q4FHZf1Wm2eipL44OpLfqhW6OPQ= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=NHvxhyvO; spf=pass (imf22.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 198.175.65.11 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=1723787258; 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=+HNbSX4Nfg/DT3bgx+GYIXGCDR7l37iAnJ1JwzYXhAE=; b=7hGYMY1332Ibadfb1ElxIkj1ilqvAylWUl6LiDUDuICZ37gKHgxmSBGfbPJtEeY3hrOp0l ix9VBUxtQqKdrSbmXGC/znulF+XYqEJakNUBAkK3KakWl0hldao2KpIh+da4SqS8UuAgHP IofYNdvcM47jd3Y6pKlZa/tBQz9sTI4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723787295; x=1755323295; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Hs5osIBnEQbfhkvnt0UdOWrL7Zx29/pIwKoBT11shSE=; b=NHvxhyvOasDMW3RELMxUOQsdjDKrFjCaOnWrsiCOAbYeo4yhP6ccDD/P IH8rHcCV00whsKrFs/PnEcddWI59hdoOHXH6MXyeSp0HzxGCs35U3pzyZ EP10WRLPhQZoVu77fDpkk+3Q6VDMnuSxfjlNml5hWH4zZIQiBeXKhvkhL Lg+ivbuHgrgHDSTXsOYPyVydAwf1nKPQkMxyKvNtPxcPOMqSEjAthoWKk AeGSYwgmkrh+3zKvnRiPav/3ut/E7kTnAnjAjyUYqXEtkYNAUVGw0WA58 a8dCbYztfz9+EW4McEH3zee/SsXt+Iwo7mYaT3S8+XBFUJGlsgEFas8m+ g==; X-CSE-ConnectionGUID: o/3P/38IQWuFuRLTnoqJsA== X-CSE-MsgGUID: kT2CGq+fQsyYlQeuP69Nvg== X-IronPort-AV: E=McAfee;i="6700,10204,11165"; a="32648123" X-IronPort-AV: E=Sophos;i="6.10,150,1719903600"; d="scan'208";a="32648123" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Aug 2024 22:48:07 -0700 X-CSE-ConnectionGUID: 3vL6PPmoSKe4hS5FNyjogw== X-CSE-MsgGUID: eewxP081SjaotTInJF/Ujw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,150,1719903600"; d="scan'208";a="59415336" Received: from jf5300-b11a338t.jf.intel.com ([10.242.51.6]) by orviesa010.jf.intel.com with ESMTP; 15 Aug 2024 22:48:06 -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 v2 2/4] mm: zswap: zswap_store() extended to handle mTHP folios. Date: Thu, 15 Aug 2024 22:48:03 -0700 Message-Id: <20240816054805.5201-3-kanchana.p.sridhar@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240816054805.5201-1-kanchana.p.sridhar@intel.com> References: <20240816054805.5201-1-kanchana.p.sridhar@intel.com> MIME-Version: 1.0 X-Stat-Signature: u8nh7k4an73gy68qm56wkgfw4sixjhw4 X-Rspamd-Queue-Id: EB9B9C0018 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1723787294-429277 X-HE-Meta: U2FsdGVkX18wysh2uANY4WfNq2XeSQa9fDDTCrOl1V20EiDN3u+FQ3uLkgUKyj2rS2pzGRtkXHlnv0/5Xh1QPFuDc0TFwEqCWH0aMN1QOHQVoQuwEXbNZEzVfMbGOw5s+05mGUmlaIiZ6xS8lPlK8Pq7GYWo0O5fMxfS7e0zMwXxn0mHT8huWSdR8kkFy7995wIEB8RbKu4Ytbrv7h/ZKrw0AgIsKQ48nRB0dEJMtcbqE6u+ESBLlIvy++cp0YOJ+S+iG/OYBNyaDxZzPms3SD9rrtuhK09roVHno00OfOvR33onRkZ2HsLsLpn4ejhBl2ukwk4fOB+bbr69752/CpUDF69ZPP2S0V5QKHGORsJj7B5Rze8EVI4bSidlAK+smflHMDg5n7/RjXWBwYUy/U0XCwRcqHIFjL5lu9dj+lAGs557VO3Uz1ef2jW2rT0zI7GZIgxncBgWMpcUaqqeiewwZuoPKrt6HJgSIHr3JTDs9I0IRp/VENq3lr1r00WT9DPJVNewcVUbDEx6i9q74o3ssmTpM/8rtfborCm/jE9Nv3Moi6cfpg2cmZxLUky3yc5XewQvGJ5Y/2y8IgzX9VVYu8djd6XDlc1ouq1h6GuxekzKbXNYdqzlgBQVmwhkKBUVBwpTCI5K37MNO93aCq6yMaLYeybzmPrsowFQ1GYCFjHsHkKG+zPlmxeneE/TajOOD9qUfi7FNBVpm2ukV5hYpPDIrn9nMPSncR9VxoXXJ5N7V8VRvy9hTc/t2rodrV0b1FcVopPWoe+gxTkV6RmadsgLELHWI3aLr5mpeyVWhCJ5w6sHfdpeJUflrSo/45KhM39Q2p0NiXOxw8TVlMwwMnSssOVAI40daAKO3G/N//gxZdm4EAP/dQC7cS2yD3jvLiFzbvKHL4lPashBaEbELmd8g5wwOW+ZJoLGgSQGSCEe/vcpt2fDnI5tDnXulWFH0A0YKLsZ6qXnXqb lAuurIrl GO/34bJ+SsBLMYa2i2Lphy/zBttjMElbnxBwo3xOtQz2gcmb8Jo5prwp55eXHa4ze1aWiD8tPwDuR+8Bd1nwJMbXu74oKzjDNj/T4kzzO0GrBmBkVzbUVzISKlR8ev342Rqq6sVxel5GOaX+r9ouAVT1mJZaIhldC+RfKsvnpuOADPW7FitXEQSdFgL2/sfGTtXA28mCTZSxR09iiwfAHL5m8QReq+eaMVJOynIur5kQ0gcDSWVwGPE+OT1okkMppFFiFUThzBHaNZh6MbyTYc+Cv1vHOjdyw/YbbmouqmFxfQXUeZ5KFec4C1Hzt4olU9RLb 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: zswap_store() will now process and store mTHP and PMD-size THP folios. This change reuses and adapts the functionality in Ryan Roberts' RFC patch [1]: "[RFC,v1] mm: zswap: Store large folios without splitting" [1] https://lore.kernel.org/linux-mm/20231019110543.3284654-1-ryan.roberts@arm.com/T/#u This patch provides a sequential implementation of storing an mTHP in zswap_store() by iterating through each page in the folio to compress and store it in the zswap zpool. Towards this goal, zswap_compress() is modified to take a page instead of a folio as input. Each page's swap offset is stored as a separate zswap entry. If an error is encountered during the store of any page in the mTHP, all previous pages/entries stored will be invalidated. Thus, an mTHP is either entirely stored in ZSWAP, or entirely not stored in ZSWAP. This forms the basis for building batching of pages during zswap store of large folios, by compressing batches of up to say, 8 pages in an mTHP in parallel in hardware, with the Intel In-Memory Analytics Accelerator (Intel IAA). Also, addressed some of the RFC comments from the discussion in [1]. Co-developed-by: Ryan Roberts Signed-off-by: Signed-off-by: Kanchana P Sridhar --- mm/zswap.c | 234 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 172 insertions(+), 62 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index 6c5c656ec282..7a712be2f3cb 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -884,7 +884,7 @@ static int zswap_cpu_comp_dead(unsigned int cpu, struct hlist_node *node) return 0; } -static bool zswap_compress(struct folio *folio, struct zswap_entry *entry) +static bool zswap_compress(struct page *page, struct zswap_entry *entry) { struct crypto_acomp_ctx *acomp_ctx; struct scatterlist input, output; @@ -902,7 +902,7 @@ static bool zswap_compress(struct folio *folio, struct zswap_entry *entry) dst = acomp_ctx->buffer; sg_init_table(&input, 1); - sg_set_folio(&input, folio, PAGE_SIZE, 0); + sg_set_page(&input, page, PAGE_SIZE, 0); /* * We need PAGE_SIZE * 2 here since there maybe over-compression case, @@ -1394,36 +1394,83 @@ static void zswap_fill_folio(struct folio *folio, unsigned long value) /********************************* * main API **********************************/ -bool zswap_store(struct folio *folio) + +/* + * Returns true if the entry was successfully + * stored in the xarray, and false otherwise. + */ +static bool zswap_store_entry(struct xarray *tree, + struct zswap_entry *entry) { - swp_entry_t swp = folio->swap; - pgoff_t offset = swp_offset(swp); - struct xarray *tree = swap_zswap_tree(swp); - struct zswap_entry *entry, *old; - struct obj_cgroup *objcg = NULL; - struct mem_cgroup *memcg = NULL; - unsigned long value; + struct zswap_entry *old; + pgoff_t offset = swp_offset(entry->swpentry); - VM_WARN_ON_ONCE(!folio_test_locked(folio)); - VM_WARN_ON_ONCE(!folio_test_swapcache(folio)); + old = xa_store(tree, offset, entry, GFP_KERNEL); - /* Large folios aren't supported */ - if (folio_test_large(folio)) + if (xa_is_err(old)) { + int err = xa_err(old); + + WARN_ONCE(err != -ENOMEM, "unexpected xarray error: %d\n", err); + zswap_reject_alloc_fail++; return false; + } - if (!zswap_enabled) - goto check_old; + /* + * We may have had an existing entry that became stale when + * the folio was redirtied and now the new version is being + * swapped out. Get rid of the old. + */ + if (old) + zswap_entry_free(old); - /* Check cgroup limits */ - objcg = get_obj_cgroup_from_folio(folio); - if (objcg && !obj_cgroup_may_zswap(objcg)) { - memcg = get_mem_cgroup_from_objcg(objcg); - if (shrink_memcg(memcg)) { - mem_cgroup_put(memcg); - goto reject; - } - mem_cgroup_put(memcg); + return true; +} + +/* + * If the zswap store fails or zswap is disabled, we must invalidate the + * possibly stale entries which were previously stored at the offsets + * corresponding to each page of the folio. Otherwise, writeback could + * overwrite the new data in the swapfile. + * + * This is called after the store of the i-th offset in a large folio has + * failed. All zswap entries in the folio must be deleted. This helps make + * sure that a swapped-out mTHP is either entirely stored in zswap, or + * entirely not stored in zswap. + * + * This is also called if zswap_store() is invoked, but zswap is not enabled. + * All offsets for the folio are deleted from zswap in this case. + */ +static void zswap_delete_stored_offsets(struct xarray *tree, + pgoff_t offset, + long nr_pages) +{ + struct zswap_entry *entry; + long i; + + for (i = 0; i < nr_pages; ++i) { + entry = xa_erase(tree, offset + i); + if (entry) + zswap_entry_free(entry); } +} + +/* + * Stores the page at specified "index" in a folio. + */ +static bool zswap_store_page(struct folio *folio, long index, + struct obj_cgroup *objcg, + struct zswap_pool *pool) +{ + swp_entry_t swp = folio->swap; + int type = swp_type(swp); + pgoff_t offset = swp_offset(swp) + index; + struct page *page = folio_page(folio, index); + struct xarray *tree = swap_zswap_tree(swp); + struct zswap_entry *entry; + unsigned long value; + + if (objcg) + obj_cgroup_get(objcg); if (zswap_check_limits()) goto reject; @@ -1435,7 +1482,7 @@ bool zswap_store(struct folio *folio) goto reject; } - if (zswap_is_folio_same_filled(folio, 0, &value)) { + if (zswap_is_folio_same_filled(folio, index, &value)) { entry->length = 0; entry->value = value; atomic_inc(&zswap_same_filled_pages); @@ -1443,42 +1490,20 @@ bool zswap_store(struct folio *folio) } /* if entry is successfully added, it keeps the reference */ - entry->pool = zswap_pool_current_get(); - if (!entry->pool) + if (!zswap_pool_get(pool)) goto freepage; - if (objcg) { - memcg = get_mem_cgroup_from_objcg(objcg); - if (memcg_list_lru_alloc(memcg, &zswap_list_lru, GFP_KERNEL)) { - mem_cgroup_put(memcg); - goto put_pool; - } - mem_cgroup_put(memcg); - } + entry->pool = pool; - if (!zswap_compress(folio, entry)) + if (!zswap_compress(page, entry)) goto put_pool; store_entry: - entry->swpentry = swp; + entry->swpentry = swp_entry(type, offset); entry->objcg = objcg; - old = xa_store(tree, offset, entry, GFP_KERNEL); - if (xa_is_err(old)) { - int err = xa_err(old); - - WARN_ONCE(err != -ENOMEM, "unexpected xarray error: %d\n", err); - zswap_reject_alloc_fail++; + if (!zswap_store_entry(tree, entry)) goto store_failed; - } - - /* - * We may have had an existing entry that became stale when - * the folio was redirtied and now the new version is being - * swapped out. Get rid of the old. - */ - if (old) - zswap_entry_free(old); if (objcg) { obj_cgroup_charge_zswap(objcg, entry->length); @@ -1512,7 +1537,7 @@ bool zswap_store(struct folio *folio) else { zpool_free(entry->pool->zpool, entry->handle); put_pool: - zswap_pool_put(entry->pool); + zswap_pool_put(pool); } freepage: zswap_entry_cache_free(entry); @@ -1520,16 +1545,101 @@ bool zswap_store(struct folio *folio) obj_cgroup_put(objcg); if (zswap_pool_reached_full) queue_work(shrink_wq, &zswap_shrink_work); -check_old: + + return false; +} + +/* + * Modified to store mTHP folios. Each page in the mTHP will be compressed + * and stored sequentially. + */ +bool zswap_store(struct folio *folio) +{ + long nr_pages = folio_nr_pages(folio); + swp_entry_t swp = folio->swap; + pgoff_t offset = swp_offset(swp); + struct xarray *tree = swap_zswap_tree(swp); + struct obj_cgroup *objcg = NULL; + struct mem_cgroup *memcg = NULL; + struct zswap_pool *pool; + bool ret = false; + long index; + + VM_WARN_ON_ONCE(!folio_test_locked(folio)); + VM_WARN_ON_ONCE(!folio_test_swapcache(folio)); + + if (!zswap_enabled) + goto reject; + /* - * If the zswap store fails or zswap is disabled, we must invalidate the - * possibly stale entry which was previously stored at this offset. - * Otherwise, writeback could overwrite the new data in the swapfile. + * Check cgroup limits: + * + * The cgroup zswap limit check is done once at the beginning of an + * mTHP store, and not within zswap_store_page() for each page + * in the mTHP. We do however check the zswap pool limits at the + * start of zswap_store_page(). What this means is, the cgroup + * could go over the limits by at most (HPAGE_PMD_NR - 1) pages. + * However, the per-store-page zswap pool limits check should + * hopefully trigger the cgroup aware and zswap LRU aware global + * reclaim implemented in the shrinker. If this assumption holds, + * the cgroup exceeding the zswap limits could potentially be + * resolved before the next zswap_store, and if it is not, the next + * zswap_store would fail the cgroup zswap limit check at the start. */ - entry = xa_erase(tree, offset); - if (entry) - zswap_entry_free(entry); - return false; + objcg = get_obj_cgroup_from_folio(folio); + if (objcg && !obj_cgroup_may_zswap(objcg)) { + memcg = get_mem_cgroup_from_objcg(objcg); + if (shrink_memcg(memcg)) { + mem_cgroup_put(memcg); + goto put_objcg; + } + mem_cgroup_put(memcg); + } + + if (zswap_check_limits()) + goto put_objcg; + + pool = zswap_pool_current_get(); + if (!pool) + goto put_objcg; + + if (objcg) { + memcg = get_mem_cgroup_from_objcg(objcg); + if (memcg_list_lru_alloc(memcg, &zswap_list_lru, GFP_KERNEL)) { + mem_cgroup_put(memcg); + goto put_pool; + } + mem_cgroup_put(memcg); + } + + /* + * Store each page of the folio as a separate entry. If we fail to store + * a page, unwind by removing all the previous pages we stored. + */ + for (index = 0; index < nr_pages; ++index) { + if (!zswap_store_page(folio, index, objcg, pool)) + goto put_pool; + } + + ret = true; + +put_pool: + zswap_pool_put(pool); +put_objcg: + obj_cgroup_put(objcg); + if (zswap_pool_reached_full) + queue_work(shrink_wq, &zswap_shrink_work); +reject: + /* + * If the zswap store fails or zswap is disabled, we must invalidate + * the possibly stale entries which were previously stored at the + * offsets corresponding to each page of the folio. Otherwise, + * writeback could overwrite the new data in the swapfile. + */ + if (!ret) + zswap_delete_stored_offsets(tree, offset, nr_pages); + + return ret; } bool zswap_load(struct folio *folio) From patchwork Fri Aug 16 05:48:04 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: 13765456 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 CAB67C3DA4A for ; Fri, 16 Aug 2024 05:48:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E3CCE8D004C; Fri, 16 Aug 2024 01:48:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DC3878D002B; Fri, 16 Aug 2024 01:48:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C16DA8D004C; Fri, 16 Aug 2024 01:48:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 9C5708D002B for ; Fri, 16 Aug 2024 01:48:15 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 4DFBCC1927 for ; Fri, 16 Aug 2024 05:48:15 +0000 (UTC) X-FDA: 82457028150.21.AB6E4C2 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by imf25.hostedemail.com (Postfix) with ESMTP id 381C1A0002 for ; Fri, 16 Aug 2024 05:48:13 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="BZAQOl/j"; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf25.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 198.175.65.11 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723787238; a=rsa-sha256; cv=none; b=QBvt9xY20Pu2nlMnTa9+S/f47gRzprDFW01YmyQ3cJdxuaddNJCuSPgmixRiobCrUxGeBy fET2qsFiPJn1+AHa0C2QYkwGu7fPyCXGwQAJLyUqEO3GhGRUYggvHsL+xRbRoQzGbkRpZZ 7dJqYzi6xANdOb1c7AsXQD2S4+miLJ8= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="BZAQOl/j"; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf25.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 198.175.65.11 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723787238; 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=lGWbhjtSJVg8G5Ir1pHmR/keo5/N7hZqSr5qDj7PThk=; b=45g/hCRaa1NIJ3DW7fCrOPtvwhy761YDRbaqxIsbTnUss2E8ouwtZsVSY0Uv35ctjyUPD6 +etzghLcAKdeB9NJd6YbOsOdF/rZuKbgWcFWzoQZ7DUMSkCl6WaavUmjyPPeN+IKo8/s2o 5sPw+dZtoYqVqod/jJGSPb/Iwe7qVYc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723787293; x=1755323293; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Rhd+o6cIvQZsonqH5BjtpwXRBNEn4sYl6ZxLr6ObqFU=; b=BZAQOl/jpsch4hFlnyMO3I8g3VSW38tJ2yQ5Q/WUDHOEBuujUskSChdC LugOH/Nu5/yRrPSbr/GlKXvnASClNtTiyADeqpdYViOpI1vG88blfejFA kiKV9CQ2WVA0NDnaKTfmyeG1iTihKWvqzAR9GFpWF3jovjAD4QrK9K8cM SyGM92EqEDR9gC9oQQ6Nyz1Drv3aXg3pn9tAIMevb0teJNzO2F91WDUnd w7foZmnOiQSS8WmgLW6B+txBsDkpL2D254NAwJJZB/aNc9G1f8OTLi8AS j20MvTRa4dzSTDREnZZptYEKsONofvVcs1rVs2nlPJkEO6M0F1KNAKQrl A==; X-CSE-ConnectionGUID: ZYjXHyuTSSqmajzUHwXzcw== X-CSE-MsgGUID: 5Djrwoy1Sw2GUVVIXA8zKg== X-IronPort-AV: E=McAfee;i="6700,10204,11165"; a="32648126" X-IronPort-AV: E=Sophos;i="6.10,150,1719903600"; d="scan'208";a="32648126" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Aug 2024 22:48:07 -0700 X-CSE-ConnectionGUID: QU3cm6lVSTygm9MQstxIWw== X-CSE-MsgGUID: 2AV6aJjrTpmXJ/AXuljOAw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,150,1719903600"; d="scan'208";a="59415339" Received: from jf5300-b11a338t.jf.intel.com ([10.242.51.6]) by orviesa010.jf.intel.com with ESMTP; 15 Aug 2024 22:48:06 -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 v2 3/4] mm: Add MTHP_STAT_ZSWPOUT to sysfs per-order mthp stats. Date: Thu, 15 Aug 2024 22:48:04 -0700 Message-Id: <20240816054805.5201-4-kanchana.p.sridhar@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240816054805.5201-1-kanchana.p.sridhar@intel.com> References: <20240816054805.5201-1-kanchana.p.sridhar@intel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 381C1A0002 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 8b77na3nf5h8cotiwjksbmnith3rce6n X-HE-Tag: 1723787293-315992 X-HE-Meta: U2FsdGVkX1+am1ftCHPwzqUl1YFshlbLaMss+6fJfvRXzFfkS+sPCdg/EQCHXrbQ7E0XXiJBJ0FDn44CjOX7F63olgSkbQqyMgM/rfIftmLykp5RpAGBjJc36s/M0hKnjf8CyT1LMHsN4iCEG1+7xIyBh6laSk/Hz5AitKWavG+Lst186wgw9iVEn6o5edI1tjR+IPV8dmy7s5hWhfFV9NFD2I4ZRb/HoAMmw9tQOTQoIcJlKRM4E6vvLr7QnUpF22VHa7cYINs1FlM0ny0G2AmzJkcvm0jmOyDWua5aXxqdS9vMf7DS8eNF6/mG5GOiN5HVcQSP4WktsQwV1TO183WBoZGYRyrzXWSbS6gSMYkVN8RGPVTdX8otQoavPTjuFxeOx8VH1ou7QI7ZWA2cYdXZIqPMq1W0GyA3mf5M8kY9wQrQcFHFD4Z1ijqgGeXbkhx0o+cTs8k/7wBujarBU1wPqU436smPolyQNl2/2YE+lm1mbfvLFwk6jHwrmeTw83TuPtfgSVvv485r1bpnYGXRwHuT08ldkjEax61yEGLIi4NzDnnQMcRRlN31UpofhQYF+zojvQVT0FVLVuwJH7tQe93IJRV6GT2/vYcuR3NRxT9ZvT/UOVwJIESvMmL4XK8f+n4cKfhvYPUyIQMmouJQG2eI+nU/DljYIVuDMXzQd4kR+sTvIiHF2ZbzpLxPil7sOO7ptm9/MfMTTkeG0yhAaXLpYovznj1HZFHFRfr/jcRd7OWduHgZa1cqH8Gmv+BIych89Sw+2bB4YXioF5ZrSRQAXHJq4mLCDi28LqKUAWvm1T39inrc3fi6bz1ZSS/ThSUcqtOCenmBi5Ly8Vqdc8KjyBI0X7FXzuM77P7FpWY+lSN9di4o70rGvdHphzCV6cflsdqqciqtvJmngIYTnS8i00NVqcMtrMC3/pg3Qla/6X9wMPgHwoyRuieZunDCbzSiKWL/c5XAN1b R3MJpi5j XLJraFQ+2ggxEWhl7ZtqIQpnYHLThabWL9f4U7l66++hvqYalo3jQEabb9fb1uHveAu6b1CMnQP+NxLvuWohWYi0G9TWcdh6ifyxWRpEaO7/MqDnvelg/44d5Yq37PY1l4s8AbJ1P5zLtVLFGk2wLmw52+a9wk1yY/hkVKe7agzSRA7YbwDaIG1Q7vrzHz3QAxLEmUKRU7WKCUXY= 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: Add a new MTHP_STAT_ZSWPOUT entry to the sysfs mTHP stats so that per-order mTHP folio ZSWAP stores can be accounted. Signed-off-by: Kanchana P Sridhar --- include/linux/huge_mm.h | 1 + mm/huge_memory.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index e25d9ebfdf89..44609d84f2dd 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -273,6 +273,7 @@ enum mthp_stat_item { MTHP_STAT_ANON_FAULT_ALLOC, MTHP_STAT_ANON_FAULT_FALLBACK, MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE, + MTHP_STAT_ZSWPOUT, MTHP_STAT_SWPOUT, MTHP_STAT_SWPOUT_FALLBACK, MTHP_STAT_SHMEM_ALLOC, diff --git a/mm/huge_memory.c b/mm/huge_memory.c index f4be468e06a4..7e97b6ed6ff1 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -574,6 +574,7 @@ static struct kobj_attribute _name##_attr = __ATTR_RO(_name) DEFINE_MTHP_STAT_ATTR(anon_fault_alloc, MTHP_STAT_ANON_FAULT_ALLOC); DEFINE_MTHP_STAT_ATTR(anon_fault_fallback, MTHP_STAT_ANON_FAULT_FALLBACK); DEFINE_MTHP_STAT_ATTR(anon_fault_fallback_charge, MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE); +DEFINE_MTHP_STAT_ATTR(zswpout, MTHP_STAT_ZSWPOUT); DEFINE_MTHP_STAT_ATTR(swpout, MTHP_STAT_SWPOUT); DEFINE_MTHP_STAT_ATTR(swpout_fallback, MTHP_STAT_SWPOUT_FALLBACK); DEFINE_MTHP_STAT_ATTR(shmem_alloc, MTHP_STAT_SHMEM_ALLOC); @@ -587,6 +588,7 @@ static struct attribute *stats_attrs[] = { &anon_fault_alloc_attr.attr, &anon_fault_fallback_attr.attr, &anon_fault_fallback_charge_attr.attr, + &zswpout_attr.attr, &swpout_attr.attr, &swpout_fallback_attr.attr, &shmem_alloc_attr.attr, From patchwork Fri Aug 16 05:48:05 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: 13765458 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 1EBC9C531DF for ; Fri, 16 Aug 2024 05:48:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1E27A8D004E; Fri, 16 Aug 2024 01:48:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 11DA48D002B; Fri, 16 Aug 2024 01:48:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E8BF58D004F; Fri, 16 Aug 2024 01:48:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id B7F9B8D002B for ; Fri, 16 Aug 2024 01:48:17 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 7A0FFA18E9 for ; Fri, 16 Aug 2024 05:48:17 +0000 (UTC) X-FDA: 82457028234.11.9E52D37 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by imf25.hostedemail.com (Postfix) with ESMTP id 68226A0002 for ; Fri, 16 Aug 2024 05:48:15 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=HGRPTu1O; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf25.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 198.175.65.11 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723787241; a=rsa-sha256; cv=none; b=IEo096JKziXiM7TAg+Ysfxum32sp07ooZPwtTag8/q7YudXrlKvSIBvzqR3Mit3Rb/WYfP uDE7Ik8tZeYlR2E9jfx5cczY8/+1j1riWHKMnLppE7JSCvwqOpV5245yA+eIc7MCx6krL+ RM9a43QGnpuIesFI2XN6RweW1VrO9Jo= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=HGRPTu1O; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf25.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 198.175.65.11 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723787241; 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=Hv0pZRH2O3uWuKJq4mHJ3ytAE+yKARc7SzdSBN4A/oo=; b=LAQ+7n9C3ASRaJotr5qFywYuDr8/562Yblz75VhZm2YIih7wLAa7dcg9K4wbaANQbXqc/N lmVrgvNPeEWgI0oACqUVY9LCRdZbWqANAO+e9PT/n872xCg/wBXWA6sK2L2CpzKUwIsfsD l8S2HU2XZOWNsFXQi+dmY/xEgICiVbc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723787295; x=1755323295; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pIv8/Aymq35M3mk+Ip2dqi+IlPE8wYobMr4oum9ku1Y=; b=HGRPTu1Oe8QrImszGskbcntKH3eUgH5j5FHB3Bh7fm+OtSNyDLvMO/JL Ig70JGySp24c+KZ5Ubv/Vcc1TmwZbM1nbr8F6PFX+n/PoQpEhCXduAOeT fuMSOCfA9fKdwRwB2OeYfrAOK1LQzpLk5BrzOT988Wh224DLf+Xv79b/X +FAF80a/gLF0DsDCIKQ+dqN4za71JmEu+ORo+ISEZmgjo5/qBA1AjLJot M25rNfLj6kC/FFchNpC4yX7S4KZ7cpxHkWYMmmURrhW7ia/QFQpPCGIlY rvQJBMPr1xWSUgauqrcA0c/Z7Rtuwgys1QFMwRTyv6f6Z8fshKvBbO9j1 A==; X-CSE-ConnectionGUID: 6OCj4NYlTNG/+9XY+1ILpg== X-CSE-MsgGUID: JNxzGQ/3RRK7VPQ+x22ehA== X-IronPort-AV: E=McAfee;i="6700,10204,11165"; a="32648137" X-IronPort-AV: E=Sophos;i="6.10,150,1719903600"; d="scan'208";a="32648137" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Aug 2024 22:48:07 -0700 X-CSE-ConnectionGUID: Lw57TrXiShu8ilNs3A/XgQ== X-CSE-MsgGUID: YVfs9eGNSDGbKoVTja+gQw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,150,1719903600"; d="scan'208";a="59415342" Received: from jf5300-b11a338t.jf.intel.com ([10.242.51.6]) by orviesa010.jf.intel.com with ESMTP; 15 Aug 2024 22:48:06 -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 v2 4/4] mm: swap: Count successful mTHP ZSWAP stores in sysfs mTHP stats. Date: Thu, 15 Aug 2024 22:48:05 -0700 Message-Id: <20240816054805.5201-5-kanchana.p.sridhar@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240816054805.5201-1-kanchana.p.sridhar@intel.com> References: <20240816054805.5201-1-kanchana.p.sridhar@intel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 68226A0002 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: co1r5yifengrnyw47xgx3p1mjjfpu7kg X-HE-Tag: 1723787295-179790 X-HE-Meta: U2FsdGVkX184NRxhve1piEYw0ykPAk+lScsNAVr6EFX0pBclyvj766fII6T6eWtm1SCAsjD7iOTC0zX9hRmlDvP/8XoxAjUltYAIjbkmW9MbRjnb5n5U6ovC8ukt9JoG2RhjY62YASrTtza5JedVAdDtlWbkbUYbCV5mutnjSoApcFwfL7DI9scVr9J8LVt8IjNZx+gA+jDKkA0KnpHPJlwgqCYB6HMMD6EvJD53ckc0Q1NR3w0HAgJRQEnxwpuyqew2Fu17fKf1W81TVPLyxTbvYmpe7vRgzO7wdbo0imM+SsRWrCw631/ns6MTs1P4RTXcnWj4HenBBbomO7SJylnc5U1O7YzkcVBxg7Evsu8KMpH3Gch5aqcCr3mLH2yzPxdKiTICieCkVRn3wIvW78R8wuoc/RKBdVcEbu+hNm8zPuvjVaxIHhBAF6cJ+yDuKYUgwVfB9k60NnWZDfPqV2I5hbFsYZ7ip9CgNTIojINfLOfYTMhwuRtEAGwDJIQyJe3CaDiRUK/stuUY3f6k3E4WXjQyUz4UIil3UrvfJ0WaqG66hDlcJte3IugSq8TegtOKp1WEqPwltxVZTlFcRPJOBzsunK67/92xPVoidpJKaGN+1Dyw/REgCpuOxBjjQsFi8GdGcsrCvGDMdWOYCDjuEHO/3WjkuisBbxU+m+nzFybCb2zPKKAUAEtw0xBY7nCu1WN3xFqGFOhNhdXeVI+nw6l/tazlc9eGKNWxgQl4m4mZpYpDSQ09o14U9KiAO4P/o+lQGH+GFXDwlfOy/IRP9zFgmXdUVIjCcf0Q1vEzMjLpyHV7DVIIgmEHI6t29q7z5dnNUxEzLWzVEJDjzyKe3gwDGLSrXDXT1lvpJquzxZnAyS0/5QLfXcfJgFhq+jUqkB19Wu9AJt9Lab9TAGe1qLRBkgCJLZv1lYTbmnQJJV73eDmVbOq34ExbfgYyxJ8Z5KUkK+r6jMTeAU8 8aPhOJMQ Nsc4aMKLAcuOaYLunfMSZqVFRro6VIpgyPXGgiyrRBbcwOUlBC2E4aWLkGfOEv0m2pSB0UYsL7bx8kWO+F9FQ8UBekvaILpnirLvOm8fJecWaOH9f/XuLuK/LNKDX3r8TPmGOyvlOC98Y2JHAUaNXQXn4og== 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 stores 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 Signed-off-by: Kanchana P Sridhar --- mm/page_io.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mm/page_io.c b/mm/page_io.c index ff8c99ee3af7..debd04fbdfd0 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -172,6 +172,12 @@ int generic_swapfile_activate(struct swap_info_struct *sis, goto out; } +static inline void count_mthp_zswpout_vm_event(struct folio *folio) +{ + if (IS_ENABLED(CONFIG_THP_SWAP)) + count_mthp_stat(folio_order(folio), MTHP_STAT_ZSWPOUT); +} + /* * We may have stale swap cache pages in memory: notice * them here and get rid of the unnecessary final write. @@ -196,6 +202,7 @@ int swap_writepage(struct page *page, struct writeback_control *wbc) return ret; } if (zswap_store(folio)) { + count_mthp_zswpout_vm_event(folio); folio_unlock(folio); return 0; }