Unverified Commit e0c3bb02 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5031 Backport 5.10.196 -5.10.197 LTS patches from upstream 

Merge Pull Request from: @sanglipeng 
 
https://gitee.com/openeuler/kernel/issues/I96Q8P

Conflicts:

Already merged(4):
c56095812721  perf jevents: Make build dependency on test JSONs
8db844077ec9  net/sched: Retire rsvp classifier
2cdcf6481cb3  mm/filemap: fix infinite loop in generic_file_buffered_read()
242c5740dd17  ext4: fix rec_len verify error


Rejected(6):
2cc1f4986233  Revert "configfs: fix a race in configfs_lookup()"
dc01bfdc3d91  perf/smmuv3: Enable HiSilicon Erratum 162001900 quirk for HIP08/09
4bff1d95ba62  ext2: fix datatype of block number in ext2_xattr_set2()
e16f5f8cab65  perf tools: Add an option to build without libbfd
0c5d5f8e0d2b  proc: fix a dentry lock race between release_task and lookup
3753e568d67f  ata: libata: disallow dev-initiated LPM transitions to unsupported states

Total patches: 79 - 4 - 6 = 69 
 
Link:https://gitee.com/openeuler/kernel/pulls/5031

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 2915e243 ef3a7cd2

arch/arm/kernel/hw_breakpoint.c

+4 −4
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ int hw_breakpoint_arch_parse(struct perf_event *bp, 
	hw->address &= ~alignment_mask;

	hw->ctrl.len <<= offset;



	if (is_default_overflow_handler(bp)) {

	if (uses_default_overflow_handler(bp)) {

		/*

		 * Mismatch breakpoints are required for single-stepping

		 * breakpoints.
@@ -798,7 +798,7 @@ static void watchpoint_handler(unsigned long addr, unsigned int fsr, 
		 * Otherwise, insert a temporary mismatch breakpoint so that

		 * we can single-step over the watchpoint trigger.

		 */

		if (!is_default_overflow_handler(wp))

		if (!uses_default_overflow_handler(wp))

			continue;

step:

		enable_single_step(wp, instruction_pointer(regs));
@@ -811,7 +811,7 @@ static void watchpoint_handler(unsigned long addr, unsigned int fsr, 
		info->trigger = addr;

		pr_debug("watchpoint fired: address = 0x%x\n", info->trigger);

		perf_bp_event(wp, regs);

		if (is_default_overflow_handler(wp))

		if (uses_default_overflow_handler(wp))

			enable_single_step(wp, instruction_pointer(regs));

	}
@@ -886,7 +886,7 @@ static void breakpoint_handler(unsigned long unknown, struct pt_regs *regs) 
			info->trigger = addr;

			pr_debug("breakpoint fired: address = 0x%x\n", addr);

			perf_bp_event(bp, regs);

			if (is_default_overflow_handler(bp))

			if (uses_default_overflow_handler(bp))

				enable_single_step(bp, addr);

			goto unlock;

		}

arch/arm64/kernel/hw_breakpoint.c

+2 −2
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ static int breakpoint_handler(unsigned long unused, unsigned int esr, 
		perf_bp_event(bp, regs);



		/* Do we need to handle the stepping? */

		if (is_default_overflow_handler(bp))

		if (uses_default_overflow_handler(bp))

			step = 1;

unlock:

		rcu_read_unlock();
@@ -733,7 +733,7 @@ static u64 get_distance_from_watchpoint(unsigned long addr, u64 val, 
static int watchpoint_report(struct perf_event *wp, unsigned long addr,

			     struct pt_regs *regs)

{

	int step = is_default_overflow_handler(wp);

	int step = uses_default_overflow_handler(wp);

	struct arch_hw_breakpoint *info = counter_arch_bp(wp);



	info->trigger = addr;

arch/powerpc/platforms/pseries/ibmebus.c

+1 −0
Original line number Diff line number Diff line
@@ -451,6 +451,7 @@ static int __init ibmebus_bus_init(void) 
	if (err) {

		printk(KERN_WARNING "%s: device_register returned %i\n",

		       __func__, err);

		put_device(&ibmebus_bus_device);

		bus_unregister(&ibmebus_bus_type);



		return err;

arch/x86/boot/compressed/ident_map_64.c

+8 −0
Original line number Diff line number Diff line
@@ -67,6 +67,14 @@ static void *alloc_pgt_page(void *context) 
		return NULL;

	}



	/* Consumed more tables than expected? */

	if (pages->pgt_buf_offset == BOOT_PGT_SIZE_WARN) {

		debug_putstr("pgt_buf running low in " __FILE__ "\n");

		debug_putstr("Need to raise BOOT_PGT_SIZE?\n");

		debug_putaddr(pages->pgt_buf_offset);

		debug_putaddr(pages->pgt_buf_size);

	}



	entry = pages->pgt_buf + pages->pgt_buf_offset;

	pages->pgt_buf_offset += PAGE_SIZE;

arch/x86/include/asm/boot.h

+31 −14
Original line number Diff line number Diff line
@@ -40,23 +40,40 @@ 
#ifdef CONFIG_X86_64

# define BOOT_STACK_SIZE	0x4000



/*

 * Used by decompressor's startup_32() to allocate page tables for identity

 * mapping of the 4G of RAM in 4-level paging mode:

 * - 1 level4 table;

 * - 1 level3 table;

 * - 4 level2 table that maps everything with 2M pages;

 *

 * The additional level5 table needed for 5-level paging is allocated from

 * trampoline_32bit memory.

 */

# define BOOT_INIT_PGT_SIZE	(6*4096)

# ifdef CONFIG_RANDOMIZE_BASE



/*

 * Assuming all cross the 512GB boundary:

 * 1 page for level4

 * (2+2)*4 pages for kernel, param, cmd_line, and randomized kernel

 * 2 pages for first 2M (video RAM: CONFIG_X86_VERBOSE_BOOTUP).

 * Total is 19 pages.

 * Total number of page tables kernel_add_identity_map() can allocate,

 * including page tables consumed by startup_32().

 *

 * Worst-case scenario:

 *  - 5-level paging needs 1 level5 table;

 *  - KASLR needs to map kernel, boot_params, cmdline and randomized kernel,

 *    assuming all of them cross 256T boundary:

 *    + 4*2 level4 table;

 *    + 4*2 level3 table;

 *    + 4*2 level2 table;

 *  - X86_VERBOSE_BOOTUP needs to map the first 2M (video RAM):

 *    + 1 level4 table;

 *    + 1 level3 table;

 *    + 1 level2 table;

 * Total: 28 tables

 *

 * Add 4 spare table in case decompressor touches anything beyond what is

 * accounted above. Warn if it happens.

 */

#  ifdef CONFIG_X86_VERBOSE_BOOTUP

#   define BOOT_PGT_SIZE	(19*4096)

#  else /* !CONFIG_X86_VERBOSE_BOOTUP */

#   define BOOT_PGT_SIZE	(17*4096)

#  endif

# else /* !CONFIG_RANDOMIZE_BASE */

#  define BOOT_PGT_SIZE		BOOT_INIT_PGT_SIZE

# endif

# define BOOT_PGT_SIZE_WARN	(28*4096)

# define BOOT_PGT_SIZE		(32*4096)



#else /* !CONFIG_X86_64 */

# define BOOT_STACK_SIZE	0x1000