The security library is specified as explicit dependency for ixgbe, so there is no more need to gate features behind #ifdef blocks that depend on presence of this library.
Signed-off-by: Anatoly Burakov <[email protected]> --- drivers/net/intel/ixgbe/ixgbe_ethdev.c | 8 ------ drivers/net/intel/ixgbe/ixgbe_ethdev.h | 4 --- drivers/net/intel/ixgbe/ixgbe_flow.c | 6 ----- drivers/net/intel/ixgbe/ixgbe_rxtx.c | 26 -------------------- drivers/net/intel/ixgbe/ixgbe_rxtx.h | 2 -- drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c | 6 ----- 6 files changed, 52 deletions(-) diff --git a/drivers/net/intel/ixgbe/ixgbe_ethdev.c b/drivers/net/intel/ixgbe/ixgbe_ethdev.c index 11500a923c..57d929cf2c 100644 --- a/drivers/net/intel/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/intel/ixgbe/ixgbe_ethdev.c @@ -32,9 +32,7 @@ #include <rte_random.h> #include <dev_driver.h> #include <rte_hash_crc.h> -#ifdef RTE_LIB_SECURITY #include <rte_security_driver.h> -#endif #include <rte_os_shim.h> #include "ixgbe_logs.h" @@ -1177,11 +1175,9 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused) /* Unlock any pending hardware semaphore */ ixgbe_swfw_lock_reset(hw); -#ifdef RTE_LIB_SECURITY /* Initialize security_ctx only for primary process*/ if (ixgbe_ipsec_ctx_create(eth_dev)) return -ENOMEM; -#endif /* Initialize DCB configuration*/ memset(dcb_config, 0, sizeof(struct ixgbe_dcb_config)); @@ -1362,10 +1358,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused) rte_free(eth_dev->data->hash_mac_addrs); eth_dev->data->hash_mac_addrs = NULL; err_exit: -#ifdef RTE_LIB_SECURITY rte_free(eth_dev->security_ctx); eth_dev->security_ctx = NULL; -#endif return ret; } @@ -3148,10 +3142,8 @@ ixgbe_dev_close(struct rte_eth_dev *dev) /* Remove all Traffic Manager configuration */ ixgbe_tm_conf_uninit(dev); -#ifdef RTE_LIB_SECURITY rte_free(dev->security_ctx); dev->security_ctx = NULL; -#endif return ret; } diff --git a/drivers/net/intel/ixgbe/ixgbe_ethdev.h b/drivers/net/intel/ixgbe/ixgbe_ethdev.h index 55b121b15d..877fce697b 100644 --- a/drivers/net/intel/ixgbe/ixgbe_ethdev.h +++ b/drivers/net/intel/ixgbe/ixgbe_ethdev.h @@ -14,9 +14,7 @@ #include "base/ixgbe_dcb_82599.h" #include "base/ixgbe_dcb_82598.h" #include "ixgbe_bypass.h" -#ifdef RTE_LIB_SECURITY #include "ixgbe_ipsec.h" -#endif #include <rte_flow.h> #include <rte_time.h> #include <rte_hash.h> @@ -478,9 +476,7 @@ struct ixgbe_adapter { struct ixgbe_filter_info filter; struct ixgbe_l2_tn_info l2_tn; struct ixgbe_bw_conf bw_conf; -#ifdef RTE_LIB_SECURITY struct ixgbe_ipsec ipsec; -#endif bool rx_bulk_alloc_allowed; bool rx_vec_allowed; struct rte_timecounter systime_tc; diff --git a/drivers/net/intel/ixgbe/ixgbe_flow.c b/drivers/net/intel/ixgbe/ixgbe_flow.c index a1245bb906..e7521a4b1f 100644 --- a/drivers/net/intel/ixgbe/ixgbe_flow.c +++ b/drivers/net/intel/ixgbe/ixgbe_flow.c @@ -214,7 +214,6 @@ cons_parse_ntuple_filter(const struct rte_flow_attr *attr, memset(ð_null, 0, sizeof(struct rte_flow_item_eth)); memset(&vlan_null, 0, sizeof(struct rte_flow_item_vlan)); -#ifdef RTE_LIB_SECURITY /** * Special case for flow action type RTE_FLOW_ACTION_TYPE_SECURITY */ @@ -249,7 +248,6 @@ cons_parse_ntuple_filter(const struct rte_flow_attr *attr, return ixgbe_crypto_add_ingress_sa_from_flow(conf, item->spec, item->type == RTE_FLOW_ITEM_TYPE_IPV6); } -#endif /* the first not void item can be MAC or IPv4 */ item = next_no_void_pattern(pattern, NULL); @@ -630,11 +628,9 @@ ixgbe_parse_ntuple_filter(struct rte_eth_dev *dev, if (ret) return ret; -#ifdef RTE_LIB_SECURITY /* ESP flow not really a flow*/ if (filter->proto == IPPROTO_ESP) return 0; -#endif /* Ixgbe doesn't support tcp flags. */ if (filter->flags & RTE_NTUPLE_FLAGS_TCP_FLAG) { @@ -3074,11 +3070,9 @@ ixgbe_flow_create(struct rte_eth_dev *dev, ret = ixgbe_parse_ntuple_filter(dev, attr, pattern, actions, &ntuple_filter, error); -#ifdef RTE_LIB_SECURITY /* ESP flow not really a flow*/ if (ntuple_filter.proto == IPPROTO_ESP) return flow; -#endif if (!ret) { ret = ixgbe_add_del_ntuple_filter(dev, &ntuple_filter, TRUE); diff --git a/drivers/net/intel/ixgbe/ixgbe_rxtx.c b/drivers/net/intel/ixgbe/ixgbe_rxtx.c index 2857c19355..71deda9ed6 100644 --- a/drivers/net/intel/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/intel/ixgbe/ixgbe_rxtx.c @@ -459,7 +459,6 @@ ixgbe_set_xmit_ctx(struct ci_tx_queue *txq, seqnum_seed |= tx_offload.l2_len << IXGBE_ADVTXD_TUNNEL_LEN; } -#ifdef RTE_LIB_SECURITY if (ol_flags & RTE_MBUF_F_TX_SEC_OFFLOAD) { union ixgbe_crypto_tx_desc_md *md = (union ixgbe_crypto_tx_desc_md *)mdata; @@ -473,7 +472,6 @@ ixgbe_set_xmit_ctx(struct ci_tx_queue *txq, tx_offload_mask.sa_idx |= ~0; tx_offload_mask.sec_pad_len |= ~0; } -#endif txq->ctx_cache[ctx_idx].flags = ol_flags; txq->ctx_cache[ctx_idx].tx_offload.data[0] = @@ -652,9 +650,7 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint32_t ctx = 0; uint32_t new_ctx; union ixgbe_tx_offload tx_offload; -#ifdef RTE_LIB_SECURITY uint8_t use_ipsec; -#endif tx_offload.data[0] = 0; tx_offload.data[1] = 0; @@ -682,9 +678,7 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, * are needed for offload functionality. */ ol_flags = tx_pkt->ol_flags; -#ifdef RTE_LIB_SECURITY use_ipsec = txq->using_ipsec && (ol_flags & RTE_MBUF_F_TX_SEC_OFFLOAD); -#endif /* If hardware offload required */ tx_ol_req = ol_flags & IXGBE_TX_OFFLOAD_MASK; @@ -696,7 +690,6 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, tx_offload.tso_segsz = tx_pkt->tso_segsz; tx_offload.outer_l2_len = tx_pkt->outer_l2_len; tx_offload.outer_l3_len = tx_pkt->outer_l3_len; -#ifdef RTE_LIB_SECURITY if (use_ipsec) { union ixgbe_crypto_tx_desc_md *ipsec_mdata = (union ixgbe_crypto_tx_desc_md *) @@ -704,7 +697,6 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, tx_offload.sa_idx = ipsec_mdata->sa_idx; tx_offload.sec_pad_len = ipsec_mdata->pad_len; } -#endif /* If new context need be built or reuse the exist ctx. */ ctx = what_advctx_update(txq, tx_ol_req, @@ -896,10 +888,8 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, olinfo_status |= ctx << IXGBE_ADVTXD_IDX_SHIFT; } olinfo_status |= (pkt_len << IXGBE_ADVTXD_PAYLEN_SHIFT); -#ifdef RTE_LIB_SECURITY if (use_ipsec) olinfo_status |= IXGBE_ADVTXD_POPTS_IPSEC; -#endif m_seg = tx_pkt; do { @@ -1523,13 +1513,11 @@ rx_desc_error_to_pkt_flags(uint32_t rx_status, uint16_t pkt_info, pkt_flags |= RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD; } -#ifdef RTE_LIB_SECURITY if (rx_status & IXGBE_RXD_STAT_SECP) { pkt_flags |= RTE_MBUF_F_RX_SEC_OFFLOAD; if (rx_status & IXGBE_RXDADV_LNKSEC_ERROR_BAD_SIG) pkt_flags |= RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED; } -#endif return pkt_flags; } @@ -2490,9 +2478,7 @@ ixgbe_dev_tx_done_cleanup(void *tx_queue, uint32_t free_cnt) { struct ci_tx_queue *txq = (struct ci_tx_queue *)tx_queue; if (txq->offloads == 0 && -#ifdef RTE_LIB_SECURITY !(txq->using_ipsec) && -#endif txq->tx_rs_thresh >= IXGBE_TX_MAX_BURST) { if (txq->tx_rs_thresh <= IXGBE_TX_MAX_FREE_BUF_SZ && rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128 && @@ -2648,9 +2634,7 @@ ixgbe_set_tx_function(struct rte_eth_dev *dev, struct ci_tx_queue *txq) { /* Use a simple Tx queue (no offloads, no multi segs) if possible */ if ((txq->offloads == 0) && -#ifdef RTE_LIB_SECURITY !(txq->using_ipsec) && -#endif (txq->tx_rs_thresh >= IXGBE_TX_MAX_BURST)) { PMD_INIT_LOG(DEBUG, "Using simple tx code path"); dev->tx_pkt_prepare = rte_eth_tx_pkt_prepare_dummy; @@ -2711,10 +2695,8 @@ ixgbe_get_tx_port_offloads(struct rte_eth_dev *dev) hw->mac.type == ixgbe_mac_E610) tx_offload_capa |= RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM; -#ifdef RTE_LIB_SECURITY if (dev->security_ctx) tx_offload_capa |= RTE_ETH_TX_OFFLOAD_SECURITY; -#endif return tx_offload_capa; } @@ -2884,10 +2866,8 @@ ixgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, txq->offloads = offloads; txq->ops = &def_txq_ops; txq->tx_deferred_start = tx_conf->tx_deferred_start; -#ifdef RTE_LIB_SECURITY txq->using_ipsec = !!(dev->data->dev_conf.txmode.offloads & RTE_ETH_TX_OFFLOAD_SECURITY); -#endif /* * Modification to set VFTDT for virtual function if vf is detected @@ -3171,10 +3151,8 @@ ixgbe_get_rx_port_offloads(struct rte_eth_dev *dev) hw->mac.type == ixgbe_mac_E610) offloads |= RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM; -#ifdef RTE_LIB_SECURITY if (dev->security_ctx) offloads |= RTE_ETH_RX_OFFLOAD_SECURITY; -#endif return offloads; } @@ -5102,10 +5080,8 @@ ixgbe_set_rx_function(struct rte_eth_dev *dev) struct ci_rx_queue *rxq = dev->data->rx_queues[i]; rxq->vector_rx = rx_using_sse; -#ifdef RTE_LIB_SECURITY rxq->using_ipsec = !!(dev->data->dev_conf.rxmode.offloads & RTE_ETH_RX_OFFLOAD_SECURITY); -#endif } } @@ -5611,7 +5587,6 @@ ixgbe_dev_rxtx_start(struct rte_eth_dev *dev) ixgbe_setup_loopback_link_x540_x550(hw, true); } -#ifdef RTE_LIB_SECURITY if ((dev->data->dev_conf.rxmode.offloads & RTE_ETH_RX_OFFLOAD_SECURITY) || (dev->data->dev_conf.txmode.offloads & @@ -5624,7 +5599,6 @@ ixgbe_dev_rxtx_start(struct rte_eth_dev *dev) return ret; } } -#endif return 0; } diff --git a/drivers/net/intel/ixgbe/ixgbe_rxtx.h b/drivers/net/intel/ixgbe/ixgbe_rxtx.h index 7950e56ee4..33023a3580 100644 --- a/drivers/net/intel/ixgbe/ixgbe_rxtx.h +++ b/drivers/net/intel/ixgbe/ixgbe_rxtx.h @@ -99,11 +99,9 @@ union ixgbe_tx_offload { /* fields for TX offloading of tunnels */ uint64_t outer_l3_len:8; /**< Outer L3 (IP) Hdr Length. */ uint64_t outer_l2_len:8; /**< Outer L2 (MAC) Hdr Length. */ -#ifdef RTE_LIB_SECURITY /* inline ipsec related*/ uint64_t sa_idx:8; /**< TX SA database entry index */ uint64_t sec_pad_len:4; /**< padding length */ -#endif }; }; diff --git a/drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c b/drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c index dca3a20ca0..3f37038e5c 100644 --- a/drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c +++ b/drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c @@ -21,7 +21,6 @@ ixgbe_rxq_rearm(struct ci_rx_queue *rxq) ci_rxq_rearm(rxq, CI_RX_VEC_LEVEL_SSE); } -#ifdef RTE_LIB_SECURITY static inline void desc_to_olflags_v_ipsec(__m128i descs[4], struct rte_mbuf **rx_pkts) { @@ -56,7 +55,6 @@ desc_to_olflags_v_ipsec(__m128i descs[4], struct rte_mbuf **rx_pkts) *rearm2 = _mm_extract_epi32(rearm, 2); *rearm3 = _mm_extract_epi32(rearm, 3); } -#endif static inline void desc_to_olflags_v(__m128i descs[4], __m128i mbuf_init, uint8_t vlan_flags, @@ -265,9 +263,7 @@ _recv_raw_pkts_vec(struct ci_rx_queue *rxq, struct rte_mbuf **rx_pkts, volatile union ixgbe_adv_rx_desc *rxdp; struct ci_rx_entry *sw_ring; uint16_t nb_pkts_recd; -#ifdef RTE_LIB_SECURITY uint8_t use_ipsec = rxq->using_ipsec; -#endif int pos; uint64_t var; __m128i shuf_msk; @@ -444,10 +440,8 @@ _recv_raw_pkts_vec(struct ci_rx_queue *rxq, struct rte_mbuf **rx_pkts, desc_to_olflags_v(descs, mbuf_init, vlan_flags, udp_p_flag, &rx_pkts[pos]); -#ifdef RTE_LIB_SECURITY if (unlikely(use_ipsec)) desc_to_olflags_v_ipsec(descs, &rx_pkts[pos]); -#endif /* D.2 pkt 3,4 set in_port/nb_seg and remove crc */ pkt_mb4 = _mm_add_epi16(pkt_mb4, crc_adjust); -- 2.47.3
