Re: [PATCH AUTOSEL 6.1 18/38] powerpc/kvm: Fix unannotated intra-function call warning

[Sathvika Vasireddy]

Hi Sasha,

On 09/02/23 16:44, Sasha Levin wrote:
> From: Sathvika Vasireddy <sv@xxxxxxxxxxxxx>
>
> [ Upstream commit fe6de81b610e5d0b9d2231acff2de74a35482e7d ]
>
> objtool throws the following warning:
>    arch/powerpc/kvm/booke.o: warning: objtool: kvmppc_fill_pt_regs+0x30:
>    unannotated intra-function call
>
> Fix the warning by setting the value of 'nip' using the _THIS_IP_ macro,
> without using an assembly bl/mflr sequence to save the instruction
> pointer.
>
> Reported-by: kernel test robot <lkp@xxxxxxxxx>
> Suggested-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
> Signed-off-by: Sathvika Vasireddy <sv@xxxxxxxxxxxxx>
> Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
> Link: https://lore.kernel.org/r/20230128124158.1066251-1-sv@xxxxxxxxxxxxx
> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
> ---
>   arch/powerpc/kvm/booke.c | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
> index 7b4920e9fd263..3852209989f04 100644
> --- a/arch/powerpc/kvm/booke.c
> +++ b/arch/powerpc/kvm/booke.c
> @@ -912,16 +912,15 @@ static int kvmppc_handle_debug(struct kvm_vcpu *vcpu)
>   
>   static void kvmppc_fill_pt_regs(struct pt_regs *regs)
>   {
> -	ulong r1, ip, msr, lr;
> +	ulong r1, msr, lr;
>   
>   	asm("mr %0, 1" : "=r"(r1));
>   	asm("mflr %0" : "=r"(lr));
>   	asm("mfmsr %0" : "=r"(msr));
> -	asm("bl 1f; 1: mflr %0" : "=r"(ip));
>   
>   	memset(regs, 0, sizeof(*regs));
>   	regs->gpr[1] = r1;
> -	regs->nip = ip;
> +	regs->nip = _THIS_IP_;
>   	regs->msr = msr;
>   	regs->link = lr;
>   }

Please drop this patch because objtool enablement patches for powerpc 
are not a part of kernel v6.1


Thanks,
Sathvika