From nobody Sun Feb 8 23:33:05 2026 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F2175202F80 for ; Wed, 5 Mar 2025 23:00:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741215645; cv=none; b=kF14eTaywzzPsdJQ2FwXehFCnxaCw269NhqHqIyANjUqXNM1cyKA42/LYRUvbf7X8dOo/rJ0StAvIvDXcf2cU4IOFf8PK8Iru81QGYFkgDWvHI4ghQgjtjF4BZJgjX9IcOgsWrgxEfZ9X2/ByHtZM1/ecMSRlvZ8DJ5A4GCwLzw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741215645; c=relaxed/simple; bh=e+QmdYfzdsHe2i47iJnp8obSLIn3fW5B1Uv/wF/582w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QJLHYNW8Xj+G4/Bdm2XBVnVQ4V70qVNR/l8+3pGWg6G4dGd9yi/8z5ud6KF10XZSYxrUp0aySMGDH7thS8cP6KrkhwyJHwiX1qvQmszJCiFKR78FWazqewLWwHq4G2m0c3q7bUSj0eAQ88tpDsnEM5hBLdyLZq64yrQAo0KT1Mw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=JnL3oiR1; arc=none smtp.client-ip=209.85.216.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="JnL3oiR1" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-2f9d3d0f55dso110826a91.1 for ; Wed, 05 Mar 2025 15:00:43 -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=vger.kernel.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=JnL3oiR13RxteGPWPiJhzhm2OGI/mBaWw2Gza0ZcbquOIvlkyS7Z6Do7sFt3VQXWAi ENAabJdj1bLo/YJkJBNZy8YMFTnZvGje7+ykgLc0iCRH8bYsH7v6KdKCM75q/95Opptr uYxU1S/XkBq0v6i4h1mMY2HFV18TB4WePdJnxXXKz9pnBHfITH6NYmKZrkyJ8fJ/+egk t6nkUD4RzBDOBYgID2qp7TyBqFNChkiTWQ6mdYy4zCjwYx2oEUITJvjHIS1LCf+RO5rJ RG2kbThpO0gwRIhtxtztxmQLRr72Ld7n+ruNF7UdBlXsqYRDiyKMQ52pvUAcQtg72SWe 2sjQ== 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=d++U/dn7SVCN7YeszKVmhMgdRWa830CuogCdPHiv/96cITcWQ9p9vSGOMnc8Ryf4xZ 7cOZkgIRLhdggL89pVjzU26mauIYxyZ5148N5n2I0kQKnKBo19T0M/Wi4EproqEcLEtT tMvd5t++9KWzEl8VBmAA7wlpCFRtdY0+H3x+fFZO6E4C5jYXWNW8mf9nkicqdeN/JZgr Wyjp2DgA674YyMD61omKOKcQk3+d+jjneTvUgWGdwe5xkeEzGk3g1BGOyQ86R2F+Dlxo weNWT8fCdhs9URy3QD9+9PH7qxdTtvW5hOCX73R9RMC059JPBgxI1lzyZVjG77n3HnAq LPJA== X-Forwarded-Encrypted: i=1; AJvYcCXTV0U8A70sJzrWRy8yYDpDLzAi+X+Uxut2VEmaRso/2/R75jckjF6kB0zDQBY7KTxELTuXsTJMupUVaXQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxNCRyTk50+I3rWsSfk8L4Ez1AhJ1nyAuaVDvRx6rE7Bgn2GeV4 byWzygXGcFG9Q6ovyDDJJ10n4TEOdJx0XhVrvsLGRASuANajdKcAXFxKeTBAhLc= X-Gm-Gg: ASbGncvRV0wL49palsN+wKeLm9znIaEIMDUhBXhNnnq9WfKJTMewCmj1xyNd4zbFKM4 HlR0gd5h18kFPLdJ0PzBr2ZhLwP0/NJELk3KextZQX+lySlmvxButA4JONvl0qYD7IuKGLkN2gr 0jC1FU2MF0G4UYW+8rFJVASaLWH29X8sHt7NMuESGodpuccl/PMt8Ch4upnL49MAqibw2gnjFTW /Qykathg51tptngbpptEuTNOfsgZuktktXXnB7uCIHbiYu2RMTlbWcVJpU/Ni0fHphYbDT8I5XW Yut6hb/TnUG5yDZ/qYGgnlatfoXVv04Os12Bn6lKg8wr20xzONfzccYuCwZZ 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 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 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/a= sm/asm-prototypes.h index cd627ec289f163a630b73dd03dd52a6b28692997..733ff609778797001006c33bba9= e3cc5b1f15387 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); =20 +asmlinkage void ret_from_fork(void *fn_arg, int (*fn)(void *), struct pt_r= egs *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..b2dc5e7c7b3a843fa4aa02eba2a= 911eb3ce31d1f 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 =20 -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) =20 #ifdef CONFIG_IRQ_STACKS /* diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index 58b6482c2bf662bf5224ca50c8e21a68760a6b41..0d07e6d8f6b57beba438dbba5e8= c74a014582bee 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -17,7 +17,9 @@ #include #include #include +#include =20 +#include #include #include #include @@ -36,7 +38,7 @@ unsigned long __stack_chk_guard __read_mostly; EXPORT_SYMBOL(__stack_chk_guard); #endif =20 -extern asmlinkage void ret_from_fork(void); +extern asmlinkage void ret_from_fork_asm(void); =20 void noinstr arch_cpu_idle(void) { @@ -206,6 +208,14 @@ int arch_dup_task_struct(struct task_struct *dst, stru= ct task_struct *src) return 0; } =20 +asmlinkage void ret_from_fork(void *fn_arg, int (*fn)(void *), struct pt_r= egs *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 *arg= s) { unsigned long clone_flags =3D args->flags; @@ -242,7 +252,7 @@ int copy_thread(struct task_struct *p, const struct ker= nel_clone_args *args) p->thread.riscv_v_flags =3D 0; if (has_vector()) riscv_v_thread_alloc(p); - p->thread.ra =3D (unsigned long)ret_from_fork; + p->thread.ra =3D (unsigned long)ret_from_fork_asm; p->thread.sp =3D (unsigned long)childregs; /* kernel sp */ return 0; } --=20 2.43.0 From nobody Sun Feb 8 23:33:05 2026 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 100BC2066C4 for ; Wed, 5 Mar 2025 23:00:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741215647; cv=none; b=a9Wg2s1lot9idOSF0dmXMI08AnlTz/jMdTKmnUquSPZkSETtjxtuZLCGy/yqlW+6PrHT7WCAJ2m9IZJoeK84BGZeyPO88Nk95UP9tubiQRegYIwXoYszhtsSljCguru6yq7bngmSrNDBtLJuOXklYSgONI6IDOgzVmXkxt2jnyE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741215647; c=relaxed/simple; bh=t9WBogxb56lApIirNVzIj0lHOk+/6g6AFgtrehj97DE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QReXAHM0j2mvdab+cIBx8vjzRlJ2DCsLhIgpm/KTCrEdq2RM6SXjAWnYJBQUeI/IH8i/hN1G/poPelcHgac6yHJa4IZIxGYnwxnKX/97/8S/g1M5plkkeZ3WBbvpurnwg5zYpT24maBJmYdAyDqo3X6+EOdJovS8NxFRTIea0bU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=V4pB/nlM; arc=none smtp.client-ip=209.85.216.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="V4pB/nlM" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-2feb9076cdcso182840a91.0 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=vger.kernel.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=V4pB/nlMXDuXL9/BFfUPB78Oou0InK9LaFA0hc5RN0hEDGqihQcVyCVKSwsM85tbCx pmFU5B0VDsKmMq+sDIPHzbLgLO//+HSdPpkJZ0b8ntsZDXMpM7ZzHOxvebvf9iq0ulNq 6pvK8NeB0ouEVur1ybOAIC0vCYQn2AB1plnJH9Gsk0kdY2qQ79ZEAmwigCTm7fkftTG/ L3G5BvMWWTJAh8lemgoL3X1Og8pj4CdJuJ3NhxBr5TfBn/FqXKFEZgyt6nJrv6UESAFR bs5aa9ibtVEdnhwc7uf/Bp1Ki8nuIHT68ffyUg4uxTwhotfs8erCql7q+dPLWk8gJsLe GCpw== 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=Xfzj/EN5QXXMQz27Kmz11JSsqyvdlXQRBu+WTO23k067l/sBbTNUBLaFMdOr5JH7W3 LNBSZ4kxRgM4BUTvhZWOABaI72fahKE0QjaJPfudALUPGip2Ff6jMQLWSpYwTEBqokxv Y8B7xt7RRhPVm0D9oXEWnLjjnYczDZ4T+IsLHZAPFaS6PmOPHN1GN4WaEOXUw5jQBMs2 QZ7uDADqNT+rBBwWcWEDj66jljRzqyhjhYTf34SF4GopK/Y3j8tw97jpQUmf7TS3a8ew /jotRyY6FDFAEzB5ZsI2xfLC7hrp8Sjm4AotAzamhJ0MsItAfGpl4tv0eu/K9A1tn907 HPyg== X-Forwarded-Encrypted: i=1; AJvYcCWw77SzX2Ae9tsoqyQeMYPnSIE4fbHP3YFf48mNLyayKjmwwITzn7lmABbNeoSMteNoITM+vjqj1s8+gjM=@vger.kernel.org X-Gm-Message-State: AOJu0YyZoFk6m4vqRVTpCmncHJl0cNlqRnBGZ6Ndb01bJsNCm3Zm/52S i/nTcm9FaBeyp3F+nCRl7mCVirT66lc0DE6DxsiKX5WX45SQe1dOf0sIWz+zDPI= X-Gm-Gg: ASbGncsH1TBMyCuYRojpXXmzogVGhFnVGU9b4OCELXLTD0nMyogP2v+hxRUFOxfvO0/ S1euZKlZADHVDUMzC4fK/Ql9Jdaj61/KmdLVFk8N4fK3hCD6YtB41Bh/0HInPN1qqR6MLprx8o1 2wnQuXZRaLZhZVGGS6+/xj+7BxsP1r2YUF1e9FB5kpTOc8URP04Tgb3GeGhUFNFTQnBMjG75CJ1 QdMfxla7gWQ0x5Jw2pRzsjzxJKj6Dh7AgbHFhTiqgEKnvhEVfVwfd0dM8ReDlFwKcuoE75rRKxn 9i20GovipiqjfzaI0po+UbLw7RynqEMlbX68mWQQYh6TIARUnCJgxX0wEF8c 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 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 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/a= sm/asm-prototypes.h index 733ff609778797001006c33bba9e3cc5b1f15387..bfc8ea5f9319b19449ec59493b4= 5b926df888832 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); =20 -asmlinkage void ret_from_fork(void *fn_arg, int (*fn)(void *), struct pt_r= egs *regs); +asmlinkage void ret_from_fork_kernel(void *fn_arg, int (*fn)(void *), stru= ct 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..0fb338000c6dc0358742cd03497= fa54b9e9d1aec 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 =20 -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) =20 #ifdef CONFIG_IRQ_STACKS /* diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index 0d07e6d8f6b57beba438dbba5e8c74a014582bee..5f15236cb526bd9fe61636ed372= b4b76c94df946 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 =20 -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); =20 void noinstr arch_cpu_idle(void) { @@ -208,14 +209,18 @@ int arch_dup_task_struct(struct task_struct *dst, str= uct task_struct *src) return 0; } =20 -asmlinkage void ret_from_fork(void *fn_arg, int (*fn)(void *), struct pt_r= egs *regs) +asmlinkage void ret_from_fork_kernel(void *fn_arg, int (*fn)(void *), stru= ct pt_regs *regs) { - if (unlikely(fn)) - fn(fn_arg); + fn(fn_arg); =20 syscall_exit_to_user_mode(regs); } =20 +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 *arg= s) { unsigned long clone_flags =3D args->flags; @@ -238,6 +243,7 @@ int copy_thread(struct task_struct *p, const struct ker= nel_clone_args *args) =20 p->thread.s[0] =3D (unsigned long)args->fn; p->thread.s[1] =3D (unsigned long)args->fn_arg; + p->thread.ra =3D (unsigned long)ret_from_fork_kernel_asm; } else { *childregs =3D *(current_pt_regs()); /* Turn off status.VS */ @@ -247,12 +253,11 @@ int copy_thread(struct task_struct *p, const struct k= ernel_clone_args *args) if (clone_flags & CLONE_SETTLS) childregs->tp =3D tls; childregs->a0 =3D 0; /* Return value of fork() */ - p->thread.s[0] =3D 0; + p->thread.ra =3D (unsigned long)ret_from_fork_user_asm; } p->thread.riscv_v_flags =3D 0; if (has_vector()) riscv_v_thread_alloc(p); - p->thread.ra =3D (unsigned long)ret_from_fork_asm; p->thread.sp =3D (unsigned long)childregs; /* kernel sp */ return 0; } --=20 2.43.0 From nobody Sun Feb 8 23:33:05 2026 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 99087207A14 for ; Wed, 5 Mar 2025 23:00:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741215649; cv=none; b=UcAvzpqyeIVR1cf1BnqsuSy5SLZhtFx1F6YEtWawlFqOjahcstZB32Hd7kgGbE2pReB2wS7DFOiB9TlECHL+OBfCfohkDbOnvnpc9AIIwehjuNN6RG941tGtnkOasodJtnFVtPe+2NIoskuJ2l/yd2CSecTvdPgIZZYiJQfCbNI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741215649; c=relaxed/simple; bh=ji6jPR39ZKDby+guv8CCAiBLyKbpGz9Kynms9BH9fJU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tEyblRLKANe8EUtATEi9Ls3dFXoiPm6NPFLyVI55i1uVPg9wHlH939mcPcPe5PVVNPpZXKJJRjPjjBNiiXHZCoVm+0zSWwmUHte4fDkOju07pMh1RXcWLRRO8c2+ZMPq2UjRGSYMl4e8EcIG35s3vN4zd+u1zp/L4N2PMtoe638= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=Ce7wpDrE; arc=none smtp.client-ip=209.85.216.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="Ce7wpDrE" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-2fa8ada6662so163911a91.1 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=vger.kernel.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=Ce7wpDrEPzuf5xb1OsDtw1lg03QQwwc5kVx73dS43QA0pJLfwUyCSuVroJ39GmOjoL JIjVnsKPBddLTjuZOJMAxqcwSg5DsuW/qLZOlxtyd6VadbkM6cwEySfDD84/iLRYYqlo ImdCRcivJlX42tPMN45+r/PC31VSJpDQINDW9EqFgsDa8QLu63FqxW6VygSdZhRoeKPF X7JZXh7yXDyOnlgFUboXAhKbw694M4f1OXFpBJeZ3PEnUkWfplV+OfJSTqQL077oBWIM RZC7TOJBH9QOrt6zDST4PZLjE72dGrKVXPhiLM7yX5Dd06SoZg/AYPhkdb4OeFlcdmUQ XUWg== 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=FA/pYXWMhOU8e4xQ3DZCk2S5eG7SGITFP7soBejf2Wkext+gHRwNSd/3KiCPrA2NF2 VwxM6Th0CMt3AxCKi/VYg8ErFeKr5IWtn8rby3yHPIqSiX7A5tRBwgvTHhZfdei/N9ih 06y3yD2Vq48ylCg06qAqQohqcYLFRsw6O4M50LPBoa2BKcqmshRs56O9YU5MCmgcZ0P3 D1iuH9qTgU/RMEWZVt13nQzmM8SG+TTf3/TfZ9AdtmkNg6WQ3SXhbGspSbvDF6Vk8tiq K3yFiEOeh97nckduDFa1yP1Al6T32n0/LAv1ldS5I3Tzff7v5Uz8DERlldWRQUaVAAk7 eV3Q== X-Forwarded-Encrypted: i=1; AJvYcCV0jxS1k0dHbZW8cBs3q3dL2Z49Tb8uv3vzpeOWN3PuivebPfSjuwicI9rfmfYtH10T3jqxjzb4v3Avdfg=@vger.kernel.org X-Gm-Message-State: AOJu0Yyh6/AQOqeBzflofsnLuVfVGM7CtmhIPVgQwkv4wKWhPtpUoZH6 CUF7PgAeE0WEi2k6ESYftukc2Dwl20blJEzuo9BdwpFw2Mv5QtoZ4/tWVvjRTAU= X-Gm-Gg: ASbGnctIr7pf9m3JR7cohxQKqxZKzfI4GAE80H0Puvna279w4ByYGzO5VMDGC8RnWsk rNPkyimzBihluMBtIIaLUxtWziyehq/uxP6akruuLwI1/WYNUW4lM6Ki2bvVGbN+LiPpjmYRhri lQEK8ItUWjUhziQDfmusP8FD29ixqA8H94+gBsOj8LDdTGgRKkYoO/xS/NsdiYVxo08reP4lTN2 1RbdcrFe2rzjSR/XA/cmxUY41QmdFsfQqQdkQkhXtKNB6f3TgLvqClbzHU+34JplPYu/3jdiKD2 ragCteeX+JmHjNBuugWZYYWNOy2paD/EBmTNFJeHEvCX9a5EE8PbVy6Ye/Vo 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 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 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/i= nclude/asm/asm-prototypes.h index 51f224bcfc654228ae423e9a066b25b35102a5b9..704066b4f7368be15be960fadbc= d6c2574bbf6c0 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_str= uct *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..2abc29e573810e000f2fef4646d= dca0dbb80eabe 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) =20 -SYM_CODE_START(ret_from_fork) +SYM_CODE_START(ret_from_fork_asm) UNWIND_HINT_REGS - bl schedule_tail # a0 =3D 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) =20 -SYM_CODE_START(ret_from_kernel_thread) +SYM_CODE_START(ret_from_kernel_thread_asm) UNWIND_HINT_REGS - bl schedule_tail # a0 =3D 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/proces= s.c index 6e58f65455c7ca3eae2e88ed852c8655a6701e5c..98bc60d7c550fcc0225e8452f81= a7d6cd7888015 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 =20 +#include #include #include #include @@ -47,6 +49,7 @@ #include #include #include +#include #include #include =20 @@ -63,8 +66,9 @@ EXPORT_SYMBOL(__stack_chk_guard); unsigned long boot_option_idle_override =3D IDLE_NO_OVERRIDE; EXPORT_SYMBOL(boot_option_idle_override); =20 -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); =20 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, stru= ct task_struct *src) return 0; } =20 +asmlinkage void noinstr __no_stack_protector ret_from_fork(struct task_str= uct *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 ker= nel_clone_args *args) p->thread.reg03 =3D childksp; p->thread.reg23 =3D (unsigned long)args->fn; p->thread.reg24 =3D (unsigned long)args->fn_arg; - p->thread.reg01 =3D (unsigned long)ret_from_kernel_thread; - p->thread.sched_ra =3D (unsigned long)ret_from_kernel_thread; + p->thread.reg01 =3D (unsigned long)ret_from_kernel_thread_asm; + p->thread.sched_ra =3D (unsigned long)ret_from_kernel_thread_asm; memset(childregs, 0, sizeof(struct pt_regs)); childregs->csr_euen =3D p->thread.csr_euen; childregs->csr_crmd =3D p->thread.csr_crmd; @@ -182,8 +203,8 @@ int copy_thread(struct task_struct *p, const struct ker= nel_clone_args *args) childregs->regs[3] =3D usp; =20 p->thread.reg03 =3D (unsigned long) childregs; - p->thread.reg01 =3D (unsigned long) ret_from_fork; - p->thread.sched_ra =3D (unsigned long) ret_from_fork; + p->thread.reg01 =3D (unsigned long) ret_from_fork_asm; + p->thread.sched_ra =3D (unsigned long) ret_from_fork_asm; =20 /* * New tasks lose permission to use the fpu. This accelerates context --=20 2.43.0 From nobody Sun Feb 8 23:33:05 2026 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F1AC71FCFF5 for ; Wed, 5 Mar 2025 23:00:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741215650; cv=none; b=Z/c61eQZ3uVCzP/3ShvK1DxhCMQ3T89mv8KdlcDS3lw33xKLHvxIxm7b6OWuQiAZ6LU8T9WIKYDpyeZCEK2Tm+xRO4T2C1QJcDU/HUZN3MNJCVbOocGlBGrJJZ6//lqOzIX+Weydzirc4PAcE/vJpnsSIoCqia2zPNvY9A7FQSE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741215650; c=relaxed/simple; bh=j7ZO4FXV1Hf14yiJt7JLsFHCp0FLrXbd7xunBuFQ9j8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YQ9p9EE0j4051mqombEQpB3YZWg9y5AdVQarciZ6j/mkNZGX9uGsj4OIHLW9p6i+EBmiXe/b/Dq4WIPBXgZfv2ALNMQMsW+sg35TXuXTNfZA3JKgZ8moILLBUceWZLvUSIOJ7doI4CiWoBKPSyzJOl4rzgEA3+zUjVZoOeO+UPE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=MsL/TzQg; arc=none smtp.client-ip=209.85.216.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="MsL/TzQg" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-2ff615a114bso578053a91.0 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=vger.kernel.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=MsL/TzQgcQgfntgUTm8OXFdtO8Y99ejKBrC67e7Papoz4ByUIZ4hfOGAAYqpKLif/Z yAKNZB0JIwzwTBQVG/KJQX+bymsXEEjtbz3+3E1w0MJ3YyULaICbVJVBRh26a8Bf1zPW GdAXML3Q7OTXQon+bKRVpiq5zLOz5Et1zzzR6QY7F2CDzphP9jNFVFf+YGDWFBApBhPu bXjkYFHfksJfL0lPJP9UQ4RB5W3qSIT4HB7Kc7iChhPghOIlQk9Mgcn7p+GY/Lq8gS5P zSR3p3RwhHK2Mo2EHn4N57hHPxjVQyNIQLp7aVQk5UIRl8WxsUEPxctd4+VAZHnAdr5E 3XVw== 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=vAQaYWj6s3Xg7uC7UWD/ytWrD++r0hx28UlZCKa2eiG7WXmhnKc5GZGLqpjMnATDtb 4yAieHXxU7mu7JyOFVu21dUJFn48e5NPCfMygjeTwYTO1GM+oUjwpIPj8Qy6ZVCMXj+M FEKtH0iCoUCqoldpFpIlbpVZQbsCr02OWotS7nUgA2FPRdRpRxMS4By7f5AvXXVQVnXd qm+OiHiDoDapMcEYFxU4xJP8fzLNflBLoSgnFmP9T41RMmNHTVwke4dvQDc9TlmzM5S3 YQsVdHTZ3eKvuON6jcAC1KHbF5mmaXpPRleItrhuRjLkBrdR/caVFs0nwDjmtn0SqUCv iZBw== X-Forwarded-Encrypted: i=1; AJvYcCX1rIz/3EHyu5qMSxpHmyEg/PAWPWvvSFCRAHDD8dW890gUk+ESzSvdj76/E0FJA+rZZaxTDCYrdjmjlRE=@vger.kernel.org X-Gm-Message-State: AOJu0Yx4d/rbv4hTXzWt6jYWh3Vnul4aLDvm00cFZLqQdfWXlZEYYhOg w3BPv4VJDycQ4vkyae7oFdBDHB/nkPS31+Hnx2tANXcNSWqO0796iTzpKdQezGs= X-Gm-Gg: ASbGncvQJ9ZKzhErOHiaJHukBa79QNIPnBBrOlQ7rTRrP5c02YkFuMXnUkPuvhNOfP5 GX8L+hNjsdvqxSSvyknCayE+rVxM9E8iLX4C070N+WuJ8QLOYfbhuVnJwhQ+ywy1I3UnGzVX4Oz Y6gey4HPBVxTXZRt4AMGVIujc/IQA3Dv8nom9i9snK2YOZMrxyk6oeCZVrNQcQ8W9QlALvvSzvF B082BdLHw4ETFWbBzVT+RB9sxrxiHBlIcVEZ11TZHdluriqhTbZ5LK6zL29FnaZQKqej86d5f3U 6YmcvKhsPm2pUsNZ9P4SS6ipN4KRvOEhSjh0DW8wcci47Mui1uSOHoh8+Ha4 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() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 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..f94f3fdf15fc0091223cc9f7b82= 3970302e67312 100644 --- a/include/linux/entry-common.h +++ b/include/linux/entry-common.h @@ -14,6 +14,7 @@ #include =20 #include +#include =20 /* * 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); } =20 +/** + * 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 m= ode * @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 =3D READ_ONCE(current_thread_info()->syscall_work); + unsigned long nr =3D syscall_get_nr(current, regs); + + CT_WARN_ON(ct_state() !=3D 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); +} =20 /** * 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 *re= gs); * 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(); +} =20 /** * 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..f55e421fb196dd5f9d4e34dd85a= e096c774cf879 100644 --- a/kernel/entry/common.c +++ b/kernel/entry/common.c @@ -146,7 +146,7 @@ static inline bool report_single_step(unsigned long wor= k) return work & SYSCALL_WORK_SYSCALL_EXIT_TRAP; } =20 -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; =20 @@ -173,53 +173,6 @@ static void syscall_exit_work(struct pt_regs *regs, un= signed long work) ptrace_report_syscall_exit(regs, step); } =20 -/* - * 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 =3D READ_ONCE(current_thread_info()->syscall_work); - unsigned long nr =3D syscall_get_nr(current, regs); - - CT_WARN_ON(ct_state() !=3D 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_reg= s *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); --=20 2.43.0