From patchwork Sun Nov 12 06:14:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 164194 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp561742vqg; Sat, 11 Nov 2023 22:17:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IHEgZbTOIsFKmtK/R6DWRby9xbn777o0aAk+RQ+woBVuHRu6TjqODWqD5CMpvTwydjFIerv X-Received: by 2002:a9d:6643:0:b0:6bf:1925:13a0 with SMTP id q3-20020a9d6643000000b006bf192513a0mr4234115otm.33.1699769865586; Sat, 11 Nov 2023 22:17:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699769865; cv=none; d=google.com; s=arc-20160816; b=hz0dH79M/wWOlr30ye6b8+4mUELsdoMt32260bXvSgaF+tr6/+Wd0RwaF98O0A9FxD G/Mr1Chs0S4cTT2L0ylOxkqj7qQIC+whndr3fH1kA0TR/t3x3HSxQScPgKo31Pb3yFAm c/HtBX2TNCj+ETNvSJiMp4xL9ks8UkZeViroc8cqT9NM6Rg6c/Z7wRPQcS6HkEVFbOcQ y3tx81tEN+Suqb/NoH8wTTIzfqwxVkf+jpVGO4e+QCfvRdyLLazdTw1Fy+VMQUiyJ5V2 bKZNxcuTKgd6Z35eST1cy47HtVRqhgBDw0G7F23b8yCyvVND8+ZWyrZPBwK5/Bsooubf 1nFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+FJTy4CQ5NJ3TzHMEOJATTx7rbkulzxAeEKZpHDMgdM=; fh=ZE/z2dNArDjRCaYXLY1qiMuWjPgjymC0plQjRd9hozE=; b=zctf8R+esxA1hLnZrZ7QVq6lgtkPBFBUwMOoeGwbZaRSlWyBCNoVw4gokD4Cvfn+kp NRWObaS9e7vq0KhNGcjnGIOFB+TtT6TILYuxN1OnxiiKUsdnchqrr7aZ7/z4TGwa2htq jT1gmOl/YReXNp2/EgO7I+W1LHL2hMjKQWpSUeFSfaekv4T4D0zOHuZzlDARUaqsw9gv a5f1zvS/HMnxIm54oao+r91L3dQvGUEm3+T4BRKXtrQU9FROtiBCj08PBDS0DPHNKXRa 6/QC2xPUNToiCR9uT5UGm49coCqRmSbC2xlkFw7FCpPW5jAnDYXX5gLno1r/3opslmG9 nkMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LijSfjXM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id u11-20020a170902b28b00b001cc2293b5e0si3044073plr.96.2023.11.11.22.17.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 22:17:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LijSfjXM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 48EBE804A665; Sat, 11 Nov 2023 22:17:02 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230104AbjKLGQ0 (ORCPT + 29 others); Sun, 12 Nov 2023 01:16:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230167AbjKLGQU (ORCPT ); Sun, 12 Nov 2023 01:16:20 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E85D446B1 for ; Sat, 11 Nov 2023 22:16:03 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33BFBC433D9; Sun, 12 Nov 2023 06:15:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699769763; bh=VEdgkasnG6WV+UwznjmxtCe/+1EnOyvijw2TTDpGzls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LijSfjXMXwZ7v68ahlqw4zv5xx9HIG5ohVA/+6HsSiQeE6I7KIp+zAYxquYYx/Rki ORMbca9Aps4wycU1ZctklwUJXamKPqduNqusNNGaelIfaYzuWcHUkxeSos9v3CrfTW SW46dQcdrj4xifPGeNtBTOo6OxlfB+gEmMnxGTBvxp/3JO3dMkdjCJkn7KUmrexuLh U4yZFJ6UfL0ORGcYa4dE0dXoPXbtBFfYyeJW9eWh1G/n26IPfND3rjkIzIStV2kaNe dFApL15ryILb9lETfRSDUR+68KH4ZPQWqsi6v5T8LmZBfloe0pJOno4PcqrQCNPhTJ SWU0cH/7PPD0g== 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 06/38] riscv: u64ilp32: Add signal support for compat Date: Sun, 12 Nov 2023 01:14:42 -0500 Message-Id: <20231112061514.2306187-7-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-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sat, 11 Nov 2023 22:17:02 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782337886489420817 X-GMAIL-MSGID: 1782337886489420817 From: Guo Ren The u64ilp32 reuses compat mode on the 64-bit Linux kernel, but the signal context is the same as the native 64-bit, not u32ilp32. So use the native signal procedure for u64ilp32 applications. Signed-off-by: Guo Ren Signed-off-by: Guo Ren --- arch/riscv/include/asm/signal32.h | 9 ++++++ arch/riscv/kernel/compat_signal.c | 21 ++++-------- arch/riscv/kernel/signal.c | 53 ++++++++++++++++++++++--------- 3 files changed, 54 insertions(+), 29 deletions(-) diff --git a/arch/riscv/include/asm/signal32.h b/arch/riscv/include/asm/signal32.h index 96dc56932e76..cda62d7eb0a5 100644 --- a/arch/riscv/include/asm/signal32.h +++ b/arch/riscv/include/asm/signal32.h @@ -6,6 +6,7 @@ #if IS_ENABLED(CONFIG_COMPAT) int compat_setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs); +long __riscv_compat_rt_sigreturn(void); #else static inline int compat_setup_rt_frame(struct ksignal *ksig, sigset_t *set, @@ -13,6 +14,14 @@ int compat_setup_rt_frame(struct ksignal *ksig, sigset_t *set, { return -1; } + +static inline +long __riscv_compat_rt_sigreturn(void) +{ + return -1; +} #endif +void __riscv_rt_sigreturn_badframe(void); + #endif diff --git a/arch/riscv/kernel/compat_signal.c b/arch/riscv/kernel/compat_signal.c index 8dea2012836e..955a638da2a4 100644 --- a/arch/riscv/kernel/compat_signal.c +++ b/arch/riscv/kernel/compat_signal.c @@ -116,18 +116,16 @@ static long compat_restore_sigcontext(struct pt_regs *regs, return err; } -COMPAT_SYSCALL_DEFINE0(rt_sigreturn) +long __riscv_compat_rt_sigreturn(void) { - struct pt_regs *regs = current_pt_regs(); - struct compat_rt_sigframe __user *frame; - struct task_struct *task; sigset_t set; + struct pt_regs *regs = current_pt_regs(); + struct compat_rt_sigframe __user *frame = + (struct compat_rt_sigframe __user *)kernel_stack_pointer(regs); /* Always make any pending restarted system calls return -EINTR */ current->restart_block.fn = do_no_restart_syscall; - frame = (struct compat_rt_sigframe __user *)regs->sp; - if (!access_ok(frame, sizeof(*frame))) goto badframe; @@ -142,17 +140,12 @@ COMPAT_SYSCALL_DEFINE0(rt_sigreturn) if (compat_restore_altstack(&frame->uc.uc_stack)) goto badframe; + regs->cause = -1UL; + return regs->a0; badframe: - task = current; - if (show_unhandled_signals) { - pr_info_ratelimited( - "%s[%d]: bad frame in %s: frame=%p pc=%p sp=%p\n", - task->comm, task_pid_nr(task), __func__, - frame, (void *)regs->epc, (void *)regs->sp); - } - force_sig(SIGSEGV); + __riscv_rt_sigreturn_badframe(); return 0; } diff --git a/arch/riscv/kernel/signal.c b/arch/riscv/kernel/signal.c index 95c4a8d8a3f5..1c51a6783c98 100644 --- a/arch/riscv/kernel/signal.c +++ b/arch/riscv/kernel/signal.c @@ -224,19 +224,34 @@ static size_t get_rt_frame_size(bool cal_all) return frame_size; } -SYSCALL_DEFINE0(rt_sigreturn) +void __riscv_rt_sigreturn_badframe(void) +{ + struct task_struct *task = current; + struct pt_regs *regs = task_pt_regs(task); + + if (show_unhandled_signals) { + pr_info_ratelimited( + "%s[%d]: bad frame in %s: frame=%p pc=%p sp=%p\n", + task->comm, task_pid_nr(task), __func__, + (void *)kernel_stack_pointer(regs), + (void *)instruction_pointer(regs), + (void *)kernel_stack_pointer(regs)); + } + + force_sig(SIGSEGV); +} + +static long __riscv_rt_sigreturn(void) { - struct pt_regs *regs = current_pt_regs(); - struct rt_sigframe __user *frame; - struct task_struct *task; sigset_t set; size_t frame_size = get_rt_frame_size(false); + struct pt_regs *regs = current_pt_regs(); + struct rt_sigframe __user *frame = + (struct rt_sigframe __user *)kernel_stack_pointer(regs); /* Always make any pending restarted system calls return -EINTR */ current->restart_block.fn = do_no_restart_syscall; - frame = (struct rt_sigframe __user *)regs->sp; - if (!access_ok(frame, frame_size)) goto badframe; @@ -256,17 +271,25 @@ SYSCALL_DEFINE0(rt_sigreturn) return regs->a0; badframe: - task = current; - if (show_unhandled_signals) { - pr_info_ratelimited( - "%s[%d]: bad frame in %s: frame=%p pc=%p sp=%p\n", - task->comm, task_pid_nr(task), __func__, - frame, (void *)regs->epc, (void *)regs->sp); - } - force_sig(SIGSEGV); + __riscv_rt_sigreturn_badframe(); return 0; } +SYSCALL_DEFINE0(rt_sigreturn) +{ + return __riscv_rt_sigreturn(); +} + +#ifdef CONFIG_COMPAT +COMPAT_SYSCALL_DEFINE0(rt_sigreturn) +{ + if (test_thread_flag(TIF_32BIT) && !test_thread_flag(TIF_64ILP32)) + return __riscv_compat_rt_sigreturn(); + else + return __riscv_rt_sigreturn(); +} +#endif + static long setup_sigcontext(struct rt_sigframe __user *frame, struct pt_regs *regs) { @@ -433,7 +456,7 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs) rseq_signal_deliver(ksig, regs); /* Set up the stack frame */ - if (is_compat_task()) + if (test_thread_flag(TIF_32BIT) && !test_thread_flag(TIF_64ILP32)) ret = compat_setup_rt_frame(ksig, oldset, regs); else ret = setup_rt_frame(ksig, oldset, regs);