From patchwork Mon Aug 19 02:16:18 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: 13767723 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 E99ADC5321D for ; Mon, 19 Aug 2024 02:16:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 751366B0085; Sun, 18 Aug 2024 22:16:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6B2A26B0088; Sun, 18 Aug 2024 22:16:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4B81C6B0089; Sun, 18 Aug 2024 22:16:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 2F97A6B0085 for ; Sun, 18 Aug 2024 22:16:27 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D758CC0B77 for ; Mon, 19 Aug 2024 02:16:26 +0000 (UTC) X-FDA: 82467380772.12.71EB268 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by imf28.hostedemail.com (Postfix) with ESMTP id BE2A7C0018 for ; Mon, 19 Aug 2024 02:16:24 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=Vb3sOVRb; 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=1724033708; 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=HVbxgbaLuIkv/t+1nckM1WyTgPV4PHYSrdazdOCSElg=; b=jo1J3OFYLK6GtMcvZMVP7BQr5OCHgd/I0xUqfLWfYBalV/qsYrufXfVHCbKocXxcb3jKq6 fkKhIpccU9rPIk89EgDOq6sjqJaVGyY6bOpDAjoWs9+p/jcJ1nsiRVowgpup7Q/SLr7+ay J9mkdUnI8Wqy/qU3a+19xwlNd9p5YxI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724033708; a=rsa-sha256; cv=none; b=IjRCFb39hhIPKAh9dNo3FLVxAAUN2gTzPukTiMNQ8f16aKVOgRHP62rWQHDqdUlfly2vMT sHfXPdIeWmpfamB2eTH+iNb4hxFfDBkEYWdVuRoPVMPRGqSu9L76IolNMXhekLzmqsawBj Hs5TtDQnz1Wpg6+kK1SD50OFTMrXF4s= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=Vb3sOVRb; 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=1724033785; x=1755569785; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=i9i0GU1tqbl+gZG9rdF1xrCDy8bSikrdWFFB2p3UFUw=; b=Vb3sOVRbDYJL29ClXUDUkuEtuuYV2XMA+jrynajBdvrdpCHqPwJLJQW5 3DgYgEniJsf/dMbIztkp2H5F6sl7rraKmzGmIN0FeawLXUBuwL0w7/E8+ Onz/Y8xv04QhyLEu14+lCJmv6OETE/afJzDz8t1yCX9lotQKlLQwcuaD1 ieUNi9tSTdxwFeMseWYnX11GJNmjYSyiGoZvCppHbSg3lsmx2G3igExvy d8yonF07F9qGM/7cOhSNFrQK0Hmz9MrKHSk6b25/mCK4OOYMt8Mv6eovw kIYYA8owJtulTtlTF59uK5YgElZaHDmtTExkir2QnLT1F4BdrVwFOfYf1 w==; X-CSE-ConnectionGUID: urbN5WG6RkyPTohU4iqdxw== X-CSE-MsgGUID: a5iDXdo1QVuRUDvDJrFoxQ== X-IronPort-AV: E=McAfee;i="6700,10204,11168"; a="44782960" X-IronPort-AV: E=Sophos;i="6.10,158,1719903600"; d="scan'208";a="44782960" 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:23 -0700 X-CSE-ConnectionGUID: wUHvjw1jTIGDkmypoq16Tw== X-CSE-MsgGUID: R4qRuZDVT/aLemdFg0NPEQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,158,1719903600"; d="scan'208";a="64610270" Received: from jf5300-b11a338t.jf.intel.com ([10.242.51.6]) by fmviesa005.fm.intel.com with ESMTP; 18 Aug 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, 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 1/4] mm: zswap: zswap_is_folio_same_filled() takes an index in the folio. Date: Sun, 18 Aug 2024 19:16:18 -0700 Message-Id: <20240819021621.29125-2-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: BE2A7C0018 X-Stat-Signature: taacad1b4nw3qt8s4x3cxnhwakik33kw X-HE-Tag: 1724033784-176173 X-HE-Meta: U2FsdGVkX1/3m7+WXF1+n05JmUQ60niAR3tbe7KqhesVM3OWZNGyn85A2mVTRYyitQx5ck3C0Vs/XLomVSNg4daGjlsvV+0oN3AVY2NdEH8inXN7YalkhmAk1uOLjwmXEWXV93MzX6/wkDLgdx7iOd2XpxIK/kIotw6wGAidZQsELh+Q4X9Sl5sbmTLA4z+RyRPpNS2mlJcvm97ELNyKBUb1fAY7Tv+IeycZptP3V3gqO1OTEgxfJasN8nfXCVFVSc60k/TVPeuzaHH7wniTcbRs4xWJR63a4d7uH9ewi/fqqQMc/RH+g5JdzHtoebvgox0CuGyYDDsnvaBkEJZnkU4/kVTJYDigEwMhhTbUoX4jz/4l/Kw0Z4EsL/JG5GaOlgGD1D4HdFzbEkyS7P5OcAg5WhdJbggeUfgq6r5J2AoGpK4GFPL+StGwNi+CP8sC1tHlO3dwwKl/LyziWtp6H9rTGAFiJVKCm9TbZKPP/Z/XLhsQBRgDaF8Z4Tok+HuyoQ9n8+Ql749eA+98YeAREGDcGvk5YqXTrt58oF/TBcjGBW8Yoxhe2u4hQWphvLg7weqMB5NOlru4HtWeoDlQKaI7VrfXeWbp7VPGLobbllJpmORYHlJvmXFYOm9HO/NiqpNd47WlQIw3GKszFj+iiZGS/+3nahNwnnIJgwsX/O4Nd8ZzVekjjMa5zYLCJy0Lbh0pFJUl7oklEhYL+LERdWuImrJoUlAEDhQv/y/GFCvuKMlM3IEOPGY8wmJFRaWShIFqnjODNmFXUtGYBokQL5kKD/Rona9gUYWF05V3As1NLDrEUcEidIux7g8wicZMlEpoR25mDCQoqtCVI2xM1I/H2U2WYqF9wsybfEm2h0WRFxoO4rmAg2zRNcJsAvcT0WOHKePoy8vzl0WB/qctfu3ltggRZpwAIIKdvk5K4bOXQu3ODzRCTEN9UCvxmWzclqaEN6Gx6lmmtdxFYkY 2yk1phym pI5hQ9NIQvgCpC+WEJ4TgT0SJgp2Rzmq//t56DKKwho6GhqRqWI+1Fa/wzhumZ9dB5lopBN22uVB6MJRj4XZxIeV02pM+hmC0JnRSVmIxc3xJGbg3QlQw5GZ0KHHeWIgBbPdrhhVZycvkPRD2qR7irWAZDl9KyAGRphttJM5hy/XAo5rnD24+OKw0ajxxr+jgx2A40U9uW9rJVg4= 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 df66ab102d27..6434e76a4ea3 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -1419,14 +1419,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]) @@ -1496,7 +1496,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);