Unverified Commit 5917ea17 authored by Leonardo Bras's avatar Leonardo Bras Committed by Palmer Dabbelt
Browse files

riscv: Introduce is_compat_thread() into compat.h 



task_user_regset_view() makes use of a function very similar to
is_compat_task(), but pointing to a any thread.

In arm64 asm/compat.h there is a function very similar to that:
is_compat_thread(struct thread_info *thread)

Copy this function to riscv asm/compat.h and make use of it into
task_user_regset_view().

Also, introduce a compile-time test for CONFIG_COMPAT and simplify the
function code by removing the #ifdef.

Signed-off-by: default avatarLeonardo Bras <leobras@redhat.com>
Reviewed-by: default avatarGuo Ren <guoren@kernel.org>
Reviewed-by: default avatarAndy Chiu <andy.chiu@sifive.com>
Link: https://lore.kernel.org/r/20240103160024.70305-6-leobras@redhat.com


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 4c0b5a45

arch/riscv/include/asm/compat.h

+8 −0
Original line number Diff line number Diff line
@@ -20,6 +20,14 @@ static inline int is_compat_task(void) 
	return test_thread_flag(TIF_32BIT);

}



static inline int is_compat_thread(struct thread_info *thread)

{

	if (!IS_ENABLED(CONFIG_COMPAT))

		return 0;



	return test_ti_thread_flag(thread, TIF_32BIT);

}



struct compat_user_regs_struct {

	compat_ulong_t pc;

	compat_ulong_t ra;

arch/riscv/kernel/ptrace.c

+3 −3
Original line number Diff line number Diff line
@@ -374,14 +374,14 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, 


	return ret;

}

#else

static const struct user_regset_view compat_riscv_user_native_view = {};

#endif /* CONFIG_COMPAT */



const struct user_regset_view *task_user_regset_view(struct task_struct *task)

{

#ifdef CONFIG_COMPAT

	if (test_tsk_thread_flag(task, TIF_32BIT))

	if (is_compat_thread(&task->thread_info))

		return &compat_riscv_user_native_view;

	else

#endif

		return &riscv_user_native_view;

}