From patchwork Tue Mar 16 00:13:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 89168 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8A2FFA054F; Tue, 16 Mar 2021 01:13:38 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 070814069F; Tue, 16 Mar 2021 01:13:38 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id EDBE840042 for ; Tue, 16 Mar 2021 01:13:36 +0100 (CET) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 2719220B39C5; Mon, 15 Mar 2021 17:13:36 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 2719220B39C5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1615853616; bh=+JCXfyUmMrGCpYPfb5rPdOmcj9orwldqMcFYrtizXcw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XY0D+YMWHO0/2Srndrdb418JZGaRFh3Eb3l9jPGPTvNFMi2hoWF0wWF+LEqV7lQBc OsrJbnDkUGOtY2ZPCktiWg0JA31X7z1+U9j1hGkYhMbsrCKsFhSJRMruYB/0YMXQ7T MxlZYaoRLmsZ3L0z2Yf43G97LuoSSPNk5yqHmkbk= From: Tyler Retzlaff To: dev@dpdk.org Cc: anatoly.burakov@intel.com, david.hunt@intel.com, mb@smartsharesystems.com Date: Mon, 15 Mar 2021 17:13:31 -0700 Message-Id: <1615853611-7253-1-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1615333490-15243-1-git-send-email-roretzla@linux.microsoft.com> References: <1615333490-15243-1-git-send-email-roretzla@linux.microsoft.com> Subject: [dpdk-dev] [PATCH v3] eal, power: use UINT64_MAX and UINT32_MAX X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use UINT64_MAX and UINT32_MAX instead of -1 or ~0 literal variations of different explicit widths when creating masks and sentinel values. some compilers generate a warning when applying a '-' to an unsigned literal so avoid this by initializing with unsigned preprocessor definitions where appropriate. Signed-off-by: Tyler Retzlaff Acked-by: Morten Brørup Acked-by: Anatoly Burakov --- lib/librte_eal/common/eal_common_fbarray.c | 12 ++++++------ lib/librte_eal/common/eal_common_log.c | 2 +- lib/librte_power/rte_power_pmd_mgmt.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/librte_eal/common/eal_common_fbarray.c b/lib/librte_eal/common/eal_common_fbarray.c index 592ec5859..3a28a5324 100644 --- a/lib/librte_eal/common/eal_common_fbarray.c +++ b/lib/librte_eal/common/eal_common_fbarray.c @@ -138,7 +138,7 @@ find_next_n(const struct rte_fbarray *arr, unsigned int start, unsigned int n, */ last = MASK_LEN_TO_IDX(arr->len); last_mod = MASK_LEN_TO_MOD(arr->len); - last_msk = ~(-1ULL << last_mod); + last_msk = ~(UINT64_MAX << last_mod); for (msk_idx = first; msk_idx < msk->n_masks; msk_idx++) { uint64_t cur_msk, lookahead_msk; @@ -398,8 +398,8 @@ find_prev_n(const struct rte_fbarray *arr, unsigned int start, unsigned int n, first_mod = MASK_LEN_TO_MOD(start); /* we're going backwards, so mask must start from the top */ ignore_msk = first_mod == MASK_ALIGN - 1 ? - -1ULL : /* prevent overflow */ - ~(-1ULL << (first_mod + 1)); + UINT64_MAX : /* prevent overflow */ + ~(UINT64_MAX << (first_mod + 1)); /* go backwards, include zero */ msk_idx = first; @@ -513,7 +513,7 @@ find_prev_n(const struct rte_fbarray *arr, unsigned int start, unsigned int n, * no runs in the space we've lookbehind-scanned * as well, so skip that on next iteration. */ - ignore_msk = -1ULL << need; + ignore_msk = UINT64_MAX << need; msk_idx = lookbehind_idx; break; } @@ -560,8 +560,8 @@ find_prev(const struct rte_fbarray *arr, unsigned int start, bool used) first_mod = MASK_LEN_TO_MOD(start); /* we're going backwards, so mask must start from the top */ ignore_msk = first_mod == MASK_ALIGN - 1 ? - -1ULL : /* prevent overflow */ - ~(-1ULL << (first_mod + 1)); + UINT64_MAX : /* prevent overflow */ + ~(UINT64_MAX << (first_mod + 1)); /* go backwards, include zero */ idx = first; diff --git a/lib/librte_eal/common/eal_common_log.c b/lib/librte_eal/common/eal_common_log.c index c5554badb..1b2745329 100644 --- a/lib/librte_eal/common/eal_common_log.c +++ b/lib/librte_eal/common/eal_common_log.c @@ -30,7 +30,7 @@ static struct rte_logs { size_t dynamic_types_len; struct rte_log_dynamic_type *dynamic_types; } rte_logs = { - .type = ~0, + .type = UINT32_MAX, .level = RTE_LOG_DEBUG, }; diff --git a/lib/librte_power/rte_power_pmd_mgmt.c b/lib/librte_power/rte_power_pmd_mgmt.c index 454ef7091..db03cbf42 100644 --- a/lib/librte_power/rte_power_pmd_mgmt.c +++ b/lib/librte_power/rte_power_pmd_mgmt.c @@ -111,7 +111,7 @@ clb_umwait(uint16_t port_id, uint16_t qidx, struct rte_mbuf **pkts __rte_unused, ret = rte_eth_get_monitor_addr(port_id, qidx, &pmc); if (ret == 0) - rte_power_monitor(&pmc, -1ULL); + rte_power_monitor(&pmc, UINT64_MAX); } q_conf->umwait_in_progress = false;