diff mbox

[dpdk-dev,v2] i40evf: fix of supporting jumbo frame

Message ID 1430962859-26782-1-git-send-email-helin.zhang@intel.com (mailing list archive)
State Superseded, archived
Headers show

Commit Message

Helin Zhang May 7, 2015, 1:40 a.m. UTC
It wouldn't check the configured maximum packet length, and then
the scattered receiving function wouldn't be selected at all even
if it wants to receive a jumbo frame. The fix is to select the
correct RX function according to the configurations.

Signed-off-by: Helin Zhang <helin.zhang@intel.com>
---
 lib/librte_pmd_i40e/i40e_ethdev.h    |    2 +
 lib/librte_pmd_i40e/i40e_ethdev_vf.c |   85 +++++++++++++++++++++++-----------
 lib/librte_pmd_i40e/i40e_rxtx.c      |    1 -
 3 files changed, 59 insertions(+), 29 deletions(-)

v2 changes:
* Removed maximum packet length check and jumbo frame check in
  i40evf_dev_start(), as the same checks are already in each queue
  initialization.

Comments

Wu, Jingjing June 3, 2015, 6:52 a.m. UTC | #1
Acked-by: Jingjing Wu <jingjing.wu@intel.com>

> -----Original Message-----
> From: Zhang, Helin
> Sent: Thursday, May 07, 2015 9:41 AM
> To: dev@dpdk.org
> Cc: Cao, Min; Wu, Jingjing; Liu, Jijiang; Xu, Qian Q; Zhang, Helin
> Subject: [PATCH v2] i40evf: fix of supporting jumbo frame
> 
> It wouldn't check the configured maximum packet length, and then the
> scattered receiving function wouldn't be selected at all even if it wants to
> receive a jumbo frame. The fix is to select the correct RX function according
> to the configurations.
> 
> Signed-off-by: Helin Zhang <helin.zhang@intel.com>
> ---
>  lib/librte_pmd_i40e/i40e_ethdev.h    |    2 +
>  lib/librte_pmd_i40e/i40e_ethdev_vf.c |   85 +++++++++++++++++++++++--
> ---------
>  lib/librte_pmd_i40e/i40e_rxtx.c      |    1 -
>  3 files changed, 59 insertions(+), 29 deletions(-)
> 
> v2 changes:
> * Removed maximum packet length check and jumbo frame check in
>   i40evf_dev_start(), as the same checks are already in each queue
>   initialization.
> 
> diff --git a/lib/librte_pmd_i40e/i40e_ethdev.h
> b/lib/librte_pmd_i40e/i40e_ethdev.h
> index b9bed5a..7ecd249 100644
> --- a/lib/librte_pmd_i40e/i40e_ethdev.h
> +++ b/lib/librte_pmd_i40e/i40e_ethdev.h
> @@ -36,6 +36,8 @@
> 
>  #include <rte_eth_ctrl.h>
> 
> +#define I40E_VLAN_TAG_SIZE        4
> +
>  #define I40E_AQ_LEN               32
>  #define I40E_AQ_BUF_SZ            4096
>  /* Number of queues per TC should be one of 1, 2, 4, 8, 16, 32, 64 */ diff --git
> a/lib/librte_pmd_i40e/i40e_ethdev_vf.c
> b/lib/librte_pmd_i40e/i40e_ethdev_vf.c
> index a0d808f..e260bb5 100644
> --- a/lib/librte_pmd_i40e/i40e_ethdev_vf.c
> +++ b/lib/librte_pmd_i40e/i40e_ethdev_vf.c
> @@ -1417,23 +1417,74 @@ i40evf_vlan_filter_set(struct rte_eth_dev *dev,
> uint16_t vlan_id, int on)  }
> 
>  static int
> +i40evf_rxq_init(struct rte_eth_dev *dev, struct i40e_rx_queue *rxq) {
> +	struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
> +	struct rte_eth_dev_data *dev_data = dev->data;
> +	struct rte_pktmbuf_pool_private *mbp_priv;
> +	uint16_t buf_size, len;
> +
> +	rxq->qrx_tail = hw->hw_addr + I40E_QRX_TAIL1(rxq->queue_id);
> +	I40E_PCI_REG_WRITE(rxq->qrx_tail, rxq->nb_rx_desc - 1);
> +	I40EVF_WRITE_FLUSH(hw);
> +
> +	/* Calculate the maximum packet length allowed */
> +	mbp_priv = rte_mempool_get_priv(rxq->mp);
> +	buf_size = (uint16_t)(mbp_priv->mbuf_data_room_size -
> +					RTE_PKTMBUF_HEADROOM);
> +	rxq->hs_mode = i40e_header_split_none;
> +	rxq->rx_hdr_len = 0;
> +	rxq->rx_buf_len = RTE_ALIGN(buf_size, (1 <<
> I40E_RXQ_CTX_DBUFF_SHIFT));
> +	len = rxq->rx_buf_len * I40E_MAX_CHAINED_RX_BUFFERS;
> +	rxq->max_pkt_len = RTE_MIN(len,
> +		dev_data->dev_conf.rxmode.max_rx_pkt_len);
> +
> +	/**
> +	 * Check if the jumbo frame and maximum packet length are set
> correctly
> +	 */
> +	if (dev_data->dev_conf.rxmode.jumbo_frame == 1) {
> +		if (rxq->max_pkt_len <= ETHER_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)ETHER_MAX_LEN,
> +					(uint32_t)I40E_FRAME_SIZE_MAX);
> +			return I40E_ERR_CONFIG;
> +		}
> +	} else {
> +		if (rxq->max_pkt_len < ETHER_MIN_LEN ||
> +			rxq->max_pkt_len > ETHER_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)ETHER_MIN_LEN,
> +						(uint32_t)ETHER_MAX_LEN);
> +			return I40E_ERR_CONFIG;
> +		}
> +	}
> +
> +	if (dev_data->dev_conf.rxmode.enable_scatter
> +		|| (rxq->max_pkt_len + 2 * I40E_VLAN_TAG_SIZE) >
> buf_size) {
> +		dev_data->scattered_rx = 1;
> +		dev->rx_pkt_burst = i40e_recv_scattered_pkts;
> +	}
> +
> +	return 0;
> +}
> +
> +static int
>  i40evf_rx_init(struct rte_eth_dev *dev)  {
>  	struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data-
> >dev_private);
>  	uint16_t i;
>  	struct i40e_rx_queue **rxq =
>  		(struct i40e_rx_queue **)dev->data->rx_queues;
> -	struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
> 
>  	i40evf_config_rss(vf);
>  	for (i = 0; i < dev->data->nb_rx_queues; i++) {
> -		rxq[i]->qrx_tail = hw->hw_addr + I40E_QRX_TAIL1(i);
> -		I40E_PCI_REG_WRITE(rxq[i]->qrx_tail, rxq[i]->nb_rx_desc -
> 1);
> +		if (i40evf_rxq_init(dev, rxq[i]) < 0)
> +			return -EFAULT;
>  	}
> 
> -	/* Flush the operation to write registers */
> -	I40EVF_WRITE_FLUSH(hw);
> -
>  	return 0;
>  }
> 
> @@ -1474,28 +1525,6 @@ i40evf_dev_start(struct rte_eth_dev *dev)
>  	PMD_INIT_FUNC_TRACE();
> 
>  	vf->max_pkt_len = dev->data->dev_conf.rxmode.max_rx_pkt_len;
> -	if (dev->data->dev_conf.rxmode.jumbo_frame == 1) {
> -		if (vf->max_pkt_len <= ETHER_MAX_LEN ||
> -			vf->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)ETHER_MAX_LEN,
> -				    (uint32_t)I40E_FRAME_SIZE_MAX);
> -			return I40E_ERR_CONFIG;
> -		}
> -	} else {
> -		if (vf->max_pkt_len < ETHER_MIN_LEN ||
> -			vf->max_pkt_len > ETHER_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)ETHER_MIN_LEN,
> -				    (uint32_t)ETHER_MAX_LEN);
> -			return I40E_ERR_CONFIG;
> -		}
> -	}
> -
>  	vf->num_queue_pairs = RTE_MAX(dev->data->nb_rx_queues,
>  					dev->data->nb_tx_queues);
> 
> diff --git a/lib/librte_pmd_i40e/i40e_rxtx.c b/lib/librte_pmd_i40e/i40e_rxtx.c
> index 493cfa3..49d1030 100644
> --- a/lib/librte_pmd_i40e/i40e_rxtx.c
> +++ b/lib/librte_pmd_i40e/i40e_rxtx.c
> @@ -64,7 +64,6 @@
>  #define DEFAULT_TX_FREE_THRESH 32
>  #define I40E_MAX_PKT_TYPE      256
> 
> -#define I40E_VLAN_TAG_SIZE 4
>  #define I40E_TX_MAX_BURST  32
> 
>  #define I40E_DMA_MEM_ALIGN 4096
> --
> 1.7.7
diff mbox

