From patchwork Sun Nov 12 06:15:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 13453291 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 68012C4332F for ; Sun, 12 Nov 2023 06:18:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=436MzFaN8+/kt8p2m6uEYqm1Ek2m1ckNWHJPl2ArUUM=; b=Eq/DtQaBa/h0Fm AJR72CzHLt5z8eSrjb2DK7zZobfepvl/vWmXDrk5Wl8cC6Gni9jMIa5Hz4BoYT9pwpl9E0Fzx2qWx DDnnuDUy5BXhrGP/uz084GK4JCPLwV7gZx2WVCsYF6BXHpOoYIGioyDyDGu4rWAElceDGyeWlajAq 8G1fS/RLnXVKXVmqQF/lzWvtZDhC/MuuuA7hEUj0Go4YQMZUOsLy2KnvZipaUC94QWI7uOBNaZCWx b1PfC2LCvaFrwbsVq8/kbe4u58LgHZmPal2Q1TXDyEiJUNJKycN2/7ofAztiAGTZllIT0f2JsROZu l4QvCuEACfP9QIoFEURA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r23nv-00Bl7N-0P; Sun, 12 Nov 2023 06:18:43 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r23nq-00Bl2W-2y for linux-riscv@lists.infradead.org; Sun, 12 Nov 2023 06:18:41 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id 1ABB2B80A2B; Sun, 12 Nov 2023 06:18:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2612FC433D9; Sun, 12 Nov 2023 06:18:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699769916; bh=Yd1se3YAvTpm3f6jR2T3YyxOy5a1aI13dnazTuxGpzs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cib6Q1ZUgS2FaDH4BWH6sy+4T4ju7sE9ZqI/4WjqXf+/9wNUzo1g8Lh7AhURej2Dh ds3OmIJ7NuwdMMJsmhVV83diwJFb4ycXr8DHEmtqAnEscuSNMaLmi6COUnDsGdvZNC 48epOdk0lVec54vwPX4+oawPbEHxi7LHNgplAYP+u7R6EFMpgZlqI1hKTTZyPAKqH+ FbHpWR6QnaaAFEwD1RB2SVt5Cs4BLe56fLDphnZjefH6nFyOwP6hZcQCB4hlMpIXU1 RPi2nAz7rtuiPBvt9l9ks0tz4U2y6cbPVa68u0jPbUIJk397571LXKTfGGugR1SMPJ X+3T30N4ldZ7A== From: guoren@kernel.org To: arnd@arndb.de, guoren@kernel.org, palmer@rivosinc.com, tglx@linutronix.de, conor.dooley@microchip.com, heiko@sntech.de, apatel@ventanamicro.com, atishp@atishpatra.org, bjorn@kernel.org, paul.walmsley@sifive.com, anup@brainfault.org, jiawei@iscas.ac.cn, liweiwei@iscas.ac.cn, wefu@redhat.com, U2FsdGVkX1@gmail.com, wangjunqiang@iscas.ac.cn, kito.cheng@sifive.com, andy.chiu@sifive.com, vincent.chen@sifive.com, greentime.hu@sifive.com, wuwei2016@iscas.ac.cn, jrtc27@jrtc27.com, luto@kernel.org, fweimer@redhat.com, catalin.marinas@arm.com, hjl.tools@gmail.com Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Guo Ren Subject: [RFC PATCH V2 31/38] riscv: s64ilp32: Add u32ilp32 signal support Date: Sun, 12 Nov 2023 01:15:07 -0500 Message-Id: <20231112061514.2306187-32-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20231112061514.2306187-1-guoren@kernel.org> References: <20231112061514.2306187-1-guoren@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231111_221839_282656_3AB9E855 X-CRM114-Status: GOOD ( 12.22 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Guo Ren The u32ilp32 uses the compat_pt_regs instead of the native pt_regs, so we borrow the compat code to support the u32ilp32 signal procedure in the s64ilp32 kernel. Signed-off-by: Guo Ren Signed-off-by: Guo Ren --- arch/riscv/include/asm/signal32.h | 2 +- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/signal.c | 5 ++++- kernel/signal.c | 24 ++++++++++++++---------- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/arch/riscv/include/asm/signal32.h b/arch/riscv/include/asm/signal32.h index cda62d7eb0a5..e47bb739e61a 100644 --- a/arch/riscv/include/asm/signal32.h +++ b/arch/riscv/include/asm/signal32.h @@ -3,7 +3,7 @@ #ifndef __ASM_SIGNAL32_H #define __ASM_SIGNAL32_H -#if IS_ENABLED(CONFIG_COMPAT) +#if IS_ENABLED(CONFIG_COMPAT) || IS_ENABLED(CONFIG_ARCH_RV64ILP32) int compat_setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs); long __riscv_compat_rt_sigreturn(void); diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index a4583a29b28b..e8af95298e98 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -97,6 +97,7 @@ obj-$(CONFIG_JUMP_LABEL) += jump_label.o obj-$(CONFIG_EFI) += efi.o obj-$(CONFIG_COMPAT) += compat_syscall_table.o obj-$(CONFIG_COMPAT) += compat_signal.o +obj-$(CONFIG_ARCH_RV64ILP32) += compat_signal.o obj-$(CONFIG_64BIT) += pi/ obj-$(CONFIG_ACPI) += acpi.o diff --git a/arch/riscv/kernel/signal.c b/arch/riscv/kernel/signal.c index 1c51a6783c98..95512af927dd 100644 --- a/arch/riscv/kernel/signal.c +++ b/arch/riscv/kernel/signal.c @@ -277,7 +277,10 @@ static long __riscv_rt_sigreturn(void) SYSCALL_DEFINE0(rt_sigreturn) { - return __riscv_rt_sigreturn(); + if (test_thread_flag(TIF_32BIT) && !test_thread_flag(TIF_64ILP32)) + return __riscv_compat_rt_sigreturn(); + else + return __riscv_rt_sigreturn(); } #ifdef CONFIG_COMPAT diff --git a/kernel/signal.c b/kernel/signal.c index b5370fe5c198..3ac7fa4f1761 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -3390,7 +3390,7 @@ int copy_siginfo_from_user(kernel_siginfo_t *to, const siginfo_t __user *from) return post_copy_siginfo_from_user(to, from); } -#ifdef CONFIG_COMPAT +#if IS_ENABLED(CONFIG_COMPAT) || IS_ENABLED(CONFIG_ARCH_RV64ILP32) /** * copy_siginfo_to_external32 - copy a kernel siginfo into a compat user siginfo * @to: compat siginfo destination @@ -3556,6 +3556,7 @@ static int post_copy_siginfo_from_user32(kernel_siginfo_t *to, return 0; } +#ifdef CONFIG_COMPAT static int __copy_siginfo_from_user32(int signo, struct kernel_siginfo *to, const struct compat_siginfo __user *ufrom) { @@ -3567,6 +3568,7 @@ static int __copy_siginfo_from_user32(int signo, struct kernel_siginfo *to, from.si_signo = signo; return post_copy_siginfo_from_user32(to, &from); } +#endif /* CONFIG_COMPAT */ int copy_siginfo_from_user32(struct kernel_siginfo *to, const struct compat_siginfo __user *ufrom) @@ -3578,7 +3580,7 @@ int copy_siginfo_from_user32(struct kernel_siginfo *to, return post_copy_siginfo_from_user32(to, &from); } -#endif /* CONFIG_COMPAT */ +#endif /** * do_sigtimedwait - wait for queued signals specified in @which @@ -4279,7 +4281,7 @@ int __save_altstack(stack_t __user *uss, unsigned long sp) return err; } -#ifdef CONFIG_COMPAT +#if IS_ENABLED(CONFIG_COMPAT) || IS_ENABLED(CONFIG_ARCH_HAS_64ILP32_KERNEL) static int do_compat_sigaltstack(const compat_stack_t __user *uss_ptr, compat_stack_t __user *uoss_ptr) { @@ -4309,13 +4311,6 @@ static int do_compat_sigaltstack(const compat_stack_t __user *uss_ptr, return ret; } -COMPAT_SYSCALL_DEFINE2(sigaltstack, - const compat_stack_t __user *, uss_ptr, - compat_stack_t __user *, uoss_ptr) -{ - return do_compat_sigaltstack(uss_ptr, uoss_ptr); -} - int compat_restore_altstack(const compat_stack_t __user *uss) { int err = do_compat_sigaltstack(uss, NULL); @@ -4335,6 +4330,15 @@ int __compat_save_altstack(compat_stack_t __user *uss, unsigned long sp) } #endif +#ifdef CONFIG_COMPAT +COMPAT_SYSCALL_DEFINE2(sigaltstack, + const compat_stack_t __user *, uss_ptr, + compat_stack_t __user *, uoss_ptr) +{ + return do_compat_sigaltstack(uss_ptr, uoss_ptr); +} +#endif + #ifdef __ARCH_WANT_SYS_SIGPENDING /**