Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86: Slightly tweak the access_ok() C variant for better code

gcc can under very specific circumstances realize that the code
sequence:

foo += bar;
if (foo < bar) ...

... is equivalent to a carry out from the addition. Tweak the
implementation of access_ok() (specifically __chk_range_not_ok()) to
make it more likely that gcc will make that connection. It isn't
fool-proof (sometimes gcc seems to think it can make better code with
lea, and ends up with a second comparison), still, but it seems to be
able to connect the two more frequently this way.

Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/CA%2B55aFzPBdbfKovMT8Edr4SmE2_=%2BOKJFac9XW2awegogTkVTA@mail.gmail.com
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

+5 -3
+5 -3
arch/x86/include/asm/uaccess.h
··· 41 41 * Test whether a block of memory is a valid user space address. 42 42 * Returns 0 if the range is valid, nonzero otherwise. 43 43 */ 44 - static inline int __chk_range_not_ok(unsigned long addr, unsigned long size, unsigned long limit) 44 + static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, unsigned long limit) 45 45 { 46 46 /* 47 47 * If we have used "sizeof()" for the size, ··· 55 55 56 56 /* Arbitrary sizes? Be careful about overflow */ 57 57 addr += size; 58 - return (addr < size) || (addr > limit); 58 + if (addr < size) 59 + return true; 60 + return addr > limit; 59 61 } 60 62 61 63 #define __range_not_ok(addr, size, limit) \ ··· 86 84 * this function, memory access functions may still return -EFAULT. 87 85 */ 88 86 #define access_ok(type, addr, size) \ 89 - (likely(__range_not_ok(addr, size, user_addr_max()) == 0)) 87 + likely(!__range_not_ok(addr, size, user_addr_max())) 90 88 91 89 /* 92 90 * The exception table consists of pairs of addresses relative to the