bring sanity to div64.h and do_div usage
PATCH 1/1 bring sanity to div64.h and do_div usage
This patch introduced include/linux/div64.h and removes asm/div64.h from all the architectures that don't have optimized ASM.
I also played janitor and found every file that used asm/div64.h. There was some mips stuff that I didn't touch, but now everything else should actually work on all platforms linux supports, instead of just those that are either 64 bit, or have optimized asm versions.
(This patch is against 2.4.17, please let me know if it does not apply to current 2.4 or 2.5)
Index: drivers/acpi/include/platform/aclinux.h
===================================================================
RCS file: /cvsdev/hhl-2.4.17/linux/drivers/acpi/include/platform/aclinux.h,v retrieving revision 1.1
acpi/include/platform/aclinux.h +1 -1
@@ -36,9 +36,9 @@#include <linux/string.h> #include <linux/kernel.h> #include <linux/ctype.h> +#include <asm/system.h> #include <asm/atomic.h> -#include <asm/div64.h> #define strtoul simple_strtoul
Index: drivers/net/sk98lin/skproc.c
===================================================================
RCS file: /cvsdev/hhl-2.4.17/linux/drivers/net/sk98lin/skproc.c,v retrieving revision 1.1
net/sk98lin/skproc.c +3 -55
76 lines not on this page · raw message
Index: drivers/video/matrox/matroxfb_maven.c
===================================================================
RCS file: /cvsdev/hhl-2.4.17/linux/drivers/video/matrox/matroxfb_maven.c,v retrieving revision 1.1
video/matrox/matroxfb_maven.c +4 -4
@@ -15,7 +15,8 @@#include "matroxfb_DAC1064.h" #include <linux/i2c.h> #include <linux/matroxfb.h> -#include <asm/div64.h> +#define USE_SLOW_64BIT_DIVIDES +#include <linux/div64.h> #include <asm/uaccess.h> #define MAVEN_I2CID (0x1B)
@@ -698,9 +699,8 @@int vdec;int vlen; -#define MATROX_USE64BIT_DIVIDE if (mt->VTotal) { -#ifdef MATROX_USE64BIT_DIVIDE +#ifdef USE_SLOW_64BIT_DIVIDES u64 f1;u32 a;u32 b;
@@ -709,7 +709,7 @@ b = (mt->VTotal -1 ) * (m->htotal +2 ) + m->hcorr +2 ; f1 = ((u64 )a) <<15 ;/* *32768 */ -do_div (f1, b); +do_div (&f1, b); vdec = f1;#else vdec = m->vlines *32768 / mt->VTotal;
Index: fs/affs/file.c
===================================================================
RCS file: /cvsdev/hhl-2.4.17/linux/fs/affs/file.c,v retrieving revision 1.1
affs/file.c +0 -1
@@ -12,7 +12,6 @@* affs regular file handling primitives */ -#include <asm/div64.h> #include <asm/uaccess.h> #include <asm/system.h> #include <linux/sched.h>
Index: fs/affs/inode.c
===================================================================
RCS file: /cvsdev/hhl-2.4.17/linux/fs/affs/inode.c,v retrieving revision 1.1
affs/inode.c +0 -1
@@ -10,7 +10,6 @@* (C) 1991 Linus Torvalds - minix filesystem */ -#include <asm/div64.h> #include <linux/errno.h> #include <linux/fs.h> #include <linux/slab.h>
Index: fs/ntfs/util.c
===================================================================
RCS file: /cvsdev/hhl-2.4.17/linux/fs/ntfs/util.c,v retrieving revision 1.1
ntfs/util.c +3 -2
@@ -13,7 +13,8 @@#include "util.h" #include <linux/string.h> #include <linux/errno.h> -#include <asm/div64.h> /* For do_div(). */ +#define USE_SLOW_64BIT_DIVIDES +#include <linux/div64.h> /* For do_div(). */ #include "support.h" /*
@@ -233,7 +234,7 @@ {/* Subtract the NTFS time offset, then convert to 1s intervals. */ ntfs_time64_t t = ntutc -NTFS_TIME_OFFSET ; -do_div (t,10000000 ); +do_div (&t,10000000 );return (ntfs_time_t )t; }
Index: fs/smbfs/proc.c
===================================================================
RCS file: /cvsdev/hhl-2.4.17/linux/fs/smbfs/proc.c,v retrieving revision 1.1
smbfs/proc.c +4 -2
@@ -18,12 +18,14 @@#include <linux/dirent.h> #include <linux/nls.h> +#define USE_SLOW_64BIT_DIVIDES +#include <linux/div64.h> +#include <linux/smb_fs.h> #include <linux/smbno.h> #include <linux/smb_mount.h> #include <asm/string.h> -#include <asm/div64.h> #include "smb_debug.h" #include "proto.h"
@@ -375,7 +377,7 @@/* FIXME: what about the timezone difference? */ /* Subtract the NTFS time offset, then convert to 1s intervals. */ u64 t = ntutc -NTFS_TIME_OFFSET ; -do_div (t,10000000 ); +do_div (&t,10000000 );return (time_t )t; }
Index: include/asm-alpha/div64.h
===================================================================
RCS file: div64.h
tmp/cvs9lkcGH deleted +0 -14
@@ -1,14 +0,0 @@ -#ifndef __ALPHA_DIV64 -#define __ALPHA_DIV64 - -/* - * Hey, we're already 64-bit, no - * need to play games.. - */ -#define do_div(n,base) ({ \ - int __res; \ - __res = ((unsigned long) (n)) % (unsigned) (base); \ - (n) = ((unsigned long) (n)) / (unsigned) (base); \ - __res; }) - -#endif
Index: include/asm-arm/div64.h
===================================================================
RCS file: div64.h
tmp/cvs6NHMn8 deleted +0 -14
@@ -1,14 +0,0 @@ -#ifndef __ASM_ARM_DIV64 -#define __ASM_ARM_DIV64 - -/* We're not 64-bit, but... */ -#define do_div(n,base) \ -({ \ - int __res; \ - __res = ((unsigned long)n) % (unsigned int)base; \ - n = ((unsigned long)n) / (unsigned int)base; \ - __res; \ -}) - -#endif -
Index: include/asm-cris/div64.h
===================================================================
RCS file: div64.h
tmp/cvsA6IpzQ deleted +0 -16
@@ -1,16 +0,0 @@ -#ifndef __ASM_CRIS_DIV64 -#define __ASM_CRIS_DIV64 - -/* copy from asm-arm */ - -/* We're not 64-bit, but... */ -#define do_div(n,base) \ -({ \ - int __res; \ - __res = ((unsigned long)n) % (unsigned int)base; \ - n = ((unsigned long)n) / (unsigned int)base; \ - __res; \ -}) - -#endif -
Index: include/asm-ia64/div64.h
===================================================================
RCS file: div64.h
tmp/cvsKee8nJ deleted +0 -20
@@ -1,20 +0,0 @@ -#ifndef _ASM_IA64_DIV64_H -#define _ASM_IA64_DIV64_H - -/* - * Copyright (C) 1999 Hewlett-Packard Co - * Copyright (C) 1999 David Mosberger-Tang <[email protected]> - * - * vsprintf uses this to divide a 64-bit integer N by a small integer BASE. - * This is incredibly hard on IA-64... - */ - -#define do_div(n,base) \ -({ \ - int _res; \ - _res = ((unsigned long) (n)) % (unsigned) (base); \ - (n) = ((unsigned long) (n)) / (unsigned) (base); \ - _res; \ -}) - -#endif /* _ASM_IA64_DIV64_H */
Index: include/asm-mips64/div64.h
===================================================================
RCS file: div64.h
tmp/cvstklJ6k deleted +0 -19
@@ -1,19 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - */ -#ifndef _ASM_DIV64_H -#define _ASM_DIV64_H - -/* - * Hey, we're already 64-bit, no - * need to play games.. - */ -#define do_div(n,base) ({ \ - int __res; \ - __res = ((unsigned long) n) % (unsigned) base; \ - n = ((unsigned long) n) / (unsigned) base; \ - __res; }) - -#endif /* _ASM_DIV64_H */
Index: include/asm-parisc/div64.h
===================================================================
RCS file: div64.h
tmp/cvsUOPlWi deleted +0 -54
54 lines not on this page · raw message
Index: include/asm-ppc/div64.h
===================================================================
RCS file: div64.h
tmp/cvs3bbXXn deleted +0 -13
@@ -1,13 +0,0 @@ -/* - * BK Id: SCCS/s.div64.h 1.5 05/17/01 18:14:24 cort - */ -#ifndef __PPC_DIV64 -#define __PPC_DIV64 - -#define do_div(n,base) ({ \ -int __res; \ -__res = ((unsigned long) n) % (unsigned) base; \ -n = ((unsigned long) n) / (unsigned) base; \ -__res; }) - -#endif
Index: include/asm-s390x/div64.h
===================================================================
RCS file: div64.h
tmp/cvsxz2zsC deleted +0 -10
@@ -1,10 +0,0 @@ -#ifndef __S390_DIV64 -#define __S390_DIV64 - -#define do_div(n,base) ({ \ -int __res; \ -__res = ((unsigned long) n) % (unsigned) base; \ -n = ((unsigned long) n) / (unsigned) base; \ -__res; }) - -#endif
Index: include/asm-sh/div64.h
===================================================================
RCS file: div64.h
tmp/cvsLubD1X deleted +0 -10
@@ -1,10 +0,0 @@ -#ifndef __ASM_SH_DIV64 -#define __ASM_SH_DIV64 - -#define do_div(n,base) ({ \ -int __res; \ -__res = ((unsigned long) n) % (unsigned) base; \ -n = ((unsigned long) n) / (unsigned) base; \ -__res; }) - -#endif /* __ASM_SH_DIV64 */
Index: include/asm-sparc/div64.h
===================================================================
RCS file: div64.h
tmp/cvsdjFoKq deleted +0 -11
@@ -1,11 +0,0 @@ -#ifndef __SPARC_DIV64 -#define __SPARC_DIV64 - -/* We're not 64-bit, but... */ -#define do_div(n,base) ({ \ - int __res; \ - __res = ((unsigned long) n) % (unsigned) base; \ - n = ((unsigned long) n) / (unsigned) base; \ - __res; }) - -#endif /* __SPARC_DIV64 */
Index: include/asm-sparc64/div64.h
===================================================================
RCS file: div64.h
tmp/cvsBXaTu3 deleted +0 -14
@@ -1,14 +0,0 @@ -#ifndef __SPARC64_DIV64 -#define __SPARC64_DIV64 - -/* - * Hey, we're already 64-bit, no - * need to play games.. - */ -#define do_div(n,base) ({ \ - int __res; \ - __res = ((unsigned long) n) % (unsigned) base; \ - n = ((unsigned long) n) / (unsigned) base; \ - __res; }) - -#endif /* __SPARC64_DIV64 */
Index: include/linux/div64.h
===================================================================
RCS file: div64.h
div64.h new file +81 -0
81 lines not on this page · raw message
Index: lib/vsprintf.c
===================================================================
RCS file: /cvsdev/hhl-2.4.17/linux/lib/vsprintf.c,v retrieving revision 1.1
vsprintf.c +23 -14
@@ -19,9 +19,9 @@#include <linux/string.h> #include <linux/ctype.h> #include <linux/kernel.h> +/* #define USE_SLOW_64BIT_DIVIDE */ +#include <linux/div64.h> -#include <asm/div64.h> -/** * simple_strtoul - convert a string to an unsigned long * @cp: The start of the string
@@ -165,7 +165,7 @@if (num ==0 ) tmp[i++]='0' ;else while (num !=0 ) - tmp[i++] = digits[do_div (num,base)]; + tmp[i++] = digits[do_div (&num,base)];if (i > precision) precision = i; size -= precision;
@@ -426,22 +426,31 @@ }continue ; } -if (qualifier =='L' ) + +switch (qualifier) { +case 'L' : num = va_arg(args, long long); -else if (qualifier =='l' ) { - num = va_arg(args, unsigned long); +break ; +case 'l' :if (flags &SIGN ) - num = (signed long ) num; - }else if (qualifier =='Z' ) { + num = (signed long long )va_arg (args, long); +else + num = va_arg(args, unsigned long); +break ; +case 'Z' : num =va_arg (args, size_t); - }else if (qualifier =='h' ) { - num = (unsigned short )va_arg (args, int); +break ; +case 'h' :if (flags &SIGN ) - num = (signed short ) num; - }else { - num = va_arg(args, unsigned int); + num = (signed long long )va_arg (args, int); +else + num = va_arg(args, unsigned int); +break ; +default :if (flags &SIGN ) - num = (signed int ) num; + num = (signed long long )va_arg (args, int); +else + num = va_arg(args, unsigned int); } str =number (str, end, num, base, field_width, precision, flags);
Hi,
This patch is broken. Please don't apply as it is.
Quoted 7 lines · Troy Benjegerdes
This patch introduced
include/linux/div64.hand removesasm/div64.hfrom all the architectures that don't have optimized ASM.I also played janitor and found every file that used
asm/div64.h. There was some mips stuff that I didn't touch, but now everything else should actually work on all platforms linux supports, instead of just those that are either 64 bit, or have optimized asm versions.
[snip]
Quoted 21 lines
diff -N
div64.hdiv64.h Thu Feb 7 21:33:12 2002 renamed from dev/null Tue May 5 13:32:27 1998 +4
-0@@ -0,0 +1,81 @@ +/* + * include/linux/div64.h + * + * Primarily used by vsprintf to divide a 64 bit int N by a small integerbase
+ * We really do NOT want to encourage people to do slow 64 bit divides in
+ * the kernel, so the 'default' version of this function panics if you
+ * try and divide a 64 bit number by anything other than 8 or 16.
+ *
+ * If you really *really* need this, and are prepared to be flamed by
+ * lkml, #defineUSE_SLOW_64BIT_DIVIDESbefore including this file.
+ */div64.h Thu Feb 7 21:33:12 2002 renamed from dev/null Tue May 5 13:32:27 1998 +5
-0+#ifndef __DIV64 +#define __DIV64 + +#include <linux/config.h> +
div64.h Thu Feb 7 21:33:12 2002
Quoted 10 lines
div64.h Thu Feb 7 21:33:12 2002 renamed from dev/null Tue May 5 13:32:27 1998 +10
-0+/* configurable */ +#undef __USE_ASM + + +#ifdef __USE_ASM +/* yeah, this is a mess, and leaves out m68k.... */ +# if defined(CONFIG_X86) || define(CONFIG_ARCH_S390) || defined(CONFIG_MIPS) +# define __USE_ASM__ +# endif +#endif
Er, what exactly do you think the above does?!?
It NEVER will define __USE_ASM because you make the definition dependent on the UNDEFINED __USE_ASM! If anything you need to do instead:
+# if defined(CONFIG_X86) || define(CONFIG_ARCH_S390) || defined(CONFIG_MIPS) || defined(CONFIG_M68K) +# define __USE_ASM__
+# endif
I.e. remove the #ifdef __USE_ASM and add CONFIG_M68K dependence.
div64.h Thu Feb 7 21:33:12 2002
Quoted 12 lines
div64.h Thu Feb 7 21:33:12 2002 renamed from dev/null Tue May 5 13:32:27 1998 +8
-0+#ifdef __USE_ASM__ +#include <asm/div64.h> +#else /* __USE_ASM__ */ +static inline int do_div(unsigned long long * n, unsigned long base) +{ + int res = 0; + unsigned long long t = *n; + if ( t == (unsigned long)t ){ /* this should handle 64 bitplatforms */
div64.h Thu Feb 7 21:33:12 2002 renamed from dev/null Tue May 5 13:32:27 1998 +3
-0+ res = ((unsigned long) t) % base; + t = ((unsigned long) t) / base; + } else {
This check is silly. It is _way_ more efficient to do:
if (BITS_PER_LONG == 64) {
res = ((unsigned long)t) % base;
t = ((unsigned long)t) / base;
} else {This actually only compiles one or the other but not both.
Quoted 1 line
+#ifndef
USE_SLOW_64BIT_DIVIDES
This is stupid. If someone knows in advance they are only doing a division by 8 or 16 they would not be using do_div in the first place, they would be using a shift or even just normal division sign which gcc is supposed to optimize to a shift itself (assuming division by constant).
Please remove this. People using do_div() are using it for a reason.
Quoted 11 lines
div64.h Thu Feb 7 21:33:12 2002 renamed from dev/null Tue May 5 13:32:27 1998 +11
-0+ switch (base) { + case 8: + res = ((unsigned long) t & 0x7); + t = t >> 3; + break; + case 16: + res = ((unsigned long) t & 0xf); + t = t >> 4; + break; + default: + panic("do_div called with 64 bit arg and
Quoted 1 line
unsupported base\n", base);
Anyway, why do you randomly pick 8 and 16? You could do any power of two via shift by simply doing something along these lines:
if (!(base & (base - 1))) {
res = t & (base - 1);
t >>= ffs(base) - 1;
} else
panic("blah");But I still think this is a really stupid thing to do.
div64.h Thu Feb 7 21:33:12 2002
Quoted 9 lines
div64.h Thu Feb 7 21:33:12 2002 renamed from dev/null Tue May 5 13:32:27 1998 +9
-0+ } +#else /* USE_SLOW_64BIT_DIVIDES */ + /* + * Nasty ugly generic C 64 bit divide on 32 bit machine + * No one seems to want to take credit for this + */ + unsigned long low, low2, high; + low = (t) & 0xffffffff; + high = (t) >> 32;
Look at asm-parisc/div64.h which has an optimized version of this for t actually being 32bit.
Quoted 12 lines
div64.h Thu Feb 7 21:33:12 2002 renamed from dev/null Tue May 5 13:32:27 1998 +12
-0+ res = high % base; + high = high / base; + low2 = low >> 16; + low2 += res << 16; + res = low2 % base; + low2 = low2 / base; + low = low & 0xffff; + low += res << 16; + res = low % base; + low = low / base; + t = low + ((long long)low2 << 16) + + ((long long) high << 32);
div64.h Thu Feb 7 21:33:12 2002
Quoted 10 lines
div64.h Thu Feb 7 21:33:12 2002 renamed from dev/null Tue May 5 13:32:27 1998 +10
-0+#endif /* USE_SLOW_64BIT_DIVIDES */ + } + *n = t; + return res; +} + + +#endif /* __USE_ASM__ */ + +#endif
[snip]
I think the patch is generally a good idea but it has to be done right...
Best regards,
Anton
Signature · 5 lines
"I've not lost my mind. It's backed up on tape somewhere." - Unknown -- Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @) Linux NTFS Maintainer / WWW: http://linux-ntfs.sf.net/ ICQ: 8561279 / WWW: http://www-stu.christs.cam.ac.uk/~aia21/
Quoted 47 lines · Anton Altaparmakov
Hi,
This patch is broken. Please don't apply as it is.
Quoted 7 lines · Troy Benjegerdes
This patch introduced
include/linux/div64.hand removesasm/div64.hfrom all the architectures that don't have optimized ASM.I also played janitor and found every file that used
asm/div64.h. There was some mips stuff that I didn't touch, but now everything else should actually work on all platforms linux supports, instead of just those that are either 64 bit, or have optimized asm versions.[snip]
Quoted 21 lines
diff -N
div64.hdiv64.h Thu Feb 7 21:33:12 2002 renamed from dev/null Tue May 5 13:32:27 1998 +4
-0@@ -0,0 +1,81 @@ +/* + * include/linux/div64.h + * + * Primarily used by vsprintf to divide a 64 bit int N by a smallinteger base
+ * We really do NOT want to encourage people to do slow 64 bit divides in
+ * the kernel, so the 'default' version of this function panics if you
+ * try and divide a 64 bit number by anything other than 8 or 16.
+ *
+ * If you really *really* need this, and are prepared to be flamed by
+ * lkml, #defineUSE_SLOW_64BIT_DIVIDESbefore including this file.
+ */div64.h Thu Feb 7 21:33:12 2002 renamed from dev/null Tue May 5 13:32:27 1998 +5
-0+#ifndef __DIV64 +#define __DIV64 + +#include <linux/config.h> +div64.h Thu Feb 7 21:33:12 2002
Quoted 10 lines
div64.h Thu Feb 7 21:33:12 2002 renamed from dev/null Tue May 5 13:32:27 1998 +10
-0+/* configurable */ +#undef __USE_ASM + + +#ifdef __USE_ASM +/* yeah, this is a mess, and leaves out m68k.... */ +# if defined(CONFIG_X86) || define(CONFIG_ARCH_S390) || defined(CONFIG_MIPS) +# define __USE_ASM__ +# endif +#endifEr, what exactly do you think the above does?!?
Quoted 1 line
It NEVER will define
__USE_ASMbecause you make the definition dependent on the UNDEFINED__USE_ASM! If anything you need to do instead:
Ooops. Sorry, didn't notice the second "__". This part will work. But rest of comments remain.
Best regards,
Anton
Quoted 113 lines
+# if
defined(CONFIG_X86)||define(CONFIG_ARCH_S390)||defined(CONFIG_MIPS)||defined(CONFIG_M68K)div64.h new file +2
-0+# define __USE_ASM__ +# endif I.e. remove the #ifdef
__USE_ASMand addCONFIG_M68Kdependence.div64.h Thu Feb 7 21:33:12 2002
Quoted 12 lines
div64.h Thu Feb 7 21:33:12 2002 renamed from dev/null Tue May 5 13:32:27 1998 +8
-0+#ifdef __USE_ASM__ +#include <asm/div64.h> +#else /* __USE_ASM__ */ +static inline int do_div(unsigned long long * n, unsigned long base) +{ + int res = 0; + unsigned long long t = *n; + if ( t == (unsigned long)t ){ /* this should handle 64 bitplatforms */
div64.h Thu Feb 7 21:33:12 2002 renamed from dev/null Tue May 5 13:32:27 1998 +3
-0+ res = ((unsigned long) t) % base; + t = ((unsigned long) t) / base; + } else {This check is silly. It is _way_ more efficient to do:
if (BITS_PER_LONG == 64) { res = ((unsigned long)t) % base; t = ((unsigned long)t) / base; } else {This actually only compiles one or the other but not both.
Quoted 1 line
+#ifndef
USE_SLOW_64BIT_DIVIDESThis is stupid. If someone knows in advance they are only doing a division by 8 or 16 they would not be using
do_divin the first place, they would be using a shift or even just normal division sign which gcc is supposed to optimize to a shift itself (assuming division by constant).Please remove this. People using
do_div()are using it for a reason.Quoted 11 lines
div64.h Thu Feb 7 21:33:12 2002 renamed from dev/null Tue May 5 13:32:27 1998 +11
-0+ switch (base) { + case 8: + res = ((unsigned long) t & 0x7); + t = t >> 3; + break; + case 16: + res = ((unsigned long) t & 0xf); + t = t >> 4; + break; + default: + panic("do_div called with 64 bit arg andQuoted 1 line
unsupported base\n", base);
Anyway, why do you randomly pick 8 and 16? You could do any power of two via shift by simply doing something along these lines:
if (!(base & (base - 1))) { res = t & (base - 1); t >>= ffs(base) - 1; } else panic("blah");But I still think this is a really stupid thing to do.
div64.h Thu Feb 7 21:33:12 2002
Quoted 9 lines
div64.h Thu Feb 7 21:33:12 2002 renamed from dev/null Tue May 5 13:32:27 1998 +9
-0+ } +#else /* USE_SLOW_64BIT_DIVIDES */ + /* + * Nasty ugly generic C 64 bit divide on 32 bit machine + * No one seems to want to take credit for this + */ + unsigned long low, low2, high; + low = (t) & 0xffffffff; + high = (t) >> 32;Look at
asm-parisc/div64.hwhich has an optimized version of this for t actually being 32bit.Quoted 12 lines
div64.h Thu Feb 7 21:33:12 2002 renamed from dev/null Tue May 5 13:32:27 1998 +12
-0+ res = high % base; + high = high / base; + low2 = low >> 16; + low2 += res << 16; + res = low2 % base; + low2 = low2 / base; + low = low & 0xffff; + low += res << 16; + res = low % base; + low = low / base; + t = low + ((long long)low2 << 16) + + ((long long) high << 32);div64.h Thu Feb 7 21:33:12 2002
Quoted 10 lines
div64.h Thu Feb 7 21:33:12 2002 renamed from dev/null Tue May 5 13:32:27 1998 +10
-0+#endif /* USE_SLOW_64BIT_DIVIDES */ + } + *n = t; + return res; +} + + +#endif /* __USE_ASM__ */ + +#endif[snip]
I think the patch is generally a good idea but it has to be done right...
Best regards,
Anton
--
"I've not lost my mind. It's backed up on tape somewhere." - Unknown
--
Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @) Linux NTFS Maintainer / WWW: http://linux-ntfs.sf.net/
ICQ: 8561279 / WWW: http://www-stu.christs.cam.ac.uk/~aia21/-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Signature · 5 lines
"I've not lost my mind. It's backed up on tape somewhere." - Unknown -- Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @) Linux NTFS Maintainer / WWW: http://linux-ntfs.sf.net/ ICQ: 8561279 / WWW: http://www-stu.christs.cam.ac.uk/~aia21/
Quoted 5 lines
Quoted 2 lines
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+/* yeah, this is a mess, and leaves out m68k.... */ +# if defined(CONFIG_X86) || define(CONFIG_ARCH_S390) ||Just noticed there is a typo. It should be "
defined(CONFIG_ARCH_S390)" not "define"... Just spotted it
fixed.
Quoted 2 lines
#if
defined(__mc68000__)so just use that instead. Any m68k people reading this care to comment?
fixed.
Quoted 4 lines
Sorry can't say. Don't have 64 bit computers/gcc. )-: But as a matter of principle I wouldn't trust gcc. I remember at least one case being discussed on lkml before where gcc was not optimizing away obviously optimizable code...
anyone else have comments on this? (for now I'm adding a '(BITS_PER_LONG ==
64) to the first if..
Quoted 4 lines
Quoted 2 lines
I provided the #define option so we can have *one* sane cross platform 64 bit divide, but one that still makes people think before using
do_div.You are just obfuscating the kernel code.
Obviously, there are good reasons for real 64 bit divides.
Would you rather have a 'do_div64()' function that does full divisions?
For ntfs/smbfs, can you just make two consecutive calls?
do_div(&val, 10000) do_div(&val, 1000)
Quoted 9 lines
Rewrite the algorithm is the obvious choice. The old NTFS driver used to have one but I got rid of it in favour of the nice
do_div()assuming it would always work... But even that had certain restrictions put in place because of the special uses it had so it is not generic enough fordo_div(). Consideringdo_div()is not useful in current state I may have to resurrect the original code and put it into NTFS (and SMBFS, which has the same problem). But it would be much better to have a properdo_div()instead. Otherwise we will just get proliferation of variousdo_div()implementations in various drivers.
Yes, I'd like to avoid 16 different degenerate case implementations of do_div() in various drivers.
Linus (or anyone else in a position to send stuff to Linus), could you please make a statement about what would be acceptable? Should we have two functions, rewrite vsprintf, or what?
I could just punt and fix powerpc with asm, but I really don't think do_div gets called enough to be worth the trouble of asm code. (ASM is for mucking with MMU's, atomic ops, etc, not 64 bit divides in-kernel)
Signature · 5 lines
Troy Benjegerdes | master of mispeeling | 'da hozer' | [email protected] -----"If this message isn't misspelled, I didn't write it" -- Me ----- "Why do musicians compose symphonies and poets write poems? They do it because life wouldn't have any meaning for them if they didn't. That's why I draw cartoons. It's my life." -- Charles Schulz
Updated div64.h cleanup
In reply to Anton AltaparmakovHere's anothing try at an acceptable div64.h cleanup.
I would appreciate if someone could verify that what I did in the matrox_maven.c file is correct.
Index: drivers/acpi/include/platform/aclinux.h
===================================================================
RCS file: /cvsdev/hhl-2.4.17/linux/drivers/acpi/include/platform/aclinux.h,v retrieving revision 1.1
acpi/include/platform/aclinux.h +1 -1
@@ -36,9 +36,9 @@#include <linux/string.h> #include <linux/kernel.h> #include <linux/ctype.h> +#include <asm/system.h> #include <asm/atomic.h> -#include <asm/div64.h> #define strtoul simple_strtoul
Index: drivers/net/sk98lin/skproc.c
===================================================================
RCS file: /cvsdev/hhl-2.4.17/linux/drivers/net/sk98lin/skproc.c,v retrieving revision 1.1
net/sk98lin/skproc.c +3 -55
76 lines not on this page · raw message
Index: drivers/video/matrox/matroxfb_maven.c
===================================================================
RCS file: /cvsdev/hhl-2.4.17/linux/drivers/video/matrox/matroxfb_maven.c,v retrieving revision 1.1
video/matrox/matroxfb_maven.c +8 -4
@@ -15,7 +15,8 @@#include "matroxfb_DAC1064.h" #include <linux/i2c.h> #include <linux/matroxfb.h> -#include <asm/div64.h> +#define USE_SLOW_64BIT_DIVIDES +#include <linux/div64.h> #include <asm/uaccess.h> #define MAVEN_I2CID (0x1B)
@@ -698,9 +699,8 @@int vdec;int vlen; -#define MATROX_USE64BIT_DIVIDE if (mt->VTotal) { -#ifdef MATROX_USE64BIT_DIVIDE +#ifdef USE_SLOW_64BIT_DIVIDES u64 f1;u32 a;u32 b;
@@ -709,7 +709,11 @@ b = (mt->VTotal -1 ) * (m->htotal +2 ) + m->hcorr +2 ; f1 = ((u64 )a) <<15 ;/* *32768 */ -do_div (f1, b); +if (b >65535 ){/* messy stuff to make sure b is less than 65536 */ +do_div (&f1, b &0xffff ); + b = (b &0xffff0000 )/(b &0xffff ) +1 ; + } +do_div (&f1, b); vdec = f1;#else vdec = m->vlines *32768 / mt->VTotal;
Index: fs/affs/file.c
===================================================================
RCS file: /cvsdev/hhl-2.4.17/linux/fs/affs/file.c,v retrieving revision 1.1
affs/file.c +0 -1
@@ -12,7 +12,6 @@* affs regular file handling primitives */ -#include <asm/div64.h> #include <asm/uaccess.h> #include <asm/system.h> #include <linux/sched.h>
Index: fs/affs/inode.c
===================================================================
RCS file: /cvsdev/hhl-2.4.17/linux/fs/affs/inode.c,v retrieving revision 1.1
affs/inode.c +0 -1
@@ -10,7 +10,6 @@* (C) 1991 Linus Torvalds - minix filesystem */ -#include <asm/div64.h> #include <linux/errno.h> #include <linux/fs.h> #include <linux/slab.h>
Index: fs/ntfs/util.c
===================================================================
RCS file: /cvsdev/hhl-2.4.17/linux/fs/ntfs/util.c,v retrieving revision 1.1
ntfs/util.c +4 -2
@@ -13,7 +13,8 @@#include "util.h" #include <linux/string.h> #include <linux/errno.h> -#include <asm/div64.h> /* For do_div(). */ +#define USE_SLOW_64BIT_DIVIDES +#include <linux/div64.h> /* For do_div(). */ #include "support.h" /*
@@ -233,7 +234,8 @@ {/* Subtract the NTFS time offset, then convert to 1s intervals. */ ntfs_time64_t t = ntutc -NTFS_TIME_OFFSET ; -do_div (t,10000000 ); +do_div (&t,10000 ); +do_div (&t,1000 );/* divide by 10000000 */ return (ntfs_time_t )t; }
Index: fs/smbfs/proc.c
===================================================================
RCS file: /cvsdev/hhl-2.4.17/linux/fs/smbfs/proc.c,v retrieving revision 1.1
smbfs/proc.c +5 -2
@@ -18,12 +18,14 @@#include <linux/dirent.h> #include <linux/nls.h> +#define USE_SLOW_64BIT_DIVIDES +#include <linux/div64.h> +#include <linux/smb_fs.h> #include <linux/smbno.h> #include <linux/smb_mount.h> #include <asm/string.h> -#include <asm/div64.h> #include "smb_debug.h" #include "proto.h"
@@ -375,7 +377,8 @@/* FIXME: what about the timezone difference? */ /* Subtract the NTFS time offset, then convert to 1s intervals. */ u64 t = ntutc -NTFS_TIME_OFFSET ; -do_div (t,10000000 ); +do_div (&t,10000 ); +do_div (&t,1000 );return (time_t )t; }
Index: include/asm-alpha/div64.h
===================================================================
RCS file: div64.h
tmp/cvs4OfhPk deleted +0 -14
@@ -1,14 +0,0 @@ -#ifndef __ALPHA_DIV64 -#define __ALPHA_DIV64 - -/* - * Hey, we're already 64-bit, no - * need to play games.. - */ -#define do_div(n,base) ({ \ - int __res; \ - __res = ((unsigned long) (n)) % (unsigned) (base); \ - (n) = ((unsigned long) (n)) / (unsigned) (base); \ - __res; }) - -#endif
Index: include/asm-arm/div64.h
===================================================================
RCS file: div64.h
tmp/cvsFC1yur deleted +0 -14
@@ -1,14 +0,0 @@ -#ifndef __ASM_ARM_DIV64 -#define __ASM_ARM_DIV64 - -/* We're not 64-bit, but... */ -#define do_div(n,base) \ -({ \ - int __res; \ - __res = ((unsigned long)n) % (unsigned int)base; \ - n = ((unsigned long)n) / (unsigned int)base; \ - __res; \ -}) - -#endif -
Index: include/asm-cris/div64.h
===================================================================
RCS file: div64.h
tmp/cvsYOw3W7 deleted +0 -16
@@ -1,16 +0,0 @@ -#ifndef __ASM_CRIS_DIV64 -#define __ASM_CRIS_DIV64 - -/* copy from asm-arm */ - -/* We're not 64-bit, but... */ -#define do_div(n,base) \ -({ \ - int __res; \ - __res = ((unsigned long)n) % (unsigned int)base; \ - n = ((unsigned long)n) / (unsigned int)base; \ - __res; \ -}) - -#endif -
Index: include/asm-ia64/div64.h
===================================================================
RCS file: div64.h
tmp/cvshL7A10 deleted +0 -20
@@ -1,20 +0,0 @@ -#ifndef _ASM_IA64_DIV64_H -#define _ASM_IA64_DIV64_H - -/* - * Copyright (C) 1999 Hewlett-Packard Co - * Copyright (C) 1999 David Mosberger-Tang <[email protected]> - * - * vsprintf uses this to divide a 64-bit integer N by a small integer BASE. - * This is incredibly hard on IA-64... - */ - -#define do_div(n,base) \ -({ \ - int _res; \ - _res = ((unsigned long) (n)) % (unsigned) (base); \ - (n) = ((unsigned long) (n)) / (unsigned) (base); \ - _res; \ -}) - -#endif /* _ASM_IA64_DIV64_H */
Index: include/asm-mips64/div64.h
===================================================================
RCS file: div64.h
tmp/cvsjVZJpB deleted +0 -19
@@ -1,19 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - */ -#ifndef _ASM_DIV64_H -#define _ASM_DIV64_H - -/* - * Hey, we're already 64-bit, no - * need to play games.. - */ -#define do_div(n,base) ({ \ - int __res; \ - __res = ((unsigned long) n) % (unsigned) base; \ - n = ((unsigned long) n) / (unsigned) base; \ - __res; }) - -#endif /* _ASM_DIV64_H */
Index: include/asm-parisc/div64.h
===================================================================
RCS file: div64.h
tmp/cvsvkng5v deleted +0 -54
54 lines not on this page · raw message
Index: include/asm-ppc/div64.h
===================================================================
RCS file: div64.h
tmp/cvsl8SXkz deleted +0 -13
@@ -1,13 +0,0 @@ -/* - * BK Id: SCCS/s.div64.h 1.5 05/17/01 18:14:24 cort - */ -#ifndef __PPC_DIV64 -#define __PPC_DIV64 - -#define do_div(n,base) ({ \ -int __res; \ -__res = ((unsigned long) n) % (unsigned) base; \ -n = ((unsigned long) n) / (unsigned) base; \ -__res; }) - -#endif
Index: include/asm-s390x/div64.h
===================================================================
RCS file: div64.h
tmp/cvs0sUH4K deleted +0 -10
@@ -1,10 +0,0 @@ -#ifndef __S390_DIV64 -#define __S390_DIV64 - -#define do_div(n,base) ({ \ -int __res; \ -__res = ((unsigned long) n) % (unsigned) base; \ -n = ((unsigned long) n) / (unsigned) base; \ -__res; }) - -#endif
Index: include/asm-sh/div64.h
===================================================================
RCS file: div64.h
tmp/cvsvYhpX1 deleted +0 -10
@@ -1,10 +0,0 @@ -#ifndef __ASM_SH_DIV64 -#define __ASM_SH_DIV64 - -#define do_div(n,base) ({ \ -int __res; \ -__res = ((unsigned long) n) % (unsigned) base; \ -n = ((unsigned long) n) / (unsigned) base; \ -__res; }) - -#endif /* __ASM_SH_DIV64 */
Index: include/asm-sparc/div64.h
===================================================================
RCS file: div64.h
tmp/cvsgmV0Up deleted +0 -11
@@ -1,11 +0,0 @@ -#ifndef __SPARC_DIV64 -#define __SPARC_DIV64 - -/* We're not 64-bit, but... */ -#define do_div(n,base) ({ \ - int __res; \ - __res = ((unsigned long) n) % (unsigned) base; \ - n = ((unsigned long) n) / (unsigned) base; \ - __res; }) - -#endif /* __SPARC_DIV64 */
Index: include/asm-sparc64/div64.h
===================================================================
RCS file: div64.h
tmp/cvsRaRtBV deleted +0 -14
@@ -1,14 +0,0 @@ -#ifndef __SPARC64_DIV64 -#define __SPARC64_DIV64 - -/* - * Hey, we're already 64-bit, no - * need to play games.. - */ -#define do_div(n,base) ({ \ - int __res; \ - __res = ((unsigned long) n) % (unsigned) base; \ - n = ((unsigned long) n) / (unsigned) base; \ - __res; }) - -#endif /* __SPARC64_DIV64 */
Index: include/linux/div64.h
===================================================================
RCS file: div64.h
div64.h new file +89 -0
89 lines not on this page · raw message
Index: lib/vsprintf.c
===================================================================
RCS file: /cvsdev/hhl-2.4.17/linux/lib/vsprintf.c,v retrieving revision 1.1
vsprintf.c +23 -14
@@ -19,9 +19,9 @@#include <linux/string.h> #include <linux/ctype.h> #include <linux/kernel.h> +/* #define USE_SLOW_64BIT_DIVIDE */ +#include <linux/div64.h> -#include <asm/div64.h> -/** * simple_strtoul - convert a string to an unsigned long * @cp: The start of the string
@@ -165,7 +165,7 @@if (num ==0 ) tmp[i++]='0' ;else while (num !=0 ) - tmp[i++] = digits[do_div (num,base)]; + tmp[i++] = digits[do_div (&num,base)];if (i > precision) precision = i; size -= precision;
@@ -426,22 +426,31 @@ }continue ; } -if (qualifier =='L' ) + +switch (qualifier) { +case 'L' : num = va_arg(args, long long); -else if (qualifier =='l' ) { - num = va_arg(args, unsigned long); +break ; +case 'l' :if (flags &SIGN ) - num = (signed long ) num; - }else if (qualifier =='Z' ) { + num = (signed long long )va_arg (args, long); +else + num = va_arg(args, unsigned long); +break ; +case 'Z' : num =va_arg (args, size_t); - }else if (qualifier =='h' ) { - num = (unsigned short )va_arg (args, int); +break ; +case 'h' :if (flags &SIGN ) - num = (signed short ) num; - }else { - num = va_arg(args, unsigned int); + num = (signed long long )va_arg (args, int); +else + num = va_arg(args, unsigned int); +break ; +default :if (flags &SIGN ) - num = (signed int ) num; + num = (signed long long )va_arg (args, int); +else + num = va_arg(args, unsigned int); } str =number (str, end, num, base, field_width, precision, flags);
Quoted 9 lines · Anton Altaparmakov
Quoted 2 lines · Troy Benjegerdes
Well, there's a reason I left out
CONFIG_M68Kdeps.. Go tell me whereCONFIG_M68Kis defined.. ;)Appologies, it's in Configure.help but that is not a too useful places to have it. However the kernel seems to be using:
#if
defined(__mc68000__)so just use that instead. Any m68k people reading this care to comment?
__mc68000__ is the correct define, I don't know who put in CONFIG_M68K but it doesn't belong there.
Jes
Quoted 7 lines · Jes Sorensen
Quoted 4 lines · Anton Altaparmakov
Quoted 2 lines · Troy Benjegerdes
Well, there's a reason I left out
CONFIG_M68Kdeps.. Go tell me whereCONFIG_M68Kis defined.. ;)
Quoted 8 lines
Quoted 5 lines
Appologies, it's in Configure.help but that is not a too useful places to have it. However the kernel seems to be using:
#if
defined(__mc68000__)so just use that instead. Any m68k people reading this care to comment?
__mc68000__is the correct define, I don't know who put inCONFIG_M68Kbut it doesn't belong there.
I disagree -- look at arch/*/config.in.
Each arch needs to define a CONFIG_$ARCH.
It looks like cris and mk68 are one of the few arches that fail to do this...
Quoted 2 lines
# Identify this as a Sparc64 build
define_boolCONFIG_SPARC64y
Sigh, this should be in an 'arch' specification :)
Jeff
Signature · 3 lines
Jeff Garzik | "UNIX enhancements aren't." Building 1024 | -- says /usr/games/fortune MandrakeSoft |
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Jeff" == Jeff Garzik <[email protected]> writes:
Quoted 2 lines · Jeff> Jes Sorensen wrote:
Quoted 2 lines
__mc68000__is the correct define, I don't know who put inCONFIG_M68Kbut it doesn't belong there.
Jeff> I disagree -- look at arch/*/config.in.
Jeff> Each arch needs to define a CONFIG_$ARCH.
Why? CONFIG_$ARCH only makes sense if you can enable two architectures in the same build. What does CONFIG_M68K give you that __mc68000__ doesn't provide?
Jes
Quoted 6 lines · Jes Sorensen
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Jeff" == Jeff Garzik <[email protected]> writes:
Quoted 2 lines · Jeff> Jes Sorensen wrote:
Quoted 2 lines
__mc68000__is the correct define, I don't know who put inCONFIG_M68Kbut it doesn't belong there.
Quoted 7 lines
Jeff> I disagree -- look at
arch/*/config.in.Jeff> Each arch needs to define a CONFIG_$ARCH.
Why? CONFIG_$ARCH only makes sense if you can enable two architectures in the same build. What does
CONFIG_M68Kgive you that__mc68000__doesn't provide?
Uniformity.
Nicolas
Quoted 7 lines · Jes Sorensen
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
"Jeff" == Jeff Garzik <[email protected]> writes:
Quoted 2 lines · Jeff> Jes Sorensen wrote:
Quoted 2 lines
__mc68000__is the correct define, I don't know who put inCONFIG_M68Kbut it doesn't belong there.
Quoted 7 lines
Jeff> I disagree -- look at
arch/*/config.in.Jeff> Each arch needs to define a CONFIG_$ARCH.
Why? CONFIG_$ARCH only makes sense if you can enable two architectures in the same build. What does
CONFIG_M68Kgive you that__mc68000__doesn't provide?
1) it is a Linux kernel standard. all arches save two define CONFIG_$arch.
2) you have two tests, "ARCH==m68k" in config.in and "__mc68000__" in C code. CONFIG_M68K means you only test one symbol, the same symbol, in all code.
3) as this thread shows, due to #1, users -expect- that CONFIG_M68K will exist
Signature · 3 lines
Jeff Garzik | "UNIX enhancements aren't." Building 1024 | -- says /usr/games/fortune MandrakeSoft |
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Jeff" == Jeff Garzik <[email protected]> writes:
Quoted 3 lines · Jeff> Jes Sorensen wrote:
Quoted 3 lines
Why? CONFIG_$ARCH only makes sense if you can enable two
architectures in the same build. What doesCONFIG_M68Kgive you that__mc68000__doesn't provide?
Jeff> 1) it is a Linux kernel standard. all arches save two define Jeff> CONFIG_$arch.
Ehm, what standard? the standard way has always been ARCH==, CONFIG_PPC used to be the only place using this and all it did was to make things uglier and inconsistent.
Jeff> 2) you have two tests, "ARCH==m68k" in config.in and "__mc68000__" Jeff> in C code. CONFIG_M68K means you only test one symbol, the same Jeff> symbol, in all code.
If you want to do that, then one should use CONFIG_<ARCH> in the Makefiles as well.
Jeff> 3) as this thread shows, due to #1, users -expect- that Jeff> CONFIG_M68K will exist
Ehm, most kernel developers will expect ARCH== in Config.in as thats how it's always been.
Jes
Jeff Garzik <[email protected]> writes:
|> Jes Sorensen wrote: |> > |> > >>>>> "Jeff" == Jeff Garzik <[email protected]> writes: |> > |> > Jeff> Jes Sorensen wrote: |> > >> __mc68000__ is the correct define, I don't know who put in |> > >> CONFIG_M68K but it doesn't belong there. |> > |> > Jeff> I disagree -- look at arch/*/config.in. |> > |> > Jeff> Each arch needs to define a CONFIG_$ARCH. |> > |> > Why? CONFIG_$ARCH only makes sense if you can enable two architectures |> > in the same build. What does CONFIG_M68K give you that __mc68000__ |> > doesn't provide? |> |> 1) it is a Linux kernel standard. all arches save two define |> CONFIG_$arch. |> |> 2) you have two tests, "ARCH==m68k" in config.in and "__mc68000__" in C |> code. CONFIG_M68K means you only test one symbol, the same symbol, in |> all code. |> |> 3) as this thread shows, due to #1, users -expect- that CONFIG_M68K will |> exist
If consistency is your goal then CONFIG_I386 should be defined.
Andreas.
Signature · 4 lines
Andreas Schwab, SuSE Labs, [email protected] SuSE GmbH, Deutschherrnstr. 15-19, D-90429 Nürnberg Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."
Quoted 1 line · Andreas Schwab
If consistency is your goal then
CONFIG_I386should be defined.
I was referring to consistency of having one symbol that can be tested in most (note: not all) makefiles, C code, and config.in code.
The i386 arch already has CONFIG_X86. I agree that if someone cared to make define always equal CONFIG_upcase($arch), you are correct.
Jeff
Signature · 3 lines
Jeff Garzik | "UNIX enhancements aren't." Building 1024 | -- says /usr/games/fortune MandrakeSoft |
Quoted 8 lines · Jes Sorensen
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
"Jeff" == Jeff Garzik <[email protected]> writes:
Quoted 3 lines · Jeff> Jes Sorensen wrote:
Quoted 3 lines
Why? CONFIG_$ARCH only makes sense if you can enable two
architectures in the same build. What doesCONFIG_M68Kgive you that__mc68000__doesn't provide?
Quoted 6 lines
Jeff> 1) it is a Linux kernel standard. all arches save two define Jeff> CONFIG_$arch.
Ehm, what standard? the standard way has always been ARCH==,
CONFIG_PPCused to be the only place using this and all it did was to make things uglier and inconsistent.
*shrug* I've known about this for years. And every arch but m68k and cris follows the standard.
Quoted 6 lines
Jeff> 2) you have two tests, "ARCH==m68k" in config.in and "
__mc68000__" Jeff> in C code.CONFIG_M68Kmeans you only test one symbol, the same Jeff> symbol, in all code.If you want to do that, then one should use CONFIG_<ARCH> in the Makefiles as well.
I'm betting a few special makefiles require $ARCH information when .config is info is not available. Otherwise, agreed.
Quoted 5 lines
Jeff> 3) as this thread shows, due to #1, users -expect- that Jeff>
CONFIG_M68Kwill existEhm, most kernel developers will expect ARCH== in Config.in as thats how it's always been.
and I forgot about this flat-out bug:
4) you cannot test ARCH==m68k as a component of dep_xxx declarations. And yes, this is a requirement, this is used currently in */config.in all over the kernel tree.
Jeff
Signature · 3 lines
Jeff Garzik | "UNIX enhancements aren't." Building 1024 | -- says /usr/games/fortune MandrakeSoft |
[snip]
Quoted 8 lines
Quoted 7 lines
div64.h new file +7
-0+ +#ifdef __USE_ASM +/* yeah, this is a mess, and leaves out m68k.... */ +# if defined(CONFIG_X86 ) ||define (CONFIG_ARCH_S390 ) || defined(CONFIG_MIPS ) +# define __USE_ASM__ +# endif +#endif
[snip]
Quoted 1 line
I.e. remove the #ifdef
__USE_ASMand addCONFIG_M68Kdependence.
Well, there's a reason I left out CONFIG_M68K deps.. Go tell me where CONFIG_M68K is defined.. ;)
Quoted 15 lines
div64.h line 38
Quoted 12 lines
div64.h new file +8
-0+#ifdef __USE_ASM__ +#include <asm/div64.h> +#else /* __USE_ASM__ */ +static inline int do_div (unsigned long long * n,unsigned long base) +{ +int res =0 ; +unsigned long long t = *n; +if ( t == (unsigned long )t ){/* this should handle 64 bit platforms */
div64.h new file +3
-0+ res = ((unsigned long ) t) % base; + t = ((unsigned long ) t) / base; + }else {This check is silly. It is _way_ more efficient to do:
Quoted 6 lines
if (BITS_PER_LONG == 64) { res = ((unsigned long)t) % base; t = ((unsigned long)t) / base; } else {This actually only compiles one or the other but not both.
The intent of this is to have one check that handles both 64 and 32 bit platforms nicely, and handle degenerate cases where N is less than 32 bits on 32 bit platforms.
I could be persuaded to add a (BITS_PER_LONG) check for 64 bit machines if someone shows me ASM showing gcc isn't smart enough to figure out that
(unsigned long long)t == (unsigned long)t
is always true on 64 bit.
Quoted 9 lines
Quoted 2 lines
+#ifndef
USE_SLOW_64BIT_DIVIDESThis is stupid. If someone knows in advance they are only doing a division by 8 or 16 they would not be using
do_divin the first place, they would be using a shift or even just normal division sign which gcc is supposed to optimize to a shift itself (assuming division by constant).Please remove this. People using
do_div()are using it for a reason.
I am trying to provide a cleanup that is acceptable to most people.
Several people I have talked to on the issue specifically asked for the panic(), as people using do_div() should really know better than to do 64 bit divides in the kernel.
I provided the #define option so we can have *one* sane cross platform 64 bit divide, but one that still makes people think before using do_div.
Quoted 10 lines
Anyway, why do you randomly pick 8 and 16? You could do any power of two via shift by simply doing something along these lines:
if (!(base & (base - 1))) { res = t & (base - 1); t >>= ffs(base) - 1; } else panic("blah");But I still think this is a really stupid thing to do.
using do_div() blindly is also considered a really stupid thing to do. YMMV.
This patch is primarily intended to fix vsprintf of long longs on all platforms, once and for all, and vsprintf only uses base 8 and 16. Anyone doing a printk and wanting a decimal representation of a long long probably deserves a panic anyway. (IHMO)
[snip]
Quoted 2 lines
Look at
asm-parisc/div64.hwhich has an optimized version of this for t actually being 32bit.
That came from asm-parisc/div64 originally.
The t being 32bit case is handled earlier
Quoted 4 lines
I think the patch is generally a good idea but it has to be done right...
Best regards,
Gabriel Paubert also pointed out one problem I'm not sure how to deal with..
The generic C algorithm only handles base < 65536.
I can think of a couple ways around this..
1) Make the base argument be a 'u16 base', and people with too large a base would get compile warnings/errors.
2) run-time check on base, and panic if too large
3) run-time check on base, print dmesg warning if too large
I'll re-post a new patch once I hear more feedback, and after I get some suggestions on how to deal with base > 65535 problem
Signature · 5 lines
Troy Benjegerdes | master of mispeeling | 'da hozer' | [email protected] -----"If this message isn't misspelled, I didn't write it" -- Me ----- "Why do musicians compose symphonies and poets write poems? They do it because life wouldn't have any meaning for them if they didn't. That's why I draw cartoons. It's my life." -- Charles Schulz
Quoted 3 lines · Troy Benjegerdes
Several people I have talked to on the issue specifically asked for the
panic(), as people usingdo_div()should really know better than to do 64 bit divides in the kernel.
There are legitimate cases where you cannot avoid a double-precision
division and the inefficiency is negligible. For example for MIPS it's used in do_*_gettimeoffset() and at most once a jiffy (actually we use do_div64_32() to reduce work, as we know the quotient will *always* fit in 32 bits).
Quoted 10 lines
The generic C algorithm only handles base < 65536.
I can think of a couple ways around this..
1) Make the base argument be a 'u16 base', and people with too large a base would get compile warnings/errors.
2) run-time check on base, and panic if too large
3) run-time check on base, print dmesg warning if too large
4) Use a generic division algorithm using shifts and subtracts such as
one of these described in academic books. You may port the implementation from include/asm-mips/div64.h. ;-)
Note that in do_*_gettimeoffset() the divisor is an arbitrary 32-bit number, mostly depending on the uptime.
Signature · 3 lines
+ Maciej W. Rozycki, Technical University of Gdansk, Poland + +--------------------------------------------------------------+ + e-mail: [email protected], PGP key available +
Quoted 6 lines · Troy Benjegerdes
[snip]
Quoted 4 lines
div64.h
Quoted 4 lines
div64.h new file +4
-0+ +#ifdef __USE_ASM +/* yeah, this is a mess, and leaves out m68k.... */ +# if defined(CONFIG_X86) || define(CONFIG_ARCH_S390) ||
Just noticed there is a typo. It should be "defined(CONFIG_ARCH_S390)" not "define"... Just spotted it
Quoted 6 lines
defined(CONFIG_MIPS)Quoted 4 lines
div64.h line 26
Quoted 3 lines
div64.h new file +3
-0+# define __USE_ASM__ +# endif +#endif
Quoted 6 lines
[snip]
Quoted 1 line
I.e. remove the #ifdef
__USE_ASMand addCONFIG_M68Kdependence.Well, there's a reason I left out
CONFIG_M68Kdeps.. Go tell me whereCONFIG_M68Kis defined.. ;)
Appologies, it's in Configure.help but that is not a too useful places to have it. However the kernel seems to be using:
#if defined(__mc68000__) so just use that instead. Any m68k people reading this care to comment?
Quoted 26 lines
Quoted 15 lines
div64.h line 38
Quoted 12 lines
div64.h new file +8
-0+#ifdef __USE_ASM__ +#include <asm/div64.h> +#else /* __USE_ASM__ */ +static inline int do_div (unsigned long long * n,unsigned long base) +{ +int res =0 ; +unsigned long long t = *n; +if ( t == (unsigned long )t ){/* this should handle 64 bit platforms */
div64.h new file +3
-0+ res = ((unsigned long ) t) % base; + t = ((unsigned long ) t) / base; + }else {This check is silly. It is _way_ more efficient to do:
Quoted 6 lines
if (BITS_PER_LONG == 64) { res = ((unsigned long)t) % base; t = ((unsigned long)t) / base; } else {This actually only compiles one or the other but not both.
The intent of this is to have one check that handles both 64 and 32 bit platforms nicely, and handle degenerate cases where N is less than 32 bits on 32 bit platforms.
Quoted 6 lines
I could be persuaded to add a (
BITS_PER_LONG) check for 64 bit machines if someone shows me ASM showing gcc isn't smart enough to figure out that(unsigned long long)t == (unsigned long)tis always true on 64 bit.
Sorry can't say. Don't have 64 bit computers/gcc. )-: But as a matter of principle I wouldn't trust gcc. I remember at least one case being discussed on lkml before where gcc was not optimizing away obviously optimizable code...
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
+#ifndef
USE_SLOW_64BIT_DIVIDESThis is stupid. If someone knows in advance they are only doing a division by 8 or 16 they would not be using
do_divin the first place, theywould be
Quoted 3 lines
using a shift or even just normal division sign which gcc is supposed to optimize to a shift itself (assuming division by constant).
Quoted 7 lines
Quoted 1 line
Please remove this. People using
do_div()are using it for a reason.I am trying to provide a cleanup that is acceptable to most people.
Several people I have talked to on the issue specifically asked for the
panic(), as people usingdo_div()should really know better than to do 64 bit divides in the kernel.
This is ridiculous. There are GENUINE uses for 64-bit division. NTFS and SMBFS and anything else having to interoperate with Windows requires 64-bit divisions. Best example is time conversion. Time is 64-bit and obviously has to be considered as a random number for all intents and purposes. And converting UNIX <-> Windows times REQUIRES 64-bit arithmetic.
And this is not the only use. Fortunately most 64-bit divisions in the kernel are by a power of 2 so shifts are used instead.
In fact I would say that anyone using do_div() for a base of 8 or 16 should be shot. I would put the panic() in do_div() but only IF the base IS a constant and IS a power of 2 and not otherwise. Then anyone using do_div() on constants will learn the lesson and do it properly instead.
Quoted 2 lines
I provided the #define option so we can have *one* sane cross platform 64 bit divide, but one that still makes people think before using
do_div.
You are just obfuscating the kernel code.
Quoted 9 lines
Quoted 9 lines
Anyway, why do you randomly pick 8 and 16? You could do any power of two via shift by simply doing something along these lines:
if (!(base & (base - 1))) { res = t & (base - 1); t >>= ffs(base) - 1; } else panic("blah");
Quoted 4 lines
Quoted 1 line
But I still think this is a really stupid thing to do.
using
do_div()blindly is also considered a really stupid thing to do. YMMV.
Yes, indeed. But do_div() exists because there ARE genuine uses for it. And these will only increase over time as everything is becoming too large to fit in 32-bits. I think that even inodes will have to become 64 bit within the next few years.
Quoted 4 lines
This patch is primarily intended to fix vsprintf of long longs on all platforms, once and for all, and vsprintf only uses base 8 and 16. Anyone doing a printk and wanting a decimal representation of a long long probably deserves a panic anyway. (IHMO)
Why? You would kill the NTFS driver's debug/error outputs completely then. Why should I have to use hex numbers when they are not exactly natural to the human brain. (Although there is a case for saying that the hex is shorter so easier to parse by eye...but that is not reason enough to panic() if someone does it). In fact IMO panic() should pretty much never be used anywhere as it just shows lack of proper error handling but that is a different issue and let us not enter into that argument...
Quoted 10 lines
[snip]
Quoted 2 lines
Look at
asm-parisc/div64.hwhich has an optimized version of this for t actually being 32bit.That came from asm-parisc/div64 originally.
The t being 32bit case is handled earlier
Quoted 1 line
Quoted 8 lines
Quoted 3 lines
I think the patch is generally a good idea but it has to be done right...
Best regards,
Gabriel Paubert also pointed out one problem I'm not sure how to deal with..
The generic C algorithm only handles base < 65536.
Eeek. I hadn't even noticed that. That is not very generic is it?!?
Quoted 8 lines
I can think of a couple ways around this..
1) Make the base argument be a 'u16 base', and people with too large a base would get compile warnings/errors.
2) run-time check on base, and panic if too large
3) run-time check on base, print dmesg warning if too large
No, neither of these will do. NTFS needs to divide by 10000000 (1x10^7) which is way above 16-bits.
Quoted 2 lines
I'll re-post a new patch once I hear more feedback, and after I get some suggestions on how to deal with base > 65535 problem
Rewrite the algorithm is the obvious choice. The old NTFS driver used to have one but I got rid of it in favour of the nice do_div() assuming it would always work... But even that had certain restrictions put in place because of the special uses it had so it is not generic enough for do_div(). Considering do_div() is not useful in current state I may have to resurrect the original code and put it into NTFS (and SMBFS, which has the same problem). But it would be much better to have a proper do_div() instead. Otherwise we will just get proliferation of various do_div() implementations in various drivers.
Best regards,
Anton
Signature · 5 lines
"I've not lost my mind. It's backed up on tape somewhere." - Unknown -- Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @) Linux NTFS Maintainer / WWW: http://linux-ntfs.sf.net/ ICQ: 8561279 / WWW: http://www-stu.christs.cam.ac.uk/~aia21/
Hi,
Quoted 10 lines · Troy Benjegerdes
div64.h new file +10
-0+#else /* USE_SLOW_64BIT_DIVIDES */ +/* +* Nasty ugly generic C 64 bit divide on 32 bit machine +* No one seems to want to take credit for this +*/ +unsigned long low, low2, high; + low = (t) &0xffffffff ; + high = (t) >>32 ; + res = high % base; + high = high / base;
div64.h line 71
Quoted 10 lines
div64.h new file +10
-0+ low2 = low >>16 ; + low2 += res <<16 ; + res = low2 % base; + low2 = low2 / base; + low = low &0xffff ; + low += res <<16 ; + res = low % base; + low = low / base; + t = low + ((long long )low2 <<16 ) + + ((long long ) high <<32 );
IMO this is large enough to put under lib/..., the rest could also be put into asm-generic, from where the archs could include it, this would avoid this:
div64.h line 26
Quoted 6 lines
div64.h new file +6
-0+#ifdef __USE_ASM +/* yeah, this is a mess, and leaves out m68k.... */ +# if defined(CONFIG_X86 ) ||define (CONFIG_ARCH_S390 ) || defined(CONFIG_MIPS ) +# define __USE_ASM__ +# endif +#endif
bye, Roman