From nobody Fri Dec 19 07:55:57 2025 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 456081CBE94 for ; Wed, 22 Jan 2025 22:56:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737586619; cv=none; b=h3nuHm0BlRc0uvZibkMUWnGVujCfLQYxGjh3HdgeuX52outb+fkbDS6yYhY4f7aua5VX5j4Mh/9jJAz2Q+T7DAfs708/GO6qE7nLOQlT2ChL0yMIgHAyLgLcOY6FkWi0Qitr0u9t/+zhgxZliZxyZuxPa+6pNKfBkJkkaGnIynM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737586619; c=relaxed/simple; bh=/8HxBSW4tXtNDNNcwvIlJWKmSet2jd64HJR1EYtmRzg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cLDlKVBZtbDa66JtUn9OGzTAphes23iNYyhGe5AWyyUshIa7YEE129TWBa6zW+tCfR3vHpD7OYlzIwYPLAFzXnKcwz4M3VULHIh8hC5j2kR/loNyxt1D21On30Z8Fi1b7nf+6uJLHvl9hW5J0+kgVKoZU+vPMggaEzbqnUP1QrA= 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=nsHFgE1j; arc=none smtp.client-ip=209.85.216.51 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="nsHFgE1j" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2ef28f07dbaso475529a91.2 for ; Wed, 22 Jan 2025 14:56:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1737586617; x=1738191417; 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=gk9EjRkEzIcEMvzIBfoIlltgvi6+ujtlpNud1xWt+ys=; b=nsHFgE1j88SWxYH/eQELVKdf2MTyqDO99g7GtQZXuu+oU0Dem/X5RWa5HsPGUpMk2A mTgOdi19Q/WJYeBYdlPg7bxjoKyKg5RsZwpnxrjTA85hwpsNCCOXZd19MMz9Az+ZALQr vdLogEnWC69+n/K/56IJu0OCy7FURqZFjhZxoK4bdsydI9kPnOu+cuc4RJCwqlKIxslI 7QZisyc7fnX3AMVLnG/Exl6q/mecQGb7jXGZIxjUsHL45kWhCl0Kg8HkXJ3Yj5lgE6T1 AYAr5ItQ6KP5iSC76B/ydQx8IYg5XOQYYfcQgiQ9hT6y+5XQksGGHnqpgcBjUjnLkW/5 eY2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737586617; x=1738191417; 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=gk9EjRkEzIcEMvzIBfoIlltgvi6+ujtlpNud1xWt+ys=; b=EU9qCD9GuP9BbO4nqQwoScYbOg/o2m/X1j6C4ZRUhI2/iYLGKm3VZLbyS86VVngMRw UK9fmuisl6iCarQ3gh8Ff9Aq2hK20Mn7UzAbq9T27kjwbf3ZKEKWKZTUE+we7kSovPM3 PjP1canKdJ3Cy6vCoW4jGrNmEQBBC+H7v3lBae1Zt75kF40vmahvFPINw2/sCC2UvRXW DJjKjHBWs0UR3qiJMAWwfjzneL9/UJUBpyYOo10xXfduoAEWop+ihtYmh3MBKoxokona E7WgxBVtvWj4RZnygcSybZ7vDN32yD4mS2PqzFWIgyaNMGR0kmrSpfpBKSvfditmwKSh fE3g== X-Forwarded-Encrypted: i=1; AJvYcCU4J9b46jpPRr5MOEKDSV22hNtZv4iSIfZZmsSd4kC9cVJ5FJ3ApTiHqqvQJHJXTIAEzCSC2QnfA2IpqZ4=@vger.kernel.org X-Gm-Message-State: AOJu0Yxz/ssqHEab++RmhubbX1RvjRPDFflmT6JiHRG9sOeLhVXnRX8C HoplOpkhEqQlXK0Yb07EqPvCJrEhSe+2DmI7SGPG/xs3FLFfr4sXPO80PrO0YUM= X-Gm-Gg: ASbGncsXqlkt9+iAWwQy5uSOJodjZbLzI4qX73BgTpe6/KQh5pQgLlPTGrCutxRBHZM wnq3MKjIvyjy2vFMZEDbdL3xSgeqkAA1wW6thywuyjo/sQZYgaUrf4SjBP3mhDyv3MKjIlAJLUd sTFWyah4Wm7bxYURvHYlEK5SJ2QsRCO2W8laTMPl09Yso8GKXLX6787I+0Jr+rl+Su8cdTNkMIg YZKI+/5mX7jB/U5tmKUeyT7S4ViriC2ZtLk1ctFG6jc2eRZwWxB3m5sX2zW5bYr6P/UzO6WPdvZ deeE4ZKjybuhkcMXr2ey X-Google-Smtp-Source: AGHT+IEgKTQYuz2/Gbshe8x8bmjmpJ0Acgfixj4MEY6AowVSMpnu4YvlJGJiQi2O8+uqfUzYLPzGkA== X-Received: by 2002:a17:90b:4b82:b0:2f4:423a:8fb2 with SMTP id 98e67ed59e1d1-2f782cbf6a3mr35467389a91.20.1737586617545; Wed, 22 Jan 2025 14:56:57 -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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2025 14:56:56 -0800 (PST) From: Charlie Jenkins Date: Wed, 22 Jan 2025 14:56:21 -0800 Subject: [PATCH 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: <20250122-riscv_optimize_entry-v1-2-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=4442; i=charlie@rivosinc.com; h=from:subject:message-id; bh=/8HxBSW4tXtNDNNcwvIlJWKmSet2jd64HJR1EYtmRzg=; b=owGbwMvMwCXWx5hUnlvL8Y3xtFoSQ/rE8i0b7c+0s/xcqt3/5b4w99KHFwsVdgnIyp27P0Uh+ PiLWpaFHaUsDGJcDLJiiiw81xqYW+/olx0VLZsAM4eVCWQIAxenAEzkvxojw/S94Wbr81rsm08G Ci0Pqo+N/Pys/vcCwWWTdNbd4dItesbwV/CvwkKz0Md8V+zighdYTl076b4Iy/KkostTt9bobnT +zwYA 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 9225c322279aa90e737b1d7144db084319cf8103..9386ef7444267f0b9bf8a0550f4= e31deaeb85881 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 */ move a1, s0 /* fn_arg */ 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