Re: [PATCH v4] m68k/kernel - wire up syscall_trace_enter/leave for m68k

[Michael Schmitz <schmitzmic@gmail.com>]

Hi Andreas,

On 16/06/21 7:27 pm, Andreas Schwab wrote:
> On Jun 16 2021, Michael Schmitz wrote:
>
>> m68k (other than Coldfire) uses syscall_trace for both trace entry
>> and trace exit. Seccomp support requires separate entry points for
>> trace entry and exit which are already provided for Coldfire.
>>
>> Replace syscall_trace by syscall_trace_enter and syscall_trace_leave
>> in preparation for seccomp support. Check return code of
>> syscall_trace_enter(), and skip syscall if -1. Return code will be
>> left at what had been set by by ptrace or seccomp (in regs->d0).
> s/by by/by/
Ouch ...
>
>> diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S
>> index 9dd76fb..e949b66 100644
>> --- a/arch/m68k/kernel/entry.S
>> +++ b/arch/m68k/kernel/entry.S
>> @@ -164,9 +164,11 @@ do_trace_entry:
>>   	movel	#-ENOSYS,%sp@(PT_OFF_D0)| needed for strace
>>   	subql	#4,%sp
>>   	SAVE_SWITCH_STACK
>> -	jbsr	syscall_trace
>> +	jbsr	syscall_trace_enter
>>   	RESTORE_SWITCH_STACK
>>   	addql	#4,%sp
>> +	cmpil	#-1,%d0
> That can be optimized as addql #1,%d0.

Thanks, that wasn't obvious at first glance!

Will fix in v5 ...

Cheers,

     Michael

>
>> +	jeq	ret_from_syscall
> Andreas.
>