iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Browse Source 
Pull arm64 fixes from Catalin Marinas:

 - Fix a build error with CONFIG_CFI_CLANG + CONFIG_FTRACE when
   CONFIG_FUNCTION_GRAPH_TRACER is not enabled.

 - Fix a BUG_ON triggered by the page table checker due to incorrect
   file_map_count for non-leaf pmd/pud (the arm64
   pmd_user_accessible_page() not checking whether it's a leaf entry).

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64/mm: fix incorrect file_map_count for non-leaf pmd/pud
  arm64: ftrace: Define ftrace_stub_graph only with FUNCTION_GRAPH_TRACER
This commit is contained in:
Linus Torvalds
2022-11-18 14:31:03 -08:00
parent f4408c3dfc 5b47348fc0
commit 23a60a03d9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/include/asm/pgtable.h
View File

@@ -863,12 +863,12 @@ static inline bool pte_user_accessible_page(pte_t pte)
static inline bool pmd_user_accessible_page(pmd_t pmd) static inline bool pmd_user_accessible_page(pmd_t pmd)
{ {
return pmd_present(pmd) && (pmd_user(pmd) || pmd_user_exec(pmd)); return pmd_leaf(pmd) && (pmd_user(pmd) || pmd_user_exec(pmd));
} }
static inline bool pud_user_accessible_page(pud_t pud) static inline bool pud_user_accessible_page(pud_t pud)
{ {
return pud_present(pud) && pud_user(pud); return pud_leaf(pud) && pud_user(pud);
} }
#endif #endif

2
arch/arm64/kernel/entry-ftrace.S
View File

@@ -299,11 +299,11 @@ SYM_TYPED_FUNC_START(ftrace_stub)
ret ret
SYM_FUNC_END(ftrace_stub) SYM_FUNC_END(ftrace_stub)
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
SYM_TYPED_FUNC_START(ftrace_stub_graph) SYM_TYPED_FUNC_START(ftrace_stub_graph)
ret ret
SYM_FUNC_END(ftrace_stub_graph) SYM_FUNC_END(ftrace_stub_graph)
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
/* /*
* void return_to_handler(void) * void return_to_handler(void)
* *