Skip to content

[linux 6.18.y] [deepin] LoongArch: Export some signal functions #1637

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

Open
Kingwkl wants to merge 3 commits into
base: linux-6.18.y
Choose a base branch
from
Open

[linux 6.18.y] [deepin] LoongArch: Export some signal functions #1637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb14efd
LoongArch: Handle fp, lsx, lasx and lbt assembly symbols
AaronDot May 7, 2025
e3db33c
LoongArch: Make some signal and ptrace functions non-static
AaronDot May 7, 2025
5cad540
LoongArch: Export some signal functions
AaronDot May 7, 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
12 changes: 6 additions & 6 deletions arch/loongarch/include/asm/fpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,22 @@ void kernel_fpu_end(void);
asmlinkage void _init_fpu(unsigned int);
asmlinkage void _save_fp(struct loongarch_fpu *);
asmlinkage void _restore_fp(struct loongarch_fpu *);
asmlinkage int _save_fp_context(void __user *fpregs, void __user *fcc, void __user *csr);
asmlinkage int _restore_fp_context(void __user *fpregs, void __user *fcc, void __user *csr);
extern int _save_fp_context(void __user *fpregs, void __user *fcc, void __user *csr);
extern int _restore_fp_context(void __user *fpregs, void __user *fcc, void __user *csr);

asmlinkage void _save_lsx(struct loongarch_fpu *fpu);
asmlinkage void _restore_lsx(struct loongarch_fpu *fpu);
asmlinkage void _init_lsx_upper(void);
asmlinkage void _restore_lsx_upper(struct loongarch_fpu *fpu);
asmlinkage int _save_lsx_context(void __user *fpregs, void __user *fcc, void __user *fcsr);
asmlinkage int _restore_lsx_context(void __user *fpregs, void __user *fcc, void __user *fcsr);
extern int _save_lsx_context(void __user *fpregs, void __user *fcc, void __user *fcsr);
extern int _restore_lsx_context(void __user *fpregs, void __user *fcc, void __user *fcsr);

asmlinkage void _save_lasx(struct loongarch_fpu *fpu);
asmlinkage void _restore_lasx(struct loongarch_fpu *fpu);
asmlinkage void _init_lasx_upper(void);
asmlinkage void _restore_lasx_upper(struct loongarch_fpu *fpu);
asmlinkage int _save_lasx_context(void __user *fpregs, void __user *fcc, void __user *fcsr);
asmlinkage int _restore_lasx_context(void __user *fpregs, void __user *fcc, void __user *fcsr);
extern int _save_lasx_context(void __user *fpregs, void __user *fcc, void __user *fcsr);
extern int _restore_lasx_context(void __user *fpregs, void __user *fcc, void __user *fcsr);

static inline void enable_lsx(void);
static inline void disable_lsx(void);
Expand Down
8 changes: 4 additions & 4 deletions arch/loongarch/include/asm/lbt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
asmlinkage void _init_lbt(void);
asmlinkage void _save_lbt(struct loongarch_lbt *);
asmlinkage void _restore_lbt(struct loongarch_lbt *);
asmlinkage int _save_lbt_context(void __user *regs, void __user *eflags);
asmlinkage int _restore_lbt_context(void __user *regs, void __user *eflags);
asmlinkage int _save_ftop_context(void __user *ftop);
asmlinkage int _restore_ftop_context(void __user *ftop);
extern int _save_lbt_context(void __user *regs, void __user *eflags);
extern int _restore_lbt_context(void __user *regs, void __user *eflags);
extern int _save_ftop_context(void __user *ftop);
extern int _restore_ftop_context(void __user *ftop);

