mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] x86/mm/64: Fix an incorrect warning with CONFIG_DEBUG_VM=y, !PCID
@ 2017-09-10 15:52 Andy Lutomirski
  2017-09-10 19:10 ` Andy Lutomirski
  0 siblings, 1 reply; 4+ messages in thread
From: Andy Lutomirski @ 2017-09-10 15:52 UTC (permalink / raw)
  To: x86; +Cc: linux-kernel, Borislav Petkov, Linus Torvalds, Andy Lutomirski

I've been staring at the word PCID too long.

Fixes: f13c8e8c58ba ("x86/mm: Reinitialize TLB state on hotplug and resume")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Andy Lutomirski <luto@kernel.org>
---
 arch/x86/mm/tlb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index 158acdad2773..1ab3821f9e26 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -261,7 +261,7 @@ void initialize_tlbstate_and_flush(void)
 	 * doesn't work like other CR4 bits because it can only be set from
 	 * long mode.)
 	 */
-	WARN_ON(boot_cpu_has(X86_CR4_PCIDE) &&
+	WARN_ON(boot_cpu_has(X86_FEATURE_PCID) &&
 		!(cr4_read_shadow() & X86_CR4_PCIDE));
 
 	/* Force ASID 0 and force a TLB flush. */
-- 
2.13.5

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] x86/mm/64: Fix an incorrect warning with CONFIG_DEBUG_VM=y, !PCID
  2017-09-10 15:52 [PATCH] x86/mm/64: Fix an incorrect warning with CONFIG_DEBUG_VM=y, !PCID Andy Lutomirski
@ 2017-09-10 19:10 ` Andy Lutomirski
  2017-09-10 19:32   ` Linus Torvalds
  0 siblings, 1 reply; 4+ messages in thread
From: Andy Lutomirski @ 2017-09-10 19:10 UTC (permalink / raw)
  To: Andy Lutomirski; +Cc: X86 ML, linux-kernel, Borislav Petkov, Linus Torvalds

On Sun, Sep 10, 2017 at 8:52 AM, Andy Lutomirski <luto@kernel.org> wrote:
> I've been staring at the word PCID too long.
>
> Fixes: f13c8e8c58ba ("x86/mm: Reinitialize TLB state on hotplug and resume")
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Andy Lutomirski <luto@kernel.org>
> ---
>  arch/x86/mm/tlb.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
> index 158acdad2773..1ab3821f9e26 100644
> --- a/arch/x86/mm/tlb.c
> +++ b/arch/x86/mm/tlb.c
> @@ -261,7 +261,7 @@ void initialize_tlbstate_and_flush(void)
>          * doesn't work like other CR4 bits because it can only be set from
>          * long mode.)
>          */
> -       WARN_ON(boot_cpu_has(X86_CR4_PCIDE) &&
> +       WARN_ON(boot_cpu_has(X86_FEATURE_PCID) &&
>                 !(cr4_read_shadow() & X86_CR4_PCIDE));
>
>         /* Force ASID 0 and force a TLB flush. */
> --
> 2.13.5
>

Ugh, don't apply this.  There's a somewhat deeper problem here.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] x86/mm/64: Fix an incorrect warning with CONFIG_DEBUG_VM=y, !PCID
  2017-09-10 19:10 ` Andy Lutomirski
@ 2017-09-10 19:32   ` Linus Torvalds
  2017-09-10 19:41     ` Andy Lutomirski
  0 siblings, 1 reply; 4+ messages in thread
From: Linus Torvalds @ 2017-09-10 19:32 UTC (permalink / raw)
  To: Andy Lutomirski; +Cc: X86 ML, linux-kernel, Borislav Petkov

On Sun, Sep 10, 2017 at 12:10 PM, Andy Lutomirski <luto@kernel.org> wrote:
>
> Ugh, don't apply this.  There's a somewhat deeper problem here.

Too late. Commit 7898f7965469 ("x86/mm/64: Fix an incorrect warning
with CONFIG_DEBUG_VM=y, !PCID").

          Linus

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] x86/mm/64: Fix an incorrect warning with CONFIG_DEBUG_VM=y, !PCID
  2017-09-10 19:32   ` Linus Torvalds
@ 2017-09-10 19:41     ` Andy Lutomirski
  0 siblings, 0 replies; 4+ messages in thread
From: Andy Lutomirski @ 2017-09-10 19:41 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Andy Lutomirski, X86 ML, linux-kernel, Borislav Petkov

On Sun, Sep 10, 2017 at 12:32 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Sun, Sep 10, 2017 at 12:10 PM, Andy Lutomirski <luto@kernel.org> wrote:
>>
>> Ugh, don't apply this.  There's a somewhat deeper problem here.
>
> Too late. Commit 7898f7965469 ("x86/mm/64: Fix an incorrect warning
> with CONFIG_DEBUG_VM=y, !PCID").
>

OK, no biggie.  I'll rebase.

--Andy

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-09-10 19:41 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-10 15:52 [PATCH] x86/mm/64: Fix an incorrect warning with CONFIG_DEBUG_VM=y, !PCID Andy Lutomirski
2017-09-10 19:10 ` Andy Lutomirski
2017-09-10 19:32   ` Linus Torvalds
2017-09-10 19:41     ` Andy Lutomirski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®