From patchwork Thu Mar 7 09:33:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 159812 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp7217367jad; Thu, 7 Mar 2019 01:33:26 -0800 (PST) X-Google-Smtp-Source: APXvYqxskzvX0sziIr0i37bCCQSKi1yr5iKliRrZWiiw90jB+Q3xjGSQyEFL6xeLMOzcjYa6WhHX X-Received: by 2002:a62:5e46:: with SMTP id s67mr11845458pfb.126.1551951206506; Thu, 07 Mar 2019 01:33:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551951206; cv=none; d=google.com; s=arc-20160816; b=ncoHFlBONh9YF6tvUOrwd90TpanfKH46vIRwY7wpqAznE9JzPX/eXCrk1hDA6g1KvB 5z4UwHUW7OsIYs1sjpqJoFMNxmTnPyOpykhJyidYpSEGRsJIk0hdFM3MbWuCcaQj1fsi 9AS6qsJlY+rMg56MYGY87tr1WcrwzMDhUyXNCFMaLp0xylnJy4HdeDaWrm6Bub7vSnKu RVtKl3R0LF64TUiJcjL9svOhcrsoXjJ1Hio2sWnySwi2re+68GgJaEd5tn8LKPVGkGEI zsr1GOz0d6c1+gXINPxfiShpliViyCQCH5lh+kiF4E+3TTAaWPD4+OmAC0fWHje8PpTB 8EvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=YDsA7XK183S3PvIbxDica4Hg1E2hAItclnema1slGIE=; b=y0VLC+82+8b1XvNQYYuxi1sL9xtwgH1i8Yw8KKXh3GvKCNISbmz5L7LpBT3xIPgzug FnCEUQ4zLsF/qHctxv8ht9M0+mm3sOTW4/8mGPFcWmcqkKsPq6vQnTBwCvqmqOiSuAIY +amMynGh6GwUg74yG0RT2g3puKB8cDa55zNZDPCiErNEy7r6NWGmAzpdmCczXRJIG6wO Pf2YplQxqHsseVB4av43FPRz+iZevrM6hJzp0GnvXPdIckzHCA9i/shsBm1znVbcXCUR 1XzbE+t/d4ZFQyoc/He9QvG3dG5zBLbC4ejYT7oRNrBEYxiD1GotH6PS5Q2x233SMuSL ueHA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b17si3774058pfm.57.2019.03.07.01.33.26; Thu, 07 Mar 2019 01:33:26 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726248AbfCGJdY (ORCPT + 31 others); Thu, 7 Mar 2019 04:33:24 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:49179 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725747AbfCGJdY (ORCPT ); Thu, 7 Mar 2019 04:33:24 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1MmD6U-1gbG5g3kzw-00iC7E; Thu, 07 Mar 2019 10:33:12 +0100 From: Arnd Bergmann To: Christian Benvenuti , Govindarajulu Varadarajan <_govind@gmx.com>, Parvi Kaustubhi , "David S. Miller" Cc: Nick Desaulniers , Arnd Bergmann , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] enic: fix build warning without CONFIG_CPUMASK_OFFSTACK Date: Thu, 7 Mar 2019 10:33:02 +0100 Message-Id: <20190307093311.3406888-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:ElMFlO3oxbtfllvKKFpnrClWzaq4TOMo9BSVLmhjv+IsBLzPz9z 5nweVAfoNs6YB3x3S289Uo2rj79EP1Q/imX1jwfhn2UnEixPhjVQWDRW7yGlqan127esPmQ g/mkuDiWapjz54M9ZoWRCkR+Wh3PQoZ32wLW2zYpsj4vQ0Sx4DIq2aHk0D/CnN1yrmLVIWL 2PGGB9eFHCS3v3gOzDg1g== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:TqoGyw5RBgg=:7lgFSaI0OFLIKbwuzEB7K9 /giQjRL89z6mcYkW9GEzsHeocr9+UB7LLCneXnjFuUfyIBem61W43xzMHAXdkx0Cbg0G1y8nm oRosXRmn17HEBDR2SEgwGaMpoX0rD88VoXdTakDqZ0bPrqvbwaBsabcdzoBLPiytSLHHRDkz2 rGhuaMCLpuQ9xhSaL3TQAfqOpwK2VKkRf2bn6ijjnijMdR2Jy2GfsJQFS18Z9BGFCJUnRDZNp AlNN0wYbBgEpkZHbM911w0+ILvqm+C3hONQC2RuBVo4XjG+q7rlxFIIyqMZnEf6UF3nKefUgX Ri5JKTR7nAxRlsLVEdJGHTdqDsa7Gj4kSHON5n+pdheEGyvyd3QagdFBcBvZ3heYcXPsab9kt EQOm9Fwpizivg2UvVZIsh0MboIhxLF7FNbr7kJCg4bfbYWI2M/NTca6+QNE+AU7ponN4SC2qg EZfUg21JvhQzjmNWuJHzqqE8LE0WJWhn0/96LGz69yfC0TZN85pUm9BsFo+CNltIIjyuEYrzX S+D+OdAUTboRdZglgOBQnVGLvCYmJ1wW9Mkn+WEKB5WdsolMotqcWWG4b6BhyW/dCPVDUMZ4I hoxuQYk5Rfhfa3UGyJCkQJ6DQW/xSg84mMsePgkb0oahi+ZzY5Enl/IEoaOYxefdjfAmHWwDl 5rd7j5FppGag9E5n5ARZRSUUNoxw76/t6ANcmJZS0rWgNLUHUG5RWA2W3RJRADrFbe/BpKXD2 2d0Jj96paklykVrQjzPL2Txn7wFyMGrq3osWUA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The enic driver relies on the CONFIG_CPUMASK_OFFSTACK feature to dynamically allocate a struct member, but this is normally intended for local variables. Building with clang, I get a warning for a few locations that check the address of the cpumask_var_t: drivers/net/ethernet/cisco/enic/enic_main.c:122:22: error: address of array 'enic->msix[i].affinity_mask' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion] As far as I can tell, the code is still correct, as the truth value of the pointer is what we need in this configuration. To get rid of the warning, I split out the check into a separate function, and hide that portion if CONFIG_CPUMASK_OFFSTACK is disabled. Fixes: 322cf7e3a4e8 ("enic: assign affinity hint to interrupts") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/cisco/enic/enic_main.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) -- 2.20.0 diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index 9a7f70db20c7..f652a8bd163e 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c @@ -112,6 +112,15 @@ static struct enic_intr_mod_range mod_range[ENIC_MAX_LINK_SPEEDS] = { {3, 6}, /* 10 - 40 Gbps */ }; +static inline int enic_affinity_mask_empty(struct enic *enic, int i) +{ +#ifdef CONFIG_CPUMASK_OFFSTACK + if (!enic->msix[i].affinity_mask) + return 1; +#endif + return cpumask_empty(enic->msix[i].affinity_mask); +} + static void enic_init_affinity_hint(struct enic *enic) { int numa_node = dev_to_node(&enic->pdev->dev); @@ -119,8 +128,7 @@ static void enic_init_affinity_hint(struct enic *enic) for (i = 0; i < enic->intr_count; i++) { if (enic_is_err_intr(enic, i) || enic_is_notify_intr(enic, i) || - (enic->msix[i].affinity_mask && - !cpumask_empty(enic->msix[i].affinity_mask))) + !enic_affinity_mask_empty(enic, i)) continue; if (zalloc_cpumask_var(&enic->msix[i].affinity_mask, GFP_KERNEL)) @@ -148,8 +156,7 @@ static void enic_set_affinity_hint(struct enic *enic) for (i = 0; i < enic->intr_count; i++) { if (enic_is_err_intr(enic, i) || enic_is_notify_intr(enic, i) || - !enic->msix[i].affinity_mask || - cpumask_empty(enic->msix[i].affinity_mask)) + enic_affinity_mask_empty(enic, i)) continue; err = irq_set_affinity_hint(enic->msix_entry[i].vector, enic->msix[i].affinity_mask); @@ -161,8 +168,7 @@ static void enic_set_affinity_hint(struct enic *enic) for (i = 0; i < enic->wq_count; i++) { int wq_intr = enic_msix_wq_intr(enic, i); - if (enic->msix[wq_intr].affinity_mask && - !cpumask_empty(enic->msix[wq_intr].affinity_mask)) + if (!enic_affinity_mask_empty(enic, wq_intr)) netif_set_xps_queue(enic->netdev, enic->msix[wq_intr].affinity_mask, i);