Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 20 May 2022 16:59:52 +0300
From:   "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
To:     Peter Zijlstra <peterz@infradead.org>
Cc:     linux-kernel@vger.kernel.org, linux-tip-commits@vger.kernel.org,
        Kuppuswamy Sathyanarayanan 
        <sathyanarayanan.kuppuswamy@linux.intel.com>,
        Dave Hansen <dave.hansen@linux.intel.com>,
        Tony Luck <tony.luck@intel.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Borislav Petkov <bp@suse.de>, x86@kernel.org
Subject: Re: [PATCH] x86/tdx: Fix tdx asm
Message-ID: <20220520135952.umeymprcfrkkc4wt@black.fi.intel.com>
References: <20220405232939.73860-4-kirill.shutemov@linux.intel.com>
 <164946766187.4207.15170758896351389068.tip-bot2@tip-bot2>
 <20220520083839.GR2578@worktop.programming.kicks-ass.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220520083839.GR2578@worktop.programming.kicks-ass.net>
Precedence: bulk

On Fri, May 20, 2022 at 10:38:39AM +0200, Peter Zijlstra wrote:
> On Sat, Apr 09, 2022 at 01:27:41AM -0000, tip-bot2 for Kuppuswamy Sathyanarayanan wrote:
> > +SYM_FUNC_START(__tdx_module_call)
> > +	FRAME_BEGIN
> > +	TDX_MODULE_CALL host=0
> > +	FRAME_END
> > +	ret
> > +SYM_FUNC_END(__tdx_module_call)
> 
> > +SYM_FUNC_START(__tdx_hypercall)
> 
> > +
> > +	retq
> > +.Lpanic:
> > +	call __tdx_hypercall_failed
> > +	/* __tdx_hypercall_failed never returns */
> > +	jmp .Lpanic
> > +SYM_FUNC_END(__tdx_hypercall)
> 
> :-(
> 
> ---
> Subject: x86/tdx: Fix tdx asm
> 
> Because build-testing is over-rated, a few trivial objtool complaints:
> 
>   vmlinux.o: warning: objtool: __tdx_module_call+0x3e: missing int3 after ret
>   vmlinux.o: warning: objtool: __tdx_hypercall+0x6e: missing int3 after ret
> 
> Fixes: eb94f1b6a70a ("x86/tdx: Add __tdx_module_call() and __tdx_hypercall() helper functions")
> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>

Oopsie :(

Reviewed-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>

> ---
>  arch/x86/coco/tdx/tdcall.S | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/coco/tdx/tdcall.S b/arch/x86/coco/tdx/tdcall.S
> index eeb4511dc414..f9eb1134f22d 100644
> --- a/arch/x86/coco/tdx/tdcall.S
> +++ b/arch/x86/coco/tdx/tdcall.S
> @@ -73,7 +73,7 @@ SYM_FUNC_START(__tdx_module_call)
>  	FRAME_BEGIN
>  	TDX_MODULE_CALL host=0
>  	FRAME_END
> -	ret
> +	RET
>  SYM_FUNC_END(__tdx_module_call)
> 
>  /*
> @@ -196,7 +196,7 @@ SYM_FUNC_START(__tdx_hypercall)
> 
>  	FRAME_END
> 
> -	retq
> +	RET
>  .Lpanic:
>  	call __tdx_hypercall_failed
>  	/* __tdx_hypercall_failed never returns */
> 

-- 
 Kirill A. Shutemov