Skip to contentSkip to conversation

x86, msr: add rdmsr_safe_on_cpu_resched() and use it in msr_read()

PATCH Superseded Eric Dumazet 2 participants 5 messages Mar 17, 2018 – Mar 19, 2018

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 x86, msr: add rdmsr_safe_on_cpu_resched() and use it in msr_read()

I noticed high latencies caused by a daemon periodically reading various MSR on all cpus. KASAN kernels would see ~10ms latencies simply reading one MSR. Even without KASAN, sending IPI to CPU in deep sleep state or blocking hard IRQ in a a long section, then waiting for the answer can consume hundreds of usec.

This patch adds rdmsr_safe_on_cpu_resched() which does not spin.

I use this function from msr_read() but future patches might convert other callers to use this variant as well.

Overall daemon cpu usage was reduced by 35 %,
and latencies caused by msr_read() disappeared.

Cc "H. Peter Anvin" <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Hugh Dickins <[email protected]>
---
 arch/x86/include/asm/msr.h |  1 +
 arch/x86/kernel/msr.c      |  2 +-
 arch/x86/lib/msr-smp.c     | 43 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)
arch/x86/include/asm/msr.h +1 -0
index 30df295f6d94c8ac6d87613acae8a32c50436c6d..117a286660c61cf9c10e68f0b48d27e2de17deab 100644
@@ -321,6 +321,7 @@ int wrmsrl_on_cpu(unsigned int cpu, u32 msr_no, u64 q);
 void rdmsr_on_cpus(const struct cpumask *mask, u32 msr_no, struct msr *msrs);
 void wrmsr_on_cpus(const struct cpumask *mask, u32 msr_no, struct msr *msrs);
 int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h);
+int rdmsr_safe_on_cpu_resched(unsigned int cpu, u32 msr_no, u32 *l, u32 *h);
 int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h);
 int rdmsrl_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 *q);
 int wrmsrl_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 q);
