From nobody Fri Dec 19 07:55:59 2025 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (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 A05CF1CAA6C for ; Wed, 22 Jan 2025 22:56:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737586618; cv=none; b=Gp02lqrvwyLZMb+zZZ1r0i/nkj4ljh65U4n623QXBPchQvV6XJ8VXszAoymfNKDgm/T8B29sMwD2nQ9RWfjyuC+gVanAsFc4q24++26rnoSdhqn0bDAU7tYvrCvkFJyoeVM7zBg0shbURhy52szrnfhAmfGXDJKPe9moxKlOWiM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737586618; c=relaxed/simple; bh=rV9JUhm8W3Bx7rnRIzGCq2bwJctlTEtmatZOhNjH0vc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=meX/EO6ytdWNrom1kVuYreMJeuaqvC0p6fPxLtlZwRvvWYtiC2POg1julbg0ISkBxiZy3oGMWia2IIyxDB0TJ7+9hEWuRIxUtE+xuZLYMmCxH1QYSk6RrFa6HeZhvGvSUSJu6jpl7IIMMpxuXIG6hrOiZfGygTlPM8K2fD+SE/Q= 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=BNegFDMM; arc=none smtp.client-ip=209.85.216.42 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="BNegFDMM" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2ef70c7efa5so493135a91.2 for ; Wed, 22 Jan 2025 14:56:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1737586616; x=1738191416; 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=Fn/PejcoPFKdcNV/yWi5+0DAQFM+nDQKenDgBFYN3Mk=; b=BNegFDMMwqHPrOh/EBShbeiK9dlMYCJLzbMxbVwQcSZbNi7k4RHfV8iK8jiwzhM3mf LJ8TDpJMyzuHAW8svlVHACBwsno4NQ0gKvlWTXfV6Snb97UonZixwiJKuMi3HbaJfaEB lPOtJ+VHBZsmoQqFpJu7Lnlzlz4Gli9D0r5jdULI/NLM3bF8/F52CMM4Zu8S2o9M6EpX 1p5vrMRz3UgOK5pIBbRQM8vtf+1Zoc8JFZG5uR65qd3NTMuDKrL3F1xjfMcE+oB3XbKT qY2Lp8/d3AqtW563xn3VLJFtrZxccJTBmwxhiWTk8DTuBdObATG5vJO7IPIu85DrsOcS fbfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737586616; x=1738191416; 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=JLTw30GVkV3zTgm+wXoWoFs2ngIiBDnUm7ba5NMDB9AwGTdB3TEDfiAoJ/6BbfJsCH +9hiykW02VTtVsCThANexk6Vb30Rk+SCdQ2EJQqkT/Y9mDYzElgj4b2I/igGwAyMQNfl R12bvXtwpSexezeuiXeX9rTyGOHcFAN99df1miI6j2dgxFHSTmMoDV227MciCZEEwprQ I3hx3YgXcf3f9P0HUpDOqhh2CSjb0y8s9G62v2fV2AsIyhgsBDquaqrPCfM4afCi8DXw sLQCpgN+xG5yRaXruaWSN0rtHijFKYqQE959Yyl48soRl1Kxee6T+tvRquHwrylkUmfb KZEA== X-Forwarded-Encrypted: i=1; AJvYcCWcv9HcO8DyHNqkdVWHdzs6AsXBMQE543MK6uG2qUPCDCXSMsCr3huwfmlSwLBA7qAqS54r3yYDYbL5HQI=@vger.kernel.org X-Gm-Message-State: AOJu0YwDWjeKpmnssGRlOu1vpEpasZaNjHLMu5jg7XF2lLExK7eoM7By OiHcydS0Nc6ZlAKdlsF1vaBj4aAWneACzuAqKgh3Wwej6p0OOQyjpPT4LB8WU4I= X-Gm-Gg: ASbGncuvB+H5pzRAgt9N+7X1QZa8adLUJoNzEn5gshNTQ/NCnvhVUMVbi6SmZCObbWm /uP9Cdwamgo+xncdtLpGPNi+01WN6KO/+6M5jsQKhplX/dhJKypPKqmPZAq8jK8SgeZpDAW6qNT qStnld1eCKjPehXdemBh04ZLDWTL5vjKnGpj+evhSPP1yxkmMvCFaBJ6SPRuisdMEZey+oUd4Ge QDiM/lyk+MYGcvTyIBIT2fodhxi3JHCAQUE+v1y3cqWtrXxn8j/B1LDjZ+Zjh3862uxIJUGdGbU T1H04801og== X-Google-Smtp-Source: AGHT+IGkOWQer0g/4jCDpWuE1nqdG+SGuwiRfCbniIbIL1sny3WjBA7acx7xqTIHE+P8KLoFagnQAg== X-Received: by 2002:a17:90b:5249:b0:2ee:e518:c1cb with SMTP id 98e67ed59e1d1-2f782c4bdd2mr36926987a91.7.1737586615920; Wed, 22 Jan 2025 14:56:55 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f7e6aaf3b4sm2301375a91.25.2025.01.22.14.56.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2025 14:56:55 -0800 (PST) From: Charlie Jenkins Date: Wed, 22 Jan 2025 14:56:20 -0800 Subject: [PATCH 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: <20250122-riscv_optimize_entry-v1-1-4ee95559cfd0@rivosinc.com> References: <20250122-riscv_optimize_entry-v1-0-4ee95559cfd0@rivosinc.com> In-Reply-To: <20250122-riscv_optimize_entry-v1-0-4ee95559cfd0@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/rE8s3MIQ08j0o/nwm++ubjMauZxccEN91XPGF74+yfn ewBNxhfdpSyMIhxMciKKbLwXGtgbr2jX3ZUtGwCzBxWJpAhDFycAjCRU7YMf7izZz+fvbMn6Tjb s5lz+eSSgzfZ1B4I++FZYx1kl/riy1xGhpMFnZuYvBcrfshj37l/8YZJ0kmhD5nP2Xm+tzAqnJ4 XwgsA 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..9225c322279aa90e737b1d7144d= b084319cf8103 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 */ + 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) =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