From: guoren@kernel.org
To: guoren@kernel.org, palmer@dabbelt.com, arnd@arndb.de,
anup@brainfault.org, gregkh@linuxfoundation.org,
liush@allwinnertech.com, wefu@redhat.com, drew@beagleboard.org,
wangjunqiang@iscas.ac.cn, hch@lst.de
Cc: linux-arch@vger.kernel.org, linux-s390@vger.kernel.org,
Guo Ren <guoren@linux.alibaba.com>,
linux-parisc@vger.kernel.org, x86@kernel.org,
linux-kernel@vger.kernel.org, linux-csky@vger.kernel.org,
linux-mips@vger.kernel.org, sparclinux@vger.kernel.org,
linux-riscv@lists.infradead.org, linuxppc-dev@lists.ozlabs.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH V5 12/21] riscv: compat: syscall: Add entry.S implementation
Date: Tue, 1 Feb 2022 23:05:36 +0800 [thread overview]
Message-ID: <20220201150545.1512822-13-guoren@kernel.org> (raw)
In-Reply-To: <20220201150545.1512822-1-guoren@kernel.org>
From: Guo Ren <guoren@linux.alibaba.com>
Implement the entry of compat_sys_call_table[] in asm. Ref to
riscv-privileged spec 4.1.1 Supervisor Status Register (sstatus):
BIT[32:33] = UXL[1:0]:
- 1:32
- 2:64
- 3:128
Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
Signed-off-by: Guo Ren <guoren@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
---
arch/riscv/include/asm/csr.h | 7 +++++++
arch/riscv/kernel/entry.S | 18 ++++++++++++++++--
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/arch/riscv/include/asm/csr.h b/arch/riscv/include/asm/csr.h
index ae711692eec9..eed96fa62d66 100644
--- a/arch/riscv/include/asm/csr.h
+++ b/arch/riscv/include/asm/csr.h
@@ -36,6 +36,13 @@
#define SR_SD _AC(0x8000000000000000, UL) /* FS/XS dirty */
#endif
+#ifdef CONFIG_COMPAT
+#define SR_UXL _AC(0x300000000, UL) /* XLEN mask for U-mode */
+#define SR_UXL_32 _AC(0x100000000, UL) /* XLEN = 32 for U-mode */
+#define SR_UXL_64 _AC(0x200000000, UL) /* XLEN = 64 for U-mode */
+#define SR_UXL_SHIFT 32
+#endif
+
/* SATP flags */
#ifndef CONFIG_64BIT
#define SATP_PPN _AC(0x003FFFFF, UL)
diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S
index ed29e9c8f660..1951743f09b3 100644
--- a/arch/riscv/kernel/entry.S
+++ b/arch/riscv/kernel/entry.S
@@ -207,13 +207,27 @@ check_syscall_nr:
* Syscall number held in a7.
* If syscall number is above allowed value, redirect to ni_syscall.
*/
- bgeu a7, t0, 1f
+ bgeu a7, t0, 3f
+#ifdef CONFIG_COMPAT
+ REG_L s0, PT_STATUS(sp)
+ srli s0, s0, SR_UXL_SHIFT
+ andi s0, s0, (SR_UXL >> SR_UXL_SHIFT)
+ li t0, (SR_UXL_32 >> SR_UXL_SHIFT)
+ sub t0, s0, t0
+ bnez t0, 1f
+
+ /* Call compat_syscall */
+ la s0, compat_sys_call_table
+ j 2f
+1:
+#endif
/* Call syscall */
la s0, sys_call_table
+2:
slli t0, a7, RISCV_LGPTR
add s0, s0, t0
REG_L s0, 0(s0)
-1:
+3:
jalr s0
ret_from_syscall:
--
2.25.1
next prev parent reply other threads:[~2022-02-01 15:14 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-01 15:05 [PATCH V5 00/21] riscv: compat: Add COMPAT mode support for rv64 guoren
2022-02-01 15:05 ` [PATCH V5 01/21] uapi: simplify __ARCH_FLOCK{,64}_PAD a little guoren
2022-02-01 15:05 ` [PATCH V5 02/21] uapi: always define F_GETLK64/F_SETLK64/F_SETLKW64 in fcntl.h guoren
2022-02-01 15:05 ` [PATCH V5 03/21] compat: consolidate the compat_flock{, 64} definition guoren
2022-02-01 15:05 ` [PATCH V5 04/21] kconfig: Add SYSVIPC_COMPAT for all architectures guoren
2022-02-01 15:05 ` [PATCH V5 05/21] fs: stat: compat: Add __ARCH_WANT_COMPAT_STAT guoren
2022-02-01 15:05 ` [PATCH V5 06/21] asm-generic: compat: Cleanup duplicate definitions guoren
2022-02-02 7:48 ` Christoph Hellwig
2022-02-01 15:05 ` [PATCH V5 07/21] syscalls: compat: Fix the missing part for __SYSCALL_COMPAT guoren
2022-02-01 15:05 ` [PATCH V5 08/21] riscv: Fixup difference with defconfig guoren
2022-02-01 15:05 ` [PATCH V5 09/21] riscv: compat: Add basic compat data type implementation guoren
2022-02-23 1:42 ` Palmer Dabbelt
2022-02-23 8:54 ` Guo Ren
2022-02-01 15:05 ` [PATCH V5 10/21] riscv: compat: Re-implement TASK_SIZE for COMPAT_32BIT guoren
2022-02-01 15:05 ` [PATCH V5 11/21] riscv: compat: syscall: Add compat_sys_call_table implementation guoren
2022-02-01 15:05 ` guoren [this message]
2022-02-23 1:42 ` [PATCH V5 12/21] riscv: compat: syscall: Add entry.S implementation Palmer Dabbelt
2022-02-01 15:05 ` [PATCH V5 13/21] riscv: compat: process: Add UXL_32 support in start_thread guoren
2022-02-23 1:42 ` Palmer Dabbelt
2022-02-23 9:21 ` Guo Ren
2022-02-01 15:05 ` [PATCH V5 14/21] riscv: compat: Add elf.h implementation guoren
2022-02-01 15:05 ` [PATCH V5 15/21] riscv: compat: Add hw capability check for elf guoren
2022-02-02 2:02 ` Guo Ren
2022-02-02 7:51 ` Christoph Hellwig
2022-02-03 2:44 ` Guo Ren
2022-02-01 15:05 ` [PATCH V5 16/21] riscv: compat: vdso: Add rv32 VDSO base code implementation guoren
2022-02-23 1:42 ` Palmer Dabbelt
2022-02-23 9:55 ` Guo Ren
2022-02-01 15:05 ` [PATCH V5 17/21] riscv: compat: vdso: Add setup additional pages implementation guoren
2022-02-23 1:42 ` Palmer Dabbelt
2022-02-23 11:49 ` Guo Ren
2022-02-24 1:36 ` Guo Ren
[not found] ` <4379941.LvFx2qVVIh@eto.sf-tec.de>
2022-02-23 12:42 ` Guo Ren
2022-02-01 15:05 ` [PATCH V5 18/21] riscv: compat: signal: Add rt_frame implementation guoren
2022-02-23 1:42 ` Palmer Dabbelt
2022-02-01 15:05 ` [PATCH V5 19/21] riscv: compat: ptrace: Add compat_arch_ptrace implement guoren
2022-02-23 1:42 ` Palmer Dabbelt
2022-02-01 15:05 ` [PATCH V5 20/21] riscv: compat: Add COMPAT Kbuild skeletal support guoren
2022-02-01 15:05 ` [PATCH V5 21/21] KVM: compat: riscv: Prevent KVM_COMPAT from being selected guoren
2022-02-01 15:44 ` Anup Patel
2022-02-01 16:00 ` Paolo Bonzini
2022-02-01 16:11 ` Anup Patel
2022-02-01 16:16 ` Guo Ren
2022-02-23 1:42 ` Palmer Dabbelt
2022-02-08 7:43 ` [PATCH V5 00/21] riscv: compat: Add COMPAT mode support for rv64 Guo Ren
2022-02-23 1:43 ` Palmer Dabbelt
2022-02-23 10:59 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220201150545.1512822-13-guoren@kernel.org \
--to=guoren@kernel.org \
--cc=anup@brainfault.org \
--cc=arnd@arndb.de \
--cc=drew@beagleboard.org \
--cc=gregkh@linuxfoundation.org \
--cc=guoren@linux.alibaba.com \
--cc=hch@lst.de \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-csky@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=liush@allwinnertech.com \
--cc=palmer@dabbelt.com \
--cc=sparclinux@vger.kernel.org \
--cc=wangjunqiang@iscas.ac.cn \
--cc=wefu@redhat.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).