Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/102665 _apply patch failure_ Submitter: Ferruh Yigit Date: Friday, October 22 2021 12:57:15 Applied on: CommitID:3ac2dffae88e8eb5c374b1fdd40d605014526510 Apply patch set 102665-102666 failed: Checking patch doc/guides/nics/features.rst... error: while searching for: * **[related] API**: ``rte_eth_dev_set_mtu()``, ``rte_eth_dev_get_mtu()``. .. _nic_features_jumbo_frame: Jumbo frame ----------- Supports Rx jumbo frames. * **[uses] rte_eth_rxconf,rte_eth_rxmode**: ``dev_conf.rxmode.mtu``. * **[related] rte_eth_dev_info**: ``max_rx_pktlen``. * **[related] API**: ``rte_eth_dev_set_mtu()``. .. _nic_features_scattered_rx: Scattered Rx error: patch failed: doc/guides/nics/features.rst:158 Checking patch doc/guides/nics/features/ark.ini... Checking patch doc/guides/nics/features/atlantic.ini... Checking patch doc/guides/nics/features/avp.ini... Checking patch doc/guides/nics/features/axgbe.ini... Checking patch doc/guides/nics/features/bnxt.ini... Checking patch doc/guides/nics/features/cnxk.ini... Checking patch doc/guides/nics/features/cnxk_vec.ini... Checking patch doc/guides/nics/features/cnxk_vf.ini... Checking patch doc/guides/nics/features/cxgbe.ini... Checking patch doc/guides/nics/features/cxgbevf.ini... Checking patch doc/guides/nics/features/default.ini... Hunk #1 succeeded at 22 (offset -1 lines). Checking patch doc/guides/nics/features/dpaa.ini... Checking patch doc/guides/nics/features/dpaa2.ini... Checking patch doc/guides/nics/features/e1000.ini... Checking patch doc/guides/nics/features/ena.ini... Checking patch doc/guides/nics/features/enetc.ini... Checking patch doc/guides/nics/features/enic.ini... Checking patch doc/guides/nics/features/failsafe.ini... Checking patch doc/guides/nics/features/fm10k.ini... Checking patch doc/guides/nics/features/fm10k_vf.ini... Checking patch doc/guides/nics/features/hinic.ini... Checking patch doc/guides/nics/features/hns3.ini... Checking patch doc/guides/nics/features/hns3_vf.ini... Checking patch doc/guides/nics/features/i40e.ini... Checking patch doc/guides/nics/features/iavf.ini... Checking patch doc/guides/nics/features/ice.ini... Checking patch doc/guides/nics/features/ice_dcf.ini... Checking patch doc/guides/nics/features/igb.ini... Checking patch doc/guides/nics/features/igc.ini... Checking patch doc/guides/nics/features/ionic.ini... Checking patch doc/guides/nics/features/ipn3ke.ini... Checking patch doc/guides/nics/features/ixgbe.ini... Checking patch doc/guides/nics/features/ixgbe_vf.ini... Checking patch doc/guides/nics/features/liquidio.ini... Checking patch doc/guides/nics/features/memif.ini... Checking patch doc/guides/nics/features/mlx4.ini... Checking patch doc/guides/nics/features/mlx5.ini... Checking patch doc/guides/nics/features/mvneta.ini... Checking patch doc/guides/nics/features/mvpp2.ini... Checking patch doc/guides/nics/features/nfp.ini... Checking patch doc/guides/nics/features/octeontx.ini... Checking patch doc/guides/nics/features/octeontx2.ini... Checking patch doc/guides/nics/features/octeontx2_vec.ini... Checking patch doc/guides/nics/features/octeontx2_vf.ini... Checking patch doc/guides/nics/features/pcap.ini... Checking patch doc/guides/nics/features/qede.ini... Checking patch doc/guides/nics/features/qede_vf.ini... Checking patch doc/guides/nics/features/sfc.ini... Checking patch doc/guides/nics/features/thunderx.ini... Checking patch doc/guides/nics/features/txgbe.ini... Checking patch doc/guides/nics/features/txgbe_vf.ini... Checking patch doc/guides/nics/features/vmxnet3.ini... Applying patch doc/guides/nics/features.rst with 1 reject... Rejected hunk #1. Applied patch doc/guides/nics/features/ark.ini cleanly. Applied patch doc/guides/nics/features/atlantic.ini cleanly. Applied patch doc/guides/nics/features/avp.ini cleanly. Applied patch doc/guides/nics/features/axgbe.ini cleanly. Applied patch doc/guides/nics/features/bnxt.ini cleanly. Applied patch doc/guides/nics/features/cnxk.ini cleanly. Applied patch doc/guides/nics/features/cnxk_vec.ini cleanly. Applied patch doc/guides/nics/features/cnxk_vf.ini cleanly. Applied patch doc/guides/nics/features/cxgbe.ini cleanly. Applied patch doc/guides/nics/features/cxgbevf.ini cleanly. Applied patch doc/guides/nics/features/default.ini cleanly. Applied patch doc/guides/nics/features/dpaa.ini cleanly. Applied patch doc/guides/nics/features/dpaa2.ini cleanly. Applied patch doc/guides/nics/features/e1000.ini cleanly. Applied patch doc/guides/nics/features/ena.ini cleanly. Applied patch doc/guides/nics/features/enetc.ini cleanly. Applied patch doc/guides/nics/features/enic.ini cleanly. Applied patch doc/guides/nics/features/failsafe.ini cleanly. Applied patch doc/guides/nics/features/fm10k.ini cleanly. Applied patch doc/guides/nics/features/fm10k_vf.ini cleanly. Applied patch doc/guides/nics/features/hinic.ini cleanly. Applied patch doc/guides/nics/features/hns3.ini cleanly. Applied patch doc/guides/nics/features/hns3_vf.ini cleanly. Applied patch doc/guides/nics/features/i40e.ini cleanly. Applied patch doc/guides/nics/features/iavf.ini cleanly. Applied patch doc/guides/nics/features/ice.ini cleanly. Applied patch doc/guides/nics/features/ice_dcf.ini cleanly. Applied patch doc/guides/nics/features/igb.ini cleanly. Applied patch doc/guides/nics/features/igc.ini cleanly. Applied patch doc/guides/nics/features/ionic.ini cleanly. Applied patch doc/guides/nics/features/ipn3ke.ini cleanly. Applied patch doc/guides/nics/features/ixgbe.ini cleanly. Applied patch doc/guides/nics/features/ixgbe_vf.ini cleanly. Applied patch doc/guides/nics/features/liquidio.ini cleanly. Applied patch doc/guides/nics/features/memif.ini cleanly. Applied patch doc/guides/nics/features/mlx4.ini cleanly. Applied patch doc/guides/nics/features/mlx5.ini cleanly. Applied patch doc/guides/nics/features/mvneta.ini cleanly. Applied patch doc/guides/nics/features/mvpp2.ini cleanly. Applied patch doc/guides/nics/features/nfp.ini cleanly. Applied patch doc/guides/nics/features/octeontx.ini cleanly. Applied patch doc/guides/nics/features/octeontx2.ini cleanly. Applied patch doc/guides/nics/features/octeontx2_vec.ini cleanly. Applied patch doc/guides/nics/features/octeontx2_vf.ini cleanly. Applied patch doc/guides/nics/features/pcap.ini cleanly. Applied patch doc/guides/nics/features/qede.ini cleanly. Applied patch doc/guides/nics/features/qede_vf.ini cleanly. Applied patch doc/guides/nics/features/sfc.ini cleanly. Applied patch doc/guides/nics/features/thunderx.ini cleanly. Applied patch doc/guides/nics/features/txgbe.ini cleanly. Applied patch doc/guides/nics/features/txgbe_vf.ini cleanly. Applied patch doc/guides/nics/features/vmxnet3.ini cleanly. diff a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst (rejected hunks) @@ -158,18 +158,6 @@ Supports updating port MTU. * **[related] API**: ``rte_eth_dev_set_mtu()``, ``rte_eth_dev_get_mtu()``. -.. _nic_features_jumbo_frame: - -Jumbo frame ------------ - -Supports Rx jumbo frames. - -* **[uses] rte_eth_rxconf,rte_eth_rxmode**: ``dev_conf.rxmode.mtu``. -* **[related] rte_eth_dev_info**: ``max_rx_pktlen``. -* **[related] API**: ``rte_eth_dev_set_mtu()``. - - .. _nic_features_scattered_rx: Scattered Rx Checking patch drivers/net/e1000/igb_rxtx.c... error: while searching for: * Configure support of jumbo frames, if any. */ max_len = dev->data->mtu + E1000_ETH_OVERHEAD; if ((dev->data->mtu & RTE_ETHER_MTU) != 0) { rctl |= E1000_RCTL_LPE; /* error: patch failed: drivers/net/e1000/igb_rxtx.c:2331 Checking patch drivers/net/i40e/i40e_rxtx.c... error: while searching for: rxq->max_pkt_len = RTE_MIN(hw->func_caps.rx_buf_chain_len * rxq->rx_buf_len, data->mtu + I40E_ETH_OVERHEAD); if (data->mtu > RTE_ETHER_MTU) { if (rxq->max_pkt_len <= I40E_ETH_MAX_LEN || rxq->max_pkt_len > I40E_FRAME_SIZE_MAX) { PMD_DRV_LOG(ERR, "maximum packet length must " "be larger than %u and smaller than %u," "as jumbo frame is enabled", (uint32_t)I40E_ETH_MAX_LEN, (uint32_t)I40E_FRAME_SIZE_MAX); return I40E_ERR_CONFIG; } } else { if (rxq->max_pkt_len < RTE_ETHER_MIN_LEN || rxq->max_pkt_len > I40E_ETH_MAX_LEN) { PMD_DRV_LOG(ERR, "maximum packet length must be " "larger than %u and smaller than %u, " "as jumbo frame is disabled", (uint32_t)RTE_ETHER_MIN_LEN, (uint32_t)I40E_ETH_MAX_LEN); return I40E_ERR_CONFIG; } } return 0; error: patch failed: drivers/net/i40e/i40e_rxtx.c:2901 Checking patch drivers/net/iavf/iavf_ethdev.c... error: while searching for: rxq->rx_buf_len * IAVF_MAX_CHAINED_RX_BUFFERS, frame_size); /* Check if the jumbo frame and maximum packet length are set * correctly. */ if (dev->data->mtu & RTE_ETHER_MTU) { if (max_pkt_len <= IAVF_ETH_MAX_LEN || max_pkt_len > IAVF_FRAME_SIZE_MAX) { PMD_DRV_LOG(ERR, "maximum packet length must be " "larger than %u and smaller than %u, " "as jumbo frame is enabled", (uint32_t)IAVF_ETH_MAX_LEN, (uint32_t)IAVF_FRAME_SIZE_MAX); return -EINVAL; } } else { if (max_pkt_len < RTE_ETHER_MIN_LEN || max_pkt_len > IAVF_ETH_MAX_LEN) { PMD_DRV_LOG(ERR, "maximum packet length must be " "larger than %u and smaller than %u, " "as jumbo frame is disabled", (uint32_t)RTE_ETHER_MIN_LEN, (uint32_t)IAVF_ETH_MAX_LEN); return -EINVAL; } } rxq->max_pkt_len = max_pkt_len; error: patch failed: drivers/net/iavf/iavf_ethdev.c:585 Checking patch drivers/net/ice/ice_dcf_ethdev.c... error: while searching for: max_pkt_len = RTE_MIN(ICE_SUPPORT_CHAIN_NUM * rxq->rx_buf_len, dev->data->mtu + ICE_ETH_OVERHEAD); /* Check if the jumbo frame and maximum packet length are set * correctly. */ if (dev_data->mtu > RTE_ETHER_MTU) { if (max_pkt_len <= ICE_ETH_MAX_LEN || max_pkt_len > ICE_FRAME_SIZE_MAX) { PMD_DRV_LOG(ERR, "maximum packet length must be " "larger than %u and smaller than %u, " "as jumbo frame is enabled", (uint32_t)ICE_ETH_MAX_LEN, (uint32_t)ICE_FRAME_SIZE_MAX); return -EINVAL; } } else { if (max_pkt_len < RTE_ETHER_MIN_LEN || max_pkt_len > ICE_ETH_MAX_LEN) { PMD_DRV_LOG(ERR, "maximum packet length must be " "larger than %u and smaller than %u, " "as jumbo frame is disabled", (uint32_t)RTE_ETHER_MIN_LEN, (uint32_t)ICE_ETH_MAX_LEN); return -EINVAL; } } rxq->max_pkt_len = max_pkt_len; error: patch failed: drivers/net/ice/ice_dcf_ethdev.c:69 Checking patch drivers/net/ice/ice_rxtx.c... error: while searching for: RTE_MIN((uint32_t)ICE_SUPPORT_CHAIN_NUM * rxq->rx_buf_len, frame_size); if (dev_data->mtu > RTE_ETHER_MTU) { if (rxq->max_pkt_len <= ICE_ETH_MAX_LEN || rxq->max_pkt_len > ICE_FRAME_SIZE_MAX) { PMD_DRV_LOG(ERR, "maximum packet length must " "be larger than %u and smaller than %u," "as jumbo frame is enabled", (uint32_t)ICE_ETH_MAX_LEN, (uint32_t)ICE_FRAME_SIZE_MAX); return -EINVAL; } } else { if (rxq->max_pkt_len < RTE_ETHER_MIN_LEN || rxq->max_pkt_len > ICE_ETH_MAX_LEN) { PMD_DRV_LOG(ERR, "maximum packet length must be " "larger than %u and smaller than %u, " "as jumbo frame is disabled", (uint32_t)RTE_ETHER_MIN_LEN, (uint32_t)ICE_ETH_MAX_LEN); return -EINVAL; } } if (rxq->offloads & DEV_RX_OFFLOAD_TIMESTAMP) { error: patch failed: drivers/net/ice/ice_rxtx.c:281 Checking patch drivers/net/igc/igc_txrx.c... error: while searching for: IGC_WRITE_REG(hw, IGC_RCTL, rctl & ~IGC_RCTL_EN); /* Configure support of jumbo frames, if any. */ if (dev->data->mtu & RTE_ETHER_MTU) rctl |= IGC_RCTL_LPE; else rctl &= ~IGC_RCTL_LPE; error: patch failed: drivers/net/igc/igc_txrx.c:1080 Checking patch drivers/net/ixgbe/ixgbe_rxtx.c... error: while searching for: /* * Configure jumbo frame support, if any. */ if ((dev->data->mtu & RTE_ETHER_MTU) != 0) { hlreg0 |= IXGBE_HLREG0_JUMBOEN; maxfrs = IXGBE_READ_REG(hw, IXGBE_MAXFRS); maxfrs &= 0x0000FFFF; error: patch failed: drivers/net/ixgbe/ixgbe_rxtx.c:5078 Applying patch drivers/net/e1000/igb_rxtx.c with 1 reject... Rejected hunk #1. Applying patch drivers/net/i40e/i40e_rxtx.c with 1 reject... Rejected hunk #1. Applying patch drivers/net/iavf/iavf_ethdev.c with 1 reject... Rejected hunk #1. Applying patch drivers/net/ice/ice_dcf_ethdev.c with 1 reject... Rejected hunk #1. Applying patch drivers/net/ice/ice_rxtx.c with 1 reject... Rejected hunk #1. Applying patch drivers/net/igc/igc_txrx.c with 1 reject... Rejected hunk #1. Applying patch drivers/net/ixgbe/ixgbe_rxtx.c with 1 reject... Rejected hunk #1. diff a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c (rejected hunks) @@ -2331,7 +2331,7 @@ eth_igb_rx_init(struct rte_eth_dev *dev) * Configure support of jumbo frames, if any. */ max_len = dev->data->mtu + E1000_ETH_OVERHEAD; - if ((dev->data->mtu & RTE_ETHER_MTU) != 0) { + if (dev->data->mtu > RTE_ETHER_MTU) { rctl |= E1000_RCTL_LPE; /* diff a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c (rejected hunks) @@ -2901,26 +2901,13 @@ i40e_rx_queue_config(struct i40e_rx_queue *rxq) rxq->max_pkt_len = RTE_MIN(hw->func_caps.rx_buf_chain_len * rxq->rx_buf_len, data->mtu + I40E_ETH_OVERHEAD); - if (data->mtu > RTE_ETHER_MTU) { - if (rxq->max_pkt_len <= I40E_ETH_MAX_LEN || - rxq->max_pkt_len > I40E_FRAME_SIZE_MAX) { - PMD_DRV_LOG(ERR, "maximum packet length must " - "be larger than %u and smaller than %u," - "as jumbo frame is enabled", - (uint32_t)I40E_ETH_MAX_LEN, - (uint32_t)I40E_FRAME_SIZE_MAX); - return I40E_ERR_CONFIG; - } - } else { - if (rxq->max_pkt_len < RTE_ETHER_MIN_LEN || - rxq->max_pkt_len > I40E_ETH_MAX_LEN) { - PMD_DRV_LOG(ERR, "maximum packet length must be " - "larger than %u and smaller than %u, " - "as jumbo frame is disabled", - (uint32_t)RTE_ETHER_MIN_LEN, - (uint32_t)I40E_ETH_MAX_LEN); - return I40E_ERR_CONFIG; - } + if (rxq->max_pkt_len < RTE_ETHER_MIN_LEN || + rxq->max_pkt_len > I40E_FRAME_SIZE_MAX) { + PMD_DRV_LOG(ERR, "maximum packet length must be " + "larger than %u and smaller than %u", + (uint32_t)RTE_ETHER_MIN_LEN, + (uint32_t)I40E_FRAME_SIZE_MAX); + return I40E_ERR_CONFIG; } return 0; diff a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c (rejected hunks) @@ -585,29 +585,14 @@ iavf_init_rxq(struct rte_eth_dev *dev, struct iavf_rx_queue *rxq) rxq->rx_buf_len * IAVF_MAX_CHAINED_RX_BUFFERS, frame_size); - /* Check if the jumbo frame and maximum packet length are set - * correctly. - */ - if (dev->data->mtu & RTE_ETHER_MTU) { - if (max_pkt_len <= IAVF_ETH_MAX_LEN || - max_pkt_len > IAVF_FRAME_SIZE_MAX) { - PMD_DRV_LOG(ERR, "maximum packet length must be " - "larger than %u and smaller than %u, " - "as jumbo frame is enabled", - (uint32_t)IAVF_ETH_MAX_LEN, - (uint32_t)IAVF_FRAME_SIZE_MAX); - return -EINVAL; - } - } else { - if (max_pkt_len < RTE_ETHER_MIN_LEN || - max_pkt_len > IAVF_ETH_MAX_LEN) { - PMD_DRV_LOG(ERR, "maximum packet length must be " - "larger than %u and smaller than %u, " - "as jumbo frame is disabled", - (uint32_t)RTE_ETHER_MIN_LEN, - (uint32_t)IAVF_ETH_MAX_LEN); - return -EINVAL; - } + /* Check if maximum packet length is set correctly. */ + if (max_pkt_len <= RTE_ETHER_MIN_LEN || + max_pkt_len > IAVF_FRAME_SIZE_MAX) { + PMD_DRV_LOG(ERR, "maximum packet length must be " + "larger than %u and smaller than %u", + (uint32_t)IAVF_ETH_MAX_LEN, + (uint32_t)IAVF_FRAME_SIZE_MAX); + return -EINVAL; } rxq->max_pkt_len = max_pkt_len; diff a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c (rejected hunks) @@ -69,29 +69,14 @@ ice_dcf_init_rxq(struct rte_eth_dev *dev, struct ice_rx_queue *rxq) max_pkt_len = RTE_MIN(ICE_SUPPORT_CHAIN_NUM * rxq->rx_buf_len, dev->data->mtu + ICE_ETH_OVERHEAD); - /* Check if the jumbo frame and maximum packet length are set - * correctly. - */ - if (dev_data->mtu > RTE_ETHER_MTU) { - if (max_pkt_len <= ICE_ETH_MAX_LEN || - max_pkt_len > ICE_FRAME_SIZE_MAX) { - PMD_DRV_LOG(ERR, "maximum packet length must be " - "larger than %u and smaller than %u, " - "as jumbo frame is enabled", - (uint32_t)ICE_ETH_MAX_LEN, - (uint32_t)ICE_FRAME_SIZE_MAX); - return -EINVAL; - } - } else { - if (max_pkt_len < RTE_ETHER_MIN_LEN || - max_pkt_len > ICE_ETH_MAX_LEN) { - PMD_DRV_LOG(ERR, "maximum packet length must be " - "larger than %u and smaller than %u, " - "as jumbo frame is disabled", - (uint32_t)RTE_ETHER_MIN_LEN, - (uint32_t)ICE_ETH_MAX_LEN); - return -EINVAL; - } + /* Check maximum packet length is set correctly. */ + if (max_pkt_len <= RTE_ETHER_MIN_LEN || + max_pkt_len > ICE_FRAME_SIZE_MAX) { + PMD_DRV_LOG(ERR, "maximum packet length must be " + "larger than %u and smaller than %u", + (uint32_t)RTE_ETHER_MIN_LEN, + (uint32_t)ICE_FRAME_SIZE_MAX); + return -EINVAL; } rxq->max_pkt_len = max_pkt_len; diff a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c (rejected hunks) @@ -281,26 +281,13 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq) RTE_MIN((uint32_t)ICE_SUPPORT_CHAIN_NUM * rxq->rx_buf_len, frame_size); - if (dev_data->mtu > RTE_ETHER_MTU) { - if (rxq->max_pkt_len <= ICE_ETH_MAX_LEN || - rxq->max_pkt_len > ICE_FRAME_SIZE_MAX) { - PMD_DRV_LOG(ERR, "maximum packet length must " - "be larger than %u and smaller than %u," - "as jumbo frame is enabled", - (uint32_t)ICE_ETH_MAX_LEN, - (uint32_t)ICE_FRAME_SIZE_MAX); - return -EINVAL; - } - } else { - if (rxq->max_pkt_len < RTE_ETHER_MIN_LEN || - rxq->max_pkt_len > ICE_ETH_MAX_LEN) { - PMD_DRV_LOG(ERR, "maximum packet length must be " - "larger than %u and smaller than %u, " - "as jumbo frame is disabled", - (uint32_t)RTE_ETHER_MIN_LEN, - (uint32_t)ICE_ETH_MAX_LEN); - return -EINVAL; - } + if (rxq->max_pkt_len <= RTE_ETHER_MIN_LEN || + rxq->max_pkt_len > ICE_FRAME_SIZE_MAX) { + PMD_DRV_LOG(ERR, "maximum packet length must " + "be larger than %u and smaller than %u", + (uint32_t)RTE_ETHER_MIN_LEN, + (uint32_t)ICE_FRAME_SIZE_MAX); + return -EINVAL; } if (rxq->offloads & DEV_RX_OFFLOAD_TIMESTAMP) { diff a/drivers/net/igc/igc_txrx.c b/drivers/net/igc/igc_txrx.c (rejected hunks) @@ -1080,7 +1080,7 @@ igc_rx_init(struct rte_eth_dev *dev) IGC_WRITE_REG(hw, IGC_RCTL, rctl & ~IGC_RCTL_EN); /* Configure support of jumbo frames, if any. */ - if (dev->data->mtu & RTE_ETHER_MTU) + if (dev->data->mtu > RTE_ETHER_MTU) rctl |= IGC_RCTL_LPE; else rctl &= ~IGC_RCTL_LPE; diff a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c (rejected hunks) @@ -5078,7 +5078,7 @@ ixgbe_dev_rx_init(struct rte_eth_dev *dev) /* * Configure jumbo frame support, if any. */ - if ((dev->data->mtu & RTE_ETHER_MTU) != 0) { + if (dev->data->mtu > RTE_ETHER_MTU) { hlreg0 |= IXGBE_HLREG0_JUMBOEN; maxfrs = IXGBE_READ_REG(hw, IXGBE_MAXFRS); maxfrs &= 0x0000FFFF; https://lab.dpdk.org/results/dashboard/patchsets/19654/ UNH-IOL DPDK Community Lab