Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1c0d66f authored by Simon Guo's avatar Simon Guo Committed by Michael Ellerman
Browse files

powerpc: Set used_(vsr|vr|spe) in sigreturn path when MSR bits are active 



Normally, when MSR[VSX/VR/SPE] bits == 1, the used_vsr/used_vr/used_spe
bit have already been set. However when loading a signal frame from user
space we need to explicitly set used_vsr/used_vr/used_spe to make them
consistent with the MSR bits from the signal frame.

For example, CRIU application, who utilizes sigreturn to restore
checkpointed process, will lead to the case where MSR[VSX] bit is active
in signal frame, but used_vsr bit is not set in the kernel. (the same
applies to VR/SPE).

This patch fixes this by always setting used_* bit when MSR related bits
are active in signal frame and we are doing sigreturn.

Based on a proposal by Benh.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarSimon Guo <wei.guo.simon@gmail.com>
[mpe: Massage change log]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 26183116

arch/powerpc/kernel/signal_32.c

+6 −0
Original line number Diff line number Diff line
@@ -699,6 +699,7 @@ static long restore_user_regs(struct pt_regs *regs, 
		if (__copy_from_user(&current->thread.vr_state, &sr->mc_vregs,

				     sizeof(sr->mc_vregs)))

			return 1;

		current->thread.used_vr = true;

	} else if (current->thread.used_vr)

		memset(&current->thread.vr_state, 0,

		       ELF_NVRREG * sizeof(vector128));
@@ -725,6 +726,7 @@ static long restore_user_regs(struct pt_regs *regs, 
		 */

		if (copy_vsx_from_user(current, &sr->mc_vsregs))

			return 1;

		current->thread.used_vsr = true;

	} else if (current->thread.used_vsr)

		for (i = 0; i < 32 ; i++)

			current->thread.fp_state.fpr[i][TS_VSRLOWOFFSET] = 0;
@@ -744,6 +746,7 @@ static long restore_user_regs(struct pt_regs *regs, 
		if (__copy_from_user(current->thread.evr, &sr->mc_vregs,

				     ELF_NEVRREG * sizeof(u32)))

			return 1;

		current->thread.used_spe = true;

	} else if (current->thread.used_spe)

		memset(current->thread.evr, 0, ELF_NEVRREG * sizeof(u32));
@@ -800,6 +803,7 @@ static long restore_tm_user_regs(struct pt_regs *regs, 
				     &tm_sr->mc_vregs,

				     sizeof(sr->mc_vregs)))

			return 1;

		current->thread.used_vr = true;

	} else if (current->thread.used_vr) {

		memset(&current->thread.vr_state, 0,

		       ELF_NVRREG * sizeof(vector128));
@@ -833,6 +837,7 @@ static long restore_tm_user_regs(struct pt_regs *regs, 
		if (copy_vsx_from_user(current, &sr->mc_vsregs) ||

		    copy_transact_vsx_from_user(current, &tm_sr->mc_vsregs))

			return 1;

		current->thread.used_vsr = true;

	} else if (current->thread.used_vsr)

		for (i = 0; i < 32 ; i++) {

			current->thread.fp_state.fpr[i][TS_VSRLOWOFFSET] = 0;
@@ -849,6 +854,7 @@ static long restore_tm_user_regs(struct pt_regs *regs, 
		if (__copy_from_user(current->thread.evr, &sr->mc_vregs,

				     ELF_NEVRREG * sizeof(u32)))

			return 1;

		current->thread.used_spe = true;

	} else if (current->thread.used_spe)

		memset(current->thread.evr, 0, ELF_NEVRREG * sizeof(u32));

arch/powerpc/kernel/signal_64.c

+8 −3
Original line number Diff line number Diff line
@@ -369,9 +369,11 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig, 
	if (v_regs && !access_ok(VERIFY_READ, v_regs, 34 * sizeof(vector128)))

		return -EFAULT;

	/* Copy 33 vec registers (vr0..31 and vscr) from the stack */

	if (v_regs != NULL && (msr & MSR_VEC) != 0)

	if (v_regs != NULL && (msr & MSR_VEC) != 0) {

		err |= __copy_from_user(&current->thread.vr_state, v_regs,

					33 * sizeof(vector128));

		current->thread.used_vr = true;

	}

	else if (current->thread.used_vr)

		memset(&current->thread.vr_state, 0, 33 * sizeof(vector128));

	/* Always get VRSAVE back */
@@ -391,9 +393,10 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig, 
	 * buffer for formatting, then into the taskstruct.

	 */

	v_regs += ELF_NVRREG;

	if ((msr & MSR_VSX) != 0)

	if ((msr & MSR_VSX) != 0) {

		err |= copy_vsx_from_user(current, v_regs);

	else

		current->thread.used_vsr = true;

	} else

		for (i = 0; i < 32 ; i++)

			current->thread.fp_state.fpr[i][TS_VSRLOWOFFSET] = 0;

#endif
@@ -488,6 +491,7 @@ static long restore_tm_sigcontexts(struct pt_regs *regs, 
					33 * sizeof(vector128));

		err |= __copy_from_user(&current->thread.transact_vr, tm_v_regs,

					33 * sizeof(vector128));

		current->thread.used_vr = true;

	}

	else if (current->thread.used_vr) {

		memset(&current->thread.vr_state, 0, 33 * sizeof(vector128));
@@ -521,6 +525,7 @@ static long restore_tm_sigcontexts(struct pt_regs *regs, 
		tm_v_regs += ELF_NVRREG;

		err |= copy_vsx_from_user(current, v_regs);

		err |= copy_transact_vsx_from_user(current, tm_v_regs);

		current->thread.used_vsr = true;

	} else {

		for (i = 0; i < 32 ; i++) {

			current->thread.fp_state.fpr[i][TS_VSRLOWOFFSET] = 0;