2021-12-27 18:50:37

by Nathan Chancellor

Subject: [PATCH 0/3] Fix build errors with do_exit() to make_task_dead() transition

Hi Eric,

I noticed that ARCH=hexagon defconfig was broken after commit
0e25498f8cd4 ("exit: Add and use make_task_dead.") in -next because of a
typo ("make_dead_task" vs. "make_task_dead") and I saw the same thing
happened for csky and h8300. Feel free to squash these into that change.

Cheers,
Nathan

Nathan Chancellor (3):
hexagon: Fix function name in die()
h8300: Fix build errors from do_exit() to make_task_dead() transition
csky: Fix function name in csky_alignment() and die()

arch/csky/abiv1/alignment.c | 2 +-
arch/csky/kernel/traps.c | 2 +-
arch/h8300/kernel/traps.c | 3 ++-
arch/h8300/mm/fault.c | 2 +-
arch/hexagon/kernel/traps.c | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)


base-commit: 329b30af470abd854fd301865f1072fa298cc8d6
--
2.34.1

2021-12-27 18:51:00

by Nathan Chancellor

Subject: [PATCH 2/3] h8300: Fix build errors from do_exit() to make_task_dead() transition

When building ARCH=h8300 defconfig:

arch/h8300/kernel/traps.c: In function 'die':
arch/h8300/kernel/traps.c:109:2: error: implicit declaration of function
'make_dead_task' [-Werror=implicit-function-declaration]
109 | make_dead_task(SIGSEGV);
| ^~~~~~~~~~~~~~

arch/h8300/mm/fault.c: In function 'do_page_fault':
arch/h8300/mm/fault.c:54:2: error: implicit declaration of function
'make_dead_task' [-Werror=implicit-function-declaration]
54 | make_dead_task(SIGKILL);
| ^~~~~~~~~~~~~~

The function's name is make_task_dead(), change it so there is no more
build error.

Additionally, include linux/sched/task.h in arch/h8300/kernel/traps.c
to avoid the same error because do_exit()'s declaration is in kernel.h
but make_task_dead()'s is in task.h, which is not included in traps.c.

Fixes: 0e25498f8cd4 ("exit: Add and use make_task_dead.")
Signed-off-by: Nathan Chancellor <[email protected]>
---
arch/h8300/kernel/traps.c | 3 ++-
arch/h8300/mm/fault.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/h8300/kernel/traps.c b/arch/h8300/kernel/traps.c
index 3d4e0bde37ae..a92c39e03802 100644
--- a/arch/h8300/kernel/traps.c
+++ b/arch/h8300/kernel/traps.c
@@ -17,6 +17,7 @@
#include <linux/types.h>
#include <linux/sched.h>
#include <linux/sched/debug.h>
+#include <linux/sched/task.h>
#include <linux/mm_types.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -106,7 +107,7 @@ void die(const char *str, struct pt_regs *fp, unsigned long err)
dump(fp);

spin_unlock_irq(&die_lock);
- make_dead_task(SIGSEGV);
+ make_task_dead(SIGSEGV);
}

static int kstack_depth_to_print = 24;
diff --git a/arch/h8300/mm/fault.c b/arch/h8300/mm/fault.c
index 0223528565dd..b465441f490d 100644
--- a/arch/h8300/mm/fault.c
+++ b/arch/h8300/mm/fault.c
@@ -51,7 +51,7 @@ asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address,
printk(" at virtual address %08lx\n", address);
if (!user_mode(regs))
die("Oops", regs, error_code);
- make_dead_task(SIGKILL);
+ make_task_dead(SIGKILL);

return 1;
}
--
2.34.1

2021-12-27 18:51:00

by Nathan Chancellor

Subject: [PATCH 1/3] hexagon: Fix function name in die()

When building ARCH=hexagon defconfig:

arch/hexagon/kernel/traps.c:217:2: error: implicit declaration of
function 'make_dead_task' [-Werror,-Wimplicit-function-declaration]
make_dead_task(err);
^

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 <[email protected]>
---
arch/hexagon/kernel/traps.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/hexagon/kernel/traps.c b/arch/hexagon/kernel/traps.c
index 6dd6cf0ab711..1240f038cce0 100644
--- a/arch/hexagon/kernel/traps.c
+++ b/arch/hexagon/kernel/traps.c
@@ -214,7 +214,7 @@ int die(const char *str, struct pt_regs *regs, long err)
panic("Fatal exception");

