Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6DE5C433EF for ; Tue, 28 Dec 2021 01:53:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234477AbhL1Bxi (ORCPT ); Mon, 27 Dec 2021 20:53:38 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:37870 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230367AbhL1Bxh (ORCPT ); Mon, 27 Dec 2021 20:53:37 -0500 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 ams.source.kernel.org (Postfix) with ESMTPS id 105B6B80DB5 for ; Tue, 28 Dec 2021 01:53:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1271C36AED for ; Tue, 28 Dec 2021 01:53:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1640656414; bh=VzYw5R0JhCCJCJLx6nPeqv//SI/vBEtYkywRZBFJ7Ic=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=lZOeGkdDNIaCMzQB2ULuTwQAQs0wqJXxsirQM7LA2lQ4SGgCh96F6ZXdQUhyVLiFS yxTXH77vf3zESvyUxCGOmWOqjKMakc1xXMXIkFxIQK1w1AnxFpB5ludIP3OYoH05kU HISjEYRpau15SVuCB0PL5ClAk4IXKEDlxq1HjGjsEzR6V4Q0no2Zc/5dZRYptaUZRQ P6Mkd7nTc2k5PzUcWUW038bPr66LlNt9WmhiWqz0wZNuAdqoz+JDulloXK5NXv39sq F79nLKKV6ywvYj+4dEkt2uYFyujNEnltZiiBR70sbotW7mzCUQ16Hf5NGRdbzZABJK 8aFbB6N5CRcEw== Received: by mail-ua1-f51.google.com with SMTP id o1so29650849uap.4 for ; Mon, 27 Dec 2021 17:53:34 -0800 (PST) X-Gm-Message-State: AOAM532o04AhawvEXuW/Xxmjyu59wPAEx/rfN3Fybb5uORxlTzEnrvfX ZqQHp2Cczd/M6Or6nvv78K/W3AdBnegm/E00pns= X-Google-Smtp-Source: ABdhPJytgQBDAB6MaP66njosK11tXOvF5PdmzJMkqYBPXIhl6L/nhrOwIjAodkey8Phy36ywr/WuSbCksGN/VJsabok= X-Received: by 2002:a05:6102:316e:: with SMTP id l14mr5429730vsm.8.1640656413741; Mon, 27 Dec 2021 17:53:33 -0800 (PST) MIME-Version: 1.0 References: <20211227184851.2297759-1-nathan@kernel.org> <20211227184851.2297759-4-nathan@kernel.org> In-Reply-To: From: Guo Ren Date: Tue, 28 Dec 2021 09:53:23 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 3/3] csky: Fix function name in csky_alignment() and die() To: Nathan Chancellor Cc: "Eric W. Biederman" , Brian Cain , Yoshinori Sato , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I would pick up csky's & make pull-request immediately. On Tue, Dec 28, 2021 at 9:47 AM Guo Ren wrote: > > Sorry mm/fault.c is okay. > > Reviewed-by: Guo Ren > > On Tue, Dec 28, 2021 at 9:46 AM Guo Ren wrote: > > > > Hi Nathan, > > > > Three wrong parts in csky! you forgot mm/fault.c. > > > > Eric's patch seems not to cc me? Why arm64 is correct, csky is wrong. -_*! > > > > here is the wrong patch part: > > diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c > > index 9ae24e3b72be1..11a28cace2d25 100644 > > --- a/arch/arm64/mm/fault.c > > +++ b/arch/arm64/mm/fault.c > > @@ -302,7 +302,7 @@ static void die_kernel_fault(const char *msg, > > unsigned long addr, > > show_pte(addr); > > die("Oops", regs, esr); > > bust_spinlocks(0); > > - do_exit(SIGKILL); > > + make_task_dead(SIGKILL); > > } > > #ifdef CONFIG_KASAN_HW_TAGS > > diff --git a/arch/csky/abiv1/alignment.c b/arch/csky/abiv1/alignment.c > > index cb2a0d94a144d..5e2fb45d605cf 100644 > > --- a/arch/csky/abiv1/alignment.c > > +++ b/arch/csky/abiv1/alignment.c > > @@ -294,7 +294,7 @@ bad_area: > > __func__, opcode, rz, rx, imm, addr); > > show_regs(regs); > > bust_spinlocks(0); > > - do_exit(SIGKILL); > > + make_dead_task(SIGKILL); > > } > > force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *)addr); > > diff --git a/arch/csky/kernel/traps.c b/arch/csky/kernel/traps.c > > index e5fbf8653a215..88a47035b9256 100644 > > --- a/arch/csky/kernel/traps.c > > +++ b/arch/csky/kernel/traps.c > > @@ -109,7 +109,7 @@ void die(struct pt_regs *regs, const char *str) > > if (panic_on_oops) > > panic("Fatal exception"); > > if (ret != NOTIFY_STOP) > > - do_exit(SIGSEGV); > > + make_dead_task(SIGSEGV); > > } > > void do_trap(struct pt_regs *regs, int signo, int code, unsigned long addr) > > diff --git a/arch/csky/mm/fault.c b/arch/csky/mm/fault.c > > index 466ad949818a6..7215a46b6b8eb 100644 > > --- a/arch/csky/mm/fault.c > > +++ b/arch/csky/mm/fault.c > > @@ -67,7 +67,7 @@ static inline void no_context(struct pt_regs *regs, > > unsigned long addr) > > pr_alert("Unable to handle kernel paging request at virtual " > > "addr 0x%08lx, pc: 0x%08lx\n", addr, regs->pc); > > die(regs, "Oops"); > > - do_exit(SIGKILL); > > + make_task_dead(SIGKILL); > > } > > > > On Tue, Dec 28, 2021 at 2:50 AM Nathan Chancellor wrote: > > > > > > When building ARCH=csky defconfig: > > > > > > arch/csky/kernel/traps.c: In function 'die': > > > arch/csky/kernel/traps.c:112:17: error: implicit declaration of function > > > 'make_dead_task' [-Werror=implicit-function-declaration] > > > 112 | make_dead_task(SIGSEGV); > > > | ^~~~~~~~~~~~~~ > > > > > > The function's name is make_task_dead(), change it so there is no more > > > build error. > > > > > > Fixes: 0e25498f8cd4 ("exit: Add and use make_task_dead.") > > > Signed-off-by: Nathan Chancellor > > > --- > > > arch/csky/abiv1/alignment.c | 2 +- > > > arch/csky/kernel/traps.c | 2 +- > > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/arch/csky/abiv1/alignment.c b/arch/csky/abiv1/alignment.c > > > index 5e2fb45d605c..2df115d0e210 100644 > > > --- a/arch/csky/abiv1/alignment.c > > > +++ b/arch/csky/abiv1/alignment.c > > > @@ -294,7 +294,7 @@ void csky_alignment(struct pt_regs *regs) > > > __func__, opcode, rz, rx, imm, addr); > > > show_regs(regs); > > > bust_spinlocks(0); > > > - make_dead_task(SIGKILL); > > > + make_task_dead(SIGKILL); > > > } > > > > > > force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *)addr); > > > diff --git a/arch/csky/kernel/traps.c b/arch/csky/kernel/traps.c > > > index 88a47035b925..50481d12d236 100644 > > > --- a/arch/csky/kernel/traps.c > > > +++ b/arch/csky/kernel/traps.c > > > @@ -109,7 +109,7 @@ void die(struct pt_regs *regs, const char *str) > > > if (panic_on_oops) > > > panic("Fatal exception"); > > > if (ret != NOTIFY_STOP) > > > - make_dead_task(SIGSEGV); > > > + make_task_dead(SIGSEGV); > > > } > > > > > > void do_trap(struct pt_regs *regs, int signo, int code, unsigned long addr) > > > -- > > > 2.34.1 > > > > > > > > > -- > > Best Regards > > Guo Ren > > > > ML: https://lore.kernel.org/linux-csky/ > > > > -- > Best Regards > Guo Ren > > ML: https://lore.kernel.org/linux-csky/ -- Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/