| Message ID | 20230509091600.70994-1-npiggin@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 750bd41aeaeb1f0e0128aa4f8fcd6dd759713641 |
| Headers | show |
| Series | [1/2] powerpc/pseries: Fix hcall tracepoints with JUMP_LABEL=n | expand |
On Tue, 09 May 2023 19:15:59 +1000, Nicholas Piggin wrote: > With JUMP_LABEL=n, hcall_tracepoint_refcount's address is being tested > instead of its value. This results in the tracing slowpath always being > taken unnecessarily. > > Applied to powerpc/next. [1/2] powerpc/pseries: Fix hcall tracepoints with JUMP_LABEL=n https://git.kernel.org/powerpc/c/750bd41aeaeb1f0e0128aa4f8fcd6dd759713641 [2/2] powerpc/pseries: Remove unused hcall tracing instruction https://git.kernel.org/powerpc/c/61d7ebe0376e2640ba77be16e186b1a6c77eb3f7 cheers
diff --git a/arch/powerpc/platforms/pseries/hvCall.S b/arch/powerpc/platforms/pseries/hvCall.S index 35254ac7af5e..ca0674b0b683 100644 --- a/arch/powerpc/platforms/pseries/hvCall.S +++ b/arch/powerpc/platforms/pseries/hvCall.S @@ -91,6 +91,7 @@ BEGIN_FTR_SECTION; \ b 1f; \ END_FTR_SECTION(0, 1); \ LOAD_REG_ADDR(r12, hcall_tracepoint_refcount) ; \ + ld r12,0(r12); \ std r12,32(r1); \ cmpdi r12,0; \ bne- LABEL; \
With JUMP_LABEL=n, hcall_tracepoint_refcount's address is being tested instead of its value. This results in the tracing slowpath always being taken unnecessarily. Fixes: 9a10ccb29c0a2 ("powerpc/pseries: move hcall_tracepoint_refcount out of .toc") Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- arch/powerpc/platforms/pseries/hvCall.S | 1 + 1 file changed, 1 insertion(+)