From patchwork Thu Jan 23 19:14:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13948571 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 74942C0218C for ; Thu, 23 Jan 2025 19:15:30 +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=/YrUj+u1tbMFoOiYKvOcK/ydWhS0sgaQajVURmuXwsI=; b=qgha2c18zLnsbR TdBooLQ3fa2lorcj9mbStporFgYmRE5wkZz54ZrhPb5NlE4Zmp7RbDHq96UNHWQbG/3KCc7tt8/PA NjsKDsCM6GZjgDPpVmnNSKgO3zhHqJ8qvgGEQxWwfXYCpjiZkzrTY8ykgMHhmMmIAB/DyQkFT2WvF 9mKhJgJp8SgVwvfmW3tzYRImHMtN5VTy8m2YGg0bBu+KLgrl0S63wXAKIgJ1x/XhlWaUjSwHpNXs5 pROyjnzM2KsnBLuJFJL/643fVB4aM5mVceIcgB9Qa4cvtOdN7n/TSVi4HyhtLSmemBuZZVOnNY4tb bCgHNlD6BefoYHkcTBSw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tb2fi-0000000D6d4-0IsT; Thu, 23 Jan 2025 19:15:22 +0000 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tb2ff-0000000D6bU-2Je3 for linux-riscv@lists.infradead.org; Thu, 23 Jan 2025 19:15:21 +0000 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-216401de828so23106525ad.3 for ; Thu, 23 Jan 2025 11:15:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1737659719; x=1738264519; 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=Fn/PejcoPFKdcNV/yWi5+0DAQFM+nDQKenDgBFYN3Mk=; b=rumdgy8DhxGdlOv8H8rgW0n724xtXFBvrectjRDPNOc4BxpCyq9e50q0jhWf9rAAn/ EgC5TNBsI2TiL6+xn8ffEI+3VGCcF1hQ4V5iIspVX8rulHbXAMljP5Zl8ZDolqjwMO9p LrfnGvcn1w+KkN1Lb06rcH+Nxu+Odg5T1+vvumMSwjFh0M1HKns5WB4we42Sw2BuxbqU absRL/tkOE5vo4JaGH6rE/BTAQ8hDIC3X+sSi/UNv8qPKc9MRRuh04zyukmqAekSHEeZ eB6AAL+d1yNF2DL2y3L3rM1CHZONoDS4sHrqYJLdAF+V/PA+k44zbuFenj9l1GTSD2sP UZvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737659719; x=1738264519; 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=Fn/PejcoPFKdcNV/yWi5+0DAQFM+nDQKenDgBFYN3Mk=; b=SvuHIE1wQGb7LkG4ZAyv/wgA/DAOH/KDJzYW9yOS+1aGiL8ixU2SAhlPmwWy4yXaIj Sfu/PI3/ohqLuh1r/7AnCBcSpyrJD5PD0Z1BPGBMi4EiJtv5l++/CbUQd1LHycuklTqk 84XID51deXIT6azbNzFv6lCQtm17Pg7lhf2hgv2yCWLVDr2SfVQ8mZV8SEkjAtLEAaaR FgLpXNbmcJu/t8ZCwBMQgOjhBbsAHZerQM9kGV6t9GDVe0UZ3uO7iVDXLWEUfj0/I8V1 Oke7yJxTOPyKxjZ8FqYBT10IdeuiZC01oOv4fI0cFE+vj4FJnXFPhBZBmgdahcAqnCRB aceA== X-Gm-Message-State: AOJu0YxhMk9IUuyFvIike8l7rvAEBlBkk8+emwSaBZ3rh9dqhkE3yzhU qoUo0MAzpCsfyaL4hlE593w3BE4R7KADXhjVLXFm1lROTJmjlieLXyTmFCKR6po= X-Gm-Gg: ASbGncuINK9v6Fu1FQ1+Q9cBQ/PqN7fj0lQAh3UxO/iPBGScGkG0plJ2r8S27CL9KL1 Hh1StHKvKiemqXab56Q6aprwohrmaTA6BPv2cBFneaberRGavtm+0Lwpf3xIMg2qtqJu2PTzdhk q5WdicWQNgdW7EPrP46RqTEZI/RUlQUZuRKlLO5IBwDxNZAOcwEtaOSOeRKlGhN60VQ1lwji/ts q91vQn2c2vEAJTt+q8kNM3dUbzLgsfNgnRfmVe/bjuYlpUDGNIGERHY8hvcuGwHpcJM8abu6zFt azoVDBWOq3OIdaOAi1Q1 X-Google-Smtp-Source: AGHT+IG2SXcF4PIOFt5auO85FS9zRjRm6NOHqFx7weXaZpffy9LXIlLj0obu51PQsSDcJNxzGgfzHw== X-Received: by 2002:a17:902:d4c2:b0:216:7cbf:951f with SMTP id d9443c01a7336-21c3540c3c2mr446009945ad.21.1737659718665; Thu, 23 Jan 2025 11:15:18 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21da3ea3cb2sm2504645ad.90.2025.01.23.11.15.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2025 11:15:17 -0800 (PST) From: Charlie Jenkins Date: Thu, 23 Jan 2025 11:14:29 -0800 Subject: [PATCH v2 1/4] riscv: entry: Convert ret_from_fork() to C MIME-Version: 1.0 Message-Id: <20250123-riscv_optimize_entry-v2-1-7c259492d508@rivosinc.com> References: <20250123-riscv_optimize_entry-v2-0-7c259492d508@rivosinc.com> In-Reply-To: <20250123-riscv_optimize_entry-v2-0-7c259492d508@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=3438; i=charlie@rivosinc.com; h=from:subject:message-id; bh=rV9JUhm8W3Bx7rnRIzGCq2bwJctlTEtmatZOhNjH0vc=; b=owGbwMvMwCXWx5hUnlvL8Y3xtFoSQ/qkqU4bH1vsaOoXfbtU9PKcyqX8u5nCrfamCxb8XNO84 3F/rd7ujlIWBjEuBlkxRRaeaw3MrXf0y46Klk2AmcPKBDKEgYtTACYyYx7D/7JZL6QSpG+/tn7M tHuvVoGx/oP5C9li10eJRKt/98tX+cbwT0VkvX7C6hZ32+LpFww03t1g7uk5G7C/++3uww6euT+ XcQIA 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-20250123_111519_614596_446F4A53 X-CRM114-Status: GOOD ( 11.86 ) 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 --- 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..9225c322279aa90e737b1d7144db084319cf8103 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 */ + move a1, s0 /* fn_arg */ + 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 Thu Jan 23 19:14:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13948570 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 10952C02182 for ; Thu, 23 Jan 2025 19:15:30 +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=o/wAY+FoBANnarVYkA4nEExBRYla9xJ8ovxLi3BoSJ8=; b=AFsy9XZ54WNyNb YcNRYFXEfRgHH1tj5ygc+62q4AFKuHASgcljkRdcNVUETg6Tqc08fT5t0C3MGS1t0rHKJUTW/1Y3O DdmJYfWZFKgj5P+2bUp7AmV5aKpfJna1tAp5BQElVo/SkdoZm8LWBtsHUMX93051th9vooAAXPOTp V/cI9z3ykmhYl9+iVBG3RtKlRYgKt2TN6kRy7XUdFcAo4CFvau640631JD6jYV5UHKTeqjGyw3ORU wTeT5NkrOIaPn9ylrCCls98Bz7gnKBFJk3tADZSHFTv0Dn6yImgMBSjkVsdKZaAlEXPWJ3YeZMpYD IQZ4aca5jXAMDq2TVStw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tb2fj-0000000D6e4-2gLB; Thu, 23 Jan 2025 19:15:23 +0000 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tb2fh-0000000D6cQ-1OnB for linux-riscv@lists.infradead.org; Thu, 23 Jan 2025 19:15:22 +0000 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-219f8263ae0so24997115ad.0 for ; Thu, 23 Jan 2025 11:15:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1737659720; x=1738264520; 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=gk9EjRkEzIcEMvzIBfoIlltgvi6+ujtlpNud1xWt+ys=; b=jh+gzbGD6PVfQZSQIXJHiohuFzHSuFpqmq5DgZzle068atNw1LayH+VfjgrZe2mIby 4Hq/e8jQf7/48eDG26Oc7rSx1bzE3WmZcyn0rMGVrNiNWEJGkhpZk9mWmedg2eQVa0TT PahhelnKil93RlmUENEWKq9tG29C5h8CNbe2fwXbZlRWzSHmPkm32pQxvk+K4flv2GmR zI3Onn7FToXUL2VDd6ED/+VUzopv+jYNGbbqbh+3mfWztC+LUdv1szwvAGNHucNTdSkr 3ROFT8QnguE9VV+kk3bAC2f/qLdOnZ8cpfLahlUemIoLg+/naoiOtEwKP/Wz5cx42qdR AUIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737659720; x=1738264520; 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=gk9EjRkEzIcEMvzIBfoIlltgvi6+ujtlpNud1xWt+ys=; b=kp0ybXsMOpRUu0zlgia2Lfp895cZ8qZDaCvFl4/kSSAESUB8Rs18dwBWwsw5g5uHTx cfw34NC7OOrMSD6g4iuCORhwFR+xXhEmOkRrjvRLD02nOVM7+DsWifbQXLze2TIpXjuj RFoiBJkLpzKMCGQ4a9DJFykHA7v0dOGcyMdw8lZtIvgYzVjqlULlyINyP17xwpCsxaW2 xfEUwgi3A/ON2f/GBtvP2xTD9WWxvW/jxvwz4X/VWjVHxQHSWm35pbopEncQlwkQrm6j muWjNsCoNTghaiaaffxn9jD4ymDxzWz+wdbO16THfb/p47sFw7dOiXaeH3TM6Cpah5lL Ytlg== X-Gm-Message-State: AOJu0YxKy/GIM3UUR/JeZVRNlG4V0eQvLUkAhdVPIy4+EQyw2sWS7FTq ASf/jK8DgtN1+Tc7Bq8sPIITfVM6K43gzKbaLsLwewA9xEF7Lmr/HnV6L4KkMk1VNHYoc/GJYWD J X-Gm-Gg: ASbGncvaActUSq/0Y2nViR4vFJk0U+nn3wv0va7mfi5HWkt7FI1Kp22W5vZw0oTRzWX xHas7e4Vha5Xz/nR++te4pWri6mZmGG3X97U1PL8Nl4QShGF4mV0PrGGPCGvA0JFJqI5VgkHWHw zvbYFfnoNt6QMpj7vrEocmeWdQHMA30xLYOcRabAP6sfyF/zkrFGvUo5UxeAzQlhRwTSkDcLTae 8Ploy8qwKy0r4RpsQkD9h48xiQ76gUptI4VoVtcaJm6DfTY2ABFVGJfsUa2nnihZh07auVd4O8H EHOzFoRMVx8AWtusIELY X-Google-Smtp-Source: AGHT+IHkfQrPEp8KLYF3AL+Bo2Q59PhtC2Y35HYLcJb5kUhqwNq9FsM6DusLZuZ2u/xwUq4DVWlfUw== X-Received: by 2002:a17:903:186:b0:216:1ad4:d8fd with SMTP id d9443c01a7336-21c352de48cmr341368705ad.8.1737659720435; Thu, 23 Jan 2025 11:15:20 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21da3ea3cb2sm2504645ad.90.2025.01.23.11.15.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2025 11:15:19 -0800 (PST) From: Charlie Jenkins Date: Thu, 23 Jan 2025 11:14:30 -0800 Subject: [PATCH v2 2/4] riscv: entry: Split ret_from_fork() into user and kernel MIME-Version: 1.0 Message-Id: <20250123-riscv_optimize_entry-v2-2-7c259492d508@rivosinc.com> References: <20250123-riscv_optimize_entry-v2-0-7c259492d508@rivosinc.com> In-Reply-To: <20250123-riscv_optimize_entry-v2-0-7c259492d508@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=/8HxBSW4tXtNDNNcwvIlJWKmSet2jd64HJR1EYtmRzg=; b=owGbwMvMwCXWx5hUnlvL8Y3xtFoSQ/qkqU5LlD7M5JuZcPjghNKfuzee+h96SKX52fwpF+7Pv yJwsEJ1ZUcpC4MYF4OsmCILz7UG5tY7+mVHRcsmwMxhZQIZwsDFKQATmfqb4b/LsmLTjNZDcn8n We6aOa8wV19C3dpT+ubLC8IskrtvVrxn+B+d8GZq9h75F88bpdL8j4uE+lp+5OEwuiJ6Vydjiex GA14A 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-20250123_111521_369469_FE108F29 X-CRM114-Status: GOOD ( 12.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 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 9225c322279aa90e737b1d7144db084319cf8103..9386ef7444267f0b9bf8a0550f4e31deaeb85881 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 */ move a1, s0 /* fn_arg */ 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 Thu Jan 23 19:14:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13948572 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 6B2B5C0218B for ; Thu, 23 Jan 2025 19:15:32 +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=XHq+BuNa3GccVeAiiwQ422dZkvZ4rZ2rnunMHYhRB28=; b=2rlHGbb0xY7g3+ iOHhOoGf1k9a98E5pp89nbYcPA6ZubGDZcU7o2cpSuliIcPa4qbXBQukIHiebdA+uSZeguAIwo1Sn aKYhZ64+tsjfyHFarJ7hKwR+81rjsobbugnVzZ7eSzkIagN9G4VE1GTZGMVA08ljFRDFG2KUxCn7V H+vaCMXT1jhVhWMgTmc97BBQwXrOE6ewJeQNvFec2eWYIyzLLlrJ+s1BDTkr9YrjUDldW4xDeH/Ns z/gDyHz3meP9hmFkYFaVU+YzIhHUOnaahDmiCBlyW4SeZuJq1G5ZxXERMOThsKQqZ3gTb1RywX2aK u2xVd1Wy71GCzqNUPPig==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tb2fn-0000000D6gX-1NiL; Thu, 23 Jan 2025 19:15:27 +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 1tb2fi-0000000D6dH-3Y41 for linux-riscv@lists.infradead.org; Thu, 23 Jan 2025 19:15:23 +0000 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-21675fd60feso28806935ad.2 for ; Thu, 23 Jan 2025 11:15:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1737659722; x=1738264522; 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=7sSJeNFuPfWReO9OO5qkQ/VIRfyi9C57dHefTNmMMUo=; b=RLqSNp0n/+wm7YzZ0ZS759D8oDiadgfLGO2RwAQrhyt4cxh6PPToyA21wCIzkVmxMY GqIHLvjk9xQ6n3mjGcHTNB19SHPymkgOiSg79Q/7iWQG/HZxjAGHJWndSQEUYIt5blOU pYMKG2jAh/GZnPCOMcxo0B4UYIIB566I9o1gweIUwVHBjxsOKraKyc2iN/F9k73654SM Ipg/28CFLvjbwdL3Q5l9TTmw7F6qph1Q7qY34RUTIHYL9Rjt3cnKgZZETsH3kRLVlSeY gho3iZrbEZ064NGr/7rkvLPS8az0UmH5cXVFeuL/KFtec0vur041oaZxyiyg7DoFHRzJ UGkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737659722; x=1738264522; 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=7sSJeNFuPfWReO9OO5qkQ/VIRfyi9C57dHefTNmMMUo=; b=KiFLq0Huk9a4o1SilJttiROJavNPmoGYIg3XDqnanu6L6oIQcisOa1oPAm1fYTPxRQ /f8mh+SM7v1t2gOQrYYQVpKz+6hC3xt+Ltxkf75L/QqD6j9cbOqr//wqW/1qTV9DpnA+ X/U/X9ieBQwUtGyXQCWoMYUH13bJ/NLosGCTI3IHmklfRlHsgmZHGswmAbe32+1NdUcZ fgeG427GGONPQx9bjAe+OzrVvw7bY96uLBB9KpMaehWggorp2UTI4TNIU1Ryh0ZGS6NT zQgpvmWIhbNIwPnJQQeMTNvQb/0O1EnqSB9dxbNDn8qkfMMgNo1HR1e2zJPoHwot5Qe1 CKuQ== X-Gm-Message-State: AOJu0YxAjdA2a5BAwR3xtAffIPKduy4mwK526zXEJgFP9JvDqqGOwBBf W9WMoGca7HMny32Z80vX0wkNNvhHxFFWghaPSehxEtvU0yaZ4EqF7yxESnPcXDY= X-Gm-Gg: ASbGncto4w/VrRhDiqche/ooDlNan908fHgtdGWke7WNA8IygNrXeWmWQHLq7/5DGrg otKUNyOXcGMxsf2kxzyKKJ1vj1pO53PZmViajwQBgZ9TUDMWzpY7EiK5KaI23ylNseHZ6rZ2P0o xsPOtaUyMj5HBMYItkZA7WagA+Kkh7V8v2ualePOs8EhIj4sLAPU0bSlfG3Htm4FGopngFwzpUY 0XTvXoHROZfuKSTuHj66wlyM31HqsKo6SHfs/sVeRItW76Qj93OxxwbWh5Btxy0+xZzg6I8IV2p 1ZAYHzOy0oLrNXAKDqqt+D2FaaczvV4= X-Google-Smtp-Source: AGHT+IGwkaQcjsRA0ckQ8hfF7rhnrA97lBFPxRTb5ooMPcRBrFUbh16WviAiYS7cf8KITGLjKjwLug== X-Received: by 2002:a17:902:ec84:b0:215:3661:747e with SMTP id d9443c01a7336-21c353ef81cmr312691415ad.8.1737659722130; Thu, 23 Jan 2025 11:15:22 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21da3ea3cb2sm2504645ad.90.2025.01.23.11.15.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2025 11:15:21 -0800 (PST) From: Charlie Jenkins Date: Thu, 23 Jan 2025 11:14:31 -0800 Subject: [PATCH v2 3/4] loongarch: entry: Migrate ret_from_fork() to C MIME-Version: 1.0 Message-Id: <20250123-riscv_optimize_entry-v2-3-7c259492d508@rivosinc.com> References: <20250123-riscv_optimize_entry-v2-0-7c259492d508@rivosinc.com> In-Reply-To: <20250123-riscv_optimize_entry-v2-0-7c259492d508@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=6370; i=charlie@rivosinc.com; h=from:subject:message-id; bh=sOZDk0mqs9t7JThCawDCQVAf1T6D7VObAlzqPEnCu8U=; b=owGbwMvMwCXWx5hUnlvL8Y3xtFoSQ/qkqU42lptFm4tfHG0Q3FL45mrn9VMsDcqfnhfev3Prn tzX2o/fOkpZGMS4GGTFFFl4rjUwt97RLzsqWjYBZg4rE8gQBi5OAZjIqi5Ghv9sVntVJ8m2P4id v3NlbdrVdMcZBxd6sWzOn7uOw19Rdh0jw6Pru85siL8aUHVBPqzbXHn2bCe2E1Lbq09amBWv2m2 8ggkA 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-20250123_111522_884829_65F35166 X-CRM114-Status: GOOD ( 12.05 ) 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 | 5 +++++ arch/loongarch/include/asm/switch_to.h | 8 +++++++ arch/loongarch/kernel/entry.S | 22 +++++++++---------- arch/loongarch/kernel/process.c | 34 ++++++++++++++++++++++++----- 4 files changed, 51 insertions(+), 18 deletions(-) diff --git a/arch/loongarch/include/asm/asm-prototypes.h b/arch/loongarch/include/asm/asm-prototypes.h index 51f224bcfc654228ae423e9a066b25b35102a5b9..0195d4309fd29f94664d5f34247198c769033b1b 100644 --- a/arch/loongarch/include/asm/asm-prototypes.h +++ b/arch/loongarch/include/asm/asm-prototypes.h @@ -12,3 +12,8 @@ __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_kernel_thread(struct task_struct *prev, + struct pt_regs *regs, + int (*fn)(void *), + void *fn_arg); diff --git a/arch/loongarch/include/asm/switch_to.h b/arch/loongarch/include/asm/switch_to.h index 5b225aff3ba21aa06d0713bc8e73e1b941389630..a1c5576f1fd145670e13038bec6dd390486099ab 100644 --- a/arch/loongarch/include/asm/switch_to.h +++ b/arch/loongarch/include/asm/switch_to.h @@ -26,6 +26,14 @@ extern asmlinkage struct task_struct *__switch_to(struct task_struct *prev, struct task_struct *next, struct thread_info *next_ti, void *sched_ra, void *sched_cfa); +void noinstr __no_stack_protector ret_from_kernel_thread(struct task_struct *prev, + struct pt_regs *regs, + int (*fn)(void *), + void *fn_arg); + +void noinstr __no_stack_protector ret_from_fork(struct task_struct *prev, + struct pt_regs *regs); + /* * For newly created kernel threads switch_to() will return to * ret_from_kernel_thread, newly created user threads to ret_from_fork. 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..16cc949fe43443d70f1d865ce04595c2d8c1615b 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,24 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src) return 0; } +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); +} + +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); +} + /* * Copy architecture-specific thread state */ @@ -165,8 +187,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 +204,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 Thu Jan 23 19:14:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13948573 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 D1F8AC0218D for ; Thu, 23 Jan 2025 19:15:32 +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=umUIImnJzUxqVi gJhB72NJWSXiMtQ4mWMTKdOXMXXy//frWEnTH8MlltYZneSgT7FWEfnDomqiqSDhPw3ZF0BYgcgvc s6gX8KPWL2Yr54Q8R6xd82f9Ucyf23sc2DO0X1Ray6aru05f88eNn+J6kdz8TdWgEH0sU0eub0m79 31a5M4p0JNBPJO5BlalOGF3UX4AsrrQ54PTUp2viL57zT0yk8aRNwp6UT4J79S6clsSGQ326JyojN S+2Lf3cENpTpFJA+jukzsMrFLCnHZa6I+HcWE/kI5XqNVdfwAofXpGJuf4ssX0fSIuYqE0yX3TXbk 4WZsymjI/k+9XWEQOCeA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tb2fn-0000000D6gu-409s; Thu, 23 Jan 2025 19:15:27 +0000 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tb2fk-0000000D6er-2uul for linux-riscv@lists.infradead.org; Thu, 23 Jan 2025 19:15:25 +0000 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-2166022c5caso20996425ad.2 for ; Thu, 23 Jan 2025 11:15:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1737659724; x=1738264524; 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=3cwhrPWHv7aaq721z0Tb0l9Eno3Hmw3yZ8zV6LfxpzGo8MYRfhp9pkowWfwPCxHogU /0V7UatFE4+Ko6Eg+UfsOAw/P6yaXyfdRlbl6s1YEmrZXRKA6RETpVTXy68eBXjymGBX yX1cnPIvZntEeNxtWOyN6pj1cA6llNBs9lhlUEa+6OXylBFYd2evRQUOldpBoBLsYNW1 DI207IvDm7CY6Z+T2ZoddXtkw+VC5it7bKlpbxlMdbYFoOUTqncvbLdLXpDCcFXVoLkw IXs4jFsdNk87aM0rXN59Nzzr6W5XFVmds14iOrjenEk7SHt5Cj3z3szYs0WCkhaMQK2N u+tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737659724; x=1738264524; 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=vjFutLYBhWsZZ8t+nvOrry1+NHwGbH3UeIomP0/PpTgPIn8gzTSHZv8NLiieowyId/ jjo+BaxVAb2mTsobXuyms8nbrqnh9WYYBOjJ18TXeukVehOBNBfQ8BTaec9/YeULN64t JxSqrhYoH5s3JdrmJZ35Jz8HzbzGztZp+ootWCdy+kybD85UF0UXYLkbdhAy4FUcvhAi sloON+20E6vMSU2Eep4EmgAWEiwjkE7nnTg53qTm4AibwODN+spLVeOhQx6tiVu7ZBgW 444fHikTxrYRws4o3Qx6GaEVdDaXNcY1U/uLIhsjGtngz9qFXwK/uWOpNsB5qd3+sX3y 3Mug== X-Gm-Message-State: AOJu0YzRu/hD6mqMkQAWjzidyiMIrZKPbH/ztlSKJ8Nn942pWkDb/rHx PxCthStD18LXJjNvxjLnsaYjp+IRZNtbewt7faRmPmkKfdilQeEqOel6C4Po/DQ= X-Gm-Gg: ASbGncuTJghOL21xM01c7RhkJqnrwqV0kFUsJ/OoBli4Am0KsUOmVvvCzIyAXvpjxbi 5dllR91BkFwfp+ICpe/Hs+wtMe7vrNAzNT9kW1+/jVnvbXPD2Uu0687j0CW7hfTgHtmbxUsxQFN zrfcAZyF5FtfvkNdQ4JNV6OFOUlnFYmwL55gvNDJL7ZpY/DpgtT6/S9NcJqXyrC9dsl19yaH4dm rRzP9/JoREXooKEuvmFmCon8b9fpYFgGQ3N+he99DIzNeILYYRnwFIpkDQoRemQs6HOTLnP1tsh nyxct85/bzoGceMYrNBu X-Google-Smtp-Source: AGHT+IEYNOhlEJXPQBtWi85GhJgHV9Yrk3PSdmPAVSOzqlnq4qLhaCE8KgNu8jpQHMIt2g3t9EdDpA== X-Received: by 2002:a17:902:ce0c:b0:21c:e34:c8c3 with SMTP id d9443c01a7336-21c35540560mr481214975ad.24.1737659723835; Thu, 23 Jan 2025 11:15:23 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21da3ea3cb2sm2504645ad.90.2025.01.23.11.15.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2025 11:15:22 -0800 (PST) From: Charlie Jenkins Date: Thu, 23 Jan 2025 11:14:32 -0800 Subject: [PATCH v2 4/4] entry: Inline syscall_exit_to_user_mode() MIME-Version: 1.0 Message-Id: <20250123-riscv_optimize_entry-v2-4-7c259492d508@rivosinc.com> References: <20250123-riscv_optimize_entry-v2-0-7c259492d508@rivosinc.com> In-Reply-To: <20250123-riscv_optimize_entry-v2-0-7c259492d508@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/qkqU53TuRtTHj3fNe5lfPyE/IEpc/3RlRNFXlhaxe/Q 9wmfbFCRykLgxgXg6yYIgvPtQbm1jv6ZUdFyybAzGFlAhnCwMUpABNZZs/wT7++1v5d9o4WnqBP p6Tbpq2w1IqbmD7lttHvQ9uM3U10tzP8D1grdbP/UmxWhqVs6beLTJv/6C04VHugw9nyjL1s4wE rZgA= 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-20250123_111524_732506_F4F67ED8 X-CRM114-Status: GOOD ( 14.76 ) 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);