static inline int is_lbt_enabled(void)
{
Expand Down
1 change: 1 addition & 0 deletions arch/loongarch/kernel/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ OBJECT_FILES_NON_STANDARD_head.o := y

always-$(KBUILD_BUILTIN) := vmlinux.lds

obj-y += extern.o
obj-y += head.o cpu-probe.o cacheinfo.o env.o setup.o entry.o genex.o \
traps.o irq.o idle.o process.o dma.o mem.o reset.o switch.o \
elf.o syscall.o signal.o time.o topology.o inst.o ptrace.o vdso.o \
Expand Down
31 changes: 31 additions & 0 deletions arch/loongarch/kernel/extern.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// SPDX-License-Identifier: GPL-2.0
Copy link

Copilot AI Apr 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EXPORT_SYMBOL_GPL is used in this file but no header is included that defines it. Add the appropriate include (e.g., <linux/export.h> or <linux/module.h>) so this compiles in all configurations.

Suggested change
// SPDX-License-Identifier: GPL-2.0
// SPDX-License-Identifier: GPL-2.0
#include <linux/export.h>

Copilot uses AI. Check for mistakes.
#include <linux/signal.h>

void loongarch_set_current_blocked(sigset_t *newset);
int loongarch_copy_siginfo_to_user(siginfo_t __user *to, const kernel_siginfo_t *from);
int loongarch___save_altstack(stack_t __user *uss, unsigned long sp);
int loongarch_restore_altstack(const stack_t __user *uss);

void loongarch_set_current_blocked(sigset_t *newset)
{
return set_current_blocked(newset);
Copy link

Copilot AI Apr 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function returns void but uses return set_current_blocked(newset);, which triggers a compiler diagnostic ('return with a value, in function returning void'). Call set_current_blocked(newset) and use a plain return; (or omit the return statement).

Suggested change
return set_current_blocked(newset);
set_current_blocked(newset);

Copilot uses AI. Check for mistakes.
}
EXPORT_SYMBOL_GPL(loongarch_set_current_blocked);

int loongarch_copy_siginfo_to_user(siginfo_t __user *to, const kernel_siginfo_t *from)
{
return copy_siginfo_to_user(to, from);
}
EXPORT_SYMBOL_GPL(loongarch_copy_siginfo_to_user);

int loongarch___save_altstack(stack_t __user *uss, unsigned long sp)
{
return __save_altstack(uss, sp);
}
EXPORT_SYMBOL_GPL(loongarch___save_altstack);

int loongarch_restore_altstack(const stack_t __user *uss)
{
return restore_altstack(uss);
}
EXPORT_SYMBOL_GPL(loongarch_restore_altstack);
37 changes: 26 additions & 11 deletions arch/loongarch/kernel/ptrace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,13 @@ void ptrace_disable(struct task_struct *child)

/* regset get/set implementations */

static int gpr_get(struct task_struct *target,
const struct user_regset *regset,
struct membuf to)
int gpr_get(struct task_struct *target,
const struct user_regset *regset,
struct membuf to);

int gpr_get(struct task_struct *target,
const struct user_regset *regset,
struct membuf to)
{
int r;
struct pt_regs *regs = task_pt_regs(target);
Expand All @@ -87,10 +91,15 @@ static int gpr_get(struct task_struct *target,
return r;
}

static int gpr_set(struct task_struct *target,
const struct user_regset *regset,
unsigned int pos, unsigned int count,
const void *kbuf, const void __user *ubuf)
int gpr_set(struct task_struct *target,
const struct user_regset *regset,
unsigned int pos, unsigned int count,
const void *kbuf, const void __user *ubuf);

int gpr_set(struct task_struct *target,
const struct user_regset *regset,
unsigned int pos, unsigned int count,
const void *kbuf, const void __user *ubuf)
{
int err;
int a0_start = sizeof(u64) * GPR_NUM;
Expand Down Expand Up @@ -950,8 +959,11 @@ const struct user_regset_view *task_user_regset_view(struct task_struct *task)
return &user_loongarch64_view;
}

static inline int read_user(struct task_struct *target, unsigned long addr,
unsigned long __user *data)
int read_user(struct task_struct *target, unsigned long addr,
unsigned long __user *data);

int read_user(struct task_struct *target, unsigned long addr,
unsigned long __user *data)
{
unsigned long tmp = 0;

Expand All @@ -975,8 +987,11 @@ static inline int read_user(struct task_struct *target, unsigned long addr,
return put_user(tmp, data);
}

static inline int write_user(struct task_struct *target, unsigned long addr,
unsigned long data)
int write_user(struct task_struct *target, unsigned long addr,
unsigned long data);

int write_user(struct task_struct *target, unsigned long addr,
unsigned long data)
{
switch (addr) {
case 0 ... 31:
Expand Down
7 changes: 5 additions & 2 deletions arch/loongarch/kernel/signal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,8 +932,11 @@ SYSCALL_DEFINE0(rt_sigreturn)
return 0;
}

static int setup_rt_frame(void *sig_return, struct ksignal *ksig,
struct pt_regs *regs, sigset_t *set)
int setup_rt_frame(void *sig_return, struct ksignal *ksig,
struct pt_regs *regs, sigset_t *set);

int setup_rt_frame(void *sig_return, struct ksignal *ksig,
struct pt_regs *regs, sigset_t *set)
{
int err = 0;
struct extctx_layout extctx;
Expand Down
Loading