Commit 96d01610 authored by Sam bobroff's avatar Sam bobroff Committed by Benjamin Herrenschmidt
Browse files

powerpc: Correct DSCR during TM context switch 



Correct the DSCR SPR becoming temporarily corrupted if a task is
context switched during a transaction.

The problem occurs while suspending the task and is caused by saving
the DSCR to thread.dscr after it has already been set to the CPU's
default value:

__switch_to() calls __switch_to_tm()
	which calls tm_reclaim_task()
	which calls tm_reclaim_thread()
	which calls tm_reclaim()
		where the DSCR is set to the CPU's default
__switch_to() calls _switch()
		where thread.dscr is set to the DSCR

When the task is resumed, it's transaction will be doomed (as usual)
and the DSCR SPR will be corrupted, although the checkpointed value
will be correct. Therefore the DSCR will be immediately corrected by
the transaction aborting, unless it has been suspended. In that case
the incorrect value can be seen by the task until it resumes the
transaction.

The fix is to treat the DSCR similarly to the TAR and save it early
in __switch_to().

A program exposing the problem is added to the kernel self tests as:
tools/testing/selftests/powerpc/tm/tm-resched-dscr.

Signed-off-by: default avatarSam Bobroff <sam.bobroff@au1.ibm.com>
CC: <stable@vger.kernel.org> [v3.10+]
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent fb5a5157

arch/powerpc/include/asm/switch_to.h

+4 −2
Original line number Diff line number Diff line
@@ -16,13 +16,15 @@ struct thread_struct; 
extern struct task_struct *_switch(struct thread_struct *prev,

				   struct thread_struct *next);

#ifdef CONFIG_PPC_BOOK3S_64

static inline void save_tar(struct thread_struct *prev)

static inline void save_early_sprs(struct thread_struct *prev)

{

	if (cpu_has_feature(CPU_FTR_ARCH_207S))

		prev->tar = mfspr(SPRN_TAR);

	if (cpu_has_feature(CPU_FTR_DSCR))

		prev->dscr = mfspr(SPRN_DSCR);

}

#else

static inline void save_tar(struct thread_struct *prev) {}

static inline void save_early_sprs(struct thread_struct *prev) {}

#endif



extern void enable_kernel_fp(void);

arch/powerpc/kernel/entry_64.S

+0 −6
Original line number Diff line number Diff line
@@ -428,12 +428,6 @@ BEGIN_FTR_SECTION 
	std	r24,THREAD_VRSAVE(r3)

END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)

#endif /* CONFIG_ALTIVEC */

#ifdef CONFIG_PPC64

BEGIN_FTR_SECTION

	mfspr	r25,SPRN_DSCR

	std	r25,THREAD_DSCR(r3)

END_FTR_SECTION_IFSET(CPU_FTR_DSCR)

#endif

	and.	r0,r0,r22

	beq+	1f

	andc	r22,r22,r0

arch/powerpc/kernel/process.c

+4 −4
Original line number Diff line number Diff line
@@ -755,15 +755,15 @@ struct task_struct *__switch_to(struct task_struct *prev, 


	WARN_ON(!irqs_disabled());



	/* Back up the TAR across context switches.

	/* Back up the TAR and DSCR across context switches.

	 * Note that the TAR is not available for use in the kernel.  (To

	 * provide this, the TAR should be backed up/restored on exception

	 * entry/exit instead, and be in pt_regs.  FIXME, this should be in

	 * pt_regs anyway (for debug).)

	 * Save the TAR here before we do treclaim/trecheckpoint as these

	 * will change the TAR.

	 * Save the TAR and DSCR here before we do treclaim/trecheckpoint as

	 * these will change them.

	 */

	save_tar(&prev->thread);

	save_early_sprs(&prev->thread);



	__switch_to_tm(prev);

tools/testing/selftests/powerpc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ CFLAGS := -Wall -O2 -flto -Wall -Werror -DGIT_VERSION='"$(GIT_VERSION)"' -I$(CUR 


export CC CFLAGS



TARGETS = pmu copyloops mm

TARGETS = pmu copyloops mm tm



endif

tools/testing/selftests/powerpc/tm/Makefile

0 → 100644
+15 −0
Original line number Diff line number Diff line 
PROGS := tm-resched-dscr



all: $(PROGS)



$(PROGS):



run_tests: all

	@-for PROG in $(PROGS); do \

		./$$PROG; \

	done;



clean:

	rm -f $(PROGS) *.o



.PHONY: all run_tests clean

CRA Git | Maintained and supported by SUSTech CRA and CCSE