From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 43A2BA0C41; Wed, 15 Sep 2021 23:05:06 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AE1CE4003F; Wed, 15 Sep 2021 23:05:05 +0200 (CEST) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by mails.dpdk.org (Postfix) with ESMTP id F000E4003C for ; Wed, 15 Sep 2021 23:05:03 +0200 (CEST) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 5D6455C0199; Wed, 15 Sep 2021 17:05:03 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 15 Sep 2021 17:05:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm2; bh=gB2R00GqJwV4hInaYa6efoXvTo dDLcRuN0K4OD+d44I=; b=ODDybJ+NzzAQROvbWS7ti8pD/jx1vPuj/LA+tKlRoZ T/D4BJTBijCk0BWIdMSGHLY6ySuNJ2cUfiF0Y6Tq2mszIGepmSefAUKR6rfgOlTQ dMgxUI2JZuhZ+RP6QoVKt3R8v2kLSMt9Y41BXZlOSrsVMU/GA2e81AHmI8VxB+RH xt0IVG8FSlprRo41CAcPyNv9TlgLVDVj0OxomU4SL6VDbK1R9f5PlLGMNm/2tmyd w2F26Fe0h6q+bPCkk4u078pWZHEfWu+3vGqcOFbjB8KCzRD0+seNCGuSBAmQW8N5 Y3o5eEdlpv1LM7C4Ul597vDQvrKHCCTc6eTACvLLbH6w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=gB2R00GqJwV4hInaY a6efoXvTodDLcRuN0K4OD+d44I=; b=jmnk0sHqfTgwcJd9HgrOQqVCGuMPn8F2i tGmhUoO/eC9Lqk18ajbJAnxedVUmtsJGZCwH9dmy8Pt7GjoVYtYT8B4DPMVtfbnq /b+r8Of2eQX/gQyKCxU4x8sUakzrvggqyVCaTvzJ716xiZj+g9p+/FzhRMvwUbf+ DekNDkLRMSeNVbd4h+1vlHWmLTFpS2i6ZYOBI4pEZKPoLVQJz0Um9ISWQRCqL0Z6 e9uxovDm7qAr1inaFcDBxSYEfsn9e7AZJTx/a75shjWR9NxpziN3KrwhomxMdmiO A1+FG2UAPY9SsBP7uzk923jfzyCLduejbMk3iJj5VgDhegiJgBF4g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrudehvddgudeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgrshcu ofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecuggftrf grthhtvghrnhepvdelvdduhedvudduveeuvdevheegudelgeeigfejheduhedttdegudff jeeihffgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh epthhhohhmrghssehmohhnjhgrlhhonhdrnhgvth X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 15 Sep 2021 17:05:01 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: Ferruh Yigit , Andrew Rybchenko , Ori Kam , Cristian Dumitrescu Date: Wed, 15 Sep 2021 23:04:44 +0200 Message-Id: <20210915210444.3126008-1-thomas@monjalon.net> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH] ethdev: replace bit shifts with macros 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" The macros RTE_BIT32 and RTE_BIT64 are used to replace bit shifts. The macro UINT64C is also used to replace remaining occurrences of ULL. Only bit shifts of ETH_RSS_LEVEL_* are kept for aesthetic reason. Signed-off-by: Thomas Monjalon --- lib/ethdev/rte_ethdev.c | 16 ++--- lib/ethdev/rte_ethdev.h | 127 ++++++++++++++++++++-------------------- lib/ethdev/rte_flow.c | 4 +- lib/ethdev/rte_flow.h | 6 +- lib/ethdev/rte_mtr.h | 16 ++--- lib/ethdev/rte_tm.h | 36 ++++++------ 6 files changed, 103 insertions(+), 102 deletions(-) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index daf5ca9242..cf3e83b7c3 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -1303,7 +1303,7 @@ eth_dev_validate_offloads(uint16_t port_id, uint64_t req_offloads, while (offloads_diff != 0) { /* Check if any offload is requested but not enabled. */ - offload = 1ULL << __builtin_ctzll(offloads_diff); + offload = RTE_BIT64(__builtin_ctzll(offloads_diff)); if (offload & req_offloads) { RTE_ETHDEV_LOG(ERR, "Port %u failed to enable %s offload %s\n", @@ -1669,7 +1669,7 @@ eth_dev_mac_restore(struct rte_eth_dev *dev, pool_mask = dev->data->mac_pool_sel[i]; do { - if (pool_mask & 1ULL) + if (pool_mask & UINT64_C(1)) (*dev->dev_ops->mac_addr_add)(dev, addr, i, pool); pool_mask >>= 1; @@ -1945,7 +1945,7 @@ rte_eth_rx_queue_check_split(const struct rte_eth_rxseg_split *rx_seg, * for each segment specified in extended configuration. */ mp_first = rx_seg[0].mp; - offset_mask = (1u << seg_capa->offset_align_log2) - 1; + offset_mask = RTE_BIT32(seg_capa->offset_align_log2) - 1; for (seg_idx = 0; seg_idx < n_seg; seg_idx++) { struct rte_mempool *mpl = rx_seg[seg_idx].mp; uint32_t length = rx_seg[seg_idx].length; @@ -3686,9 +3686,9 @@ rte_eth_dev_vlan_filter(uint16_t port_id, uint16_t vlan_id, int on) vbit = vlan_id % 64; if (on) - vfc->ids[vidx] |= UINT64_C(1) << vbit; + vfc->ids[vidx] |= RTE_BIT64(vbit); else - vfc->ids[vidx] &= ~(UINT64_C(1) << vbit); + vfc->ids[vidx] &= ~RTE_BIT64(vbit); } return eth_err(port_id, ret); @@ -3960,7 +3960,7 @@ eth_check_reta_entry(struct rte_eth_rss_reta_entry64 *reta_conf, for (i = 0; i < reta_size; i++) { idx = i / RTE_RETA_GROUP_SIZE; shift = i % RTE_RETA_GROUP_SIZE; - if ((reta_conf[idx].mask & (1ULL << shift)) && + if ((reta_conf[idx].mask & RTE_BIT64(shift)) && (reta_conf[idx].reta[shift] >= max_rxq)) { RTE_ETHDEV_LOG(ERR, "reta_conf[%u]->reta[%u]: %u exceeds the maximum rxq index: %u\n", @@ -4299,7 +4299,7 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr, pool_mask = dev->data->mac_pool_sel[index]; /* Check if both MAC address and pool is already there, and do nothing */ - if (pool_mask & (1ULL << pool)) + if (pool_mask & RTE_BIT64(pool)) return 0; } @@ -4311,7 +4311,7 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr, rte_ether_addr_copy(addr, &dev->data->mac_addrs[index]); /* Update pool bitmap in NIC data structure */ - dev->data->mac_pool_sel[index] |= (1ULL << pool); + dev->data->mac_pool_sel[index] |= RTE_BIT64(pool); } return eth_err(port_id, ret); diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index d2b27c351f..8495192121 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -159,6 +159,7 @@ extern "C" { #include #include #include +#include #include #include #include @@ -279,23 +280,23 @@ struct rte_eth_stats { /** * Device supported speeds bitmap flags */ -#define ETH_LINK_SPEED_AUTONEG (0 << 0) /**< Autonegotiate (all speeds) */ -#define ETH_LINK_SPEED_FIXED (1 << 0) /**< Disable autoneg (fixed speed) */ -#define ETH_LINK_SPEED_10M_HD (1 << 1) /**< 10 Mbps half-duplex */ -#define ETH_LINK_SPEED_10M (1 << 2) /**< 10 Mbps full-duplex */ -#define ETH_LINK_SPEED_100M_HD (1 << 3) /**< 100 Mbps half-duplex */ -#define ETH_LINK_SPEED_100M (1 << 4) /**< 100 Mbps full-duplex */ -#define ETH_LINK_SPEED_1G (1 << 5) /**< 1 Gbps */ -#define ETH_LINK_SPEED_2_5G (1 << 6) /**< 2.5 Gbps */ -#define ETH_LINK_SPEED_5G (1 << 7) /**< 5 Gbps */ -#define ETH_LINK_SPEED_10G (1 << 8) /**< 10 Gbps */ -#define ETH_LINK_SPEED_20G (1 << 9) /**< 20 Gbps */ -#define ETH_LINK_SPEED_25G (1 << 10) /**< 25 Gbps */ -#define ETH_LINK_SPEED_40G (1 << 11) /**< 40 Gbps */ -#define ETH_LINK_SPEED_50G (1 << 12) /**< 50 Gbps */ -#define ETH_LINK_SPEED_56G (1 << 13) /**< 56 Gbps */ -#define ETH_LINK_SPEED_100G (1 << 14) /**< 100 Gbps */ -#define ETH_LINK_SPEED_200G (1 << 15) /**< 200 Gbps */ +#define ETH_LINK_SPEED_AUTONEG 0 /**< Autonegotiate (all speeds) */ +#define ETH_LINK_SPEED_FIXED RTE_BIT32(0) /**< Disable autoneg (fixed speed) */ +#define ETH_LINK_SPEED_10M_HD RTE_BIT32(1) /**< 10 Mbps half-duplex */ +#define ETH_LINK_SPEED_10M RTE_BIT32(2) /**< 10 Mbps full-duplex */ +#define ETH_LINK_SPEED_100M_HD RTE_BIT32(3) /**< 100 Mbps half-duplex */ +#define ETH_LINK_SPEED_100M RTE_BIT32(4) /**< 100 Mbps full-duplex */ +#define ETH_LINK_SPEED_1G RTE_BIT32(5) /**< 1 Gbps */ +#define ETH_LINK_SPEED_2_5G RTE_BIT32(6) /**< 2.5 Gbps */ +#define ETH_LINK_SPEED_5G RTE_BIT32(7) /**< 5 Gbps */ +#define ETH_LINK_SPEED_10G RTE_BIT32(8) /**< 10 Gbps */ +#define ETH_LINK_SPEED_20G RTE_BIT32(9) /**< 20 Gbps */ +#define ETH_LINK_SPEED_25G RTE_BIT32(10) /**< 25 Gbps */ +#define ETH_LINK_SPEED_40G RTE_BIT32(11) /**< 40 Gbps */ +#define ETH_LINK_SPEED_50G RTE_BIT32(12) /**< 50 Gbps */ +#define ETH_LINK_SPEED_56G RTE_BIT32(13) /**< 56 Gbps */ +#define ETH_LINK_SPEED_100G RTE_BIT32(14) /**< 100 Gbps */ +#define ETH_LINK_SPEED_200G RTE_BIT32(15) /**< 200 Gbps */ /** * Ethernet numeric link speeds in Mbps @@ -506,37 +507,37 @@ struct rte_eth_rss_conf { * Below macros are defined for RSS offload types, they can be used to * fill rte_eth_rss_conf.rss_hf or rte_flow_action_rss.types. */ -#define ETH_RSS_IPV4 (1ULL << 2) -#define ETH_RSS_FRAG_IPV4 (1ULL << 3) -#define ETH_RSS_NONFRAG_IPV4_TCP (1ULL << 4) -#define ETH_RSS_NONFRAG_IPV4_UDP (1ULL << 5) -#define ETH_RSS_NONFRAG_IPV4_SCTP (1ULL << 6) -#define ETH_RSS_NONFRAG_IPV4_OTHER (1ULL << 7) -#define ETH_RSS_IPV6 (1ULL << 8) -#define ETH_RSS_FRAG_IPV6 (1ULL << 9) -#define ETH_RSS_NONFRAG_IPV6_TCP (1ULL << 10) -#define ETH_RSS_NONFRAG_IPV6_UDP (1ULL << 11) -#define ETH_RSS_NONFRAG_IPV6_SCTP (1ULL << 12) -#define ETH_RSS_NONFRAG_IPV6_OTHER (1ULL << 13) -#define ETH_RSS_L2_PAYLOAD (1ULL << 14) -#define ETH_RSS_IPV6_EX (1ULL << 15) -#define ETH_RSS_IPV6_TCP_EX (1ULL << 16) -#define ETH_RSS_IPV6_UDP_EX (1ULL << 17) -#define ETH_RSS_PORT (1ULL << 18) -#define ETH_RSS_VXLAN (1ULL << 19) -#define ETH_RSS_GENEVE (1ULL << 20) -#define ETH_RSS_NVGRE (1ULL << 21) -#define ETH_RSS_GTPU (1ULL << 23) -#define ETH_RSS_ETH (1ULL << 24) -#define ETH_RSS_S_VLAN (1ULL << 25) -#define ETH_RSS_C_VLAN (1ULL << 26) -#define ETH_RSS_ESP (1ULL << 27) -#define ETH_RSS_AH (1ULL << 28) -#define ETH_RSS_L2TPV3 (1ULL << 29) -#define ETH_RSS_PFCP (1ULL << 30) -#define ETH_RSS_PPPOE (1ULL << 31) -#define ETH_RSS_ECPRI (1ULL << 32) -#define ETH_RSS_MPLS (1ULL << 33) +#define ETH_RSS_IPV4 RTE_BIT64(2) +#define ETH_RSS_FRAG_IPV4 RTE_BIT64(3) +#define ETH_RSS_NONFRAG_IPV4_TCP RTE_BIT64(4) +#define ETH_RSS_NONFRAG_IPV4_UDP RTE_BIT64(5) +#define ETH_RSS_NONFRAG_IPV4_SCTP RTE_BIT64(6) +#define ETH_RSS_NONFRAG_IPV4_OTHER RTE_BIT64(7) +#define ETH_RSS_IPV6 RTE_BIT64(8) +#define ETH_RSS_FRAG_IPV6 RTE_BIT64(9) +#define ETH_RSS_NONFRAG_IPV6_TCP RTE_BIT64(10) +#define ETH_RSS_NONFRAG_IPV6_UDP RTE_BIT64(11) +#define ETH_RSS_NONFRAG_IPV6_SCTP RTE_BIT64(12) +#define ETH_RSS_NONFRAG_IPV6_OTHER RTE_BIT64(13) +#define ETH_RSS_L2_PAYLOAD RTE_BIT64(14) +#define ETH_RSS_IPV6_EX RTE_BIT64(15) +#define ETH_RSS_IPV6_TCP_EX RTE_BIT64(16) +#define ETH_RSS_IPV6_UDP_EX RTE_BIT64(17) +#define ETH_RSS_PORT RTE_BIT64(18) +#define ETH_RSS_VXLAN RTE_BIT64(19) +#define ETH_RSS_GENEVE RTE_BIT64(20) +#define ETH_RSS_NVGRE RTE_BIT64(21) +#define ETH_RSS_GTPU RTE_BIT64(23) +#define ETH_RSS_ETH RTE_BIT64(24) +#define ETH_RSS_S_VLAN RTE_BIT64(25) +#define ETH_RSS_C_VLAN RTE_BIT64(26) +#define ETH_RSS_ESP RTE_BIT64(27) +#define ETH_RSS_AH RTE_BIT64(28) +#define ETH_RSS_L2TPV3 RTE_BIT64(29) +#define ETH_RSS_PFCP RTE_BIT64(30) +#define ETH_RSS_PPPOE RTE_BIT64(31) +#define ETH_RSS_ECPRI RTE_BIT64(32) +#define ETH_RSS_MPLS RTE_BIT64(33) /* * We use the following macros to combine with above ETH_RSS_* for @@ -547,12 +548,12 @@ struct rte_eth_rss_conf { * the same level are used simultaneously, it is the same case as none of * them are added. */ -#define ETH_RSS_L3_SRC_ONLY (1ULL << 63) -#define ETH_RSS_L3_DST_ONLY (1ULL << 62) -#define ETH_RSS_L4_SRC_ONLY (1ULL << 61) -#define ETH_RSS_L4_DST_ONLY (1ULL << 60) -#define ETH_RSS_L2_SRC_ONLY (1ULL << 59) -#define ETH_RSS_L2_DST_ONLY (1ULL << 58) +#define ETH_RSS_L3_SRC_ONLY RTE_BIT64(63) +#define ETH_RSS_L3_DST_ONLY RTE_BIT64(62) +#define ETH_RSS_L4_SRC_ONLY RTE_BIT64(61) +#define ETH_RSS_L4_DST_ONLY RTE_BIT64(60) +#define ETH_RSS_L2_SRC_ONLY RTE_BIT64(59) +#define ETH_RSS_L2_DST_ONLY RTE_BIT64(58) /* * Only select IPV6 address prefix as RSS input set according to @@ -560,12 +561,12 @@ struct rte_eth_rss_conf { * Must be combined with ETH_RSS_IPV6, ETH_RSS_NONFRAG_IPV6_UDP, * ETH_RSS_NONFRAG_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_SCTP. */ -#define RTE_ETH_RSS_L3_PRE32 (1ULL << 57) -#define RTE_ETH_RSS_L3_PRE40 (1ULL << 56) -#define RTE_ETH_RSS_L3_PRE48 (1ULL << 55) -#define RTE_ETH_RSS_L3_PRE56 (1ULL << 54) -#define RTE_ETH_RSS_L3_PRE64 (1ULL << 53) -#define RTE_ETH_RSS_L3_PRE96 (1ULL << 52) +#define RTE_ETH_RSS_L3_PRE32 RTE_BIT64(57) +#define RTE_ETH_RSS_L3_PRE40 RTE_BIT64(56) +#define RTE_ETH_RSS_L3_PRE48 RTE_BIT64(55) +#define RTE_ETH_RSS_L3_PRE56 RTE_BIT64(54) +#define RTE_ETH_RSS_L3_PRE64 RTE_BIT64(53) +#define RTE_ETH_RSS_L3_PRE96 RTE_BIT64(52) /* * Use the following macros to combine with the above layers @@ -1624,7 +1625,7 @@ struct rte_eth_txq_info { * by PMD, then the application can iterate to retrieve burst description for * all other queues. */ -#define RTE_ETH_BURST_FLAG_PER_QUEUE (1ULL << 0) +#define RTE_ETH_BURST_FLAG_PER_QUEUE RTE_BIT64(0) /** * Ethernet device RX/TX queue packet burst mode information structure. @@ -1716,10 +1717,10 @@ enum rte_eth_fec_mode { }; /* Translate from FEC mode to FEC capa */ -#define RTE_ETH_FEC_MODE_TO_CAPA(x) (1U << (x)) +#define RTE_ETH_FEC_MODE_TO_CAPA(x) RTE_BIT32(x) /* This macro indicates FEC capa mask */ -#define RTE_ETH_FEC_MODE_CAPA_MASK(x) (1U << (RTE_ETH_FEC_ ## x)) +#define RTE_ETH_FEC_MODE_CAPA_MASK(x) RTE_BIT32(RTE_ETH_FEC_ ## x) /* A structure used to get capabilities per link speed */ struct rte_eth_fec_capa { diff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c index 8cb7a069c8..206d175055 100644 --- a/lib/ethdev/rte_flow.c +++ b/lib/ethdev/rte_flow.c @@ -213,12 +213,12 @@ rte_flow_dynf_metadata_register(void) if (flag < 0) goto error; rte_flow_dynf_metadata_offs = offset; - rte_flow_dynf_metadata_mask = (1ULL << flag); + rte_flow_dynf_metadata_mask = RTE_BIT64(flag); return 0; error: rte_flow_dynf_metadata_offs = -1; - rte_flow_dynf_metadata_mask = 0ULL; + rte_flow_dynf_metadata_mask = UINT64_C(0); return -rte_errno; } diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index 70f455d47d..d70710661a 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -4131,17 +4131,17 @@ struct rte_flow_tunnel { /** * Indicate that the packet has a tunnel. */ -#define RTE_FLOW_RESTORE_INFO_TUNNEL (1ULL << 0) +#define RTE_FLOW_RESTORE_INFO_TUNNEL RTE_BIT64(0) /** * Indicate that the packet has a non decapsulated tunnel header. */ -#define RTE_FLOW_RESTORE_INFO_ENCAPSULATED (1ULL << 1) +#define RTE_FLOW_RESTORE_INFO_ENCAPSULATED RTE_BIT64(1) /** * Indicate that the packet has a group_id. */ -#define RTE_FLOW_RESTORE_INFO_GROUP_ID (1ULL << 2) +#define RTE_FLOW_RESTORE_INFO_GROUP_ID RTE_BIT64(2) /** * Restore information structure to communicate the current packet processing diff --git a/lib/ethdev/rte_mtr.h b/lib/ethdev/rte_mtr.h index dc246dd7af..babc9968d0 100644 --- a/lib/ethdev/rte_mtr.h +++ b/lib/ethdev/rte_mtr.h @@ -60,28 +60,28 @@ extern "C" { */ enum rte_mtr_stats_type { /** Number of packets passed as green by the policer. */ - RTE_MTR_STATS_N_PKTS_GREEN = 1 << 0, + RTE_MTR_STATS_N_PKTS_GREEN = RTE_BIT64(0), /** Number of packets passed as yellow by the policer. */ - RTE_MTR_STATS_N_PKTS_YELLOW = 1 << 1, + RTE_MTR_STATS_N_PKTS_YELLOW = RTE_BIT64(1), /** Number of packets passed as red by the policer. */ - RTE_MTR_STATS_N_PKTS_RED = 1 << 2, + RTE_MTR_STATS_N_PKTS_RED = RTE_BIT64(2), /** Number of packets dropped by the policer. */ - RTE_MTR_STATS_N_PKTS_DROPPED = 1 << 3, + RTE_MTR_STATS_N_PKTS_DROPPED = RTE_BIT64(3), /** Number of bytes passed as green by the policer. */ - RTE_MTR_STATS_N_BYTES_GREEN = 1 << 4, + RTE_MTR_STATS_N_BYTES_GREEN = RTE_BIT64(4), /** Number of bytes passed as yellow by the policer. */ - RTE_MTR_STATS_N_BYTES_YELLOW = 1 << 5, + RTE_MTR_STATS_N_BYTES_YELLOW = RTE_BIT64(5), /** Number of bytes passed as red by the policer. */ - RTE_MTR_STATS_N_BYTES_RED = 1 << 6, + RTE_MTR_STATS_N_BYTES_RED = RTE_BIT64(6), /** Number of bytes dropped by the policer. */ - RTE_MTR_STATS_N_BYTES_DROPPED = 1 << 7, + RTE_MTR_STATS_N_BYTES_DROPPED = RTE_BIT64(7), }; /** diff --git a/lib/ethdev/rte_tm.h b/lib/ethdev/rte_tm.h index 175417a15f..cc0af67f6e 100644 --- a/lib/ethdev/rte_tm.h +++ b/lib/ethdev/rte_tm.h @@ -93,38 +93,38 @@ extern "C" { */ enum rte_tm_stats_type { /** Number of packets scheduled from current node. */ - RTE_TM_STATS_N_PKTS = 1 << 0, + RTE_TM_STATS_N_PKTS = RTE_BIT64(0), /** Number of bytes scheduled from current node. */ - RTE_TM_STATS_N_BYTES = 1 << 1, + RTE_TM_STATS_N_BYTES = RTE_BIT64(1), /** Number of green packets dropped by current leaf node. */ - RTE_TM_STATS_N_PKTS_GREEN_DROPPED = 1 << 2, + RTE_TM_STATS_N_PKTS_GREEN_DROPPED = RTE_BIT64(2), /** Number of yellow packets dropped by current leaf node. */ - RTE_TM_STATS_N_PKTS_YELLOW_DROPPED = 1 << 3, + RTE_TM_STATS_N_PKTS_YELLOW_DROPPED = RTE_BIT64(3), /** Number of red packets dropped by current leaf node. */ - RTE_TM_STATS_N_PKTS_RED_DROPPED = 1 << 4, + RTE_TM_STATS_N_PKTS_RED_DROPPED = RTE_BIT64(4), /** Number of green bytes dropped by current leaf node. */ - RTE_TM_STATS_N_BYTES_GREEN_DROPPED = 1 << 5, + RTE_TM_STATS_N_BYTES_GREEN_DROPPED = RTE_BIT64(5), /** Number of yellow bytes dropped by current leaf node. */ - RTE_TM_STATS_N_BYTES_YELLOW_DROPPED = 1 << 6, + RTE_TM_STATS_N_BYTES_YELLOW_DROPPED = RTE_BIT64(6), /** Number of red bytes dropped by current leaf node. */ - RTE_TM_STATS_N_BYTES_RED_DROPPED = 1 << 7, + RTE_TM_STATS_N_BYTES_RED_DROPPED = RTE_BIT64(7), /** Number of packets currently waiting in the packet queue of current * leaf node. */ - RTE_TM_STATS_N_PKTS_QUEUED = 1 << 8, + RTE_TM_STATS_N_PKTS_QUEUED = RTE_BIT64(8), /** Number of bytes currently waiting in the packet queue of current * leaf node. */ - RTE_TM_STATS_N_BYTES_QUEUED = 1 << 9, + RTE_TM_STATS_N_BYTES_QUEUED = RTE_BIT64(9), }; /** @@ -169,31 +169,31 @@ enum rte_tm_dynamic_update_type { * hierarchy level as the former parent node. Consequently, the node * whose parent is changed preserves its hierarchy level. */ - RTE_TM_UPDATE_NODE_PARENT_KEEP_LEVEL = 1 << 0, + RTE_TM_UPDATE_NODE_PARENT_KEEP_LEVEL = RTE_BIT64(0), /** Dynamic parent node update. The new parent node is located on * different hierarchy level than the former parent node. Consequently, * the node whose parent is changed also changes its hierarchy level. */ - RTE_TM_UPDATE_NODE_PARENT_CHANGE_LEVEL = 1 << 1, + RTE_TM_UPDATE_NODE_PARENT_CHANGE_LEVEL = RTE_BIT64(1), /** Dynamic node add/delete. */ - RTE_TM_UPDATE_NODE_ADD_DELETE = 1 << 2, + RTE_TM_UPDATE_NODE_ADD_DELETE = RTE_BIT64(2), /** Suspend/resume nodes. */ - RTE_TM_UPDATE_NODE_SUSPEND_RESUME = 1 << 3, + RTE_TM_UPDATE_NODE_SUSPEND_RESUME = RTE_BIT64(3), /** Dynamic switch between byte-based and packet-based WFQ weights. */ - RTE_TM_UPDATE_NODE_WFQ_WEIGHT_MODE = 1 << 4, + RTE_TM_UPDATE_NODE_WFQ_WEIGHT_MODE = RTE_BIT64(4), /** Dynamic update on number of SP priorities. */ - RTE_TM_UPDATE_NODE_N_SP_PRIORITIES = 1 << 5, + RTE_TM_UPDATE_NODE_N_SP_PRIORITIES = RTE_BIT64(5), /** Dynamic update of congestion management mode for leaf nodes. */ - RTE_TM_UPDATE_NODE_CMAN = 1 << 6, + RTE_TM_UPDATE_NODE_CMAN = RTE_BIT64(6), /** Dynamic update of the set of enabled stats counter types. */ - RTE_TM_UPDATE_NODE_STATS = 1 << 7, + RTE_TM_UPDATE_NODE_STATS = RTE_BIT64(7), }; /** -- 2.33.0