From: Oleg Nesterov <oleg@redhat.com>
To: David Laight <david.laight.linux@gmail.com>,
Ingo Molnar <mingo@redhat.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
"H. Peter Anvin" <hpa@zytor.com>,
"Li,Rongqing" <lirongqing@baidu.com>,
Steven Rostedt <rostedt@goodmis.org>,
linux-kernel@vger.kernel.org, x86@kernel.org
Subject: [PATCH] x86/math64: handle #DE in mul_u64_u64_div_u64()
Date: Mon, 21 Jul 2025 15:04:22 +0200 [thread overview]
Message-ID: <20250721130422.GA31640@redhat.com> (raw)
Change mul_u64_u64_div_u64() to return ULONG_MAX if the result doesn't
fit u64, this matches the generic implementation in lib/math/div64.c.
Reported-by: "Li,Rongqing" <lirongqing@baidu.com>
Link: https://lore.kernel.org/all/78a0d7bb20504c0884d474868eccd858@baidu.com/
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
arch/x86/include/asm/div64.h | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
index 9931e4c7d73f..dfd25cfd1c33 100644
--- a/arch/x86/include/asm/div64.h
+++ b/arch/x86/include/asm/div64.h
@@ -79,20 +79,27 @@ static inline u64 mul_u32_u32(u32 a, u32 b)
#else
# include <asm-generic/div64.h>
+# include <asm/asm.h>
+# include <asm/bug.h>
/*
- * Will generate an #DE when the result doesn't fit u64, could fix with an
- * __ex_table[] entry when it becomes an issue.
+ * Returns ULONG_MAX when the result doesn't fit u64.
*/
static inline u64 mul_u64_u64_div_u64(u64 a, u64 mul, u64 div)
{
+ int ok = 0;
u64 q;
- asm ("mulq %2; divq %3" : "=a" (q)
- : "a" (a), "rm" (mul), "rm" (div)
- : "rdx");
+ asm ("mulq %3; 1: divq %4; movl $1,%1; 2:\n"
+ _ASM_EXTABLE(1b, 2b)
+ : "=a" (q), "+r" (ok)
+ : "a" (a), "rm" (mul), "rm" (div)
+ : "rdx");
- return q;
+ if (ok)
+ return q;
+ WARN_ON_ONCE(!div);
+ return ~(u64)0;
}
#define mul_u64_u64_div_u64 mul_u64_u64_div_u64
--
2.25.1.362.g51ebf55
next reply other threads:[~2025-07-21 13:05 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-21 13:04 Oleg Nesterov [this message]
2025-07-21 18:20 ` [PATCH] x86/math64: handle #DE in mul_u64_u64_div_u64() David Laight
2025-07-22 10:50 ` Oleg Nesterov
2025-07-22 12:09 ` David Laight
2025-07-22 13:21 ` Oleg Nesterov
2025-07-22 22:03 ` David Laight
2025-07-23 9:38 ` Oleg Nesterov
2025-07-23 21:48 ` David Laight
2025-07-24 8:11 ` Oleg Nesterov
2025-07-24 8:25 ` Oleg Nesterov
2025-07-24 11:14 ` Oleg Nesterov
2025-07-25 1:00 ` H. Peter Anvin
2025-07-25 10:12 ` Oleg Nesterov
2025-07-25 21:46 ` David Laight
2025-07-26 9:55 ` Oleg Nesterov
2025-07-24 12:00 ` David Laight
2025-07-24 13:58 ` Oleg Nesterov
2025-07-22 16:53 ` H. Peter Anvin
2025-07-22 21:53 ` David Laight
2025-07-22 16:50 ` H. Peter Anvin
2025-07-22 17:58 ` Oleg Nesterov
2025-07-22 18:12 ` H. Peter Anvin
2025-07-22 18:38 ` Oleg Nesterov
2025-07-22 19:26 ` H. Peter Anvin
2025-07-22 21:56 ` David Laight
2025-07-27 12:34 ` [PATCH v2] " Oleg Nesterov
2025-07-28 18:53 ` David Laight
2025-07-30 2:30 ` [????] " Li,Rongqing
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=20250721130422.GA31640@redhat.com \
--to=oleg@redhat.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=david.laight.linux@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lirongqing@baidu.com \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.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 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.