Re: [PATCH] x86/sgx: Use goto to remove redundant if check in sgx_encl_init

[Jarkko Sakkinen]

On Wed, Dec 10, 2025 at 02:00:35PM +0100, Thorsten Blum wrote:
> Immediately break out of both loops when 'ret != SGX_UNMASKED_EVENT'
> instead of checking for the same condition again in the outer loop.
> 
> Signed-off-by: Thorsten Blum <thorsten.blum@xxxxxxxxx>
> ---
>  arch/x86/kernel/cpu/sgx/ioctl.c | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/x86/kernel/cpu/sgx/ioctl.c b/arch/x86/kernel/cpu/sgx/ioctl.c
> index 9322a9287dc7..c1e9841685e8 100644
> --- a/arch/x86/kernel/cpu/sgx/ioctl.c
> +++ b/arch/x86/kernel/cpu/sgx/ioctl.c
> @@ -521,15 +521,10 @@ static int sgx_encl_init(struct sgx_encl *encl, struct sgx_sigstruct *sigstruct,
>  
>  			preempt_enable();
>  
> -			if (ret == SGX_UNMASKED_EVENT)
> -				continue;
> -			else
> -				break;
> +			if (ret != SGX_UNMASKED_EVENT)
> +				goto skip_loop;
>  		}
>  
> -		if (ret != SGX_UNMASKED_EVENT)
> -			break;
> -
>  		msleep_interruptible(SGX_EINIT_SLEEP_TIME);
>  
>  		if (signal_pending(current)) {
> @@ -538,6 +533,7 @@ static int sgx_encl_init(struct sgx_encl *encl, struct sgx_sigstruct *sigstruct,
>  		}
>  	}
>  
> +skip_loop:
>  	if (encls_faulted(ret)) {
>  		if (encls_failed(ret))
>  			ENCLS_WARN(ret, "EINIT");
> -- 
> Thorsten Blum <thorsten.blum@xxxxxxxxx>
> GPG: 1D60 735E 8AEF 3BE4 73B6  9D84 7336 78FD 8DFE EAD4
> 

I don't think moving code around is very useful.

BR, Jarkko