[PATCH] powerpc/kvm: Fix objtool warning for unannotated intra-function call in booke.o

[PATCH] powerpc/kvm: Fix objtool warning for unannotated intra-function call in booke.o

[Sathvika Vasireddy]

Objtool throws the following warning:
arch/powerpc/kvm/booke.o: warning: objtool: kvmppc_fill_pt_regs+0x30: unannotated intra-function call

Fix this warning by allowing the function to set the value of 'nip' field
using _THIS_IP_ macro, without having to use an additional assembly
instruction to save the instruction pointer.

Reported-by: kernel test robot <lkp@intel.com>
Suggested-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Sathvika Vasireddy <sv@linux.ibm.com>
---
 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 0dce93ccaadf..e89281d3ba28 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;
 }
-- 
2.31.1

Re: [PATCH] powerpc/kvm: Fix objtool warning for unannotated intra-function call in booke.o

[Michael Ellerman]

On Sat, 28 Jan 2023 18:11:58 +0530, Sathvika Vasireddy wrote:
> Objtool throws the following warning:
> arch/powerpc/kvm/booke.o: warning: objtool: kvmppc_fill_pt_regs+0x30: unannotated intra-function call
> 
> Fix this warning by allowing the function to set the value of 'nip' field
> using _THIS_IP_ macro, without having to use an additional assembly
> instruction to save the instruction pointer.
> 
> [...]

Applied to powerpc/fixes.

[1/1] powerpc/kvm: Fix objtool warning for unannotated intra-function call in booke.o
      https://git.kernel.org/powerpc/c/fe6de81b610e5d0b9d2231acff2de74a35482e7d

cheers