Skip to content

【bugfix】合入uaccess优化的fixes补丁 #266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sterling-teng merged 6 commits into from
May 12, 2026
+16 −14
Merged

【bugfix】合入uaccess优化的fixes补丁 #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
37b33f8
riscv: Fix sparse warning about different address spaces
Sep 3, 2025
ebff58e
riscv: uaccess: Fix -Wuninitialized and -Wshadow in __put_user_nocheck
nathanchance Jul 16, 2025
7d1e89e
riscv: uaccess: fix __put_user_nocheck for unaligned accesses
aurel32 Jul 24, 2025
0fcaa7b
RISC-V: uaccess: Wrap the get_user_8 uaccess macro
palmer-dabbelt Jun 10, 2025
b18ee1a
riscv: Fix sparse warning in __get_user_error()
Sep 3, 2025
0d61cc4
riscv: uaccess: Only restore the CSR_STATUS SUM bit
cyrilbur-tenstorrent Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arch/riscv/include/asm/processor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ struct thread_struct {
struct __riscv_d_ext_state fstate;
unsigned long bad_cause;
unsigned long envcfg;
unsigned long status;
unsigned long sum;
u32 riscv_v_flags;
u32 vstate_ctrl;
struct __riscv_v_ext_state vstate;
Expand Down
13 changes: 7 additions & 6 deletions arch/riscv/include/asm/uaccess.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ do { \

#ifdef CONFIG_CC_HAS_ASM_GOTO_OUTPUT
#define __get_user_8(x, ptr, label) \
do { \
u32 __user *__ptr = (u32 __user *)(ptr); \
u32 __lo, __hi; \
asm_goto_output( \
Expand All @@ -108,7 +109,7 @@ do { \
: : label); \
(x) = (__typeof__(x))((__typeof__((x) - (x)))( \
(((u64)__hi << 32) | __lo))); \

} while (0)
#else /* !CONFIG_CC_HAS_ASM_GOTO_OUTPUT */
#define __get_user_8(x, ptr, label) \
do { \
Expand Down Expand Up @@ -175,7 +176,7 @@ do { \
err = 0; \
break; \
__gu_failed: \
x = 0; \
x = (__typeof__(x))0; \
err = -EFAULT; \
} while (0)

Expand Down Expand Up @@ -277,8 +278,8 @@ do { \
do { \
if (!IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && \
!IS_ALIGNED((uintptr_t)__gu_ptr, sizeof(*__gu_ptr))) { \
__inttype(x) val = (__inttype(x))x; \
if (__asm_copy_to_user_sum_enabled(__gu_ptr, &(val), sizeof(*__gu_ptr))) \
__typeof__(*(__gu_ptr)) ___val = (x); \
if (__asm_copy_to_user_sum_enabled(__gu_ptr, &(___val), sizeof(*__gu_ptr))) \
goto label; \
break; \
} \
Expand Down Expand Up @@ -404,10 +405,10 @@ unsigned long __must_check clear_user(void __user *to, unsigned long n)
}

#define __get_kernel_nofault(dst, src, type, err_label) \
__get_user_nocheck(*((type *)(dst)), (type *)(src), err_label)
__get_user_nocheck(*((type *)(dst)), (__force __user type *)(src), err_label)

#define __put_kernel_nofault(dst, src, type, err_label) \
__put_user_nocheck(*((type *)(src)), (type *)(dst), err_label)
__put_user_nocheck(*((type *)(src)), (__force __user type *)(dst), err_label)

static __must_check __always_inline bool user_access_begin(const void __user *ptr, size_t len)
{
Expand Down
6 changes: 3 additions & 3 deletions arch/riscv/kernel/asm-offsets.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ void asm_offsets(void)
OFFSET(TASK_THREAD_S9, task_struct, thread.s[9]);
OFFSET(TASK_THREAD_S10, task_struct, thread.s[10]);
OFFSET(TASK_THREAD_S11, task_struct, thread.s[11]);
OFFSET(TASK_THREAD_STATUS, task_struct, thread.status);
OFFSET(TASK_THREAD_SUM, task_struct, thread.sum);

OFFSET(TASK_TI_CPU, task_struct, thread_info.cpu);
OFFSET(TASK_TI_FLAGS, task_struct, thread_info.flags);
Expand Down Expand Up @@ -346,8 +346,8 @@ void asm_offsets(void)
offsetof(struct task_struct, thread.s[11])
- offsetof(struct task_struct, thread.ra)
);
DEFINE(TASK_THREAD_STATUS_RA,
offsetof(struct task_struct, thread.status)
DEFINE(TASK_THREAD_SUM_RA,
offsetof(struct task_struct, thread.sum)
- offsetof(struct task_struct, thread.ra)
);

Expand Down
9 changes: 5 additions & 4 deletions arch/riscv/kernel/entry.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,12 +354,13 @@ SYM_FUNC_START(__switch_to)
REG_S s11, TASK_THREAD_S11_RA(a3)

/* save the user space access flag */
li s0, SR_SUM
csrr s1, CSR_STATUS
REG_S s1, TASK_THREAD_STATUS_RA(a3)
csrr s0, CSR_STATUS
REG_S s0, TASK_THREAD_SUM_RA(a3)

/* Restore context from next->thread */
REG_L s0, TASK_THREAD_STATUS_RA(a4)
REG_L s0, TASK_THREAD_SUM_RA(a4)
li s1, SR_SUM
and s0, s0, s1
csrs CSR_STATUS, s0
REG_L ra, TASK_THREAD_RA_RA(a4)
REG_L sp, TASK_THREAD_SP_RA(a4)
Expand Down
Loading