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 9B33DC54FB9 for ; Tue, 21 Nov 2023 06:44:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D66416B03FF; Tue, 21 Nov 2023 01:44:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D165C6B0400; Tue, 21 Nov 2023 01:44:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BB7246B0410; Tue, 21 Nov 2023 01:44:51 -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 A96876B03FF for ; Tue, 21 Nov 2023 01:44:51 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 6E5ED14011D for ; Tue, 21 Nov 2023 06:44:51 +0000 (UTC) X-FDA: 81481023582.24.DD5AD50 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf07.hostedemail.com (Postfix) with ESMTP id 5337840012 for ; Tue, 21 Nov 2023 06:44:49 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=SIRW9Anh; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf07.hostedemail.com: domain of chrisl@kernel.org designates 145.40.68.75 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=1700549089; 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=emAWHOcgeGh+BIMdhsRHdRfpEc5vMwnfiBlaQ7oBDEs=; b=uYd9rqZHPcuOJSvedlhylhI1Z4ay9LRMmqKbDqGTlyIorW6MX3c78PQ6xg48l5jkOOErNR IsjOefeVEjtRfl0ctE5WaF43LfZinkSgeRWR3w3PtZNdVgggG99JtuFwczw9zuBjtDU0wK jnIrrtcD7NR3XxkHBlONLwSdCMrhjaU= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=SIRW9Anh; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf07.hostedemail.com: domain of chrisl@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=chrisl@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700549089; a=rsa-sha256; cv=none; b=UX7P1xDCDMOFmda4PLQ4xMyhJ7tixLpXXckqb0Qy1eNMGuC54vMcCftN6hjUxTtlp2Vw/O v8BQd02X9Q47UmfPB9BKWunVBIBoePs+wmg8pT/RC1JbfQLSOGZSROVJPGw8X/SQeKeJsj Qr5b3q4NEyHLOhxBH2uDsOvO0xHC5pI= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id B0A3AB80FAC for ; Tue, 21 Nov 2023 06:44:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 688AEC433C8 for ; Tue, 21 Nov 2023 06:44:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700549086; bh=HbjMaa08XhBMvqPbiqjjtUENS42bCNLumGs9hHt3ya4=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=SIRW9Anh8qnnEi0pqIZrHl/fUoObs5IT4mlXxZdiLYfNT2uiqEN1kcs8ERj/PGm88 BB6Ek0Jym8SyhnAurieBaxz/TzmI0/Ta9U+Tk452F/BHXkxbLnvQzUzuqBjJkugvK9 yTnVY9mw/7vHuRngHLiQIIDiOkThnsgFXfRVVt9utyLMCAkesxmS0kAZHIUVgCcYq8 nio6IKIF63G91T94NSsUJTrOHnTxzR3/v1bSMLhDXKi2oa27vvFKhIDUhdv1rztw/d 9l4r4U88D62cVR3ZQMCNS80soKnV2l0EJuujsKt3Ul756DIWgeFuoxiyPK+mp/sj88 k/pzY3Pb+vU2g== Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-282fcf7eef9so3577411a91.1 for ; Mon, 20 Nov 2023 22:44:46 -0800 (PST) X-Gm-Message-State: AOJu0Yw+xAIaRUlUnOPbKK7IUk3D8+DvyjLPXKklm2YBE4AWaaLxEtGB 20znGqN8IQ+HbpyVKJMrUkV8g65VLQ710ItKkA9yoA== X-Google-Smtp-Source: AGHT+IGHAYyJkX0fTvu8sfcaQjbc+N0MzAsCY8/vIH+MOfw0Dl3I8GwbvhRqLx7yrhUEwJyac2G55exzEd/s8SN2iQQ= X-Received: by 2002:a17:90b:4c8c:b0:280:74fc:ac2c with SMTP id my12-20020a17090b4c8c00b0028074fcac2cmr8436665pjb.13.1700549085867; Mon, 20 Nov 2023 22:44:45 -0800 (PST) MIME-Version: 1.0 References: <20231119194740.94101-1-ryncsn@gmail.com> <20231119194740.94101-7-ryncsn@gmail.com> In-Reply-To: <20231119194740.94101-7-ryncsn@gmail.com> From: Chris Li Date: Mon, 20 Nov 2023 22:44:34 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 06/24] swap: rework swapin_no_readahead arguments 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-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 5337840012 X-Stat-Signature: x6jn961u13ymmuxs1xfjxwtkft1f7i6w X-HE-Tag: 1700549089-913192 X-HE-Meta: U2FsdGVkX18X6UouDRLWlGbhAv9y7vwSdrD+bNeEEvXTpXFTO2qjS9rEspUCfWJaUXYqiYrpGw5YSmqATfQU9dVGVkHKIqbkPiHCKCSyLpGGAxJ8BwOIl3Kx6fq/7XwVstnsEJiMRHpGrMp+R68O+25BL7i5ky0HS0VjYVQXcmfQWyn4pj5hCUuJajEkANc1ZTgrNwkAKD5zgt2fVywyrEmaSQEFhaxOUSpUDH51QDA4oeGTvqd5323W0+zZDCZJXTFAxDlmFgH7ILafKYdO0ra8wPVolmZ9cve55qHd0njDH5HYObx05LZnaz1WEx5ao7R3VCHBbN2ZVAtWdHQhcI21YFmwCCohEqaX6AfnSp7YbCXhSQ11KLQz43P2i1TJS5Uph2GghQ8smhE7cDBIJGB22py9MR4gLTTgrJMEAm39t4Bl6RHM37tinTKNeK0hiv78LeV1dhmXQd/4r+kHKjpkz4Cu01LYjyVXSHLeiALJ9GU4B0XD179bQoD3r9h9nZDhYH6EigJe0STlnSgPTQ4bR2C4o3T6qUWaWHHfAyGkztAj7vlTaDutnYaxTyNY6Re4Zrd5MFzqwKQm8yF3Mo19uJApny0gWKjtcy/pZ2a7XF7k3qSxT3rEbReFH10thrFvkBlf3KiZA0AlsvBiKEPepiA6w5fkZnBA0y4cr15LfxxIJhBYgD+wwaDywQ6P2J9T53RtAl3+z3n7yFglyUBY9VfQL9z1IL48R4K1cf49O0x9Ow+0XkYuXSHo4wbtdpjjG5Hu8dPlJrl5ljtG2Jkp5vAHwSto9hWKF8r+3sl+4Xv60f8Siz5YrC+D182gwkxjFX9uwezOvLKp8pw4xq7ZLaL+8fUPorf+oxfTeeItAFAsa9g4qQKmFF+fFqIkf4ictnXETDPwPI1NNmHmI/v+RIziujUd7M5njr/C7eaSba+4vF5UDaRcl7S572x0vquJ2Xh6Ro61Ct6Ovvt tUaevMls DgM4yZzOU0v43v95DaghdVRfiMCCiZvirIcj+6Zh/+TlRUlBK7IDDIH3928poyRVgqCO1vjwgRvBAjL0eInZaCLCK7OJ1l8fQjvwCK6fDrbVhr64Xv88SJHHX14TFS2qgPBCMzd0AotDsa/t6CJ0lKHyFNwyBNphvDnSIgcyN3zDZEf3YMJFdu9UUlLjLwEOwbF7YvUnOD7Cn2udmAyNHGV1sBDYhju+UvHPzR9RGiHPOniCCiu3MGnQ4ui/RopnOc4J6uYwBBYi9qxFa+nyOBANP+WOyhwPgO0Xk/cCBJc1WFfWMT0kdLHtYYYw7c9M40HFGR2FQFKp3pm/IdZj7/0HY4Q== 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 > > Make it use alloc_pages_mpol instead of vma_alloc_folio, and accept > mm_struct directly as an argument instead of taking a vmf as argument. > Make its arguments similar to swap_{cluster,vma}_readahead, to > make the code more aligned. It is unclear to me what is the value of making the swap_{cluster,vma}_readahead more aligned here. > Also prepare for following commits which will skip vmf for certain > swapin paths. The following patch 07/24 does not seem to use this patch. Can it merge with the other patch that uses it? As it is, this patch does not serve a stand alone value to justify it. Chris > > Signed-off-by: Kairui Song > --- > mm/swap_state.c | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) > > diff --git a/mm/swap_state.c b/mm/swap_state.c > index fd0047ae324e..ff6756f2e8e4 100644 > --- a/mm/swap_state.c > +++ b/mm/swap_state.c > @@ -867,17 +867,17 @@ static struct page *swap_vma_readahead(swp_entry_t = targ_entry, gfp_t gfp_mask, > * in. > */ > static struct page *swapin_no_readahead(swp_entry_t entry, gfp_t gfp_mas= k, > - struct vm_fault *vmf) > + struct mempolicy *mpol, pgoff_t i= lx, > + struct mm_struct *mm) > { > - struct vm_area_struct *vma =3D vmf->vma; > - struct page *page =3D NULL; > struct folio *folio; > + struct page *page; > void *shadow =3D NULL; > > - folio =3D vma_alloc_folio(GFP_HIGHUSER_MOVABLE, 0, > - vma, vmf->address, false); > + page =3D alloc_pages_mpol(gfp_mask, 0, mpol, ilx, numa_node_id())= ; > + folio =3D (struct folio *)page; > if (folio) { > - if (mem_cgroup_swapin_charge_folio(folio, vma->vm_mm, > + if (mem_cgroup_swapin_charge_folio(folio, mm, > GFP_KERNEL, entry)) { > folio_put(folio); > return NULL; > @@ -896,7 +896,6 @@ static struct page *swapin_no_readahead(swp_entry_t e= ntry, gfp_t gfp_mask, > > /* To provide entry to swap_readpage() */ > folio->swap =3D entry; > - page =3D &folio->page; > swap_readpage(page, true, NULL); > folio->private =3D NULL; > } > @@ -928,7 +927,7 @@ struct page *swapin_readahead(swp_entry_t entry, gfp_= t gfp_mask, > > mpol =3D get_vma_policy(vmf->vma, vmf->address, 0, &ilx); > if (swap_use_no_readahead(swp_swap_info(entry), entry)) { > - page =3D swapin_no_readahead(entry, gfp_mask, vmf); > + page =3D swapin_no_readahead(entry, gfp_mask, mpol, ilx, = vmf->vma->vm_mm); > cached =3D false; > } else if (swap_use_vma_readahead()) { > page =3D swap_vma_readahead(entry, gfp_mask, mpol, ilx, v= mf); > -- > 2.42.0 > >