Commit 5411de07 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-5.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:

 - Fix BPF uapi confusion about the correct type of bpf_user_pt_regs_t.

 - Fix virt_addr_valid() when memory is hotplugged above the boot-time
   high_memory value.

 - Fix a bug in 64-bit Book3E map_kernel_page() which would incorrectly
   allocate a PMD page at PUD level.

 - Fix a couple of minor issues found since we enabled KASAN for 64-bit
   Book3S.

Thanks to Aneesh Kumar K.V, Cédric Le Goater, Christophe Leroy, Kefeng
Wang, Liam Howlett, Nathan Lynch, and Naveen N. Rao.

* tag 'powerpc-5.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/memhotplug: Add add_pages override for PPC
  powerpc/bpf: Fix use of user_pt_regs in uapi
  powerpc/prom_init: Fix kernel config grep
  powerpc/book3e: Fix PUD allocation size in map_kernel_page()
  powerpc/xive/spapr: correct bitmap allocation size
parents 08986606 ac790d09

arch/powerpc/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -358,6 +358,10 @@ config ARCH_SUSPEND_NONZERO_CPU 
	def_bool y

	depends on PPC_POWERNV || PPC_PSERIES



config ARCH_HAS_ADD_PAGES

	def_bool y

	depends on ARCH_ENABLE_MEMORY_HOTPLUG



config PPC_DCR_NATIVE

	bool

arch/powerpc/include/asm/bpf_perf_event.h

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

#ifndef _ASM_POWERPC_BPF_PERF_EVENT_H

#define _ASM_POWERPC_BPF_PERF_EVENT_H



#include <asm/ptrace.h>



typedef struct user_pt_regs bpf_user_pt_regs_t;



#endif /* _ASM_POWERPC_BPF_PERF_EVENT_H */

arch/powerpc/include/uapi/asm/bpf_perf_event.h

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef _UAPI__ASM_BPF_PERF_EVENT_H__

#define _UAPI__ASM_BPF_PERF_EVENT_H__



#include <asm/ptrace.h>



typedef struct user_pt_regs bpf_user_pt_regs_t;



#endif /* _UAPI__ASM_BPF_PERF_EVENT_H__ */

arch/powerpc/kernel/prom_init_check.sh

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
# If you really need to reference something from prom_init.o add

# it to the list below:



grep "^CONFIG_KASAN=y$" .config >/dev/null

grep "^CONFIG_KASAN=y$" ${KCONFIG_CONFIG} >/dev/null

if [ $? -eq 0 ]

then

	MEM_FUNCS="__memcpy __memset"

arch/powerpc/mm/mem.c

+32 −1
Original line number Diff line number Diff line
@@ -105,6 +105,37 @@ void __ref arch_remove_linear_mapping(u64 start, u64 size) 
	vm_unmap_aliases();

}



/*

 * After memory hotplug the variables max_pfn, max_low_pfn and high_memory need

 * updating.

 */

static void update_end_of_memory_vars(u64 start, u64 size)

{

	unsigned long end_pfn = PFN_UP(start + size);



	if (end_pfn > max_pfn) {

		max_pfn = end_pfn;

		max_low_pfn = end_pfn;

		high_memory = (void *)__va(max_pfn * PAGE_SIZE - 1) + 1;

	}

}



int __ref add_pages(int nid, unsigned long start_pfn, unsigned long nr_pages,

		    struct mhp_params *params)

{

	int ret;



	ret = __add_pages(nid, start_pfn, nr_pages, params);

	if (ret)

		return ret;



	/* update max_pfn, max_low_pfn and high_memory */

	update_end_of_memory_vars(start_pfn << PAGE_SHIFT,

				  nr_pages << PAGE_SHIFT);



	return ret;

}



int __ref arch_add_memory(int nid, u64 start, u64 size,

			  struct mhp_params *params)

{
@@ -115,7 +146,7 @@ int __ref arch_add_memory(int nid, u64 start, u64 size, 
	rc = arch_create_linear_mapping(nid, start, size, params);

	if (rc)

		return rc;

	rc = __add_pages(nid, start_pfn, nr_pages, params);

	rc = add_pages(nid, start_pfn, nr_pages, params);

	if (rc)

		arch_remove_linear_mapping(start, size);

	return rc;