From patchwork Wed Mar 13 21:13:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 10851785 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8C95E13B5 for ; Wed, 13 Mar 2019 21:13:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 727D62A017 for ; Wed, 13 Mar 2019 21:13:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 706FF2A01F; Wed, 13 Mar 2019 21:13:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 866142A01B for ; Wed, 13 Mar 2019 21:13:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727393AbfCMVNn (ORCPT ); Wed, 13 Mar 2019 17:13:43 -0400 Received: from mail-qk1-f202.google.com ([209.85.222.202]:53097 "EHLO mail-qk1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727357AbfCMVNm (ORCPT ); Wed, 13 Mar 2019 17:13:42 -0400 Received: by mail-qk1-f202.google.com with SMTP id k21so2803645qkg.19 for ; Wed, 13 Mar 2019 14:13:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=Xxgbuqf7isoEHZ4jDhfd3oMpETiU0v/Wg5TD8vE91LY=; b=J/pSU9gh1NUZYhxzb6IeE5OUy80tX0UwGfQgfF9wHhKV52BLRhIgGAJiHsMpYLDld/ YQT613MPnsom9WwPb7cEqbHYz/4y9oG4kuSi+lsOQyBhTl3MgUMLd6/JTEITiD/9ESyW SfZ9bUO12EeFwzc9weGEW/3y0DbzyBk9lZL3l84J0lXPkHdEA1153Fco1rAxwSsYF1Vg Uw6g5fYmAqr00//C/ePmBzH21mLugJJ/cXBYIiNI3RRmBs3+bxYSX2t2n/HBo8kN2QG8 qFZqAjwIzkPF187I8xA+uLGMm9/x7QFK6uHulcs3BlXwspDGIaNgPxEERSFt+yMWUfZM G7gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Xxgbuqf7isoEHZ4jDhfd3oMpETiU0v/Wg5TD8vE91LY=; b=CzmE3e+Uqe70k8PFGvm14wbxzXZjuxln508v51g+SzPnekE1kIAevrfXYsX3F2lCtz NtE1VA17AE5grxTW0TuWiw8gaOq/bF1V2TtjhrpbTuTfdO6PC2uuu4ECICOaPhN6MpbQ bONwLUKtGkLJPkcJBKOnmpGWt7uNN+ENHaDI1F0OqWVALSPm9ro6ZdVaTPBHUEjeOaky Uo8sw2xen5r96hF/01/l1rQcrx6Ikdrh/moNpClgJn2BbBx4sapU48UojN97L1J1Fiow p9hgSyl96xB6WJkEIQgXU16yaesNoL9jDa4utRMBifLWh+MOSr7LemFlG54cBFfK1kcd o+HA== X-Gm-Message-State: APjAAAUyVTBL/qigUiB2MbdUAazytk6/RpC471xlRMY10pDn5mqE9WNI XrOlbE//rSW5b72/hHCkBgJUSeFro06a5snPCKM= X-Google-Smtp-Source: APXvYqzUXfqziWkWrEQIoCYqJeGtAxIqA1+MDoWXQ0VdqMGhYbL2+RNiEwqLFhyDWaOaCCQqepk6SxJ1gGFeAdfbYDc= X-Received: by 2002:aed:3a42:: with SMTP id n60mr25119356qte.62.1552511621353; Wed, 13 Mar 2019 14:13:41 -0700 (PDT) Date: Wed, 13 Mar 2019 14:13:31 -0700 In-Reply-To: <7549EE7E-4172-467D-815A-63664A33D410@goodmis.org> Message-Id: <20190313211335.165605-1-ndesaulniers@google.com> Mime-Version: 1.0 References: <7549EE7E-4172-467D-815A-63664A33D410@goodmis.org> X-Mailer: git-send-email 2.21.0.360.g471c308f928-goog Subject: [PATCH v4] lib/string.c: implement a basic bcmp From: Nick Desaulniers To: akpm@linux-foundation.org Cc: clang-built-linux@googlegroups.com, linux-kbuild@vger.kernel.org, Nick Desaulniers , stable@vger.kernel.org, Nathan Chancellor , Adhemerval Zanella , Arnd Bergmann , James Y Knight , Masahiro Yamada , Rasmus Villemoes , Steven Rostedt , Namhyung Kim , Greg Kroah-Hartman , Alexander Shishkin , Dan Williams , Andy Shevchenko , linux-kernel@vger.kernel.org Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Cc: stable@vger.kernel.org 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 Signed-off-by: Nick Desaulniers Acked-by: Steven Rostedt (VMware) Reviewed-by: Nathan Chancellor Tested-by: Nathan Chancellor Reviewed-by: Masahiro Yamada Reviewed-by: Andy Shevchenko --- Changes V3 -> V4: * Include the entirety of Rasmus' sugguestion, as per Steven. * Change formal parameter identifiers to match the comment. Changes V2 -> V3: * Adjust comment as per Steven to Rasmus' sugguestion. * Pick up Steven's Ack. Changes V1 -> V2: * Add declaration to include/linux/string.h. * Reword comment above bcmp. include/linux/string.h | 3 +++ lib/string.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/include/linux/string.h b/include/linux/string.h index 7927b875f80c..6ab0a6fa512e 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -150,6 +150,9 @@ extern void * memscan(void *,int,__kernel_size_t); #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 diff --git a/lib/string.c b/lib/string.c index 38e4ca08e757..3ab861c1a857 100644 --- a/lib/string.c +++ b/lib/string.c @@ -866,6 +866,26 @@ __visible int memcmp(const void *cs, const void *ct, size_t count) 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.