Merge tag 'powerpc-5.7-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux (ffeb595d) · Commits · 戴 / test

Pull powerpc fixes from Michael Ellerman: - a fix for the recent change to how we restore non-volatile GPRs, which broke our emulation of reading from the DSCR (Data Stream Control Register). - a fix for the recent rewrite of interrupt/syscall exit in C, we need to exclude KCOV from that code, otherwise it can lead to unrecoverable faults. Thanks to Daniel Axtens. * tag 'powerpc-5.7-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: powerpc/64s: Disable sanitisers for C syscall/interrupt entry/exit code powerpc/64s: Fix restore of NV GPRs after facility unavailable exception

arch/powerpc/kernel/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -162,6 +162,9 @@ UBSAN_SANITIZE_kprobes.o := n
		GCOV_PROFILE_kprobes-ftrace.o := n
		KCOV_INSTRUMENT_kprobes-ftrace.o := n
		UBSAN_SANITIZE_kprobes-ftrace.o := n
		GCOV_PROFILE_syscall_64.o := n
		KCOV_INSTRUMENT_syscall_64.o := n
		UBSAN_SANITIZE_syscall_64.o := n
		UBSAN_SANITIZE_vdso.o := n

		# Necessary for booting with kcov enabled on book3e machines

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -2411,6 +2411,7 @@ EXC_COMMON_BEGIN(facility_unavailable_common)
		GEN_COMMON facility_unavailable
		addi r3,r1,STACK_FRAME_OVERHEAD
		bl facility_unavailable_exception
		REST_NVGPRS(r1) /* instruction emulation may change GPRs */
		b interrupt_return

		GEN_KVM facility_unavailable
		@@ -2440,6 +2441,7 @@ EXC_COMMON_BEGIN(h_facility_unavailable_common)
		GEN_COMMON h_facility_unavailable
		addi r3,r1,STACK_FRAME_OVERHEAD
		bl facility_unavailable_exception
		REST_NVGPRS(r1) /* XXX Shouldn't be necessary in practice */
		b interrupt_return

		GEN_KVM h_facility_unavailable

Admin message