From: Juergen Gross <jgross@suse.com> To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org Cc: boris.ostrovsky@oracle.com, david.vrabel@citrix.com, mingo@redhat.com, peterz@infradead.org, Douglas_Warzecha@dell.com, pali.rohar@gmail.com, jdelvare@suse.com, linux@roeck-us.net, tglx@linutronix.de, hpa@zytor.com, jeremy@goop.org, chrisw@sous-sol.org, akataria@vmware.com, rusty@rustcorp.com.au, virtualization@lists.linux-foundation.org, x86@kernel.org, Juergen Gross <jgross@suse.com> Subject: [PATCH v6 6/6] hwmon: use smp_call_on_cpu() for dell-smm i8k Date: Mon, 29 Aug 2016 08:48:47 +0200 [thread overview] Message-ID: <1472453327-19050-7-git-send-email-jgross@suse.com> (raw) In-Reply-To: <1472453327-19050-1-git-send-email-jgross@suse.com> Use the smp_call_on_cpu() function to call system management mode on cpu 0. Make call secure by adding get_online_cpus() to avoid e.g. suspend resume cycles in between. Signed-off-by: Juergen Gross <jgross@suse.com> --- V4: add call to get_online_cpus() --- drivers/hwmon/dell-smm-hwmon.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c index acf9c03..34704b0 100644 --- a/drivers/hwmon/dell-smm-hwmon.c +++ b/drivers/hwmon/dell-smm-hwmon.c @@ -21,6 +21,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include <linux/cpu.h> #include <linux/delay.h> #include <linux/module.h> #include <linux/types.h> @@ -36,6 +37,7 @@ #include <linux/io.h> #include <linux/sched.h> #include <linux/ctype.h> +#include <linux/smp.h> #include <linux/i8k.h> @@ -134,11 +136,11 @@ static inline const char *i8k_get_dmi_data(int field) /* * Call the System Management Mode BIOS. Code provided by Jonathan Buzzard. */ -static int i8k_smm(struct smm_regs *regs) +static int i8k_smm_func(void *par) { int rc; + struct smm_regs *regs = par; int eax = regs->eax; - cpumask_var_t old_mask; #ifdef DEBUG int ebx = regs->ebx; @@ -149,16 +151,8 @@ static int i8k_smm(struct smm_regs *regs) #endif /* SMM requires CPU 0 */ - if (!alloc_cpumask_var(&old_mask, GFP_KERNEL)) - return -ENOMEM; - cpumask_copy(old_mask, ¤t->cpus_allowed); - rc = set_cpus_allowed_ptr(current, cpumask_of(0)); - if (rc) - goto out; - if (smp_processor_id() != 0) { - rc = -EBUSY; - goto out; - } + if (smp_processor_id() != 0) + return -EBUSY; #if defined(CONFIG_X86_64) asm volatile("pushq %%rax\n\t" @@ -216,10 +210,6 @@ static int i8k_smm(struct smm_regs *regs) if (rc != 0 || (regs->eax & 0xffff) == 0xffff || regs->eax == eax) rc = -EINVAL; -out: - set_cpus_allowed_ptr(current, old_mask); - free_cpumask_var(old_mask); - #ifdef DEBUG rettime = ktime_get(); delta = ktime_sub(rettime, calltime); @@ -232,6 +222,20 @@ out: } /* + * Call the System Management Mode BIOS. + */ +static int i8k_smm(struct smm_regs *regs) +{ + int ret; + + get_online_cpus(); + ret = smp_call_on_cpu(0, i8k_smm_func, regs, true); + put_online_cpus(); + + return ret; +} + +/* * Read the fan status. */ static int i8k_get_fan_status(int fan) -- 2.6.6
WARNING: multiple messages have this Message-ID (diff)
From: Juergen Gross <jgross@suse.com> To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org Cc: Juergen Gross <jgross@suse.com>, jeremy@goop.org, jdelvare@suse.com, peterz@infradead.org, hpa@zytor.com, akataria@vmware.com, x86@kernel.org, virtualization@lists.linux-foundation.org, chrisw@sous-sol.org, mingo@redhat.com, david.vrabel@citrix.com, Douglas_Warzecha@dell.com, pali.rohar@gmail.com, boris.ostrovsky@oracle.com, tglx@linutronix.de, linux@roeck-us.net Subject: [PATCH v6 6/6] hwmon: use smp_call_on_cpu() for dell-smm i8k Date: Mon, 29 Aug 2016 08:48:47 +0200 [thread overview] Message-ID: <1472453327-19050-7-git-send-email-jgross@suse.com> (raw) In-Reply-To: <1472453327-19050-1-git-send-email-jgross@suse.com> Use the smp_call_on_cpu() function to call system management mode on cpu 0. Make call secure by adding get_online_cpus() to avoid e.g. suspend resume cycles in between. Signed-off-by: Juergen Gross <jgross@suse.com> --- V4: add call to get_online_cpus() --- drivers/hwmon/dell-smm-hwmon.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c index acf9c03..34704b0 100644 --- a/drivers/hwmon/dell-smm-hwmon.c +++ b/drivers/hwmon/dell-smm-hwmon.c @@ -21,6 +21,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include <linux/cpu.h> #include <linux/delay.h> #include <linux/module.h> #include <linux/types.h> @@ -36,6 +37,7 @@ #include <linux/io.h> #include <linux/sched.h> #include <linux/ctype.h> +#include <linux/smp.h> #include <linux/i8k.h> @@ -134,11 +136,11 @@ static inline const char *i8k_get_dmi_data(int field) /* * Call the System Management Mode BIOS. Code provided by Jonathan Buzzard. */ -static int i8k_smm(struct smm_regs *regs) +static int i8k_smm_func(void *par) { int rc; + struct smm_regs *regs = par; int eax = regs->eax; - cpumask_var_t old_mask; #ifdef DEBUG int ebx = regs->ebx; @@ -149,16 +151,8 @@ static int i8k_smm(struct smm_regs *regs) #endif /* SMM requires CPU 0 */ - if (!alloc_cpumask_var(&old_mask, GFP_KERNEL)) - return -ENOMEM; - cpumask_copy(old_mask, ¤t->cpus_allowed); - rc = set_cpus_allowed_ptr(current, cpumask_of(0)); - if (rc) - goto out; - if (smp_processor_id() != 0) { - rc = -EBUSY; - goto out; - } + if (smp_processor_id() != 0) + return -EBUSY; #if defined(CONFIG_X86_64) asm volatile("pushq %%rax\n\t" @@ -216,10 +210,6 @@ static int i8k_smm(struct smm_regs *regs) if (rc != 0 || (regs->eax & 0xffff) == 0xffff || regs->eax == eax) rc = -EINVAL; -out: - set_cpus_allowed_ptr(current, old_mask); - free_cpumask_var(old_mask); - #ifdef DEBUG rettime = ktime_get(); delta = ktime_sub(rettime, calltime); @@ -232,6 +222,20 @@ out: } /* + * Call the System Management Mode BIOS. + */ +static int i8k_smm(struct smm_regs *regs) +{ + int ret; + + get_online_cpus(); + ret = smp_call_on_cpu(0, i8k_smm_func, regs, true); + put_online_cpus(); + + return ret; +} + +/* * Read the fan status. */ static int i8k_get_fan_status(int fan) -- 2.6.6
next prev parent reply other threads:[~2016-08-29 6:50 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-08-29 6:48 [PATCH v6 0/6] Support calling functions on dedicated physical cpu Juergen Gross 2016-08-29 6:48 ` Juergen Gross 2016-08-29 6:48 ` [PATCH v6 1/6] xen: sync xen header Juergen Gross 2016-08-29 6:48 ` Juergen Gross 2016-08-29 6:48 ` Juergen Gross 2016-09-05 13:27 ` [tip:core/smp] xen: Sync " tip-bot for Juergen Gross 2016-08-29 6:48 ` [PATCH v6 2/6] virt, sched: add generic vcpu pinning support Juergen Gross 2016-08-29 6:48 ` Juergen Gross 2016-08-29 6:48 ` Juergen Gross 2016-09-05 13:28 ` [tip:core/smp] virt, sched: Add generic vCPU " tip-bot for Juergen Gross 2016-08-29 6:48 ` [PATCH v6 3/6] smp: add function to execute a function synchronously on a cpu Juergen Gross 2016-08-29 6:48 ` Juergen Gross 2016-09-05 13:28 ` [tip:core/smp] smp: Add function to execute a function synchronously on a CPU tip-bot for Juergen Gross 2016-08-29 6:48 ` [PATCH v6 3/6] smp: add function to execute a function synchronously on a cpu Juergen Gross 2016-08-29 6:48 ` [PATCH v6 4/6] xen: add xen_pin_vcpu() to support calling functions on a dedicated pcpu Juergen Gross 2016-08-29 6:48 ` Juergen Gross 2016-08-29 6:48 ` Juergen Gross 2016-09-05 13:29 ` [tip:core/smp] xen: Add xen_pin_vcpu() to support calling functions on a dedicated pCPU tip-bot for Juergen Gross 2016-08-29 6:48 ` [PATCH v6 5/6] dcdbas: make use of smp_call_on_cpu() Juergen Gross 2016-08-29 6:48 ` Juergen Gross 2016-09-05 13:29 ` [tip:core/smp] dcdbas: Make " tip-bot for Juergen Gross 2016-08-29 6:48 ` [PATCH v6 5/6] dcdbas: make " Juergen Gross 2016-08-29 6:48 ` [PATCH v6 6/6] hwmon: use smp_call_on_cpu() for dell-smm i8k Juergen Gross 2016-08-29 6:48 ` Juergen Gross [this message] 2016-08-29 6:48 ` Juergen Gross 2016-09-05 13:30 ` [tip:core/smp] hwmon: Use " tip-bot for Juergen Gross
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=1472453327-19050-7-git-send-email-jgross@suse.com \ --to=jgross@suse.com \ --cc=Douglas_Warzecha@dell.com \ --cc=akataria@vmware.com \ --cc=boris.ostrovsky@oracle.com \ --cc=chrisw@sous-sol.org \ --cc=david.vrabel@citrix.com \ --cc=hpa@zytor.com \ --cc=jdelvare@suse.com \ --cc=jeremy@goop.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=mingo@redhat.com \ --cc=pali.rohar@gmail.com \ --cc=peterz@infradead.org \ --cc=rusty@rustcorp.com.au \ --cc=tglx@linutronix.de \ --cc=virtualization@lists.linux-foundation.org \ --cc=x86@kernel.org \ --cc=xen-devel@lists.xenproject.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 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.