Commit 30f3f68e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull arm64 fixes from Will Deacon:
 "Here's the weekly batch of fixes for arm64. Not an awful lot here, but
  there are still a few unresolved issues relating to CPU hotplug, RCU
  and IRQ tracing that I hope to queue fixes for next week.

  Summary:

   - Fix early use of kprobes

   - Fix kernel placement in kexec_file_load()

   - Bump maximum number of NUMA nodes"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: kexec_file: try more regions if loading segments fails
  arm64: kprobes: Use BRK instead of single-step when executing instructions out-of-line
  arm64: NUMA: Kconfig: Increase NODES_SHIFT to 4
parents 4257087e 108aa503

arch/arm64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1002,7 +1002,7 @@ config NUMA 
config NODES_SHIFT

	int "Maximum NUMA Nodes (as a power of 2)"

	range 1 10

	default "2"

	default "4"

	depends on NEED_MULTIPLE_NODES

	help

	  Specify the maximum number of NUMA Nodes available on the target

arch/arm64/include/asm/brk-imm.h

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 * #imm16 values used for BRK instruction generation

 * 0x004: for installing kprobes

 * 0x005: for installing uprobes

 * 0x006: for kprobe software single-step

 * Allowed values for kgdb are 0x400 - 0x7ff

 * 0x100: for triggering a fault on purpose (reserved)

 * 0x400: for dynamic BRK instruction
@@ -19,6 +20,7 @@ 
 */

#define KPROBES_BRK_IMM			0x004

#define UPROBES_BRK_IMM			0x005

#define KPROBES_BRK_SS_IMM		0x006

#define FAULT_BRK_IMM			0x100

#define KGDB_DYN_DBG_BRK_IMM		0x400

#define KGDB_COMPILED_DBG_BRK_IMM	0x401

arch/arm64/include/asm/debug-monitors.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 


/* kprobes BRK opcodes with ESR encoding  */

#define BRK64_OPCODE_KPROBES	(AARCH64_BREAK_MON | (KPROBES_BRK_IMM << 5))

#define BRK64_OPCODE_KPROBES_SS	(AARCH64_BREAK_MON | (KPROBES_BRK_SS_IMM << 5))

/* uprobes BRK opcodes with ESR encoding  */

#define BRK64_OPCODE_UPROBES	(AARCH64_BREAK_MON | (UPROBES_BRK_IMM << 5))

arch/arm64/include/asm/kprobes.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/percpu.h>



#define __ARCH_WANT_KPROBES_INSN_SLOT

#define MAX_INSN_SIZE			1

#define MAX_INSN_SIZE			2



#define flush_insn_slot(p)		do { } while (0)

#define kretprobe_blacklist_size	0

arch/arm64/kernel/kexec_image.c

+31 −10
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static void *image_load(struct kimage *image, 
	u64 flags, value;

	bool be_image, be_kernel;

	struct kexec_buf kbuf;

	unsigned long text_offset;

	unsigned long text_offset, kernel_segment_number;

	struct kexec_segment *kernel_segment;

	int ret;
@@ -88,11 +88,37 @@ static void *image_load(struct kimage *image, 
	/* Adjust kernel segment with TEXT_OFFSET */

	kbuf.memsz += text_offset;



	ret = kexec_add_buffer(&kbuf);

	if (ret)

	kernel_segment_number = image->nr_segments;



	/*

	 * The location of the kernel segment may make it impossible to satisfy

	 * the other segment requirements, so we try repeatedly to find a

	 * location that will work.

	 */

	while ((ret = kexec_add_buffer(&kbuf)) == 0) {

		/* Try to load additional data */

		kernel_segment = &image->segment[kernel_segment_number];

		ret = load_other_segments(image, kernel_segment->mem,

					  kernel_segment->memsz, initrd,

					  initrd_len, cmdline);

		if (!ret)

			break;



		/*

		 * We couldn't find space for the other segments; erase the

		 * kernel segment and try the next available hole.

		 */

		image->nr_segments -= 1;

		kbuf.buf_min = kernel_segment->mem + kernel_segment->memsz;

		kbuf.mem = KEXEC_BUF_MEM_UNKNOWN;

	}



	if (ret) {

		pr_err("Could not find any suitable kernel location!");

		return ERR_PTR(ret);

	}



	kernel_segment = &image->segment[image->nr_segments - 1];

	kernel_segment = &image->segment[kernel_segment_number];

	kernel_segment->mem += text_offset;

	kernel_segment->memsz -= text_offset;

	image->start = kernel_segment->mem;
@@ -101,12 +127,7 @@ static void *image_load(struct kimage *image, 
				kernel_segment->mem, kbuf.bufsz,

				kernel_segment->memsz);



	/* Load additional data */

	ret = load_other_segments(image,

				kernel_segment->mem, kernel_segment->memsz,

				initrd, initrd_len, cmdline);



	return ERR_PTR(ret);

	return 0;

}



#ifdef CONFIG_KEXEC_IMAGE_VERIFY_SIG

CRA Git | Maintained and supported by SUSTech CRA and CCSE