From patchwork Fri Nov 28 15:31:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 1693 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 9A7EC58E8; Fri, 28 Nov 2014 16:31:06 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 254F0231C for ; Fri, 28 Nov 2014 16:31:04 +0100 (CET) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 28 Nov 2014 07:31:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,477,1413270000"; d="scan'208";a="639605330" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga002.fm.intel.com with ESMTP; 28 Nov 2014 07:31:02 -0800 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id sASFV1ds025555; Fri, 28 Nov 2014 15:31:01 GMT Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id sASFV1jo014628; Fri, 28 Nov 2014 15:31:01 GMT Received: (from bricha3@localhost) by sivswdev01.ir.intel.com with id sASFV0BN014622; Fri, 28 Nov 2014 15:31:00 GMT From: Bruce Richardson To: dev@dpdk.org Date: Fri, 28 Nov 2014 15:31:00 +0000 Message-Id: <1417188660-14587-1-git-send-email-bruce.richardson@intel.com> X-Mailer: git-send-email 1.7.4.1 Subject: [dpdk-dev] [PATCH] ixgbe: fix clang compile - remove truncation errors X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" When compiling with clang, errors were being emitted due to truncation of values when assigning to the tx_offload_mask bit fields. dpdk.org/lib/librte_pmd_ixgbe/ixgbe_rxtx.c:404:27: fatal error: implicit truncation from 'int' to bitfield changes value from -1 to 127 [-Wbitfield-constant-conversion] tx_offload_mask.l2_len = ~0; The fix proposed here is to define a static const value of the same type with all fields set to 1s, and use that instead of constants for assigning to. Other options would be to explicitily define the suitable constants that would not truncate for each individual field e.g. 0x7f for l2_len, 0x1FF for l3_len, etc., but this solution here has the advantage that it works without any changes to values if the field sizes are ever modified. Signed-off-by: Bruce Richardson --- lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c index 8559ef6..4f71194 100644 --- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c +++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c @@ -367,6 +367,7 @@ ixgbe_set_xmit_ctx(struct igb_tx_queue* txq, volatile struct ixgbe_adv_tx_context_desc *ctx_txd, uint64_t ol_flags, union ixgbe_tx_offload tx_offload) { + static const union ixgbe_tx_offload offload_allones = { .data = ~0 }; uint32_t type_tucmd_mlhl; uint32_t mss_l4len_idx = 0; uint32_t ctx_idx; @@ -381,7 +382,7 @@ ixgbe_set_xmit_ctx(struct igb_tx_queue* txq, mss_l4len_idx |= (ctx_idx << IXGBE_ADVTXD_IDX_SHIFT); if (ol_flags & PKT_TX_VLAN_PKT) { - tx_offload_mask.vlan_tci = ~0; + tx_offload_mask.vlan_tci = offload_allones.vlan_tci; } /* check if TCP segmentation required for this packet */ @@ -391,17 +392,17 @@ ixgbe_set_xmit_ctx(struct igb_tx_queue* txq, IXGBE_ADVTXD_TUCMD_L4T_TCP | IXGBE_ADVTXD_DTYP_CTXT | IXGBE_ADVTXD_DCMD_DEXT; - tx_offload_mask.l2_len = ~0; - tx_offload_mask.l3_len = ~0; - tx_offload_mask.l4_len = ~0; - tx_offload_mask.tso_segsz = ~0; + tx_offload_mask.l2_len = offload_allones.l2_len; + tx_offload_mask.l3_len = offload_allones.l3_len; + tx_offload_mask.l4_len = offload_allones.l4_len; + tx_offload_mask.tso_segsz = offload_allones.tso_segsz; mss_l4len_idx |= tx_offload.tso_segsz << IXGBE_ADVTXD_MSS_SHIFT; mss_l4len_idx |= tx_offload.l4_len << IXGBE_ADVTXD_L4LEN_SHIFT; } else { /* no TSO, check if hardware checksum is needed */ if (ol_flags & PKT_TX_IP_CKSUM) { type_tucmd_mlhl = IXGBE_ADVTXD_TUCMD_IPV4; - tx_offload_mask.l2_len = ~0; - tx_offload_mask.l3_len = ~0; + tx_offload_mask.l2_len = offload_allones.l2_len; + tx_offload_mask.l3_len = offload_allones.l3_len; } switch (ol_flags & PKT_TX_L4_MASK) { @@ -409,23 +410,23 @@ ixgbe_set_xmit_ctx(struct igb_tx_queue* txq, type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_L4T_UDP | IXGBE_ADVTXD_DTYP_CTXT | IXGBE_ADVTXD_DCMD_DEXT; mss_l4len_idx |= sizeof(struct udp_hdr) << IXGBE_ADVTXD_L4LEN_SHIFT; - tx_offload_mask.l2_len = ~0; - tx_offload_mask.l3_len = ~0; + tx_offload_mask.l2_len = offload_allones.l2_len; + tx_offload_mask.l3_len = offload_allones.l3_len; break; case PKT_TX_TCP_CKSUM: type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_L4T_TCP | IXGBE_ADVTXD_DTYP_CTXT | IXGBE_ADVTXD_DCMD_DEXT; mss_l4len_idx |= sizeof(struct tcp_hdr) << IXGBE_ADVTXD_L4LEN_SHIFT; - tx_offload_mask.l2_len = ~0; - tx_offload_mask.l3_len = ~0; - tx_offload_mask.l4_len = ~0; + tx_offload_mask.l2_len = offload_allones.l2_len; + tx_offload_mask.l3_len = offload_allones.l3_len; + tx_offload_mask.l4_len = offload_allones.l4_len; break; case PKT_TX_SCTP_CKSUM: type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_L4T_SCTP | IXGBE_ADVTXD_DTYP_CTXT | IXGBE_ADVTXD_DCMD_DEXT; mss_l4len_idx |= sizeof(struct sctp_hdr) << IXGBE_ADVTXD_L4LEN_SHIFT; - tx_offload_mask.l2_len = ~0; - tx_offload_mask.l3_len = ~0; + tx_offload_mask.l2_len = offload_allones.l2_len; + tx_offload_mask.l3_len = offload_allones.l3_len; break; default: type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_L4T_RSV |