Commit 57480b98 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:
 "The main change is we're reverting the initial stack protector support
  we merged this cycle. It turns out to not work on toolchains built
  with libc support, and fixing it will be need to wait for another
  release.

  And the rest are all fairly minor:

   - Some pasemi machines were not booting due to a missing error check
     in prom_find_boot_cpu()

   - In EEH we were checking a pointer rather than the bool it pointed
     to

   - The clang build was broken by a BUILD_BUG_ON() we added.

   - The radix (Power9 only) version of map_kernel_page() was broken if
     our memory size was a multiple of 2MB, which it generally isn't

  Thanks to: Darren Stevens, Gavin Shan, Reza Arbab"

* tag 'powerpc-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/mm: Use the correct pointer when setting a 2MB pte
  powerpc: Fix build failure with clang due to BUILD_BUG_ON()
  powerpc: Revert the initial stack protector support
  powerpc/eeh: Fix wrong flag passed to eeh_unfreeze_pe()
  powerpc: Add missing error check to prom_find_boot_cpu()
parents 2d47b8aa a0615a16

arch/powerpc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ config PPC 
	select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE

	select HAVE_ARCH_HARDENED_USERCOPY

	select HAVE_KERNEL_GZIP

	select HAVE_CC_STACKPROTECTOR



config GENERIC_CSUM

	def_bool CPU_LITTLE_ENDIAN

arch/powerpc/include/asm/cpu_has_feature.h

+2 −0
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ static __always_inline bool cpu_has_feature(unsigned long feature) 
{

	int i;



#ifndef __clang__ /* clang can't cope with this */

	BUILD_BUG_ON(!__builtin_constant_p(feature));

#endif



#ifdef CONFIG_JUMP_LABEL_FEATURE_CHECK_DEBUG

	if (!static_key_initialized) {

arch/powerpc/include/asm/mmu.h

+2 −0
Original line number Diff line number Diff line
@@ -160,7 +160,9 @@ static __always_inline bool mmu_has_feature(unsigned long feature) 
{

	int i;



#ifndef __clang__ /* clang can't cope with this */

	BUILD_BUG_ON(!__builtin_constant_p(feature));

#endif



#ifdef CONFIG_JUMP_LABEL_FEATURE_CHECK_DEBUG

	if (!static_key_initialized) {

arch/powerpc/include/asm/stackprotector.h

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
/*

 * GCC stack protector support.

 *

 * Stack protector works by putting predefined pattern at the start of

 * the stack frame and verifying that it hasn't been overwritten when

 * returning from the function.  The pattern is called stack canary

 * and gcc expects it to be defined by a global variable called

 * "__stack_chk_guard" on PPC.  This unfortunately means that on SMP

 * we cannot have a different canary value per task.

 */



#ifndef _ASM_STACKPROTECTOR_H

#define _ASM_STACKPROTECTOR_H



#include <linux/random.h>

#include <linux/version.h>

#include <asm/reg.h>



extern unsigned long __stack_chk_guard;



/*

 * Initialize the stackprotector canary value.

 *

 * NOTE: this must only be called from functions that never return,

 * and it must always be inlined.

 */

static __always_inline void boot_init_stack_canary(void)

{

	unsigned long canary;



	/* Try to get a semi random initial value. */

	get_random_bytes(&canary, sizeof(canary));

	canary ^= mftb();

	canary ^= LINUX_VERSION_CODE;



	current->stack_canary = canary;

	__stack_chk_guard = current->stack_canary;

}



#endif	/* _ASM_STACKPROTECTOR_H */

arch/powerpc/kernel/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -19,10 +19,6 @@ CFLAGS_init.o += $(DISABLE_LATENT_ENTROPY_PLUGIN) 
CFLAGS_btext.o += $(DISABLE_LATENT_ENTROPY_PLUGIN)

CFLAGS_prom.o += $(DISABLE_LATENT_ENTROPY_PLUGIN)



# -fstack-protector triggers protection checks in this code,

# but it is being used too early to link to meaningful stack_chk logic.

CFLAGS_prom_init.o += $(call cc-option, -fno-stack-protector)



ifdef CONFIG_FUNCTION_TRACER

# Do not trace early boot code

CFLAGS_REMOVE_cputable.o = -mno-sched-epilog $(CC_FLAGS_FTRACE)

CRA Git | Maintained and supported by SUSTech CRA and CCSE