[dpdk-stable] [PATCH v2] net/bnx2x: handle guest vlan for SR-IOV case

[dpdk-stable] [PATCH v2] net/bnx2x: handle guest vlan for SR-IOV case

[Dey, Souvik]

In case of bnx2xvf pmd, tx packets can support vland id in 2 ways :
1. setting the mbuf ol_flags=PKT_TX_VLAN_PKT and passing the
vlanid in mbuf->vlan_tci.
2. the tx packet itself has the vlan id included in the packet.
The first case is working as expected but the second case where
the vlan id is included in thetx packets itself was found not
working as expected. To handle that we need to properly set the
start_bd bitfield and the vlan_or_ethertype instead of setting it
to just the ethertype in case of VF.

Signed-off-by: "Dey, Souvik" <sodey@rbbn.com>
---
v2:
* Fixed complitaion issues 
   ether_type  to rte_ether_type/
   ETHER_TYPE_VLAN to RTE_ETHER_TYPE_VLAN/
   vlan_hdr to rte_vlan_hdr/
* Changed the subject line from bnx2x to net/bnx2x.

 drivers/net/bnx2x/bnx2x.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index f7cca21..a96e8c2 100644
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -2219,11 +2219,11 @@ int bnx2x_tx_encap(struct bnx2x_tx_queue *txq, struct rte_mbuf *m0)
 			/* when transmitting in a vf, start bd must hold the ethertype
 			 * for fw to enforce it
 			 */
-			struct ether_hdr *eh =
+			struct rte_ether_hdr  *eh =
 			    rte_pktmbuf_mtod(m0, struct ether_hdr *);
 			/* Still need to consider inband vlan for enforced */
-			if (eh->ether_type == rte_cpu_to_be_16(ETHER_TYPE_VLAN)) {
-				struct vlan_hdr *vh = (struct vlan_hdr *)(eh + 1);
+			if (eh->ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN)) {
+				struct rte_vlan_hdr *vh = (struct vlan_hdr *)(eh + 1);
 				tx_start_bd->bd_flags.as_bitfield |=
 					(X_ETH_INBAND_VLAN <<
 						ETH_TX_BD_FLAGS_VLAN_MODE_SHIFT);
@@ -2231,7 +2231,8 @@ int bnx2x_tx_encap(struct bnx2x_tx_queue *txq, struct rte_mbuf *m0)
 					rte_cpu_to_le_16(ntohs(vh->vlan_tci));
 			} else {
 				tx_start_bd->vlan_or_ethertype =
-					rte_cpu_to_le_16(rte_be_to_cpu_16(eh->ether_type));
+					(rte_cpu_to_le_16(
+						rte_be_to_cpu_16(eh->ether_type)));
 			}
 		}
 	}
-- 
2.9.3


-----------------------------------------------------------------------------------------------------------------------
Notice: This e-mail together with any attachments may contain information of Ribbon Communications Inc. that
is confidential and/or proprietary for the sole use of the intended recipient.  Any review, disclosure, reliance or
distribution by others or forwarding without express permission is strictly prohibited.  If you are not the intended
recipient, please notify the sender immediately and then delete all copies, including any attachments.
-----------------------------------------------------------------------------------------------------------------------

[dpdk-stable] [PATCH v2] bnx2x: handle guest vlan for SR-IOV case

[Dey, Souvik]

In case of bnx2xvf pmd, tx packets can support vland id in 2 ways :
1. setting the mbuf ol_flags=PKT_TX_VLAN_PKT and passing the
vlanid in mbuf->vlan_tci.
2. the tx packet itself has the vlan id included in the packet.
The first case is working as expected but the second case where
the vlan id is included in thetx packets itself was found not
working as expected. To handle that we need to properly set the
start_bd bitfield and the vlan_or_ethertype instead of setting it
to just the ethertype in case of VF.


Signed-off-by: "Dey, Souvik" <sodey@rbbn.com>
---
v2:
 * Fix compilation issues.
   ether_type to rte_ether_type/
   ETHER_TYPE_VLAN to RTE_ETHER_TYPE_VLAN/
   vlan_hdr to rte_vlan_hdr/
 * Kept the Subject still same for refernce.

 drivers/net/bnx2x/bnx2x.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index 0b4030e..6113d7c 100644
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -2216,11 +2216,23 @@ int bnx2x_tx_encap(struct bnx2x_tx_queue *txq, struct rte_mbuf *m0)
 			tx_start_bd->vlan_or_ethertype =
 			    rte_cpu_to_le_16(pkt_prod);
 		else {
+			/* when transmitting in a vf, start bd must hold the ethertype
+			 * for fw to enforce it
+			 */
 			struct rte_ether_hdr *eh =
 			    rte_pktmbuf_mtod(m0, struct rte_ether_hdr *);
-
-			tx_start_bd->vlan_or_ethertype =
-			    rte_cpu_to_le_16(rte_be_to_cpu_16(eh->ether_type));
+			/* Still need to consider inband vlan for enforced */
+			if (eh->ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN)) {
+				struct rte_vlan_hdr *vh = (struct vlan_hdr *)(eh + 1);
+				tx_start_bd->bd_flags.as_bitfield |=
+					(X_ETH_INBAND_VLAN <<
+						ETH_TX_BD_FLAGS_VLAN_MODE_SHIFT);
+				tx_start_bd->vlan_or_ethertype =
+					rte_cpu_to_le_16(ntohs(vh->vlan_tci));
+			} esle {
+				tx_start_bd->vlan_or_ethertype = (rte_cpu_to_le_16
+					(rte_be_to_cpu_16(eh->ether_type)));
+			}
 		}
 	}
 
-- 
2.9.3


-----------------------------------------------------------------------------------------------------------------------
Notice: This e-mail together with any attachments may contain information of Ribbon Communications Inc. that
is confidential and/or proprietary for the sole use of the intended recipient.  Any review, disclosure, reliance or
distribution by others or forwarding without express permission is strictly prohibited.  If you are not the intended
recipient, please notify the sender immediately and then delete all copies, including any attachments.
-----------------------------------------------------------------------------------------------------------------------