From mboxrd@z Thu Jan 1 00:00:00 1970 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 0DEA9C54E58 for ; Thu, 21 Mar 2024 23:53:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 958266B0088; Thu, 21 Mar 2024 19:53:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 90AAA6B0093; Thu, 21 Mar 2024 19:53:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7CFBE6B0095; Thu, 21 Mar 2024 19:53:27 -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 6A7906B0088 for ; Thu, 21 Mar 2024 19:53:27 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 39D52A01A2 for ; Thu, 21 Mar 2024 23:53:27 +0000 (UTC) X-FDA: 81922700454.20.E89C0F8 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf25.hostedemail.com (Postfix) with ESMTP id 94FE1A0020 for ; Thu, 21 Mar 2024 23:53:25 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=EwYMi7iG; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf25.hostedemail.com: domain of chrisl@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=chrisl@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711065205; 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-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=6s0bdMYdTeIo9WlXxEixCvPs0eNHdGzOWGm8mcKdNyc=; b=fPri/Z6LOU3GgWsjT7a6S8xRyM4P9exLPRw52hgKMkwPrS3ULvPlH2pMbxGVbGOcxYdk86 /UqLw6u+I6NJ0zO8/MTNoBq3zVD2ttQs17WMYzwVg84hJ8GcomUKP0BoDP5hgSEt4GfLRo JO8y4tNVZujsZyvO3BJvS0OhXFNbqX8= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=EwYMi7iG; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf25.hostedemail.com: domain of chrisl@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=chrisl@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711065205; a=rsa-sha256; cv=none; b=rteOJCD0X0/rgRzqOZoXFYgFxKwDipS1yMFdcBZt5WPsaXXf+1jBi69drjesQ58GKuJKMh x11y0+mGnoJdNO49Rqjav93SujZOMVbvu1uI+vnr5SG/Ua9keLrvcs6VcUAMAmgaN0tEWm de3ZqtS+jtRoMVAAhelIwsEg1sWneP8= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 8D4DE60F53; Thu, 21 Mar 2024 23:53:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E8EB0C433C7; Thu, 21 Mar 2024 23:53:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711065204; bh=btGZzD1NGaWl5rIl1fGIHLafZR6K2hXr+pUs+/6xQ04=; h=From:Date:Subject:To:Cc:From; b=EwYMi7iG7QWryLlhggsH0fDY5JjvXm8l1nyjC/vY10MDmqPAkczLUmBRrI/K4oTUl QLgYAVTFpm1LrTJFuUzwADY2YVDrW7jyzT2jk8edq99+EZauOV1GbMpels6jc+vMrL gaAFhkAXke4mdSN/PYE+BGEerwwEf6IguJ3lrSlW67G+pnzRcXCf9MMdRlSSikud+f K+s8l5lyFA4uHyXPE53SrX4Mo3PhCVKAM+5LYpUM+kQa65rdJCX27B5RljYM327yj3 7m4F2BJHG8YhAMePGWNwtGmAnjlDy5qms4RNRPLvRw+9Hv100XkQyv1+p2z17JK5XS mWhd7wy2oYr4Q== From: Chris Li Date: Thu, 21 Mar 2024 16:53:17 -0700 Subject: [PATCH] zswap: initialize entry->pool on same filled entry MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20240321-zswap-fill-v1-1-b6180dbf7c27@kernel.org> X-B4-Tracking: v=1; b=H4sIAGzI/GUC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDIxMDY0NT3ari8sQC3bTMnBzdNDPTNBMTU3MTczMDJaCGgqLUtMwKsGHRsbW 1AHATTS5cAAAA To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Yosry Ahmed , Nhat Pham , Johannes Weiner , Chengming Zhou , Chris Li X-Mailer: b4 0.12.4 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 94FE1A0020 X-Stat-Signature: waj3qc7zhjr1fys1dayosjg45538ezmn X-HE-Tag: 1711065205-198217 X-HE-Meta: U2FsdGVkX180j9cwHahIY7FkbXQD9H5rEq4dPSEx3f9bMyLpwFqsxH7v/r3H218xnoiMYBO2uFafPQF71JccwUsRkWcSpRWXF+T5JTW+SsBQRlABiSzZ6nCKkrIw8Gnyg1an1TCbf0J6CjtuWq70dhHOh8+Io2zu5siYSiGMdMWtcpMZ3ZH2bDj77LPqVVBOn6w+jRHYH3JMLyiqfgHmF3Ked+50e9U0HjiV2NzuAMO4PnIhhUP2WUr0ieyb8+rgbgICl0Yu01emO4Fi8uDje9k/+/J0zKf8hOiWplv/3K+A7UNBrbYszJugCUw7JVO+IfZT7KjyaE8jsVr5u1lciE+/UJdOQ56KCv4Srp/76AgYff2pgiq6cQJTBeZRkzFV76b/U0bzChCs6+7jFCE+lbzcWodYakN2yeNgYNMgJA/AK7EuHdJXaFIS6V5MeJEQP7U7oSiaBQH8N186mb8KzKNfE6SL7ArFmMY1+oqT0UVGLL23yqBwnR9loUJypL5mRqduCA4Rd7EYOUroa7X4lJ0TlyWIJrtW4rAeUkhs8MciTm3Mpb+T7l8kku83bgSomA3QRF6ZQNbNMnu97mvnwLVzToLgUOkt1/ScVgediaHEPYpcJwvfT3Ybkf2YeXhuYN42kl7gkVTvsdzAHa+McOzTOmWCAoufYr5souvUmClZGTb1BSLkndiqth8e0s0GHiFut+nuyeLbw5quHKF/bi5jllJ5VOkvHiF7b23EDcxEHeKXx5m/hf2MAYiDuEi3WpS6LUqbaK6mB4aV4PtzKwTZh6fOXbNOoadPBWdKtRgu2rzizAVNBxB1vvk/Z5VMHotLFTu5CnTC+JQ8L4oCpGveaxDRu72akJeESxcKnZ9f8+74RWPZ1g9Y98v9QwLVykunyq/iWhz7RGKpODCz6Jy9U+DoBDoFKHwN8dW+70/W3MEXRNCqlkFTZ7QCEPDj2xT9ax5FNeVQH4DdHjA D6hkMRhL scSj7z15EqT5f97SfOV/sMv6d+YLEMidvA2WRpt3vBVpQ4glQOahcvqA7hJ9IYCdwo9LPBrBOZ8k42QdXcCoQTbOPFxOXoTXihP71BL14Ah5uTvtAcaBVQN9xzAEMQY4FcbJzp+K7WTiVpN1QdFPEf7ajkg/B3zcQ20d/vie3wlgnJTxCukYFtHOepChLgOw2vYwIqGsANPyyqEmhC+xdpGx7iBEgk5VO0WngehIdpTzXMS7U1C6JLhD6Gm3mQe4j2WDELPLCOY/MmcJx/4lulpCW9vSRVrtR/thabT9PSFjUHV0= 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: Current zswap will leave the entry->pool uninitialized if the page is same  filled. The entry->pool pointer can contain data written by previous usage. Initialize entry->pool to zero for the same filled zswap entry. Signed-off-by: Chris Li --- Per Yosry's suggestion to split out this clean up from the zxwap rb tree to xarray patch. https://lore.kernel.org/all/ZemDuW25YxjqAjm-@google.com/ --- mm/zswap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mm/zswap.c b/mm/zswap.c index b31c977f53e9..f04a75a36236 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -1527,6 +1527,7 @@ bool zswap_store(struct folio *folio) kunmap_local(src); entry->length = 0; entry->value = value; + entry->pool = 0; atomic_inc(&zswap_same_filled_pages); goto insert_entry; } --- base-commit: a824831a082f1d8f9b51a4c0598e633d38555fcf change-id: 20240315-zswap-fill-f65f44574760 Best regards, -- Chris Li