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 F34C9C61D90 for ; Tue, 21 Nov 2023 17:16:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 72DDE6B04BF; Tue, 21 Nov 2023 12:16:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6DE236B04C0; Tue, 21 Nov 2023 12:16:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5A6076B04C1; Tue, 21 Nov 2023 12:16:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 47A3A6B04BF for ; Tue, 21 Nov 2023 12:16:10 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 09CAA140281 for ; Tue, 21 Nov 2023 17:16:10 +0000 (UTC) X-FDA: 81482614500.23.B0F40C7 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf16.hostedemail.com (Postfix) with ESMTP id 3B23F18001B for ; Tue, 21 Nov 2023 17:16:05 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=dPoMeaIf; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf16.hostedemail.com: domain of chrisl@kernel.org designates 145.40.73.55 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=1700586966; 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=xVrgIpbwsa50Xozxtco+JSvjBXaNOxdfKYKYsB561Jc=; b=L3gsbOwT0a9Hjde+piHZ98rGhVwJk/eyOD0dL5I0pjYmXcjgnDfGEwoj8LfDhjfqdjvuwn WBpJrQVg1HswNUSG5fp6bix1fSwOfcFWPFnFhawalAkcREWma0qh9f+6FiAlU2giORF/SR PA8xrtSSr789/orUg6ToVMW8i+/qvY8= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=dPoMeaIf; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf16.hostedemail.com: domain of chrisl@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=chrisl@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700586966; a=rsa-sha256; cv=none; b=z31riRWpEg5dPkd7e4OH7tikYHUD6Nz3pqGagrSbXk2I4U8TDU3Fhevvt8mYWkDP9jp1+w KmlVFTzri2bUCMD2cUB3r2JMCVTcBGRTf4AompgeLgtVMA3kfxHM+b7Qu3A3OjSMNPSFvk 5KahEBGpCvn9RpAk3Ar0ATA60xjoJck= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 6CEC0CE1CA2 for ; Tue, 21 Nov 2023 17:16:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AB07AC433C9 for ; Tue, 21 Nov 2023 17:16:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700586961; bh=C2o6Du8XtSWYB4gbq77qkTzMSqsl//9Xx/hGvIH9cJI=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=dPoMeaIf6+HEqOv8P3GDpkfza+aXvuy1cRAG5921pE3EusZ0JkMjwnWq8VAUKmOMK e72/S/zdceQ5tzVOCGvzjxiVix2nLbvB68AcxodbYt7J8ojHV/idr73o2K7EMFfPH9 GAtu+lsOVzWKtjFQENnDEL8ND9ftKIvgBIYKH/w1EkBcKAcHNEqqpOFp1hbskBjcZD dKrU882xe1tLnQeH2JABE7GfdW7FiOF24EESLVKLOK9l2BlDKYmB5wf/rOUZfBPvj/ Uhh7ehd3eMTPLEZxOKjKrBFfqSSXcp9F4c7y4s+l7f4OtWhIXGhO+uZo5BmWdNY81W MAOJN201ViAiA== Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2809414efa9so4548507a91.1 for ; Tue, 21 Nov 2023 09:16:01 -0800 (PST) X-Gm-Message-State: AOJu0YxXoxeCxSFyJ7pZGCM9FslX/4oUyH4v6yaqOfcHPvoE8Ze7FmTJ Rlemlldy7ranbjob7P/AX37E8JE3gQa9VFM/txYThg== X-Google-Smtp-Source: AGHT+IH/Jim9Fey3EiHvbDawPJNw5h8OgyvTVFblOywnUJCMzMkU4OccUtDTcvFWeAi5rp7XQT0XwSIcyW5EU5b2f98= X-Received: by 2002:a17:90b:3b4b:b0:280:2823:6612 with SMTP id ot11-20020a17090b3b4b00b0028028236612mr8785203pjb.35.1700586961111; Tue, 21 Nov 2023 09:16:01 -0800 (PST) MIME-Version: 1.0 References: <20231119194740.94101-1-ryncsn@gmail.com> <20231119194740.94101-16-ryncsn@gmail.com> In-Reply-To: <20231119194740.94101-16-ryncsn@gmail.com> From: Chris Li Date: Tue, 21 Nov 2023 09:15:50 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 15/24] mm/swap: avoid an duplicated swap cache lookup for SYNCHRONOUS_IO device To: Kairui Song Cc: linux-mm@kvack.org, Andrew Morton , "Huang, Ying" , David Hildenbrand , Hugh Dickins , Johannes Weiner , Matthew Wilcox , Michal Hocko , linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 3B23F18001B X-Stat-Signature: 8zbbdsswjcfix8hropngt7t7yaij81fq X-Rspam-User: X-HE-Tag: 1700586965-690319 X-HE-Meta: U2FsdGVkX196Cbfy6+8hIPfOVrO/SIRKdon8YhfcA9qm7wbHdp7HAXgEjwbXWllBwqkNM7ZUtYnebzwILOKLd2+ZHFtdWPGbCZHI8eT3Wt74EYZnPIfmYEPYtk4Hi0A+X5XZdmu32xwvjMnQMhlHD5/IN1amIZ9DhKM+PlumHCB64zhUSFOpXWcFXZfDpLYlwOdVpsh3iz07a88iAHROvx/3oqBhLsQ/5lUWkI8k/qndLW6Ygn6G+BdejvHWEkBqQrMGOp7/O2UAywg8EgwGiAK2vXaY5hI4a6/c0h2lZ9MzBxCrhT6XX8qvLxrhvddWSx8kszQINmcDiB2UtKWV+7wiwShYhOJjovji2TgGQHL2mCBq4JpQcXpQC2aDFdD4jJ03fViQl+biOoBXxIIeHqXlLOKz/RJjZ8p/gFDam1qa1TDLnPXp4RNVxEFSfqzxPpij8LavYhBNwnZdPmFKE1jsRPK4rsFh9hGlUYLNnLrLYpWpIY6giuc2ZlyzpnmPsBpDjEhvjd8ILvbM77tLzOj5r6DXYSB44laUwGbO97M5zcvWrMZFeT7lGKWBaLMmTDZP34J2z6sUSRoeup+3+RIvkDfIropAEN+p1shGrqfI4hJ/4CE4mrPxJWTFsDV5o7BVo4Bm7eCRqrfzb2IEWotDYy5Yfp2qwNPHsVKaavMn7Le8pAPbbMPjrtFxKd1Mr1VpblL5WVlTIaQrLTT6W0X5rXANsIPQEdsnQGwW++I1E46Q3l6N+e+cmy5xkxaNG4HcdcueRDwrrd99rWW/fydXMFnjuMEDK6mkw+TG60hP69/KZFmsRPKVzumhAZhZMuTVIrAyrYyyVIZnr1QRIOVgk0q5O9pPkgg+Dk47fETlbQjigEHqWY5ruw7TJM+zVrqTsoPUL++HWE7j5cfbznH/91/PSr6/ExBlDfbSHGqntYNI4LdgSkaGKFZZhD5VmAi4Ag0KoLRDIgrVtpC BeEHkCnG dSJmRtdk00TKpWJiRwA6sbKMZcpBrsuBQsxo9siOv2cbsp0hjNlgEe7HKajVSHlEWUl5iKMI4Q9XrkIm/bMfuj+QBR8nByTAsUE4aXJ0b9BTnr6cLkY1s0pO8KlsIQqII2ultfPpd5bHDsgW5LSV6WZcWvhKiSpugWa0hTEwMfjA3JlSet29pmi481geOkWRE9eMWX1ng4bZj085rUQrTpM8bHMag08gHJHKvLgQnvf6L4SPDaWH3vZmsAjZGbZNKAa/SIXBz1+ugxgrZg2fDlvwhv6YTBJSTU8Erl5O+b3DAkfKSN8mu3tmSKaSairIHnN5+7bWtOnHPOQC33QhrZInNAg== 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 Sun, Nov 19, 2023 at 11:48=E2=80=AFAM Kairui Song wro= te: > > From: Kairui Song > > When a xa_value is returned by the cache lookup, keep it to be used > later for workingset refault check instead of doing the looking up again > in swapin_no_readahead. > > This does have a side effect of making swapoff also triggers workingset > check, but should be fine since swapoff does effect the workload in many > ways already. I need to sleep on it a bit to see if this will create another problem or n= ot. > > Signed-off-by: Kairui Song > --- > mm/swap_state.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/mm/swap_state.c b/mm/swap_state.c > index e057c79fb06f..51de2a0412df 100644 > --- a/mm/swap_state.c > +++ b/mm/swap_state.c > @@ -872,7 +872,6 @@ static struct page *swapin_no_readahead(swp_entry_t e= ntry, gfp_t gfp_mask, > { > struct folio *folio; > struct page *page; > - void *shadow =3D NULL; > > page =3D alloc_pages_mpol(gfp_mask, 0, mpol, ilx, numa_node_id())= ; > folio =3D (struct folio *)page; > @@ -888,10 +887,6 @@ static struct page *swapin_no_readahead(swp_entry_t = entry, gfp_t gfp_mask, > > mem_cgroup_swapin_uncharge_swap(entry); > > - shadow =3D get_shadow_from_swap_cache(entry); > - if (shadow) > - workingset_refault(folio, shadow); > - > folio_add_lru(folio); > > /* To provide entry to swap_readpage() */ > @@ -922,11 +917,12 @@ struct page *swapin_readahead(swp_entry_t entry, gf= p_t gfp_mask, > enum swap_cache_result cache_result; > struct swap_info_struct *si; > struct mempolicy *mpol; > + void *shadow =3D NULL; > struct folio *folio; > struct page *page; > pgoff_t ilx; > > - folio =3D swap_cache_get_folio(entry, vmf, NULL); > + folio =3D swap_cache_get_folio(entry, vmf, &shadow); > if (folio) { > page =3D folio_file_page(folio, swp_offset(entry)); > cache_result =3D SWAP_CACHE_HIT; > @@ -938,6 +934,8 @@ struct page *swapin_readahead(swp_entry_t entry, gfp_= t gfp_mask, > if (swap_use_no_readahead(si, swp_offset(entry))) { > page =3D swapin_no_readahead(entry, gfp_mask, mpol, ilx, = vmf->vma->vm_mm); > cache_result =3D SWAP_CACHE_BYPASS; > + if (shadow) > + workingset_refault(page_folio(page), shadow); It is inconsistent why other flavors of readahead do not do the workingset_refault here. I suggest keeping the workingset_refault in swapin_no_readahead() and pass the shadow argument in. Chris > } else if (swap_use_vma_readahead(si)) { > page =3D swap_vma_readahead(entry, gfp_mask, mpol, ilx, v= mf); > cache_result =3D SWAP_CACHE_MISS; > -- > 2.42.0 > >