LKML Archive on lore.kernel.org help / color / mirror / Atom feed
From: Fenghua Yu <fenghua.yu@intel.com> To: "Thomas Gleixner" <tglx@linutronix.de>, "Ingo Molnar" <mingo@elte.hu>, "H. Peter Anvin" <hpa@linux.intel.com>, "Ashok Raj" <ashok.raj@intel.com>, "Ravi V Shankar" <ravi.v.shankar@intel.com>, "Tony Luck" <tony.luck@intel.com>, "Dave Hansen" <dave.hansen@intel.com>, "Rafael Wysocki" <rafael.j.wysocki@intel.com>, "Arjan van de Ven" <arjan@infradead.org>, "Alan Cox" <alan@linux.intel.com> Cc: "x86" <x86@kernel.org>, "linux-kernel" <linux-kernel@vger.kernel.org>, Fenghua Yu <fenghua.yu@intel.com> Subject: [PATCH 11/15] x86/split_lock: Add sysfs interface to control user mode behavior Date: Mon, 14 May 2018 11:52:21 -0700 [thread overview] Message-ID: <1526323945-211107-12-git-send-email-fenghua.yu@intel.com> (raw) In-Reply-To: <1526323945-211107-1-git-send-email-fenghua.yu@intel.com> Add the interface /sys/kernel/split_lock/user_mode to allow user to choose to either generate SIGBUS (default) when hitting split lock in user or re-execute the user faulting instruction without generating SIGBUS signal. Signed-off-by: Fenghua Yu <fenghua.yu@intel.com> --- arch/x86/kernel/cpu/split_lock.c | 89 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/arch/x86/kernel/cpu/split_lock.c b/arch/x86/kernel/cpu/split_lock.c index 5d399b09c1c8..02b461c48b3c 100644 --- a/arch/x86/kernel/cpu/split_lock.c +++ b/arch/x86/kernel/cpu/split_lock.c @@ -32,6 +32,19 @@ static DECLARE_DELAYED_WORK(delayed_work, delayed_reenable_split_lock); static DEFINE_MUTEX(split_lock_mutex); +enum { + USER_MODE_SIGBUS, + USER_MODE_RE_EXECUTE, + USER_MODE_LAST +}; + +static int user_mode_reaction = USER_MODE_SIGBUS; + +static const char * const user_modes[USER_MODE_LAST] = { + [USER_MODE_SIGBUS] = "sigbus", + [USER_MODE_RE_EXECUTE] = "re-execute", +}; + /* * On processors not supporting #AC exception for split lock feature, * MSR_TEST_CTL may not exist or MSR_TEST_CTL exists but the bit 29 is @@ -214,6 +227,16 @@ static void delayed_reenable_split_lock(struct work_struct *w) _setup_split_lock(ENABLE_SPLIT_LOCK_AC); } +static unsigned long eflags_ac(struct pt_regs *regs) +{ + return regs->flags & X86_EFLAGS_AC; +} + +static unsigned long cr0_am(struct pt_regs *regs) +{ + return read_cr0() & X86_CR0_AM; +} + /* Will the faulting instruction be re-executed? */ static bool re_execute(struct pt_regs *regs) { @@ -224,6 +247,24 @@ static bool re_execute(struct pt_regs *regs) if (!user_mode(regs)) return true; + /* + * Now check if the user faulting instruction can be re-executed. + * + * If both CR0.AM (Alignment Mask) and EFLAGS.AC (Alignment Check) + * are set in user space, any misalignment including split lock + * can trigger #AC. In this case, we just issue SIGBUS as standard + * #AC handler to the user process because split lock is not the + * definite reason for triggering this #AC. + * + * If either CR0.AM or EFLAGS.AC is zero, the only reason for + * triggering this #AC is split lock. So the faulting instruction + * can be re-executed if required by user. + */ + if (cr0_am(regs) == 0 || eflags_ac(regs) == 0) + /* User faulting instruction will be re-executed if required. */ + if (user_mode_reaction == USER_MODE_RE_EXECUTE) + return true; + return false; } @@ -323,8 +364,56 @@ static ssize_t enable_store(struct kobject *kobj, struct kobj_attribute *attr, static struct kobj_attribute split_lock_ac_enable = __ATTR_RW(enable); +static ssize_t +user_mode_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) +{ + char *s = buf; + int reaction; + + for (reaction = 0; reaction < USER_MODE_LAST; reaction++) { + if (reaction == user_mode_reaction) + s += sprintf(s, "[%s] ", user_modes[reaction]); + else + s += sprintf(s, "%s ", user_modes[reaction]); + } + + if (s != buf) + /* convert the last space to a newline */ + *(s - 1) = '\n'; + + return s - buf; +} + +static ssize_t +user_mode_store(struct kobject *kobj, struct kobj_attribute *attr, + const char *buf, size_t count) +{ + int reaction, len, error = -EINVAL; + const char * const *s, *p; + + p = memchr(buf, '\n', count); + len = p ? p - buf : count; + + mutex_lock(&split_lock_mutex); + reaction = USER_MODE_SIGBUS; + for (s = &user_modes[reaction]; reaction <= USER_MODE_LAST; + s++, reaction++) { + if (*s && len == strlen(*s) && !strncmp(buf, *s, len)) { + user_mode_reaction = reaction; + error = 0; + break; + } + } + mutex_unlock(&split_lock_mutex); + + return error ? error : count; +} + +static struct kobj_attribute split_lock_ac_user = __ATTR_RW(user_mode); + static struct attribute *split_lock_attrs[] = { &split_lock_ac_enable.attr, + &split_lock_ac_user.attr, NULL, }; -- 2.5.0
next prev parent reply other threads:[~2018-05-14 18:52 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-14 18:52 [PATCH 0/15] x86/split_lock: Enable #AC exception for split locked accesses Fenghua Yu 2018-05-14 18:52 ` [PATCH 01/15] x86/split_lock: Add CONFIG and enumerate #AC exception for split locked access feature Fenghua Yu 2018-05-15 15:36 ` Dave Hansen 2018-05-15 15:41 ` Fenghua Yu 2018-05-15 15:54 ` Dave Hansen 2018-05-14 18:52 ` [PATCH 02/15] x86/split_lock: Set up #AC exception for split locked accesses Fenghua Yu 2018-05-14 18:52 ` [PATCH 03/15] x86/split_lock: Handle #AC exception for split lock in kernel mode Fenghua Yu 2018-05-15 15:51 ` Dave Hansen 2018-05-15 16:35 ` Luck, Tony 2018-05-15 17:21 ` Fenghua Yu 2018-05-16 16:44 ` Dave Hansen 2018-05-16 21:35 ` Fenghua Yu 2018-05-14 18:52 ` [PATCH 04/15] x86/split_lock: Use non locked bit set instruction in set_cpu_cap Fenghua Yu 2018-05-14 18:52 ` [PATCH 05/15] x86/split_lock: Use non atomic set and clear bit instructions to clear cpufeature Fenghua Yu 2018-05-14 18:52 ` [PATCH 06/15] x86/split_lock: Save #AC setting for split lock in BIOS in boot time and restore the setting in reboot Fenghua Yu 2018-05-14 18:52 ` [PATCH 07/15] x86/split_lock: Handle suspend/hibernate and resume Fenghua Yu 2018-05-14 21:42 ` Rafael J. Wysocki 2018-05-14 18:52 ` [PATCH 08/15] x86/split_lock: Set split lock during EFI runtime service Fenghua Yu 2018-05-14 18:52 ` [PATCH 09/15] x86/split_lock: Explicitly enable or disable #AC for split locked accesses Fenghua Yu 2018-05-15 16:15 ` Dave Hansen 2018-05-15 17:29 ` Fenghua Yu 2018-05-16 16:37 ` Dave Hansen 2018-05-14 18:52 ` [PATCH 10/15] x86/split_lock: Add a sysfs interface to allow user to enable or disable split lock during run time Fenghua Yu 2018-05-14 18:52 ` Fenghua Yu [this message] 2018-05-14 18:52 ` [PATCH 12/15] x86/split_lock: Add sysfs interface to show and control BIOS split lock setting Fenghua Yu 2018-05-14 18:52 ` [PATCH 13/15] x86/split_lock: Trace #AC exception for split lock Fenghua Yu 2018-05-14 18:52 ` [PATCH 14/15] x86/split_lock: Add CONFIG and testing sysfs interface Fenghua Yu 2018-05-14 18:52 ` [PATCH 15/15] x86/split_lock: Add split lock user space test in selftest Fenghua Yu 2018-05-15 15:10 ` [PATCH 0/15] x86/split_lock: Enable #AC exception for split locked accesses Dave Hansen 2018-05-15 16:26 ` Alan Cox 2018-05-15 16:30 ` 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=1526323945-211107-12-git-send-email-fenghua.yu@intel.com \ --to=fenghua.yu@intel.com \ --cc=alan@linux.intel.com \ --cc=arjan@infradead.org \ --cc=ashok.raj@intel.com \ --cc=dave.hansen@intel.com \ --cc=hpa@linux.intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@elte.hu \ --cc=rafael.j.wysocki@intel.com \ --cc=ravi.v.shankar@intel.com \ --cc=tglx@linutronix.de \ --cc=tony.luck@intel.com \ --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: linkBe 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; as well as URLs for NNTP newsgroup(s).