From nobody Sat May 9 09:10:16 2026 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 DB7061E7C04 for ; Fri, 24 Jan 2025 22:31:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737757891; cv=none; b=Li+0FUtt0m18zsEQfQ4yB6xi4D22i9RTF2vINSDTdBUA/t/Gy0B8t+FaktWJv5SXw9gkSFmoZQ+4ZcuOngS0Q3xipTWVtvDmq0wku4O312wQf7vkw9wAQGLjBoKehH5oePJLiQ1V6YYun8u6d8M9mbajxFjeM4bjyrJKTNHyVSI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737757891; 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=hrE3gDtk3QkijMEeQGPxa3P99Fq/hQP+eLnddnlOcNuRjUe/HNh9KiNdaIvEDzHIi8rN80IRKq2mS3NGttG1rYzxIQkVawoAXBfQjkcv5Txz7y+mznJR8UnlctSFxrLd9e4Gtcz3emXOYyz2TlFFmgikABq99z7YsETCfgxYnd8= 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=3gMvI2jM; arc=none smtp.client-ip=209.85.214.180 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="3gMvI2jM" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-216281bc30fso62604005ad.0 for ; Fri, 24 Jan 2025 14:31:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1737757888; x=1738362688; darn=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=3gMvI2jMf71Iiai7zoGmnnTHb3coxULZrUWTtOAYTFN2SyGQpiYXQ9cqiLWVN46qDU oCr0kkt9ux5jnVl4q2nqlvkQXa+EbITQAbRf6nt8KfzQx+vpf0LVeZGV7xlOBUQoy7kS akDGwkP+hZKygsx7GPl4JX08Dojp5uXX62scV+suu7mMGn7JtZGFSlQNSBAMmc9+6Le8 oHzsnvyQDRqYRRzm/ZJFz6AgV9nJAfDiPa5sXuceGvkDBPWZFjGTLjms2LhQoGYYJFbI iU1GSQA5gqyLRUVNV77IGZmXer2Zd0ve8fa8KoyFATInbTHNuv/KfoPMLe74w+WqoBes 2rJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737757888; x=1738362688; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vNOxwbh8TJLovUJ4xbmkceu/OhoInCtt14EIM5E3MZs=; b=Xs07TREKDqfVjyZ3COLqVBSobcHqGjFo2iwC1CpBSqdPlSVSpO4k0TUCXhXYdWYt4h kj0kNhw41nTaNHiVFtfie7D3fB8C9/ZYGApVbGhHd3LZ8YWP/KMUBjaQCaY7YiowyRal +NBw3E+UhJN7+chxQKuCAi7ZXBHzLqc4Ud7nBR0bDFALzgmwMUssKmoCSQkY0X1A1LTL XYnKZ4oG9i7/W+49+z7K0w7fctR0x3pVWLeL7aaMMW7WyDicCkl4+RGn4s2UR8LcbOHj am1I8fqyMRoDJACkwujxmeGVjAImZZ/rLXTnlCqf5knRnFmOadP/Q+xBOlGWs5LyEqqU fqIQ== X-Forwarded-Encrypted: i=1; AJvYcCXEy0hhApbG6xwLhazOSsmGoeGdvSM3FcZrbCbOvp+pDI/CQ7ZNsa9CEAsxtw7lQfkUFtLl5i2RZ1yIt8Y=@vger.kernel.org X-Gm-Message-State: AOJu0YxAMeEu4TuTJqzneQtK3DtLl9Uvb8Nnty9c8qGTlrg9SN5Jn2W5 3KWYLLIPtw5kXFcznEdzWpF3CL+SyEHQj79C4It9cOtamOncA3Fu+khbMKs5rmc= X-Gm-Gg: ASbGncv8cMmj2HnZ+MMK9XLY/Ogi/f9Konko15Tu9aWR0FTsnfT1QqPrqzgTIoWz1GJ HmqGiFTe4/psDoDeuQ18CnTHnwFDWhyaBVbFsQcMzdaRBucV1yPY5F1sfhE5KtaRKhnKYJWVdZs FBDZ7tl30Xtp/Ooaldlu2OFye6jgwlvmdSMsSTKI2iTkTlDlv0lCYf5KsSjRYrtBFplijLiffKr R+X5StsUiEwsXZSnbiKA9QOyrf92f1/a+BpCVjxJiTtkf0+WFimGEhu/h1umLu3KhVB0CVgKZlA 7z/Zk8ShN5IrWQp5Z8of X-Google-Smtp-Source: AGHT+IE7NbObNQvQSaPZkmeR+n8U2XghXp9qA7/c1qoqbpDzuOOutMqEPF/BOHkTtclCps2IhnplYw== X-Received: by 2002:a05:6a00:460e:b0:726:54f1:d133 with SMTP id d2e1a72fcca58-72dafa44498mr46196661b3a.12.1737757888123; Fri, 24 Jan 2025 14:31:28 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72f8a761150sm2397183b3a.119.2025.01.24.14.31.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2025 14:31:27 -0800 (PST) From: Charlie Jenkins Date: Fri, 24 Jan 2025 14:30:59 -0800 Subject: [PATCH v3 1/4] riscv: entry: Convert ret_from_fork() to C 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: <20250124-riscv_optimize_entry-v3-1-869f36b9e43b@rivosinc.com> References: <20250124-riscv_optimize_entry-v3-0-869f36b9e43b@rivosinc.com> In-Reply-To: <20250124-riscv_optimize_entry-v3-0-869f36b9e43b@rivosinc.com> To: Paul Walmsley , Palmer Dabbelt , Huacai Chen , WANG Xuerui , Thomas Gleixner , Peter Zijlstra , Andy Lutomirski , Alexandre Ghiti Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Charlie Jenkins X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3493; i=charlie@rivosinc.com; h=from:subject:message-id; bh=e+QmdYfzdsHe2i47iJnp8obSLIn3fW5B1Uv/wF/582w=; b=owGbwMvMwCXWx5hUnlvL8Y3xtFoSQ/oUkT07p5vc3pN3zOnkt2t7t13MSjCoa19Xuf7PhTMrZ mmaPX4S01HKwiDGxSArpsjCc62BufWOftlR0bIJMHNYmUCGMHBxCsBEPFYx/A8WTt5ryjLVpMH1 TErO2sWKx6RENDf46fAGP0z2XfrJ+A0jww+e91PXpHawiKp7p8QaGc1fP/81y37mGUU9B1q3fG/ 5zgYA X-Developer-Key: i=charlie@rivosinc.com; a=openpgp; fpr=7D834FF11B1D8387E61C776FFB10D1F27D6B1354 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 Sat May 9 09:10:16 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 7C2FB1E98F4 for ; Fri, 24 Jan 2025 22:31:30 +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=1737757892; cv=none; b=cnl3Ra38bBp/e/6m3WkX9S4P07BPvBFKSp1ZIMQOWDcO7vacYyyphmYmG04hL5BlWmdqYfLH+Wj8YKTxUPnBxtu1ZTB8KBIHbw3mHKab4vIWKm9l5B95dMhAyD6BtfueIIijo2qL77voRorHuNmFkYrXKnMwU4Hglai+QcOi/eI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737757892; c=relaxed/simple; bh=t9WBogxb56lApIirNVzIj0lHOk+/6g6AFgtrehj97DE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZJBlt3wKGlJQ+faRtJdug/IeqCImxKR6AsCcdng7zyiC2iYwSGLYt0unbixmJy8DOg9lPIm2oC/euwDCR4hOMbI1PIU3s+y2tl+AaP9egzD8S6iuZ2DsDfwZEV3S3gFICNuxo713Ggtl0SR8j5nG6bJz5sPjvNWQh8/BO6srTSA= 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=bvcfqEG1; 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="bvcfqEG1" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-2efded08c79so3878076a91.0 for ; Fri, 24 Jan 2025 14:31:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1737757889; x=1738362689; darn=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=bvcfqEG1yhAORbVUruQcXePAMIQ/HW6cptJYh0AnEqBT9/fNr9zki91iCHnZTbezkS OevIOpblXnTYIuCAyD61TGRdr3sfGuMeuygxQhJ2S270d/4Tm37gYsqJtYAqLy4cdSo1 musvu0Z8t4Fvx3wLa3IF7Qam76AJQuvO1PoMNSehBABEQhiUVDk3C1Ux8eATCEOxOFeU 4qAGaiGW99cORdeMrntRWD8MuiTxKEs5XGJbvdIiSThh/PyApDSKueI7j3kgvoBmsLNO djs0ru9ksa06BFxKhXrfoua8jEI+qLtQheL2M8JcVNMoIRhugooY64UxEbpPlY40l+jT 2H5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737757889; x=1738362689; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nnq3B23qbOBveDsFleAgWeOkAmZk3gQFKZw4IbSmZLU=; b=Dc1i4dzJx640GRHdlyiTykXnojb2uobbJhziYfsK1fvvq8Ic6TyrKUnZ5zz7ewPilv 9JAiyOKefGGtIy7qMLlkhoWDQ5SHW1AR1uqv24pK3HyJN6/kc/PzhpdSDIEfat765s4X Ar+esMYX1BJUm1UFtCfMV3ieXPWCUSKC58p/N0UN6Mm5D4fqVy4hDOwDn9sH8OPUt/zI QZ5DH1/Z1Y02NG5kbNE+RDJZM66v21NoulujICNXrStYuIZAVcofK9L8QWji+3Mxxc7u 6WdIK0tsGCaQOHgdqIJDz5h/49p7sGHRoYiBhWawhwfPh7U7oeRB83uwBtlGKC5do80u uhOA== X-Forwarded-Encrypted: i=1; AJvYcCX+rSsmreJMK2NVSHG1fpfzNCuuJslzB9STZqYeZX6tzdmZy7mbs7kD8VQMJOtdaYWIhd5Qg7wYm4wO8Lc=@vger.kernel.org X-Gm-Message-State: AOJu0Yw19nz0t3kBb3h1+buwOS2bhSoPOM7G/uT8u47ozLrN2lT+6eRt KgHwnTGP1swj1oDRY4g2rIpO5H2ApWVXxJ5vm0XARqSD47VgEjXnNxFdJpY2so0= X-Gm-Gg: ASbGncu4jX19lPWtOgHVqELHflbGyerdW/MFlHOjTteuRh0jmTon6PGTr0Efi/Qs/LX iYtI9xUNEoFokMASRk/yu/WV1bry7d5i1CIDBR9ltfEl39j1bCwqyA1nQKZh6QKAE+z+eHP9poJ teH1vWgnSNdyVpHuTKdDmKMsjbupsjsRuCjBbuuOGOV5TGRAWvw+YZ8wS9C3CBaqFO9RYXhCTsb hMsbcvXLJd+WNrhfeNvEglxzsAgcdbVZScrTDvth0XoIOnYU0ezjTI/n6g71s/Ym/WJEVA/NoVj KHMjHO5n8U0FF/bcKSeW X-Google-Smtp-Source: AGHT+IG2A2M9jJ06wgeU6MMIXKJU3cZe7jVRjjabtXl2tIE7gfG3Pli2LQenVrOmHMThyR5CLM42Yw== X-Received: by 2002:a05:6a00:8084:b0:724:d758:f35 with SMTP id d2e1a72fcca58-72daf9bd157mr43251403b3a.2.1737757889642; Fri, 24 Jan 2025 14:31:29 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72f8a761150sm2397183b3a.119.2025.01.24.14.31.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2025 14:31:28 -0800 (PST) From: Charlie Jenkins Date: Fri, 24 Jan 2025 14:31:00 -0800 Subject: [PATCH v3 2/4] riscv: entry: Split ret_from_fork() into user and kernel 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: <20250124-riscv_optimize_entry-v3-2-869f36b9e43b@rivosinc.com> References: <20250124-riscv_optimize_entry-v3-0-869f36b9e43b@rivosinc.com> In-Reply-To: <20250124-riscv_optimize_entry-v3-0-869f36b9e43b@rivosinc.com> To: Paul Walmsley , Palmer Dabbelt , Huacai Chen , WANG Xuerui , Thomas Gleixner , Peter Zijlstra , Andy Lutomirski , Alexandre Ghiti Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Charlie Jenkins X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4442; i=charlie@rivosinc.com; h=from:subject:message-id; bh=t9WBogxb56lApIirNVzIj0lHOk+/6g6AFgtrehj97DE=; b=owGbwMvMwCXWx5hUnlvL8Y3xtFoSQ/oUkT1rm9Z8Nf0kEHf0/WHb/Q7WLrI7Fxwsm14jGnnDn +9v0JejHaUsDGJcDLJiiiw81xqYW+/olx0VLZsAM4eVCWQIAxenAEzk4GqG/44uK2Vbko953/Tz iju3MFvOKHpDoOYUC6lZB7o9n3u+2crwh/PYJ327eY+9t3o2/Zgy35Dj0px0OeEla1NcZefnh3L ZcwMA X-Developer-Key: i=charlie@rivosinc.com; a=openpgp; fpr=7D834FF11B1D8387E61C776FFB10D1F27D6B1354 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 Sat May 9 09:10:16 2026 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 077721EE7AF for ; Fri, 24 Jan 2025 22:31:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737757893; cv=none; b=UTfL0pqnXkm3WBGAzn3K5VjmOd5XLPVcl9K6oNRwnwzbBY6Gd/m+PFiYbBqVmW11pQjrYeIL+0NLaj+IgbuTLE2vEBX2pF0vEPCktwVsfbsHLcY0d+9sgwcYhckMISMDpbpbRtfc4S1ULHsKIH9eDDkhhkwZXAvyquuEhR3SMvs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737757893; c=relaxed/simple; bh=ji6jPR39ZKDby+guv8CCAiBLyKbpGz9Kynms9BH9fJU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uOtx0ernq8hnLXZinbtJI9bV1ze1He/o9iBSlvNvmLOHcpMImt+hvhsraurwYw8zOLL1ixAPfj0G/bZX/dmO7RCHUHLJJvqzMR5SMBoK/ahZl8A5bbOkMaCrzv7D/EoAFHAY72HUtFpn2yuv24DpWhRCiEQvG+sRRxHSzt/0YVI= 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=hezQ+OOd; arc=none smtp.client-ip=209.85.214.175 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="hezQ+OOd" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-216728b1836so43709965ad.0 for ; Fri, 24 Jan 2025 14:31:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1737757891; x=1738362691; darn=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=hezQ+OOd2WXIkgIK5t9LmIZoP8rrW9M91cly1q9+DMh9cNxuqsg7XioeVu8vYRW2FC FZpKLHpXkAJOHlS0OcLddGwsqUvVfDNSd+irsrLSGHCg/2DVzggEpyz8a4saAwd/XuK5 NAVGWGeHVvIMWwkvMH0cFARTjipDo1X7GVyrVmeRs4S3vXfpU4UNaIjGczR0SSJZQRgw nShr8Tb9Dzh7L3SmbfXzTrmsZI++9zn+bp9796EyTCuM8wVLRnlziQetT8S/nTiHAMS9 yUGpgN3OaXUkQ5nBEsROxId+yLxeQ7wOnL8X3g3DTZI0VBzBFndLGResANCikdeHaS+7 4Z+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737757891; x=1738362691; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a+zSCWqqyKc551VynXTcxotuXwo5gv9XFD/e4PnRFpw=; b=JQ4XYp416lWXzKWD73+s1G9KD3AtzAC14/7ETn5ZJakL/Mh1DU5p2NGwT7k8rbwZ0O OMpuvknzFeXAtHKOoOdZhcBSM/dQKMyygO9I0zLm5CiW/wPrcTlWzhZWYamOpZaHwz7V 0fIbrEd3gZRTiulN4TKOJvrHm9aVRnRbsOoV1gJrcOXV+QBZGTvq8xSdu9c38SUxEbiB Wb30N2Lk+H0fljkDCxDozIv8ms7FKKo9ghTCoCHOnlhCjM03rio2ux1q/qX64MUrY5Fp 8tCuOylCP1zdEmtSjrr7vPzqUM6JhZUmzAOZgg17wrkdurySGbLiFUHqJ0/cFrYfeHNN n2sA== X-Forwarded-Encrypted: i=1; AJvYcCWGzyQwF4k+9KlWqlPetUZbCOiLIurzGPlp6aHhOSIsJCEL4jpdhpZLF0IRfvf33PMciF2IpLBfZ1IOH8g=@vger.kernel.org X-Gm-Message-State: AOJu0YwANshPxiRwql8wEPn0kfCmVDjYMk35rxcWRJnTokArx6nq1BPH H+0YJUJHSsgrqPGIRY3XWHy9+YJ7BhkR4BUnDcyUA54kIZmpIbk03dTnjaMt6BM= X-Gm-Gg: ASbGnctv86cxO+Qclhk5USsMSQpGFfKaY7jcekd8jKHIBeTgkmGR+cb+wzAYunyi+iY NUjMacjkz4i1FyMAn3Gc/qWo1saYio68dK7LzmlH349fqQGXs4Q1kcbrH5TMAxALm5IiZByfdX/ F/+Qa2jbdyJ6ryxWUwN8NvoR43uFNHaOpMWRTaWcYz3chvHYLU044rfUuHRGzWiBA70+xenbyIY AYZ6tgBZMQHcgCcXyl6WZhQlvkSH2dmj8OzVIGgCXiIODSTkaDW6mg1KDLGXnE17zDdSopOAdSS YzMNTV9tpNKJJQ12AL8e X-Google-Smtp-Source: AGHT+IFtzVMWJA2cJy0hbK7qGJLRhh8SGaR/f/uRZsSLRq3SYx5yoyUu7AJhe3KVtuMpObcfJz9puA== X-Received: by 2002:a05:6a21:6816:b0:1ea:ddd1:2fa7 with SMTP id adf61e73a8af0-1eb2158717fmr53240943637.28.1737757891304; Fri, 24 Jan 2025 14:31:31 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72f8a761150sm2397183b3a.119.2025.01.24.14.31.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2025 14:31:30 -0800 (PST) From: Charlie Jenkins Date: Fri, 24 Jan 2025 14:31:01 -0800 Subject: [PATCH v3 3/4] LoongArch: entry: Migrate ret_from_fork() to C 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: <20250124-riscv_optimize_entry-v3-3-869f36b9e43b@rivosinc.com> References: <20250124-riscv_optimize_entry-v3-0-869f36b9e43b@rivosinc.com> In-Reply-To: <20250124-riscv_optimize_entry-v3-0-869f36b9e43b@rivosinc.com> To: Paul Walmsley , Palmer Dabbelt , Huacai Chen , WANG Xuerui , Thomas Gleixner , Peter Zijlstra , Andy Lutomirski , Alexandre Ghiti Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Charlie Jenkins X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5547; i=charlie@rivosinc.com; h=from:subject:message-id; bh=ji6jPR39ZKDby+guv8CCAiBLyKbpGz9Kynms9BH9fJU=; b=owGbwMvMwCXWx5hUnlvL8Y3xtFoSQ/oUkT0/mHcH/Kxl2rj74eeSTNt3rYnZr36Jna5htr7++ O1Ro493O0pZGMS4GGTFFFl4rjUwt97RLzsqWjYBZg4rE8gQBi5OAZiIkTcjw9S4jXpMMo+lL3sr a8xT8BPxbFnM4bl+ccvUqcelOna/WMHwz8Qwk9Fdr6hpoQRPJWPj6+3vb1/4c3NOAcuPstNT9Zp 62QA= X-Developer-Key: i=charlie@rivosinc.com; a=openpgp; fpr=7D834FF11B1D8387E61C776FFB10D1F27D6B1354 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 Sat May 9 09:10:16 2026 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 7E9111EEA3E for ; Fri, 24 Jan 2025 22:31:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737757895; cv=none; b=UMmMJAaUR1efnbRUvSUwi+9uLVadUu0FZc+PFidyXQsLM4qmUnK/HJ6Z+QQ903OHSEmuIKO9yN8LXGc8BsfFLCUhAFQ1d8jpwtEYgsJegCE3w0Prt91FAJd6s4z5nBvAxH5oiCR0ofLbnka8rrHK2fFuRAfH5qYwopY1nrbuVQo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737757895; c=relaxed/simple; bh=sNZ3kRgQB3K0rJNT54yR9TpYcWCb1xtle/FG6x9msOc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eN5VNt2AY6JvTxkQ6lS4d0ZD5LMgeNypOaDCbABcCaHK7inHSOFQYFToON/3s4gDwCyFdYdvtQn02NFygIMjvUExD383OLxJPFiahnRYJnUcYtqmvgv6fMCBEB6+290lUK7AVIpO3BgHqpZfeihMacJil/P9Ufq18cozp+beQm8= 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=ybJMgcaB; arc=none smtp.client-ip=209.85.214.169 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="ybJMgcaB" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-21634338cfdso61029455ad.2 for ; Fri, 24 Jan 2025 14:31:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1737757893; x=1738362693; darn=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=OT7EL7aXHj5Qe8OT6w++iL8CLZKTuGLA5KeWTFGIQzY=; b=ybJMgcaB19hiiXO515QUKNzVf8PAA91EA4DQBskmjEUPJYm1qgz+A6vnQnOmJnukKz 5bUpGL8n0RcncWAQt0I197d373CeuyZAXmhmUto2Ev4Lp6o2b1O7exYVj5y4ezGMPNwg xDHl5li0cFuRR8JqPFWBhj3AsoMHQ9MG7tXJa2vLNQtN4MMx0lgc+9ckyyQ+BTm4fAP9 iii0kw++ZzmC1Yf4k6pj/T/EPabYKADbFLoOeiiOt4eyHKBbzlZbB0SVRzK7zQf5tMxO XPp6I76/xhmf2LA3A+BoC9qfaQ+9v7JNsFMG+jsX6+iU8EM99tZfUVk3bXlrloC87LAw 6cqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737757893; x=1738362693; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OT7EL7aXHj5Qe8OT6w++iL8CLZKTuGLA5KeWTFGIQzY=; b=IHmeIF1GNO2XO9gSLh129FUJxNo1kcoxHGGQewRP5eCQbRdmej4Eln7mfBbI/Yfyr/ Hat6V2K16ylScT2zy6ztCC9x3H8QCOGm6xTX2PtglGMWgRaeliEDFmbQsdTfz1E+bW01 9Oafy21dFPq+LoY+l1JKplpvb8yz0oe/7OLQvP5kFhzrgFMqupUZ0HAJQ8Pth+bINoVN LxB8DXAs/ViXbnUxsOVZ7okYTGTohDLgTrWBjDsSgb11LfV+TNt3R6YSZULclsT8xGiA O6/LeNu0y77wr7gh+eSMvNDxhKHLVAPrxriI0UkE5aOYW0ShXK46r33Kx9EJCmc0HbX1 ktYg== X-Forwarded-Encrypted: i=1; AJvYcCVLVaS6lTHaWvac5RGJZXqqbqfimqlYlA46l+aAh60YFAMnW/1L4+/uGg+CP3ltitZZA7tSTnDkIT6fCoM=@vger.kernel.org X-Gm-Message-State: AOJu0YxDKlKdw6pFuMjfOckYJ+XI6ZEDnQ/r23pK9/HAaaZESJsG22T5 i35+ssSif0eCLoweV2poh7fb53Dc5f8KwAuvL5j0TCiJUsaGckpShsUhGTlCwspb6HTPrSN2f+X c X-Gm-Gg: ASbGnctoF0DTQrINwIcDtNFUvdyCell2s76WrwnS+qFLAlxN135+Niq5Lok+oJ1vQrh zJUT3sP+34OK2OTIVC4RHtwAqaWu4LkVX+6xpBn9T9SdcE4/IfSEofNHlIeKrQVOln9xiqAKu66 YkbSweZh2hbxgYrjp2BArpfSn/JJ+gA6t9Fe+N5koLJDaTGYKk+pfUwvyXAB7CdSeYUNMLfbaJg J2Kn/D8klqjK7sSLG2L+QR18ybN4XNFfKQP+khVdEBbexCg5xjV+Sw4N1vgyB9LImwEd4Pqh6PY ql0CSk49NXwgYKDluyBNhq3DRioJr/Q= X-Google-Smtp-Source: AGHT+IFXK5F2oZ/QyolwaGkbszhQMrnQEgQ/zkG4vY/tsUK75EkmfNWITMpNDa0U8tOC37teAvGGhA== X-Received: by 2002:a05:6a20:7f89:b0:1e0:dc34:2e7d with SMTP id adf61e73a8af0-1eb214650camr45666065637.5.1737757892796; Fri, 24 Jan 2025 14:31:32 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72f8a761150sm2397183b3a.119.2025.01.24.14.31.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2025 14:31:32 -0800 (PST) From: Charlie Jenkins Date: Fri, 24 Jan 2025 14:31:02 -0800 Subject: [PATCH v3 4/4] entry: Inline syscall_exit_to_user_mode() 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: <20250124-riscv_optimize_entry-v3-4-869f36b9e43b@rivosinc.com> References: <20250124-riscv_optimize_entry-v3-0-869f36b9e43b@rivosinc.com> In-Reply-To: <20250124-riscv_optimize_entry-v3-0-869f36b9e43b@rivosinc.com> To: Paul Walmsley , Palmer Dabbelt , Huacai Chen , WANG Xuerui , Thomas Gleixner , Peter Zijlstra , Andy Lutomirski , Alexandre Ghiti Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Charlie Jenkins X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5145; i=charlie@rivosinc.com; h=from:subject:message-id; bh=sNZ3kRgQB3K0rJNT54yR9TpYcWCb1xtle/FG6x9msOc=; b=owGbwMvMwCXWx5hUnlvL8Y3xtFoSQ/oUkT0VfqffFouuyp4Vb3LsoMOtgw9+zgvqmDWt7m1u6 uptVtNOdZSwMIhxMciKKbLwXGtgbr2jX3ZUtGwCzBxWJpAhDFycAjCRxYwMXzjKHDiO9HEpHtJd XMe7bKfCOlUBhU239h18IyXnPImPmeF/4OP5x+crPrF0lYizMbt4ZOOWJwxbIwtsblh/klvlYbu dDQA= X-Developer-Key: i=charlie@rivosinc.com; a=openpgp; fpr=7D834FF11B1D8387E61C776FFB10D1F27D6B1354 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..ee1c400bc0eb0ebb5850f95e856= b819fca7b3577 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 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); +} =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