From: "tip-bot2 for Sohil Mehta" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Sohil Mehta <sohil.mehta@intel.com>,
Ingo Molnar <mingo@kernel.org>, Kai Huang <kai.huang@intel.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Nikolay Borisov <nik.borisov@suse.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/nmi] x86/nmi: Improve NMI duration console printouts
Date: Thu, 03 Apr 2025 13:33:37 -0000 [thread overview]
Message-ID: <174368721780.30396.7072042211093296234.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250327234629.3953536-10-sohil.mehta@intel.com>
The following commit has been merged into the x86/nmi branch of tip:
Commit-ID: f2e01dcf6df2d12e86c363ea9c37d53994d89dd6
Gitweb: https://git.kernel.org/tip/f2e01dcf6df2d12e86c363ea9c37d53994d89dd6
Author: Sohil Mehta <sohil.mehta@intel.com>
AuthorDate: Thu, 27 Mar 2025 23:46:29
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Tue, 01 Apr 2025 22:26:38 +02:00
x86/nmi: Improve NMI duration console printouts
Convert the last remaining printk() in nmi.c to pr_info(). Along with
it, use timespec macros to calculate the NMI handler duration.
Signed-off-by: Sohil Mehta <sohil.mehta@intel.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Kai Huang <kai.huang@intel.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Nikolay Borisov <nik.borisov@suse.com>
Link: https://lore.kernel.org/r/20250327234629.3953536-10-sohil.mehta@intel.com
---
arch/x86/kernel/nmi.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index 59ed74e..be93ec7 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -119,12 +119,12 @@ static void nmi_check_duration(struct nmiaction *action, u64 duration)
action->max_duration = duration;
- remainder_ns = do_div(duration, (1000 * 1000));
- decimal_msecs = remainder_ns / 1000;
+ /* Convert duration from nsec to msec */
+ remainder_ns = do_div(duration, NSEC_PER_MSEC);
+ decimal_msecs = remainder_ns / NSEC_PER_USEC;
- printk_ratelimited(KERN_INFO
- "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
- action->handler, duration, decimal_msecs);
+ pr_info_ratelimited("INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
+ action->handler, duration, decimal_msecs);
}
static int nmi_handle(unsigned int type, struct pt_regs *regs)
next prev parent reply other threads:[~2025-04-03 13:33 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-27 23:46 [PATCH 0/9] x86: Cleanup NMI handling Sohil Mehta
2025-03-27 23:46 ` [PATCH 1/9] x86/nmi: Simplify unknown NMI panic handling Sohil Mehta
2025-03-31 22:52 ` Huang, Kai
2025-03-31 23:01 ` Sohil Mehta
2025-04-01 15:00 ` Nikolay Borisov
2025-04-01 15:54 ` Sohil Mehta
2025-04-03 13:33 ` [tip: x86/nmi] " tip-bot2 for Sohil Mehta
2025-03-27 23:46 ` [PATCH 2/9] x86/nmi: Consolidate NMI panic variables Sohil Mehta
2025-03-31 22:43 ` Huang, Kai
2025-03-31 22:50 ` Sohil Mehta
2025-03-31 23:05 ` Huang, Kai
2025-03-31 23:20 ` Sohil Mehta
2025-04-01 1:06 ` Huang, Kai
2025-04-01 5:46 ` Sohil Mehta
2025-04-01 8:08 ` Huang, Kai
2025-04-03 13:33 ` [tip: x86/nmi] " tip-bot2 for Sohil Mehta
2025-03-27 23:46 ` [PATCH 3/9] x86/nmi: Use a macro to initialize NMI descriptors Sohil Mehta
2025-03-31 23:46 ` Huang, Kai
2025-04-03 13:33 ` [tip: x86/nmi] " tip-bot2 for Sohil Mehta
2025-03-27 23:46 ` [PATCH 4/9] x86/nmi: Remove export of local_touch_nmi() Sohil Mehta
2025-03-31 23:47 ` Huang, Kai
2025-04-03 13:33 ` [tip: x86/nmi] " tip-bot2 for Sohil Mehta
2025-03-27 23:46 ` [PATCH 5/9] x86/nmi: Fix comment in unknown NMI handling Sohil Mehta
2025-04-01 0:17 ` Huang, Kai
2025-04-01 5:28 ` Sohil Mehta
2025-04-01 5:45 ` H. Peter Anvin
2025-04-01 5:53 ` Sohil Mehta
2025-04-03 13:33 ` [tip: x86/nmi] x86/nmi: Fix comment in unknown_nmi_error() tip-bot2 for Sohil Mehta
2025-03-27 23:46 ` [PATCH 6/9] x86/nmi: Improve and relocate NMI handler comments Sohil Mehta
2025-04-01 1:03 ` Huang, Kai
2025-04-03 13:33 ` [tip: x86/nmi] " tip-bot2 for Sohil Mehta
2025-03-27 23:46 ` [PATCH 7/9] x86/nmi: Improve NMI header documentation Sohil Mehta
2025-03-31 10:47 ` Ingo Molnar
2025-03-31 16:04 ` Sohil Mehta
2025-03-31 21:36 ` Sohil Mehta
2025-04-01 8:08 ` Ingo Molnar
2025-04-01 16:11 ` Sohil Mehta
2025-04-03 13:33 ` [tip: x86/nmi] x86/nmi: Add missing description x86_platform_ops::get_nmi_reason to <asm/x86_init.h> tip-bot2 for Sohil Mehta
2025-04-03 13:33 ` [tip: x86/nmi] x86/nmi: Improve <asm/nmi.h> documentation tip-bot2 for Sohil Mehta
2025-03-27 23:46 ` [PATCH 8/9] x86/nmi: Clean up NMI selftest Sohil Mehta
2025-04-03 13:33 ` [tip: x86/nmi] " tip-bot2 for Sohil Mehta
2025-03-27 23:46 ` [PATCH 9/9] x86/nmi: Improve NMI duration console print Sohil Mehta
2025-04-01 0:42 ` Huang, Kai
2025-04-03 13:33 ` tip-bot2 for Sohil Mehta [this message]
2025-04-01 14:54 ` [PATCH 0/9] x86: Cleanup NMI handling Peter Zijlstra
2025-04-01 16:00 ` Nikolay Borisov
2025-04-02 15:13 ` H. Peter Anvin
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=174368721780.30396.7072042211093296234.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=kai.huang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=nik.borisov@suse.com \
--cc=peterz@infradead.org \
--cc=sohil.mehta@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: 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®