arch/x86/kernel/msr.c +1 -1
index ef688804f80d33088fef15448996a97f69e2b193..d464858cdcad59cb08a913388d60f1aee6d2277a 100644
@@ -60,7 +60,7 @@ static ssize_t msr_read(struct file *file, char __user *buf,
 		return -EINVAL;	/* Invalid chunk size */
 
 	for (; count; count -= 8) {
-		err = rdmsr_safe_on_cpu(cpu, reg, &data[0], &data[1]);
+		err = rdmsr_safe_on_cpu_resched(cpu, reg, &data[0], &data[1]);
 		if (err)
 			break;
 		if (copy_to_user(tmp, &data, 8)) {
arch/x86/lib/msr-smp.c +43 -0

61 lines not on this page · raw message

Signature · 1 line
2.16.2.804.g6dcf76e118-goog
#1 lore raw

PATCH 2/2 x86, cpuid: allow cpuid_read() to schedule

I noticed high latencies caused by a daemon periodically reading various MSR and cpuid on all cpus. KASAN kernels would see ~10ms latencies simply reading one cpuid. Even without KASAN, sending IPI to CPU in deep sleep state or blocking hard IRQ in a a long section, then waiting for the answer can consume hundreds of usec or more.

Switching to smp_call_function_single_async() and a completion allows to reschedule and not burn cpu cycles.

Cc "H. Peter Anvin" <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Hugh Dickins <[email protected]>
---
 arch/x86/kernel/cpuid.c | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)
arch/x86/kernel/cpuid.c +26 -8
index 0931a105ffe16cde4640e759efa600b23a756d84..1d300f96df4b316dbe3392c8221467cfd8593272 100644
@@ -40,6 +40,7 @@
 #include <linux/notifier.h>
 #include <linux/uaccess.h>
 #include <linux/gfp.h>
+#include <linux/completion.h>
 
 #include <asm/processor.h>
 #include <asm/msr.h>
@@ -47,19 +48,27 @@
 static struct class *cpuid_class;
 static enum cpuhp_state cpuhp_cpuid_state;
 
+struct cpuid_regs_done {
+	struct cpuid_regs regs;
+	struct completion done;
+};
+
 static void cpuid_smp_cpuid(void *cmd_block)
 {
-	struct cpuid_regs *cmd = (struct cpuid_regs *)cmd_block;
+	struct cpuid_regs_done *cmd = cmd_block;
+
+	cpuid_count(cmd->regs.eax, cmd->regs.ecx,
+		    &cmd->regs.eax, &cmd->regs.ebx,
+		    &cmd->regs.ecx, &cmd->regs.edx);
 
-	cpuid_count(cmd->eax, cmd->ecx,
-		    &cmd->eax, &cmd->ebx, &cmd->ecx, &cmd->edx);
+	complete(&cmd->done);
 }
 
 static ssize_t cpuid_read(struct file *file, char __user *buf,
 			  size_t count, loff_t *ppos)
 {
 	char __user *tmp = buf;
-	struct cpuid_regs cmd;
+	struct cpuid_regs_done cmd;
 	int cpu = iminor(file_inode(file));
 	u64 pos = *ppos;
 	ssize_t bytes = 0;
@@ -68,19 +77,28 @@ static ssize_t cpuid_read(struct file *file, char __user *buf,
 	if (count % 16)
 		return -EINVAL;	/* Invalid chunk size */
 
+	init_completion(&cmd.done);
 	for (; count; count -= 16) {
-		cmd.eax = pos;
-		cmd.ecx = pos >> 32;
-		err = smp_call_function_single(cpu, cpuid_smp_cpuid, &cmd, 1);
+		call_single_data_t csd = {
+			.func = cpuid_smp_cpuid,
+			.info = &cmd,
+		};
+
+		cmd.regs.eax = pos;
+		cmd.regs.ecx = pos >> 32;
+
+		err = smp_call_function_single_async(cpu, &csd);
 		if (err)
 			break;
-		if (copy_to_user(tmp, &cmd, 16)) {
+		wait_for_completion(&cmd.done);
+		if (copy_to_user(tmp, &cmd.regs, 16)) {
 			err = -EFAULT;
 			break;
 		}
 		tmp += 16;
 		bytes += 16;
 		*ppos = ++pos;
+		reinit_completion(&cmd.done);
 	}
 
 	return bytes ? bytes : err;
Signature · 1 line
2.16.2.804.g6dcf76e118-goog
#2 lore raw
In reply to Eric Dumazet
Thank you for the patch! Yet something to improve:

Hi Eric,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on linus/master]
[also build test ERROR on v4.16-rc5 next-20180316]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url: https://github.com/0day-ci/linux/commits/Eric-Dumazet/x86-msr-add-rdmsr_safe_on_cpu_resched-and-use-it-in-msr_read/20180319-001007
config: i386-randconfig-x076-201811 (attached as .config)
compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 reproduce:

        # save the attached .config to linux build tree
        make ARCH=i386 

All errors (new ones prefixed by >>):

arch/x86/kernel/msr.c: In function 'msr_read':

>> arch/x86/kernel/msr.c:63:9: error: implicit declaration of function 'rdmsr_safe_on_cpu_resched'; did you mean 'rdmsr_safe_on_cpu'? [-Werror=implicit-function-declaration]
      err = rdmsr_safe_on_cpu_resched(cpu, reg, &data[0], &data[1]);
            ^~~~~~~~~~~~~~~~~~~~~~~~~
            rdmsr_safe_on_cpu

Cyclomatic Complexity 1 arch/x86/include/asm/bitops.h:constant_test_bit Cyclomatic Complexity 1 arch/x86/include/asm/paravirt.h:paravirt_write_msr_safe Cyclomatic Complexity 1 arch/x86/include/asm/msr.h:wrmsr_safe_on_cpu Cyclomatic Complexity 1 arch/x86/include/asm/msr.h:rdmsr_safe_regs_on_cpu Cyclomatic Complexity 1 arch/x86/include/asm/msr.h:wrmsr_safe_regs_on_cpu Cyclomatic Complexity 1 include/linux/err.h:PTR_ERR
Cyclomatic Complexity 1 include/linux/err.h:IS_ERR
Cyclomatic Complexity 2 include/linux/err.h:PTR_ERR_OR_ZERO Cyclomatic Complexity 1 include/linux/thread_info.h:check_object_size Cyclomatic Complexity 2 include/linux/thread_info.h:copy_overflow Cyclomatic Complexity 4 include/linux/thread_info.h:check_copy_size Cyclomatic Complexity 1 include/linux/fs.h:iminor
Cyclomatic Complexity 1 include/linux/fs.h:file_inode
Cyclomatic Complexity 2 include/linux/uaccess.h:copy_from_user Cyclomatic Complexity 2 include/linux/uaccess.h:copy_to_user Cyclomatic Complexity 1 include/linux/cpuhotplug.h:cpuhp_setup_state Cyclomatic Complexity 1 include/linux/cpuhotplug.h:cpuhp_remove_state Cyclomatic Complexity 6 arch/x86/kernel/msr.c:msr_write
Cyclomatic Complexity 11 arch/x86/kernel/msr.c:msr_ioctl Cyclomatic Complexity 4 arch/x86/kernel/msr.c:msr_init
Cyclomatic Complexity 1 arch/x86/kernel/msr.c:msr_exit
Cyclomatic Complexity 1 arch/x86/kernel/msr.c:msr_device_destroy Cyclomatic Complexity 1 arch/x86/kernel/msr.c:msr_device_create Cyclomatic Complexity 1 arch/x86/kernel/msr.c:msr_devnode Cyclomatic Complexity 4 arch/x86/kernel/msr.c:msr_open
Cyclomatic Complexity 6 arch/x86/kernel/msr.c:msr_read
cc1: some warnings being treated as errors

vim +63 arch/x86/kernel/msr.c

    48	
    49	static ssize_t msr_read(struct file *file, char __user *buf,
    50				size_t count, loff_t *ppos)
    51	{
    52		u32 __user *tmp = (u32 __user *) buf;
    53		u32 data[2];
    54		u32 reg = *ppos;
    55		int cpu = iminor(file_inode(file));
    56		int err = 0;
    57		ssize_t bytes = 0;
    58	
    59		if (count % 8)
    60			return -EINVAL;	/* Invalid chunk size */
    61	
    62		for (; count; count -= 8) {
  > 63			err = rdmsr_safe_on_cpu_resched(cpu, reg, &data[0], &data[1]);
    64			if (err)
    65				break;
    66			if (copy_to_user(tmp, &data, 8)) {
    67				err = -EFAULT;
    68				break;
    69			}
    70			tmp += 2;
    71			bytes += 8;
    72		}
    73	
    74		return bytes ? bytes : err;
    75	}
    76	

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation

#3 lore raw
In reply to Eric Dumazet
Thank you for the patch! Yet something to improve:

Hi Eric,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on linus/master]
[also build test ERROR on v4.16-rc5 next-20180316]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url: https://github.com/0day-ci/linux/commits/Eric-Dumazet/x86-msr-add-rdmsr_safe_on_cpu_resched-and-use-it-in-msr_read/20180319-001007
config: i386-randconfig-s1-201811 (attached as .config)
compiler: gcc-6 (Debian 6.4.0-9) 6.4.0 20171026 reproduce:

        # save the attached .config to linux build tree
        make ARCH=i386 

All errors (new ones prefixed by >>):

arch/x86/kernel/msr.c: In function 'msr_read':

>> arch/x86/kernel/msr.c:63:9: error: implicit declaration of function 'rdmsr_safe_on_cpu_resched' [-Werror=implicit-function-declaration]
      err = rdmsr_safe_on_cpu_resched(cpu, reg, &data[0], &data[1]);
            ^~~~~~~~~~~~~~~~~~~~~~~~~

cc1: some warnings being treated as errors

vim +/rdmsr_safe_on_cpu_resched +63 arch/x86/kernel/msr.c

    48	
    49	static ssize_t msr_read(struct file *file, char __user *buf,
    50				size_t count, loff_t *ppos)
    51	{
    52		u32 __user *tmp = (u32 __user *) buf;
    53		u32 data[2];
    54		u32 reg = *ppos;
    55		int cpu = iminor(file_inode(file));
    56		int err = 0;
    57		ssize_t bytes = 0;
    58	
    59		if (count % 8)
    60			return -EINVAL;	/* Invalid chunk size */
    61	
    62		for (; count; count -= 8) {
  > 63			err = rdmsr_safe_on_cpu_resched(cpu, reg, &data[0], &data[1]);
    64			if (err)
    65				break;
    66			if (copy_to_user(tmp, &data, 8)) {
    67				err = -EFAULT;
    68				break;
    69			}
    70			tmp += 2;
    71			bytes += 8;
    72		}
    73	
    74		return bytes ? bytes : err;
    75	}
    76	

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation

#4 lore raw
Quoted 7 lines · kbuild test robot

Hi Eric,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on linus/master]
[also build test ERROR on v4.16-rc5 next-20180316]
[if your patch is applied to the wrong git tree, please drop us a note to

help improve the system]

Quoted 1 line

url:

https://github.com/0day-ci/linux/commits/Eric-Dumazet/x86-msr-add-rdmsr_safe_on_cpu_resched-and-use-it-in-msr_read/20180319-001007

Quoted 10 lines

config: i386-randconfig-s1-201811 (attached as .config)
compiler: gcc-6 (Debian 6.4.0-9) 6.4.0 20171026 reproduce:

         # save the attached .config to linux build tree
         make ARCH=i386

All errors (new ones prefixed by >>):

arch/x86/kernel/msr.c: In function 'msr_read':

Quoted 1 line
Quoted 1 line

arch/x86/kernel/msr.c:63:9: error: implicit declaration of function

'rdmsr_safe_on_cpu_resched' [-Werror=implicit-function-declaration]

Quoted 3 lines
       err = rdmsr_safe_on_cpu_resched(cpu, reg, &data[0], &data[1]);
             ^~~~~~~~~~~~~~~~~~~~~~~~~
    cc1: some warnings being treated as errors

I guess I will have to add in V2 this missing part :

arch/x86/include/asm/msr.h +0 -0

index 117a286660c61cf9c10e68f0b48d27e2de17deab..15e220243a4d5e9da524fb7733e23e2766b6eb12 100644

arch/x86/include/asm/msr.h +0 -0
@@ -363,6 +363,11 @@ static inline int rdmsr_safe_on_cpu(unsigned int cpu,

u32 msr_no,

  {
         return rdmsr_safe(msr_no, l, h);

}
+static inline int rdmsr_safe_on_cpu_resched(unsigned int cpu, u32 msr_no,
+ u32 *l, u32 *h)
+{
+ return rdmsr_safe(msr_no, l, h);
+}
static inline int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l,
u32 h)

  {
         return wrmsr_safe(msr_no, l, h);