From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 439C52DECCB for ; Tue, 30 Jun 2026 05:48:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782798519; cv=none; b=ZUbjMiXIpqITPDkVtegO0Bztxfnqx7//Dtgm+uGP4HpV7k6OutkMW3tGEP72e+45C2kQhtqS2s3Xzs/1hKG0rKLECFqv5+H8oS9nsPBo5lphMUVX6N0i3X1bDXy1dR1Fh7kDTI4N5i332KxmmfJIUsxt7Htp45HL/TfqWPsTsr4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782798519; c=relaxed/simple; bh=xKEH+0d/3O6wqvx2qWbwRyatphGNsuh2ZbQ6nrliYsY=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=L3kk8pp3TNl6preb0xrXW69bsErQ51Xj5YE3gvFVvMhfF8BiZ59phW3zOR3W9cw6Ay/54v4Y7TTi7UyKUFa339WCiBD02/BxHYl2KIpaWGOG3Y/HjqfNmCWG49CSW1XNHMA26x/MSfJDcejgOeI8TWtV+7I3qvT1CRJdwXnaWfE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kIRh9tiq; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kIRh9tiq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40F4A1F000E9; Tue, 30 Jun 2026 05:48:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1782798518; bh=jupNvdmFnR/Px+8NpmjXUojkBHAB6uqajDM8/BZw794=; h=Date:Subject:To:Cc:References:From:In-Reply-To; b=kIRh9tiqXn8no/E4hXCG4xXv7n5WlJFXAoWv/Yjzf2+lGRElBKyyydjumSSmjdhzV 6YaZZHr5VBWeaVZVU6ofy9SCnaUrVabh/MiB9it3pplV8JZ2x3kx/VNBNOGErrEt+L EpWEMnO+X13LV5/0xIGUlZP9BFP4g34Ur7B7x6wODFtqLmXNw/X5uMuMlIg3r+bWVy zTDHJU20r7mPHPCEnVjNCOJeiE17x5hjblndbBZ1xz3GHLg6ZU5a8wlulEkK2ypZbu YHx6sXvLpLw808UB+1N9Hju/JEcWrXRSoI65d4KZFWz/QyiEla1R2pbSnbqXNHnCZy 0LbRQAmHlHHyw== Message-ID: <1e7a712b-33f4-44c2-85ed-6333ddca421c@kernel.org> Date: Tue, 30 Jun 2026 07:48:32 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 4/4] mm: try to free swapcache for non-LRU folios To: Barry Song Cc: Kairui Song , akpm@linux-foundation.org, linux-mm@kvack.org, baoquan.he@linux.dev, chrisl@kernel.org, jp.kobryn@linux.dev, kasong@tencent.com, liam@infradead.org, linux-kernel@vger.kernel.org, ljs@kernel.org, mhocko@suse.com, nphamcs@gmail.com, rppt@kernel.org, shakeel.butt@linux.dev, shikemeng@huaweicloud.com, surenb@google.com, usama.arif@linux.dev, vbabka@kernel.org, youngjun.park@lge.com References: <20260623231635.43086-1-baohua@kernel.org> <20260623231635.43086-5-baohua@kernel.org> From: "David Hildenbrand (Arm)" Content-Language: en-US Autocrypt: addr=david@kernel.org; keydata= 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 qIws/H2t In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 6/30/26 01:59, Barry Song wrote: > On Sat, Jun 27, 2026 at 12:36 AM David Hildenbrand (Arm) > wrote: >> >>> >>> That's awkward, my bad, terribly sorry about this :( >>> >>> I sincerely apologize for the oversight and the trouble this has caused. >>> >> >> All good, I was just surprised to see a previous optimization partially >> reverted without a clear reasoning :) >> >> Because it should have removed the handling in should_try_to_free_swap() as well. >> >> It's good that we are discussing it now! >> >>> I haven't seen any performance regression in any workload recently >>> though, or any correctness issue, perhaps the round trip of >>> do_wp_page wasn't that bad. It should still catch the reuse folios, >>> just more costly than doing things in-place. >> >> Right, do_wp_page() handles it, after the page was mapped. It adds some overhead, >> but fortunately no TLB flush if we're just upgrading write permissions. >> >> The optimization dates back to pre PageAnonExclusive handling. >> >>> >>> I think we should restore the original check first. We might also want to >>> avoid dropping the swap cache if the folio will not be reused, which >>> was discussed here: >>> >>> https://lore.kernel.org/linux-mm/CAMgjq7BDfvNXdWH0cqarsujjUn3i3tDDhDkmSg01TR4h-tDorQ@mail.gmail.com/ >>> >>> Maybe extracting some common part into a helper can help make this >>> cleaner. >>> >>> >>> Hi Barry, >>> >>> The problem is more than that, the `exclusive || folio_ref_count(folio) == 1` >>> in do_swap_page is also ineffective now. >> >> Exactly. >> >> If the roundtrip through do_wp_page() is good enough today, we can just do >> >> @@ -4512,7 +4516,6 @@ static vm_fault_t remove_device_exclusive_entry(struct vm_fault *vmf) >> static inline bool should_try_to_free_swap(struct swap_info_struct *si, >> struct folio *folio, >> struct vm_area_struct *vma, >> - unsigned int extra_refs, >> unsigned int fault_flags) >> { >> if (!folio_test_swapcache(folio)) >> @@ -4528,14 +4531,7 @@ static inline bool should_try_to_free_swap(struct swap_info_struct *si, >> if (mem_cgroup_swap_full(folio) || (vma->vm_flags & VM_LOCKED) || >> folio_test_mlocked(folio)) >> return true; >> - /* >> - * If we want to map a page that's in the swapcache writable, we >> - * have to detect via the refcount if we're really the exclusive >> - * user. Try freeing the swapcache to get rid of the swapcache >> - * reference only in case it's likely that we'll be the exclusive user. >> - */ >> - return (fault_flags & FAULT_FLAG_WRITE) && !folio_test_ksm(folio) && >> - folio_ref_count(folio) == (extra_refs + folio_nr_pages(folio)); >> + return false; >> } >> >> static vm_fault_t pte_marker_clear(struct vm_fault *vmf) >> @@ -5095,7 +5091,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) >> * Do it after mapping, so raced page faults will likely see the folio >> * in swap cache and wait on the folio lock. >> */ >> - if (should_try_to_free_swap(si, folio, vma, nr_pages, vmf->flags)) >> + if (should_try_to_free_swap(si, folio, vma, vmf->flags)) >> folio_free_swap(folio); >> >> folio_unlock(folio); >> >> But then, one question is whether we'd actually want to try removing the swapcache when >> we mapped the page writable (iow: exclusive)? > > I guess this question comes from my earlier commit c18160dba5ff > ("mm: swap: reuse exclusive folio directly instead of wp page faults"), > where the folio is reused even for READ faults. In that case, we > would miss do_wp_page(), which could later drop the swapcache? > Also, again, nobody has reported any regression for this. > > Holding swapcache for a clean folio for non-sync swap I/O has the > benefit of avoiding a potential pageout(). Now, reuse even for read > faults and always dropping swapcache seems to somewhat defeat that > benefit. On the other hand, we always drop swapcache for sync I/O > to avoid the copy in zRAM or elsewhere consuming memory, so it seems > safe enough to always enable reuse in do_swap_page() for sync I/O. Right, I meant during write faults, when a write is expected. See below. > >> >> >> @@ -4512,7 +4516,7 @@ static vm_fault_t remove_device_exclusive_entry(struct vm_fault *vmf) >> static inline bool should_try_to_free_swap(struct swap_info_struct *si, >> struct folio *folio, >> struct vm_area_struct *vma, >> - unsigned int extra_refs, >> + bool exclusive, >> unsigned int fault_flags) >> { >> if (!folio_test_swapcache(folio)) >> @@ -4529,13 +4533,11 @@ static inline bool should_try_to_free_swap(struct swap_info_struct *si, >> folio_test_mlocked(folio)) >> return true; >> /* >> - * If we want to map a page that's in the swapcache writable, we >> - * have to detect via the refcount if we're really the exclusive >> - * user. Try freeing the swapcache to get rid of the swapcache >> - * reference only in case it's likely that we'll be the exclusive user. >> + * We have an exclusive page that was mapped writable or will soon >> + * be mapped writable (as we are in a write fault). Let's just try >> + * to reclaim swap immediately. >> */ >> - return (fault_flags & FAULT_FLAG_WRITE) && !folio_test_ksm(folio) && >> - folio_ref_count(folio) == (extra_refs + folio_nr_pages(folio)); >> + return (fault_flags & FAULT_FLAG_WRITE) && exclusive; > > I assume you mean (fault_flags & FAULT_FLAG_WRITE) || exclusive, or No, I meant "we are serving a write fault (write is definitely going to happen) and we are definitely reusing the page (exclusive). > we can just remove (fault_flags & FAULT_FLAG_WRITE) and use > "exclusive" instead since we are always using do_wp_page() now, If you drop the "FAULT_FLAG_WRITE", you'd remove clean pages (that will likely stay clean as no write fault) from the swapcache, As you correctly say above, can avoid a pageout(), so I think we should keep that. > and FAULT_FLAG_WRITE in fault_flags could have been cleared > by the reuse of do_swap_page(). Ah, yes, that existing handling is nasty. We should look into not messing with fault flags. Something like the following diff --git a/mm/memory.c b/mm/memory.c index ff338c2abe923..b0d8f3674525b 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5052,10 +5052,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) if ((vma->vm_flags & VM_WRITE) && !userfaultfd_pte_wp(vma, pte) && !pte_needs_soft_dirty_wp(vma, pte)) { pte = pte_mkwrite(pte, vma); - if (vmf->flags & FAULT_FLAG_WRITE) { + if (vmf->flags & FAULT_FLAG_WRITE) pte = pte_mkdirty(pte); - vmf->flags &= ~FAULT_FLAG_WRITE; - } } rmap_flags |= RMAP_EXCLUSIVE; } @@ -5112,7 +5110,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) folio_put(swapcache); } - if (vmf->flags & FAULT_FLAG_WRITE) { + if ((vmf->flags & FAULT_FLAG_WRITE) && !pte_write(pte)) { ret |= do_wp_page(vmf); if (ret & VM_FAULT_ERROR) ret &= VM_FAULT_ERROR; -- Cheers, David