lib-add-mul_u64_add_u64_div_u64-and-mul_u64_u64_div_u64_roundup.patch removed from -mm tree
The quilt patch titled
Subject: lib: add mul_u64_add_u64_div_u64() and mul_u64_u64_div_u64_roundup()
has been removed from the -mm tree. Its filename was
lib-add-mul_u64_add_u64_div_u64-and-mul_u64_u64_div_u64_roundup.patchThis patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: David Laight <[email protected]>
Subject: lib: add mul_u64_add_u64_div_u64() and mul_u64_u64_div_u64_roundup()
Date: Wed, 5 Nov 2025 20:10:30 +0000
The existing mul_u64_u64_div_u64() rounds down, a 'rounding up' variant needs 'divisor - 1' adding in between the multiply and divide so cannot easily be done by a caller.
Add mul_u64_add_u64_div_u64(a, b, c, d) that calculates (a * b + c)/d and implement the 'round down' and 'round up' using it.
Update the x86-64 asm to optimise for 'c' being a constant zero.
Add kerndoc definitions for all three functions.
---
arch/x86/include/asm/div64.h | 20 ++++++++----- include/linux/math64.h | 48 ++++++++++++++++++++++++++++++++- lib/math/div64.c | 14 +++++---- 3 files changed, 67 insertions(+), 15 deletions(-)
arch/x86/include/asm/div64.h renamed from arch/x86/include/asm/div64.h~lib-add-mul_u64_add_u64_div_u64-and-mul_u64_u64_div_u64_roundup +12 -8
@@ -84,21 +84,25 @@ static inline u64 mul_u32_u32(u32 a, u32* Will generate an #DE when the result doesn't fit u64, could fix with an * __ex_table[] entry when it becomes an issue. */ -static inline u64 mul_u64_u64_div_u64 (u64 a,u64 mul,u64 div) +static inline u64 mul_u64_add_u64_div_u64 (u64 rax,u64 mul,u64 add,u64 div) { -u64 q; +u64 rdx; - asm ("mulq %2; divq %3" :"=a" (q) - :"a" (a),"rm" (mul),"rm" (div) - :"rdx" ); + asm ("mulq %[mul]" :"+a" (rax),"=d" (rdx) : [mul]"rm" (mul)); -return q; +if (!statically_true (!add)) + asm ("addq %[add], %[lo]; adcq $0, %[hi]" : + [lo]"+r" (rax), [hi]"+r" (rdx) : [add]"irm" (add)); + + asm ("divq %[div]" :"+a" (rax),"+d" (rdx) : [div]"rm" (div)); + +return rax; } -#define mul_u64_u64_div_u64 mul_u64_u64_div_u64 +#define mul_u64_add_u64_div_u64 mul_u64_add_u64_div_u64static inline u64 mul_u64_u32_div (u64 a,u32 mul,u32 div) { -return mul_u64_u64_div_u64 (a, mul, div); +return mul_u64_add_u64_div_u64 (a, mul,0 , div); }#define mul_u64_u32_div mul_u64_u32_div
include/linux/math64.h renamed from include/linux/math64.h~lib-add-mul_u64_add_u64_div_u64-and-mul_u64_u64_div_u64_roundup +47 -1
54 lines not on this page · raw message
lib/math/div64.c renamed from lib/math/div64.c~lib-add-mul_u64_add_u64_div_u64-and-mul_u64_u64_div_u64_roundup +8 -6
@@ -183,13 +183,13 @@ u32 iter_div_u64_rem(u64 dividend, u32 d }EXPORT_SYMBOL (iter_div_u64_rem); -#ifndef mul_u64_u64_div_u64 -u64 mul_u64_u64_div_u64 (u64 a,u64 b,u64 d) +#ifndef mul_u64_add_u64_div_u64 +u64 mul_u64_add_u64_div_u64 (u64 a,u64 b,u64 c,u64 d) {#if defined(__SIZEOF_INT128__)/* native 64x64=128 bits multiplication */ -u128 prod = (u128 )a * b; +u128 prod = (u128 )a * b + c;u64 n_lo = prod, n_hi = prod >>64 ;#else
@@ -198,8 +198,10 @@ u64 mul_u64_u64_div_u64(u64 a, u64 b, u6u32 a_lo = a, a_hi = a >>32 , b_lo = b, b_hi = b >>32 ;u64 x, y, z; - x = (u64 )a_lo * b_lo; - y = (u64 )a_lo * b_hi + (u32)(x >>32 ); +/* Since (x-1)(x-1) + 2(x-1) == x.x - 1 two u32 can be added to a u64 */ + x = (u64 )a_lo * b_lo + (u32 )c; + y = (u64 )a_lo * b_hi + (u32)(c >>32 ); + y += (u32)(x >>32 ); z = (u64 )a_hi * b_hi + (u32)(y >>32 ); y = (u64 )a_hi * b_lo + (u32 )y; z += (u32)(y >>32 );
@@ -265,5 +267,5 @@ u64 mul_u64_u64_div_u64(u64 a, u64 b, u6 return res; } -EXPORT_SYMBOL (mul_u64_u64_div_u64); +EXPORT_SYMBOL (mul_u64_add_u64_div_u64);#endif
_
Patches currently in -mm which might be from [email protected] are