1. Patchew
  2. linux
  3. [PATCH v2 0/2] arm64/module: Enable late module relocations.
  4. View patch

[PATCH v2 1/2] arm64: patching: Rename aarch64_insn_copy to text_poke.

Dylan Hatch posted 2 patches 8 months, 1 week ago
[PATCH v2 1/2] arm64: patching: Rename aarch64_insn_copy to text_poke.
Posted by Dylan Hatch 8 months, 1 week ago 
Match the name and signature of the equivalent in the x86 text-poke API.
Making the src pointer const also allows this function to be
interchangeable with memcpy().

Signed-off-by: Dylan Hatch <dylanbhatch@google.com>
---
 arch/arm64/include/asm/text-patching.h |  2 +-
 arch/arm64/kernel/patching.c           | 12 ++++++------
 arch/arm64/net/bpf_jit_comp.c          |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm64/include/asm/text-patching.h b/arch/arm64/include/asm/text-patching.h
index 587bdb91ab7a6..450d806d11109 100644
--- a/arch/arm64/include/asm/text-patching.h
+++ b/arch/arm64/include/asm/text-patching.h
@@ -9,7 +9,7 @@ int aarch64_insn_write(void *addr, u32 insn);
 
 int aarch64_insn_write_literal_u64(void *addr, u64 val);
 void *aarch64_insn_set(void *dst, u32 insn, size_t len);
-void *aarch64_insn_copy(void *dst, void *src, size_t len);
+void *text_poke(void *dst, const void *src, size_t len);
 
 int aarch64_insn_patch_text_nosync(void *addr, u32 insn);
 int aarch64_insn_patch_text(void *addrs[], u32 insns[], int cnt);
diff --git a/arch/arm64/kernel/patching.c b/arch/arm64/kernel/patching.c
index 1041bc67a3eee..e07dc32620053 100644
--- a/arch/arm64/kernel/patching.c
+++ b/arch/arm64/kernel/patching.c
@@ -102,9 +102,9 @@ noinstr int aarch64_insn_write_literal_u64(void *addr, u64 val)
 	return ret;
 }
 
-typedef void text_poke_f(void *dst, void *src, size_t patched, size_t len);
+typedef void text_poke_f(void *dst, const void *src, size_t patched, size_t len);
 
-static void *__text_poke(text_poke_f func, void *addr, void *src, size_t len)
+static void *__text_poke(text_poke_f func, void *addr, const void *src, size_t len)
 {
 	unsigned long flags;
 	size_t patched = 0;
@@ -132,12 +132,12 @@ static void *__text_poke(text_poke_f func, void *addr, void *src, size_t len)
 	return addr;
 }
 
-static void text_poke_memcpy(void *dst, void *src, size_t patched, size_t len)
+static void text_poke_memcpy(void *dst, const void *src, size_t patched, size_t len)
 {
 	copy_to_kernel_nofault(dst, src + patched, len);
 }
 
-static void text_poke_memset(void *dst, void *src, size_t patched, size_t len)
+static void text_poke_memset(void *dst, const void *src, size_t patched, size_t len)
 {
 	u32 c = *(u32 *)src;
 
@@ -145,14 +145,14 @@ static void text_poke_memset(void *dst, void *src, size_t patched, size_t len)
 }
 
 /**
- * aarch64_insn_copy - Copy instructions into (an unused part of) RX memory
+ * text_poke - Copy instructions into (an unused part of) RX memory
  * @dst: address to modify
  * @src: source of the copy
  * @len: length to copy
  *
  * Useful for JITs to dump new code blocks into unused regions of RX memory.
  */
