From patchwork Mon Mar 15 13:55:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 400462 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp3462092jai; Mon, 15 Mar 2021 07:16:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkaYiKUqSy5u8jl39wvNJc0oDlRIQJbr5Hck2GIudaPqOjhwga3Neb3GMbrcBRoKzBNnL8 X-Received: by 2002:a50:ed90:: with SMTP id h16mr30335320edr.101.1615817794997; Mon, 15 Mar 2021 07:16:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615817794; cv=none; d=google.com; s=arc-20160816; b=CeOWoQR2+exaQVFVbcy3/3cz7BfDpLd/Ki46QPxwkdw+Zdppib3n/Zxn4phZzLWUjW ory0Hf3mn/a+FN9+6HwXQEvFGdqwe+Hr0NyXDn6zf4+tGrrXF9hFyQz6aKTHZe1n+36h jEA9bYfu1dDmGruCbOjMFbOtdZGxZNg2WP+AAg+b4hBoYge7r/mrhDp9ZQhSeBiBhEzr S3PfD//dce15qvBSN8Weml+NNinzDJiha7tx/URHkarrz6wp7jDMzA0xz6dUJcX/HLq8 nf/jMehpbb1cFUVFi1aEAWjqqPuWoqPzz224BbTdGebjwdcAVGiq1rDbpTmnJyXJPdii FHBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9AFy/zTOu2V/IvFSQjPLAF/3sCRRPSGwU41pdCKTYDA=; b=wVr+Dk/yCHtPR23uFqZuPv8bzjUBOf4zSYJvOrfjPrTttf3pYqfkpMkxpx7RERtHhe C71y/5eV/XtAhczUGL4k5AbJWSeYWtEB2D0lPDvklnJUlLec1XOVXGYo5BMCqGzvb4uS 7QV0/GUqF5EPES9nMEsU8kfd+jnKMFu48v26YK2PUaQ1xn1BQxi9ne71UsLWIzk+g/4g zsKvoujSSRtVpUd52Ge0bCiLZutBj864FVVhkafmM3rfvU64IKLTxZKJDdCEMLJ9kRPV nZx1zpcUn/NIHKNUol+yHkJtv/SUIlLPSSvTEbaxyPzHidRPwMcFSerDTx5L2pUljsLR HplQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Qo4c+gS9; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h21si993553ede.37.2021.03.15.07.16.34; Mon, 15 Mar 2021 07:16:34 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Qo4c+gS9; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232133AbhCOOJi (ORCPT + 12 others); Mon, 15 Mar 2021 10:09:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:51554 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234521AbhCOOEL (ORCPT ); Mon, 15 Mar 2021 10:04:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7405A64EEB; Mon, 15 Mar 2021 14:04:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615817049; bh=tTJVqx+rVDBWCwqr4gWuVNJmGyEQKTlZp9sbHeogfm8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qo4c+gS9XiamOHLU2NUN3nolaFAZtb42DiZ701BkN6KWfVxHTHY5i71lLJVX2ZR31 m1Eeh9YQHkalqh78vjEi5Hhl/8G3yV/GWXWjJ3Vp7CxlNQMnhHhNobqsa1U4ALJJvR qTyVp/xRlrX0TQoZEdd2LVk4R32lXfevNYAyR+74= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Nathan Chancellor , Kees Cook , Miguel Ojeda , Nick Desaulniers , Luc Van Oostenryck , Masahiro Yamada , Nick Hu , Greentime Hu , Vincent Chen , Paul Walmsley , Palmer Dabbelt , Albert Ou , Guo Ren , Randy Dunlap , Sami Tolvanen , Marco Elver , Arvind Sankar , Andrew Morton , Linus Torvalds Subject: [PATCH 5.10 262/290] linux/compiler-clang.h: define HAVE_BUILTIN_BSWAP* Date: Mon, 15 Mar 2021 14:55:55 +0100 Message-Id: <20210315135550.871864824@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135541.921894249@linuxfoundation.org> References: <20210315135541.921894249@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Greg Kroah-Hartman From: Arnd Bergmann commit 97e4910232fa1f81e806aa60c25a0450276d99a2 upstream. Separating compiler-clang.h from compiler-gcc.h inadventently dropped the definitions of the three HAVE_BUILTIN_BSWAP macros, which requires falling back to the open-coded version and hoping that the compiler detects it. Since all versions of clang support the __builtin_bswap interfaces, add back the flags and have the headers pick these up automatically. This results in a 4% improvement of compilation speed for arm defconfig. Note: it might also be worth revisiting which architectures set CONFIG_ARCH_USE_BUILTIN_BSWAP for one compiler or the other, today this is set on six architectures (arm32, csky, mips, powerpc, s390, x86), while another ten architectures define custom helpers (alpha, arc, ia64, m68k, mips, nios2, parisc, sh, sparc, xtensa), and the rest (arm64, h8300, hexagon, microblaze, nds32, openrisc, riscv) just get the unoptimized version and rely on the compiler to detect it. A long time ago, the compiler builtins were architecture specific, but nowadays, all compilers that are able to build the kernel have correct implementations of them, though some may not be as optimized as the inline asm versions. The patch that dropped the optimization landed in v4.19, so as discussed it would be fairly safe to backport this revert to stable kernels to the 4.19/5.4/5.10 stable kernels, but there is a remaining risk for regressions, and it has no known side-effects besides compile speed. Link: https://lkml.kernel.org/r/20210226161151.2629097-1-arnd@kernel.org Link: https://lore.kernel.org/lkml/20210225164513.3667778-1-arnd@kernel.org/ Fixes: 815f0ddb346c ("include/linux/compiler*.h: make compiler-*.h mutually exclusive") Signed-off-by: Arnd Bergmann Reviewed-by: Nathan Chancellor Reviewed-by: Kees Cook Acked-by: Miguel Ojeda Acked-by: Nick Desaulniers Acked-by: Luc Van Oostenryck Cc: Masahiro Yamada Cc: Nick Hu Cc: Greentime Hu Cc: Vincent Chen Cc: Paul Walmsley Cc: Palmer Dabbelt Cc: Albert Ou Cc: Guo Ren Cc: Randy Dunlap Cc: Sami Tolvanen Cc: Marco Elver Cc: Arvind Sankar Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- include/linux/compiler-clang.h | 6 ++++++ 1 file changed, 6 insertions(+) --- a/include/linux/compiler-clang.h +++ b/include/linux/compiler-clang.h @@ -41,6 +41,12 @@ #define __no_sanitize_thread #endif +#if defined(CONFIG_ARCH_USE_BUILTIN_BSWAP) +#define __HAVE_BUILTIN_BSWAP32__ +#define __HAVE_BUILTIN_BSWAP64__ +#define __HAVE_BUILTIN_BSWAP16__ +#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ + #if __has_feature(undefined_behavior_sanitizer) /* GCC does not have __SANITIZE_UNDEFINED__ */ #define __no_sanitize_undefined \