Commit 4ea3c642 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-5.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:

 - Fix KVM "lost kick" race, where an attempt to pull a vcpu out of the
   guest could be lost (or delayed until the next guest exit).

 - Disable SCV (system call vectored) when PR KVM guests could be run.

 - Fix KVM PR guests using SCV, by disallowing AIL != 0 for KVM PR
   guests.

 - Add a new KVM CAP to indicate if AIL == 3 is supported.

 - Fix a regression when hotplugging a CPU to a memoryless/cpuless node.

 - Make virt_addr_valid() stricter for 64-bit Book3E & 32-bit, which
   fixes crashes seen due to hardened usercopy.

 - Revert a change to max_mapnr which broke HIGHMEM.

Thanks to Christophe Leroy, Fabiano Rosas, Kefeng Wang, Nicholas Piggin,
and Srikar Dronamraju.

* tag 'powerpc-5.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  Revert "powerpc: Set max_mapnr correctly"
  powerpc: Fix virt_addr_valid() for 64-bit Book3E & 32-bit
  KVM: PPC: Move kvmhv_on_pseries() into kvm_ppc.h
  powerpc/numa: Handle partially initialized numa nodes
  powerpc/64: Fix build failure with allyesconfig in book3s_64_entry.S
  KVM: PPC: Use KVM_CAP_PPC_AIL_MODE_3
  KVM: PPC: Book3S PR: Disallow AIL != 0
  KVM: PPC: Book3S PR: Disable SCV when AIL could be disabled
  KVM: PPC: Book3S HV P9: Fix "lost kick" race
parents 1519610b 1ff5c8e8

arch/powerpc/include/asm/kvm_book3s_64.h

+0 −12
Original line number Diff line number Diff line
@@ -16,18 +16,6 @@ 
#include <asm/ppc-opcode.h>

#include <asm/pte-walk.h>



#ifdef CONFIG_PPC_PSERIES

static inline bool kvmhv_on_pseries(void)

{

	return !cpu_has_feature(CPU_FTR_HVMODE);

}

#else

static inline bool kvmhv_on_pseries(void)

{

	return false;

}

#endif



/*

 * Structure for a nested guest, that is, for a guest that is managed by

 * one of our guests.

arch/powerpc/include/asm/kvm_ppc.h

+12 −0
Original line number Diff line number Diff line
@@ -586,6 +586,18 @@ static inline bool kvm_hv_mode_active(void) { return false; } 


#endif



#ifdef CONFIG_PPC_PSERIES

static inline bool kvmhv_on_pseries(void)

{

	return !cpu_has_feature(CPU_FTR_HVMODE);

}

#else

static inline bool kvmhv_on_pseries(void)

{

	return false;

}

#endif



#ifdef CONFIG_KVM_XICS

static inline int kvmppc_xics_enabled(struct kvm_vcpu *vcpu)

{

arch/powerpc/include/asm/page.h

+5 −1
Original line number Diff line number Diff line
@@ -132,7 +132,11 @@ static inline bool pfn_valid(unsigned long pfn) 
#define virt_to_page(kaddr)	pfn_to_page(virt_to_pfn(kaddr))

#define pfn_to_kaddr(pfn)	__va((pfn) << PAGE_SHIFT)



#define virt_addr_valid(kaddr)	pfn_valid(virt_to_pfn(kaddr))

#define virt_addr_valid(vaddr)	({					\

	unsigned long _addr = (unsigned long)vaddr;			\

	_addr >= PAGE_OFFSET && _addr < (unsigned long)high_memory &&	\

	pfn_valid(virt_to_pfn(_addr));					\

})



/*

 * On Book-E parts we need __va to parse the device tree and we can't

arch/powerpc/include/asm/setup.h

+2 −0
Original line number Diff line number Diff line
@@ -28,11 +28,13 @@ void setup_panic(void); 
#define ARCH_PANIC_TIMEOUT 180



#ifdef CONFIG_PPC_PSERIES

extern bool pseries_reloc_on_exception(void);

extern bool pseries_enable_reloc_on_exc(void);

extern void pseries_disable_reloc_on_exc(void);

extern void pseries_big_endian_exceptions(void);

void __init pseries_little_endian_exceptions(void);

#else

static inline bool pseries_reloc_on_exception(void) { return false; }

static inline bool pseries_enable_reloc_on_exc(void) { return false; }

static inline void pseries_disable_reloc_on_exc(void) {}

static inline void pseries_big_endian_exceptions(void) {}

arch/powerpc/kernel/exceptions-64s.S

+4 −0
Original line number Diff line number Diff line
@@ -809,6 +809,10 @@ __start_interrupts: 
 * - MSR_EE|MSR_RI is clear (no reentrant exceptions)

 * - Standard kernel environment is set up (stack, paca, etc)

 *

 * KVM:

 * These interrupts do not elevate HV 0->1, so HV is not involved. PR KVM

 * ensures that FSCR[SCV] is disabled whenever it has to force AIL off.

 *

 * Call convention:

 *

 * syscall register convention is in Documentation/powerpc/syscall64-abi.rst