From patchwork Thu Dec 8 02:58:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 31129 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp530058wrr; Wed, 7 Dec 2022 19:01:21 -0800 (PST) X-Google-Smtp-Source: AA0mqf6WgD9qfPoagUAnzB3MPgcEaQBrp326o8BHokZAaX37jaH3rsgm9SscNpeUDuFidC6FArog X-Received: by 2002:a17:906:70ca:b0:7ae:fbe8:a73f with SMTP id g10-20020a17090670ca00b007aefbe8a73fmr78397011ejk.479.1670468481733; Wed, 07 Dec 2022 19:01:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670468481; cv=none; d=google.com; s=arc-20160816; b=NCi8sdu19qpJM3HQLPIZxVBK7B2A0+XX6NhJnGRTIS82ux3/3l4jCGDbs0885g/P3r q7si+JQNbpX2GTKNVwTYlBLi9qeC2P3aEx2zsz6eMkZxcMVUCgi/8z+HUTlWIgpv03nJ 0oxTo7ls65LpVjGvkMYfeg465fmM3mHjM7mOLsmLCK8CaY8XVNASccfzJpxhlO+U7XLL 3suwjRri8lz+zWkuKsuamdMLs8uWjPBsvYUaLx/P23uO1iZbfTC5zWku+CSriGuEgihH 7TvO6vhQI98tgGHguNgE+I8dEk4zD3nrhdnbPTkGiIiI36SYnTCXgLzaIF869WuOlBoV 4RVg== 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=qpnMoVbikFJoa8lhKBXBtyCJ1Em9kqvqxy+og0yhslo=; b=TgtFXATVTOg2re9pHfY1iz5QuwkUFCzNDscsY+KS7jYKGlOZO3quvaE1ht3GL5RrYs gd4gUDWHu9vtaP2uyepvonlSYnpwwK3P+q/mdnktMlXdHvdhOlfb7uJ0JXQzD83RorNU X1dF/obqy+Ho9CkZMNy9SjmmfuBdenVtr4JVBkTHjfaEZOA+Ba4i3fs+K6u8MVhaDQgC B7m8JHsYAE5NIV3i9QcAu/w1EIa4sedTflhFOfwiQPHthab79vUzEPatieMHmi6LiIiA HH3rwblLDFPgm3RrrMA+UnwRLku5zaJGpX/PVhU3cMsI9/wUoswaAsxWwT5Rd3Q86Ozm +hSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jfGYxeCZ; 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 dr14-20020a170907720e00b0078adad5930esi19050993ejc.255.2022.12.07.19.00.58; Wed, 07 Dec 2022 19:01:21 -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=jfGYxeCZ; 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 S230001AbiLHDAD (ORCPT + 99 others); Wed, 7 Dec 2022 22:00:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229948AbiLHC7b (ORCPT ); Wed, 7 Dec 2022 21:59:31 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5AA9C4B9A0; Wed, 7 Dec 2022 18:59:31 -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 0188D61D42; Thu, 8 Dec 2022 02:59:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C953EC433B5; Thu, 8 Dec 2022 02:59:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670468370; bh=rRgx4hNzhe0jjK9q+Rvjiqoqgz/4yVh97abPr6C0y4s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jfGYxeCZcHz+CEeLuNUPorKvKFANyfkrnUHsztgFIv+ODD3Ic3uLcl6rcuaB/K5pl pdeOeA8EAoTSnzrBOhse/OKdfcLhKvgbGM8hX9IC4IfNATSrJL7thnOenc4F23JmhD mFFUIyU8rP4sdn3YVgY9xJuLUWuEGLvsphUG7tuWSEtScxF0JcOESJi7twqFf0l05B vUHQ+miEFAwt5k66tDYivwmeBqZsVXwbtPU7V1tP+XL7huFkidYCTenmaE5NrWcNNN mKARQcbG8eIjS5fBnxLG2qVRp6Jmne3cbrxQXvZaIffseEohDrPMzkcgMlM6BXro3a 1RvPCxFrhh4lg== 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, palmer@dabbelt.com, paul.walmsley@sifive.com, mark.rutland@arm.com, zouyipeng@huawei.com, bigeasy@linutronix.de, David.Laight@aculab.com, chenzhongjin@huawei.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 V10 06/10] riscv: entry: Consolidate ret_from_kernel_thread into ret_from_fork Date: Wed, 7 Dec 2022 21:58:12 -0500 Message-Id: <20221208025816.138712-7-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221208025816.138712-1-guoren@kernel.org> References: <20221208025816.138712-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?1751613158924693388?= X-GMAIL-MSGID: =?utf-8?q?1751613158924693388?= 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 make 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 69097dfffdc9..e4a9140a5b99 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -132,7 +132,6 @@ 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 @@ END(handle_kernel_stack_overflow) ENTRY(ret_from_fork) call schedule_tail - move a0, sp /* pt_regs */ - la ra, ret_from_exception - tail syscall_exit_to_user_mode -ENDPROC(ret_from_fork) - -ENTRY(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 -ENDPROC(ret_from_kernel_thread) +ENDPROC(ret_from_fork) /* 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; }