Commit 8f6f76a6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-nonmm-stable-2023-11-02-14-08' of... 

Merge tag 'mm-nonmm-stable-2023-11-02-14-08' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull non-MM updates from Andrew Morton:
 "As usual, lots of singleton and doubleton patches all over the tree
  and there's little I can say which isn't in the individual changelogs.

  The lengthier patch series are

   - 'kdump: use generic functions to simplify crashkernel reservation
     in arch', from Baoquan He. This is mainly cleanups and
     consolidation of the 'crashkernel=' kernel parameter handling

   - After much discussion, David Laight's 'minmax: Relax type checks in
     min() and max()' is here. Hopefully reduces some typecasting and
     the use of min_t() and max_t()

   - A group of patches from Oleg Nesterov which clean up and slightly
     fix our handling of reads from /proc/PID/task/... and which remove
     task_struct.thread_group"

* tag 'mm-nonmm-stable-2023-11-02-14-08' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (64 commits)
  scripts/gdb/vmalloc: disable on no-MMU
  scripts/gdb: fix usage of MOD_TEXT not defined when CONFIG_MODULES=n
  .mailmap: add address mapping for Tomeu Vizoso
  mailmap: update email address for Claudiu Beznea
  tools/testing/selftests/mm/run_vmtests.sh: lower the ptrace permissions
  .mailmap: map Benjamin Poirier's address
  scripts/gdb: add lx_current support for riscv
  ocfs2: fix a spelling typo in comment
  proc: test ProtectionKey in proc-empty-vm test
  proc: fix proc-empty-vm test with vsyscall
  fs/proc/base.c: remove unneeded semicolon
  do_io_accounting: use sig->stats_lock
  do_io_accounting: use __for_each_thread()
  ocfs2: replace BUG_ON() at ocfs2_num_free_extents() with ocfs2_error()
  ocfs2: fix a typo in a comment
  scripts/show_delta: add __main__ judgement before main code
  treewide: mark stuff as __ro_after_init
  fs: ocfs2: check status values
  proc: test /proc/${pid}/statm
  compiler.h: move __is_constexpr() to compiler.h
  ...
parents ecae0bd5 6620999f

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ Ben M Cahill <ben.m.cahill@intel.com> 
Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>

Ben Widawsky <bwidawsk@kernel.org> <ben.widawsky@intel.com>

Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>

Benjamin Poirier <benjamin.poirier@gmail.com> <bpoirier@suse.de>

Bjorn Andersson <andersson@kernel.org> <bjorn@kryo.se>

Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@linaro.org>

Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@sonymobile.com>
@@ -128,6 +129,7 @@ Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com> 
Christian Marangi <ansuelsmth@gmail.com>

Christophe Ricard <christophe.ricard@gmail.com>

Christoph Hellwig <hch@lst.de>

Claudiu Beznea <claudiu.beznea@tuxon.dev> <claudiu.beznea@microchip.com>

Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>

Corey Minyard <minyard@acm.org>

Damian Hobson-Garcia <dhobsong@igel.co.jp>
@@ -568,6 +570,7 @@ Takashi YOSHII <takashi.yoshii.zj@renesas.com> 
Tamizh Chelvam Raja <quic_tamizhr@quicinc.com> <tamizhr@codeaurora.org>

Taniya Das <quic_tdas@quicinc.com> <tdas@codeaurora.org>

Tejun Heo <htejun@gmail.com>

Tomeu Vizoso <tomeu@tomeuvizoso.net> <tomeu.vizoso@collabora.com>

Thomas Graf <tgraf@suug.ch>

Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>

Thomas Pedersen <twp@codeaurora.org>

arch/arm/kernel/setup.c

+2 −1
Original line number Diff line number Diff line
@@ -1010,7 +1010,8 @@ static void __init reserve_crashkernel(void) 


	total_mem = get_total_mem();

	ret = parse_crashkernel(boot_command_line, total_mem,

				&crash_size, &crash_base);

				&crash_size, &crash_base,

				NULL, NULL);

	/* invalid value specified or crashkernel=0 */

	if (ret || !crash_size)

		return;

arch/arm64/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -1498,6 +1498,9 @@ config ARCH_DEFAULT_KEXEC_IMAGE_VERIFY_SIG 
config ARCH_SUPPORTS_CRASH_DUMP

	def_bool y



config ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION

	def_bool CRASH_CORE



config TRANS_TABLE

	def_bool y

	depends on HIBERNATION || KEXEC_CORE

arch/arm64/include/asm/crash_core.h

0 → 100644
+10 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

#ifndef _ARM64_CRASH_CORE_H

#define _ARM64_CRASH_CORE_H



/* Current arm64 boot protocol requires 2MB alignment */

#define CRASH_ALIGN                     SZ_2M



#define CRASH_ADDR_LOW_MAX              arm64_dma_phys_limit

#define CRASH_ADDR_HIGH_MAX             (PHYS_MASK + 1)

#endif

arch/arm64/mm/init.c

+8 −132
Original line number Diff line number Diff line
@@ -65,15 +65,6 @@ EXPORT_SYMBOL(memstart_addr); 
 */

phys_addr_t __ro_after_init arm64_dma_phys_limit;



/* Current arm64 boot protocol requires 2MB alignment */

#define CRASH_ALIGN			SZ_2M



#define CRASH_ADDR_LOW_MAX		arm64_dma_phys_limit

#define CRASH_ADDR_HIGH_MAX		(PHYS_MASK + 1)

#define CRASH_HIGH_SEARCH_BASE		SZ_4G



#define DEFAULT_CRASH_KERNEL_LOW_SIZE	(128UL << 20)



