Commit f2abc305 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Paul Walmsley
Browse files

riscv: Define __riscv_copy_{,vec_}{words,bytes}_unaligned() using SYM_TYPED_FUNC_START 



After commit 67bdd7b0 ("riscv: Split out measure_cycles() for
reuse") and commit c03ad15f ("riscv: Reuse measure_cycles() in
check_vector_unaligned_access()"), there are CFI failure when booting
kernels with CONFIG_CFI=y:

  CFI failure at measure_cycles+0x38/0xe0 (target: __riscv_copy_words_unaligned+0x0/0x50; expected type: ...)
  CFI failure at measure_cycles+0x38/0xe0 (target: __riscv_copy_vec_words_unaligned+0x0/0x24; expected type: ...)

The __riscv_copy_*_unaligned() functions are now called indirectly but
they are not defined with SYM_TYPED_FUNC_START, which is required for
assembly functions called indirectly from C to pass CFI checking. Switch
to SYM_TYPED_FUNC_START to clear up the CFI failures.

Fixes: 67bdd7b0 ("riscv: Split out measure_cycles() for reuse")
Fixes: c03ad15f ("riscv: Reuse measure_cycles() in check_vector_unaligned_access()")
Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Reviewed-by: default avatarSami Tolvanen <samitolvanen@google.com>
Reviewed-by: default avatarNam Cao <namcao@linutronix.de>
Link: https://patch.msgid.link/20260406-measure_cycles-cfi-failure-v1-1-03e0234ae02f@kernel.org


Signed-off-by: default avatarPaul Walmsley <pjw@kernel.org>
parent 254f4963

arch/riscv/kernel/copy-unaligned.S

+3 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Copyright (C) 2023 Rivos Inc. */



#include <linux/cfi_types.h>

#include <linux/linkage.h>

#include <asm/asm.h>
@@ -9,7 +10,7 @@ 
/* void __riscv_copy_words_unaligned(void *, const void *, size_t) */

/* Performs a memcpy without aligning buffers, using word loads and stores. */

/* Note: The size is truncated to a multiple of 8 * SZREG */

SYM_FUNC_START(__riscv_copy_words_unaligned)

SYM_TYPED_FUNC_START(__riscv_copy_words_unaligned)

	andi  a4, a2, ~((8*SZREG)-1)

	beqz  a4, 2f

	add   a3, a1, a4
@@ -41,7 +42,7 @@ SYM_FUNC_END(__riscv_copy_words_unaligned) 
/* void __riscv_copy_bytes_unaligned(void *, const void *, size_t) */

/* Performs a memcpy without aligning buffers, using only byte accesses. */

/* Note: The size is truncated to a multiple of 8 */

SYM_FUNC_START(__riscv_copy_bytes_unaligned)

SYM_TYPED_FUNC_START(__riscv_copy_bytes_unaligned)

	andi a4, a2, ~(8-1)

	beqz a4, 2f

	add  a3, a1, a4

arch/riscv/kernel/vec-copy-unaligned.S

+3 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/* Copyright (C) 2024 Rivos Inc. */



#include <linux/args.h>

#include <linux/cfi_types.h>

#include <linux/linkage.h>

#include <asm/asm.h>
@@ -16,7 +17,7 @@ 
/* void __riscv_copy_vec_words_unaligned(void *, const void *, size_t) */

/* Performs a memcpy without aligning buffers, using word loads and stores. */

/* Note: The size is truncated to a multiple of WORD_EEW */

SYM_FUNC_START(__riscv_copy_vec_words_unaligned)

SYM_TYPED_FUNC_START(__riscv_copy_vec_words_unaligned)

	andi  a4, a2, ~(WORD_EEW-1)

	beqz  a4, 2f

	add   a3, a1, a4
@@ -38,7 +39,7 @@ SYM_FUNC_END(__riscv_copy_vec_words_unaligned) 
/* void __riscv_copy_vec_bytes_unaligned(void *, const void *, size_t) */

/* Performs a memcpy without aligning buffers, using only byte accesses. */

/* Note: The size is truncated to a multiple of 8 */

SYM_FUNC_START(__riscv_copy_vec_bytes_unaligned)

SYM_TYPED_FUNC_START(__riscv_copy_vec_bytes_unaligned)

	andi a4, a2, ~(8-1)

	beqz a4, 2f

	add  a3, a1, a4