From patchwork Thu Mar 7 09:11:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10842451 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 457F0139A for ; Thu, 7 Mar 2019 09:13:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2FEBC2E84A for ; Thu, 7 Mar 2019 09:13:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 221232E9E0; Thu, 7 Mar 2019 09:13:13 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 0704D2E84A for ; Thu, 7 Mar 2019 09:13:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726057AbfCGJNL (ORCPT ); Thu, 7 Mar 2019 04:13:11 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:43833 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726028AbfCGJNL (ORCPT ); Thu, 7 Mar 2019 04:13:11 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.129]) with ESMTPA (Nemesis) id 1MWRmF-1hZZT41bOV-00XuJT; Thu, 07 Mar 2019 10:12:21 +0100 From: Arnd Bergmann To: linux-kernel@vger.kernel.org Cc: Nick Desaulniers , Oleg Nesterov , "Eric W . Biederman" , Alexander Viro , linux-arch@vger.kernel.org, Arnd Bergmann , Ralf Baechle , Paul Burton , James Hogan , Andrew Morton , Deepa Dinamani , Christian Brauner , "Gustavo A. R. Silva" , linux-mips@vger.kernel.org Subject: [PATCH] signal: fix building with clang Date: Thu, 7 Mar 2019 10:11:52 +0100 Message-Id: <20190307091218.2343836-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:1+k5oZrni0eA0F/3l43JgAAbOgdZFo05OvCQvb4XIPIV+Y+dMnF WqSpPXtS8GbQEzMyC4Pd07ZZ0SKmHJMn8wT1vOMcXaEdXZTy96iaq/5d3K1sRsh0ZbLACMT zUNzGZiYpLbwNRf7SRvnq9b/Y5IS8zpJgS5IPHIvsdAfIUWR3e5aZrkVno0Xf2KwBXTWr90 nqhi3cAK9fOQyWPWPAINg== X-UI-Out-Filterresults: notjunk:1;V03:K0:wodNbODB7+8=:AMnyYdtHaV0nkCYIECevsw 2PM6NWTjEHoWP0Q2FNayumcOTjqBj/2GkyBTF5J3GxgqEF0ghe5QJiL+qggn8GJbKk8x6XWMe N65Ka4PkrRLmFxdel6QQ1eE2x83hqmhddkjgVeKuYHXdCPECvPJ67kkPNIGGsWiAK5QYxLa5K tvD9Z7bLm3PYGtqPSfOqmOLjnaZMQ5lexjYslgzqcBUehaUukx7xM75AlZwDu/1UL+i+ZjLO+ ol8x7KH6UrlhIWjddLlXmT1p8hDn85iZRTm6UBqyyCUunfN0gTHkJ85+HxXP6eLULiMEGk5gS 5CR59nn4XLcTCnrt/mCUq/cbHoAqV+oZG0T/HXTfMP2///Zglb2lu5DfGeJC9FR+rD7ca7CaG h0I04GhGCtWDJfcMVBh7kARJYFEwxdSNbDskx6TtH5f3m21FknDXoka2T6W6NRzCF+HZWUW1r QlyzRFDa1726QdUl6niz89rizlAtKYdlT8rxvgOx3quCOq7gKJrvmkmpN/GAW0WzEvpB4C4B8 5qY+jzuWbTuJcyLlaS26UQFnQnuXrakV+bCX4plEQfODm24aaICbF7Q3gVDnN7j2vuQrX+xW5 4ovCagvx7C5spmgj68OXH80jhNlsf5oYli/VxSxwjevURv1t0xh/Kcu2lig+RBQRPrbd9K+7K PEWdpvwcP4ibzyGrPEn+tV/HpBtEY9UhrKwwDXnaMJ1St0I6KUvO3KUrcnh3ZFIljThahKMV0 fkXApGvEBxFk6PJA3IfX4oL9cjqEOiIgY/t0Vw== Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP clang warns about the sigset_t manipulating functions (sigaddset, sigdelset, sigisemptyset, ...) because it performs semantic analysis before discarding dead code, unlike gcc that does this in the reverse order. The result is a long list of warnings like: In file included from arch/arm64/include/asm/ftrace.h:21: include/linux/compat.h:489:10: error: array index 3 is past the end of the array (which contains 2 elements) [-Werror,-Warray-bounds] case 2: v.sig[3] = (set->sig[1] >> 32); v.sig[2] = set->sig[1]; ^ ~ include/linux/compat.h:138:2: note: array 'sig' declared here compat_sigset_word sig[_COMPAT_NSIG_WORDS]; ^ include/linux/compat.h:489:42: error: array index 2 is past the end of the array (which contains 2 elements) [-Werror,-Warray-bounds] case 2: v.sig[3] = (set->sig[1] >> 32); v.sig[2] = set->sig[1]; ^ ~ include/linux/compat.h:138:2: note: array 'sig' declared here compat_sigset_word sig[_COMPAT_NSIG_WORDS]; ^ As a (rather ugly) workaround, I turn the nice switch()/case statements into preprocessor conditionals, and where that is not possible, use the '%' operator to modify the warning case into an operation that clang will not warn about. Since that only matters for dead code, the actual behavior does not change. Link: https://bugs.llvm.org/show_bug.cgi?id=38789 Signed-off-by: Arnd Bergmann Acked-by: Christian Brauner --- arch/mips/include/uapi/asm/signal.h | 3 +- include/linux/signal.h | 72 ++++++++++++++--------------- 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/arch/mips/include/uapi/asm/signal.h b/arch/mips/include/uapi/asm/signal.h index 53104b10aae2..8e71a2f778f7 100644 --- a/arch/mips/include/uapi/asm/signal.h +++ b/arch/mips/include/uapi/asm/signal.h @@ -11,9 +11,10 @@ #define _UAPI_ASM_SIGNAL_H #include +#include #define _NSIG 128 -#define _NSIG_BPW (sizeof(unsigned long) * 8) +#define _NSIG_BPW __BITS_PER_LONG #define _NSIG_WORDS (_NSIG / _NSIG_BPW) typedef struct { diff --git a/include/linux/signal.h b/include/linux/signal.h index 9702016734b1..b967d502ab61 100644 --- a/include/linux/signal.h +++ b/include/linux/signal.h @@ -82,35 +82,33 @@ static inline int sigismember(sigset_t *set, int _sig) static inline int sigisemptyset(sigset_t *set) { - switch (_NSIG_WORDS) { - case 4: - return (set->sig[3] | set->sig[2] | - set->sig[1] | set->sig[0]) == 0; - case 2: - return (set->sig[1] | set->sig[0]) == 0; - case 1: - return set->sig[0] == 0; - default: - BUILD_BUG(); - return 0; - } +#if _NSIG_WORDS == 4 + return (set->sig[3] | set->sig[2] | + set->sig[1] | set->sig[0]) == 0; +#elif _NSIG_WORDS == 2 + return (set->sig[1] | set->sig[0]) == 0; +#elif _NSIG_WORDS == 1 + return set->sig[0] == 0; +#else + BUILD_BUG(); +#endif } static inline int sigequalsets(const sigset_t *set1, const sigset_t *set2) { - switch (_NSIG_WORDS) { - case 4: - return (set1->sig[3] == set2->sig[3]) && - (set1->sig[2] == set2->sig[2]) && - (set1->sig[1] == set2->sig[1]) && - (set1->sig[0] == set2->sig[0]); - case 2: - return (set1->sig[1] == set2->sig[1]) && - (set1->sig[0] == set2->sig[0]); - case 1: - return set1->sig[0] == set2->sig[0]; - } +#if _NSIG_WORDS == 4 + return (set1->sig[3] == set2->sig[3]) && + (set1->sig[2] == set2->sig[2]) && + (set1->sig[1] == set2->sig[1]) && + (set1->sig[0] == set2->sig[0]); +#elif _NSIG_WORDS == 2 + return (set1->sig[1] == set2->sig[1]) && + (set1->sig[0] == set2->sig[0]); +#elif _NSIG_WORDS == 1 + return set1->sig[0] == set2->sig[0]; +#else return 0; +#endif } #define sigmask(sig) (1UL << ((sig) - 1)) @@ -125,14 +123,14 @@ static inline void name(sigset_t *r, const sigset_t *a, const sigset_t *b) \ \ switch (_NSIG_WORDS) { \ case 4: \ - a3 = a->sig[3]; a2 = a->sig[2]; \ - b3 = b->sig[3]; b2 = b->sig[2]; \ - r->sig[3] = op(a3, b3); \ - r->sig[2] = op(a2, b2); \ + a3 = a->sig[3%_NSIG_WORDS]; a2 = a->sig[2%_NSIG_WORDS]; \ + b3 = b->sig[3%_NSIG_WORDS]; b2 = b->sig[2%_NSIG_WORDS]; \ + r->sig[3%_NSIG_WORDS] = op(a3, b3); \ + r->sig[2%_NSIG_WORDS] = op(a2, b2); \ /* fall through */ \ case 2: \ - a1 = a->sig[1]; b1 = b->sig[1]; \ - r->sig[1] = op(a1, b1); \ + a1 = a->sig[1%_NSIG_WORDS]; b1 = b->sig[1%_NSIG_WORDS]; \ + r->sig[1%_NSIG_WORDS] = op(a1, b1); \ /* fall through */ \ case 1: \ a0 = a->sig[0]; b0 = b->sig[0]; \ @@ -161,10 +159,10 @@ _SIG_SET_BINOP(sigandnsets, _sig_andn) static inline void name(sigset_t *set) \ { \ switch (_NSIG_WORDS) { \ - case 4: set->sig[3] = op(set->sig[3]); \ - set->sig[2] = op(set->sig[2]); \ + case 4: set->sig[3%_NSIG_WORDS] = op(set->sig[3%_NSIG_WORDS]); \ + set->sig[2%_NSIG_WORDS] = op(set->sig[2%_NSIG_WORDS]); \ /* fall through */ \ - case 2: set->sig[1] = op(set->sig[1]); \ + case 2: set->sig[1%_NSIG_WORDS] = op(set->sig[1%_NSIG_WORDS]); \ /* fall through */ \ case 1: set->sig[0] = op(set->sig[0]); \ break; \ @@ -185,7 +183,7 @@ static inline void sigemptyset(sigset_t *set) default: memset(set, 0, sizeof(sigset_t)); break; - case 2: set->sig[1] = 0; + case 2: set->sig[1%_NSIG_WORDS] = 0; /* fall through */ case 1: set->sig[0] = 0; break; @@ -198,7 +196,7 @@ static inline void sigfillset(sigset_t *set) default: memset(set, -1, sizeof(sigset_t)); break; - case 2: set->sig[1] = -1; + case 2: set->sig[1%_NSIG_WORDS] = -1; /* fall through */ case 1: set->sig[0] = -1; break; @@ -229,7 +227,7 @@ static inline void siginitset(sigset_t *set, unsigned long mask) default: memset(&set->sig[1], 0, sizeof(long)*(_NSIG_WORDS-1)); break; - case 2: set->sig[1] = 0; + case 2: set->sig[1%_NSIG_WORDS] = 0; case 1: ; } } @@ -241,7 +239,7 @@ static inline void siginitsetinv(sigset_t *set, unsigned long mask) default: memset(&set->sig[1], -1, sizeof(long)*(_NSIG_WORDS-1)); break; - case 2: set->sig[1] = -1; + case 2: set->sig[1%_NSIG_WORDS] = -1; case 1: ; } }