mirror of
https://github.com/torvalds/linux.git
synced 2026-05-27 16:44:58 +02:00
f2abc305aa
After commit67bdd7b013("riscv: Split out measure_cycles() for reuse") and commitc03ad15f7c("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:67bdd7b013("riscv: Split out measure_cycles() for reuse") Fixes:c03ad15f7c("riscv: Reuse measure_cycles() in check_vector_unaligned_access()") Signed-off-by: Nathan Chancellor <nathan@kernel.org> Reviewed-by: Sami Tolvanen <samitolvanen@google.com> Reviewed-by: Nam Cao <namcao@linutronix.de> Link: https://patch.msgid.link/20260406-measure_cycles-cfi-failure-v1-1-03e0234ae02f@kernel.org Signed-off-by: Paul Walmsley <pjw@kernel.org>
60 lines
1.4 KiB
ArmAsm
60 lines
1.4 KiB
ArmAsm
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/* Copyright (C) 2024 Rivos Inc. */
|
|
|
|
#include <linux/args.h>
|
|
#include <linux/cfi_types.h>
|
|
#include <linux/linkage.h>
|
|
#include <asm/asm.h>
|
|
|
|
.text
|
|
|
|
#define WORD_EEW 32
|
|
|
|
#define WORD_SEW CONCATENATE(e, WORD_EEW)
|
|
#define VEC_L CONCATENATE(vle, WORD_EEW).v
|
|
#define VEC_S CONCATENATE(vse, WORD_EEW).v
|
|
|
|
/* 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_TYPED_FUNC_START(__riscv_copy_vec_words_unaligned)
|
|
andi a4, a2, ~(WORD_EEW-1)
|
|
beqz a4, 2f
|
|
add a3, a1, a4
|
|
.option push
|
|
.option arch, +zve32x
|
|
1:
|
|
vsetivli t0, 8, WORD_SEW, m8, ta, ma
|
|
VEC_L v0, (a1)
|
|
VEC_S v0, (a0)
|
|
addi a0, a0, WORD_EEW
|
|
addi a1, a1, WORD_EEW
|
|
bltu a1, a3, 1b
|
|
|
|
2:
|
|
.option pop
|
|
ret
|
|
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_TYPED_FUNC_START(__riscv_copy_vec_bytes_unaligned)
|
|
andi a4, a2, ~(8-1)
|
|
beqz a4, 2f
|
|
add a3, a1, a4
|
|
.option push
|
|
.option arch, +zve32x
|
|
1:
|
|
vsetivli t0, 8, e8, m8, ta, ma
|
|
vle8.v v0, (a1)
|
|
vse8.v v0, (a0)
|
|
addi a0, a0, 8
|
|
addi a1, a1, 8
|
|
bltu a1, a3, 1b
|
|
|
|
2:
|
|
.option pop
|
|
ret
|
|
SYM_FUNC_END(__riscv_copy_vec_bytes_unaligned)
|