patches for DPDK stable branches
 help / color / mirror / Atom feed
From: "Zhang,Alvin" <alvinx.zhang@intel.com>
To: jia.guo@intel.com, WeiX.Xie@intel.com, haiyue.wang@intel.com
Cc: dev@dpdk.org, Alvin Zhang <alvinx.zhang@intel.com>, stable@dpdk.org
Subject: [dpdk-stable] [PATCH v4] net/ixgbe: fix configuration of max frame size
Date: Fri, 15 Jan 2021 18:08:29 +0800
Message-ID: <20210115100829.31980-1-alvinx.zhang@intel.com> (raw)
In-Reply-To: <20210115070029.2768-1-alvinx.zhang@intel.com>

From: Alvin Zhang <alvinx.zhang@intel.com>

For 82599 NIC, jumbo frame feature is not supported in IOV mode,
if a VF requests to configure the max frame size to that not
bigger than RTE_ETHER_MAX_LEN, the kernel driver returns 0, but
the DPDK ixgbe PMD returens -1, this will cause the VF to fail
to start when the PF driven by DPDK ixgbe PMD.

This patch keeps ixgbe PMD's handling mode consistent with kernel
driver in above situation.

In addition, the value set by the command IXGBE_VF_SET_LPE
represents the max frame size, not the mtu.

Fixes: 1b9ea09c067b ("ixgbe: support X550")
Fixes: 95a27b3ba5f5 ("net/ixgbe: enable jumbo frame for VF")
Cc: stable@dpdk.org

Signed-off-by: Alvin Zhang <alvinx.zhang@intel.com>
---

V3: Restore variable name from cur_frame_size to max_frs.
V4: Update git log and add notes.
---
 drivers/net/ixgbe/ixgbe_pf.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c
index 833863a..911a145 100644
--- a/drivers/net/ixgbe/ixgbe_pf.c
+++ b/drivers/net/ixgbe/ixgbe_pf.c
@@ -555,17 +555,26 @@ int ixgbe_pf_host_configure(struct rte_eth_dev *eth_dev)
 ixgbe_set_vf_lpe(struct rte_eth_dev *dev, __rte_unused uint32_t vf, uint32_t *msgbuf)
 {
 	struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-	uint32_t new_mtu = msgbuf[1];
+	uint32_t max_frame = msgbuf[1];
 	uint32_t max_frs;
 	uint32_t hlreg0;
-	int max_frame = new_mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN;
 
 	/* X540 and X550 support jumbo frames in IOV mode */
 	if (hw->mac.type != ixgbe_mac_X540 &&
 		hw->mac.type != ixgbe_mac_X550 &&
 		hw->mac.type != ixgbe_mac_X550EM_x &&
-		hw->mac.type != ixgbe_mac_X550EM_a)
-		return -1;
+		hw->mac.type != ixgbe_mac_X550EM_a) {
+		/**
+		 * For Other NICs, set max packet length is not enabled,
+		 * but if the value is not bigger than that has been set
+		 * by PF, here return -1 will cause the VF to fail to
+		 * start.
+		 */
+		if (max_frame > dev->data->dev_conf.rxmode.max_rx_pkt_len)
+			return -1;
+
+		return 0;
+	}
 
 	if (max_frame < RTE_ETHER_MIN_LEN ||
 			max_frame > RTE_ETHER_MAX_JUMBO_FRAME_LEN)
@@ -573,9 +582,9 @@ int ixgbe_pf_host_configure(struct rte_eth_dev *eth_dev)
 
 	max_frs = (IXGBE_READ_REG(hw, IXGBE_MAXFRS) &
 		   IXGBE_MHADD_MFS_MASK) >> IXGBE_MHADD_MFS_SHIFT;
-	if (max_frs < new_mtu) {
+	if (max_frs < max_frame) {
 		hlreg0 = IXGBE_READ_REG(hw, IXGBE_HLREG0);
-		if (new_mtu > RTE_ETHER_MAX_LEN) {
+		if (max_frame > RTE_ETHER_MAX_LEN) {
 			dev->data->dev_conf.rxmode.offloads |=
 				DEV_RX_OFFLOAD_JUMBO_FRAME;
 			hlreg0 |= IXGBE_HLREG0_JUMBOEN;
@@ -586,7 +595,7 @@ int ixgbe_pf_host_configure(struct rte_eth_dev *eth_dev)
 		}
 		IXGBE_WRITE_REG(hw, IXGBE_HLREG0, hlreg0);
 
-		max_frs = new_mtu << IXGBE_MHADD_MFS_SHIFT;
+		max_frs = max_frame << IXGBE_MHADD_MFS_SHIFT;
 		IXGBE_WRITE_REG(hw, IXGBE_MAXFRS, max_frs);
 	}
 
-- 
1.8.3.1


  parent reply	other threads:[~2021-01-15 10:08 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-14 10:14 [dpdk-stable] [PATCH] " Zhang,Alvin
2021-01-15  2:31 ` [dpdk-stable] [PATCH v2] " Zhang,Alvin
2021-01-15  6:43   ` Xie, WeiX
2021-01-15  7:00   ` [dpdk-stable] [PATCH v3] " Zhang,Alvin
2021-01-15  7:34     ` Xie, WeiX
2021-01-15  8:15     ` Guo, Jia
2021-01-15  9:50       ` Zhang, AlvinX
2021-01-15 10:08     ` Zhang,Alvin [this message]
2021-01-18  5:03       ` [dpdk-stable] [PATCH v5] " Zhang,Alvin
2021-01-18  5:58         ` Xie, WeiX
2021-01-18  8:35         ` [dpdk-stable] [PATCH v6] " Zhang,Alvin
2021-01-18  8:37           ` Guo, Jia
2021-01-19  5:25           ` [dpdk-stable] [PATCH v7] " Zhang,Alvin
2021-01-19  6:30             ` Zhang, Qi Z

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210115100829.31980-1-alvinx.zhang@intel.com \
    --to=alvinx.zhang@intel.com \
    --cc=WeiX.Xie@intel.com \
    --cc=dev@dpdk.org \
    --cc=haiyue.wang@intel.com \
    --cc=jia.guo@intel.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git