From mboxrd@z Thu Jan 1 00:00:00 1970 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: 7bit 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/asm/asm-prototypes.h index cd627ec289f163a630b73dd03dd52a6b28692997..733ff609778797001006c33bba9e3cc5b1f15387 100644 --- a/arch/riscv/include/asm/asm-prototypes.h +++ b/arch/riscv/include/asm/asm-prototypes.h @@ -52,6 +52,7 @@ DECLARE_DO_ERROR_INFO(do_trap_ecall_s); DECLARE_DO_ERROR_INFO(do_trap_ecall_m); DECLARE_DO_ERROR_INFO(do_trap_break); +asmlinkage void ret_from_fork(void *fn_arg, int (*fn)(void *), struct pt_regs *regs); asmlinkage void handle_bad_stack(struct pt_regs *regs); asmlinkage void do_page_fault(struct pt_regs *regs); asmlinkage void do_irq(struct pt_regs *regs); diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S index 33a5a9f2a0d4e1eeccfb3621b9e518b88e1b0704..b2dc5e7c7b3a843fa4aa02eba2a911eb3ce31d1f 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -319,17 +319,14 @@ SYM_CODE_END(handle_kernel_stack_overflow) ASM_NOKPROBE(handle_kernel_stack_overflow) #endif -SYM_CODE_START(ret_from_fork) +SYM_CODE_START(ret_from_fork_asm) call schedule_tail - beqz s0, 1f /* not from kernel thread */ - /* Call fn(arg) */ - move a0, s1 - jalr s0 -1: - move a0, sp /* pt_regs */ - call syscall_exit_to_user_mode + move a0, s1 /* fn_arg */ + move a1, s0 /* fn */ + move a2, sp /* pt_regs */ + call ret_from_fork j ret_from_exception -SYM_CODE_END(ret_from_fork) +SYM_CODE_END(ret_from_fork_asm) #ifdef CONFIG_IRQ_STACKS /* diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index 58b6482c2bf662bf5224ca50c8e21a68760a6b41..0d07e6d8f6b57beba438dbba5e8c74a014582bee 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -17,7 +17,9 @@ #include #include #include +#include +#include #include #include #include @@ -36,7 +38,7 @@ unsigned long __stack_chk_guard __read_mostly; EXPORT_SYMBOL(__stack_chk_guard); #endif -extern asmlinkage void ret_from_fork(void); +extern asmlinkage void ret_from_fork_asm(void); void noinstr arch_cpu_idle(void) { @@ -206,6 +208,14 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src) return 0; } +asmlinkage void ret_from_fork(void *fn_arg, int (*fn)(void *), struct pt_regs *regs) +{ + if (unlikely(fn)) + fn(fn_arg); + + syscall_exit_to_user_mode(regs); +} + int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) { unsigned long clone_flags = args->flags; @@ -242,7 +252,7 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) p->thread.riscv_v_flags = 0; if (has_vector()) riscv_v_thread_alloc(p); - p->thread.ra = (unsigned long)ret_from_fork; + p->thread.ra = (unsigned long)ret_from_fork_asm; p->thread.sp = (unsigned long)childregs; /* kernel sp */ return 0; } -- 2.43.0