From patchwork Wed Mar 5 23:00:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 14003630 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 EA25FC19F32 for ; Wed, 5 Mar 2025 23:00:56 +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=Zdcq/RPuqYQKHa wQFksnFdHGs5C2woFpF+bOMjgdZfDoP5dKJ/6ghkeJTJ65/p8WN23WSwgPlBdC7Gz41mOirIxXPyV DwrnJUM61YbFG5Po6JuarJLmCI8d+pGhU1q7rjn+glr+k5extM22RtzTbpRnJnEudwkCJG6C+lx68 /r3UKbnb7h/AGa2hFxCVMHNxEiw7Ec5AFBMWSMOnLQorLam66IDO41qnTYy7KhykjJjBgNMooGqXI dMzj8cVuvTMGKFRdIGmmnMDji4XroVOlJkOaaoFLXVDfZJ8jEk7svETIzIEI6XzGiTCDeth8wCV7M U505K2+pZ271sHEoeLMg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tpxjP-00000009YSE-3xxi; Wed, 05 Mar 2025 23:00:51 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tpxjO-00000009YRA-0YqR for linux-riscv@bombadil.infradead.org; Wed, 05 Mar 2025 23:00:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Sender:Reply-To:Content-ID:Content-Description; bh=vNOxwbh8TJLovUJ4xbmkceu/OhoInCtt14EIM5E3MZs=; b=A7G6W3qHptPFikrhr0K7c6+WwP 8wPl4cPjZluKTTOB2YCUf4JtxuChXci4OqCkkBlj0nzFz/WGN1WoCnnaXLFEnRPbAzBd5cYxtuhI2 KEBYkCyT5BgwmBgC83hAfjuCOIQqoePBxQ0VkRh5kFEm4jCQ9gcmEz/J1Bugc374jRnP8VmlTkT/O 8XmwDklM5dYeWAP8iF+Ss4YWcXL1JzEkX/ySidt0Ng31geK8mE95rrjtYkX/sUlKpI0dx87VG8Yx8 ETVchI2TSSTlb9ss8NuiFRUlQn3gdfqLM0pAiQ+1n7r3d6Tw/hWLaJ4bu+UMhKSbfG/uEA37ZCL+/ OwYbFnVw==; Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by desiato.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tpxjK-00000000nIT-2miJ for linux-riscv@lists.infradead.org; Wed, 05 Mar 2025 23:00:48 +0000 Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-2ff64550991so124019a91.0 for ; Wed, 05 Mar 2025 15:00:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741215643; x=1741820443; 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=SvHY74Gb8opowEQ4y1WKy0hn/rBWqrp9ytJyiMFJDSyDcGKEs6Usn5qRqruam2VwNa K1O5qolR3H+vahlc2w7GQro+i87AdbgreB0Yo1xWBigENcdcqF8NXIagawqaK3WoQuwc 88aEPAQzpqdOKQ4VSa6a6FfOcHcCwtfJ6oMU9Q02LOb4SKoX4Lt+Ax64X/QlvHuD6bCK s05obBDFuLOVyEwHiY0/puHOkZjg48wFF+ee0iR+VxUQ3pwMvYTUbD8mwabblaoKDSUm CXof89lLojxIxkT6gF9KQSQO2sYNbPwdyFc1n5087aTkkpSez/C4rVu0xT55bPQb3Szf GyBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741215643; x=1741820443; 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=FiB98isGJwSN2Q9bT6DjDvFAZj6859KWKZ1mhywppA68h9JiC/WxpuY1v0VHLPYgPI RkFNVNW0yKcjhyK/jaOf9pfE/1Ksc4vKWdbI94pvfdFXU+iTzlwzTTz6MKXd1VewY3KL ECiLNtEkqT5eEvZG0VmOg5YG2DBjcJ+yyX3SOonTOHhcjd5Fnf0uSq7DqVbLvje5p1JV wXrkP4rK3m2LoMit1pBcyxFiTJnS6pHQJT/710+CGUwoPADlJibOtS6EWF4ne0UMD2Ux kTqn1t2gaG38IdxMraYtQY5rcyxE55LAdV1bxzJqrE5LQZe6mBtbM/zUXEnnTpws5Ex6 xvfg== X-Gm-Message-State: AOJu0Yz6jeMNO5kQOJ2Sv2XfWGAMNCN6aryubL+9/NmdTqQp7Sk9ifY1 seN1cfp4L/KNzMyehq4LMV/uw5mVgirKD7AoVkVvN3HgNSMSecOcEln5Cd34BCM= X-Gm-Gg: ASbGncse9Rnc0hyG9vjlbBZvc3dzCdxw5KUOZs4dkRgwNxs03ejmQcppr2lgwvBb18Q uAO60rIcpkhMakGWpgN4qNVd/+oNIFODBtUYwK9BlBVVv8lD+flECXXZxk4NXZq4xg3ONJ9F7pq Uo0Rr7cQ+Y0TmTdpFOuEQwiTPFNsWTr4TW+yjnJrlh2EQiNSPW9LVxJpvrKrEq/97VWa2oA9tfk EHG12W4Z2qimKYZv/82M+TenmeqfKVmZSLoOfWAaWZay+JuAnY17IrIUPknFX/dA84AkykViFnL QEen40glOsl7REIS6NlTM4PQQtdQMuQQRaNI9sn+fPCBCLzx3FA1qiJege+Q X-Google-Smtp-Source: AGHT+IE0LT3egsCf9Urz66Hr4bJMn+zainSmz8nEsKJAFaaZPyaYH4qzNRLADAIJB2bEWLdIN8btRw== X-Received: by 2002:a05:6a21:a43:b0:1ee:ce5b:853d with SMTP id adf61e73a8af0-1f349570abcmr8120592637.39.1741215642914; Wed, 05 Mar 2025 15:00:42 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-aee7dedd22esm10593413a12.63.2025.03.05.15.00.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 15:00:41 -0800 (PST) From: Charlie Jenkins Date: Wed, 05 Mar 2025 15:00:25 -0800 Subject: [PATCH RESEND v4 1/4] riscv: entry: Convert ret_from_fork() to C MIME-Version: 1.0 Message-Id: <20250305-riscv_optimize_entry-v4-1-0d81bb45203f@rivosinc.com> References: <20250305-riscv_optimize_entry-v4-0-0d81bb45203f@rivosinc.com> In-Reply-To: <20250305-riscv_optimize_entry-v4-0-0d81bb45203f@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/qJ69PiNd+oeFsds8zszVLMP1HHUte0ZAm/YvjifVG3J lz6OkWuo5SFQYyLQVZMkYXnWgNz6x39sqOiZRNg5rAygQxh4OIUgIlc/cfI8Fb52bE/3fqqn9pY j5QxTM783rF7xm3Bx3y1eQkHNeZEHmT4p/R6+499UV/jbyb9ubj4WFiuRHdFRXrlg8+RQUHrrX5 oMAEA 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-20250305_230046_911291_F99717E7 X-CRM114-Status: GOOD ( 11.89 ) 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 Wed Mar 5 23:00:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 14003627 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 C581BC282EC for ; Wed, 5 Mar 2025 23:00:52 +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=4fg/tR3sPz4ClU E8TBXw1GgmJFI2WE0PNmltZm32wmL/DRrlMgL3QcCYANjS8rJbCXU9a5hN3CK8wczTT1PV3oqsADN 1A4f0jLW/529FMz1bC26jT1VmvsdUkMk514VWkQDXi1qPgtMRI9N3kHVxvDW1Al14KE4NaQNmVnUl wiWeCm8/Cdb+AXLvIvuNZ+cfk1G9bsld5HOF5kLeIXRgQjmmugEufyAb6EW/3DLNMQ63ikPk53l2x NP56/XnvtlB9oL0f34UDJY/UiEeoFN50BgyagY9fXMqIAJ+5pOAboavTJ2ARo/Qdvd0y4i7LPUBNr jL+PoXXBaN63etgSyGYw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tpxjL-00000009YPH-2uc7; Wed, 05 Mar 2025 23:00:47 +0000 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tpxjJ-00000009YNm-2qjW for linux-riscv@lists.infradead.org; Wed, 05 Mar 2025 23:00:47 +0000 Received: by mail-pj1-x1036.google.com with SMTP id 98e67ed59e1d1-2fea47bcb51so150620a91.2 for ; Wed, 05 Mar 2025 15:00:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741215645; x=1741820445; 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=u11XG5Gba9/K4dfmvngCBCtZ61HLpJA6Csl7XKn5MNEPgPl5LPXKHd66YNfBmIjL84 ZXvW/xsY9PW6EgLaqgpuk8x5lrBVuYPvQKXE8Gy4ULfy3JqRURwWqntCPG4id+daGqtg PhovFaWwrMXf8AujjAtdulCUY3wGgWJapTiAJF+KmOu/nVn6XMpPic1kkoHbW6ktGnLH 958l16hAacA7Ycv+E4wjioLyHkweN5pqrFrswR9kOTwrbXRdnX8elmZkXUciNdlVaUaQ tOlaT7PlirGNHWMsSyUCRwEjMHPSoHp7h98e+zsdzIfgRqvAA4i/k3B5D9oi/zBCH2bW C6Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741215645; x=1741820445; 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=MhKXBEz46X2xX1fgD8VIxxYYczch9guJlSxpc4pUtTBa3peqk6QxFJrD4R2H37QZKa h2zo8LctUNdLLl2IxsnbOLtxFnj8Z9NfpzbUIEOk40g/Pcy3gcvnhoZFLgPjXnl2UR86 qcmIBwd4tPVXbgvVMRvbuIY7yA+KOOOU2q06IuRqclHD9xUFtJnpa5C9DYpFkq0IJ6CV 4/7/cfiI4ybmg+VpnXwDtyryb1anLeY7ufEmpLiUHAj6xiUJmiKdLyXke+EmFqkqhlqX i/f6fWIfeQ6KsXSvBgIR8LpQx13uj+dCeOS1RB0SZIJN7/isZbmsAU/p8tw3hD4tdhWs 0Vow== X-Gm-Message-State: AOJu0YzSZ/kmS+kDGnC7pPNvbgBUyGo8PV5xXbSjejhN8rJ3NbnNRDFg eZCsnMG7NkamzNlf2guXkKJH145R3ttFYfVTIGVV3kcI/YUQrV9u1LwSqE2Gdqo= X-Gm-Gg: ASbGncujeonnkdqFpCDOBT95SplU7WSqJnnbXWwSbBNhaUrVlXSX1WWiPCDAL1iKdHd FMejf9ZK/XdPDU/25XTCww7V7uU33j3aqptaDTl29obLKknktTRUAt6ZJTA/AcqmshFpOHtsSWA zOELVca9hGsRB4MvS7LOzght2rOeH6sTqRWYzh8CDj6ohAuciVOWO9pdgqW6csy3Ip9rWNBrTxj gC2+M2hVZDWFaLA4VpbZcxESrYQ7NItjeJLBGQJAY3ZAtQGgq8KwcDZehPK+z8KRX3wGtKYiahP mQbEPFTI4Nteer4/s5HB99goIUAPwZP6UZXj9GP8vpH9VcCZzanngtnHFrpR X-Google-Smtp-Source: AGHT+IHvW5MI/rViqhq1DoMiw7xqnu+EXrlGQ4nTLYN2RziECr6n5eoBvZiwNc4aRRHQuXNm88Ho1Q== X-Received: by 2002:a05:6a21:328c:b0:1ee:dcd3:80e6 with SMTP id adf61e73a8af0-1f3493303c1mr9715603637.0.1741215644639; Wed, 05 Mar 2025 15:00:44 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-aee7dedd22esm10593413a12.63.2025.03.05.15.00.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 15:00:43 -0800 (PST) From: Charlie Jenkins Date: Wed, 05 Mar 2025 15:00:26 -0800 Subject: [PATCH RESEND v4 2/4] riscv: entry: Split ret_from_fork() into user and kernel MIME-Version: 1.0 Message-Id: <20250305-riscv_optimize_entry-v4-2-0d81bb45203f@rivosinc.com> References: <20250305-riscv_optimize_entry-v4-0-0d81bb45203f@rivosinc.com> In-Reply-To: <20250305-riscv_optimize_entry-v4-0-0d81bb45203f@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/qJ69PKgi8V7xPjXmGYb6hQrvgjfnd2xYXS799eR28NP FG5XmdPRykLgxgXg6yYIgvPtQbm1jv6ZUdFyybAzGFlAhnCwMUpABNJms3I8Iq1Tv7tm/bAprj2 6SaO39+sCbGcdkWd61+iQCeL86I0ZkaGpSUCEburIm5d+bT9h2hB1nc2rQXXr4qmanTdnGM8MU+ OFQA= 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-20250305_150045_724594_447E206E X-CRM114-Status: GOOD ( 13.17 ) 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 Wed Mar 5 23:00:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 14003628 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 6727BC28B22 for ; Wed, 5 Mar 2025 23:00:55 +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=3+nI1lytNKLozg rM8ei5SPwPPjo939YNU2Hb3TqFPXpFGkshUv/6Su5EggGgxjXOwweCQ1rm9fC7Jh9hKCA5qGl5TSL inWflkeMbQ/nl6sYMdWYG+5oOconpW1tZtWcURfCmYHNXQj8WUGN8D2pIoq9ZClQG0evk+zRIyv6J 1NFuwOnUTq2+qsWZ6hpR9sI17KF1YBtLzB6vXm+hH/LtaW56TMsFLpi6wV4VLIEMTCybfbHxyRrIf ROSTGbTHvkdpAJkTE8AiJiXTyXbtzZE5gU5rh/P5g0hsTiLhH+rJRRCanwxfnKAELRVWVLpie78UL FMTh0+JDMegBWmCC0cRQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tpxjP-00000009YRu-1a0c; Wed, 05 Mar 2025 23:00:51 +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 1tpxjL-00000009YOz-31Gv for linux-riscv@lists.infradead.org; Wed, 05 Mar 2025 23:00:49 +0000 Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-2feb9076cdcso182885a91.0 for ; Wed, 05 Mar 2025 15:00:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741215647; x=1741820447; 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=E5+a70lQCIW2jZs91kR0C2EJ+V0leYJ5xDspMhm4duhA233b/p+8KRYcYkU2Gpa6AC i0CPDz1R7Puz9GdJSRDbEruOtWNWo0SNg4rzTBZ9ZiWr78Ja0PO+0rtDNhNYv3bmwlNy METh+6NuYTfE5VcyXGoFmOegUK86om4PMsAzhbwxhPl7d2vvsyQHt5rT8GAaJt1QHFxC ts46aUBzy/3oxwVS5Kv9oJw07BImI5Hw5Zx7vhA6MlN0VNpKWHP9g2plDBSoob5HE57s 7MRFUAibjUIFUOERo7ZUfsENiO7M6MP6YCoyhQyN+R6s6d6A36ZgbQLRva6J9ma6aKbz TGlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741215647; x=1741820447; 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=nUTzMua/nQdB7RvFemOdZTvTtaNT3d8e0qP9eeB845JQj51THJzOlhQaP9dMKc734M n2SATwl2XKxuyNbDTvfU1Ky57MwKtqiMd/U2BtOsiGi7KUzutEMKsZTUl0VfaNTQxn3p sr609rA7WCIs7M3kTWt9a29jDMM5EBgmEtm2xO4OOin/HzNM8qb7wga5mxHwKlRQ7tkE 6rXyqgaITPFfN8FkK1EQhkumkJ0vDByjQ6d4L9PpIvdsjX6e6gwFw21m0uvKLK/wFxsJ Hsu/Tua9qpZM+w12Gah7wdWq62RVdPHgCUEKHpmj699ggCRDCqBaYhp1uLphEXLdERoC QRDQ== X-Gm-Message-State: AOJu0Yws9TROOryV4aTsleO+ts8VC17gPxUISHbOjUcIWC0lGMmgb/Li fi1RZUzn4AqQdVgtgG7bXqhk5XBQ96jLOk5gzBmUpJiKK5xYxn4SGRK8eV+HzVA= X-Gm-Gg: ASbGncv4cfW2Jx74Zt5XkV8xUijWv5dqvW2NEVL0thE3tPS16DPD8omG4Z2ngawzUVR OveTNWZG+y4vKqHjTu6AJKEnBTlBFGT6fuwyCZbryGED3+ll0/hQ6Jzem8UNl49+T6GH+qJI/aC EiTYL56hW40WHjsxyjFVym+8tWL6bI/la28t9/1YOwmY68Mv63VYPvzxoNdbvXBt3zgTylXmoi8 hx3QAgcemhx9FU2gje6RQI8bFf9oImcw+iCWuVgzA4wYj+7iSXM6fQD7Kvr3FzCiNh/xsvwqNtT jWpzYppRgi/FBERNdmoPnPdEgTXg73QY8Ug5hFj4XXKaHk9Ama+Pj9PjlW8n X-Google-Smtp-Source: AGHT+IFUZM1PszfzAWoVVShusmLCiU/XuuDYOST/feYMAaw+rilPbChpa9JEeP9Mv/q3NY/4Zidi4A== X-Received: by 2002:a05:6a20:3943:b0:1f3:44de:619a with SMTP id adf61e73a8af0-1f349578ac5mr8989026637.38.1741215646383; Wed, 05 Mar 2025 15:00:46 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-aee7dedd22esm10593413a12.63.2025.03.05.15.00.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 15:00:45 -0800 (PST) From: Charlie Jenkins Date: Wed, 05 Mar 2025 15:00:27 -0800 Subject: [PATCH RESEND v4 3/4] LoongArch: entry: Migrate ret_from_fork() to C MIME-Version: 1.0 Message-Id: <20250305-riscv_optimize_entry-v4-3-0d81bb45203f@rivosinc.com> References: <20250305-riscv_optimize_entry-v4-0-0d81bb45203f@rivosinc.com> In-Reply-To: <20250305-riscv_optimize_entry-v4-0-0d81bb45203f@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/qJ69OPR8VFSwqH/4n0qgkyLi8SFnQ42Jfdc2SHSFLjz MsHOPk6SlkYxLgYZMUUWXiuNTC33tEvOypaNgFmDisTyBAGLk4BmMjc0wz/83n5w+0nHOfqudOq JzDnWcAb3oh9LXz3atJrmG/N6LBTZvineiBVcx/PRKVNumtfMlim7Kl5tPpZe8/V6Yqv+aaoXbN lBAA= 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-20250305_150047_802425_979B7BB8 X-CRM114-Status: GOOD ( 10.85 ) 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 Wed Mar 5 23:00:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 14003629 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 841B3C282EC for ; Wed, 5 Mar 2025 23:00:56 +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=QtlkEMzySJwDjKbqmAKM7/+o9BfneowYZX1+ayrwo0c=; b=gbigYLHglMhM/2 Qr+GnNgd1kpHAeuwqihUwSKyNbeY/xUBj4OIn1gezP+VUQytVa21zyrDkdeTERw1CArd60+uzPe4G 4pwUPN+Xvov8EqgAX3s3m+ryi06SBIoxfVLZb8Kn6bkCUvtTepGpnfog3N90bY/ogwVT/WYT6dGIQ eKiZyzIR0O5wa8Ehf8xdlfU+FpWs6efMLh1KXiUVsEaENClqfoilgoaXsAx2Mo+bv07v9XbCUa81i k3MXknYfcQNNkNmirrqH7+Gr+Pee9eAZ1W1JCIGrnEQGm2EJ/4viFBrfGxurFpBwVcE/atKqsFHQS 5ptTFrTxfSkpY5aq95LQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tpxjQ-00000009YSo-2KpN; Wed, 05 Mar 2025 23:00:52 +0000 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tpxjN-00000009YQU-06aL for linux-riscv@lists.infradead.org; Wed, 05 Mar 2025 23:00:50 +0000 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-22185cddbffso24814775ad.1 for ; Wed, 05 Mar 2025 15:00:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741215648; x=1741820448; 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=p30t3bidsL8DH7wJ55Ht0+lyyt5ZTgdtBsNdg8zXD0s=; b=wN7O7vcI02KiSrYYyR2Od/WEXcsIAMukeqiBQy5t+gdEX/Dj423O+5CCoAM0gvc6oq QLfL8DDXYKxZyJGcb87OUJHq9nGqgcM0D1FkpgRNBL3bN42qiHIxkMjNI/Y61e2l+Eac 92WOU1ZTHIjDaqFfScCYOGgs9MardrrDvKbjTWpR/tREHRAnDYjnDE6GyrmEQg8J5zSU cHIdgWDxa9BEniFh8Xb4iFDC0WgAk8OygBYj4M/S1U1ckCF0ISJ06aJkpeumtUMUbRV8 xa7vP6owHb+jmVC5gkYQPvNU5bWFn7mz5pMO6c9RCFYmv1DMMgoaAplxbVSDHK4Fz/8c lNsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741215648; x=1741820448; 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=p30t3bidsL8DH7wJ55Ht0+lyyt5ZTgdtBsNdg8zXD0s=; b=R9EHgi4dojM+U28RKUK64wsS5rqetKLYsI5ncHqaexxCyXibwJceZ4Fm6+2l4uABDk W9pjT6/f3qCLdAAQzjWQznQ+YLOxDHktV2SQ8QhVJi2RjbNG4EO84EJyHnIqZ8PvQMqc dIxDAcTdjLH2mPs0+SNQvauwtFGmFnBeJ/tfz+kFSM54eXM4jcKpGbhZHXz+fmJoGgCH qAbLO1o03R/Cr8HZToMMX169PLxvlfyrT4KP1B+3+Vv0dBKCKFKUparfpcF0WNZiyAtE 4wBlKAkP1CJSZp3MM644lKlpxWDu+/o+NlBvuNVtn1/whw0mHnAPc9xX9pQyjnfuTpG0 EiWw== X-Gm-Message-State: AOJu0YyTTP+vy6upeBtSDBRf1atnVPEHr1HOLmBJIwyi440sGq1UGCkV BermbQcjqadauOKCHbo1TvkiEdIX+6oBR7fK89pQt2879csEAbI3DCYWO7JD7BE= X-Gm-Gg: ASbGncvL/1RRplneELJRWRY4zQPfmrR9VCkMb0oLDRiXRMndil7dDMV3V3oR33U1X2E 3QIOIR0F0rWnwCaze5k3YX44ToS6L4tla9Ko4Ut2bnn93SFJyO/2/F0rN8j+f/lRZP8AlsFaPzL /fflXdfETgmYnZPQU02qmnBLPqmaVH6CYbm7IzHFauggDUbXWI7wEsGREF7mgw9WHhUDSAiW6kc zSWmRsqyfe6O02UQz6DuyFbaGx9xb1LIvOYf5qJwRuvT24/S7XVUTDTDjoXKdSJYHTkL1Jufcz5 QGhKKq5SqlxQn8rLybUZAJFmrHVALsHk5fR3H0oCQR7YBbfMh4RlJFcwZ/ZW X-Google-Smtp-Source: AGHT+IHIXuq48FCG34gQSDWE/fOeG6ktun6hvvxw8iNV8AUnzyOAu2vvj3lTw8zV66HwuuHt9MjAlA== X-Received: by 2002:a05:6a21:78a8:b0:1f3:3547:f21b with SMTP id adf61e73a8af0-1f359b16c26mr1515464637.5.1741215648040; Wed, 05 Mar 2025 15:00:48 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-aee7dedd22esm10593413a12.63.2025.03.05.15.00.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 15:00:47 -0800 (PST) From: Charlie Jenkins Date: Wed, 05 Mar 2025 15:00:28 -0800 Subject: [PATCH RESEND v4 4/4] entry: Inline syscall_exit_to_user_mode() MIME-Version: 1.0 Message-Id: <20250305-riscv_optimize_entry-v4-4-0d81bb45203f@rivosinc.com> References: <20250305-riscv_optimize_entry-v4-0-0d81bb45203f@rivosinc.com> In-Reply-To: <20250305-riscv_optimize_entry-v4-0-0d81bb45203f@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=5141; i=charlie@rivosinc.com; h=from:subject:message-id; bh=j7ZO4FXV1Hf14yiJt7JLsFHCp0FLrXbd7xunBuFQ9j8=; b=owGbwMvMwCXWx5hUnlvL8Y3xtFoSQ/qJ69OP3ch+/m7/lUad2VUJDPL51ybv0VH/nvKC5SkLh xw7y9trHaUsDGJcDLJiiiw81xqYW+/olx0VLZsAM4eVCWQIAxenAEzEjonhv4vXQjVhvjLJW47v WI/u84ud+Gj1tLXqLWe8m6Py1dcqMDAyrDtzKpZ5ai7br0NPPZ1Ktt3U837x7/vCZP99nPvecaj 08AIA 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-20250305_150049_065184_45CD47D3 X-CRM114-Status: GOOD ( 14.65 ) 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..f94f3fdf15fc0091223cc9f7b823970302e67312 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() != 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); + 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);