2022-04-26 14:27:27

by Jun Miao

Subject: [PATCH] irq_work: Make irq_work_queue_on() NMI-safe again

We should not put NMI unsafe code in irq_work_queue_on().

The KASAN of kasan_record_aux_stack_noalloc() is not NMI safe. Because which
will call the spinlock. While the irq_work_queue_on() is also very carefully
carafted to be exactly that.
When unable CONFIG_SM or local CPU, the irq_work_queue_on() is even same to
irq_work_queue(). So delete KASAN instantly.

Fixes: e2b5bcf9f5ba ("irq_work: record irq_work_queue() call stack")
Suggested by: "Huang, Ying" <[email protected]>
Signed-off-by: Jun Miao <[email protected]>
---
kernel/irq_work.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/kernel/irq_work.c b/kernel/irq_work.c
index 7afa40fe5cc4..e7f48aa8d8af 100644
--- a/kernel/irq_work.c
+++ b/kernel/irq_work.c
@@ -20,7 +20,6 @@
#include <linux/smp.h>
#include <linux/smpboot.h>
#include <asm/processor.h>
-#include <linux/kasan.h>

static DEFINE_PER_CPU(struct llist_head, raised_list);
static DEFINE_PER_CPU(struct llist_head, lazy_list);
@@ -137,8 +136,6 @@ bool irq_work_queue_on(struct irq_work *work, int cpu)
if (!irq_work_claim(work))
return false;

