From patchwork Fri Jan 24 22:30:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13949978 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 73DB3C0218C for ; Fri, 24 Jan 2025 22:32:14 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=jb7e7+a60GG3tcgpyR1Leiq2fUe+Pu5bw8wD+cUMlNI=; b=t8thatMrs1Ec+D zFsdk8NfjI5Ix+zPIrk6qncdE3oKbSwVCado85QWLWGjoxdA0wKDAfj5yroMptLPMWDGs02iuEuTt nEljvb0y73EkXRbgo/Xnq5O88DvSTsS+eWhnlz/jmrImcSmFojS5rIbT/l7kFEEWAzDhbfbeJS0nT M5GTYdrMnJoXanepfey10AR84V4+3vowWY3G9F8ONJkj/qVbn4BHd+N/wJMBIhk/lQjv4qVxibPqT 0TZNKMdeS+c/dT/s68eQ5WBNmrygw1jD94dIzglrjdVSQONiYuXxyyw2lg1wZ4bPe1+jTlmGjl+/X y8ilKscD6TBimY/4pfhA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tbSDh-0000000Fctx-3AHq; Fri, 24 Jan 2025 22:32:09 +0000 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tbSD2-0000000Fcgc-2cb4 for linux-riscv@lists.infradead.org; Fri, 24 Jan 2025 22:31:29 +0000 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-2166f1e589cso66689255ad.3 for ; Fri, 24 Jan 2025 14:31:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1737757888; x=1738362688; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=vNOxwbh8TJLovUJ4xbmkceu/OhoInCtt14EIM5E3MZs=; b=i33xVxIuN4X5v4X6egND/s85bGrty13IFV1z2mLaU4jqFKvm8GgPyvwgOPoFOGl8a4 XdQcW6OQszQAXvWlshQvnAuPdtGgBn2B4pifMiOdW3TmYFEvV5xJ4eQzIV17TNw5ogWs jo/Gpx48bZgSWh6uVKyiTaZZu9pqer8DIj/1b68fnHQfMKQw4wK8yau4oeGGOErwyfuP yOCDlidOhpoIDvCQjl5f3Bn8jWrJ7OU4q81EVZ9PIY389CvSXeHS1hMGmVlLW1qstU6Y UcdQBiWdlfLugyqT/7XQGqXoLgLLY4/3/4rblDcVWLYpw5/aH4kvB2fPcok3I5bVKTzS 06lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737757888; x=1738362688; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vNOxwbh8TJLovUJ4xbmkceu/OhoInCtt14EIM5E3MZs=; b=egiXZbu+qQaLBPLl3nxW097j63Tx5YvFsIxuWt/CeHxXeztZl4AGP8uKR4amzeD7j2 hKPUq2SFfVsiizslfvR6yjnMh1qpR/Z/PLPQLQQU55Xgspevr4gG+jOkr8PnpGjTgolb wf2p2uZlx/NcKhPB0EAmt1lmtfvtCQ5DcP7bFM2kNCuwnPH1tzto5LCLgfXVlVWRRPvg ZWqIuxEqsGXt+V7l+INzdnLO7hVMLUm678rdWMOrUiv+hLQcXHLYT1wLDA2HI98qwj4j EoIqSqwxlA7Exiul7/DhF+8qcuxmPvL+EzcQbDxWDOVqifrFM7SdIQy6vnkk3hY/iflR G3CQ== X-Gm-Message-State: AOJu0YzEElV0YlF/bmV90dZzQQZRGqL673qHC4rhLz+guWFlQ9KDGG1J RtA4RWhWmEC30M4PUEx1gw5Vp+fvnzXlLU9Qn97MitotCGk4sdTtzQCu3WSBm/o= X-Gm-Gg: ASbGncsTxaAzZPs6q1l6W6qe0CJvk8aF5SAZ07zfK8A2zNtY/jmHYCh+Dvu1PuOEByn wdrzeam8zCbKmlb+k3gWO1mYzXBeu/CAbNRLSIVXNHoBEdRXNj4KE/xiszN0Lj1RlyyIXT6GjWn 9vFLl1dBqhtVzMMuAhbgoM7wJWDbjTxfp6rFJMdpEZXI2b+HpQ/pzoYdpNDWeGN2CVWhIpA4t9Q chD+wiVEewsTA3eBJKCgdg/ncpacRzOmorwzoZsPooW0fuMeQD8lIlfOfplzfEcaneVh9P+7ikV /675Aij2OSwlktLLeNki X-Google-Smtp-Source: AGHT+IE7NbObNQvQSaPZkmeR+n8U2XghXp9qA7/c1qoqbpDzuOOutMqEPF/BOHkTtclCps2IhnplYw== X-Received: by 2002:a05:6a00:460e:b0:726:54f1:d133 with SMTP id d2e1a72fcca58-72dafa44498mr46196661b3a.12.1737757888123; Fri, 24 Jan 2025 14:31:28 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72f8a761150sm2397183b3a.119.2025.01.24.14.31.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2025 14:31:27 -0800 (PST) From: Charlie Jenkins Date: Fri, 24 Jan 2025 14:30:59 -0800 Subject: [PATCH v3 1/4] riscv: entry: Convert ret_from_fork() to C MIME-Version: 1.0 Message-Id: <20250124-riscv_optimize_entry-v3-1-869f36b9e43b@rivosinc.com> References: <20250124-riscv_optimize_entry-v3-0-869f36b9e43b@rivosinc.com> In-Reply-To: <20250124-riscv_optimize_entry-v3-0-869f36b9e43b@rivosinc.com> To: Paul Walmsley , Palmer Dabbelt , Huacai Chen , WANG Xuerui , Thomas Gleixner , Peter Zijlstra , Andy Lutomirski , Alexandre Ghiti Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Charlie Jenkins X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3493; i=charlie@rivosinc.com; h=from:subject:message-id; bh=e+QmdYfzdsHe2i47iJnp8obSLIn3fW5B1Uv/wF/582w=; b=owGbwMvMwCXWx5hUnlvL8Y3xtFoSQ/oUkT07p5vc3pN3zOnkt2t7t13MSjCoa19Xuf7PhTMrZ mmaPX4S01HKwiDGxSArpsjCc62BufWOftlR0bIJMHNYmUCGMHBxCsBEPFYx/A8WTt5ryjLVpMH1 TErO2sWKx6RENDf46fAGP0z2XfrJ+A0jww+e91PXpHawiKp7p8QaGc1fP/81y37mGUU9B1q3fG/ 5zgYA X-Developer-Key: i=charlie@rivosinc.com; a=openpgp; fpr=7D834FF11B1D8387E61C776FFB10D1F27D6B1354 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250124_143128_667663_81453070 X-CRM114-Status: GOOD ( 11.88 ) 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 Move the main section of ret_from_fork() to C to allow inlining of syscall_exit_to_user_mode(). Signed-off-by: Charlie Jenkins Reviewed-by: Alexandre Ghiti --- arch/riscv/include/asm/asm-prototypes.h | 1 + arch/riscv/kernel/entry.S | 15 ++++++--------- arch/riscv/kernel/process.c | 14 ++++++++++++-- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/arch/riscv/include/asm/asm-prototypes.h b/arch/riscv/include/asm/asm-prototypes.h index cd627ec289f163a630b73dd03dd52a6b28692997..733ff609778797001006c33bba9e3cc5b1f15387 100644 --- a/arch/riscv/include/asm/asm-prototypes.h +++ b/arch/riscv/include/asm/asm-prototypes.h @@ -52,6 +52,7 @@ DECLARE_DO_ERROR_INFO(do_trap_ecall_s); DECLARE_DO_ERROR_INFO(do_trap_ecall_m); DECLARE_DO_ERROR_INFO(do_trap_break); +asmlinkage void ret_from_fork(void *fn_arg, int (*fn)(void *), struct pt_regs *regs); asmlinkage void handle_bad_stack(struct pt_regs *regs); asmlinkage void do_page_fault(struct pt_regs *regs); asmlinkage void do_irq(struct pt_regs *regs); diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S index 33a5a9f2a0d4e1eeccfb3621b9e518b88e1b0704..b2dc5e7c7b3a843fa4aa02eba2a911eb3ce31d1f 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -319,17 +319,14 @@ SYM_CODE_END(handle_kernel_stack_overflow) ASM_NOKPROBE(handle_kernel_stack_overflow) #endif -SYM_CODE_START(ret_from_fork) +SYM_CODE_START(ret_from_fork_asm) call schedule_tail - beqz s0, 1f /* not from kernel thread */ - /* Call fn(arg) */ - move a0, s1 - jalr s0 -1: - move a0, sp /* pt_regs */ - call syscall_exit_to_user_mode + move a0, s1 /* fn_arg */ + move a1, s0 /* fn */ + move a2, sp /* pt_regs */ + call ret_from_fork j ret_from_exception -SYM_CODE_END(ret_from_fork) +SYM_CODE_END(ret_from_fork_asm) #ifdef CONFIG_IRQ_STACKS /* diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index 58b6482c2bf662bf5224ca50c8e21a68760a6b41..0d07e6d8f6b57beba438dbba5e8c74a014582bee 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -17,7 +17,9 @@ #include #include #include +#include +#include #include #include #include @@ -36,7 +38,7 @@ unsigned long __stack_chk_guard __read_mostly; EXPORT_SYMBOL(__stack_chk_guard); #endif -extern asmlinkage void ret_from_fork(void); +extern asmlinkage void ret_from_fork_asm(void); void noinstr arch_cpu_idle(void) { @@ -206,6 +208,14 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src) return 0; } +asmlinkage void ret_from_fork(void *fn_arg, int (*fn)(void *), struct pt_regs *regs) +{ + if (unlikely(fn)) + fn(fn_arg); + + syscall_exit_to_user_mode(regs); +} + int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) { unsigned long clone_flags = args->flags; @@ -242,7 +252,7 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) p->thread.riscv_v_flags = 0; if (has_vector()) riscv_v_thread_alloc(p); - p->thread.ra = (unsigned long)ret_from_fork; + p->thread.ra = (unsigned long)ret_from_fork_asm; p->thread.sp = (unsigned long)childregs; /* kernel sp */ return 0; } From patchwork Fri Jan 24 22:31:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13949977 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 9E3BBC02181 for ; Fri, 24 Jan 2025 22:32:14 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/tvQD+hIPFr9HIfLQzbZ4edd6dpi15plHy4hQ6Q8zK4=; b=aBEAfDNa9rfKfd cCNqeTuvffV2m4SFAmTkFwmVENlGNgVBtF9dVsjNdfNzaGfpsHvJFKrZjkE6+BHnFHeRL4VkL6o/l u5ddK0DwZgT9mokFjt3qR6LE+PR5DbjsquObWM7dQIGjc5T0l+2nMaLqQwm2BZ8UmPnHROXajvQXO FUpveyLKVZLBJEesCo6vqkSrX3icgHvS1JqS06uS85gx4SmAixwJlSGP22oFqEx0eRi4ML+TvmbsZ bm0zoKiXO81JNVUajnmZircL2fWh79mHzlLMmnNtwei6GB4HwQWvaIDMQKk+fQiu/FHdvuDlUOGuZ CigL+PWpwx3uThs4JwOA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tbSDi-0000000FcuZ-1Xjh; Fri, 24 Jan 2025 22:32:10 +0000 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tbSD4-0000000FchL-1wdB for linux-riscv@lists.infradead.org; Fri, 24 Jan 2025 22:31:31 +0000 Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-2eec9b3a1bbso3841277a91.3 for ; Fri, 24 Jan 2025 14:31:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1737757889; x=1738362689; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=nnq3B23qbOBveDsFleAgWeOkAmZk3gQFKZw4IbSmZLU=; b=bkyKYMVs7yIJNRqPinTKYiRniVM8uqeAZoVl8HqFjn/jt4P7ftjl4HpewvdDYKEyBC 7Tb/qfabdWz1YBgSndoRH2bfFU5ciWhuaBeeyxHdrzaOgL6L8dRd2cCsYEuTt0zwj0M4 NP4rq9JXT5d+B+cL3BmSN4jkInM7Tyhs/mzyfBXvmledDqpTwXukL9PApE9N9zU9UEUt NzGVcRXzYZzT36caCEM/o7GnlJGeeUd3GSm7Q3+mIJwcyxkEd0wBmb2+z7t2QjDxERJU rikbcX+VzFH6dweCoir37pU63MnmovjrOq0kI/EcZhDoOVDuylbTfBpp2/k3tVHFaKOk 16Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737757889; x=1738362689; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nnq3B23qbOBveDsFleAgWeOkAmZk3gQFKZw4IbSmZLU=; b=lP2g1DiqEwIbICAQw/URgPVl6ejFzXk/Mb6FPv5r1iNyVICdvPPlzxG78yLEz54py/ TCw66hBcJN6Z4d/j8r0kWIEXljFQCoeXVVFRexWtSz0zmhhPzL525hLv2Fp8Ej0MWTYZ +attRoPagPCUXSPZoCcbwpUne+x6PD7qIZ/vCYItLIzq94Tnel3YeLgeIACe1T69679m QogeE1nxRIoP/55kxdH384ZgZAWEH4mSbi803uBgdA36UWPHdHyQ+SyG5un4KJBlv29S UZQNQsP584vRcvEz5K7sVll9vWpGCfjlktgEnnL3RRmHX81I6h3PRcsdTf3m7TnXNfLo 3KNg== X-Gm-Message-State: AOJu0YzQDtor4fSThLjrrtpdr/GEIhVpcf6qN3xuk0XvLPQ6YfFGYoI6 AMFHvNkdoC622jHCyCcrRqN7NubM/7z29wE8OtsGvZGrSNbyLWdZeLgVtfwITDw= X-Gm-Gg: ASbGnctgrkFt6QoD3hK98K2rg7gycS0Qrun5MFdVC6TxfieCeAf5IgS9iobKPEkIori Q/CwwiB6vIBvwhCYdrGE9d/fWsGFNDuBkgYiZfwYSPk9UG8ddpXztRvqVJ8eLsOU52HrEYu5pe0 ZptLcf6sfE6UsnrxGTJs+VK4cgvvEygMqy+EyB33kQmgHf7U8kZkX5+RcdA4V0R1zYZwoFD5Wb5 TuXqkD5V6Wx6PU0GNHRPo7UUR4A8Nbks8v6YgeQtlK/+FoBzLhcChHHhDqhXEc8eiIKGQh/u7NP oc8zXjaNarb9EMxRJOTK X-Google-Smtp-Source: AGHT+IG2A2M9jJ06wgeU6MMIXKJU3cZe7jVRjjabtXl2tIE7gfG3Pli2LQenVrOmHMThyR5CLM42Yw== X-Received: by 2002:a05:6a00:8084:b0:724:d758:f35 with SMTP id d2e1a72fcca58-72daf9bd157mr43251403b3a.2.1737757889642; Fri, 24 Jan 2025 14:31:29 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72f8a761150sm2397183b3a.119.2025.01.24.14.31.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2025 14:31:28 -0800 (PST) From: Charlie Jenkins Date: Fri, 24 Jan 2025 14:31:00 -0800 Subject: [PATCH v3 2/4] riscv: entry: Split ret_from_fork() into user and kernel MIME-Version: 1.0 Message-Id: <20250124-riscv_optimize_entry-v3-2-869f36b9e43b@rivosinc.com> References: <20250124-riscv_optimize_entry-v3-0-869f36b9e43b@rivosinc.com> In-Reply-To: <20250124-riscv_optimize_entry-v3-0-869f36b9e43b@rivosinc.com> To: Paul Walmsley , Palmer Dabbelt , Huacai Chen , WANG Xuerui , Thomas Gleixner , Peter Zijlstra , Andy Lutomirski , Alexandre Ghiti Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Charlie Jenkins X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4442; i=charlie@rivosinc.com; h=from:subject:message-id; bh=t9WBogxb56lApIirNVzIj0lHOk+/6g6AFgtrehj97DE=; b=owGbwMvMwCXWx5hUnlvL8Y3xtFoSQ/oUkT1rm9Z8Nf0kEHf0/WHb/Q7WLrI7Fxwsm14jGnnDn +9v0JejHaUsDGJcDLJiiiw81xqYW+/olx0VLZsAM4eVCWQIAxenAEzk4GqG/44uK2Vbko953/Tz iju3MFvOKHpDoOYUC6lZB7o9n3u+2crwh/PYJ327eY+9t3o2/Zgy35Dj0px0OeEla1NcZefnh3L ZcwMA X-Developer-Key: i=charlie@rivosinc.com; a=openpgp; fpr=7D834FF11B1D8387E61C776FFB10D1F27D6B1354 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250124_143130_505692_0948AC93 X-CRM114-Status: GOOD ( 13.01 ) 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 This function was unified into a single function in commit ab9164dae273 ("riscv: entry: Consolidate ret_from_kernel_thread into ret_from_fork"). However that imposed a performance degradation. Partially reverting this commit to have ret_from_fork() split again results in a 1% increase on the number of times fork is able to be called per second. Signed-off-by: Charlie Jenkins --- arch/riscv/include/asm/asm-prototypes.h | 3 ++- arch/riscv/kernel/entry.S | 13 ++++++++++--- arch/riscv/kernel/process.c | 17 +++++++++++------ 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/arch/riscv/include/asm/asm-prototypes.h b/arch/riscv/include/asm/asm-prototypes.h index 733ff609778797001006c33bba9e3cc5b1f15387..bfc8ea5f9319b19449ec59493b45b926df888832 100644 --- a/arch/riscv/include/asm/asm-prototypes.h +++ b/arch/riscv/include/asm/asm-prototypes.h @@ -52,7 +52,8 @@ DECLARE_DO_ERROR_INFO(do_trap_ecall_s); DECLARE_DO_ERROR_INFO(do_trap_ecall_m); DECLARE_DO_ERROR_INFO(do_trap_break); -asmlinkage void ret_from_fork(void *fn_arg, int (*fn)(void *), struct pt_regs *regs); +asmlinkage void ret_from_fork_kernel(void *fn_arg, int (*fn)(void *), struct pt_regs *regs); +asmlinkage void ret_from_fork_user(struct pt_regs *regs); asmlinkage void handle_bad_stack(struct pt_regs *regs); asmlinkage void do_page_fault(struct pt_regs *regs); asmlinkage void do_irq(struct pt_regs *regs); diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S index b2dc5e7c7b3a843fa4aa02eba2a911eb3ce31d1f..0fb338000c6dc0358742cd03497fa54b9e9d1aec 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -319,14 +319,21 @@ SYM_CODE_END(handle_kernel_stack_overflow) ASM_NOKPROBE(handle_kernel_stack_overflow) #endif -SYM_CODE_START(ret_from_fork_asm) +SYM_CODE_START(ret_from_fork_kernel_asm) call schedule_tail move a0, s1 /* fn_arg */ move a1, s0 /* fn */ move a2, sp /* pt_regs */ - call ret_from_fork + call ret_from_fork_kernel j ret_from_exception -SYM_CODE_END(ret_from_fork_asm) +SYM_CODE_END(ret_from_fork_kernel_asm) + +SYM_CODE_START(ret_from_fork_user_asm) + call schedule_tail + move a0, sp /* pt_regs */ + call ret_from_fork_user + j ret_from_exception +SYM_CODE_END(ret_from_fork_user_asm) #ifdef CONFIG_IRQ_STACKS /* diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index 0d07e6d8f6b57beba438dbba5e8c74a014582bee..5f15236cb526bd9fe61636ed372b4b76c94df946 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -38,7 +38,8 @@ unsigned long __stack_chk_guard __read_mostly; EXPORT_SYMBOL(__stack_chk_guard); #endif -extern asmlinkage void ret_from_fork_asm(void); +extern asmlinkage void ret_from_fork_kernel_asm(void); +extern asmlinkage void ret_from_fork_user_asm(void); void noinstr arch_cpu_idle(void) { @@ -208,14 +209,18 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src) return 0; } -asmlinkage void ret_from_fork(void *fn_arg, int (*fn)(void *), struct pt_regs *regs) +asmlinkage void ret_from_fork_kernel(void *fn_arg, int (*fn)(void *), struct pt_regs *regs) { - if (unlikely(fn)) - fn(fn_arg); + fn(fn_arg); syscall_exit_to_user_mode(regs); } +asmlinkage void ret_from_fork_user(struct pt_regs *regs) +{ + syscall_exit_to_user_mode(regs); +} + int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) { unsigned long clone_flags = args->flags; @@ -238,6 +243,7 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) p->thread.s[0] = (unsigned long)args->fn; p->thread.s[1] = (unsigned long)args->fn_arg; + p->thread.ra = (unsigned long)ret_from_fork_kernel_asm; } else { *childregs = *(current_pt_regs()); /* Turn off status.VS */ @@ -247,12 +253,11 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) if (clone_flags & CLONE_SETTLS) childregs->tp = tls; childregs->a0 = 0; /* Return value of fork() */ - p->thread.s[0] = 0; + p->thread.ra = (unsigned long)ret_from_fork_user_asm; } p->thread.riscv_v_flags = 0; if (has_vector()) riscv_v_thread_alloc(p); - p->thread.ra = (unsigned long)ret_from_fork_asm; p->thread.sp = (unsigned long)childregs; /* kernel sp */ return 0; } From patchwork Fri Jan 24 22:31:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13949979 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 F1606C0218D for ; Fri, 24 Jan 2025 22:32:16 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=K574FHPasfcBoR7F0SLDoTWHHesWTUHmk6Tjlypguyo=; b=p1eWIIzbmdst2z J2+UhLcfzKEk8KWEmCmaZlop1KiJwExvJxnsf8FxGQAdXFFxQRs/fZ2C0/zkQrS2YFYgsIH+C4tgW vdkDbJES7qjM9BdiKnR1vLG3ntm44ACdPBfqwIk+XVbZUnMZIkfE2gP/OQIeT7GqBYtVCAiqGjx6Z Pbjv+ebWDtc91D/15VIhue9Wz/ftuqX5ycW1v83jnh4pVGaPeYnSqYwfWX1AjCt55VVe+Kkci4Kel olWdtH8DUcnie4vvapjGp1Q/pgLUm+tT6FGRl4DMyETTOeiczPp+4XLFLTJcBw8nxSjQhADVAZk46 OhCvUXs5eSjq1Mhan9Vg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tbSDi-0000000Fcv4-494B; Fri, 24 Jan 2025 22:32:10 +0000 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tbSD5-0000000Fci1-485Q for linux-riscv@lists.infradead.org; Fri, 24 Jan 2025 22:31:33 +0000 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-21669fd5c7cso47017575ad.3 for ; Fri, 24 Jan 2025 14:31:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1737757891; x=1738362691; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=a+zSCWqqyKc551VynXTcxotuXwo5gv9XFD/e4PnRFpw=; b=WB/64OeaRttlNTA80o+oXibTA+r6hvqkPX7dsEHNsJlb6r8od6ZdV3deRQqb19CfJJ WysFQXtCZYne27uGVzINte7d/cqdjVUD1GOwLWUcaubfRvldjYWfISmVbUAb9X4V+vHm Iq+pfixx3FTlxTf+H0kPKra2s9YNQURJO8JjLSNdSrvwePfLAyY2XgrJj8dbUm2fHtim reU+xB9iZePJLcRSoLAFmVqfjftfHzIfiFUzqRyHgSmevQrGiv9ARTQSXMFUY9hwIh+g R2CRsGeoYYPSKLfrIlN699TzESCnDsELDGbtMlK03bAof0amMN3rZjP2zj/uNVVXNwIQ jqtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737757891; x=1738362691; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a+zSCWqqyKc551VynXTcxotuXwo5gv9XFD/e4PnRFpw=; b=SAD5jYCzhAlX6MUxqndbWqu2wz/n+g9LxYX1N8vC5Z8nGO2m1kITNSeoEEqyNa1mc9 qVuiHWeCsjPp8/y8V91ZMiHdWpUPLwMHyrFwEc8RthuiennaLV3fxuclLpnd9Ib+Jk0c p20g+VrE52AMdhv6Zp0aZWrE3xgHzpzri+ekz3gpuE1S6sNOYvnKKn/oLO1MjirYnM3C Ega/PxejqmHN3Gysp6QBKOXx4MZIWCncCYp8GStQAigUsLHL442g2e2t13yhptEG3VWy 0tzMyYNnazmr+jeSKWhAmsjmtnobXgmq9HqMciBh5yqgWLiwVq7qyRxNlrIR8GnzDWRu MF2w== X-Gm-Message-State: AOJu0YyyxSXkB5t7p0z8tX0SE/j2GHyoC5mCsLOPylbo7VjSRw92GFpO veABxQ0kIqL2hgcpFKxRF9Px4guNZ5rIVxnooNzF+/5I4JQhIMhfzSLUOazo8LE= X-Gm-Gg: ASbGnctZ5v5ZRp9nbiyZZk9/8IegvepPPUeMkWy7IkQSrnevIfHp1nFL/gQmb1XkGDS mvpsHAYMEcbGFjEyJlABUTKYpfhWki0frIwuOxpt4jEcf57lhrcEnemjnIXrS1HNo2XWBtGncAF K2znoL2jx9QYb3cSwJ8Trg5abJzj2VDLQIdI3RyeMJG1hW2/GUqW67eG2LHfqThc2V3AJQzNJRk U5r1Kwx1zMDzx+obiAtA8Zo+RSXf1l4YZk2N8+xPZTKhRiNjMLDv2/iinZDqegJv6RixlzoBA4t BUsNZ4tOiIaX9+l/mdtb X-Google-Smtp-Source: AGHT+IFtzVMWJA2cJy0hbK7qGJLRhh8SGaR/f/uRZsSLRq3SYx5yoyUu7AJhe3KVtuMpObcfJz9puA== X-Received: by 2002:a05:6a21:6816:b0:1ea:ddd1:2fa7 with SMTP id adf61e73a8af0-1eb2158717fmr53240943637.28.1737757891304; Fri, 24 Jan 2025 14:31:31 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72f8a761150sm2397183b3a.119.2025.01.24.14.31.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2025 14:31:30 -0800 (PST) From: Charlie Jenkins Date: Fri, 24 Jan 2025 14:31:01 -0800 Subject: [PATCH v3 3/4] LoongArch: entry: Migrate ret_from_fork() to C MIME-Version: 1.0 Message-Id: <20250124-riscv_optimize_entry-v3-3-869f36b9e43b@rivosinc.com> References: <20250124-riscv_optimize_entry-v3-0-869f36b9e43b@rivosinc.com> In-Reply-To: <20250124-riscv_optimize_entry-v3-0-869f36b9e43b@rivosinc.com> To: Paul Walmsley , Palmer Dabbelt , Huacai Chen , WANG Xuerui , Thomas Gleixner , Peter Zijlstra , Andy Lutomirski , Alexandre Ghiti Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Charlie Jenkins X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5547; i=charlie@rivosinc.com; h=from:subject:message-id; bh=ji6jPR39ZKDby+guv8CCAiBLyKbpGz9Kynms9BH9fJU=; b=owGbwMvMwCXWx5hUnlvL8Y3xtFoSQ/oUkT0/mHcH/Kxl2rj74eeSTNt3rYnZr36Jna5htr7++ O1Ro493O0pZGMS4GGTFFFl4rjUwt97RLzsqWjYBZg4rE8gQBi5OAZiIkTcjw9S4jXpMMo+lL3sr a8xT8BPxbFnM4bl+ccvUqcelOna/WMHwz8Qwk9Fdr6hpoQRPJWPj6+3vb1/4c3NOAcuPstNT9Zp 62QA= X-Developer-Key: i=charlie@rivosinc.com; a=openpgp; fpr=7D834FF11B1D8387E61C776FFB10D1F27D6B1354 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250124_143132_019332_B2213519 X-CRM114-Status: GOOD ( 10.79 ) 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 LoongArch is the only architecture that calls syscall_exit_to_user_mode() from asm. Move the call into C so that this function can be inlined across all architectures. Signed-off-by: Charlie Jenkins --- arch/loongarch/include/asm/asm-prototypes.h | 8 +++++++ arch/loongarch/kernel/entry.S | 22 +++++++++---------- arch/loongarch/kernel/process.c | 33 +++++++++++++++++++++++------ 3 files changed, 45 insertions(+), 18 deletions(-) diff --git a/arch/loongarch/include/asm/asm-prototypes.h b/arch/loongarch/include/asm/asm-prototypes.h index 51f224bcfc654228ae423e9a066b25b35102a5b9..704066b4f7368be15be960fadbcd6c2574bbf6c0 100644 --- a/arch/loongarch/include/asm/asm-prototypes.h +++ b/arch/loongarch/include/asm/asm-prototypes.h @@ -12,3 +12,11 @@ __int128_t __ashlti3(__int128_t a, int b); __int128_t __ashrti3(__int128_t a, int b); __int128_t __lshrti3(__int128_t a, int b); #endif + +asmlinkage void noinstr __no_stack_protector ret_from_fork(struct task_struct *prev, + struct pt_regs *regs); + +asmlinkage void noinstr __no_stack_protector ret_from_kernel_thread(struct task_struct *prev, + struct pt_regs *regs, + int (*fn)(void *), + void *fn_arg); diff --git a/arch/loongarch/kernel/entry.S b/arch/loongarch/kernel/entry.S index 48e7e34e355e83eae8165957ba2eac05a8bf17df..2abc29e573810e000f2fef4646ddca0dbb80eabe 100644 --- a/arch/loongarch/kernel/entry.S +++ b/arch/loongarch/kernel/entry.S @@ -77,24 +77,22 @@ SYM_CODE_START(handle_syscall) SYM_CODE_END(handle_syscall) _ASM_NOKPROBE(handle_syscall) -SYM_CODE_START(ret_from_fork) +SYM_CODE_START(ret_from_fork_asm) UNWIND_HINT_REGS - bl schedule_tail # a0 = struct task_struct *prev - move a0, sp - bl syscall_exit_to_user_mode + move a1, sp + bl ret_from_fork RESTORE_STATIC RESTORE_SOME RESTORE_SP_AND_RET -SYM_CODE_END(ret_from_fork) +SYM_CODE_END(ret_from_fork_asm) -SYM_CODE_START(ret_from_kernel_thread) +SYM_CODE_START(ret_from_kernel_thread_asm) UNWIND_HINT_REGS - bl schedule_tail # a0 = struct task_struct *prev - move a0, s1 - jirl ra, s0, 0 - move a0, sp - bl syscall_exit_to_user_mode + move a1, sp + move a2, s0 + move a3, s1 + bl ret_from_kernel_thread RESTORE_STATIC RESTORE_SOME RESTORE_SP_AND_RET -SYM_CODE_END(ret_from_kernel_thread) +SYM_CODE_END(ret_from_kernel_thread_asm) diff --git a/arch/loongarch/kernel/process.c b/arch/loongarch/kernel/process.c index 6e58f65455c7ca3eae2e88ed852c8655a6701e5c..98bc60d7c550fcc0225e8452f81a7d6cd7888015 100644 --- a/arch/loongarch/kernel/process.c +++ b/arch/loongarch/kernel/process.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -33,6 +34,7 @@ #include #include +#include #include #include #include @@ -47,6 +49,7 @@ #include #include #include +#include #include #include @@ -63,8 +66,9 @@ EXPORT_SYMBOL(__stack_chk_guard); unsigned long boot_option_idle_override = IDLE_NO_OVERRIDE; EXPORT_SYMBOL(boot_option_idle_override); -asmlinkage void ret_from_fork(void); -asmlinkage void ret_from_kernel_thread(void); +asmlinkage void restore_and_ret(void); +asmlinkage void ret_from_fork_asm(void); +asmlinkage void ret_from_kernel_thread_asm(void); void start_thread(struct pt_regs *regs, unsigned long pc, unsigned long sp) { @@ -138,6 +142,23 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src) return 0; } +asmlinkage void noinstr __no_stack_protector ret_from_fork(struct task_struct *prev, + struct pt_regs *regs) +{ + schedule_tail(prev); + syscall_exit_to_user_mode(regs); +} + +asmlinkage void noinstr __no_stack_protector ret_from_kernel_thread(struct task_struct *prev, + struct pt_regs *regs, + int (*fn)(void *), + void *fn_arg) +{ + schedule_tail(prev); + fn(fn_arg); + syscall_exit_to_user_mode(regs); +} + /* * Copy architecture-specific thread state */ @@ -165,8 +186,8 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) p->thread.reg03 = childksp; p->thread.reg23 = (unsigned long)args->fn; p->thread.reg24 = (unsigned long)args->fn_arg; - p->thread.reg01 = (unsigned long)ret_from_kernel_thread; - p->thread.sched_ra = (unsigned long)ret_from_kernel_thread; + p->thread.reg01 = (unsigned long)ret_from_kernel_thread_asm; + p->thread.sched_ra = (unsigned long)ret_from_kernel_thread_asm; memset(childregs, 0, sizeof(struct pt_regs)); childregs->csr_euen = p->thread.csr_euen; childregs->csr_crmd = p->thread.csr_crmd; @@ -182,8 +203,8 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) childregs->regs[3] = usp; p->thread.reg03 = (unsigned long) childregs; - p->thread.reg01 = (unsigned long) ret_from_fork; - p->thread.sched_ra = (unsigned long) ret_from_fork; + p->thread.reg01 = (unsigned long) ret_from_fork_asm; + p->thread.sched_ra = (unsigned long) ret_from_fork_asm; /* * New tasks lose permission to use the fpu. This accelerates context From patchwork Fri Jan 24 22:31:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13949980 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 74A3AC0218B for ; Fri, 24 Jan 2025 22:32:16 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=QWJgRsvBKUyrDoH6mpji1zYt5VMX4P6Bh6RH5MuSPhY=; b=D0Qgg0oRjQmDD5 7bZzxQnuWqw6cF3xeOVYabuTkFhWx94U31+Ah6tu9IWPxBXUDgDVmdby2M2TfoZ8nsLO/ICJi1cKy H764vRINm+qTpPzoq4iVPDCxIGqEh23WacRXHGIQ6+85ZbDrMKsF+hPufXtqCg6VYh6yZpASjq9V9 N6pSwge7qcbeUNG/0SgCRJLNIObWQXULdppWC9Y9+v5RDMT58q7zlkn8oen0k+BjyWY9/KhPpkGyE NKI0wJToUyraY/wLljM6Nfxz+K49jBkBr/y0deLoO/5236yT13vdA7EBfuiC/0kfszzRMcAHQ5Ewj 3aVyYK1AdVP4bJWQDB2w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tbSDj-0000000FcvR-2fmu; Fri, 24 Jan 2025 22:32:11 +0000 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tbSD7-0000000Fcig-1PE5 for linux-riscv@lists.infradead.org; Fri, 24 Jan 2025 22:31:34 +0000 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-21bc1512a63so52571445ad.1 for ; Fri, 24 Jan 2025 14:31:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1737757893; x=1738362693; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=OT7EL7aXHj5Qe8OT6w++iL8CLZKTuGLA5KeWTFGIQzY=; b=Jux018lff7XesWDuVIF5D7CQKLJ6Y96O5DfAjdFJazgBETS/D33VRcON6hjjnfJxno KN5lWInAgwJweKDXBclS3msCx2Mr8od+BliDcE25jOj/zRE5pvAkphf4sIm7JdlHgAv7 alm5s0VyStNnuDKq73t2M0Ng24XemLbWYM1R98jGk2YfMDwRsfpRWVA5FK+8FAxlzWq+ i0HITrznXWQP3j6lY60l+iuA6ahyL3rFqZLX82XDTvnIgw8EKV02OFmAStmHuRpjwsq1 pvKuNL/oxkE83CP36pRnMggd8S+oGOvSkcb56UpylhsauK5kxj3QifjO8rP5Ei39k55V NqVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737757893; x=1738362693; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OT7EL7aXHj5Qe8OT6w++iL8CLZKTuGLA5KeWTFGIQzY=; b=ck+UGSUPwADZo1ha3+bJVODw1uSz52zs9PcKRW+O2FzsHP93VQX79yuRIpVb40C612 I20aM/ekUX1uNvCUQyPum6HlO3AK8pNYWkbtv6JnGZqOJzHX5zdRciDM2AYc0oEGis7W VR+HFXFXmqurIb1XbHtrkiqDS6B5YLvvpzfkX+uGRtSomcXF6hEzogc4lfTkNybpKKwS yMRdys4XUw7enzZUPiAYNj94wzEZs9+yBXIbDNp0ARkKGe7Aq/GxPPNYtU6Tm9qvW/GV FuwmzfO9oRd/2yAS3VJnAyWp82ZwDiisrCyIguEw/4tvcZFSj9YW+K1SCz5WYW/jJ38C zgbw== X-Gm-Message-State: AOJu0YzUuGD3uvobnlAi+Os/3mqxvlirr1MtfezfKW64bLcEiOr8c+cE NyFOT2huIrBP6P7IlNu9emPmLAtFrxo8k4tb+M+UbAmSPt9HgMw4F6L9iY6/JNw= X-Gm-Gg: ASbGncsb/lSpwaDo1OKMQ7JljpF+W5JlEzGSqemxN2XucbEQgrsIZ+3OVK+AwGRInV/ jqbAv0KrPmrMWPuJhmFx2TKgked5+J1fTQRxCgeHqQOc+EmoBUvJHGRfImkq7XJ1c76JSG35cX1 2tbMHIKeTKDwiYw3KAJ58xatGRxqNJHfH2Bz7t1NEfgqY3Milcg2ky9Ww89vAP5lUBNm5L1booz 2w3jOw+V2MBI+wdxir+ABS7wwNk8uzMclVlrgjwd7zlJrljUPH3JysmdV5RuD7K78ApzLdcytX1 cUKYlauCUjrBtkwMJS2M2dejjBIDNhA= X-Google-Smtp-Source: AGHT+IFXK5F2oZ/QyolwaGkbszhQMrnQEgQ/zkG4vY/tsUK75EkmfNWITMpNDa0U8tOC37teAvGGhA== X-Received: by 2002:a05:6a20:7f89:b0:1e0:dc34:2e7d with SMTP id adf61e73a8af0-1eb214650camr45666065637.5.1737757892796; Fri, 24 Jan 2025 14:31:32 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72f8a761150sm2397183b3a.119.2025.01.24.14.31.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2025 14:31:32 -0800 (PST) From: Charlie Jenkins Date: Fri, 24 Jan 2025 14:31:02 -0800 Subject: [PATCH v3 4/4] entry: Inline syscall_exit_to_user_mode() MIME-Version: 1.0 Message-Id: <20250124-riscv_optimize_entry-v3-4-869f36b9e43b@rivosinc.com> References: <20250124-riscv_optimize_entry-v3-0-869f36b9e43b@rivosinc.com> In-Reply-To: <20250124-riscv_optimize_entry-v3-0-869f36b9e43b@rivosinc.com> To: Paul Walmsley , Palmer Dabbelt , Huacai Chen , WANG Xuerui , Thomas Gleixner , Peter Zijlstra , Andy Lutomirski , Alexandre Ghiti Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Charlie Jenkins X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5145; i=charlie@rivosinc.com; h=from:subject:message-id; bh=sNZ3kRgQB3K0rJNT54yR9TpYcWCb1xtle/FG6x9msOc=; b=owGbwMvMwCXWx5hUnlvL8Y3xtFoSQ/oUkT0VfqffFouuyp4Vb3LsoMOtgw9+zgvqmDWt7m1u6 uptVtNOdZSwMIhxMciKKbLwXGtgbr2jX3ZUtGwCzBxWJpAhDFycAjCRxYwMXzjKHDiO9HEpHtJd XMe7bKfCOlUBhU239h18IyXnPImPmeF/4OP5x+crPrF0lYizMbt4ZOOWJwxbIwtsblh/klvlYbu dDQA= X-Developer-Key: i=charlie@rivosinc.com; a=openpgp; fpr=7D834FF11B1D8387E61C776FFB10D1F27D6B1354 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250124_143133_369595_A2AFFE97 X-CRM114-Status: GOOD ( 14.88 ) 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 Architectures using the generic entry code can be optimized by having syscall_exit_to_user_mode inlined. Signed-off-by: Charlie Jenkins --- include/linux/entry-common.h | 43 ++++++++++++++++++++++++++++++++++++-- kernel/entry/common.c | 49 +------------------------------------------- 2 files changed, 42 insertions(+), 50 deletions(-) diff --git a/include/linux/entry-common.h b/include/linux/entry-common.h index fc61d0205c97084acc89c8e45e088946f5e6d9b2..ee1c400bc0eb0ebb5850f95e856b819fca7b3577 100644 --- a/include/linux/entry-common.h +++ b/include/linux/entry-common.h @@ -14,6 +14,7 @@ #include #include +#include /* * Define dummy _TIF work flags if not defined by the architecture or for @@ -366,6 +367,15 @@ static __always_inline void exit_to_user_mode(void) lockdep_hardirqs_on(CALLER_ADDR0); } +/** + * syscall_exit_work - Handle work before returning to user mode + * @regs: Pointer to current pt_regs + * @work: Current thread syscall work + * + * Do one-time syscall specific work. + */ +void syscall_exit_work(struct pt_regs *regs, unsigned long work); + /** * syscall_exit_to_user_mode_work - Handle work before returning to user mode * @regs: Pointer to currents pt_regs @@ -379,7 +389,30 @@ static __always_inline void exit_to_user_mode(void) * make the final state transitions. Interrupts must stay disabled between * return from this function and the invocation of exit_to_user_mode(). */ -void syscall_exit_to_user_mode_work(struct pt_regs *regs); +static __always_inline void syscall_exit_to_user_mode_work(struct pt_regs *regs) +{ + unsigned long work = READ_ONCE(current_thread_info()->syscall_work); + unsigned long nr = syscall_get_nr(current, regs); + + CT_WARN_ON(ct_state() != PERF_CONTEXT_KERNEL); + + if (IS_ENABLED(CONFIG_PROVE_LOCKING)) { + if (WARN(irqs_disabled(), "syscall %lu left IRQs disabled", nr)) + local_irq_enable(); + } + + rseq_syscall(regs); + + /* + * Do one-time syscall specific work. If these work items are + * enabled, we want to run them exactly once per syscall exit with + * interrupts enabled. + */ + if (unlikely(work & SYSCALL_WORK_EXIT)) + syscall_exit_work(regs, work); + local_irq_disable_exit_to_user(); + exit_to_user_mode_prepare(regs); +} /** * syscall_exit_to_user_mode - Handle work before returning to user mode @@ -410,7 +443,13 @@ void syscall_exit_to_user_mode_work(struct pt_regs *regs); * exit_to_user_mode(). This function is preferred unless there is a * compelling architectural reason to use the separate functions. */ -void syscall_exit_to_user_mode(struct pt_regs *regs); +static __always_inline void syscall_exit_to_user_mode(struct pt_regs *regs) +{ + instrumentation_begin(); + syscall_exit_to_user_mode_work(regs); + instrumentation_end(); + exit_to_user_mode(); +} /** * irqentry_enter_from_user_mode - Establish state before invoking the irq handler diff --git a/kernel/entry/common.c b/kernel/entry/common.c index e33691d5adf7aab4af54cf2bf8e5ef5bd6ad1424..f55e421fb196dd5f9d4e34dd85ae096c774cf879 100644 --- a/kernel/entry/common.c +++ b/kernel/entry/common.c @@ -146,7 +146,7 @@ static inline bool report_single_step(unsigned long work) return work & SYSCALL_WORK_SYSCALL_EXIT_TRAP; } -static void syscall_exit_work(struct pt_regs *regs, unsigned long work) +void syscall_exit_work(struct pt_regs *regs, unsigned long work) { bool step; @@ -173,53 +173,6 @@ static void syscall_exit_work(struct pt_regs *regs, unsigned long work) ptrace_report_syscall_exit(regs, step); } -/* - * Syscall specific exit to user mode preparation. Runs with interrupts - * enabled. - */ -static void syscall_exit_to_user_mode_prepare(struct pt_regs *regs) -{ - unsigned long work = READ_ONCE(current_thread_info()->syscall_work); - unsigned long nr = syscall_get_nr(current, regs); - - CT_WARN_ON(ct_state() != CT_STATE_KERNEL); - - if (IS_ENABLED(CONFIG_PROVE_LOCKING)) { - if (WARN(irqs_disabled(), "syscall %lu left IRQs disabled", nr)) - local_irq_enable(); - } - - rseq_syscall(regs); - - /* - * Do one-time syscall specific work. If these work items are - * enabled, we want to run them exactly once per syscall exit with - * interrupts enabled. - */ - if (unlikely(work & SYSCALL_WORK_EXIT)) - syscall_exit_work(regs, work); -} - -static __always_inline void __syscall_exit_to_user_mode_work(struct pt_regs *regs) -{ - syscall_exit_to_user_mode_prepare(regs); - local_irq_disable_exit_to_user(); - exit_to_user_mode_prepare(regs); -} - -void syscall_exit_to_user_mode_work(struct pt_regs *regs) -{ - __syscall_exit_to_user_mode_work(regs); -} - -__visible noinstr void syscall_exit_to_user_mode(struct pt_regs *regs) -{ - instrumentation_begin(); - __syscall_exit_to_user_mode_work(regs); - instrumentation_end(); - exit_to_user_mode(); -} - noinstr void irqentry_enter_from_user_mode(struct pt_regs *regs) { enter_from_user_mode(regs);