Commit efb52a7d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull powerpc fixes from Michael Ellerman:
 "A bit of a big batch, partly because I didn't send any last week, and
  also just because the BPF fixes happened to land this week.

  Summary:

   - Fix a regression hit by the IPR SCSI driver, introduced by the
     recent addition of MSI domains on pseries.

   - A big series including 8 BPF fixes, some with potential security
     impact and the rest various code generation issues.

   - Fix our program check assembler entry path, which was accidentally
     jumping into a gas macro and generating strange stack frames, which
     could confuse find_bug().

   - A couple of fixes, and related changes, to fix corner cases in our
     machine check handling.

   - Fix our DMA IOMMU ops, which were not always returning the optimal
     DMA mask, leading to at least one device falling back to 32-bit DMA
     when it shouldn't.

   - A fix for KUAP handling on 32-bit Book3S.

   - Fix crashes seen when kdumping on some pseries systems.

  Thanks to Naveen N. Rao, Nicholas Piggin, Alexey Kardashevskiy, Cédric
  Le Goater, Christophe Leroy, Mahesh Salgaonkar, Abdul Haleem,
  Christoph Hellwig, Johan Almbladh, Stan Johnson"

* tag 'powerpc-5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  pseries/eeh: Fix the kdump kernel crash during eeh_pseries_init
  powerpc/32s: Fix kuap_kernel_restore()
  powerpc/pseries/msi: Add an empty irq_write_msi_msg() handler
  powerpc/64s: Fix unrecoverable MCE calling async handler from NMI
  powerpc/64/interrupt: Reconcile soft-mask state in NMI and fix false BUG
  powerpc/64: warn if local irqs are enabled in NMI or hardirq context
  powerpc/traps: do not enable irqs in _exception
  powerpc/64s: fix program check interrupt emergency stack path
  powerpc/bpf ppc32: Fix BPF_SUB when imm == 0x80000000
  powerpc/bpf ppc32: Do not emit zero extend instruction for 64-bit BPF_END
  powerpc/bpf ppc32: Fix JMP32_JSET_K
  powerpc/bpf ppc32: Fix ALU32 BPF_ARSH operation
  powerpc/bpf: Emit stf barrier instruction sequences for BPF_NOSPEC
  powerpc/security: Add a helper to query stf_barrier type
  powerpc/bpf: Fix BPF_SUB when imm == 0x80000000
  powerpc/bpf: Fix BPF_MOD when imm == 1
  powerpc/bpf: Validate branch ranges
  powerpc/lib: Add helper to check if offset is within conditional branch range
  powerpc/iommu: Report the correct most efficient DMA mask for PCI devices
parents 75cd9b01 eb8257a1

arch/powerpc/include/asm/book3s/32/kup.h

+8 −0
Original line number Diff line number Diff line
@@ -136,6 +136,14 @@ static inline void kuap_kernel_restore(struct pt_regs *regs, unsigned long kuap) 
	if (kuap_is_disabled())

		return;



	if (unlikely(kuap != KUAP_NONE)) {

		current->thread.kuap = KUAP_NONE;

		kuap_lock(kuap, false);

	}



	if (likely(regs->kuap == KUAP_NONE))

		return;



	current->thread.kuap = regs->kuap;



	kuap_unlock(regs->kuap, false);

arch/powerpc/include/asm/code-patching.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#define BRANCH_ABSOLUTE	0x2



bool is_offset_in_branch_range(long offset);

bool is_offset_in_cond_branch_range(long offset);

int create_branch(struct ppc_inst *instr, const u32 *addr,

		  unsigned long target, int flags);

int create_cond_branch(struct ppc_inst *instr, const u32 *addr,

arch/powerpc/include/asm/interrupt.h

+10 −8
Original line number Diff line number Diff line
@@ -265,13 +265,16 @@ static inline void interrupt_nmi_enter_prepare(struct pt_regs *regs, struct inte 
	local_paca->irq_soft_mask = IRQS_ALL_DISABLED;

	local_paca->irq_happened |= PACA_IRQ_HARD_DIS;



	if (is_implicit_soft_masked(regs)) {

		// Adjust regs->softe soft implicit soft-mask, so

		// arch_irq_disabled_regs(regs) behaves as expected.

	if (!(regs->msr & MSR_EE) || is_implicit_soft_masked(regs)) {

		/*

		 * Adjust regs->softe to be soft-masked if it had not been

		 * reconcied (e.g., interrupt entry with MSR[EE]=0 but softe

		 * not yet set disabled), or if it was in an implicit soft

		 * masked state. This makes arch_irq_disabled_regs(regs)

		 * behave as expected.

		 */

		regs->softe = IRQS_ALL_DISABLED;

	}

	if (IS_ENABLED(CONFIG_PPC_IRQ_SOFT_MASK_DEBUG))

		BUG_ON(!arch_irq_disabled_regs(regs) && !(regs->msr & MSR_EE));



	/* Don't do any per-CPU operations until interrupt state is fixed */
@@ -525,10 +528,9 @@ static __always_inline long ____##func(struct pt_regs *regs) 
/* kernel/traps.c */

DECLARE_INTERRUPT_HANDLER_NMI(system_reset_exception);

#ifdef CONFIG_PPC_BOOK3S_64

DECLARE_INTERRUPT_HANDLER_ASYNC(machine_check_exception);

#else

DECLARE_INTERRUPT_HANDLER_NMI(machine_check_exception);

DECLARE_INTERRUPT_HANDLER_ASYNC(machine_check_exception_async);

#endif

DECLARE_INTERRUPT_HANDLER_NMI(machine_check_exception);

DECLARE_INTERRUPT_HANDLER(SMIException);

DECLARE_INTERRUPT_HANDLER(handle_hmi_exception);

DECLARE_INTERRUPT_HANDLER(unknown_exception);

arch/powerpc/include/asm/security_features.h

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,11 @@ static inline bool security_ftr_enabled(u64 feature) 
	return !!(powerpc_security_features & feature);

}



#ifdef CONFIG_PPC_BOOK3S_64

enum stf_barrier_type stf_barrier_type_get(void);

#else

static inline enum stf_barrier_type stf_barrier_type_get(void) { return STF_BARRIER_NONE; }

#endif



// Features indicating support for Spectre/Meltdown mitigations

arch/powerpc/kernel/dma-iommu.c

+9 −0
Original line number Diff line number Diff line
@@ -184,6 +184,15 @@ u64 dma_iommu_get_required_mask(struct device *dev) 
	struct iommu_table *tbl = get_iommu_table_base(dev);

	u64 mask;



	if (dev_is_pci(dev)) {

		u64 bypass_mask = dma_direct_get_required_mask(dev);



		if (dma_iommu_dma_supported(dev, bypass_mask)) {

			dev_info(dev, "%s: returning bypass mask 0x%llx\n", __func__, bypass_mask);

			return bypass_mask;

		}

	}



	if (!tbl)

		return 0;