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 77784C6FD1F for ; Tue, 26 Mar 2024 20:03:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8D5F56B008A; Tue, 26 Mar 2024 16:03:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8859A6B008C; Tue, 26 Mar 2024 16:03:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 773CE6B0092; Tue, 26 Mar 2024 16:03:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 680056B008A for ; Tue, 26 Mar 2024 16:03:45 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 3631C1C0710 for ; Tue, 26 Mar 2024 20:03:45 +0000 (UTC) X-FDA: 81940265610.16.97049E0 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf07.hostedemail.com (Postfix) with ESMTP id 8CCCF40019 for ; Tue, 26 Mar 2024 20:03:41 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=QfrgKkzL; spf=none (imf07.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=1711483422; 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=YLa4HUex8/bG4yUSqFwJp3NxJNy5ji4AjU0vaS24NpE=; b=mFzv3VeEJeHSiXK2cQMn9hPxFTEWOudiDH1snJZ4AlwB/CZhhM7QTsjJAL4TOBxmuLzluq iJnIXr1YoqPPhlMEsChhEADHkgdwUgJNvz+ohOIlK8pXb3HLjMaOIvbktNhXXmdnVqh6f/ wDXDltgsT5R4l2h+YaV/8wz5VQq+JsY= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=QfrgKkzL; spf=none (imf07.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=1711483422; a=rsa-sha256; cv=none; b=PF3S22iuyv/X1Or4HhIFzleQfipYULcNhTEYBrpedqg+VUurJ5mPoZqmY1e59BPHtyw2+0 6Z3FAPnqDo7gYP9x1+5sAxvuZjZq3dVuH/wR3Sx5UWpBquhARp4bXjNc2WMDRTvSvpER1N Lmdxq2hFb6lS27mDKwXKhwKasCCVzJs= 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=YLa4HUex8/bG4yUSqFwJp3NxJNy5ji4AjU0vaS24NpE=; b=QfrgKkzLR29gB3iOewPE4iYJxs QtWtpERfgh33KhuP9fM4CvxU2ztdMs0g96ZTmklXK2ZqKLyb3CA8IczExZaTt8kHHTgP88bMzLb9H 47y5gQx1FN0Pb04ji0qDxAbgQ135enJ9X6AuqtmTiRCrj4p6rV5wQxVz5utRq9d9w3uiyuEPgAOR0 t52gkiur8X0rG2Xdcx1cKyNJMMm7iAFiCZxjyCllHEBPuAtzXv4F3N8KVPohv76VDvCmspM0eaW2e QOHsIjP69leW80Ur+Tn/W0BGhdB/k4o5wN0xS1GEw2YHn4Sy4QfQPgFC7oZLOU1LSCd60j0FBySXE WUVwbMiQ==; Received: from willy by casper.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpD13-000000029i7-42DQ; Tue, 26 Mar 2024 20:03:26 +0000 Date: Tue, 26 Mar 2024 20:03:25 +0000 From: Matthew Wilcox To: Kairui Song Cc: linux-mm@kvack.org, "Huang, Ying" , Chris Li , Minchan Kim , Barry Song , Ryan Roberts , Yu Zhao , SeongJae Park , David Hildenbrand , Yosry Ahmed , Johannes Weiner , Nhat Pham , Chengming Zhou , Andrew Morton , linux-kernel@vger.kernel.org Subject: Re: [RFC PATCH 03/10] mm/swap: convert swapin_readahead to return a folio Message-ID: References: <20240326185032.72159-1-ryncsn@gmail.com> <20240326185032.72159-4-ryncsn@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240326185032.72159-4-ryncsn@gmail.com> X-Rspamd-Queue-Id: 8CCCF40019 X-Rspam-User: X-Stat-Signature: 34qbr7todtmj7qjwwpuc6usi8rdmbt9h X-Rspamd-Server: rspam01 X-HE-Tag: 1711483421-488234 X-HE-Meta: U2FsdGVkX19rtZV+f90eC0LzDfIFvhpu2Qk88vEdgqf2T0gBXVuirSdf4HYtiaWtsqUYLhNN4cnHiR8nBM0yncKq549NinZpyP9JNp9xNAkEpb1X8wwVm7JwKztlnU08QYFzCWREfiSURpIf2SI5H+kJsKUvmieVaAbqb8dJqaTbURBcq4hP4HjUpyovgGbhdIhbuMatf2B4qECzofbdYuMIPuDf4pGFlD1/j5y3YM/uIJPvaCRBN2kz1T0xik9ERC9cG+fH6e9wZvkmpwC3li+zq9wfCR4ceFcay1PtKwTrAYLJKlO4S4j4ddTwc4z/3G6xjtDTWVMGpYahayEasMHoqSOuG+JCdPzrtQM76rFsoqRJaU0PIHdYZbCD4Q8LUamux5v/dB7Y8b/4tOCIKXVQL81Uen4A9SJbAOnW8BvHv1FG1H/jOzyh04xsO0NT0hysAddV5crSGLBZvMS1ZAixzxPkA+VyC5AvW1zzb1lpEXABaveciKju2Cp5RqPXTsQI219GvmwL4RrmG2qI18xv79wJmwt02X9nKWah9067LEf7vN1exydXE1547FLCfTvBQnZ1Zh9tYOnGIejBW74n4oKokUqmBxURVW3Yz5jgHaNSMpIG8xzGa86db2W7p3+zuFE3g/pQPDlPBkcKY8F+vekpYOknDY0AjrZkUD7aXyPvU1ERNRqkK7mPxSY5l7U2/W28qIwjCncEzLTymR2c9U9JXmh0xWc6mwClrQQdppb2cyKpJ1HVM455kMPdci7EDWkp38RyHu8+vK+Zwdy422r23+bsLmri4369SZndqWpdTqfqAI7JcRTGzxt+6SIGc1nzK3qM0PHsWUArXH6ufyO+HY6MRabwX/zoe/kPan1OhLM9jRAVd8EfjaIDtX3tEqIprHJ6WQ21zxMVXw6HnAT64fgfOAnW53xT3HiUENMYDj//iPx22m62HmCL6ERd7kvTh7PtNSlDKkq dhZjX25O Ttg+NLX0Y0v8zpXM/+AW/28SSH0zZM4Gbpg6D2UxfXPTNmo4fgno1KZ8qcMOTSOuPkdIFjjdYBYNB/WdayQCSGtYbMnTiV+4PqEgds+Ee4US0ezgy76IXAu0KVGziZR0XKuxtZ2V5jhtC3bKORl1JsUV4WDpL04NUBrZKdtwdWquaDUaIgU3tGO/LeZWni+rtTMiW09PPu4Mjuxgiych/+SydzMBkghMkVTqzqmla1Xq0j5319aFV+JBHfqacwQjf6VIQSi6dhboIirGA1tAMTjQrchv7szO6I23sK9x27enTqTn6DlAJbAtEGA== 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 Wed, Mar 27, 2024 at 02:50:25AM +0800, Kairui Song wrote: > From: Kairui Song > > Simplify the caller code logic. > > Signed-off-by: Kairui Song I have this patch in my tree which is basically identical, but I think has a slightly better commit message. Feel free to merge the two. >From 0c17eefb4c1ca7733ca765ab2f28ee09c9110ec0 Mon Sep 17 00:00:00 2001 From: "Matthew Wilcox (Oracle)" Date: Fri, 22 Mar 2024 13:28:33 -0400 Subject: [PATCH] mm: Return the folio from swapin_readahead The unuse_pte_range() caller only wants the folio while do_swap_page() wants both the page and the folio. Since do_swap_page() already has logic for handling both the folio and the page, move the folio-to-page logic there. This also lets us allocate larger folios in the SWP_SYNCHRONOUS_IO path in future. Signed-off-by: Matthew Wilcox (Oracle) --- mm/memory.c | 6 ++---- mm/swap.h | 6 +++--- mm/swap_state.c | 8 +++----- mm/swapfile.c | 5 +---- 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 40070ef01867..aedf0ee554d1 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4020,7 +4020,6 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) /* skip swapcache */ folio = vma_alloc_folio(GFP_HIGHUSER_MOVABLE, 0, vma, vmf->address, false); - page = &folio->page; if (folio) { __folio_set_locked(folio); __folio_set_swapbacked(folio); @@ -4045,10 +4044,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) folio->private = NULL; } } else { - page = swapin_readahead(entry, GFP_HIGHUSER_MOVABLE, + folio = swapin_readahead(entry, GFP_HIGHUSER_MOVABLE, vmf); - if (page) - folio = page_folio(page); swapcache = folio; } @@ -4069,6 +4066,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) ret = VM_FAULT_MAJOR; count_vm_event(PGMAJFAULT); count_memcg_event_mm(vma->vm_mm, PGMAJFAULT); + page = folio_file_page(folio, swp_offset(entry)); } else if (PageHWPoison(page)) { /* * hwpoisoned dirty swapcache pages are kept for killing diff --git a/mm/swap.h b/mm/swap.h index fc2f6ade7f80..6661b55b2c75 100644 --- a/mm/swap.h +++ b/mm/swap.h @@ -55,8 +55,8 @@ struct folio *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_flags, bool skip_if_exists); struct folio *swap_cluster_readahead(swp_entry_t entry, gfp_t flag, struct mempolicy *mpol, pgoff_t ilx); -struct page *swapin_readahead(swp_entry_t entry, gfp_t flag, - struct vm_fault *vmf); +struct folio *swapin_readahead(swp_entry_t entry, gfp_t flag, + struct vm_fault *vmf); static inline unsigned int folio_swap_flags(struct folio *folio) { @@ -87,7 +87,7 @@ static inline struct folio *swap_cluster_readahead(swp_entry_t entry, return NULL; } -static inline struct page *swapin_readahead(swp_entry_t swp, gfp_t gfp_mask, +static inline struct folio *swapin_readahead(swp_entry_t swp, gfp_t gfp_mask, struct vm_fault *vmf) { return NULL; diff --git a/mm/swap_state.c b/mm/swap_state.c index 2deac23633cd..f3c379e93bc6 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -885,13 +885,13 @@ static struct folio *swap_vma_readahead(swp_entry_t targ_entry, gfp_t gfp_mask, * @gfp_mask: memory allocation flags * @vmf: fault information * - * Returns the struct page for entry and addr, after queueing swapin. + * Returns the struct folio for entry and addr, after queueing swapin. * * It's a main entry function for swap readahead. By the configuration, * it will read ahead blocks by cluster-based(ie, physical disk based) * or vma-based(ie, virtual address based on faulty address) readahead. */ -struct page *swapin_readahead(swp_entry_t entry, gfp_t gfp_mask, +struct folio *swapin_readahead(swp_entry_t entry, gfp_t gfp_mask, struct vm_fault *vmf) { struct mempolicy *mpol; @@ -904,9 +904,7 @@ struct page *swapin_readahead(swp_entry_t entry, gfp_t gfp_mask, swap_cluster_readahead(entry, gfp_mask, mpol, ilx); mpol_cond_put(mpol); - if (!folio) - return NULL; - return folio_file_page(folio, swp_offset(entry)); + return folio; } #ifdef CONFIG_SYSFS diff --git a/mm/swapfile.c b/mm/swapfile.c index 5e6d2304a2a4..c9d041ad8df6 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1883,7 +1883,6 @@ static int unuse_pte_range(struct vm_area_struct *vma, pmd_t *pmd, folio = swap_cache_get_folio(entry, vma, addr); if (!folio) { - struct page *page; struct vm_fault vmf = { .vma = vma, .address = addr, @@ -1891,10 +1890,8 @@ static int unuse_pte_range(struct vm_area_struct *vma, pmd_t *pmd, .pmd = pmd, }; - page = swapin_readahead(entry, GFP_HIGHUSER_MOVABLE, + folio = swapin_readahead(entry, GFP_HIGHUSER_MOVABLE, &vmf); - if (page) - folio = page_folio(page); } if (!folio) { swp_count = READ_ONCE(si->swap_map[offset]); -- 2.43.0 > mm/memory.c | 8 +++----- > mm/swap.h | 4 ++-- > mm/swap_state.c | 6 ++---- > mm/swapfile.c | 5 +---- > 4 files changed, 8 insertions(+), 15 deletions(-) > > diff --git a/mm/memory.c b/mm/memory.c > index e42fadc25268..dfdb620a9123 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -4005,12 +4005,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > if (PTR_ERR(folio) == -EBUSY) > goto out; > need_clear_cache = true; > - page = &folio->page; > } else { > - page = swapin_readahead(entry, GFP_HIGHUSER_MOVABLE, > - vmf); > - if (page) > - folio = page_folio(page); > + folio = swapin_readahead(entry, GFP_HIGHUSER_MOVABLE, vmf); > swapcache = folio; > } > > @@ -4027,6 +4023,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > goto unlock; > } > > + page = folio_file_page(folio, swp_offset(entry)); > + > /* Had to read the page from swap area: Major fault */ > ret = VM_FAULT_MAJOR; > count_vm_event(PGMAJFAULT); > diff --git a/mm/swap.h b/mm/swap.h > index 40e902812cc5..aee134907a70 100644 > --- a/mm/swap.h > +++ b/mm/swap.h > @@ -57,7 +57,7 @@ struct folio *swap_cluster_readahead(swp_entry_t entry, gfp_t flag, > struct mempolicy *mpol, pgoff_t ilx); > struct folio *swapin_direct(swp_entry_t entry, gfp_t flag, > struct vm_fault *vmf); > -struct page *swapin_readahead(swp_entry_t entry, gfp_t flag, > +struct folio *swapin_readahead(swp_entry_t entry, gfp_t flag, > struct vm_fault *vmf); > > static inline unsigned int folio_swap_flags(struct folio *folio) > @@ -95,7 +95,7 @@ static inline struct folio *swapin_direct(swp_entry_t entry, gfp_t flag, > return NULL; > } > > -static inline struct page *swapin_readahead(swp_entry_t swp, gfp_t gfp_mask, > +static inline struct folio *swapin_readahead(swp_entry_t swp, gfp_t gfp_mask, > struct vm_fault *vmf) > { > return NULL; > diff --git a/mm/swap_state.c b/mm/swap_state.c > index 0a3fa48b3893..2a9c6bdff5ea 100644 > --- a/mm/swap_state.c > +++ b/mm/swap_state.c > @@ -951,7 +951,7 @@ struct folio *swapin_direct(swp_entry_t entry, gfp_t gfp_mask, > * it will read ahead blocks by cluster-based(ie, physical disk based) > * or vma-based(ie, virtual address based on faulty address) readahead. > */ > -struct page *swapin_readahead(swp_entry_t entry, gfp_t gfp_mask, > +struct folio *swapin_readahead(swp_entry_t entry, gfp_t gfp_mask, > struct vm_fault *vmf) > { > struct mempolicy *mpol; > @@ -964,9 +964,7 @@ struct page *swapin_readahead(swp_entry_t entry, gfp_t gfp_mask, > swap_cluster_readahead(entry, gfp_mask, mpol, ilx); > mpol_cond_put(mpol); > > - if (!folio) > - return NULL; > - return folio_file_page(folio, swp_offset(entry)); > + return folio; > } > > #ifdef CONFIG_SYSFS > diff --git a/mm/swapfile.c b/mm/swapfile.c > index 4919423cce76..4dd894395a0f 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -1883,7 +1883,6 @@ static int unuse_pte_range(struct vm_area_struct *vma, pmd_t *pmd, > > folio = swap_cache_get_folio(entry, vma, addr); > if (!folio) { > - struct page *page; > struct vm_fault vmf = { > .vma = vma, > .address = addr, > @@ -1891,10 +1890,8 @@ static int unuse_pte_range(struct vm_area_struct *vma, pmd_t *pmd, > .pmd = pmd, > }; > > - page = swapin_readahead(entry, GFP_HIGHUSER_MOVABLE, > + folio = swapin_readahead(entry, GFP_HIGHUSER_MOVABLE, > &vmf); > - if (page) > - folio = page_folio(page); > } > if (!folio) { > swp_count = READ_ONCE(si->swap_map[offset]); > -- > 2.43.0 >