All of lore.kernel.org
 help / color / mirror / Atom feed
From: Guo Ren <guoren@kernel.org>
To: Nathan Chancellor <nathan@kernel.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>,
	Brian Cain <bcain@codeaurora.org>,
	Yoshinori Sato <ysato@users.sourceforge.jp>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 3/3] csky: Fix function name in csky_alignment() and die()
Date: Tue, 28 Dec 2021 10:50:22 +0800	[thread overview]
Message-ID: <CAJF2gTSK4sKbU1XkPN-kJvT=cFkBNr=HpVd-zMmRO78ZQGThuQ@mail.gmail.com> (raw)
In-Reply-To: <Ycp0DsB68GWQ1eD6@archlinux-ax161>

On Tue, Dec 28, 2021 at 10:19 AM Nathan Chancellor <nathan@kernel.org> wrote:
>
> Hi Guo,
>
> On Tue, Dec 28, 2021 at 10:01:11AM +0800, Guo Ren wrote:
> > Hi Nathan & Eric,
> >
> > Seems Eric's patch is not in Linus tree, right? Abandoned?
> >
> > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0e25498f8cd43c1b5aa327f373dd094e9a006da7
>
> Correct, Eric's patch is not in Linus' tree. It is in his
> signal-for-v5.17 branch, which is currently flowing into -next:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git/log/?h=signal-for-v5.17
>
> Apologies for not spelling this out in the cover letter. Aside from a
> review/ack/test, there should not be anything else that you need to do.
Good

>
> Cheers,
> Nathan
>
> > On Tue, Dec 28, 2021 at 9:53 AM Guo Ren <guoren@kernel.org> wrote:
> > >
> > > I would pick up csky's & make pull-request immediately.
> > >
> > > On Tue, Dec 28, 2021 at 9:47 AM Guo Ren <guoren@kernel.org> wrote:
> > > >
> > > > Sorry mm/fault.c is okay.
> > > >
> > > > Reviewed-by: Guo Ren <guoren@kernel.org>
> > > >
> > > > On Tue, Dec 28, 2021 at 9:46 AM Guo Ren <guoren@kernel.org> 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 <nathan@kernel.org> 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 <nathan@kernel.org>
> > > > > > ---
> > > > > >  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/
> >
> >
> >
> > --
> > Best Regards
> >  Guo Ren
> >
> > ML: https://lore.kernel.org/linux-csky/



-- 
Best Regards
 Guo Ren

ML: https://lore.kernel.org/linux-csky/

  reply	other threads:[~2021-12-28  2:50 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-27 18:48 [PATCH 0/3] Fix build errors with do_exit() to make_task_dead() transition Nathan Chancellor
2021-12-27 18:48 ` [PATCH 1/3] hexagon: Fix function name in die() Nathan Chancellor
2021-12-27 18:48 ` [PATCH 2/3] h8300: Fix build errors from do_exit() to make_task_dead() transition Nathan Chancellor
2021-12-27 18:48 ` [PATCH 3/3] csky: Fix function name in csky_alignment() and die() Nathan Chancellor
2021-12-28  1:46   ` Guo Ren
2021-12-28  1:47     ` Guo Ren
2021-12-28  1:53       ` Guo Ren
2021-12-28  2:01         ` Guo Ren
2021-12-28  2:18           ` Nathan Chancellor
2021-12-28  2:50             ` Guo Ren [this message]
2021-12-29 16:29     ` Eric W. Biederman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAJF2gTSK4sKbU1XkPN-kJvT=cFkBNr=HpVd-zMmRO78ZQGThuQ@mail.gmail.com' \
    --to=guoren@kernel.org \
    --cc=bcain@codeaurora.org \
    --cc=ebiederm@xmission.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nathan@kernel.org \
    --cc=ysato@users.sourceforge.jp \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.