Skip to contentSkip to conversation

mm-move-init_mem_debugging_and_hardening-to-mm-mm_initc.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Apr 6, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: move init_mem_debugging_and_hardening() to mm/mm_init.c
has been removed from the -mm tree. Its filename was
mm-move-init_mem_debugging_and_hardening-to-mm-mm_initc.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: "Mike Rapoport (IBM)" <[email protected]>
Subject: mm: move init_mem_debugging_and_hardening() to mm/mm_init.c
Date: Tue, 21 Mar 2023 19:05:08 +0200

init_mem_debugging_and_hardening() is only called from mm_core_init().

Move it close to the caller, make it static and rename it to mem_debugging_and_hardening_init() for consistency with surrounding convention.

---

 include/linux/mm.h |    1 
 mm/internal.h      |    8 +++
 mm/mm_init.c       |   91 ++++++++++++++++++++++++++++++++++++++++-
 mm/page_alloc.c    |   95 -------------------------------------------
 4 files changed, 98 insertions(+), 97 deletions(-)
include/linux/mm.h renamed from include/linux/mm.h~mm-move-init_mem_debugging_and_hardening-to-mm-mm_initc +0 -1
@@ -3251,7 +3251,6 @@ extern int apply_to_existing_page_range(
 				   unsigned long address, unsigned long size,
 				   pte_fn_t fn, void *data);
 
-extern void __init init_mem_debugging_and_hardening(void);
 #ifdef CONFIG_PAGE_POISONING
 extern void __kernel_poison_pages(struct page *page, int numpages);
 extern void __kernel_unpoison_pages(struct page *page, int numpages);
mm/internal.h renamed from mm/internal.h~mm-move-init_mem_debugging_and_hardening-to-mm-mm_initc +8 -0
@@ -204,6 +204,14 @@ pmd_t *mm_find_pmd(struct mm_struct *mm,
 
 extern char * const zone_names[MAX_NR_ZONES];
 
+/* perform sanity checks on struct pages being allocated or freed */
+DECLARE_STATIC_KEY_MAYBE(CONFIG_DEBUG_VM, check_pages_enabled);
+
+static inline bool is_check_pages_enabled(void)
+{
+	return static_branch_unlikely(&check_pages_enabled);
+}
+
 /*
  * Structure for holding the mostly immutable allocation parameters passed
  * between functions involved in allocations, including the alloc_pages*
mm/mm_init.c renamed from mm/mm_init.c~mm-move-init_mem_debugging_and_hardening-to-mm-mm_initc +90 -1

103 lines not on this page · raw message

mm/page_alloc.c renamed from mm/page_alloc.c~mm-move-init_mem_debugging_and_hardening-to-mm-mm_initc +0 -95

107 lines not on this page · raw message

_

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

arm-reword-arch_force_max_order-prompt-and-help-text.patch arm64-drop-ranges-in-definition-of-arch_force_max_order.patch arm64-reword-arch_force_max_order-prompt-and-help-text.patch arm64-reword-arch_force_max_order-prompt-and-help-text-v3.patch csky-drop-arch_force_max_order.patch ia64-dont-allow-users-to-override-arch_force_max_order.patch m68k-reword-arch_force_max_order-prompt-and-help-text.patch nios2-reword-arch_force_max_order-prompt-and-help-text.patch nios2-drop-ranges-for-definition-of-arch_force_max_order.patch powerpc-reword-arch_force_max_order-prompt-and-help-text.patch powerpc-drop-ranges-for-definition-of-arch_force_max_order.patch sh-reword-arch_force_max_order-prompt-and-help-text.patch sh-reword-arch_force_max_order-prompt-and-help-text-v3.patch sh-drop-ranges-for-definition-of-arch_force_max_order.patch sh-drop-ranges-for-definition-of-arch_force_max_order-v3.patch sparc-reword-arch_force_max_order-prompt-and-help-text.patch xtensa-reword-arch_force_max_order-prompt-and-help-text.patch mm-move-free_area_empty-to-mm-internalh.patch