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: 160275 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp14765760jad; Wed, 13 Mar 2019 14:13:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqxZ++wZfzxGzjZLYZ7LPsQFoGw+Dp+XyOLWjP0jD7hNmzruO6n9TfzFgcQ4DlWYIdqP10EJ X-Received: by 2002:a63:36cb:: with SMTP id d194mr2664810pga.426.1552511623863; Wed, 13 Mar 2019 14:13:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552511623; cv=none; d=google.com; s=arc-20160816; b=bpL8qa8MURB7Vx1uxXakNGaNAswZcGtnINTWXpWq6ehZ6+5lHdV/OPXO9oc7dG9WU0 deN8YXlgfx3B93sGNP5ir67zVDWxf6YUTFlhwFuP1zkP5fw3nirJtISIgjUQLp2GZOF/ H0T+99HWXLydagCY2eBbvMBqZULGWLKZzfcivkgh+XGIf3k8NdSVcBUNGTmFYr2WvA5O sOfdVbvZRenDifMkyLCo/319fixqBznJK3USg6+MbL4Vyd5xa7A8g38Lq+NpsaaKRggO sV5lbwNL+PGMW1PtyQdVvCRoCNyrefod1RpZAC+fmWFhADj1OJVba4ro+Pv9komh5kZ2 H1Rw== 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=Xxgbuqf7isoEHZ4jDhfd3oMpETiU0v/Wg5TD8vE91LY=; b=vl4wIH4ZJGM7WEeE0AfmUj7cjqW49G+45SNsdeRUzsUEHKi/MjWKkZIrx7Ijgmrf8q Gk4t1ajWWQEA+uR1C2m5Y8MXNAgqZGAsXhSHQmJ5rKOyz/j75jaTTMfgWqY5kQ97nWCJ l7hZG8cG3K2YeTbEEXqPd0ag+W+vC07Fb/Q603C+ZJ/CEs+7D5m8Zis8mGJD72b/fCA4 1yelEJF8LObYyMURkNpWFUs1bRooKy3aLf8g/NP14CObq+xLJqK9yu35tyjX2Z1jSA5t jhKz21ovVHe0qR7HKdynvhbR9I9diTBDTSZxA5p71jb9lPd+3uYGEO2km5aphqsS7eFl nQ7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b="J/pSU9gh"; 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; 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 y3si10621343pgk.490.2019.03.13.14.13.43; Wed, 13 Mar 2019 14:13:43 -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; dkim=pass header.i=@google.com header.s=20161025 header.b="J/pSU9gh"; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726125AbfCMVNm (ORCPT + 14 others); Wed, 13 Mar 2019 17:13:42 -0400 Received: from mail-qt1-f201.google.com ([209.85.160.201]:56282 "EHLO mail-qt1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727367AbfCMVNm (ORCPT ); Wed, 13 Mar 2019 17:13:42 -0400 Received: by mail-qt1-f201.google.com with SMTP id e31so3217918qtb.22 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=dFJccSWYUzi/uMOrEVii/bMTBn4M6qKdVKYfKM8HBn1MGI0p19oCCF+zTsTgU0+rtO ZgHBtR6z59DdRwdPhfcAJFGRGddSXJpowLGMv1IrdmOt9BlQwPTFfa6O7rOZRmTjJ0sX wLXZ0+sAQ0GEcw3MjoOF8+93/AluVmdZ5f5UzeWyBH2k/jkZZu6a6o33y0L7GtUh6oUf mVuT4ZMfQFchQN/By25tbtq3llw69eVlf+0l0kQvfiJ4AO7Ci9wIjyslZ+DGpQzoTrOw bOQOMxcu03Z4sybHDnKpaK7FciJJKzH+onJwnRIZYMYS6gy9ICEYh2pMsFvPYaSO3pfO k4wQ== X-Gm-Message-State: APjAAAXJN/21xey/B4IViXxnQNa8cf895x0sBiswYvc5/9ccNWkclXyK aTYHC/nndALw8gQ6SJMdm9F5Mjj+JFRWjbVLU3E= 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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 Acked-by: Steven Rostedt (VMware) --- 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(+) -- 2.21.0.360.g471c308f928-goog Reviewed-by: Masahiro Yamada Reviewed-by: Andy Shevchenko 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.