From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C31123A6EED for ; Fri, 10 Jul 2026 05:59:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783663192; cv=none; b=FUbx6b9noa9ZvwGucjnuPLo9lH513vBBZ8WW88gwc2qVx5EgvqiS5/246HKRJtuViuAGMsI21+8tEltVnjstdzI/VxKbLlhoWngb/7aqNJ2aKeMOU7rCEfFzVTwJzgZzwKP9bkoueJ3d0GowCzh0J/NwWiythFJwtB/v2DQpeuI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783663192; c=relaxed/simple; bh=FTNvFo8zJJiC9Sw9FEkIdDyjrgMmiRN2wZltHnRPR6A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R/ISij0zd4rvGKs4ykzlrNMTUO3udXgmYWu57NuME6FEXq+tImNLBVaakaEipDYpyUlaFU07JmEW4r4DTQYwv8quB5+/Glgwa/f6SBt+F0pElx/2Urwbfr+Lvh6uw1s/fN6hLEfyXGeBK9M0NkpR1yct+SlpGILBcaRdAgwWIqU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=et0TOOI6; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="et0TOOI6" Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 916C91FC7; Thu, 9 Jul 2026 22:59:45 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-01.blr.arm.com (cesw-amp-gbt-1s-m12830-01.blr.arm.com [10.164.195.33]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 90D673F85F; Thu, 9 Jul 2026 22:59:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1783663189; bh=FTNvFo8zJJiC9Sw9FEkIdDyjrgMmiRN2wZltHnRPR6A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=et0TOOI6ceXcgTO3k2Y3sElxu8IwptHF2mHDX/rWBFcZsPha/M8RGlmRn6sxHOIv9 QcPGKmiU+NUgePZV7vy7CD/mtcbeLq1KTmCzjx06iwU9dFN/dgYRK0NXr9ksEgSsbm xL7FioeDuJJy5vyS1ebTFGqpfwPxUDASLyCABHj8= From: Dev Jain To: akpm@linux-foundation.org, david@kernel.org, ljs@kernel.org, muchun.song@linux.dev, osalvador@suse.de Cc: Dev Jain , riel@surriel.com, liam@infradead.org, vbabka@kernel.org, harry@kernel.org, jannh@google.com, lance.yang@linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org, ryan.roberts@arm.com, anshuman.khandual@arm.com Subject: [PATCH v2 5/5] mm/rmap: add anon folio unmap dispatcher Date: Fri, 10 Jul 2026 05:59:14 +0000 Message-ID: <20260710055915.638659-6-dev.jain@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260710055915.638659-1-dev.jain@arm.com> References: <20260710055915.638659-1-dev.jain@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add ttu_anon_folio() as the common entry point for anonymous folio unmapping. It dispatches to the lazyfree or swapbacked helper as appropriate. Keep restoration of cleared PTEs in the caller, where the PTEs were removed. No functional change intended. Signed-off-by: Dev Jain --- mm/rmap.c | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 68459f23f5c0a..55aa3ff8bf216 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -2172,6 +2172,28 @@ static bool ttu_anon_swapbacked_folio(struct vm_area_struct *vma, return true; } +static bool ttu_anon_folio(struct vm_area_struct *vma, struct folio *folio, + struct page *page, unsigned long address, pte_t *ptep, + pte_t pteval, unsigned long nr_pages) +{ + /* + * Store the swap location in the pte. + * See handle_pte_fault() ... + */ + if (unlikely(folio_test_swapbacked(folio) != + folio_test_swapcache(folio))) { + WARN_ON_ONCE(1); + return false; + } + + if (!folio_test_swapbacked(folio)) + return ttu_anon_lazyfree_folio(vma, folio, nr_pages); + + /* nr_pages > 1 not supported yet */ + return ttu_anon_swapbacked_folio(vma, folio, page, address, ptep, + pteval); +} + /* * @arg: enum ttu_flags will be passed to this argument */ @@ -2352,31 +2374,12 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, */ dec_mm_counter(mm, mm_counter(folio)); } else if (folio_test_anon(folio)) { - /* - * Store the swap location in the pte. - * See handle_pte_fault() ... - */ - if (unlikely(folio_test_swapbacked(folio) != - folio_test_swapcache(folio))) { - WARN_ON_ONCE(1); + if (!ttu_anon_folio(vma, folio, page, address, + pvmw.pte, pteval, nr_pages)) { + set_ptes(mm, address, pvmw.pte, pteval, nr_pages); goto walk_abort; } - /* MADV_FREE page check */ - if (!folio_test_swapbacked(folio)) { - if (!ttu_anon_lazyfree_folio(vma, folio, - nr_pages)) { - set_ptes(mm, address, pvmw.pte, pteval, nr_pages); - goto walk_abort; - } - goto finish_unmap; - } - - if (!ttu_anon_swapbacked_folio(vma, folio, page, address, - pvmw.pte, pteval)) { - set_pte_at(mm, address, pvmw.pte, pteval); - goto walk_abort; - } goto finish_unmap; } else { /* -- 2.43.0