Patch

diff --git a/lib/librte_pmd_i40e/i40e_ethdev.h b/lib/librte_pmd_i40e/i40e_ethdev.h
index b9bed5a..7ecd249 100644
--- a/lib/librte_pmd_i40e/i40e_ethdev.h
+++ b/lib/librte_pmd_i40e/i40e_ethdev.h
@@ -36,6 +36,8 @@ 
 
 #include <rte_eth_ctrl.h>
 
+#define I40E_VLAN_TAG_SIZE        4
+
 #define I40E_AQ_LEN               32
 #define I40E_AQ_BUF_SZ            4096
 /* Number of queues per TC should be one of 1, 2, 4, 8, 16, 32, 64 */
diff --git a/lib/librte_pmd_i40e/i40e_ethdev_vf.c b/lib/librte_pmd_i40e/i40e_ethdev_vf.c
index a0d808f..e260bb5 100644
--- a/lib/librte_pmd_i40e/i40e_ethdev_vf.c
+++ b/lib/librte_pmd_i40e/i40e_ethdev_vf.c
@@ -1417,23 +1417,74 @@  i40evf_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
 }
 
 static int
+i40evf_rxq_init(struct rte_eth_dev *dev, struct i40e_rx_queue *rxq)
+{
+	struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+	struct rte_eth_dev_data *dev_data = dev->data;
+	struct rte_pktmbuf_pool_private *mbp_priv;
+	uint16_t buf_size, len;
+
+	rxq->qrx_tail = hw->hw_addr + I40E_QRX_TAIL1(rxq->queue_id);
+	I40E_PCI_REG_WRITE(rxq->qrx_tail, rxq->nb_rx_desc - 1);
+	I40EVF_WRITE_FLUSH(hw);
+
+	/* Calculate the maximum packet length allowed */
+	mbp_priv = rte_mempool_get_priv(rxq->mp);
+	buf_size = (uint16_t)(mbp_priv->mbuf_data_room_size -
+					RTE_PKTMBUF_HEADROOM);
+	rxq->hs_mode = i40e_header_split_none;
+	rxq->rx_hdr_len = 0;
+	rxq->rx_buf_len = RTE_ALIGN(buf_size, (1 << I40E_RXQ_CTX_DBUFF_SHIFT));
+	len = rxq->rx_buf_len * I40E_MAX_CHAINED_RX_BUFFERS;
+	rxq->max_pkt_len = RTE_MIN(len,
+		dev_data->dev_conf.rxmode.max_rx_pkt_len);
+
+	/**
+	 * Check if the jumbo frame and maximum packet length are set correctly
+	 */
+	if (dev_data->dev_conf.rxmode.jumbo_frame == 1) {
+		if (rxq->max_pkt_len <= ETHER_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)ETHER_MAX_LEN,
+					(uint32_t)I40E_FRAME_SIZE_MAX);
+			return I40E_ERR_CONFIG;
+		}
+	} else {
+		if (rxq->max_pkt_len < ETHER_MIN_LEN ||
+			rxq->max_pkt_len > ETHER_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)ETHER_MIN_LEN,
+						(uint32_t)ETHER_MAX_LEN);
+			return I40E_ERR_CONFIG;
+		}
+	}
+
+	if (dev_data->dev_conf.rxmode.enable_scatter
+		|| (rxq->max_pkt_len + 2 * I40E_VLAN_TAG_SIZE) > buf_size) {
+		dev_data->scattered_rx = 1;
+		dev->rx_pkt_burst = i40e_recv_scattered_pkts;
+	}
+
+	return 0;
+}
+
+static int
 i40evf_rx_init(struct rte_eth_dev *dev)
 {
 	struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
 	uint16_t i;
 	struct i40e_rx_queue **rxq =
 		(struct i40e_rx_queue **)dev->data->rx_queues;
-	struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
 	i40evf_config_rss(vf);
 	for (i = 0; i < dev->data->nb_rx_queues; i++) {
-		rxq[i]->qrx_tail = hw->hw_addr + I40E_QRX_TAIL1(i);
-		I40E_PCI_REG_WRITE(rxq[i]->qrx_tail, rxq[i]->nb_rx_desc - 1);
+		if (i40evf_rxq_init(dev, rxq[i]) < 0)
+			return -EFAULT;
 	}
 
-	/* Flush the operation to write registers */
-	I40EVF_WRITE_FLUSH(hw);
-
 	return 0;
 }
 
