Skip to contentSkip to conversation

mm-vma-eliminate-mmap_action-error_hook-introduce-error_override.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jun 2

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled

     Subject: mm/vma: eliminate mmap_action->error_hook, introduce error_override

has been removed from the -mm tree. Its filename was
mm-vma-eliminate-mmap_action-error_hook-introduce-error_override.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: Lorenzo Stoakes <[email protected]>
Subject: mm/vma: eliminate mmap_action->error_hook, introduce error_override
Date: Tue, 2 Jun 2026 12:06:27 +0100

Rather than providing a hook, simplify things by providing the ability to override mmap action errors. This allows us to more carefully validate the value provided and thus ensure only a valid error code is specified, and simplifies the interface.

This way, we eliminate all hooks but mmap_prepare and allow only mmap actions to be specified (which core mm controls).

This significantly improves robustness and eliminates any unnecessary code duplication in driver mmap hooks.

We also update the /dev/mem logic (the only user) to use mmap_action->error_override instead.

---

 drivers/char/mem.c              |    8 +-------
 include/linux/mm_types.h        |    9 +++------
 mm/util.c                       |   29 +++++++++++++++++++++--------
 tools/testing/vma/include/dup.h |    9 +++------
 4 files changed, 28 insertions(+), 27 deletions(-)
drivers/char/mem.c renamed from drivers/char/mem.c~mm-vma-eliminate-mmap_action-error_hook-introduce-error_override +1 -7
@@ -322,11 +322,6 @@ static const struct vm_operations_struct
 #endif
 };
 
-static int mmap_filter_error(int err)
-{
-	return -EAGAIN;
-}
-
 static int mmap_mem_prepare(struct vm_area_desc *desc)
 {
 	struct file *file = desc->file;
@@ -362,8 +357,7 @@ static int mmap_mem_prepare(struct vm_ar
 
 	/* Remap-pfn-range will mark the range with the I/O flag. */
 	mmap_action_remap_full(desc, desc->pgoff);
-	/* We filter remap errors to -EAGAIN. */
-	desc->action.error_hook = mmap_filter_error;
+	desc->action.error_override = -EAGAIN;
 
 	return 0;
 }
include/linux/mm_types.h renamed from include/linux/mm_types.h~mm-vma-eliminate-mmap_action-error_hook-introduce-error_override +3 -6
@@ -844,13 +844,10 @@ struct mmap_action {
 	enum mmap_action_type type;
 
 	/*
-	 * If specified, this hook is invoked when an error occurred when
-	 * attempting the selected action.
-	 *
-	 * The hook can return an error code in order to filter the error, but
-	 * it is not valid to clear the error here.
+	 * If non-zero, replace errors that arise from mmap actions with this
+	 * value instead. Only valid error codes may be specified.
 	 */
-	int (*error_hook)(int err);
+	int error_override;
 
 	/*
 	 * This should be set in rare instances where the operation required
mm/util.c renamed from mm/util.c~mm-vma-eliminate-mmap_action-error_hook-introduce-error_override +21 -8
@@ -1414,16 +1414,22 @@ static int mmap_action_finish(struct vm_
 	 */
 	len = vma_pages(vma) << PAGE_SHIFT;
 	do_munmap(current->mm, vma->vm_start, len, NULL);
-	if (action->error_hook) {
-		/* We may want to filter the error. */
-		err = action->error_hook(err);
-		/* The caller should not clear the error. */
-		VM_WARN_ON_ONCE(!err);
-	}
-	return err;
+
+	return action->error_override ?: err;
 }
 
 #ifdef CONFIG_MMU
+
+static int check_mmap_action(struct mmap_action *action)
+{
+	const unsigned long override = action->error_override;
+
+	if (WARN_ON_ONCE(override && !IS_ERR_VALUE(override)))
+		return -EINVAL;
+
+	return 0;
+}
+
 /**
  * mmap_action_prepare - Perform preparatory setup for an VMA descriptor
  * action which need to be performed.
@@ -1433,7 +1439,14 @@ static int mmap_action_finish(struct vm_
  */
 int mmap_action_prepare(struct vm_area_desc *desc)
 {
-	switch (desc->action.type) {
+	struct mmap_action *action = &desc->action;
+	int err;
+
+	err = check_mmap_action(action);
+	if (err)
+		return err;
+
+	switch (action->type) {
 	case MMAP_NOTHING:
 		return 0;
 	case MMAP_REMAP_PFN:
tools/testing/vma/include/dup.h renamed from tools/testing/vma/include/dup.h~mm-vma-eliminate-mmap_action-error_hook-introduce-error_override +3 -6
@@ -483,13 +483,10 @@ struct mmap_action {
 	enum mmap_action_type type;
 
 	/*
-	 * If specified, this hook is invoked when an error occurred when
-	 * attempting the selection action.
-	 *
-	 * The hook can return an error code in order to filter the error, but
-	 * it is not valid to clear the error here.
+	 * If non-zero, replace errors that arise from mmap actions with this
+	 * value instead. Only valid error codes may be specified.
 	 */
-	int (*error_hook)(int err);
+	int error_override;
 
 	/*
 	 * This should be set in rare instances where the operation required

_

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

mm-huge_memory-use-correct-flags-for-device-private-pmd-entry.patch