From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 1 Jul 2023 09:57:15 +0000 (+0200)
Subject: 6.1-stable patches
X-Git-Tag: v6.4.1~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83f26598526fd0ff3ae362acc7cf3e3eaf64dea1;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

added patches:
	xtensa-fix-nommu-build-with-lock_mm_and_find_vma-conversion.patch
---

diff --git a/queue-6.1/series b/queue-6.1/series
index 37dda0a7417..6f0be0ccd91 100644
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -32,3 +32,4 @@ revert-thermal-drivers-mediatek-use-devm_of_iomap-to-avoid-resource-leak-in-mtk_
 sparc32-fix-lock_mm_and_find_vma-conversion.patch
 parisc-fix-expand_stack-conversion.patch
 csky-fix-up-lock_mm_and_find_vma-conversion.patch
+xtensa-fix-nommu-build-with-lock_mm_and_find_vma-conversion.patch
diff --git a/queue-6.1/xtensa-fix-nommu-build-with-lock_mm_and_find_vma-conversion.patch b/queue-6.1/xtensa-fix-nommu-build-with-lock_mm_and_find_vma-conversion.patch
new file mode 100644
index 00000000000..784e66ac0c3
--- /dev/null
+++ b/queue-6.1/xtensa-fix-nommu-build-with-lock_mm_and_find_vma-conversion.patch
@@ -0,0 +1,89 @@
+From d85a143b69abb4d7544227e26d12c4c7735ab27d Mon Sep 17 00:00:00 2001
+From: Linus Torvalds <torvalds@linux-foundation.org>
+Date: Fri, 30 Jun 2023 18:24:49 -0700
+Subject: xtensa: fix NOMMU build with lock_mm_and_find_vma() conversion
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Linus Torvalds <torvalds@linux-foundation.org>
+
+commit d85a143b69abb4d7544227e26d12c4c7735ab27d upstream.
+
+It turns out that xtensa has a really odd configuration situation: you
+can do a no-MMU config, but still have the page fault code enabled.
+Which doesn't sound all that sensible, but it turns out that xtensa can
+have protection faults even without the MMU, and we have this:
+
+    config PFAULT
+        bool "Handle protection faults" if EXPERT && !MMU
+        default y
+        help
+          Handle protection faults. MMU configurations must enable it.
+          noMMU configurations may disable it if used memory map never
+          generates protection faults or faults are always fatal.
+
+          If unsure, say Y.
+
+which completely violated my expectations of the page fault handling.
+
+End result: Guenter reports that the xtensa no-MMU builds all fail with
+
+  arch/xtensa/mm/fault.c: In function ‘do_page_fault’:
+  arch/xtensa/mm/fault.c:133:8: error: implicit declaration of function ‘lock_mm_and_find_vma’
+
+because I never exposed the new lock_mm_and_find_vma() function for the
+no-MMU case.
+
+Doing so is simple enough, and fixes the problem.
+
+Reported-and-tested-by: Guenter Roeck <linux@roeck-us.net>
+Fixes: a050ba1e7422 ("mm/fault: convert remaining simple cases to lock_mm_and_find_vma()")
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/mm.h |    5 +++--
+ mm/nommu.c         |   11 +++++++++++
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+--- a/include/linux/mm.h
++++ b/include/linux/mm.h
+@@ -1921,6 +1921,9 @@ void pagecache_isize_extended(struct ino
+ void truncate_pagecache_range(struct inode *inode, loff_t offset, loff_t end);
+ int generic_error_remove_page(struct address_space *mapping, struct page *page);
+ 
++struct vm_area_struct *lock_mm_and_find_vma(struct mm_struct *mm,
++		unsigned long address, struct pt_regs *regs);
++
+ #ifdef CONFIG_MMU
+ extern vm_fault_t handle_mm_fault(struct vm_area_struct *vma,
+ 				  unsigned long address, unsigned int flags,
+@@ -1932,8 +1935,6 @@ void unmap_mapping_pages(struct address_
+ 		pgoff_t start, pgoff_t nr, bool even_cows);
+ void unmap_mapping_range(struct address_space *mapping,
+ 		loff_t const holebegin, loff_t const holelen, int even_cows);
+-struct vm_area_struct *lock_mm_and_find_vma(struct mm_struct *mm,
+-		unsigned long address, struct pt_regs *regs);
+ #else
+ static inline vm_fault_t handle_mm_fault(struct vm_area_struct *vma,
+ 					 unsigned long address, unsigned int flags,
+--- a/mm/nommu.c
++++ b/mm/nommu.c
+@@ -682,6 +682,17 @@ struct vm_area_struct *find_vma(struct m
+ EXPORT_SYMBOL(find_vma);
+ 
+ /*
++ * At least xtensa ends up having protection faults even with no
++ * MMU.. No stack expansion, at least.
++ */
++struct vm_area_struct *lock_mm_and_find_vma(struct mm_struct *mm,
++			unsigned long addr, struct pt_regs *regs)
++{
++	mmap_read_lock(mm);
++	return vma_lookup(mm, addr);
++}
++
++/*
+  * expand a stack to a given address
+  * - not supported under NOMMU conditions
+  */