Skip to contentSkip to conversation

x86/nmi: Fix nmi_handle duration miscalculation

PATCH Superseded Libing Zhou 2 participants 3 messages Aug 17, 2020 – Aug 20, 2020 x86

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/nmi: Fix nmi_handle duration miscalculation

In nmi_check_duration(), the 'whole_msecs' value should get from 'duration' to reflect actual time duration, but not 'action->max_duration'.

---
 arch/x86/kernel/nmi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/nmi.c +1 -1
index 4fc9954a9560..c51ee659e520 100644
@@ -102,7 +102,7 @@ fs_initcall(nmi_warning_debugfs);
 
 static void nmi_check_duration(struct nmiaction *action, u64 duration)
 {
-	u64 whole_msecs = READ_ONCE(action->max_duration);
+	u64 whole_msecs = duration;
 	int remainder_ns, decimal_msecs;
 
 	if (duration < nmi_longest_ns || duration < action->max_duration)
Signature · 1 line
2.22.0
#1 lore raw
Quoted 3 lines · Libing Zhou

In nmi_check_duration(), the 'whole_msecs' value should get from 'duration' to reflect actual time duration, but not 'action->max_duration'.

Fixes 248ed51048c4 ("x86/nmi: Remove irq_work from the long duration NMI handler")
Quoted 10 lines
---
 arch/x86/kernel/nmi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/nmi.c +0 -0
index 4fc9954a9560..c51ee659e520 100644

arch/x86/kernel/nmi.c fs_initcall(nmi_warning_debugfs); · line 108

Quoted 8 lines
arch/x86/kernel/nmi.c +1 -1
@@ -102,7 +102,7 @@ fs_initcall(nmi_warning_debugfs);
 
 static void nmi_check_duration(struct nmiaction *action, u64 duration)
 {
-	u64 whole_msecs = READ_ONCE(action->max_duration);
+	u64 whole_msecs = duration;
 	int remainder_ns, decimal_msecs;
 
 	if (duration < nmi_longest_ns || duration < action->max_duration)

The, IMO, saner solution is:

---

arch/x86/kernel/nmi.c +2 -3
index 4fc9954a9560..47381666d6a5 100644
@@ -102,7 +102,6 @@ fs_initcall(nmi_warning_debugfs);
 
 static void nmi_check_duration(struct nmiaction *action, u64 duration)
 {
-	u64 whole_msecs = READ_ONCE(action->max_duration);
 	int remainder_ns, decimal_msecs;
 
 	if (duration < nmi_longest_ns || duration < action->max_duration)
@@ -110,12 +109,12 @@ static void nmi_check_duration(struct nmiaction *action, u64 duration)
 
 	action->max_duration = duration;
 
-	remainder_ns = do_div(whole_msecs, (1000 * 1000));
+	remainder_ns = do_div(duration, (1000 * 1000));
 	decimal_msecs = remainder_ns / 1000;
 
 	printk_ratelimited(KERN_INFO
 		"INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
-		action->handler, whole_msecs, decimal_msecs);
+		action->handler, duration, decimal_msecs);
 }
 
 static int nmi_handle(unsigned int type, struct pt_regs *regs)
#2 lore raw

Thanks for your comments, I will recommit patch soon.

-----Original Message-----
From: [email protected] <[email protected]>
Sent: 2020年8月19日 16:07
To: Zhou, Libing (NSB - CN/Hangzhou) <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH] x86/nmi: Fix nmi_handle duration miscalculation

Quoted 3 lines · Libing Zhou

In nmi_check_duration(), the 'whole_msecs' value should get from 'duration' to reflect actual time duration, but not 'action->max_duration'.

Fixes 248ed51048c4 ("x86/nmi: Remove irq_work from the long duration NMI handler")
Quoted 10 lines
---
 arch/x86/kernel/nmi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/nmi.c index renamed from arch/x86/kernel/nmi.c +0 -0

4fc9954a9560..c51ee659e520 100644

arch/x86/kernel/nmi.c fs_initcall(nmi_warning_debugfs); · line 108

Quoted 8 lines
arch/x86/kernel/nmi.c +1 -1
@@ -102,7 +102,7 @@ fs_initcall(nmi_warning_debugfs);
 
 static void nmi_check_duration(struct nmiaction *action, u64 
 duration)  {
-	u64 whole_msecs = READ_ONCE(action->max_duration);
+	u64 whole_msecs = duration;
 	int remainder_ns, decimal_msecs;
 
 	if (duration < nmi_longest_ns || duration < action->max_duration)

The, IMO, saner solution is:

---

arch/x86/kernel/nmi.c +0 -1
@@ -102,7 +102,6 @@ fs_initcall(nmi_warning_debugfs);
 
 static void nmi_check_duration(struct nmiaction *action, u64 duration)  {
-	u64 whole_msecs = READ_ONCE(action->max_duration);
 	int remainder_ns, decimal_msecs;
 
 	if (duration < nmi_longest_ns || duration < action->max_duration) @@ -110,12 +109,12 @@ static void nmi_check_duration(struct nmiaction *action, u64 duration)
 

action->max_duration = duration;

- remainder_ns = do_div(whole_msecs, (1000 * 1000));
+ remainder_ns = do_div(duration, (1000 * 1000));
decimal_msecs = remainder_ns / 1000;

printk_ratelimited(KERN_INFO
"INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
- action->handler, whole_msecs, decimal_msecs);
+ action->handler, duration, decimal_msecs);
}

static int nmi_handle(unsigned int type, struct pt_regs *regs)