Skip to contentSkip to conversation

sh-mm-cache-use-folio_mapped-in-copy_from_user_page.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message May 6, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: sh/mm/cache: use folio_mapped() in copy_from_user_page()
has been removed from the -mm tree. Its filename was
sh-mm-cache-use-folio_mapped-in-copy_from_user_page.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: David Hildenbrand <[email protected]>
Subject: sh/mm/cache: use folio_mapped() in copy_from_user_page()
Date: Tue, 9 Apr 2024 21:22:55 +0200

We want to limit the use of page_mapcount() to the places where it is absolutely necessary.

We're already using folio_mapped in copy_user_highpage() and copy_to_user_page() for a similar purpose so ... let's also simply use it for copy_from_user_page().

There is no change for small folios. Likely we won't stumble over many large folios on sh in that code either way.

Cc Chris Zankel <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc John Paul Adrian Glaubitz <[email protected]>
Cc Jonathan Corbet <[email protected]>
Cc Matthew Wilcox (Oracle) <[email protected]>
Cc Max Filippov <[email protected]>
Cc Miaohe Lin <[email protected]>
Cc Muchun Song <[email protected]>
Cc Naoya Horiguchi <[email protected]>
Cc Peter Xu <[email protected]>
Cc Richard Chang <[email protected]>
Cc Rich Felker <[email protected]>
Cc Ryan Roberts <[email protected]>
Cc Yang Shi <[email protected]>
Cc Yin Fengwei <[email protected]>
Cc Yoshinori Sato <[email protected]>
Cc Zi Yan <[email protected]>

---

 arch/sh/mm/cache.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sh/mm/cache.c renamed from arch/sh/mm/cache.c~sh-mm-cache-use-folio_mapped-in-copy_from_user_page +1 -1
@@ -84,7 +84,7 @@ void copy_from_user_page(struct vm_area_
 {
 	struct folio *folio = page_folio(page);
 
-	if (boot_cpu_data.dcache.n_aliases && page_mapcount(page) &&
+	if (boot_cpu_data.dcache.n_aliases && folio_mapped(folio) &&
 	    test_bit(PG_dcache_clean, &folio->flags)) {
 		void *vfrom = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
 		memcpy(dst, vfrom, len);

_

Patches currently in -mm which might be from [email protected] are