From: Jiang Biao <jiang.biao2@zte.com.cn>
To: tglx@linutronix.de, mingo@redhat.com
Cc: dave.hansen@linux.intel.com, luto@kernel.org, hpa@zytor.com,
x86@kernel.org, albcamus@gmail.com, linux-kernel@vger.kernel.org,
zhong.weidong@zte.com.cn, jiang.biao2@zte.com.cn
Subject: [PATCH 4/5] x86/pti: warn for unknown pti boot options
Date: Mon, 16 Jul 2018 12:03:39 +0800 [thread overview]
Message-ID: <1531713820-24544-5-git-send-email-jiang.biao2@zte.com.cn> (raw)
In-Reply-To: <1531713820-24544-1-git-send-email-jiang.biao2@zte.com.cn>
When using unknown pti boot options other than on/off/auto, we
select auto silently, which is sometimes confusing. Add warning for
unknown pti boot options like we do in
spectre_v2_select_mitigation().
Signed-off-by: Jiang Biao <jiang.biao2@zte.com.cn>
---
arch/x86/mm/pti.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c
index a76b2cc..a368656 100644
--- a/arch/x86/mm/pti.c
+++ b/arch/x86/mm/pti.c
@@ -92,14 +92,14 @@ void __init pti_check_boottime_disable(void)
pti_mode = PTI_FORCE_OFF;
pti_print_if_insecure("disabled on command line.");
return;
- }
- if (ret == 2 && !strncmp(arg, "on", 2)) {
+ } else if (ret == 2 && !strncmp(arg, "on", 2)) {
pti_mode = PTI_FORCE_ON;
pti_print_if_secure("force enabled on command line.");
goto enable;
- }
- if (ret == 4 && !strncmp(arg, "auto", 4)) {
- pti_mode = PTI_AUTO;
+ } else if (ret == 4 && !strncmp(arg, "auto", 4)) {
+ goto autosel;
+ } else {
+ pr_err("unknown option (%s). Switching to AUTO select\n", arg);
goto autosel;
}
}
--
2.7.4
next prev parent reply other threads:[~2018-07-16 4:22 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-16 4:03 [PATCH 0/5] x86/pti: small fixes and cleanups for pti Jiang Biao
2018-07-16 4:03 ` [PATCH 1/5] x86/pti: check the return value of pti_user_pagetable_walk_p4d Jiang Biao
2018-07-16 14:28 ` Dave Hansen
2018-07-16 4:03 ` [PATCH 2/5] x86/pti: check the return value of pti_user_pagetable_walk_pmd Jiang Biao
2018-07-16 4:03 ` [PATCH 3/5] x86/pti: make pti_set_kernel_image_nonglobal static Jiang Biao
2018-07-16 15:16 ` Dave Hansen
2018-07-16 16:04 ` [tip:x86/pti] x86/pti: Make pti_set_kernel_image_nonglobal() static tip-bot for Jiang Biao
2018-07-16 4:03 ` Jiang Biao [this message]
2018-07-16 14:34 ` [PATCH 4/5] x86/pti: warn for unknown pti boot options Dave Hansen
2018-07-16 4:03 ` [PATCH 5/5] x86/pti: constify address parameters Jiang Biao
2018-07-16 14:37 ` Dave Hansen
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=1531713820-24544-5-git-send-email-jiang.biao2@zte.com.cn \
--to=jiang.biao2@zte.com.cn \
--cc=albcamus@gmail.com \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=zhong.weidong@zte.com.cn \
/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
all inboxes | Powered by JetHome®