Re: [PATCH v6 07/12] unwind_user/sframe: Wire up unwind_user to sframe

[Jens Remus <jremus@linux.ibm.com>]

On 18.06.2025 00:50, Steven Rostedt wrote:
> From: Josh Poimboeuf <jpoimboe@kernel.org>
> 
> Now that the sframe infrastructure is fully in place, make it work by
> hooking it up to the unwind_user interface.
> 
> Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>

> diff --git a/kernel/unwind/user.c b/kernel/unwind/user.c

> @@ -41,17 +48,27 @@ static inline bool compat_state(struct unwind_user_state *state)
>  int unwind_user_next(struct unwind_user_state *state)
>  {
>  	struct unwind_user_frame *frame;
> +	struct unwind_user_frame _frame;
>  	unsigned long cfa = 0, fp, ra = 0;
>  
>  	if (state->done)
>  		return -EINVAL;
>  
> -	if (compat_state(state))
> +	if (compat_state(state)) {
>  		frame = &compat_fp_frame;
> -	else if (fp_state(state))
> +	} else if (sframe_state(state)) {
> +		/* sframe expects the frame to be local storage */
> +		frame = &_frame;
> +		if (sframe_find(state->ip, frame)) {
> +			if (!IS_ENABLED(CONFIG_HAVE_UNWIND_USER_FP))
> +				goto the_end;

Nit: s/the_end/done/

> +			frame = &fp_frame;
> +		}
> +	} else if (fp_state(state)) {
>  		frame = &fp_frame;
> -	else
> +	} else {
>  		goto the_end;
> +	}
>  
>  	cfa = (frame->use_fp ? state->fp : state->sp) + frame->cfa_off;
>  

Regards,
Jens
-- 
Jens Remus
Linux on Z Development (D3303)
+49-7031-16-1128 Office
jremus@de.ibm.com

IBM

IBM Deutschland Research & Development GmbH; Vorsitzender des Aufsichtsrats: Wolfgang Wendt; Geschäftsführung: David Faller; Sitz der Gesellschaft: Böblingen; Registergericht: Amtsgericht Stuttgart, HRB 243294
IBM Data Privacy Statement: https://www.ibm.com/privacy/