: Fix regression added by ppoll/pselect code.
PATCH 1/1 : Fix regression added by ppoll/pselect code.
The compat layer timeout handling changes in:
9f72949f679df06021c9e43886c9191494fdb007
are busted. This is most easily seen with an X application that uses sub-second select/poll timeout such as emacs. You hit a key and it takes a second or so before the app responds.
The two ROUND_UP() calls upon entry are using {tv,ts}_sec where it should instead be using {tv_usec,ts_nsec}, which perfectly explains the observed incorrect behavior.
Another bug shot down with git bisect.
fs/compat.c +2 -2
@@ -1743,7 +1743,7 @@ asmlinkage long compat_sys_select(int n,if ((u64 )tv.tv_sec >= (u64 )MAX_INT64_SECONDS ) timeout =-1 ;/* infinite */ else { - timeout =ROUND_UP (tv.tv_sec,1000000 /HZ ); + timeout =ROUND_UP (tv.tv_usec,1000000 /HZ ); timeout += tv.tv_sec *HZ ; } }
@@ -1884,7 +1884,7 @@ asmlinkage long compat_sys_ppoll(struct/* We assume that ts.tv_sec is always lower than the number of seconds that can be expressed in an s64. Otherwise the compiler bitches at us */ - timeout =ROUND_UP (ts.tv_sec,1000000000 /HZ ); + timeout =ROUND_UP (ts.tv_nsec,1000000000 /HZ ); timeout += ts.tv_sec *HZ ; }
Quoted 3 lines · David S. Miller
The two
ROUND_UP()calls upon entry are using {tv,ts}_sec where it should instead be using {tv_usec,ts_nsec}, which perfectly explains the observed incorrect behavior.
Hm, I thought akpm had already fixed that -- but thanks.
His patch also changed the simple powers of ten to the slightly confusing 'NSEC_PER_SEC' and 'USEC_PER_SEC' macros, as if those numbers are subject to change by later decree, and shouldn't be hard-coded. I suspect we can do without that part, although I don't really care either way.
Signature · 1 line
dwmw2
Quoted 4 lines · David Woodhouse
His patch also changed the simple powers of ten to the slightly
confusing 'NSEC_PER_SEC' and 'USEC_PER_SEC' macros, as if those numbers are subject to change by later decree, and shouldn't be hard-coded.
a) They tell you what the magic numbers _mean_.
b) Ever tried counting nine contiguous zeros at 4AM, making sure that they're all there?
Quoted 1 line · Andrew Morton
a) They tell you what the magic numbers _mean_.
Yeah, but so does the context.
Quoted 2 lines
b) Ever tried counting nine contiguous zeros at 4AM, making sure that they're all there?
I work on the principle that if I can't even count any more, it's time I stopped looking at code altogether :)
Do it if you really want to, by all means -- I just think it's a little gratuitous. Doesn't really hurt though.
Signature · 1 line
dwmw2