Commit 95c7b075 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-5.12-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:
 "Some some more powerpc fixes for 5.12:

   - Fix an oops triggered by ptrace when CONFIG_PPC_FPU_REGS=n

   - Fix an oops on sigreturn when the VDSO is unmapped on 32-bit

   - Fix vdso_wrapper.o not being rebuilt everytime vdso.so is rebuilt

  Thanks to Christophe Leroy"

* tag 'powerpc-5.12-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/vdso: Make sure vdso_wrapper.o is rebuilt everytime vdso.so is rebuilt
  powerpc/signal32: Fix Oops on sigreturn with unmapped VDSO
  powerpc/ptrace: Don't return error when getting/setting FP regs without CONFIG_PPC_FPU_REGS
parents d5fa1dad 791f9e36

arch/powerpc/kernel/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -191,3 +191,7 @@ $(obj)/prom_init_check: $(src)/prom_init_check.sh $(obj)/prom_init.o FORCE 
targets += prom_init_check



clean-files := vmlinux.lds



# Force dependency (incbin is bad)

$(obj)/vdso32_wrapper.o : $(obj)/vdso32/vdso32.so.dbg

$(obj)/vdso64_wrapper.o : $(obj)/vdso64/vdso64.so.dbg

arch/powerpc/kernel/ptrace/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ 
CFLAGS_ptrace-view.o		+= -DUTS_MACHINE='"$(UTS_MACHINE)"'



obj-y				+= ptrace.o ptrace-view.o

obj-$(CONFIG_PPC_FPU_REGS)	+= ptrace-fpu.o

obj-y				+= ptrace-fpu.o

obj-$(CONFIG_COMPAT)		+= ptrace32.o

obj-$(CONFIG_VSX)		+= ptrace-vsx.o

ifneq ($(CONFIG_VSX),y)

obj-$(CONFIG_PPC_FPU_REGS)	+= ptrace-novsx.o

obj-y				+= ptrace-novsx.o

endif

obj-$(CONFIG_ALTIVEC)		+= ptrace-altivec.o

obj-$(CONFIG_SPE)		+= ptrace-spe.o

arch/powerpc/kernel/ptrace/ptrace-decl.h

+0 −14
Original line number Diff line number Diff line
@@ -165,22 +165,8 @@ int ptrace_put_reg(struct task_struct *task, int regno, unsigned long data); 
extern const struct user_regset_view user_ppc_native_view;



/* ptrace-fpu */

#ifdef CONFIG_PPC_FPU_REGS

int ptrace_get_fpr(struct task_struct *child, int index, unsigned long *data);

int ptrace_put_fpr(struct task_struct *child, int index, unsigned long data);

#else

static inline int

ptrace_get_fpr(struct task_struct *child, int index, unsigned long *data)

{

	return -EIO;

}



static inline int

ptrace_put_fpr(struct task_struct *child, int index, unsigned long data)

{

	return -EIO;

}

#endif



/* ptrace-(no)adv */

void ppc_gethwdinfo(struct ppc_debug_info *dbginfo);

arch/powerpc/kernel/ptrace/ptrace-fpu.c

+10 −0
Original line number Diff line number Diff line
@@ -8,32 +8,42 @@ 


int ptrace_get_fpr(struct task_struct *child, int index, unsigned long *data)

{

#ifdef CONFIG_PPC_FPU_REGS

	unsigned int fpidx = index - PT_FPR0;

#endif



	if (index > PT_FPSCR)

		return -EIO;



#ifdef CONFIG_PPC_FPU_REGS

	flush_fp_to_thread(child);

	if (fpidx < (PT_FPSCR - PT_FPR0))

		memcpy(data, &child->thread.TS_FPR(fpidx), sizeof(long));

	else

		*data = child->thread.fp_state.fpscr;

#else

	*data = 0;

#endif



	return 0;

}



int ptrace_put_fpr(struct task_struct *child, int index, unsigned long data)

{

#ifdef CONFIG_PPC_FPU_REGS

	unsigned int fpidx = index - PT_FPR0;

#endif



	if (index > PT_FPSCR)

		return -EIO;



#ifdef CONFIG_PPC_FPU_REGS

	flush_fp_to_thread(child);

	if (fpidx < (PT_FPSCR - PT_FPR0))

		memcpy(&child->thread.TS_FPR(fpidx), &data, sizeof(long));

	else

		child->thread.fp_state.fpscr = data;

#endif



	return 0;

}

arch/powerpc/kernel/ptrace/ptrace-novsx.c

+8 −0
Original line number Diff line number Diff line
@@ -21,12 +21,16 @@ 
int fpr_get(struct task_struct *target, const struct user_regset *regset,

	    struct membuf to)

{

#ifdef CONFIG_PPC_FPU_REGS

	BUILD_BUG_ON(offsetof(struct thread_fp_state, fpscr) !=

		     offsetof(struct thread_fp_state, fpr[32]));



	flush_fp_to_thread(target);



	return membuf_write(&to, &target->thread.fp_state, 33 * sizeof(u64));

#else

	return membuf_write(&to, &empty_zero_page, 33 * sizeof(u64));

#endif

}



/*
@@ -46,6 +50,7 @@ int fpr_set(struct task_struct *target, const struct user_regset *regset, 
	    unsigned int pos, unsigned int count,

	    const void *kbuf, const void __user *ubuf)

{

#ifdef CONFIG_PPC_FPU_REGS

	BUILD_BUG_ON(offsetof(struct thread_fp_state, fpscr) !=

		     offsetof(struct thread_fp_state, fpr[32]));
@@ -53,4 +58,7 @@ int fpr_set(struct task_struct *target, const struct user_regset *regset, 


	return user_regset_copyin(&pos, &count, &kbuf, &ubuf,

				  &target->thread.fp_state, 0, -1);

#else

	return 0;

#endif

}