[PATCH 1/3] KVM: arm64: fix include path for ring buffer implementation

[PATCH 1/3] KVM: arm64: fix include path for ring buffer implementation

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

The simple_ring_buffer.c file is in the source tree rather than
generated at build time, so the include path is wrong when using
separate object trees:

arch/arm64/kvm/hyp/nvhe/trace.c:16:10: fatal error: simple_ring_buffer.c: No such file or directory
   16 | #include "simple_ring_buffer.c"

Include it from the source tree instead.

Fixes: 680a04c333fa ("KVM: arm64: Add tracing capability for the nVHE/pKVM hyp")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 arch/arm64/kvm/hyp/nvhe/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile
index 143d55ec7298..3d33fbefdfc1 100644
--- a/arch/arm64/kvm/hyp/nvhe/Makefile
+++ b/arch/arm64/kvm/hyp/nvhe/Makefile
@@ -33,7 +33,7 @@ hyp-obj-$(CONFIG_NVHE_EL2_TRACING) += clock.o trace.o events.o
 hyp-obj-y += $(lib-objs)
 
 # Path to simple_ring_buffer.c
-CFLAGS_trace.nvhe.o += -I$(objtree)/kernel/trace/
+CFLAGS_trace.nvhe.o += -I$(srctree)/kernel/trace/
 
 ##
 ## Build rules for compiling nVHE hyp code
-- 
2.39.5

[PATCH 3/3] KVM: arm64: tracing: add ftrace dependency

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

Selecting CONFIG_TRACE_REMOTE causes a build time warning when FTRACE
is disabled:

WARNING: unmet direct dependencies detected for TRACE_REMOTE
  Depends on [n]: FTRACE [=n]
  Selected by [y]:
  - NVHE_EL2_TRACING [=y] && VIRTUALIZATION [=y] && KVM [=y] && NVHE_EL2_DEBUG [=y] && TRACING [=y]

Add this as another dependency to ensure a clean build.

Fixes: 3aed038aac8d ("KVM: arm64: Add trace remote for the nVHE/pKVM hyp")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 arch/arm64/kvm/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig
index 32c7a4f85e75..bcc87f9dad33 100644
--- a/arch/arm64/kvm/Kconfig
+++ b/arch/arm64/kvm/Kconfig
@@ -78,7 +78,7 @@ if NVHE_EL2_DEBUG
 
 config NVHE_EL2_TRACING
 	bool
-	depends on TRACING
+	depends on TRACING && FTRACE
 	select TRACE_REMOTE
 	default y
 
-- 
2.39.5

Re: [PATCH 1/3] KVM: arm64: fix include path for ring buffer implementation

[Vincent Donnefort]

On Thu, Mar 12, 2026 at 01:35:42PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> The simple_ring_buffer.c file is in the source tree rather than
> generated at build time, so the include path is wrong when using
> separate object trees:
> 
> arch/arm64/kvm/hyp/nvhe/trace.c:16:10: fatal error: simple_ring_buffer.c: No such file or directory
>    16 | #include "simple_ring_buffer.c"
> 
> Include it from the source tree instead.
> 
> Fixes: 680a04c333fa ("KVM: arm64: Add tracing capability for the nVHE/pKVM hyp")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

I believe Marc has taken a fix already for that one

https://lore.kernel.org/all/20260311164956.1424119-1-vdonnefort@google.com/

> ---
>  arch/arm64/kvm/hyp/nvhe/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile
> index 143d55ec7298..3d33fbefdfc1 100644
> --- a/arch/arm64/kvm/hyp/nvhe/Makefile
> +++ b/arch/arm64/kvm/hyp/nvhe/Makefile
> @@ -33,7 +33,7 @@ hyp-obj-$(CONFIG_NVHE_EL2_TRACING) += clock.o trace.o events.o
>  hyp-obj-y += $(lib-objs)
>  
>  # Path to simple_ring_buffer.c
> -CFLAGS_trace.nvhe.o += -I$(objtree)/kernel/trace/
> +CFLAGS_trace.nvhe.o += -I$(srctree)/kernel/trace/
>  
>  ##
>  ## Build rules for compiling nVHE hyp code
> -- 
> 2.39.5
> 

Re: [PATCH 3/3] KVM: arm64: tracing: add ftrace dependency

[Vincent Donnefort]

On Thu, Mar 12, 2026 at 01:35:44PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> Selecting CONFIG_TRACE_REMOTE causes a build time warning when FTRACE
> is disabled:
> 
> WARNING: unmet direct dependencies detected for TRACE_REMOTE
>   Depends on [n]: FTRACE [=n]
>   Selected by [y]:
>   - NVHE_EL2_TRACING [=y] && VIRTUALIZATION [=y] && KVM [=y] && NVHE_EL2_DEBUG [=y] && TRACING [=y]
> 
> Add this as another dependency to ensure a clean build.
> 
> Fixes: 3aed038aac8d ("KVM: arm64: Add trace remote for the nVHE/pKVM hyp")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  arch/arm64/kvm/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig
> index 32c7a4f85e75..bcc87f9dad33 100644
> --- a/arch/arm64/kvm/Kconfig
> +++ b/arch/arm64/kvm/Kconfig
> @@ -78,7 +78,7 @@ if NVHE_EL2_DEBUG
>  
>  config NVHE_EL2_TRACING
>  	bool
> -	depends on TRACING
> +	depends on TRACING && FTRACE
>  	select TRACE_REMOTE
>  	default y

Reviewed-by: Vincent Donnefort <vdonnefort@google.com>

>  
> -- 
> 2.39.5
> 

Re: (subset) [PATCH 1/3] KVM: arm64: fix include path for ring buffer implementation

[Marc Zyngier]

On Thu, 12 Mar 2026 13:35:42 +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> The simple_ring_buffer.c file is in the source tree rather than
> generated at build time, so the include path is wrong when using
> separate object trees:
> 
> arch/arm64/kvm/hyp/nvhe/trace.c:16:10: fatal error: simple_ring_buffer.c: No such file or directory
>    16 | #include "simple_ring_buffer.c"
> 
> [...]

Applied to next, thanks!

[2/3] tracing: add more symbols to whitelist
      commit: 7e4b6c94300e355a72670c5b896ccc26ac312c63
[3/3] KVM: arm64: tracing: add ftrace dependency
      commit: 9e5dd49de5d82401e92098c03e0a0e978ddd515a

Cheers,

	M.
-- 
Without deviation from the norm, progress is not possible.

Re: (subset) [PATCH 1/3] KVM: arm64: fix include path for ring buffer implementation

[Nathan Chancellor]

On Thu, Mar 12, 2026 at 03:45:26PM +0000, Marc Zyngier wrote:
> Applied to next, thanks!
> 
> [2/3] tracing: add more symbols to whitelist
>       commit: 7e4b6c94300e355a72670c5b896ccc26ac312c63

This dropped the SPDX indentifier line in kernel/trace/Makefile.

Cheers,
Nathan