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 75080C4828D for ; Tue, 6 Feb 2024 02:07:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AC15B6B0074; Mon, 5 Feb 2024 21:07:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A70B96B0075; Mon, 5 Feb 2024 21:07:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 95F1C6B0078; Mon, 5 Feb 2024 21:07:30 -0500 (EST) 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 865FA6B0074 for ; Mon, 5 Feb 2024 21:07:30 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 4FF2CC01A4 for ; Tue, 6 Feb 2024 02:07:30 +0000 (UTC) X-FDA: 81759742260.03.564B0F6 Received: from out-183.mta1.migadu.com (out-183.mta1.migadu.com [95.215.58.183]) by imf28.hostedemail.com (Postfix) with ESMTP id 5E2F0C0009 for ; Tue, 6 Feb 2024 02:07:27 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=LV73bJJY; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf28.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.183 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707185247; a=rsa-sha256; cv=none; b=kA7rp27sVwB19D/ePZimxyWfanv7c36e5yzLGxkBcwYBqgo6c0KvcmhFNEqp8QKwGHlS/e TO3KxXgnjTytglSjBihTUYiOkir/Bq4MjvH1+cLbOSyyrFJKHfENyt2TcMWo/NpX7bOgay OY5QPcWQW7Xq9wzT5vL8rnCjpavjnY4= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=LV73bJJY; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf28.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.183 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=1707185247; 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=eIJijInYFu0cUG/tmLajV3LIHwabmz8bTWiDitWtQ+k=; b=ySqdWD8GJpNFV7e80IV07+63sTl4DrfwalaRh+3PVMajpzDzWKlCw8+WDXgTS7EcC3KDf1 BBhe0/M1N1o8+mkrUTLiGD94b82olvqfRE2cOTSJ/rXHY5xKKbmCm6dRnCyH4Siz1293z8 wd2UDT0V0EZoGUxAIxCTr51mV6yNbIU= Message-ID: <38dae4da-7afe-4405-9545-294efc18fb8f@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1707185245; 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=eIJijInYFu0cUG/tmLajV3LIHwabmz8bTWiDitWtQ+k=; b=LV73bJJYq+BC3YGCCBAWgfDKtcFLErH41Ml9O9zbPiFRre+qDKQcXllfi1XubWXUBEvFDH KwuK1d1z4y8kBULaXqi8ehf+wTFSQwz4MmtNl/FK+QWr/hw+o+72dUCpbYpwbyoXfze0tm NmFxfyNHo1Qf/tEcRKhOcVB7M0Kmu90= Date: Tue, 6 Feb 2024 10:07:19 +0800 MIME-Version: 1.0 Subject: Re: [PATCH] mm/swap_state: update zswap LRU's protection range with the folio locked Content-Language: en-US To: Nhat Pham , akpm@linux-foundation.org Cc: hannes@cmpxchg.org, yosryahmed@google.com, linux-mm@kvack.org, kernel-team@meta.com, linux-kernel@vger.kernel.org References: <20240205232442.3240571-1-nphamcs@gmail.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Chengming Zhou In-Reply-To: <20240205232442.3240571-1-nphamcs@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 5E2F0C0009 X-Stat-Signature: ijodtowy3gk45y79j9wxb937sbbocjru X-HE-Tag: 1707185247-366103 X-HE-Meta: U2FsdGVkX196WyFw9MaccrbzabVHZhRHT3r2sPjOOVfxt6zkVHPW46+2drdTitGdHh4MTU+siQnUQ8LQcelBaaMULjE2R/y+1pn1dUKvsgUwD4WN+V6Mhju4h3jSiCRLExL8YpNLvuQq4FCYPYJ+SPRx555pj7T301Wt0JnTccGEsXEZpWTRvDs6tP7nZXiaZX31YcTXkKhqWw7Js05a9pWYaTwV3XNLfzbtmjDoHnxTbgIcJ0YhANdEnnJoWXrgwvr6TMdi0TgEtPFW486blnECXHmqip4Omh1P4snuYl1/HRzknB8DDKRmNh3X3/2po2vOulx4Km3ydfzkNNpmauyFesHrd+HCssfne7u5QRloja0Bh7TQ3Uo2BrfhuBybvpefGhb3gQWWAZOP/31RbkQW7blm+qSQYjLLHPhtR0am3sOFh0VkDHvF3m94O3WyMZ/weI50Ln8Sng62MX2RNW5fEc6xGfcPYQGPCnvalBoCVfmg7OJPxq6p45CMkL8dJ5kFafzQnicGX1jvazUPqUngXpkjbA9hfaRDT3jn5va8W4GdSh1l1ya9rbbR0Bykr1X1S6vhUFMzHaccfrr7RrfI03L7g9V6E6CvOjb8fY6zLkLzpKVbEHj0EDtVjHm6VFrSrPM2pKiSbnz/7iY1t+AygLSbl0Y4t2i0TySSRJg8buhMlBNGhiEcnuYZOjG678aOe3wrXmUHrXm9qcSGjO60+t5KtyXlJqO/CCjJUMt/dboYxQXuQSrgdeIUKJSJiiEIjiDCybz1+CBFYoI8PGh9Nigbm5Q1pnGJ56m2uoPYmWp2PLd11Rvm6IlE/6oqTLIdiJeSOyCOXFPMIQB7iVG6UbuJq8NXzXgxQnUx6E2bk1ztWE8dr2sJYB3zKj1+1Lg0RquaKqcA8y3Y/4UpqgCbCFAEoEDxc0lwPxioFJSIg0xxPI6UVg/viNjgcQCL/lr09EgUB+lh9DP1lfP U7PIqHIC p5B5RVyOJkng3dNijFkDkfqOI+CUG0F2uKjvdAUVW5N5AUyeYZmQjrLiAOLTdUCUqLKisuZ37eVunJQY4Awf32buapXE+mh4En0BS+qOdX1qy/X86FDrO+FCFj7nxMlymYk9+yGuV9MpetkLbdU34LIyj0r1GkRCK6VLzyvejpVHR7GYH5NGctWq6fm52qlQvRkRQdriZr4xl8wG3RZr2kNnjDMkwiGoBXo2E0SDmAP89reTseooks52LNhU615TsETXdJJHADnaXovrfYO2edEKTSaR99WMIXu31ahIkkDOx/yyaFUQcA7QgLpWbQtlksMbAFHJjZB4/WVIByxd9lfAqJ6IgpvYNPdFIfTd/kg6wDjobaEwbmnTPPx682YiO7fjR 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/6 07:24, Nhat Pham wrote: > Move the zswap LRU protection range update above the swap_read_folio() > call, and only when a new page is allocated. This is the case where > (z)swapin could happen, which is a signal that the zswap shrinker should > be more conservative with its reclaiming action. > > It also prevents a race, in which folio migration can clear the > memcg_data of the now unlocked folio, resulting in a warning in the > inlined folio_lruvec() call. > > Reported-by: syzbot+17a611d10af7d18a7092@syzkaller.appspotmail.com > Closes: https://lore.kernel.org/all/000000000000ae47f90610803260@google.com/ > Fixes: b5ba474f3f51 ("zswap: shrink zswap pool based on memory pressure") > Signed-off-by: Nhat Pham LGTM, thanks! Reviewed-by: Chengming Zhou > --- > mm/swap_state.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/mm/swap_state.c b/mm/swap_state.c > index e671266ad772..7255c01a1e4e 100644 > --- a/mm/swap_state.c > +++ b/mm/swap_state.c > @@ -680,9 +680,10 @@ struct folio *swap_cluster_readahead(swp_entry_t entry, gfp_t gfp_mask, > /* The page was likely read above, so no need for plugging here */ > folio = __read_swap_cache_async(entry, gfp_mask, mpol, ilx, > &page_allocated, false); > - if (unlikely(page_allocated)) > + if (unlikely(page_allocated)) { > + zswap_folio_swapin(folio); > swap_read_folio(folio, false, NULL); > - zswap_folio_swapin(folio); > + } > return folio; > } > > @@ -855,9 +856,10 @@ static struct folio *swap_vma_readahead(swp_entry_t targ_entry, gfp_t gfp_mask, > /* The folio was likely read above, so no need for plugging here */ > folio = __read_swap_cache_async(targ_entry, gfp_mask, mpol, targ_ilx, > &page_allocated, false); > - if (unlikely(page_allocated)) > + if (unlikely(page_allocated)) { > + zswap_folio_swapin(folio); > swap_read_folio(folio, false, NULL); > - zswap_folio_swapin(folio); > + } > return folio; > } > > > base-commit: 91f3daa1765ee4e0c89987dc25f72c40f07af34d