Commit bd9c3506 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Pull yet more updates from Andrew Morton:
 "54 patches.

  Subsystems affected by this patch series: lib, mm (slub, secretmem,
  cleanups, init, pagemap, and mremap), and debug"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (54 commits)
  powerpc/mm: enable HAVE_MOVE_PMD support
  powerpc/book3s64/mm: update flush_tlb_range to flush page walk cache
  mm/mremap: allow arch runtime override
  mm/mremap: hold the rmap lock in write mode when moving page table entries.
  mm/mremap: use pmd/pud_poplulate to update page table entries
  mm/mremap: don't enable optimized PUD move if page table levels is 2
  mm/mremap: convert huge PUD move to separate helper
  selftest/mremap_test: avoid crash with static build
  selftest/mremap_test: update the test to handle pagesize other than 4K
  mm: rename p4d_page_vaddr to p4d_pgtable and make it return pud_t *
  mm: rename pud_page_vaddr to pud_pgtable and make it return pmd_t *
  kdump: use vmlinux_build_id to simplify
  buildid: fix kernel-doc notation
  buildid: mark some arguments const
  scripts/decode_stacktrace.sh: indicate 'auto' can be used for base path
  scripts/decode_stacktrace.sh: silence stderr messages from addr2line/nm
  scripts/decode_stacktrace.sh: support debuginfod
  x86/dumpstack: use %pSb/%pBb for backtrace printing
  arm64: stacktrace: use %pSb for backtrace printing
  module: add printk formats to add module build ID to stacktraces
  ...
parents f5596657 feac00aa

Documentation/core-api/printk-formats.rst

+11 −0
Original line number Diff line number Diff line
@@ -125,6 +125,17 @@ used when printing stack backtraces. The specifier takes into 
consideration the effect of compiler optimisations which may occur

when tail-calls are used and marked with the noreturn GCC attribute.



If the pointer is within a module, the module name and optionally build ID is

printed after the symbol name with an extra ``b`` appended to the end of the

specifier.



::

	%pS	versatile_init+0x0/0x110 [module_name]

	%pSb	versatile_init+0x0/0x110 [module_name ed5019fdf5e53be37cb1ba7899292d7e143b259e]

	%pSRb	versatile_init+0x9/0x110 [module_name ed5019fdf5e53be37cb1ba7899292d7e143b259e]

		(with __builtin_extract_return_addr() translation)

	%pBb	prev_fn_of_versatile_init+0x88/0x88 [module_name ed5019fdf5e53be37cb1ba7899292d7e143b259e]



Probed Pointers from BPF / tracing

----------------------------------

arch/alpha/include/asm/pgtable.h

+5 −3
Original line number Diff line number Diff line
@@ -236,8 +236,10 @@ pmd_page_vaddr(pmd_t pmd) 
#define pmd_page(pmd)	(pfn_to_page(pmd_val(pmd) >> 32))

#define pud_page(pud)	(pfn_to_page(pud_val(pud) >> 32))



extern inline unsigned long pud_page_vaddr(pud_t pgd)

{ return PAGE_OFFSET + ((pud_val(pgd) & _PFN_MASK) >> (32-PAGE_SHIFT)); }

extern inline pmd_t *pud_pgtable(pud_t pgd)

{

	return (pmd_t *)(PAGE_OFFSET + ((pud_val(pgd) & _PFN_MASK) >> (32-PAGE_SHIFT)));

}



extern inline int pte_none(pte_t pte)		{ return !pte_val(pte); }

extern inline int pte_present(pte_t pte)	{ return pte_val(pte) & _PAGE_VALID; }
@@ -287,7 +289,7 @@ extern inline pte_t pte_mkyoung(pte_t pte) { pte_val(pte) |= __ACCESS_BITS; retu 
/* Find an entry in the second-level page table.. */

extern inline pmd_t * pmd_offset(pud_t * dir, unsigned long address)

{

	pmd_t *ret = (pmd_t *) pud_page_vaddr(*dir) + ((address >> PMD_SHIFT) & (PTRS_PER_PAGE - 1));

	pmd_t *ret = pud_pgtable(*dir) + ((address >> PMD_SHIFT) & (PTRS_PER_PAGE - 1));

	smp_rmb(); /* see above */

	return ret;

}

arch/arc/mm/init.c

+1 −4
Original line number Diff line number Diff line
@@ -89,10 +89,7 @@ void __init setup_arch_memory(void) 
{

	unsigned long max_zone_pfn[MAX_NR_ZONES] = { 0 };



	init_mm.start_code = (unsigned long)_text;

	init_mm.end_code = (unsigned long)_etext;

	init_mm.end_data = (unsigned long)_edata;

	init_mm.brk = (unsigned long)_end;

	setup_initial_init_mm(_text, _etext, _edata, _end);



	/* first page of system - kernel .vector starts here */

	min_low_pfn = virt_to_pfn(CONFIG_LINUX_RAM_BASE);

arch/arm/include/asm/pgtable-3level.h

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ 
		flush_pmd_entry(pudp);	\

	} while (0)



static inline pmd_t *pud_page_vaddr(pud_t pud)

static inline pmd_t *pud_pgtable(pud_t pud)

{

	return __va(pud_val(pud) & PHYS_MASK & (s32)PAGE_MASK);

}

arch/arm/kernel/setup.c

+1 −4
Original line number Diff line number Diff line
@@ -1130,10 +1130,7 @@ void __init setup_arch(char **cmdline_p) 
	if (mdesc->reboot_mode != REBOOT_HARD)

		reboot_mode = mdesc->reboot_mode;



	init_mm.start_code = (unsigned long) _text;

	init_mm.end_code   = (unsigned long) _etext;

	init_mm.end_data   = (unsigned long) _edata;

	init_mm.brk	   = (unsigned long) _end;

	setup_initial_init_mm(_text, _etext, _edata, _end);



	/* populate cmd_line too for later use, preserving boot_command_line */

	strlcpy(cmd_line, boot_command_line, COMMAND_LINE_SIZE);