mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Libing Zhou <libing.zhou@nokia-sbell.com>
To: peterz@infradead.org, tglx@linutronix.de, mingo@redhat.com,
	bp@alien8.de, bp@suse.de, x86@kernel.org
Cc: linux-kernel@vger.kernel.org, libing.zhou@nokia-sbell.com, hpa@zytor.com
Subject: [PATCH v2] x86/nmi: Fix nmi_handle duration miscalculation
Date: Thu, 20 Aug 2020 10:56:41 +0800	[thread overview]
Message-ID: <20200820025641.44075-1-libing.zhou@nokia-sbell.com> (raw)

In nmi_check_duration(), the 'whole_msecs' value get from
'action->max_duration' is wrong.

Fixes: 248ed51048c4 ("x86/nmi: Remove irq_work from the long duration NMI handler")
Signed-off-by: Libing Zhou <libing.zhou@nokia-sbell.com>
---
v2:
Change solution as peterz@infradead.org suggested.

 arch/x86/kernel/nmi.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index 4fc9954a9560..47381666d6a5 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -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.22.0


             reply	other threads:[~2020-08-20  2:57 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-20  2:56 Libing Zhou [this message]
2020-08-31  7:02 ` Zhou, Libing (NSB - CN/Hangzhou)
2020-10-01 12:46 ` [tip: x86/misc] x86/nmi: Fix nmi_handle() " tip-bot2 for Libing Zhou

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=20200820025641.44075-1-libing.zhou@nokia-sbell.com \
    --to=libing.zhou@nokia-sbell.com \
    --cc=bp@alien8.de \
    --cc=bp@suse.de \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --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: 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®