From patchwork Wed Mar 13 20:37:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 10851721 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 8D78A13B5 for ; Wed, 13 Mar 2019 20:37:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79D7A29EAD for ; Wed, 13 Mar 2019 20:37:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6D76429F88; Wed, 13 Mar 2019 20:37:57 +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 DB5F729EAD for ; Wed, 13 Mar 2019 20:37:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727132AbfCMUhv (ORCPT ); Wed, 13 Mar 2019 16:37:51 -0400 Received: from mail-ot1-f73.google.com ([209.85.210.73]:39390 "EHLO mail-ot1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727051AbfCMUhu (ORCPT ); Wed, 13 Mar 2019 16:37:50 -0400 Received: by mail-ot1-f73.google.com with SMTP id j13so1368450otl.6 for ; Wed, 13 Mar 2019 13:37:50 -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=8HB51ltATTSFxrkKUn27F32DnBWWX1A5orTg6yCiOwk=; b=JVx8Cdn4Ohqbx6G4FMQBhLTgsdin8muSSnuiMoHKCJBOqYlKSfJF2NuZk4mK4gmjhc OBSTJr2GDoreZ53iauDU9qux56ei152bzSYTX4/hLVQLW8P/S5940Cr+5oS/Qm7UTNSf Jor3ILoCz/hilhwYhHYIwywgaUW3JuTKzygXd+Ote+5NQZMWAvgBI+KDwPbwNPtE2ZOQ 6OG3Bnuz9F5RIwJ/Po8hiilPK1l4zFxrGKN/cpFlPJOJMN0X5GkaXYaFGZLtLpSI3vIg hmJtkvxQ/yTpDMHy9mVI26pysegV5zsuK/r+UuYdrFKIpHIor3ZOOC8XHo8eO8RV4LTG VnoA== 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=8HB51ltATTSFxrkKUn27F32DnBWWX1A5orTg6yCiOwk=; b=ZtxDAaR6Gjjnr4wUOzKomZzqU9vz0CvCHCBL0ncIpJtSgO7BqAtQ7sWlF6dqCXJAk9 wdquwpNvrXyClVQhxJupLzKhCYn+AdjdRFLxgt72sM4K/AmlbDBcHPFkkxub9IsBMVM7 JWZQ6rv+/yn636/cKaSsNA0HYqs/rwKM+8/3h0hok8/ZNn+uhX8CSYLTZa4aydlpmmQj XPbx+4A8ugzHz+7xo7Q95k8xZnXghrR6H8ztN10aSHY0DPMIRlXI5FH9qStbUVYFlH/F rAHZq1vI3nqGldJZY/E3YMqvSaeDep/96d6Qdv6miLTdHQpVNEQCDO/jzMu07+8njcVY mNxw== X-Gm-Message-State: APjAAAWxCTfZCouvbFm+78X8lwygUkovaZPFmSGt73VdQRcp708t2umt kplIA4W1hoI6vtD5DgBcB2fwI+WO+L3uQwAICDE= X-Google-Smtp-Source: APXvYqy8rPYkhjA6+/nL4T7P745g01Bb3rvA7boGj+VCpW2DI1HGxoaUE0Hq2JxQpXPUOWnURu58me69OQPHjqGr7kM= X-Received: by 2002:a9d:77d1:: with SMTP id w17mr24715818otl.65.1552509469760; Wed, 13 Mar 2019 13:37:49 -0700 (PDT) Date: Wed, 13 Mar 2019 13:37:37 -0700 In-Reply-To: <20190313161221.41797313@gandalf.local.home> Message-Id: <20190313203741.142380-1-ndesaulniers@google.com> Mime-Version: 1.0 References: <20190313161221.41797313@gandalf.local.home> X-Mailer: git-send-email 2.21.0.360.g471c308f928-goog Subject: [PATCH v3] 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 , Andy Shevchenko , Dan Williams , Namhyung Kim , Alexander Shishkin , Greg Kroah-Hartman , 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) --- 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 | 15 +++++++++++++++ 2 files changed, 18 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..48a43a42d3f2 100644 --- a/lib/string.c +++ b/lib/string.c @@ -866,6 +866,21 @@ __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. + * @cs: One area of memory. + * @ct: Another area of memory. + * @count: The size of the areas. + */ +#undef bcmp +int bcmp(const void *cs, const void *ct, size_t count) +{ + return memcmp(cs, ct, count); +} +EXPORT_SYMBOL(bcmp); +#endif + #ifndef __HAVE_ARCH_MEMSCAN /** * memscan - Find a character in an area of memory.