From patchwork Wed Mar 13 18:17:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 160264 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp14617667jad; Wed, 13 Mar 2019 11:17:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqw+tZ4v8Ty2EST4Ixl3yRgyzkiE/NqXJo7bY9ITmjNZnY+imHP1LDTqw7IsNRJUWI50VMrf X-Received: by 2002:a17:902:e40a:: with SMTP id ci10mr23533637plb.77.1552501060762; Wed, 13 Mar 2019 11:17:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552501060; cv=none; d=google.com; s=arc-20160816; b=qFvtcSQZgSV/au65gaXhlWHpwWOxMYTmxBYVClG8JeQtB9ghc6rAjwM6FMqHQH3Cpt WchyPw0cqMBCRwbZ7jt+NquSBFQrJ4UQZPAC/GcTLaw73iyOaqBOwXuaG6NIkRT6/8Qu PIVNSjL7PSIsf13mPGCAxPhn7QKKnjn1nPsfbFJOUGlHV8s4tWGhlLnc8cvFB0mpRW3b rV7ZWtJSxnxn78G9YzqowA/u8N4IeYYvVjBCuQCck3MBzMWuIv0XcGoIYoLRpArM6kSJ wKM/x54AKfYeN8J61K6Ry1VFQwo7NApflRHVjKQHBYJuLK+L+G43JX5YiDmstoHKUjcz tt6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=B7yTfa6bCcb9PKaV1iobsmMqwEGi32G0CcJNlnQFP78=; b=B9LEy43Ca2eOd7c7zfes23DLNr7AJesXT63u1qKSwEVY3KFNxlgKqy+y9jg/YC8lAU Y1UUs2l/638w8Vv5juRiMMCp0CS9kYToLy8iC0gjhYOIHqDSY8FSwOUPbkV+YorNj93M Zn1sH7inFkx5wwNE73uezyoz1xyp02TBtU1hR2K+47f+8HJ/OraGFC2PSwRQLR6eCZC6 bsXVh34H0+S+DymRJuSAEypJHl0bXBaiDRnSQDNF5d++gGlkp1Z0eUPy67+npMUcC4EA wFu+oMsEl+BqyE8aHgaWVCVSo8F9tbDL5cGUZ7KqJIHe7hj/gM5OSxsNJVaO+gr+moZq jVlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=I6Qm7AcN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v71si10274717pgd.499.2019.03.13.11.17.40; Wed, 13 Mar 2019 11:17:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=I6Qm7AcN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726922AbfCMSRi (ORCPT + 31 others); Wed, 13 Mar 2019 14:17:38 -0400 Received: from mail-vs1-f74.google.com ([209.85.217.74]:43799 "EHLO mail-vs1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726427AbfCMSRi (ORCPT ); Wed, 13 Mar 2019 14:17:38 -0400 Received: by mail-vs1-f74.google.com with SMTP id y189so654851vsc.10 for ; Wed, 13 Mar 2019 11:17:37 -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=B7yTfa6bCcb9PKaV1iobsmMqwEGi32G0CcJNlnQFP78=; b=I6Qm7AcNBeHZMAsjuo3XWkuLtTJ4JA8+Q0qxlyDLWNkFzprQS2A69hr/ummJwq2QbH xp0gsFaqzX+fQR37P68lR3noqmZ5/xTj+hzOMbFlIT45v+jRAjlOweBXlRawUQVFbu4L 9T/yh1X5JYggBbP+R/dEZt8CluisI6ZAmvOfvdp4ASDBBj5RGEC4P9YS1/pxXZcGGnML pQfP7f3UaG0FZVHp+QK2LA5W0qrTIfoEXEk5nWh3IyUvCGJBU2XIj/lp99ZPjJzQrWXd qCAyTHICvPX8hh3bkTXcN6FkPwOO34DvkucXhUxWNXI65dLjPGk96Kh2uSm6nZ3pqxh5 43tA== 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=B7yTfa6bCcb9PKaV1iobsmMqwEGi32G0CcJNlnQFP78=; b=ggv0H1J72ID6TqqUJ7GGculb6Wc7N8YCPMOHBDqvaGEPEUjKI+u1EthdVD8x289dyC fXdidn98CP+7iSVnS4tSEwkt+1ZmNX3CyppVKpUI2Q9/ArkJvO8HSQJy/OX0eM3+WaTH jplHqD0iAJXN0ZIbQcna2pWhxdj2ORFizb33Q4mQrOuzV4vfOi4xH2lKduo87exT4d0C pO+Rmn1N6iYlke1wKj+45IkVs4vGY7D8iH+N1rGQ/3xg6zN2iKGv8SAxFoWH6Kxq7qyd IAXNq4HoWwUIAyKeyyLivaKHxlrTHbdXVKMKIdQeOGP4qpnjqf2tgnyKdYUeEpPOe35N ohww== X-Gm-Message-State: APjAAAXJcWU5QMY6xrOHtSFgLYTaeKmYYl62sfkfCAFZoQ/0RcgJTr5Y UQtwMJKuMbFTHbBVVUwy/xmzCeH6tbKX67otn+c= X-Received: by 2002:ab0:20d2:: with SMTP id z18mr7508106ual.24.1552501056981; Wed, 13 Mar 2019 11:17:36 -0700 (PDT) Date: Wed, 13 Mar 2019 11:17:15 -0700 In-Reply-To: Message-Id: <20190313181719.87859-1-ndesaulniers@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.21.0.360.g471c308f928-goog Subject: [PATCH v2] 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 , Alexander Shishkin , Ingo Molnar , "Steven Rostedt (VMware)" , Greg Kroah-Hartman , Dan Williams , Andy Shevchenko , linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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(+) -- 2.21.0.360.g471c308f928-goog 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..b882692bac04 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 - Like memcmp but a non-zero return code simply indicates a non-match. + * @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.