oops_exit();
- make_dead_task(err);
+ make_task_dead(err);
return 0;
}

--
2.34.1

2021-12-27 18:51:00

by Nathan Chancellor

Subject: [PATCH 3/3] csky: Fix function name in csky_alignment() and die()

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 <[email protected]>
---
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

2021-12-28 01:46:41

by Guo Ren

Subject: Re: [PATCH 3/3] csky: Fix function name in csky_alignment() and die()

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 <[email protected]> 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 <[email protected]>
> ---
> 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/

2021-12-28 01:47:38

by Guo Ren

Subject: Re: [PATCH 3/3] csky: Fix function name in csky_alignment() and die()

Sorry mm/fault.c is okay.

Reviewed-by: Guo Ren <[email protected]>

On Tue, Dec 28, 2021 at 9:46 AM Guo Ren <[email protected]> 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 <[email protected]> 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 <[email protected]>
> > ---
> > 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/

2021-12-28 01:53:38

by Guo Ren

Subject: Re: [PATCH 3/3] csky: Fix function name in csky_alignment() and die()

I would pick up csky's & make pull-request immediately.

On Tue, Dec 28, 2021 at 9:47 AM Guo Ren <[email protected]> wrote:
>
> Sorry mm/fault.c is okay.
>
> Reviewed-by: Guo Ren <[email protected]>
>
> On Tue, Dec 28, 2021 at 9:46 AM Guo Ren <[email protected]> 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 <[email protected]> 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 <[email protected]>
> > > ---
> > > 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/

2021-12-28 02:01:26

by Guo Ren

Subject: Re: [PATCH 3/3] csky: Fix function name in csky_alignment() and die()

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

On Tue, Dec 28, 2021 at 9:53 AM Guo Ren <[email protected]> wrote:
>
> I would pick up csky's & make pull-request immediately.
>
> On Tue, Dec 28, 2021 at 9:47 AM Guo Ren <[email protected]> wrote:
> >
> > Sorry mm/fault.c is okay.
> >
> > Reviewed-by: Guo Ren <[email protected]>
> >
> > On Tue, Dec 28, 2021 at 9:46 AM Guo Ren <[email protected]> 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 <[email protected]> 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 <[email protected]>
> > > > ---
> > > > 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/

2021-12-28 02:21:30

by Nathan Chancellor

Subject: Re: [PATCH 3/3] csky: Fix function name in csky_alignment() and die()

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.

Cheers,
Nathan

> On Tue, Dec 28, 2021 at 9:53 AM Guo Ren <[email protected]> wrote:
> >
> > I would pick up csky's & make pull-request immediately.
> >
> > On Tue, Dec 28, 2021 at 9:47 AM Guo Ren <[email protected]> wrote:
> > >
> > > Sorry mm/fault.c is okay.
> > >
> > > Reviewed-by: Guo Ren <[email protected]>
> > >
> > > On Tue, Dec 28, 2021 at 9:46 AM Guo Ren <[email protected]> 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 <[email protected]> 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 <[email protected]>
> > > > > ---
> > > > > 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/

2021-12-28 02:50:37

by Guo Ren

Subject: Re: [PATCH 3/3] csky: Fix function name in csky_alignment() and die()

On Tue, Dec 28, 2021 at 10:19 AM Nathan Chancellor <[email protected]> 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 <[email protected]> wrote:
> > >
> > > I would pick up csky's & make pull-request immediately.
> > >
> > > On Tue, Dec 28, 2021 at 9:47 AM Guo Ren <[email protected]> wrote:
> > > >
> > > > Sorry mm/fault.c is okay.
> > > >
> > > > Reviewed-by: Guo Ren <[email protected]>
> > > >
> > > > On Tue, Dec 28, 2021 at 9:46 AM Guo Ren <[email protected]> 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 <[email protected]> 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 <[email protected]>
> > > > > > ---
> > > > > > 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/

2021-12-29 16:30:13

by Eric W. Biederman

Subject: Re: [PATCH 3/3] csky: Fix function name in csky_alignment() and die()

Guo Ren <[email protected]> writes:

> 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. -_*!

Human frailty and the unfortunate fact I could not find a compiler for
csky, h8300, or hexagon.

Since I could not find a compiler I could not even compile test my
changes. Nor I presume could any of the automated bots.

The good thing is that Nathan caught my typo before the change made it
to Linus.


I will get these changes applied to my tree shortly.

Eric