- kasan_record_aux_stack_noalloc(work);
-
preempt_disable();
if (cpu != smp_processor_id()) {
/* Arch remote IPI send/receive backend aren't NMI safe */
--
2.32.0

2022-04-27 09:13:22

by Jun Miao

Subject: Re: [PATCH] irq_work: Make irq_work_queue_on() NMI-safe again

Add  To/Cc : KASAN/MEM , since I only used the scripts/get_maintainer.pl
to irq_work.c file.

Thanks
Jun Miao


On 2022/4/26 21:49, Jun Miao wrote:
> We should not put NMI unsafe code in irq_work_queue_on().
>
> The KASAN of kasan_record_aux_stack_noalloc() is not NMI safe. Because which
> will call the spinlock. While the irq_work_queue_on() is also very carefully
> carafted to be exactly that.
> When unable CONFIG_SM or local CPU, the irq_work_queue_on() is even same to
> irq_work_queue(). So delete KASAN instantly.
>
> Fixes: e2b5bcf9f5ba ("irq_work: record irq_work_queue() call stack")
> Suggested by: "Huang, Ying" <[email protected]>
> Signed-off-by: Jun Miao <[email protected]>
> ---
> kernel/irq_work.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/kernel/irq_work.c b/kernel/irq_work.c
> index 7afa40fe5cc4..e7f48aa8d8af 100644
> --- a/kernel/irq_work.c
> +++ b/kernel/irq_work.c
> @@ -20,7 +20,6 @@
> #include <linux/smp.h>
> #include <linux/smpboot.h>
> #include <asm/processor.h>
> -#include <linux/kasan.h>
>
> static DEFINE_PER_CPU(struct llist_head, raised_list);
> static DEFINE_PER_CPU(struct llist_head, lazy_list);
> @@ -137,8 +136,6 @@ bool irq_work_queue_on(struct irq_work *work, int cpu)
> if (!irq_work_claim(work))
> return false;
>
> - kasan_record_aux_stack_noalloc(work);
> -
> preempt_disable();
> if (cpu != smp_processor_id()) {
> /* Arch remote IPI send/receive backend aren't NMI safe */

2022-04-27 12:52:54

by Marco Elver

Subject: Re: [PATCH] irq_work: Make irq_work_queue_on() NMI-safe again

On Wed, 27 Apr 2022 at 03:49, Jun Miao <[email protected]> wrote:
>
> Add To/Cc : KASAN/MEM , since I only used the scripts/get_maintainer.pl
> to irq_work.c file.
>
> Thanks
> Jun Miao
>
>
> On 2022/4/26 21:49, Jun Miao wrote:
> > We should not put NMI unsafe code in irq_work_queue_on().
> >
> > The KASAN of kasan_record_aux_stack_noalloc() is not NMI safe. Because which
> > will call the spinlock. While the irq_work_queue_on() is also very carefully
> > carafted to be exactly that.

"crafted"

> > When unable CONFIG_SM or local CPU, the irq_work_queue_on() is even same to

CONFIG_SM -> CONFIG_SMP

> > irq_work_queue(). So delete KASAN instantly.
> >
> > Fixes: e2b5bcf9f5ba ("irq_work: record irq_work_queue() call stack")
> > Suggested by: "Huang, Ying" <[email protected]>
> > Signed-off-by: Jun Miao <[email protected]>

I thought this had already been removed, but apparently there were 2
places: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=156172a13ff0626d8e23276e741c7e2cb2f3b572

Acked-by: Marco Elver <[email protected]>

> > ---
> > kernel/irq_work.c | 3 ---
> > 1 file changed, 3 deletions(-)
> >
> > diff --git a/kernel/irq_work.c b/kernel/irq_work.c
> > index 7afa40fe5cc4..e7f48aa8d8af 100644
> > --- a/kernel/irq_work.c
> > +++ b/kernel/irq_work.c
> > @@ -20,7 +20,6 @@
> > #include <linux/smp.h>
> > #include <linux/smpboot.h>
> > #include <asm/processor.h>
> > -#include <linux/kasan.h>
> >
> > static DEFINE_PER_CPU(struct llist_head, raised_list);
> > static DEFINE_PER_CPU(struct llist_head, lazy_list);
> > @@ -137,8 +136,6 @@ bool irq_work_queue_on(struct irq_work *work, int cpu)
> > if (!irq_work_claim(work))
> > return false;
> >
> > - kasan_record_aux_stack_noalloc(work);
> > -
> > preempt_disable();
> > if (cpu != smp_processor_id()) {
> > /* Arch remote IPI send/receive backend aren't NMI safe */
>
> --
> You received this message because you are subscribed to the Google Groups "kasan-dev" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
> To view this discussion on the web visit https://groups.google.com/d/msgid/kasan-dev/9c951fe6-d354-5870-e91b-83d8346ac162%40intel.com.

2022-04-27 13:46:43

by Jun Miao

Subject: Re: [PATCH] irq_work: Make irq_work_queue_on() NMI-safe again

On 2022/4/27 20:26, Marco Elver wrote:
> On Wed, 27 Apr 2022 at 03:49, Jun Miao <[email protected]> wrote:
>> Add To/Cc : KASAN/MEM , since I only used the scripts/get_maintainer.pl
>> to irq_work.c file.
>>
>> Thanks
>> Jun Miao
>>
>>
>> On 2022/4/26 21:49, Jun Miao wrote:
>>> We should not put NMI unsafe code in irq_work_queue_on().
>>>
>>> The KASAN of kasan_record_aux_stack_noalloc() is not NMI safe. Because which
>>> will call the spinlock. While the irq_work_queue_on() is also very carefully
>>> carafted to be exactly that.
> "crafted"
>
>>> When unable CONFIG_SM or local CPU, the irq_work_queue_on() is even same to
> CONFIG_SM -> CONFIG_SMP
>
>>> irq_work_queue(). So delete KASAN instantly.
>>>
>>> Fixes: e2b5bcf9f5ba ("irq_work: record irq_work_queue() call stack")
>>> Suggested by: "Huang, Ying" <[email protected]>
>>> Signed-off-by: Jun Miao <[email protected]>
> I thought this had already been removed, but apparently there were 2
> places: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=156172a13ff0626d8e23276e741c7e2cb2f3b572
>
> Acked-by: Marco Elver <[email protected]>

Sure, I also found this patch which is the same reason, maybe Peter Z
forgot it. Let me make up a little.????

Send V2 later.

Thanks
Jun Miao
>>> ---
>>> kernel/irq_work.c | 3 ---
>>> 1 file changed, 3 deletions(-)
>>>
>>> diff --git a/kernel/irq_work.c b/kernel/irq_work.c
>>> index 7afa40fe5cc4..e7f48aa8d8af 100644
>>> --- a/kernel/irq_work.c
>>> +++ b/kernel/irq_work.c
>>> @@ -20,7 +20,6 @@
>>> #include <linux/smp.h>
>>> #include <linux/smpboot.h>
>>> #include <asm/processor.h>
>>> -#include <linux/kasan.h>
>>>
>>> static DEFINE_PER_CPU(struct llist_head, raised_list);
>>> static DEFINE_PER_CPU(struct llist_head, lazy_list);
>>> @@ -137,8 +136,6 @@ bool irq_work_queue_on(struct irq_work *work, int cpu)
>>> if (!irq_work_claim(work))
>>> return false;
>>>
>>> - kasan_record_aux_stack_noalloc(work);
>>> -
>>> preempt_disable();
>>> if (cpu != smp_processor_id()) {
>>> /* Arch remote IPI send/receive backend aren't NMI safe */
>> --
>> You received this message because you are subscribed to the Google Groups "kasan-dev" group.
>> To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
>> To view this discussion on the web visit https://groups.google.com/d/msgid/kasan-dev/9c951fe6-d354-5870-e91b-83d8346ac162%40intel.com.