-noinstr void *aarch64_insn_copy(void *dst, void *src, size_t len)
+noinstr void *text_poke(void *dst, const void *src, size_t len)
 {
 	/* A64 instructions must be word aligned */
 	if ((uintptr_t)dst & 0x3)
diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c
index 70d7c89d3ac90..b5be90edff410 100644
--- a/arch/arm64/net/bpf_jit_comp.c
+++ b/arch/arm64/net/bpf_jit_comp.c
@@ -2047,7 +2047,7 @@ bool bpf_jit_supports_kfunc_call(void)
 
 void *bpf_arch_text_copy(void *dst, void *src, size_t len)
 {
-	if (!aarch64_insn_copy(dst, src, len))
+	if (!text_poke(dst, src, len))
 		return ERR_PTR(-EINVAL);
 	return dst;
 }
-- 
2.49.0.604.gff1f9ca942-goog
Re: [PATCH v2 1/2] arm64: patching: Rename aarch64_insn_copy to text_poke.
Posted by Song Liu 8 months ago 
On Fri, Apr 11, 2025 at 6:10 PM Dylan Hatch <dylanbhatch@google.com> wrote:
>
> Match the name and signature of the equivalent in the x86 text-poke API.
> Making the src pointer const also allows this function to be
> interchangeable with memcpy().
>
> Signed-off-by: Dylan Hatch <dylanbhatch@google.com>

Acked-by: Song Liu <song@kernel.org>
Re: [PATCH v2 1/2] arm64: patching: Rename aarch64_insn_copy to text_poke.
Posted by Dylan Hatch 8 months ago 
On Fri, Apr 11, 2025 at 6:10 PM Dylan Hatch <dylanbhatch@google.com> wrote:
>
> Match the name and signature of the equivalent in the x86 text-poke API.
> Making the src pointer const also allows this function to be
> interchangeable with memcpy().
>
> Signed-off-by: Dylan Hatch <dylanbhatch@google.com>
> ---
>  arch/arm64/include/asm/text-patching.h |  2 +-
>  arch/arm64/kernel/patching.c           | 12 ++++++------
>  arch/arm64/net/bpf_jit_comp.c          |  2 +-
>  3 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm64/include/asm/text-patching.h b/arch/arm64/include/asm/text-patching.h
> index 587bdb91ab7a6..450d806d11109 100644
> --- a/arch/arm64/include/asm/text-patching.h
> +++ b/arch/arm64/include/asm/text-patching.h
> @@ -9,7 +9,7 @@ int aarch64_insn_write(void *addr, u32 insn);
>
>  int aarch64_insn_write_literal_u64(void *addr, u64 val);
>  void *aarch64_insn_set(void *dst, u32 insn, size_t len);
> -void *aarch64_insn_copy(void *dst, void *src, size_t len);
> +void *text_poke(void *dst, const void *src, size_t len);
>
>  int aarch64_insn_patch_text_nosync(void *addr, u32 insn);
>  int aarch64_insn_patch_text(void *addrs[], u32 insns[], int cnt);
> diff --git a/arch/arm64/kernel/patching.c b/arch/arm64/kernel/patching.c
> index 1041bc67a3eee..e07dc32620053 100644
> --- a/arch/arm64/kernel/patching.c
> +++ b/arch/arm64/kernel/patching.c
> @@ -102,9 +102,9 @@ noinstr int aarch64_insn_write_literal_u64(void *addr, u64 val)
>         return ret;
>  }
>
> -typedef void text_poke_f(void *dst, void *src, size_t patched, size_t len);
> +typedef void text_poke_f(void *dst, const void *src, size_t patched, size_t len);
>
> -static void *__text_poke(text_poke_f func, void *addr, void *src, size_t len)
> +static void *__text_poke(text_poke_f func, void *addr, const void *src, size_t len)
>  {
>         unsigned long flags;
>         size_t patched = 0;
> @@ -132,12 +132,12 @@ static void *__text_poke(text_poke_f func, void *addr, void *src, size_t len)
>         return addr;
>  }
>
> -static void text_poke_memcpy(void *dst, void *src, size_t patched, size_t len)
> +static void text_poke_memcpy(void *dst, const void *src, size_t patched, size_t len)
>  {
>         copy_to_kernel_nofault(dst, src + patched, len);
>  }
>
> -static void text_poke_memset(void *dst, void *src, size_t patched, size_t len)
> +static void text_poke_memset(void *dst, const void *src, size_t patched, size_t len)
>  {
>         u32 c = *(u32 *)src;
>
> @@ -145,14 +145,14 @@ static void text_poke_memset(void *dst, void *src, size_t patched, size_t len)
>  }
>
>  /**
> - * aarch64_insn_copy - Copy instructions into (an unused part of) RX memory
> + * text_poke - Copy instructions into (an unused part of) RX memory
>   * @dst: address to modify
>   * @src: source of the copy
>   * @len: length to copy
>   *
>   * Useful for JITs to dump new code blocks into unused regions of RX memory.
>   */
> -noinstr void *aarch64_insn_copy(void *dst, void *src, size_t len)
> +noinstr void *text_poke(void *dst, const void *src, size_t len)
>  {
>         /* A64 instructions must be word aligned */
>         if ((uintptr_t)dst & 0x3)
> diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c
> index 70d7c89d3ac90..b5be90edff410 100644
> --- a/arch/arm64/net/bpf_jit_comp.c
> +++ b/arch/arm64/net/bpf_jit_comp.c
> @@ -2047,7 +2047,7 @@ bool bpf_jit_supports_kfunc_call(void)
>
>  void *bpf_arch_text_copy(void *dst, void *src, size_t len)
>  {
> -       if (!aarch64_insn_copy(dst, src, len))
> +       if (!text_poke(dst, src, len))
>                 return ERR_PTR(-EINVAL);
>         return dst;
>  }
> --
> 2.49.0.604.gff1f9ca942-goog
>

Friendly ping.

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.