/*

 * To make optimal use of block mappings when laying out the linear

 * mapping, round down the base of physical memory to a size that can
@@ -101,140 +92,25 @@ phys_addr_t __ro_after_init arm64_dma_phys_limit; 
#define ARM64_MEMSTART_ALIGN	(1UL << ARM64_MEMSTART_SHIFT)

#endif



static int __init reserve_crashkernel_low(unsigned long long low_size)

{

	unsigned long long low_base;



	low_base = memblock_phys_alloc_range(low_size, CRASH_ALIGN, 0, CRASH_ADDR_LOW_MAX);

	if (!low_base) {

		pr_err("cannot allocate crashkernel low memory (size:0x%llx).\n", low_size);

		return -ENOMEM;

	}



	pr_info("crashkernel low memory reserved: 0x%08llx - 0x%08llx (%lld MB)\n",

		low_base, low_base + low_size, low_size >> 20);



	crashk_low_res.start = low_base;

	crashk_low_res.end   = low_base + low_size - 1;

	insert_resource(&iomem_resource, &crashk_low_res);



	return 0;

}



/*

 * reserve_crashkernel() - reserves memory for crash kernel

 *

 * This function reserves memory area given in "crashkernel=" kernel command

 * line parameter. The memory reserved is used by dump capture kernel when

 * primary kernel is crashing.

 */

static void __init reserve_crashkernel(void)

static void __init arch_reserve_crashkernel(void)

{

	unsigned long long crash_low_size = 0, search_base = 0;

	unsigned long long crash_max = CRASH_ADDR_LOW_MAX;

	unsigned long long low_size = 0;

	unsigned long long crash_base, crash_size;

	char *cmdline = boot_command_line;

	bool fixed_base = false;

	bool high = false;

	int ret;



	if (!IS_ENABLED(CONFIG_KEXEC_CORE))

		return;



	/* crashkernel=X[@offset] */

	ret = parse_crashkernel(cmdline, memblock_phys_mem_size(),

				&crash_size, &crash_base);

	if (ret == -ENOENT) {

		ret = parse_crashkernel_high(cmdline, 0, &crash_size, &crash_base);

		if (ret || !crash_size)

			return;



		/*

		 * crashkernel=Y,low can be specified or not, but invalid value

		 * is not allowed.

		 */

		ret = parse_crashkernel_low(cmdline, 0, &crash_low_size, &crash_base);

		if (ret == -ENOENT)

			crash_low_size = DEFAULT_CRASH_KERNEL_LOW_SIZE;

		else if (ret)

			return;



		search_base = CRASH_HIGH_SEARCH_BASE;

		crash_max = CRASH_ADDR_HIGH_MAX;

		high = true;

	} else if (ret || !crash_size) {

		/* The specified value is invalid */

				&crash_size, &crash_base,

				&low_size, &high);

	if (ret)

		return;

	}



	crash_size = PAGE_ALIGN(crash_size);



	/* User specifies base address explicitly. */

	if (crash_base) {

		fixed_base = true;

		search_base = crash_base;

		crash_max = crash_base + crash_size;

	}



retry:

	crash_base = memblock_phys_alloc_range(crash_size, CRASH_ALIGN,

					       search_base, crash_max);

	if (!crash_base) {

		/*

		 * For crashkernel=size[KMG]@offset[KMG], print out failure

		 * message if can't reserve the specified region.

		 */

		if (fixed_base) {

			pr_warn("crashkernel reservation failed - memory is in use.\n");

			return;

		}



		/*

		 * For crashkernel=size[KMG], if the first attempt was for

		 * low memory, fall back to high memory, the minimum required

		 * low memory will be reserved later.

		 */

		if (!high && crash_max == CRASH_ADDR_LOW_MAX) {

			crash_max = CRASH_ADDR_HIGH_MAX;

			search_base = CRASH_ADDR_LOW_MAX;

			crash_low_size = DEFAULT_CRASH_KERNEL_LOW_SIZE;

			goto retry;

		}



		/*

		 * For crashkernel=size[KMG],high, if the first attempt was

		 * for high memory, fall back to low memory.

		 */

		if (high && crash_max == CRASH_ADDR_HIGH_MAX) {

			crash_max = CRASH_ADDR_LOW_MAX;

			search_base = 0;

			goto retry;

		}

		pr_warn("cannot allocate crashkernel (size:0x%llx)\n",

			crash_size);

		return;

	}



	if ((crash_base >= CRASH_ADDR_LOW_MAX) && crash_low_size &&

	     reserve_crashkernel_low(crash_low_size)) {

		memblock_phys_free(crash_base, crash_size);

		return;

	}



	pr_info("crashkernel reserved: 0x%016llx - 0x%016llx (%lld MB)\n",

		crash_base, crash_base + crash_size, crash_size >> 20);



	/*

	 * The crashkernel memory will be removed from the kernel linear

	 * map. Inform kmemleak so that it won't try to access it.

	 */

	kmemleak_ignore_phys(crash_base);

	if (crashk_low_res.end)

		kmemleak_ignore_phys(crashk_low_res.start);



	crashk_res.start = crash_base;

	crashk_res.end = crash_base + crash_size - 1;

	insert_resource(&iomem_resource, &crashk_res);

	reserve_crashkernel_generic(cmdline, crash_size, crash_base,

				    low_size, high);

}



/*
@@ -480,7 +356,7 @@ void __init bootmem_init(void) 
	 * request_standard_resources() depends on crashkernel's memory being

	 * reserved, so do it here.

	 */

	reserve_crashkernel();

	arch_reserve_crashkernel();



	memblock_dump_all();

}