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 87E3DC4332F for ; Thu, 8 Dec 2022 19:14:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C9A0B8E0010; Thu, 8 Dec 2022 14:14:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C4A0B8E0001; Thu, 8 Dec 2022 14:14:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B11EC8E0010; Thu, 8 Dec 2022 14:14:35 -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 9C3138E0001 for ; Thu, 8 Dec 2022 14:14:35 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 6C868A2570 for ; Thu, 8 Dec 2022 19:14:35 +0000 (UTC) X-FDA: 80220090510.29.48146F0 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf06.hostedemail.com (Postfix) with ESMTP id F1E91180013 for ; Thu, 8 Dec 2022 19:14:33 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=VhWSQh5n; spf=none (imf06.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670526874; 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=0uwthzCinj77lhOFlJtbRaN2SPsCgH53sRB6S+9jybM=; b=ufSXcH5vZGWhFg6Yfozb9223AJKd9KRdf23PAslMSSCTKcdCFMcMqUvUQnM7vC2Qv/6XXH o2GA45P2byY8o9xjJsm1TskTM64LmL3vfMjBOIrNqrDjZOkgtrXcy5ClDgZNCgs7SUGd2R N5kb+36yBYQ2MiOgKRa0Bbk7j+u1KJc= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=VhWSQh5n; spf=none (imf06.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670526874; a=rsa-sha256; cv=none; b=kTjVfCkmGxnHhiFdRH/mQReuiG7KE9UCXZpPAfgIrOivqXIV/wU9gW60PnrXdVP9FfR96b iequJ0Rr8uD1YySj6qHzT/G+4KIKbnyjF4H2zlXbAWs52UT/eEegSki/BGa4Fre6axE61h 5YHqe7OpnKt0A2MssFsJh7I+vVMX6ew= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=0uwthzCinj77lhOFlJtbRaN2SPsCgH53sRB6S+9jybM=; b=VhWSQh5nAy1Tc/aDBJOzNFtxM7 WjDctl7sLwr+V4OTuuhPg33yHaLQOsaUOPBS5dGnQ41UTiwG+xWYuxQojZdyr43uryNXElRdcFKj8 FL7VaY5rrh212pZecIiMNbVDLUWcUR/r536hoGL0U4Ual66QG0uFewHDaNQCPDjNvmCrcmrR+xm/4 qfeZd6yiCIcgW/3tSIwMuw2a8Cd6qfDE2fwEQtHRvy+OkXp48EkQaisLBSQjBZChzNITTgEBVUWb9 9bYhqcwyYVcQ+SZX91AE5oBEd62G9wb3UEgOu1+15SsXr8U1OMhkZ8GuMCd7W8PAsEslKxzf+ydDV nCPEc1VQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1p3MLl-007ElF-1s; Thu, 08 Dec 2022 19:14:29 +0000 Date: Thu, 8 Dec 2022 19:14:29 +0000 From: Matthew Wilcox To: Kairui Song Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton , Miaohe Lin , David Hildenbrand , "Huang, Ying" , Hugh Dickins Subject: Re: [PATCH 5/5] swap: avoid ra statistic lost when swapin races Message-ID: References: <20221208180209.50845-1-ryncsn@gmail.com> <20221208180209.50845-6-ryncsn@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221208180209.50845-6-ryncsn@gmail.com> X-Rspamd-Queue-Id: F1E91180013 X-Stat-Signature: p3p7ewk3s9yq9dfuxqejhw9b1gerx46t X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1670526873-691978 X-HE-Meta: U2FsdGVkX1/+Q/zr1WLseLytl2by+pk4J8YurmvMvuAvjvA2kJFRJ0S1VHjvp0+r263s4MCfEl2Dn9var5Wwj/thb/P8cEXddK0K++9QzAaC0vGrai25Z4biRSlHmuXjfmsPC53lFzKDMvNzr3W0ZdPeFQhGXhZjUITFz2NjxLSLHaBt4VKDEpKAEfFWvfFQBzhK/RyLFfzW10QyIDxh81/0a2KCt+0izLyZ4GxM/4dVZI+P3WkN7K3d+r5es9JyYolERc6M0GKite3o2ZDN2f34sohG8glCcTot33rj8vdpz/IwlcsyzxZjMGRh0v8JwknpFBCvKGYAeaT2x5YJwoRUsKO0XbO/3jtisvKIgRaGpmSXbqJpBfWz4CexPhPqODaiaRiZVNH7XG5Fpza1biu4xsUAwec04EP+IwEoztbZPm5E9sjSR4Tr60LJlul7gPeq1HiQ4XwJPU7kIzY+7YA1kAe14x4NYJwH5kmQ+U+VKWNCLC3q0bLXJAQh8ESbFRkKHaaOQ+BMNdAHRQp4CqP/qLhxGl5Uw7Bc1MQu3GPIrY3kA6XbBzZ+nnmEeOtGxKpxKAT3PORF7dYqDP5gwsHalLGcIYcswKI5iiB+bwpRrzISPwKIp/aD6E2VP4G03glHioZB0SRJCPQAzkQNrISm96dDkbUi7h/kVbQojqUvTCX3ksBrqzc4ZSqH/V7O67GjxClGgaTmS6QO8Ij4AuOIRWofFcnRwJXfbYbhvEB6N3a/yH6qHp3TXzktp9paCsKi9b0MSFHjyMXZnAFMwmTikHqwBeRl0jyEDy/JB9/IPQIt/T3V3gsVClZyhJ7EqTNSqO+TVg2+A+K2b0u6eXzdi/cWkIgs 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: On Fri, Dec 09, 2022 at 02:02:09AM +0800, Kairui Song wrote: > From: Kairui Song > > __read_swap_cache_async should just call swap_cache_get_folio for trying > to look up the swap cache. Because swap_cache_get_folio handles the > readahead statistic, and clears the RA flag, looking up the cache > directly will skip these parts. > > And the comment no longer applies after commit 442701e7058b > ("mm/swap: remove swap_cache_info statistics"), just remove them. But what about the readahead stats? > Fixes: 442701e7058b ("mm/swap: remove swap_cache_info statistics") > Signed-off-by: Kairui Song > --- > mm/swap_state.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/mm/swap_state.c b/mm/swap_state.c > index eba388f67741..f39cfb62551d 100644 > --- a/mm/swap_state.c > +++ b/mm/swap_state.c > @@ -418,15 +418,12 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, > for (;;) { > int err; > /* > - * First check the swap cache. Since this is normally > - * called after swap_cache_get_folio() failed, re-calling > - * that would confuse statistics. > + * First check the swap cache in case of race. > */ > si = get_swap_device(entry); > if (!si) > return NULL; > - folio = filemap_get_folio(swap_address_space(entry), > - swp_offset(entry)); > + folio = swap_cache_get_folio(entry, vma, addr); > put_swap_device(si); > if (folio) > return folio_file_page(folio, swp_offset(entry)); > -- > 2.35.2 > >