From patchwork Sat Apr 6 01:38:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 161897 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1113047jan; Fri, 5 Apr 2019 18:38:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqzbGCG0Q9ZyExLv78GSxhueFgef7jFs9LRn7pwPlOud1JUtMI4nV8CuonGien7Uvhu1ZhfS X-Received: by 2002:a63:581c:: with SMTP id m28mr15352924pgb.332.1554514730205; Fri, 05 Apr 2019 18:38:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554514730; cv=none; d=google.com; s=arc-20160816; b=kyuLqHG8fxxhNdtGi62+6tuJp9MzGCaCRIxCAQABwiMx3DsKfBRsDnSfgAm/ubEJGN GI3FZGzqxfnw2TkHwYIlQdI0a66h21WgavveCC4GwrKYZ1eA1KLyFA2X3DAouvozYgsS KpvvXK9qxBw3FPNtcmm6v4uo9IDXm7gNG6+R/F0pGkMsfXbZycKDJ5D5q1wAsGX5Vfnk Fo1u8m9PGBvywvvd3ozNbW15OcO1B0G338eky0/tI5IIHW2iD8Vz7u6TQNSFyPUUFanu gHkwACP9EmJLdNu9gdjx7bR1k5hdzokhAdXKaEh9icWJ70oiPHdQAZYwi/HFVkG7M8np WdoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:message-id:subject:to:from :date; bh=V0icJT5hvjHnsSxWT9BGQ1P5B/FKaJlaFyoOaaAm3BM=; b=PKKAG/Ct5HMLQJxJGhhi/HurWrvmS4lgRDImYi3Lu5XFs1o/cSb8aY4QA0caKmYUyd ZaIUMJPf4ZtemYxtLQ6yVLF66RAiAKe5devS0WbzBBJtheAAycwE/wQVris8H9LT6Cdr Yltc3BAvfO6iCm3s3wpnszM2kURr3u3+UQBXRjhiFhoC5vLZYiR/riqXRY3MDRmIA64r 9bmi3cwDWDNBw9fbLRag/QDFiAkddggBq+ymYiVrJpXmreUwTkkOSUAr+w/S2LHnB+Xv xo837As7cnsxKnb1uxmXN3nYnJ9mVcgqs6lqlYBQUKv7YRWv0sv+7KMLFlPm3fK4tvBK eN7Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a4si20572671pfj.17.2019.04.05.18.38.49; Fri, 05 Apr 2019 18:38:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726337AbfDFBit (ORCPT + 14 others); Fri, 5 Apr 2019 21:38:49 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:40968 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725973AbfDFBit (ORCPT ); Fri, 5 Apr 2019 21:38:49 -0400 Received: from localhost.localdomain (c-73-223-200-170.hsd1.ca.comcast.net [73.223.200.170]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id B0AC62537; Sat, 6 Apr 2019 01:38:46 +0000 (UTC) Date: Fri, 05 Apr 2019 18:38:45 -0700 From: akpm@linux-foundation.org To: adhemerval.zanella@linaro.org, akpm@linux-foundation.org, alexander.shishkin@linux.intel.com, andriy.shevchenko@linux.intel.com, arnd@arndb.de, dan.j.williams@intel.com, David.Laight@ACULAB.COM, gregkh@linuxfoundation.org, jyknight@google.com, linux@rasmusvillemoes.dk, mm-commits@vger.kernel.org, namhyung@kernel.org, natechancellor@gmail.com, ndesaulniers@google.com, rostedt@goodmis.org, stable@vger.kernel.org, torvalds@linux-foundation.org, yamada.masahiro@socionext.com Subject: [patch 01/14] lib/string.c: implement a basic bcmp Message-ID: <20190406013845.SWPXm4z6E%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nick Desaulniers Subject: lib/string.c: implement a basic bcmp A recent optimization in Clang (r355672) lowers comparisons of the return value of memcmp against zero to comparisons of the return value of bcmp against zero. This helps some platforms that implement bcmp more efficiently than memcmp. glibc simply aliases bcmp to memcmp, but an optimized implementation is in the works. This results in linkage failures for all targets with Clang due to the undefined symbol. For now, just implement bcmp as a tailcail to memcmp to unbreak the build. This routine can be further optimized in the future. Other ideas discussed: * A weak alias was discussed, but breaks for architectures that define their own implementations of memcmp since aliases to declarations are not permitted (only definitions). Arch-specific memcmp implementations typically declare memcmp in C headers, but implement them in assembly. * -ffreestanding also is used sporadically throughout the kernel. * -fno-builtin-bcmp doesn't work when doing LTO. Link: https://bugs.llvm.org/show_bug.cgi?id=41035 Link: https://code.woboq.org/userspace/glibc/string/memcmp.c.html#bcmp Link: https://github.com/llvm/llvm-project/commit/8e16d73346f8091461319a7dfc4ddd18eedcff13 Link: https://github.com/ClangBuiltLinux/linux/issues/416 Link: http://lkml.kernel.org/r/20190313211335.165605-1-ndesaulniers@google.com Signed-off-by: Nick Desaulniers Reported-by: Nathan Chancellor Reported-by: Adhemerval Zanella Suggested-by: Arnd Bergmann Suggested-by: James Y Knight Suggested-by: Masahiro Yamada Suggested-by: Nathan Chancellor Suggested-by: Rasmus Villemoes Acked-by: Steven Rostedt (VMware) Reviewed-by: Nathan Chancellor Tested-by: Nathan Chancellor Reviewed-by: Masahiro Yamada Reviewed-by: Andy Shevchenko Cc: David Laight Cc: Rasmus Villemoes Cc: Namhyung Kim Cc: Greg Kroah-Hartman Cc: Alexander Shishkin Cc: Dan Williams Cc: Signed-off-by: Andrew Morton --- include/linux/string.h | 3 +++ lib/string.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+) --- a/include/linux/string.h~lib-stringc-implement-a-basic-bcmp +++ a/include/linux/string.h @@ -150,6 +150,9 @@ extern void * memscan(void *,int,__kerne #ifndef __HAVE_ARCH_MEMCMP extern int memcmp(const void *,const void *,__kernel_size_t); #endif +#ifndef __HAVE_ARCH_BCMP +extern int bcmp(const void *,const void *,__kernel_size_t); +#endif #ifndef __HAVE_ARCH_MEMCHR extern void * memchr(const void *,int,__kernel_size_t); #endif --- a/lib/string.c~lib-stringc-implement-a-basic-bcmp +++ a/lib/string.c @@ -866,6 +866,26 @@ __visible int memcmp(const void *cs, con EXPORT_SYMBOL(memcmp); #endif +#ifndef __HAVE_ARCH_BCMP +/** + * bcmp - returns 0 if and only if the buffers have identical contents. + * @a: pointer to first buffer. + * @b: pointer to second buffer. + * @len: size of buffers. + * + * The sign or magnitude of a non-zero return value has no particular + * meaning, and architectures may implement their own more efficient bcmp(). So + * while this particular implementation is a simple (tail) call to memcmp, do + * not rely on anything but whether the return value is zero or non-zero. + */ +#undef bcmp +int bcmp(const void *a, const void *b, size_t len) +{ + return memcmp(a, b, len); +} +EXPORT_SYMBOL(bcmp); +#endif + #ifndef __HAVE_ARCH_MEMSCAN /** * memscan - Find a character in an area of memory. From patchwork Sat Apr 6 01:38:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 161898 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1113132jan; Fri, 5 Apr 2019 18:38:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqzEVJR3PDNAHJ+ZRHFu8CPvcItPgWs7oqfkp+Ec/WBuaMnVvhKuj7TQu1tZjurkQqCBFvsE X-Received: by 2002:a65:6148:: with SMTP id o8mr15542060pgv.153.1554514737807; Fri, 05 Apr 2019 18:38:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554514737; cv=none; d=google.com; s=arc-20160816; b=jmX6mR15mgFndxkvJuTeEY20+kDRwsySyf4rxuD24UIPFafYP5qQGxHX5q/ENmD6Xl wdO4v7P/TOxAixEpVdtioloR9zMg8rehuIgRkP9ofFLlJrjgGQ7NH8z89O5kDNjVBQCU uc8YljCp7nOMR0xxj81U1Y6iQY5x7o6GqgRHGgkWOJLsWX+244pajq7TnXp6Tppz6enl 85OfgLu7tp1SCoDDn+MzaoLC75uUTyeiJ6n+151S4yyVKa8qoxJuqAb7TpNFAqBw6y7N JWjudWHzQFkdJ5/Rqh9+cff83jAIVRmX6OHiwHbsAgb+sW27r+mrSRxce/vdCWlvp4si UI4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:message-id:subject:to:from :date; bh=Vlv530gXpmrv0gY6mKIriUr8z2kN7SwYBWzuHYGpZuU=; b=PfE/oyJpRiWY20OuDH93WYqsoT549E1ZJ0KFgsRJ75QoUvywWRbLjSmfuT35UDa/rs kdoAqUppSxuK7c6GdFrWBcvj8BQkw0vclWDb0lBwTk60l7q0Sg5fSZDRpVK08MZXc7oO e34GM7Hnn72gEGnSOY187BWLlHdXPEIBmoWR+VQjx6OJ/zQk25AUxm1zfwxfRYPjYGDJ FiP+gcaZfuHVcqGrBh6H/sjc7VcKpA4c+fiIYBADM+KBFxUEGdFk7Hey93308zEKIjj1 a3Bv9dwoVIASS+YynC4nUdPP/oqDuuIn94m8bExi1pSfpCc2uMDAeUfEO11vNhKiF8ga Rl+A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a4si20572671pfj.17.2019.04.05.18.38.57; Fri, 05 Apr 2019 18:38:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726532AbfDFBi5 (ORCPT + 14 others); Fri, 5 Apr 2019 21:38:57 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:40992 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725973AbfDFBi5 (ORCPT ); Fri, 5 Apr 2019 21:38:57 -0400 Received: from localhost.localdomain (c-73-223-200-170.hsd1.ca.comcast.net [73.223.200.170]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 71A2E263F; Sat, 6 Apr 2019 01:38:55 +0000 (UTC) Date: Fri, 05 Apr 2019 18:38:53 -0700 From: akpm@linux-foundation.org To: akpm@linux-foundation.org, arnd@arndb.de, mm-commits@vger.kernel.org, ndesaulniers@google.com, qiang.zhao@nxp.com, stable@vger.kernel.org, torvalds@linux-foundation.org, yalin.wang@sonymobile.com Subject: [patch 03/14] include/linux/bitrev.h: fix constant bitrev Message-ID: <20190406013853.y1FS0oWC0%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann Subject: include/linux/bitrev.h: fix constant bitrev clang points out with hundreds of warnings that the bitrev macros have a problem with constant input: drivers/hwmon/sht15.c:187:11: error: variable '__x' is uninitialized when used within its own initialization [-Werror,-Wuninitialized] u8 crc = bitrev8(data->val_status & 0x0F); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/linux/bitrev.h:102:21: note: expanded from macro 'bitrev8' __constant_bitrev8(__x) : \ ~~~~~~~~~~~~~~~~~~~^~~~ include/linux/bitrev.h:67:11: note: expanded from macro '__constant_bitrev8' u8 __x = x; \ ~~~ ^ Both the bitrev and the __constant_bitrev macros use an internal variable named __x, which goes horribly wrong when passing one to the other. The obvious fix is to rename one of the variables, so this adds an extra '_'. It seems we got away with this because - there are only a few drivers using bitrev macros - usually there are no constant arguments to those - when they are constant, they tend to be either 0 or (unsigned)-1 (drivers/isdn/i4l/isdnhdlc.o, drivers/iio/amplifiers/ad8366.c) and give the correct result by pure chance. In fact, the only driver that I could find that gets different results with this is drivers/net/wan/slic_ds26522.c, which in turn is a driver for fairly rare hardware (adding the maintainer to Cc for testing). Link: http://lkml.kernel.org/r/20190322140503.123580-1-arnd@arndb.de Fixes: 556d2f055bf6 ("ARM: 8187/1: add CONFIG_HAVE_ARCH_BITREVERSE to support rbit instruction") Signed-off-by: Arnd Bergmann Reviewed-by: Nick Desaulniers Cc: Zhao Qiang Cc: Yalin Wang Cc: Signed-off-by: Andrew Morton --- include/linux/bitrev.h | 46 +++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) --- a/include/linux/bitrev.h~bitrev-fix-constant-bitrev +++ a/include/linux/bitrev.h @@ -34,41 +34,41 @@ static inline u32 __bitrev32(u32 x) #define __constant_bitrev32(x) \ ({ \ - u32 __x = x; \ - __x = (__x >> 16) | (__x << 16); \ - __x = ((__x & (u32)0xFF00FF00UL) >> 8) | ((__x & (u32)0x00FF00FFUL) << 8); \ - __x = ((__x & (u32)0xF0F0F0F0UL) >> 4) | ((__x & (u32)0x0F0F0F0FUL) << 4); \ - __x = ((__x & (u32)0xCCCCCCCCUL) >> 2) | ((__x & (u32)0x33333333UL) << 2); \ - __x = ((__x & (u32)0xAAAAAAAAUL) >> 1) | ((__x & (u32)0x55555555UL) << 1); \ - __x; \ + u32 ___x = x; \ + ___x = (___x >> 16) | (___x << 16); \ + ___x = ((___x & (u32)0xFF00FF00UL) >> 8) | ((___x & (u32)0x00FF00FFUL) << 8); \ + ___x = ((___x & (u32)0xF0F0F0F0UL) >> 4) | ((___x & (u32)0x0F0F0F0FUL) << 4); \ + ___x = ((___x & (u32)0xCCCCCCCCUL) >> 2) | ((___x & (u32)0x33333333UL) << 2); \ + ___x = ((___x & (u32)0xAAAAAAAAUL) >> 1) | ((___x & (u32)0x55555555UL) << 1); \ + ___x; \ }) #define __constant_bitrev16(x) \ ({ \ - u16 __x = x; \ - __x = (__x >> 8) | (__x << 8); \ - __x = ((__x & (u16)0xF0F0U) >> 4) | ((__x & (u16)0x0F0FU) << 4); \ - __x = ((__x & (u16)0xCCCCU) >> 2) | ((__x & (u16)0x3333U) << 2); \ - __x = ((__x & (u16)0xAAAAU) >> 1) | ((__x & (u16)0x5555U) << 1); \ - __x; \ + u16 ___x = x; \ + ___x = (___x >> 8) | (___x << 8); \ + ___x = ((___x & (u16)0xF0F0U) >> 4) | ((___x & (u16)0x0F0FU) << 4); \ + ___x = ((___x & (u16)0xCCCCU) >> 2) | ((___x & (u16)0x3333U) << 2); \ + ___x = ((___x & (u16)0xAAAAU) >> 1) | ((___x & (u16)0x5555U) << 1); \ + ___x; \ }) #define __constant_bitrev8x4(x) \ ({ \ - u32 __x = x; \ - __x = ((__x & (u32)0xF0F0F0F0UL) >> 4) | ((__x & (u32)0x0F0F0F0FUL) << 4); \ - __x = ((__x & (u32)0xCCCCCCCCUL) >> 2) | ((__x & (u32)0x33333333UL) << 2); \ - __x = ((__x & (u32)0xAAAAAAAAUL) >> 1) | ((__x & (u32)0x55555555UL) << 1); \ - __x; \ + u32 ___x = x; \ + ___x = ((___x & (u32)0xF0F0F0F0UL) >> 4) | ((___x & (u32)0x0F0F0F0FUL) << 4); \ + ___x = ((___x & (u32)0xCCCCCCCCUL) >> 2) | ((___x & (u32)0x33333333UL) << 2); \ + ___x = ((___x & (u32)0xAAAAAAAAUL) >> 1) | ((___x & (u32)0x55555555UL) << 1); \ + ___x; \ }) #define __constant_bitrev8(x) \ ({ \ - u8 __x = x; \ - __x = (__x >> 4) | (__x << 4); \ - __x = ((__x & (u8)0xCCU) >> 2) | ((__x & (u8)0x33U) << 2); \ - __x = ((__x & (u8)0xAAU) >> 1) | ((__x & (u8)0x55U) << 1); \ - __x; \ + u8 ___x = x; \ + ___x = (___x >> 4) | (___x << 4); \ + ___x = ((___x & (u8)0xCCU) >> 2) | ((___x & (u8)0x33U) << 2); \ + ___x = ((___x & (u8)0xAAU) >> 1) | ((___x & (u8)0x55U) << 1); \ + ___x; \ }) #define bitrev32(x) \