Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] x86: fix sigaddset() inline asm memory constraint

Browse source 
Due to incomplete memory constraints, gcc would miscompile code with
sigaddset on i386 if sig arg was const.

A quote form Jakub to make the issue clear:

 "You need either
	__asm__("btsl %1,%0" : "+m"(*set) : "Ir"(_sig-1) : "cc");
  or
	__asm__("btsl %1,%0" : "=m"(*set) : "Ir"(_sig-1), "m"(*set) : "cc");
  because the btsl instruction doesn't just set the memory to some
  value, but needs to read its previous content as well.  If you don't
  tell that fact to GCC, GCC is of course free to optimize as if the asm
  was just setting the value and not depended on the previous value."

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Constantine Gavrilov 2005-11-17 11:40:43 +02:00 committed by Linus Torvalds
parent 3b26b1100e
commit b7fd1edd2c
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
include/asm-i386/signal.h
View file

@ -159,14 +159,37 @@ typedef struct sigaltstack {
#define __HAVE_ARCH_SIG_BITOPS #define __HAVE_ARCH_SIG_BITOPS
static __inline__ void sigaddset(sigset_t *set, int _sig) #define sigaddset(set,sig) \
(__builtin_constant_p(sig) ? \
__const_sigaddset((set),(sig)) : \
__gen_sigaddset((set),(sig)))
static __inline__ void __gen_sigaddset(sigset_t *set, int _sig)
{ {
__asm__("btsl %1,%0" : "=m"(*set) : "Ir"(_sig - 1) : "cc"); __asm__("btsl %1,%0" : "+m"(*set) : "Ir"(_sig - 1) : "cc");
} }
static __inline__ void sigdelset(sigset_t *set, int _sig) static __inline__ void __const_sigaddset(sigset_t *set, int _sig)
{ {
__asm__("btrl %1,%0" : "=m"(*set) : "Ir"(_sig - 1) : "cc"); unsigned long sig = _sig - 1;
set->sig[sig / _NSIG_BPW] |= 1 << (sig % _NSIG_BPW);
}
#define sigdelset(set,sig) \
(__builtin_constant_p(sig) ? \
__const_sigdelset((set),(sig)) : \
__gen_sigdelset((set),(sig)))
static __inline__ void __gen_sigdelset(sigset_t *set, int _sig)
{
__asm__("btrl %1,%0" : "+m"(*set) : "Ir"(_sig - 1) : "cc");
}
static __inline__ void __const_sigaddset(sigset_t *set, int _sig)
{
unsigned long sig = _sig - 1;
set->sig[sig / _NSIG_BPW] &= ~(1 << (sig % _NSIG_BPW));
} }
static __inline__ int __const_sigismember(sigset_t *set, int _sig) static __inline__ int __const_sigismember(sigset_t *set, int _sig)