@@ -1474,28 +1525,6 @@  i40evf_dev_start(struct rte_eth_dev *dev)
 	PMD_INIT_FUNC_TRACE();
 
 	vf->max_pkt_len = dev->data->dev_conf.rxmode.max_rx_pkt_len;
-	if (dev->data->dev_conf.rxmode.jumbo_frame == 1) {
-		if (vf->max_pkt_len <= ETHER_MAX_LEN ||
-			vf->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)ETHER_MAX_LEN,
-				    (uint32_t)I40E_FRAME_SIZE_MAX);
-			return I40E_ERR_CONFIG;
-		}
-	} else {
-		if (vf->max_pkt_len < ETHER_MIN_LEN ||
-			vf->max_pkt_len > ETHER_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)ETHER_MIN_LEN,
-				    (uint32_t)ETHER_MAX_LEN);
-			return I40E_ERR_CONFIG;
-		}
-	}
-
 	vf->num_queue_pairs = RTE_MAX(dev->data->nb_rx_queues,
 					dev->data->nb_tx_queues);
 
diff --git a/lib/librte_pmd_i40e/i40e_rxtx.c b/lib/librte_pmd_i40e/i40e_rxtx.c
index 493cfa3..49d1030 100644
--- a/lib/librte_pmd_i40e/i40e_rxtx.c
+++ b/lib/librte_pmd_i40e/i40e_rxtx.c
@@ -64,7 +64,6 @@ 
 #define DEFAULT_TX_FREE_THRESH 32
 #define I40E_MAX_PKT_TYPE      256
 
-#define I40E_VLAN_TAG_SIZE 4
 #define I40E_TX_MAX_BURST  32
 
 #define I40E_DMA_MEM_ALIGN 4096