From: Peter Zijlstra <peterz@infradead.org>
To: ira.weiny@intel.com
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Andy Lutomirski <luto@kernel.org>,
x86@kernel.org, Dave Hansen <dave.hansen@linux.intel.com>,
Andrew Morton <akpm@linux-foundation.org>,
Fenghua Yu <fenghua.yu@intel.com>,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-nvdimm@lists.01.org, linux-fsdevel@vger.kernel.org,
linux-mm@kvack.org, linux-kselftest@vger.kernel.org
Subject: Re: [PATCH RFC V3 6/9] x86/entry: Pass irqentry_state_t by reference
Date: Fri, 16 Oct 2020 13:45:10 +0200 [thread overview]
Message-ID: <20201016114510.GO2611@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <20201009194258.3207172-7-ira.weiny@intel.com>
On Fri, Oct 09, 2020 at 12:42:55PM -0700, ira.weiny@intel.com wrote:
> -noinstr bool idtentry_enter_nmi(struct pt_regs *regs)
> +noinstr void idtentry_enter_nmi(struct pt_regs *regs, irqentry_state_t *irq_state)
> {
> - bool irq_state = lockdep_hardirqs_enabled();
> + irq_state->exit_rcu = lockdep_hardirqs_enabled();
>
> __nmi_enter();
> lockdep_hardirqs_off(CALLER_ADDR0);
> @@ -222,15 +222,13 @@ noinstr bool idtentry_enter_nmi(struct pt_regs *regs)
> trace_hardirqs_off_finish();
> ftrace_nmi_enter();
> instrumentation_end();
> -
> - return irq_state;
> }
>
> -noinstr void idtentry_exit_nmi(struct pt_regs *regs, bool restore)
> +noinstr void idtentry_exit_nmi(struct pt_regs *regs, irqentry_state_t *irq_state)
> {
> instrumentation_begin();
> ftrace_nmi_exit();
> - if (restore) {
> + if (irq_state->exit_rcu) {
> trace_hardirqs_on_prepare();
> lockdep_hardirqs_on_prepare(CALLER_ADDR0);
> }
> @@ -238,7 +236,7 @@ noinstr void idtentry_exit_nmi(struct pt_regs *regs, bool restore)
>
> rcu_nmi_exit();
> lockdep_hardirq_exit();
> - if (restore)
> + if (irq_state->exit_rcu)
> lockdep_hardirqs_on(CALLER_ADDR0);
> __nmi_exit();
> }
That's not nice.. The NMI path is different from the IRQ path and has a
different variable. Yes, this works, but *groan*.
Maybe union them if you want to avoid bloating the structure, but the
above makes it really hard to read.
_______________________________________________
Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
To unsubscribe send an email to linux-nvdimm-leave@lists.01.org
WARNING: multiple messages have this Message-ID (diff)
From: Peter Zijlstra <peterz@infradead.org>
To: ira.weiny@intel.com
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Andy Lutomirski <luto@kernel.org>,
x86@kernel.org, Dave Hansen <dave.hansen@linux.intel.com>,
Dan Williams <dan.j.williams@intel.com>,
Andrew Morton <akpm@linux-foundation.org>,
Fenghua Yu <fenghua.yu@intel.com>,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-nvdimm@lists.01.org, linux-fsdevel@vger.kernel.org,
linux-mm@kvack.org, linux-kselftest@vger.kernel.org
Subject: Re: [PATCH RFC V3 6/9] x86/entry: Pass irqentry_state_t by reference
Date: Fri, 16 Oct 2020 13:45:10 +0200 [thread overview]
Message-ID: <20201016114510.GO2611@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <20201009194258.3207172-7-ira.weiny@intel.com>
On Fri, Oct 09, 2020 at 12:42:55PM -0700, ira.weiny@intel.com wrote:
> -noinstr bool idtentry_enter_nmi(struct pt_regs *regs)
> +noinstr void idtentry_enter_nmi(struct pt_regs *regs, irqentry_state_t *irq_state)
> {
> - bool irq_state = lockdep_hardirqs_enabled();
> + irq_state->exit_rcu = lockdep_hardirqs_enabled();
>
> __nmi_enter();
> lockdep_hardirqs_off(CALLER_ADDR0);
> @@ -222,15 +222,13 @@ noinstr bool idtentry_enter_nmi(struct pt_regs *regs)
> trace_hardirqs_off_finish();
> ftrace_nmi_enter();
> instrumentation_end();
> -
> - return irq_state;
> }
>
> -noinstr void idtentry_exit_nmi(struct pt_regs *regs, bool restore)
> +noinstr void idtentry_exit_nmi(struct pt_regs *regs, irqentry_state_t *irq_state)
> {
> instrumentation_begin();
> ftrace_nmi_exit();
> - if (restore) {
> + if (irq_state->exit_rcu) {
> trace_hardirqs_on_prepare();
> lockdep_hardirqs_on_prepare(CALLER_ADDR0);
> }
> @@ -238,7 +236,7 @@ noinstr void idtentry_exit_nmi(struct pt_regs *regs, bool restore)
>
> rcu_nmi_exit();
> lockdep_hardirq_exit();
> - if (restore)
> + if (irq_state->exit_rcu)
> lockdep_hardirqs_on(CALLER_ADDR0);
> __nmi_exit();
> }
That's not nice.. The NMI path is different from the IRQ path and has a
different variable. Yes, this works, but *groan*.
Maybe union them if you want to avoid bloating the structure, but the
above makes it really hard to read.
next prev parent reply other threads:[~2020-10-16 11:45 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-09 19:42 [PATCH RFC V3 0/9] PKS: Add Protection Keys Supervisor (PKS) support RFC v3 ira.weiny
2020-10-09 19:42 ` ira.weiny
2020-10-09 19:42 ` [PATCH RFC V3 1/9] x86/pkeys: Create pkeys_common.h ira.weiny
2020-10-09 19:42 ` ira.weiny
2020-10-13 17:46 ` Dave Hansen
2020-10-13 17:46 ` Dave Hansen
2020-10-13 19:44 ` Ira Weiny
2020-10-13 19:44 ` Ira Weiny
2020-10-09 19:42 ` [PATCH RFC V3 2/9] x86/fpu: Refactor arch_set_user_pkey_access() for PKS support ira.weiny
2020-10-09 19:42 ` ira.weiny
2020-10-13 17:50 ` Dave Hansen
2020-10-13 17:50 ` Dave Hansen
2020-10-13 23:56 ` Ira Weiny
2020-10-13 23:56 ` Ira Weiny
2020-10-16 10:57 ` Peter Zijlstra
2020-10-16 10:57 ` Peter Zijlstra
2020-10-17 3:32 ` Ira Weiny
2020-10-17 3:32 ` Ira Weiny
2020-10-19 9:35 ` Peter Zijlstra
2020-10-19 9:35 ` Peter Zijlstra
2020-10-09 19:42 ` [PATCH RFC V3 3/9] x86/pks: Enable Protection Keys Supervisor (PKS) ira.weiny
2020-10-09 19:42 ` ira.weiny
2020-10-13 18:23 ` Dave Hansen
2020-10-13 18:23 ` Dave Hansen
2020-10-14 2:08 ` Ira Weiny
2020-10-14 2:08 ` Ira Weiny
2020-10-09 19:42 ` [PATCH RFC V3 4/9] x86/pks: Preserve the PKRS MSR on context switch ira.weiny
2020-10-09 19:42 ` ira.weiny
2020-10-13 18:31 ` Dave Hansen
2020-10-13 18:31 ` Dave Hansen
2020-10-14 22:36 ` Ira Weiny
2020-10-14 22:36 ` Ira Weiny
2020-10-16 11:12 ` Peter Zijlstra
2020-10-16 11:12 ` Peter Zijlstra
2020-10-17 5:14 ` Ira Weiny
2020-10-17 5:14 ` Ira Weiny
2020-10-19 9:37 ` Peter Zijlstra
2020-10-19 9:37 ` Peter Zijlstra
2020-10-19 18:48 ` Ira Weiny
2020-10-19 18:48 ` Ira Weiny
2020-10-16 11:06 ` Peter Zijlstra
2020-10-16 11:06 ` Peter Zijlstra
2020-10-17 5:37 ` Ira Weiny
2020-10-17 5:37 ` Ira Weiny
2020-10-09 19:42 ` [PATCH RFC V3 5/9] x86/pks: Add PKS kernel API ira.weiny
2020-10-09 19:42 ` ira.weiny
2020-10-13 18:43 ` Dave Hansen
2020-10-13 18:43 ` Dave Hansen
2020-10-15 1:08 ` Ira Weiny
2020-10-15 1:08 ` Ira Weiny
2020-10-16 11:07 ` Peter Zijlstra
2020-10-16 11:07 ` Peter Zijlstra
2020-10-17 5:42 ` Ira Weiny
2020-10-17 5:42 ` Ira Weiny
2020-10-09 19:42 ` [PATCH RFC V3 6/9] x86/entry: Pass irqentry_state_t by reference ira.weiny
2020-10-09 19:42 ` ira.weiny
2020-10-16 11:45 ` Peter Zijlstra [this message]
2020-10-16 11:45 ` Peter Zijlstra
2020-10-16 12:55 ` Thomas Gleixner
2020-10-16 12:55 ` Thomas Gleixner
2020-10-19 5:37 ` Ira Weiny
2020-10-19 5:37 ` Ira Weiny
2020-10-19 9:32 ` Thomas Gleixner
2020-10-19 9:32 ` Thomas Gleixner
2020-10-19 20:26 ` Ira Weiny
2020-10-19 20:26 ` Ira Weiny
2020-10-19 21:12 ` Thomas Gleixner
2020-10-19 21:12 ` Thomas Gleixner
2020-10-20 14:10 ` Ira Weiny
2020-10-20 14:10 ` Ira Weiny
2020-10-09 19:42 ` [PATCH RFC V3 7/9] x86/entry: Preserve PKRS MSR across exceptions ira.weiny
2020-10-09 19:42 ` ira.weiny
2020-10-13 18:52 ` Dave Hansen
2020-10-13 18:52 ` Dave Hansen
2020-10-15 3:46 ` Ira Weiny
2020-10-15 3:46 ` Ira Weiny
2020-10-15 4:06 ` Dave Hansen
2020-10-15 4:06 ` Dave Hansen
2020-10-15 4:18 ` Ira Weiny
2020-10-15 4:18 ` Ira Weiny
2020-10-09 19:42 ` [PATCH RFC V3 8/9] x86/fault: Report the PKRS state on fault ira.weiny
2020-10-09 19:42 ` ira.weiny
2020-10-13 18:56 ` Dave Hansen
2020-10-13 18:56 ` Dave Hansen
2020-10-15 4:13 ` Ira Weiny
2020-10-15 4:13 ` Ira Weiny
2020-10-09 19:42 ` [PATCH RFC V3 9/9] x86/pks: Add PKS test code ira.weiny
2020-10-09 19:42 ` ira.weiny
2020-10-13 19:02 ` Dave Hansen
2020-10-13 19:02 ` Dave Hansen
2020-10-15 4:46 ` Ira Weiny
2020-10-15 4:46 ` Ira Weiny
2020-10-09 20:18 ` [PATCH RFC V3 0/9] PKS: Add Protection Keys Supervisor (PKS) support RFC v3 Ira Weiny
2020-10-09 20:18 ` Ira Weiny
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=20201016114510.GO2611@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=fenghua.yu@intel.com \
--cc=ira.weiny@intel.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nvdimm@lists.01.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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.