From: tip-bot for Borislav Petkov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, dave.hansen@linux.intel.com, hpa@zytor.com,
mingo@redhat.com, bp@suse.de, linux-kernel@vger.kernel.org,
luto@kernel.org, mingo@kernel.org, peterz@infradead.org
Subject: [tip:x86/asm] x86/mm: Convert some slow-path static_cpu_has() callers to boot_cpu_has()
Date: Mon, 8 Apr 2019 07:30:32 -0700 [thread overview]
Message-ID: <tip-28e3ace70c3d2ea47a62dffe046011d1b74ee839@git.kernel.org> (raw)
In-Reply-To: <20190330112022.28888-5-bp@alien8.de>
Commit-ID: 28e3ace70c3d2ea47a62dffe046011d1b74ee839
Gitweb: https://git.kernel.org/tip/28e3ace70c3d2ea47a62dffe046011d1b74ee839
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Fri, 29 Mar 2019 20:00:38 +0100
Committer: Borislav Petkov <bp@suse.de>
CommitDate: Mon, 8 Apr 2019 12:14:16 +0200
x86/mm: Convert some slow-path static_cpu_has() callers to boot_cpu_has()
Using static_cpu_has() is pointless on those paths, convert them to the
boot_cpu_has() variant.
No functional changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86@kernel.org
Link: https://lkml.kernel.org/r/20190330112022.28888-5-bp@alien8.de
---
arch/x86/mm/dump_pagetables.c | 4 ++--
arch/x86/mm/pgtable.c | 4 ++--
arch/x86/mm/pti.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c
index ee8f8ab46941..7b71ac15b235 100644
--- a/arch/x86/mm/dump_pagetables.c
+++ b/arch/x86/mm/dump_pagetables.c
@@ -577,7 +577,7 @@ void ptdump_walk_pgd_level(struct seq_file *m, pgd_t *pgd)
void ptdump_walk_pgd_level_debugfs(struct seq_file *m, pgd_t *pgd, bool user)
{
#ifdef CONFIG_PAGE_TABLE_ISOLATION
- if (user && static_cpu_has(X86_FEATURE_PTI))
+ if (user && boot_cpu_has(X86_FEATURE_PTI))
pgd = kernel_to_user_pgdp(pgd);
#endif
ptdump_walk_pgd_level_core(m, pgd, false, false);
@@ -590,7 +590,7 @@ void ptdump_walk_user_pgd_level_checkwx(void)
pgd_t *pgd = INIT_PGD;
if (!(__supported_pte_mask & _PAGE_NX) ||
- !static_cpu_has(X86_FEATURE_PTI))
+ !boot_cpu_has(X86_FEATURE_PTI))
return;
pr_info("x86/mm: Checking user space page tables\n");
diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
index 7bd01709a091..3dbf440d4114 100644
--- a/arch/x86/mm/pgtable.c
+++ b/arch/x86/mm/pgtable.c
@@ -190,7 +190,7 @@ static void pgd_dtor(pgd_t *pgd)
* when PTI is enabled. We need them to map the per-process LDT into the
* user-space page-table.
*/
-#define PREALLOCATED_USER_PMDS (static_cpu_has(X86_FEATURE_PTI) ? \
+#define PREALLOCATED_USER_PMDS (boot_cpu_has(X86_FEATURE_PTI) ? \
KERNEL_PGD_PTRS : 0)
#define MAX_PREALLOCATED_USER_PMDS KERNEL_PGD_PTRS
@@ -292,7 +292,7 @@ static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
#ifdef CONFIG_PAGE_TABLE_ISOLATION
- if (!static_cpu_has(X86_FEATURE_PTI))
+ if (!boot_cpu_has(X86_FEATURE_PTI))
return;
pgdp = kernel_to_user_pgdp(pgdp);
diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c
index 4fee5c3003ed..8c9a54ebda60 100644
--- a/arch/x86/mm/pti.c
+++ b/arch/x86/mm/pti.c
@@ -626,7 +626,7 @@ void pti_set_kernel_image_nonglobal(void)
*/
void __init pti_init(void)
{
- if (!static_cpu_has(X86_FEATURE_PTI))
+ if (!boot_cpu_has(X86_FEATURE_PTI))
return;
pr_info("enabled\n");
next prev parent reply other threads:[~2019-04-08 14:31 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-30 11:20 [PATCH 0/5] x86/asm: Remove some static_cpu_has() usage Borislav Petkov
2019-03-30 11:20 ` [PATCH 1/5] x86/asm: Clarify static_cpu_has()'s intended use Borislav Petkov
2019-04-01 8:06 ` Peter Zijlstra
2019-04-08 14:29 ` [tip:x86/asm] " tip-bot for Borislav Petkov
2019-03-30 11:20 ` [PATCH 2/5] x86: Convert some slow-path static_cpu_has() callers to boot_cpu_has() Borislav Petkov
2019-03-30 12:47 ` Rik van Riel
2019-03-30 12:50 ` Juergen Gross
2019-04-08 14:29 ` [tip:x86/asm] " tip-bot for Borislav Petkov
2019-03-30 11:20 ` [PATCH 3/5] x86/kvm: " Borislav Petkov
2019-03-31 14:20 ` Paolo Bonzini
2019-03-31 15:12 ` Borislav Petkov
2019-04-01 7:24 ` Paolo Bonzini
2019-04-01 7:33 ` Borislav Petkov
2019-03-30 11:20 ` [PATCH 4/5] x86/mm: " Borislav Petkov
2019-04-08 14:30 ` tip-bot for Borislav Petkov [this message]
2019-03-30 11:20 ` [PATCH 5/5] drivers/cpufreq: " Borislav Petkov
2019-04-01 9:31 ` Rafael J. Wysocki
2019-04-01 9:32 ` Rafael J. Wysocki
2019-04-01 12:48 ` Borislav Petkov
2019-04-01 21:34 ` Rafael J. Wysocki
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=tip-28e3ace70c3d2ea47a62dffe046011d1b74ee839@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@suse.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox