From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-io1-f48.google.com (mail-io1-f48.google.com [209.85.166.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E53AF2D5930 for ; Wed, 3 Sep 2025 17:41:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756921314; cv=none; b=BOA6+bIDyqtgUd4ZUCX0tp5OmHBhMkXvzE6h1JDqq7hByGc+kmNOv7r5qLhYwud/os3UHPAXzVdEyBnpuKP/YhsGEB1vZx2LvtfVPk5mTbR8+sN2nSrTBPlIro9hufX1t9DUoZgr3jZiYFFw1wlzT2/MKSRZ9xABagJxo/yOA/c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756921314; c=relaxed/simple; bh=gd8pqSVGzIQ/I81ux9RqVFe036r1giMHglzTbxRsuuE=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=MC24lvqj8G4GguthFpXk01iiFkHegmdmnaODvrySvpDzBhWAiJZ0CYdWJdVRR2oBVWqSeXMiLW8xWCCu+O00+SutHzz0B0eDuVVevwhHvcXkTH6O7wyuQLZw2SyD6XdDjMqHyP3Av/jdHItFMluHTiEEH2/u0mnEjXsrVM4RbYA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=eWnr4fRm; arc=none smtp.client-ip=209.85.166.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eWnr4fRm" Received: by mail-io1-f48.google.com with SMTP id ca18e2360f4ac-88735894d29so8171939f.1 for ; Wed, 03 Sep 2025 10:41:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756921311; x=1757526111; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=B2rifCSawIzOi8vgwTJd+B+H/b1XHeNN66Su7lbem9s=; b=eWnr4fRmMSHn9mT3Exn33kt3X5XgXe4svTJLz4rUuCTqFFsWnIsu4T4wNrqLU8XuJE YFTeIs5Lv14xSuQqRqaBoBLzCqz9YNwn5P7/6Txb6QZxGCIXqpSOGM4ILKizqhBHk1aF lAyu80d/aC3i3jUV8r+qxpaUiwJcnwMWdTf5sGPp6ZHSC35l8isWDcxiLsCnOEL10WlS f2CYicFcnD6G0oLDJa3uzD1EnkC3E2QLZ2JBY9wmKPRmF1N+5zt4GLayB3yxlSR1Ayn1 4mO0SDt0JXeizZs7Dt1U+Oyvr5ZpdvJVkcw9owMs7FToMHwcSr2AXSCwhnHqGCAAHxgy YW1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756921311; x=1757526111; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B2rifCSawIzOi8vgwTJd+B+H/b1XHeNN66Su7lbem9s=; b=ehpp6h2PF1qfJGl2II+OHWAGOYqd+yfMD1MhBqZocUvXgxbkBk6qHxllzrpBdYKWPI 73nT6Vfc+HT3pAzirA5zCwCOT9c88K5TOcOk+UCcbe6i5WSUsOl94HYOfe1amn/j5u2M snUHzggP3zitNupR8cNH2j4zTImpUd1A5/SDFnEdPd8Ewqwu4Fm2EczcDLojH/L+f6GO yNkirCjcWtTPy4BZ3N2usdx4CSBTyA7gDb1sjXlYVASFXkEREFCjC3ImTF2kyby8FgMM bOtD3dv5jSlMyJ0+JJlzGkB77YTryZFcbr57tLXGUAXNvKw2hS3XnhAq/3d2A67H5x0V b2HQ== X-Forwarded-Encrypted: i=1; AJvYcCXG6uReEXfLG5Vw+cY9s9g29V//45dOQCNCTR0vhF6On+zob3XnXNvih3Dj3mBj9sTPUUuzc1McA+t5aLQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwWx3rfcpGrQ4JNNSGhpHhrwMqj/zI3MK4wlqKhZpZBTj2zA9Cg +PI444Drrm0ZaDFx/Y65wIEhFnwttGIBHFXwzp/TJr9PYUvIzmFh9TdI23hlOXGbl4btum9pqrd pK8ayOxsSQ+KRww+hBvLnhVA+gBp+ze8= X-Gm-Gg: ASbGncsBgODCknsFdhBTLBgrUe73LV6q6okjv/TavU0qNWcnKnXtsDoPAr3I1aC9eQY mCfDPLkhrtR1+AwC9J8EGlJTP8hPZm5fA+jsUKuM/bUzkuqkkUOsb0eT3P4PaZecGnfWACsoYwN ILMqd8DvKy1vwjcDCuTcqOpw4RF+OX7v95aM553mQ2suJxvrsdDvJEZewOe2hV6B/m7BUwxl5Ax 6gf X-Google-Smtp-Source: AGHT+IHRGYBhaH4a2/1W+w1i/hfdfD3R60H2jo1GjazUpX0ccoDYHvvujlerUh1Hpa+v0V24YT26tm/4gh7VTgYta3A= X-Received: by 2002:a05:6602:3e85:b0:887:5dc8:fc0b with SMTP id ca18e2360f4ac-8875dc8fea9mr75929239f.13.1756921310773; Wed, 03 Sep 2025 10:41:50 -0700 (PDT) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 References: <20250822192023.13477-1-ryncsn@gmail.com> <20250822192023.13477-2-ryncsn@gmail.com> In-Reply-To: <20250822192023.13477-2-ryncsn@gmail.com> From: Nhat Pham Date: Wed, 3 Sep 2025 10:41:38 -0700 X-Gm-Features: Ac12FXyYuQbDS5o--UYof7pVJ2z63Kz4KMhiTlOVGRty2sX47XKdTjHqmQ4FgWk Message-ID: Subject: Re: [PATCH 1/9] mm, swap: use unified helper for swap cache look up To: Kairui Song Cc: linux-mm@kvack.org, Andrew Morton , Matthew Wilcox , Hugh Dickins , Chris Li , Barry Song , Baoquan He , Kemeng Shi , Baolin Wang , Ying Huang , Johannes Weiner , David Hildenbrand , Yosry Ahmed , Lorenzo Stoakes , Zi Yan , linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, Aug 22, 2025 at 12:20=E2=80=AFPM Kairui Song wro= te: > > From: Kairui Song > > Always use swap_cache_get_folio for swap cache folio look up. The reason > we are not using it in all places is that it also updates the readahead > info, and some callsites want to avoid that. > > So decouple readahead update with swap cache lookup into a standalone > helper, let the caller call the readahead update helper if that's > needed. And convert all swap cache lookups to use swap_cache_get_folio. > > After this commit, there are only three special cases for accessing swap > cache space now: huge memory splitting, migration and shmem replacing, > because they need to lock the Xarray. Following commits will wrap their > accesses to the swap cache too with special helpers. > > Signed-off-by: Kairui Song My personal taste is we should have one patch to do the decoupling of readahead update and the swapcache lookup, then another patch to use the swapcache lookup helper in places that previously cannot be used (due to the coupling of swapcache and readahead). But, this looks good to me :) Feel free to add: Acked-by: Nhat Pham > --- > mm/memory.c | 6 ++- > mm/mincore.c | 3 +- > mm/shmem.c | 4 +- > mm/swap.h | 13 +++++-- > mm/swap_state.c | 99 +++++++++++++++++++++++------------------------- > mm/swapfile.c | 11 +++--- > mm/userfaultfd.c | 5 +-- > 7 files changed, 72 insertions(+), 69 deletions(-) > > diff --git a/mm/memory.c b/mm/memory.c > index d9de6c056179..10ef528a5f44 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -4660,9 +4660,11 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > if (unlikely(!si)) > goto out; > > - folio =3D swap_cache_get_folio(entry, vma, vmf->address); > - if (folio) > + folio =3D swap_cache_get_folio(entry); > + if (folio) { > + swap_update_readahead(folio, vma, vmf->address); > page =3D folio_file_page(folio, swp_offset(entry)); > + } > swapcache =3D folio; > > if (!folio) { > diff --git a/mm/mincore.c b/mm/mincore.c > index 2f3e1816a30d..8ec4719370e1 100644 > --- a/mm/mincore.c > +++ b/mm/mincore.c > @@ -76,8 +76,7 @@ static unsigned char mincore_swap(swp_entry_t entry, bo= ol shmem) > if (!si) > return 0; > } > - folio =3D filemap_get_entry(swap_address_space(entry), > - swap_cache_index(entry)); > + folio =3D swap_cache_get_folio(entry); > if (shmem) > put_swap_device(si); > /* The swap cache space contains either folio, shadow or NULL */ > diff --git a/mm/shmem.c b/mm/shmem.c > index 13cc51df3893..e9d0d2784cd5 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -2354,7 +2354,7 @@ static int shmem_swapin_folio(struct inode *inode, = pgoff_t index, > } > > /* Look it up and read it in.. */ > - folio =3D swap_cache_get_folio(swap, NULL, 0); > + folio =3D swap_cache_get_folio(swap); > if (!folio) { > if (data_race(si->flags & SWP_SYNCHRONOUS_IO)) { > /* Direct swapin skipping swap cache & readahead = */ > @@ -2379,6 +2379,8 @@ static int shmem_swapin_folio(struct inode *inode, = pgoff_t index, > count_vm_event(PGMAJFAULT); > count_memcg_event_mm(fault_mm, PGMAJFAULT); > } > + } else { > + swap_update_readahead(folio, NULL, 0); > } > > if (order > folio_order(folio)) { > diff --git a/mm/swap.h b/mm/swap.h > index 1ae44d4193b1..efb6d7ff9f30 100644 > --- a/mm/swap.h > +++ b/mm/swap.h > @@ -62,8 +62,7 @@ void delete_from_swap_cache(struct folio *folio); > void clear_shadow_from_swap_cache(int type, unsigned long begin, > unsigned long end); > void swapcache_clear(struct swap_info_struct *si, swp_entry_t entry, int= nr); > -struct folio *swap_cache_get_folio(swp_entry_t entry, > - struct vm_area_struct *vma, unsigned long addr); > +struct folio *swap_cache_get_folio(swp_entry_t entry); > struct folio *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, > struct vm_area_struct *vma, unsigned long addr, > struct swap_iocb **plug); > @@ -74,6 +73,8 @@ struct folio *swap_cluster_readahead(swp_entry_t entry,= gfp_t flag, > struct mempolicy *mpol, pgoff_t ilx); > struct folio *swapin_readahead(swp_entry_t entry, gfp_t flag, > struct vm_fault *vmf); > +void swap_update_readahead(struct folio *folio, struct vm_area_struct *v= ma, > + unsigned long addr); > > static inline unsigned int folio_swap_flags(struct folio *folio) > { > @@ -159,6 +160,11 @@ static inline struct folio *swapin_readahead(swp_ent= ry_t swp, gfp_t gfp_mask, > return NULL; > } > > +static inline void swap_update_readahead(struct folio *folio, > + struct vm_area_struct *vma, unsigned long addr) > +{ > +} > + > static inline int swap_writeout(struct folio *folio, > struct swap_iocb **swap_plug) > { > @@ -169,8 +175,7 @@ static inline void swapcache_clear(struct swap_info_s= truct *si, swp_entry_t entr > { > } > > -static inline struct folio *swap_cache_get_folio(swp_entry_t entry, > - struct vm_area_struct *vma, unsigned long addr) > +static inline struct folio *swap_cache_get_folio(swp_entry_t entry) > { > return NULL; > } > diff --git a/mm/swap_state.c b/mm/swap_state.c > index 99513b74b5d8..ff9eb761a103 100644 > --- a/mm/swap_state.c > +++ b/mm/swap_state.c > @@ -69,6 +69,21 @@ void show_swap_cache_info(void) > printk("Total swap =3D %lukB\n", K(total_swap_pages)); > } > > +/* > + * Lookup a swap entry in the swap cache. A found folio will be returned > + * unlocked and with its refcount incremented. > + * > + * Caller must lock the swap device or hold a reference to keep it valid= . > + */ > +struct folio *swap_cache_get_folio(swp_entry_t entry) > +{ > + struct folio *folio =3D filemap_get_folio(swap_address_space(entr= y), > + swap_cache_index(entry)); > + if (!IS_ERR(folio)) > + return folio; > + return NULL; > +} > + > void *get_shadow_from_swap_cache(swp_entry_t entry) > { > struct address_space *address_space =3D swap_address_space(entry)= ; > @@ -273,54 +288,40 @@ static inline bool swap_use_vma_readahead(void) > } > > /* > - * Lookup a swap entry in the swap cache. A found folio will be returned > - * unlocked and with its refcount incremented - we rely on the kernel > - * lock getting page table operations atomic even if we drop the folio > - * lock before returning. > - * > - * Caller must lock the swap device or hold a reference to keep it valid= . > + * Update the readahead statistics of a vma or globally. > */ > -struct folio *swap_cache_get_folio(swp_entry_t entry, > - struct vm_area_struct *vma, unsigned long addr) > +void swap_update_readahead(struct folio *folio, > + struct vm_area_struct *vma, > + unsigned long addr) > { > - struct folio *folio; > - > - folio =3D filemap_get_folio(swap_address_space(entry), swap_cache= _index(entry)); > - if (!IS_ERR(folio)) { > - bool vma_ra =3D swap_use_vma_readahead(); > - bool readahead; > + bool readahead, vma_ra =3D swap_use_vma_readahead(); > > - /* > - * At the moment, we don't support PG_readahead for anon = THP > - * so let's bail out rather than confusing the readahead = stat. > - */ > - if (unlikely(folio_test_large(folio))) > - return folio; > - > - readahead =3D folio_test_clear_readahead(folio); > - if (vma && vma_ra) { > - unsigned long ra_val; > - int win, hits; > - > - ra_val =3D GET_SWAP_RA_VAL(vma); > - win =3D SWAP_RA_WIN(ra_val); > - hits =3D SWAP_RA_HITS(ra_val); > - if (readahead) > - hits =3D min_t(int, hits + 1, SWAP_RA_HIT= S_MAX); > - atomic_long_set(&vma->swap_readahead_info, > - SWAP_RA_VAL(addr, win, hits)); > - } > - > - if (readahead) { > - count_vm_event(SWAP_RA_HIT); > - if (!vma || !vma_ra) > - atomic_inc(&swapin_readahead_hits); > - } > - } else { > - folio =3D NULL; > + /* > + * At the moment, we don't support PG_readahead for anon THP > + * so let's bail out rather than confusing the readahead stat. > + */ > + if (unlikely(folio_test_large(folio))) > + return; > + > + readahead =3D folio_test_clear_readahead(folio); > + if (vma && vma_ra) { > + unsigned long ra_val; > + int win, hits; > + > + ra_val =3D GET_SWAP_RA_VAL(vma); > + win =3D SWAP_RA_WIN(ra_val); > + hits =3D SWAP_RA_HITS(ra_val); > + if (readahead) > + hits =3D min_t(int, hits + 1, SWAP_RA_HITS_MAX); > + atomic_long_set(&vma->swap_readahead_info, > + SWAP_RA_VAL(addr, win, hits)); > } > > - return folio; > + if (readahead) { > + count_vm_event(SWAP_RA_HIT); > + if (!vma || !vma_ra) > + atomic_inc(&swapin_readahead_hits); > + } > } > > struct folio *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, > @@ -336,14 +337,10 @@ struct folio *__read_swap_cache_async(swp_entry_t e= ntry, gfp_t gfp_mask, > *new_page_allocated =3D false; > 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. > - */ > - folio =3D filemap_get_folio(swap_address_space(entry), > - swap_cache_index(entry)); > - if (!IS_ERR(folio)) > + > + /* Check the swap cache in case the folio is already ther= e */ > + folio =3D swap_cache_get_folio(entry); > + if (folio) > goto got_folio; > > /* > diff --git a/mm/swapfile.c b/mm/swapfile.c > index a7ffabbe65ef..4b8ab2cb49ca 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -213,15 +213,14 @@ static int __try_to_reclaim_swap(struct swap_info_s= truct *si, > unsigned long offset, unsigned long flag= s) > { > swp_entry_t entry =3D swp_entry(si->type, offset); > - struct address_space *address_space =3D swap_address_space(entry)= ; > struct swap_cluster_info *ci; > struct folio *folio; > int ret, nr_pages; > bool need_reclaim; > > again: > - folio =3D filemap_get_folio(address_space, swap_cache_index(entry= )); > - if (IS_ERR(folio)) > + folio =3D swap_cache_get_folio(entry); > + if (!folio) > return 0; > > nr_pages =3D folio_nr_pages(folio); > @@ -2131,7 +2130,7 @@ static int unuse_pte_range(struct vm_area_struct *v= ma, pmd_t *pmd, > pte_unmap(pte); > pte =3D NULL; > > - folio =3D swap_cache_get_folio(entry, vma, addr); > + folio =3D swap_cache_get_folio(entry); > if (!folio) { > struct vm_fault vmf =3D { > .vma =3D vma, > @@ -2357,8 +2356,8 @@ static int try_to_unuse(unsigned int type) > (i =3D find_next_to_unuse(si, i)) !=3D 0) { > > entry =3D swp_entry(type, i); > - folio =3D filemap_get_folio(swap_address_space(entry), sw= ap_cache_index(entry)); > - if (IS_ERR(folio)) > + folio =3D swap_cache_get_folio(entry); > + if (!folio) > continue; > > /* > diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c > index 50aaa8dcd24c..af61b95c89e4 100644 > --- a/mm/userfaultfd.c > +++ b/mm/userfaultfd.c > @@ -1489,9 +1489,8 @@ static long move_pages_ptes(struct mm_struct *mm, p= md_t *dst_pmd, pmd_t *src_pmd > * separately to allow proper handling. > */ > if (!src_folio) > - folio =3D filemap_get_folio(swap_address_space(en= try), > - swap_cache_index(entry)); > - if (!IS_ERR_OR_NULL(folio)) { > + folio =3D swap_cache_get_folio(entry); > + if (folio) { > if (folio_test_large(folio)) { > ret =3D -EBUSY; > folio_put(folio); > -- > 2.51.0 >