diff mbox

[dpdk-dev] net/liquidio: fix MTU calculation from port configuration

Message ID 1496747074-23138-1-git-send-email-shijith.thotton@caviumnetworks.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Shijith Thotton June 6, 2017, 11:04 a.m. UTC 
  max_rx_pkt_len member of port RX configuration indicates max frame
length. Ethernet header and CRC length should be subtracted from it to
find MTU.

Fixes: 605164c8e79d ("net/liquidio: add API to validate VF MTU")

Signed-off-by: Shijith Thotton <shijith.thotton@caviumnetworks.com>
---
 drivers/net/liquidio/lio_ethdev.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

Comments

Ferruh Yigit June 8, 2017, 10:19 a.m. UTC | #1 
On 6/6/2017 12:04 PM, Shijith Thotton wrote:
> max_rx_pkt_len member of port RX configuration indicates max frame
> length. Ethernet header and CRC length should be subtracted from it to
> find MTU.
> 
> Fixes: 605164c8e79d ("net/liquidio: add API to validate VF MTU")
> 
> Signed-off-by: Shijith Thotton <shijith.thotton@caviumnetworks.com>

Applied to dpdk-next-net/master, thanks.
diff mbox

Patch

diff --git a/drivers/net/liquidio/lio_ethdev.c b/drivers/net/liquidio/lio_ethdev.c
index 436d25b..61946ac 100644
--- a/drivers/net/liquidio/lio_ethdev.c
+++ b/drivers/net/liquidio/lio_ethdev.c
@@ -36,6 +36,7 @@ 
 #include <rte_cycles.h>
 #include <rte_malloc.h>
 #include <rte_alarm.h>
+#include <rte_ether.h>
 
 #include "lio_logs.h"
 #include "lio_23xx_vf.h"
@@ -1348,7 +1349,8 @@  struct rte_lio_xstats_name_off {
 static int
 lio_dev_start(struct rte_eth_dev *eth_dev)
 {
-	uint16_t mtu = eth_dev->data->dev_conf.rxmode.max_rx_pkt_len;
+	uint16_t mtu;
+	uint32_t frame_len = eth_dev->data->dev_conf.rxmode.max_rx_pkt_len;
 	struct lio_device *lio_dev = LIO_DEV(eth_dev);
 	uint16_t timeout = LIO_MAX_CMD_TIMEOUT;
 	int ret = 0;
@@ -1386,12 +1388,29 @@  struct rte_lio_xstats_name_off {
 		goto dev_mtu_check_error;
 	}
 
+	if (eth_dev->data->dev_conf.rxmode.jumbo_frame == 1) {
+		if (frame_len <= ETHER_MAX_LEN ||
+		    frame_len > LIO_MAX_RX_PKTLEN) {
+			lio_dev_err(lio_dev, "max packet length should be >= %d and < %d when jumbo frame is enabled\n",
+				    ETHER_MAX_LEN, LIO_MAX_RX_PKTLEN);
+			ret = -EINVAL;
+			goto dev_mtu_check_error;
+		}
+		mtu = (uint16_t)(frame_len - ETHER_HDR_LEN - ETHER_CRC_LEN);
+	} else {
+		/* default MTU */
+		mtu = ETHER_MTU;
+		eth_dev->data->dev_conf.rxmode.max_rx_pkt_len = ETHER_MAX_LEN;
+	}
+
 	if (lio_dev->linfo.link.s.mtu != mtu) {
 		ret = lio_dev_validate_vf_mtu(eth_dev, mtu);
 		if (ret)
 			goto dev_mtu_check_error;
 	}
 
+	eth_dev->data->mtu = mtu;
+
 	return 0;
 
 dev_mtu_check_error: