Commit 2d19630e authored by Christopher M. Riedl's avatar Christopher M. Riedl Committed by Michael Ellerman
Browse files

powerpc/signal64: Remove TM ifdefery in middle of if/else block 



Both rt_sigreturn() and handle_rt_signal_64() contain TM-related ifdefs
which break-up an if/else block. Provide stubs for the ifdef-guarded TM
functions and remove the need for an ifdef in rt_sigreturn().

Rework the remaining TM ifdef in handle_rt_signal64() similar to
commit f1cf4f93 ("powerpc/signal32: Remove ifdefery in middle of if/else").

Unlike in the commit for ppc32, the ifdef can't be removed entirely
since uc_transact in sigframe depends on CONFIG_PPC_TRANSACTIONAL_MEM.

Signed-off-by: default avatarChristopher M. Riedl <cmr@codefail.de>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210227011259.11992-6-cmr@codefail.de
parent 1a130b67

arch/powerpc/kernel/process.c

+2 −1
Original line number Diff line number Diff line
@@ -1117,9 +1117,10 @@ void restore_tm_state(struct pt_regs *regs) 
	regs->msr |= msr_diff;

}



#else

#else /* !CONFIG_PPC_TRANSACTIONAL_MEM */

#define tm_recheckpoint_new_task(new)

#define __switch_to_tm(prev, new)

void tm_reclaim_current(uint8_t cause) {}

#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */



static inline void save_sprs(struct thread_struct *t)

arch/powerpc/kernel/signal_64.c

+52 −50
Original line number Diff line number Diff line
@@ -594,6 +594,12 @@ static long restore_tm_sigcontexts(struct task_struct *tsk, 


	return err;

}

#else /* !CONFIG_PPC_TRANSACTIONAL_MEM */

static long restore_tm_sigcontexts(struct task_struct *tsk, struct sigcontext __user *sc,

				   struct sigcontext __user *tm_sc)

{

	return -EINVAL;

}

#endif



/*
@@ -710,9 +716,7 @@ SYSCALL_DEFINE0(rt_sigreturn) 
	struct pt_regs *regs = current_pt_regs();

	struct ucontext __user *uc = (struct ucontext __user *)regs->gpr[1];

	sigset_t set;

#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

	unsigned long msr;

#endif



	/* Always make any pending restarted system calls return -EINTR */

	current->restart_block.fn = do_no_restart_syscall;
@@ -724,7 +728,7 @@ SYSCALL_DEFINE0(rt_sigreturn) 
		goto badframe;

	set_current_blocked(&set);



#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

	if (IS_ENABLED(CONFIG_PPC_TRANSACTIONAL_MEM)) {

		/*

		 * If there is a transactional state then throw it away.

		 * The purpose of a sigreturn is to destroy all traces of the
@@ -765,7 +769,9 @@ SYSCALL_DEFINE0(rt_sigreturn) 


		if (__get_user(msr, &uc->uc_mcontext.gp_regs[PT_MSR]))

			goto badframe;

	if (MSR_TM_ACTIVE(msr)) {

	}



	if (IS_ENABLED(CONFIG_PPC_TRANSACTIONAL_MEM) && MSR_TM_ACTIVE(msr)) {

		/* We recheckpoint on return. */

		struct ucontext __user *uc_transact;
@@ -778,9 +784,7 @@ SYSCALL_DEFINE0(rt_sigreturn) 
		if (restore_tm_sigcontexts(current, &uc->uc_mcontext,

					   &uc_transact->uc_mcontext))

			goto badframe;

	} else

#endif

	{

	} else {

		/*

		 * Fall through, for non-TM restore

		 *
@@ -818,10 +822,8 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, 
	unsigned long newsp = 0;

	long err = 0;

	struct pt_regs *regs = tsk->thread.regs;

#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

	/* Save the thread's msr before get_tm_stackpointer() changes it */

	unsigned long msr = regs->msr;

#endif



	frame = get_sigframe(ksig, tsk, sizeof(*frame), 0);

	if (!access_ok(frame, sizeof(*frame)))
@@ -836,8 +838,9 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, 
	/* Create the ucontext.  */

	err |= __put_user(0, &frame->uc.uc_flags);

	err |= __save_altstack(&frame->uc.uc_stack, regs->gpr[1]);

#ifdef CONFIG_PPC_TRANSACTIONAL_MEM



	if (MSR_TM_ACTIVE(msr)) {

#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

		/* The ucontext_t passed to userland points to the second

		 * ucontext_t (for transactional state) with its uc_link ptr.

		 */
@@ -847,9 +850,8 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, 
					    tsk, ksig->sig, NULL,

					    (unsigned long)ksig->ka.sa.sa_handler,

					    msr);

	} else

#endif

	{

	} else {

		err |= __put_user(0, &frame->uc.uc_link);

		prepare_setup_sigcontext(tsk);

		err |= setup_sigcontext(&frame->uc.uc_mcontext, tsk, ksig->sig,