Commit b33d59fb authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390/uaccess: avoid __ashlti3() call 



__cmpxchg_user_key() uses 128 bit types which, depending on compiler
and config options, may lead to an __ashlti3() library call.

Get rid of that by simply casting the 128 bit values to 32 bit values.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Suggested-by: default avatarJanis Schoetterl-Glausch <scgl@linux.ibm.com>
Fixes: 51098f0e ("s390/cmpxchg: make loop condition for 1,2 byte cases precise")
Link: https://lore.kernel.org/all/4b96b112d5415d08a81d30657feec2c8c3000f7c.camel@linux.ibm.com/


Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 739ad2e4

arch/s390/include/asm/uaccess.h

+4 −4
Original line number Diff line number Diff line
@@ -407,8 +407,8 @@ static __always_inline int __cmpxchg_user_key(unsigned long address, void *uval, 


		shift = (3 ^ (address & 3)) << 3;

		address ^= address & 3;

		_old = (old & 0xff) << shift;

		_new = (new & 0xff) << shift;

		_old = ((unsigned int)old & 0xff) << shift;

		_new = ((unsigned int)new & 0xff) << shift;

		mask = ~(0xff << shift);

		asm volatile(

			"	spka	0(%[key])\n"
@@ -455,8 +455,8 @@ static __always_inline int __cmpxchg_user_key(unsigned long address, void *uval, 


		shift = (2 ^ (address & 2)) << 3;

		address ^= address & 2;

		_old = (old & 0xffff) << shift;

		_new = (new & 0xffff) << shift;

		_old = ((unsigned int)old & 0xffff) << shift;

		_new = ((unsigned int)new & 0xffff) << shift;

		mask = ~(0xffff << shift);

		asm volatile(

			"	spka	0(%[key])\n"