From patchwork Sat Dec 10 17:11:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 32076 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1420979wrr; Sat, 10 Dec 2022 09:15:22 -0800 (PST) X-Google-Smtp-Source: AA0mqf63+okZyaET5TqUEc/ce0DHeZvcFW00d2EbCnBE1BQ8DHCWo8/K2eSWKGEOtKHelrlR7P0g X-Received: by 2002:a17:902:788e:b0:189:efe7:df8d with SMTP id q14-20020a170902788e00b00189efe7df8dmr9490987pll.43.1670692522548; Sat, 10 Dec 2022 09:15:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670692522; cv=none; d=google.com; s=arc-20160816; b=xsl0E7e4E6gBzMkprOR8L7DtRp8Lr6vJOkstuqSj+VIqB/L1B7z9mzbemRFvSsEL7J oGxiC00/YyRx9sUj/tLZPuXqKYn7FdNlI57xBU5wokVSGFYeCcEpzrPUzCyIOAINvLHT NZSuvZCKF/P8DcSA4jn3tSXI6jrsaCRq4X18NTo9EJw51AjwQHw2tGelDVxgTeYyBoXC PQANmJofqfOTOeVvsCQzR59jG4g+36QPWiI3X7wuxMVpueSdMELVYSYv4ISLqqa+069x kI83PNn8JGUi/mptaa9ihGbVV9pGAyI/AyfHNoIOIeCu9gLE1K07CxnmSo5pKwRHVNCP GMnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jSj7Ca5fLREr6d8DHpir2FbAXtzwSht5nkhkLcdWdSk=; b=OGGMQW0zWOtG33usZiUnE07Gm0mF+E9unEiBlXyASTed/YHEN9CtWksLhXq5bqGzYz ZgYD7NAZefO/CNBLHSMM/0+mP3py6AK097FV/ur2y7YMPSp4FZVOq9SuoKV7M0940j1v aUFflMLntBKodb4dTZ2RDTZ2hUCOc8ra0DeyMFgSjNOFwbFmRaumFHZu5v6iBcy5seqs N5O0E/zUi2AHbsBcTLrXVRj8Rmw1LklQizgb3Qg/meq9xzwH8sapKv6PxuX36bfi90+O +az27AF6GvedCpZ2bUthdi/coDd8W3E9R/92skRa3nQcnfJERX4bDXjDSzq57ExWNhZh h51w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Gzk3Ebcj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h14-20020a170902f54e00b00186b3cb9b80si5033079plf.354.2022.12.10.09.15.09; Sat, 10 Dec 2022 09:15:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Gzk3Ebcj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229896AbiLJROC (ORCPT + 99 others); Sat, 10 Dec 2022 12:14:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229982AbiLJRNN (ORCPT ); Sat, 10 Dec 2022 12:13:13 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2643CF63; Sat, 10 Dec 2022 09:13:11 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B30C460C6F; Sat, 10 Dec 2022 17:13:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1483DC433F0; Sat, 10 Dec 2022 17:13:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670692390; bh=ZKYO1uILYjB5jhrBzMDR8i4ryt0RxqSbZCLdsgXq5hQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gzk3EbcjrhqooA/BqXWJHBvfYhgyZLGwTX0WIoSa3nVa/knAaMVVBvZHnyEP85FcK zG4SjuRZAIrpPtHIO7WQ7Oa76WMJePOhzai82Nc3VdcUJvPOq0ZPdxN0X3odbzvo0Q g/IKQ8yWnevYxXEeJjE24oBs3+ZzkbquAk9awfMGxBaRh9SWDZqtajpwNwABpg/I/D MvrURzjuXfsIMOQxafeo5mRGGsZc6kgwBOPmqduDgWpNHeMzgtMkHqDYkI5a1CW72g K0zn6oU5deXgaBoVRCYcVOgeLCP9oqVQ/Stl10SGr3ZF4hJs6CT0Tc4NfklgjihqPO OIA1dLcN0lnfw== From: guoren@kernel.org To: arnd@arndb.de, guoren@kernel.org, palmer@rivosinc.com, tglx@linutronix.de, peterz@infradead.org, luto@kernel.org, conor.dooley@microchip.com, heiko@sntech.de, jszhang@kernel.org, lazyparser@gmail.com, falcon@tinylab.org, chenhuacai@kernel.org, apatel@ventanamicro.com, atishp@atishpatra.org, paul.walmsley@sifive.com, mark.rutland@arm.com, greentime.hu@sifive.com, andy.chiu@sifive.com, ben@decadent.org.uk, bjorn@kernel.org Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH -next V11 6/7] riscv: entry: Consolidate ret_from_kernel_thread into ret_from_fork Date: Sat, 10 Dec 2022 12:11:40 -0500 Message-Id: <20221210171141.1120123-7-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221210171141.1120123-1-guoren@kernel.org> References: <20221210171141.1120123-1-guoren@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751848082850595652?= X-GMAIL-MSGID: =?utf-8?q?1751848082850595652?= From: Jisheng Zhang The ret_from_kernel_thread() behaves similarly with ret_from_fork(), the only difference is whether call the fn(arg) or not, this can be achieved by testing fn is NULL or not, I.E s0 is 0 or not. Many architectures have done the same thing, it makes entry.S more clean. Signed-off-by: Jisheng Zhang Reviewed-by: Guo Ren Tested-by: Guo Ren Signed-off-by: Guo Ren --- arch/riscv/kernel/entry.S | 12 +++--------- arch/riscv/kernel/process.c | 5 ++--- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S index b224dfecae40..3c3c040424c6 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -132,7 +132,6 @@ SYM_CODE_END(handle_exception) * caller list: * - handle_exception * - ret_from_fork - * - ret_from_kernel_thread */ SYM_CODE_START_NOALIGN(ret_from_exception) REG_L s0, PT_STATUS(sp) @@ -323,20 +322,15 @@ SYM_CODE_END(handle_kernel_stack_overflow) SYM_CODE_START(ret_from_fork) call schedule_tail - move a0, sp /* pt_regs */ - la ra, ret_from_exception - tail syscall_exit_to_user_mode -SYM_CODE_END(ret_from_fork) - -SYM_CODE_START(ret_from_kernel_thread) - call schedule_tail + beqz s0, 1f /* not from kernel thread */ /* Call fn(arg) */ move a0, s1 jalr s0 +1: move a0, sp /* pt_regs */ la ra, ret_from_exception tail syscall_exit_to_user_mode -SYM_CODE_END(ret_from_kernel_thread) +SYM_CODE_END(ret_from_fork) /* * Integer register context switch diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index b0c63e8e867e..5108c76a14dd 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -34,7 +34,6 @@ EXPORT_SYMBOL(__stack_chk_guard); #endif extern asmlinkage void ret_from_fork(void); -extern asmlinkage void ret_from_kernel_thread(void); void arch_cpu_idle(void) { @@ -172,7 +171,6 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) /* Supervisor/Machine, irqs on: */ childregs->status = SR_PP | SR_PIE; - p->thread.ra = (unsigned long)ret_from_kernel_thread; p->thread.s[0] = (unsigned long)args->fn; p->thread.s[1] = (unsigned long)args->fn_arg; } else { @@ -182,8 +180,9 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) if (clone_flags & CLONE_SETTLS) childregs->tp = tls; childregs->a0 = 0; /* Return value of fork() */ - p->thread.ra = (unsigned long)ret_from_fork; + p->thread.s[0] = 0; } + p->thread.ra = (unsigned long)ret_from_fork; p->thread.sp = (unsigned long)childregs; /* kernel sp */ return 0; }