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 51ECFC4828F for ; Thu, 8 Feb 2024 13:14:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B85F36B0075; Thu, 8 Feb 2024 08:14:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B34216B007D; Thu, 8 Feb 2024 08:14:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 987656B0078; Thu, 8 Feb 2024 08:14:23 -0500 (EST) 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 875906B0074 for ; Thu, 8 Feb 2024 08:14:23 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 57AFB160EFD for ; Thu, 8 Feb 2024 13:14:23 +0000 (UTC) X-FDA: 81768680406.19.8047925 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by imf12.hostedemail.com (Postfix) with ESMTP id 376664000E for ; Thu, 8 Feb 2024 13:14:20 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b="jY/gxjve"; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf12.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.218.48 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707398061; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=5ntukh3iLbboob5RjSi1RGWl1ttcbv304nzNTDlBnME=; b=JqCJssNQHd+MySnVJa3IjJ/qudL818hhOUyzDOrQoMY6V4aFWAoOMeKwKghxPkrbqxdW3p iReY19gutIu99GS4VtpYStfbbtsYUa5pKKQxIbHCbOBFdlndv2lRWbF6qv8VSm/8Nm7rSV iq3fMH6uH/t/e3yn+wjsrvPCAzFQL2M= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b="jY/gxjve"; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf12.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.218.48 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707398061; a=rsa-sha256; cv=none; b=CdLhecBI8xe3KZyPf4BK0bU2ZcqrOvfRXRhKxFePsLnpEvCgD174aQIWoOtXZ9F6uz3N12 wRfb2S08jHl7lVzuFk3RS0T3gA/yjXzhUSTa1DAf3JSdcZSghLfraDnDs3Br49cEkVse4B RlrluRwCL7O4I//UqR3tsLvXJr+mNuA= Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-a3916c1f9b0so134620566b.1 for ; Thu, 08 Feb 2024 05:14:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20230601.gappssmtp.com; s=20230601; t=1707398059; x=1708002859; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=5ntukh3iLbboob5RjSi1RGWl1ttcbv304nzNTDlBnME=; b=jY/gxjveRvmH9qUiaxUgi0x6ekJZk6p9fVr2C4NGD5OPwr3uDyefuPuR5s0Vi6rfvp 6T3QdkcLcPe2qn4L3K7qMzanTTlqsXV9TGbelOz9J1wXXIKk/fV8+LzDnkHss3Xc2JSy J2avnT0sF97b0A3WNMdZ5i1D/w30eeNllesjMFRBcIynHrwZQRob+HwYuB0LiU6IV7pf LqvOTtquBm50FDUBWUD11/h7S0cxAqYZhoWENCOWIk0tmOc0V8i8RrBrx+jAagCdZZmG TrXRyCoOrAcu2j2QLI781gZv5ygmKm6qtM3vw1kKCH+fWDNp3BE7B0r8ZhYuMv0r2omf j64A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707398059; x=1708002859; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=5ntukh3iLbboob5RjSi1RGWl1ttcbv304nzNTDlBnME=; b=uNLgvTzpatKYXnq24WB41zgRzzaiQGiCa5iKienVxJlDAAlaOZyCLxUuA6wk4R5pkX c2AExaZmRX0Gwmewvkq5yZ27x5QyHvISQcr8Z29JSAJHjhAN1ZGHXLsDoviwO9g3kiyZ udvaZBgvYNcpmmPWxTp7wM0l5RE5Z/MacC7VHA8LugfBE6qdoQxLj1fIUa4cjJFeg6oH 7JWIjtbEnWelJm5LrDzv0hhB4tNmCo2LELfYXt3L6TxcIidsay1Vk/CBAgiajlu2E3Ty xmE62U+cq9PKTGGlRayL52zHeeZ/jB23aE6lzj6Rh2dpbk+xT7NMHpX5Kk2696/obs9U bd6Q== X-Forwarded-Encrypted: i=1; AJvYcCXuNBaTdR452JhhvDl7qhu+bn8yxUdTxy/+0K/fbu2XfEgDCsDbVDGG9BJpO6CysPiVmmGcJKoAxyDakqgF2b05WA0= X-Gm-Message-State: AOJu0Yx1w3pLFrhTbEqb5Nm5NJEfoPtgfFvyRv2p18lVHQYBG9JjhHAC w932trX6HS8SJw6CTlN3TpzDwqH/pEMDvTyxm0WkaPiuIuAZNbHX/VzzyNUVrr4= X-Google-Smtp-Source: AGHT+IFxbsmI0ElM1ZdD7KC6y7qcHLiINyUO2uqTJm0NGN+KRXLzE11VCkTZ7fcDVi5+DjtPt7PW0g== X-Received: by 2002:a17:906:80d3:b0:a38:4b2c:8178 with SMTP id a19-20020a17090680d300b00a384b2c8178mr4613591ejx.19.1707398059311; Thu, 08 Feb 2024 05:14:19 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVug2VZ27JP6E4LkCDJegC+o/d4kAvgYornjfSyauOCXVlrxA/UD7zr8dqlDJSKtVwbL2zFzOGQp3y3dmjN4bhkknQ3BNy2Z1ZenwsiKzeSrPlPRnx/UkIsoO8Umni4njI72tzxecdB8kUQVEOK5uSM0mAN/ulw5WJtjVNghnu1uD5M1MKzZLcBGkBwMAk6ZPvcuJvebPsczrnn8PcoxxF8UPtS/9ImrEp/3IxhypYE0reubPRtmf8vQpuqdqs+Ncydn7A= Received: from localhost ([2a02:8071:6401:180:f8f5:527f:9670:eba8]) by smtp.gmail.com with ESMTPSA id z22-20020a170906669600b00a3543718f5bsm24304ejo.221.2024.02.08.05.14.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Feb 2024 05:14:18 -0800 (PST) Date: Thu, 8 Feb 2024 14:14:14 +0100 From: Johannes Weiner To: chengming.zhou@linux.dev Cc: yosryahmed@google.com, nphamcs@gmail.com, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Chengming Zhou , stable@vger.kernel.org Subject: Re: [PATCH mm-hotfixes-unstable] mm/zswap: invalidate duplicate entry when !zswap_enabled Message-ID: <20240208131414.GA224435@cmpxchg.org> References: <20240207154308.bc275f3e72ec1c1fd06cf5a2@linux-foundation.org> <20240208023254.3873823-1-chengming.zhou@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240208023254.3873823-1-chengming.zhou@linux.dev> X-Rspam-User: X-Stat-Signature: ms34rbjwn5nrtnfgouec5duaesk5bu9j X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 376664000E X-HE-Tag: 1707398060-340782 X-HE-Meta: U2FsdGVkX1/iSI4tqa3mcjDtopiQ3GmTSlUNqYys/YaKjHWgPBmu9PjFat0B6KrU82c55M377/3N6L09uAo7zaX7AYNZPrbU4ZPbfNBIbeUftvuegz3X9Edz+qeYDliIcPO4+tzCnP6bXHB9CZuL4YkHdmFqgjqUs/98pFZJPSF2FlvDOr6unpclmmFtW7OUe5TKo4zOut5V7lTRJYR1pj7/bJ+3yrsncVa1XPUyI/aIM/8TmVaq29BrrylqR+yKod8NriRC/YZRSuaPUJvOWJWQ5zm7ht0w0rtzsskEQU6kaYksgPYgg6clMIHCy9mSTXQ5DdxXB1/T+z1y19kyb7OSeVcAQ7+mQHTZPtojLiPckeKPR7nv3KjYtShYTu5R8dFqpJPhUQWCxXYiQv66HQM/aOFESZ0QL1Sx9hwx/f/pH23d48jj3GNh3sT5dRRaYCkAJYb1iWaejwf5UpYGbw02DOC41Z/A+dCtIu4w+7VYRgRnPbEyZ6ab5AYzUc+LcJDSA6TsZdXOdQiqWotCDZyXjzHFsWOBLPTIT+ccwu2TXC+wgOgg8bOpo1eIycuqk/Jb9CF7mEGhMSR2RVNndASjvXZoHioJi+fz+ZxlA44NnuZm+wIDu9Rl1g7bFqyKfi7JleJFHBAVkdR6MGg/YnWwTPzs8zRbKQydJW97nNQSc/Kb21lURJqwX6Qc1q6KKnehMtxtPys24dRMvpHhiuEImtgmp6LWfw90wri/zgbtd+dpUGQyB6S1wPvxU41zB/OC3PIihqeCdu/VsMUwbl40hMLS3TdEJo0HcDnDLn87AZt9/cgiSolILITyYZCusfHermfK0FQSj0APsy3c04s+j5OMbWnFnoske9vmC+EugcZzwO0uARHxAzLCMSrpUj6k/RZ+Lmi57iqBXtLFQdYxnJki9xiA3Jo4XODvXpAZ7X5y1g1unM8KRQ4N3c8fYbqX6KSGQRcx3s9XRI/ P8NKJGkb yWZ4m5juRT9LDm2WkWTnb1Gx8vN6g0JmXgHUGQnIegWi8H1vo+pwCtlLoyE1yiQ8T4a0927qxLEUgYygwB/R4BTy7xqODX7mUYh3pLxmtukJOU5emAYHTJFpdJNcnkqlPAZxWO70tfIe+KHisFlXyGfyHHvW4g8g29YiHPdLUvGOgDThwGkmCFpSRW92LUvG5LkZyKdRZNsytzK+yhiVEeBrjaYPIXhtYy+09sE0PDBjNzqYZQHOm4dnFw5vSLajCxrzc5Wys2yb6nmyUCdqz/0JSrCrwkfVQz9QkN3g/1AYpOYF4TQDw9EWX/XnsjYGrZEmHkdaTd5UitV4yirkEK2C1bqY/OTGnPHEiywM3RthoA8z3lVmBG5lweFzn8LmfB9ImU4chYzI6Of7ytKIfpphdTYyflDBZYGu0jcnvGdVPYZVsbi/1nfxWcbRJU24+6BLB49gZl06ShKa3jiGcXxOoUkmmY1w43JZIapxqQvGvK15S+wzcBHmN/JUiMKQJPv6hQTGKa5YLMt0K5hEN8RwX1UR1cVQdDiCvdCwcZtHYlzfy9QUWeoQTNrkHhRWB4zXerpsPvWfp3sjoPCqj03/R63pvpsfPxDX1EKnLu2UsKl/D0jYL9Yrv0VhS7R+7Uvczus2alFVhHTWw7Q3Mr3bQwg63rcgIYjyWqKTcebmb3uujNEpNiWYuFb/0SDl6F9yZm0mMk9ARf6W048L2t6X/dQ== 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: On Thu, Feb 08, 2024 at 02:32:54AM +0000, chengming.zhou@linux.dev wrote: > From: Chengming Zhou > > We have to invalidate any duplicate entry even when !zswap_enabled > since zswap can be disabled anytime. If the folio store success before, > then got dirtied again but zswap disabled, we won't invalidate the old > duplicate entry in the zswap_store(). So later lru writeback may > overwrite the new data in swapfile. > > Fixes: 42c06a0e8ebe ("mm: kill frontswap") > Cc: > Signed-off-by: Chengming Zhou Acked-by: Johannes Weiner Nice, this is easier to backport and should be less disruptive to mm-unstable as well. It makes sense to me to put the optimization and cleanup that was cut out into a separate patch on top of mm-unstable. > mm/zswap.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/mm/zswap.c b/mm/zswap.c > index fe7ee2640c69..32633d0597dc 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -1516,7 +1516,7 @@ bool zswap_store(struct folio *folio) > if (folio_test_large(folio)) > return false; > > - if (!zswap_enabled || !tree) > + if (!tree) > return false; > > /* > @@ -1531,6 +1531,10 @@ bool zswap_store(struct folio *folio) > zswap_invalidate_entry(tree, dupentry); > } > spin_unlock(&tree->lock); > + > + if (!zswap_enabled) > + return false; > + > objcg = get_obj_cgroup_from_folio(folio); > if (objcg && !obj_cgroup_may_zswap(objcg)) { > memcg = get_mem_cgroup_from_objcg(objcg);