mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Dao Huang <huangdao1@oppo.com>
To: <samitolvanen@google.com>
Cc: <andrii@kernel.org>, <ast@kernel.org>, <bpf@vger.kernel.org>,
	<catalin.marinas@arm.com>, <daniel@iogearbox.net>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-kernel@vger.kernel.org>, <mark.rutland@arm.com>,
	<mbland@motorola.com>, <puranjay12@gmail.com>, <will@kernel.org>
Subject: Re: [PATCH bpf-next v8 1/2] cfi: add C CFI type macro
Date: Mon, 14 Apr 2025 17:53:30 +0800	[thread overview]
Message-ID: <1744624410-471661-1-git-send-email-huangdao1@oppo.com> (raw)
In-Reply-To: <20250310222942.1988975-5-samitolvanen@google.com>

> From: Mark Rutland <mark.rutland@arm.com>
> 
> Currently x86 and riscv open-code 4 instances of the same logic to
> define a u32 variable with the KCFI typeid of a given function.
> 
> Replace the duplicate logic with a common macro.
> 
> Signed-off-by: Mark Rutland <mark.rutland@arm.com>
> Co-Developed-by: Maxwell Bland <mbland@motorola.com>
> Signed-off-by: Maxwell Bland <mbland@motorola.com>
> Co-Developed-by: Sami Tolvanen <samitolvanen@google.com>
> Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
> ---
>  arch/riscv/kernel/cfi.c       | 35 +++--------------------------------
>  arch/x86/kernel/alternative.c | 35 +++--------------------------------
>  include/linux/cfi_types.h     | 23 +++++++++++++++++++++++
>  3 files changed, 29 insertions(+), 64 deletions(-)
> 
> diff --git a/arch/riscv/kernel/cfi.c b/arch/riscv/kernel/cfi.c
> index 64bdd3e1ab8c..e7aec5f36dd5 100644
> --- a/arch/riscv/kernel/cfi.c
> +++ b/arch/riscv/kernel/cfi.c
> @@ -4,6 +4,7 @@
>   *
>   * Copyright (C) 2023 Google LLC
>   */
> +#include <linux/cfi_types.h>
>  #include <linux/cfi.h>
>  #include <asm/insn.h>
>  
> @@ -82,41 +83,11 @@ struct bpf_insn;
>  /* Must match bpf_func_t / DEFINE_BPF_PROG_RUN() */
>  extern unsigned int __bpf_prog_runX(const void *ctx,
>  				    const struct bpf_insn *insn);
> -
> -/*
> - * Force a reference to the external symbol so the compiler generates
> - * __kcfi_typid.
> - */
> -__ADDRESSABLE(__bpf_prog_runX);
> -
> -/* u32 __ro_after_init cfi_bpf_hash = __kcfi_typeid___bpf_prog_runX; */
> -asm (
> -"	.pushsection	.data..ro_after_init,\"aw\",@progbits	\n"
> -"	.type	cfi_bpf_hash,@object				\n"
> -"	.globl	cfi_bpf_hash					\n"
> -"	.p2align	2, 0x0					\n"
> -"cfi_bpf_hash:							\n"
> -"	.word	__kcfi_typeid___bpf_prog_runX			\n"
> -"	.size	cfi_bpf_hash, 4					\n"
> -"	.popsection						\n"
> -);
> +DEFINE_CFI_TYPE(cfi_bpf_hash, __bpf_prog_runX);
>  
>  /* Must match bpf_callback_t */
>  extern u64 __bpf_callback_fn(u64, u64, u64, u64, u64);
> -
> -__ADDRESSABLE(__bpf_callback_fn);
> -
> -/* u32 __ro_after_init cfi_bpf_subprog_hash = __kcfi_typeid___bpf_callback_fn; */
> -asm (
> -"	.pushsection	.data..ro_after_init,\"aw\",@progbits	\n"
> -"	.type	cfi_bpf_subprog_hash,@object			\n"
> -"	.globl	cfi_bpf_subprog_hash				\n"
> -"	.p2align	2, 0x0					\n"
> -"cfi_bpf_subprog_hash:						\n"
> -"	.word	__kcfi_typeid___bpf_callback_fn			\n"
> -"	.size	cfi_bpf_subprog_hash, 4				\n"
> -"	.popsection						\n"
> -);
> +DEFINE_CFI_TYPE(cfi_bpf_subprog_hash, __bpf_callback_fn);
>  
>  u32 cfi_get_func_hash(void *func)
>  {
> diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
> index c71b575bf229..a9f415e873dd 100644
> --- a/arch/x86/kernel/alternative.c
> +++ b/arch/x86/kernel/alternative.c
> @@ -1,6 +1,7 @@
>  // SPDX-License-Identifier: GPL-2.0-only
>  #define pr_fmt(fmt) "SMP alternatives: " fmt
>  
> +#include <linux/cfi_types.h>
>  #include <linux/module.h>
>  #include <linux/sched.h>
>  #include <linux/perf_event.h>
> @@ -934,41 +935,11 @@ struct bpf_insn;
>  /* Must match bpf_func_t / DEFINE_BPF_PROG_RUN() */
>  extern unsigned int __bpf_prog_runX(const void *ctx,
>  				    const struct bpf_insn *insn);
> -
> -/*
> - * Force a reference to the external symbol so the compiler generates
> - * __kcfi_typid.
> - */
> -__ADDRESSABLE(__bpf_prog_runX);
> -
> -/* u32 __ro_after_init cfi_bpf_hash = __kcfi_typeid___bpf_prog_runX; */
> -asm (
> -"	.pushsection	.data..ro_after_init,\"aw\",@progbits	\n"
> -"	.type	cfi_bpf_hash,@object				\n"
> -"	.globl	cfi_bpf_hash					\n"
> -"	.p2align	2, 0x0					\n"
> -"cfi_bpf_hash:							\n"
> -"	.long	__kcfi_typeid___bpf_prog_runX			\n"
> -"	.size	cfi_bpf_hash, 4					\n"
> -"	.popsection						\n"
> -);
> +DEFINE_CFI_TYPE(cfi_bpf_hash, __bpf_prog_runX);
>  
>  /* Must match bpf_callback_t */
>  extern u64 __bpf_callback_fn(u64, u64, u64, u64, u64);
> -
> -__ADDRESSABLE(__bpf_callback_fn);
> -
> -/* u32 __ro_after_init cfi_bpf_subprog_hash = __kcfi_typeid___bpf_callback_fn; */
> -asm (
> -"	.pushsection	.data..ro_after_init,\"aw\",@progbits	\n"
> -"	.type	cfi_bpf_subprog_hash,@object			\n"
> -"	.globl	cfi_bpf_subprog_hash				\n"
> -"	.p2align	2, 0x0					\n"
> -"cfi_bpf_subprog_hash:						\n"
> -"	.long	__kcfi_typeid___bpf_callback_fn			\n"
> -"	.size	cfi_bpf_subprog_hash, 4				\n"
> -"	.popsection						\n"
> -);
> +DEFINE_CFI_TYPE(cfi_bpf_subprog_hash, __bpf_callback_fn);
>  
>  u32 cfi_get_func_hash(void *func)
>  {
> diff --git a/include/linux/cfi_types.h b/include/linux/cfi_types.h
> index 6b8713675765..209c8a16ac4e 100644
> --- a/include/linux/cfi_types.h
> +++ b/include/linux/cfi_types.h
> @@ -41,5 +41,28 @@
>  	SYM_TYPED_START(name, SYM_L_GLOBAL, SYM_A_ALIGN)
>  #endif
>  
> +#else /* __ASSEMBLY__ */
> +
> +#ifdef CONFIG_CFI_CLANG
> +#define DEFINE_CFI_TYPE(name, func)						\
> +	/*									\
> +	 * Force a reference to the function so the compiler generates		\
> +	 * __kcfi_typeid_<func>.						\
> +	 */									\
> +	__ADDRESSABLE(func);							\
> +	/* u32 name = __kcfi_typeid_<func> */					\
> +	extern u32 name;							\
> +	asm (									\
> +	"	.pushsection	.data..ro_after_init,\"aw\",@progbits	\n"	\
> +	"	.type	" #name ",@object				\n"	\
> +	"	.globl	" #name "					\n"	\
> +	"	.p2align	2, 0x0					\n"	\
> +	#name ":							\n"	\
> +	"	.4byte	__kcfi_typeid_" #func "				\n"	\
> +	"	.size	" #name ", 4					\n"	\
> +	"	.popsection						\n"	\
> +	);
> +#endif
> +
>  #endif /* __ASSEMBLY__ */
>  #endif /* _LINUX_CFI_TYPES_H */
> -- 
> 2.49.0.rc0.332.g42c0ae87b1-goog

we oppo team have tested this patch on Mediatek DX-5(arm64)
with a kernel based on android-16(kernel-6.12). It has been running
fine for a week on both machines.

  reply	other threads:[~2025-04-14  9:54 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-10 22:29 [PATCH bpf-next v8 0/2] Support kCFI + BPF on arm64 Sami Tolvanen
2025-03-10 22:29 ` [PATCH bpf-next v8 1/2] cfi: add C CFI type macro Sami Tolvanen
2025-04-14  9:53   ` Dao Huang [this message]
2025-04-14 21:42     ` Sami Tolvanen
2025-04-17  9:07       ` Dao Huang
2025-03-10 22:29 ` [PATCH bpf-next v8 2/2] arm64/cfi,bpf: Support kCFI + BPF on arm64 Sami Tolvanen
2025-04-14  9:58   ` Dao Huang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1744624410-471661-1-git-send-email-huangdao1@oppo.com \
    --to=huangdao1@oppo.com \
    --cc=andrii@kernel.org \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=daniel@iogearbox.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mbland@motorola.com \
    --cc=puranjay12@gmail.com \
    --cc=samitolvanen@google.com \
    --cc=will@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®