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 DF5F7C48297 for ; Fri, 9 Feb 2024 04:50:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5E30D6B0078; Thu, 8 Feb 2024 23:50:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 593756B007E; Thu, 8 Feb 2024 23:50:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4827C6B0080; Thu, 8 Feb 2024 23:50:58 -0500 (EST) 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 383F46B0078 for ; Thu, 8 Feb 2024 23:50:58 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id EB7621401B9 for ; Fri, 9 Feb 2024 04:50:56 +0000 (UTC) X-FDA: 81771040512.26.8518916 Received: from out-182.mta0.migadu.com (out-182.mta0.migadu.com [91.218.175.182]) by imf09.hostedemail.com (Postfix) with ESMTP id EE5A3140019 for ; Fri, 9 Feb 2024 04:50:54 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=Sv0HuYUF; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf09.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.182 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707454255; 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:in-reply-to:references:references:dkim-signature; bh=rCsEgKAQ47A9auRHPKJ2GAU0swz6qNM7w47Z4P7dE2A=; b=JCEXOXnXiEgRlmfDy7zB516SvMqSjApsNit0NysRbLih4lOooCBvHEp2L3KTIzgvsQ6a/g fQzHGZ3vV7SfuQR1DKUGQm5t3KEQkCpGXOpcJ3HTGeyGmA89iuXLNpxsKjWiuVKtO3vc0L 4GBP3yazW0GUIDc5WJBduVetycEKugE= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=Sv0HuYUF; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf09.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.182 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707454255; a=rsa-sha256; cv=none; b=Ijkczx2cBU+qPYFZmka+M/Z+F8lZaN4RMLpnj0PYqzBGsKNejxRZhWU1rYyqup1hfpb0xi O2+awotQAQkbS2/z2v6d2Wi6hd7agtCdcnOLuz0PsKaB1AkTHVHTgnM58DWtmf++nc+Jkb 578b8CqlJBi67S9JdaGfW9BICsg7D/Q= Message-ID: <61212b2b-7f40-42f0-9a44-1ab34a2a1cde@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1707454252; h=from:from: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:in-reply-to:references:references; bh=rCsEgKAQ47A9auRHPKJ2GAU0swz6qNM7w47Z4P7dE2A=; b=Sv0HuYUF+rLrL2ry4C0stU1sqBDp6wsd3N5sQY4pOF1ColatziubJNT60FK9S9fiLWhnAd j1QwAzwIkcB5aPbSzow5c8ye7/mvVICXgoGAzY+Pv42L7w+iAtKX9swA7WdzdjRQMlDU86 suACeiucy03M07Y4GzIEU6WNiThs0Ds= Date: Fri, 9 Feb 2024 12:50:41 +0800 MIME-Version: 1.0 Subject: Re: [PATCH mm-hotfixes-unstable] mm/zswap: invalidate duplicate entry when !zswap_enabled Content-Language: en-US To: Andrew Morton Cc: hannes@cmpxchg.org, yosryahmed@google.com, nphamcs@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Chengming Zhou , stable@vger.kernel.org References: <20240207154308.bc275f3e72ec1c1fd06cf5a2@linux-foundation.org> <20240208023254.3873823-1-chengming.zhou@linux.dev> <20240208130952.b2696eaf6a27eef9866723d4@linux-foundation.org> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Chengming Zhou In-Reply-To: <20240208130952.b2696eaf6a27eef9866723d4@linux-foundation.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: EE5A3140019 X-Stat-Signature: xmgswc73f1xx5tani5qpu58jymw85zr4 X-HE-Tag: 1707454254-850628 X-HE-Meta: U2FsdGVkX19yqUGw/VbfcmwCRxMbkJsMnxdAFbYegcxuIomudwnbo6aAu7K/7CVF0pInH4AoUchstLIpvld6yIwx/ffhy0fTJxth5UILYi1rtyv0GediOzRrFsuhDhkjYMC+Tl9jZkjBly4cyCMYz84uUn1nSRZ1R7gY+zveoApkgOu0uKnTSmw0+TQQvK3JiMu2dAWyI0bD6c3uFC5OMepjFLioQPeTYr8wGgvHctAJkDpjJPg9THuOQ45CD2iQOAn1eBV6JOsjBGklXjLhr4ZxQZsfIZzGIviyR+7V0RQ2G7yj3e7n0mTqe2ijIQS3+GcIJ6Vs+kwxae/iMWZF+Za/xr1ShVUjVeokga3jmFpe7qhHhVvuRX/dYg2lsS7prHRsVyUcmXjieRUYle7T3GFK5bYYOgJ9dMXGvbPEHMihgNlCXWqMeTQUGU726tNlBxt4HuHEPki13wLOQEH/nws1UoAveHv7LqL95SeONnXsTlFbsASGEYUbe8Uj1lczeiTjrHQWiQsyXohCKDRivZXFHx0A3Mq2uQPkPodk4iVVzuEkq/Ri87kH8nw1RozjEdwBA/aqTRqJ0tnxC5S9dqQJLPPW6yu2T7nrqWO3H6ygcYibPMPyJU45ZkHpPpBd0OanmGwMkiQJcvZ4yOeCjkYCF84wmNv5JuyDE+nAE4RvGTPT3/Qrkylk/UGeUmoBU5pEme5aWQNdCsERhCS1jPcFoZ93F+X9gTnyZNvGJBgnRQSAB2DXRnhmlIrFe4HPsNtEyo/rZfNRCDd+JsjZ1wini+n3PedHe3BLlU4HDZNkSvrzvB7/Vt6eSbob+/2eXcjg1+t+CbhHd2oipjmInE7UAwLYhKqQOmBhQakkdcn5vpjeaJ79tUpEtx0neJemlZQERZ28Rh2j7WGaRAOnNYymarw9Jwr6c0SeM2yIgWZeyPDikt50L1BlH2qIvHc9VGkzFTvNRmnSJPYdhi6 T+ViW1Es 3cbqLlxshfCXuWSh6q2yiORdBQv4HY0rJTU1/afcuXTfO25mFQ5jnZZ4LQaX0kmGGlE6SaAIRdtqqL81psB9X6FiUGtfRd3ccMCiHCEpxHdeQUpgv0cZFw2gZtZBmZF54DyytZhba3v7oqhoxXrinz5NKPICImi0fv2jusaX61p9XZZcIE4fikY1l2I8Lu1207g7KOez4dKsmWmmHxdyk+8xk1to3oJHC8REDYtPpgwPAtR71JrfQJxMG2icXb4VdSnjK7Na69U5R7F4igbhU3KhhACQS354sjq7fRKE3WKa9F5/yRUcD1BSlxLAEpN/nTyPz 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 2024/2/9 05:09, Andrew Morton wrote: > On Thu, 8 Feb 2024 02:32:54 +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. >> >> ... >> >> --- 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); > > OK, thanks. > > I saw only one reject from mm-unstable patches. Your patch "mm/zswap: > make sure each swapfile always have zswap rb-tree" now does It's correct. Thanks! The other patch that includes optimization and cleanup is updated based on mm-unstable and just resend: https://lore.kernel.org/all/20240209044112.3883835-1-chengming.zhou@linux.dev/ > > --- a/mm/zswap.c~mm-zswap-make-sure-each-swapfile-always-have-zswap-rb-tree > +++ a/mm/zswap.c > @@ -1518,9 +1518,6 @@ bool zswap_store(struct folio *folio) > if (folio_test_large(folio)) > return false; > > - if (!tree) > - return false; > - > /* > * If this is a duplicate, it must be removed before attempting to store > * it, otherwise, if the store fails the old page won't be removed from > >