From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (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 D7CB718BC3F for ; Tue, 28 Jan 2025 05:33:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738042405; cv=none; b=QTqsMdJvDoBn2JE9Z/JBZwMNmIMaRFcaf3b0SJ91K02HCzV6KVHei+Q01Ao3kJN6YJYsawuxLL/OM2w1EK6fECNa6soSIh3vr15LFOjN5Pban/mliDjdNiwjlTiXPv1NwrWNiu/KR08+o7/OUtkkpVnfMEsd/K6Kh1KFPBjowjY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738042405; 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=H+XoXTfYBSQ+z2udwFJxpdujkyAtrrgd8Ossftixy+2wioKntYTAqnMcuJpiJvltCz8qd9WBOE+C3fvNqH9uZp8EIEiNQhE/ggaT2ZuxpDQCEgV4PUqDPv+ADJrn+A/OHLZwvHQ/Wj0pkpxGszsFcj+SY+/8j8qJ6WBs4P1irvE= 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=3ZlfyWP9; arc=none smtp.client-ip=209.85.216.41 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="3ZlfyWP9" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-2ee50ffcf14so9726618a91.0 for ; Mon, 27 Jan 2025 21:33:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738042403; x=1738647203; 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=3ZlfyWP9GxYdJdZg2vNwHR4eR9CVP3daGSUF4tRCyMLrzq9BUJ9XENW/6J9iX2nKQj vq4wnWRUAZ1WjsYBeGzupqZAJAxacgjQaXJ6hUyxWPXxz/dq+VkIE3i3HvzvJlhm9oE8 2eGBjV0mxo9zG64zWpAcIB1ZX6fVgtf8o6vQuy1PQnfUdd0aKi4CS22UPFv6RLmLyEtX BU7OqCfT1q0Y91Zm8N1jVJ75uaI6toIY/wk7d0f/jl+rOtzuP1bkRZOAsqvjA3P7AFDX kNYepUfTqfK+bvZf7EQZgYQ8czpwjj1iV2Q73ORqzKgCbAoBuuRjfGydAej+v+6BXefx NO0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738042403; x=1738647203; 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=q2IFJlS56qxpu3fpEMqMK8kB7KUfoOpWhgiga4pcXBHDVFToa0ASxRj6XsEm4pSZHZ xI7cOsSze+h2IF3tYfV1d901Qi1qBHG/4b9NEwwIpTQYeM+xEcfsUXWj6LHUyq6cu6ak fwTC8kCX4AT7vK5/+BPw/WHBUssynf64W0IGFfbmNSLKt8Ck/XgYIJcgL4GcfaYfLc1g re3dE9L/kBeeEcjMTICKz8Bfw2QW0+UKOaEiK20LBMskwjZEA2idQS8Hod3g/Q5G/Nfg icmnJ2DiNiNPF8KCkXJLsEKZXd6Ht59fntLFEWOtFFniMXWVfkK3Izptj9kLhmS3lCzA ilkA== X-Forwarded-Encrypted: i=1; AJvYcCVbF5xaBOZ6JvvX+nKlQcjo2V1qgth6EL2bSFO76oIFC0HqzE2ZN9LY0KxNtYKw/G+WYbIepOz+Pjn6drY=@vger.kernel.org X-Gm-Message-State: AOJu0Yzs3cIeKaWZmYXI7neZP+Ycba54ftYdkO6oZIRshnjQ0SrMST9d 8zy+rBeWjeB6o0cZwIqnEqBgf5zS/ObsKE0KWY2Cf8k9wyJWylIxOHdhp/P/9mU= X-Gm-Gg: ASbGncvLuocv/Y8vVD8pBlQ1Uj+MqCIjruXupPGRh4aZAO+1BniwDmqSCLY3tVIfvQf MPyBP7ZMeG/3i5jQBdfb4DF9i6NTIdTmaCZl1fnyG2D6hY2Dg93UDvbIJ+gwn96YgCkEN0QLnb4 NpUYOWwm346FNO6WlSsD/O8a8HEJ1qd959uMyvU36msO2Y9i3tKUW28Zg9Vc3LqnujmEaExWk3N EQ0NabOnxpub+La+FfjLh1yH66lJO55Rily9eq9RvKSmnN9qxfTeLabSAGAiINFLce3CxdQpFtp /2/+eT0ZkNT3/f8fUMEBFsQEKQgkjsY= X-Google-Smtp-Source: AGHT+IHJHQRcL9Lv4f1yIJBut5cVZG5MPbkCVxCZQ6AIY/XzegyPECOnS8zpH/X82U5LA34CHjhDGw== X-Received: by 2002:a17:90b:2dca:b0:2ee:e2f6:8abc with SMTP id 98e67ed59e1d1-2f82c028adfmr3131615a91.10.1738042402000; Mon, 27 Jan 2025 21:33:22 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f7ffaf9e98sm8266247a91.38.2025.01.27.21.33.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jan 2025 21:33:21 -0800 (PST) From: Charlie Jenkins Date: Mon, 27 Jan 2025 21:33:09 -0800 Subject: [PATCH 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: 7bit Message-Id: <20250127-riscv_optimize_entry-v4-1-868cf7702dc9@rivosinc.com> References: <20250127-riscv_optimize_entry-v4-0-868cf7702dc9@rivosinc.com> In-Reply-To: <20250127-riscv_optimize_entry-v4-0-868cf7702dc9@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/qMHNmW1oVXLgvdrHm3epf2zccMKopBG1aE7L961V1Ps 8zg7Yf6jlIWBjEuBlkxRRaeaw3MrXf0y46Klk2AmcPKBDKEgYtTACbyewUjQ0cF/4qw6W6Tp91M dj3pWZezPHNdv3m7eIHJb5l10jkWIQz/Exmk5z/IsjaQM6rhfiby99r+4z0//5VsE18Ye+azt74 fNwA= 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