Skip to contentSkip to conversation

powerpc64/ftrace: Include ftrace.h needed for enable/disable calls

PATCH In review Luke Dashjr 3 participants 5 messages Aug 16, 2018 – Aug 21, 2018

Subsystems (2)
PowerPC KVM PowerPC
lore
Share & tools
lore

Luke Dashjr

author
#0 lore raw

PATCH 1/1 powerpc64/ftrace: Include ftrace.h needed for enable/disable calls

this_cpu_disable_ftrace and this_cpu_enable_ftrace are inlines in ftrace.h Without it included, the build fails.

Fixes a4bc64d305af ("powerpc64/ftrace: Disable ftrace during kvm entry/exit")
Signed-off-by Luke Dashjr <[email protected]>
Cc [email protected]
---
 arch/powerpc/kvm/book3s_hv.c | 1 +
 1 file changed, 1 insertion(+)
arch/powerpc/kvm/book3s_hv.c +1 -0
index ee4a8854985e..15c2c64291f4 100644
@@ -46,6 +46,7 @@
 #include <linux/compiler.h>
 #include <linux/of.h>
 
+#include <asm/ftrace.h>
 #include <asm/reg.h>
 #include <asm/ppc-opcode.h>
 #include <asm/asm-prototypes.h>
Signature · 1 line
2.16.4
Acked-by on v1 1/1
#1 lore raw
Quoted 1 line · Luke Dashjr

this_cpu_disable_ftrace and this_cpu_enable_ftrace are inlines in ftrace.=

h

Quoted 1 line

Without it included, the build fails.

I'm unable to reproduce this. Can you share your .config and the build=20 environment?

Quoted 2 lines

=20

Fixes a4bc64d305af ("powerpc64/ftrace: Disable ftrace during kvm entry/e=

xit")

Quoted 13 lines
Signed-off-by Luke Dashjr <[email protected]>
Cc [email protected]
---
 arch/powerpc/kvm/book3s_hv.c | 1 +
 1 file changed, 1 insertion(+)

=20

arch/powerpc/kvm/book3s_hv.c +0 -0
index ee4a8854985e..15c2c64291f4 100644
@@ -46,6 +46,7 @@
 #include <linux/compiler.h>
 #include <linux/of.h>
Quoted 5 lines

=20
+#include <asm/ftrace.h>
#include <asm/reg.h>
#include <asm/ppc-opcode.h>
#include <asm/asm-prototypes.h>

In any case, this change itself looks alright to me. So:

Acked-by Naveen N. Rao <[email protected]>

Thanks,
Naveen

=

author
#2 lore raw
Quoted 6 lines · On Friday 17 August 2018 10:25:40 Naveen N. Rao wrote:
Quoted 2 lines · Luke Dashjr

this_cpu_disable_ftrace and this_cpu_enable_ftrace are inlines in ftrace.h Without it included, the build fails.

I'm unable to reproduce this. Can you share your .config and the build environment?

https://luke.dashjr.org/tmp/code/4.18-config.xz

Gentoo GNU/Linux (mostly stable keywords) on a Raptor Talos II POWER9 system.

Quoted 26 lines
Quoted 12 lines
Fixes a4bc64d305af ("powerpc64/ftrace: Disable ftrace during kvm

entry/exit") Signed-off-by: Luke Dashjr <[email protected]>
Cc: [email protected]

---
 arch/powerpc/kvm/book3s_hv.c | 1 +
 1 file changed, 1 insertion(+)
arch/powerpc/kvm/book3s_hv.c +0 -0
index ee4a8854985e..15c2c64291f4 100644

arch/powerpc/kvm/book3s_hv.c line 52

Quoted 7 lines
arch/powerpc/kvm/book3s_hv.c +1 -0
@@ -46,6 +46,7 @@
 #include <linux/compiler.h>
 #include <linux/of.h>
 
+#include <asm/ftrace.h>
 #include <asm/reg.h>
 #include <asm/ppc-opcode.h>
 #include <asm/asm-prototypes.h>

In any case, this change itself looks alright to me. So:

Acked-by Naveen N. Rao <[email protected]>

Thanks,
Naveen

#3 lore raw
Quoted 11 lines · Luke Dashjr
Quoted 6 lines · On Friday 17 August 2018 10:25:40 Naveen N. Rao wrote:
Quoted 2 lines · Luke Dashjr

this_cpu_disable_ftrace and this_cpu_enable_ftrace are inlines in ftrace.h Without it included, the build fails.

I'm unable to reproduce this. Can you share your .config and the build environment?

=20
https://luke.dashjr.org/tmp/code/4.18-config.xz
=20
Gentoo GNU/Linux (mostly stable keywords) on a Raptor Talos II POWER9 sys=

tem.

Thanks. Your config is missing CONFIG_TRACEPOINTS and I hadn't tested=20 that. The below fix looks good and I've confirmed that the other uses=20 are fine as well.

- Naveen

=

reviewer
#4 lore raw
In reply to Luke Dashjr
Quoted 9 lines · Luke Dashjr

this_cpu_disable_ftrace and this_cpu_enable_ftrace are inlines in ftrace.h Without it included, the build fails.

Fixes a4bc64d305af ("powerpc64/ftrace: Disable ftrace during kvm entry/exit")
Signed-off-by Luke Dashjr <[email protected]>
Cc [email protected]
---
 arch/powerpc/kvm/book3s_hv.c | 1 +
 1 file changed, 1 insertion(+)

I've picked this up.

If you can Cc linuxppc-dev on arch/powerpc patches that would be ideal, that way my patchwork[1] picks it up.

I realise this is a KVM patch so you've Cc'ed kvm-ppc but it's also a powerpc patch :)

If you use scripts/get_maintainer.pl it should give you the right answer.

cheers

[1]: https://patchwork.ozlabs.org/project/linuxppc-dev

Quoted 14 lines
arch/powerpc/kvm/book3s_hv.c +1 -0
index ee4a8854985e..15c2c64291f4 100644
@@ -46,6 +46,7 @@
 #include <linux/compiler.h>
 #include <linux/of.h>
 
+#include <asm/ftrace.h>
 #include <asm/reg.h>
 #include <asm/ppc-opcode.h>
 #include <asm/asm-prototypes.h>
Signature · 1 line
2.16.4