[v2] net/bnx2x: handle guest vlan for SR-IOV case
Checks
Commit Message
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.
* Changed the Subject Line as recommended.
drivers/net/bnx2x/bnx2x.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
Comments
>From: dev <dev-bounces@dpdk.org> On Behalf Of Dey, Souvik
>Sent: Monday, March 02, 2020 5:29 PM
>
>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>
>---
May be it would be good to use --in-reply-to when generating the patch and resubmit. This will ensure it lands up in the same thread as the first patch.
http://mails.dpdk.org/archives/test-report/2020-March/119108.html
Acked-by: Rasesh Mody <rmody@marvell.com>
>v2:
> * Fix compilation issues.
> * Changed the Subject Line as recommended.
>
>
> drivers/net/bnx2x/bnx2x.c | 20 +++++++++++++++++---
> 1 file changed, 17 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c index
>0b4030e..0afa602 100644
>--- a/drivers/net/bnx2x/bnx2x.c
>+++ b/drivers/net/bnx2x/bnx2x.c
>@@ -2216,11 +2216,25 @@ 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 rte_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));
>+ } else {
>+ 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.
>-----------------------------------------------------------------------------------------------
>------------------------
When we are doing open source work, the contents of above footer is not compatible with what we are doing. Please remove the footer in patches and mailing list interactions for future.
Thanks will do that. And will also try to remove the trailer in the patches. Thanks for pointing it out.
From: dev <dev-bounces@dpdk.org> On Behalf Of Rasesh Mody
Sent: Tuesday, March 3, 2020 6:01 PM
To: Dey, Souvik <sodey@rbbn.com>; Shahed Shaikh <shshaikh@marvell.com>; Jerin Jacob Kollanukkaran <jerinj@marvell.com>; ferruh.yigit@intel.com; thomas@monjalon.net
Cc: dev@dpdk.org; stable@dpdk.org
Subject: Re: [dpdk-dev] [PATCH v2] net/bnx2x: handle guest vlan for SR-IOV case
On Thu, Mar 5, 2020 at 7:21 PM Dey, Souvik <sodey@rbbn.com> wrote:
>
> Thanks will do that. And will also try to remove the trailer in the patches. Thanks for pointing it out.
>
> From: dev <dev-bounces@dpdk.org> On Behalf Of Rasesh Mody
> Sent: Tuesday, March 3, 2020 6:01 PM
> To: Dey, Souvik <sodey@rbbn.com>; Shahed Shaikh <shshaikh@marvell.com>; Jerin Jacob Kollanukkaran <jerinj@marvell.com>; ferruh.yigit@intel.com; thomas@monjalon.net
> Cc: dev@dpdk.org; stable@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v2] net/bnx2x: handle guest vlan for SR-IOV case
1) Please change vlan to VLAN
2) Fix the following checkpatch issue. Probably move the new code to a
new function
to get enough space.
[master][dpdk-next-net-mrvl] $ ./devtools/checkpatches.sh
### net/bnx2x: handle guest VLAN for SR-IOV case
WARNING:BAD_SIGN_OFF: email address '"Dey Souvik" <sodey@rbbn.com>'
might be better as 'Dey Souvik <sodey@rbbn.com>'
#16:
Signed-off-by: "Dey Souvik" <sodey@rbbn.com>
WARNING:LONG_LINE_COMMENT: line over 80 characters
#27: FILE: drivers/net/bnx2x/bnx2x.c:2219:
+ /* when transmitting in a vf, start bd must
hold the ethertype
WARNING:LONG_LINE: line over 80 characters
#36: FILE: drivers/net/bnx2x/bnx2x.c:2225:
+ if (eh->ether_type ==
rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN)) {
WARNING:LONG_LINE: line over 80 characters
#41: FILE: drivers/net/bnx2x/bnx2x.c:2230:
+
ETH_TX_BD_FLAGS_VLAN_MODE_SHIFT);
WARNING:LONG_LINE: line over 80 characters
#47: FILE: drivers/net/bnx2x/bnx2x.c:2236:
+
(rte_be_to_cpu_16(eh->ether_type)));
WARNING:NO_AUTHOR_SIGN_OFF: Missing Signed-off-by: line by nominal
patch author 'Dey, Souvik <sodey@rbbn.com>'
total: 0 errors, 6 warnings, 0 checks, 28 lines checked
0/1 valid patch
----------------------------------------------------------------------------
Just for reference also attached the changed patch in text format with the changes requested below. Have raised a v3 of the patch too.
Now bit ceckpatches and check-git-logs works fine and also updated vlan to VLAN.
--
Thanks,
Souvik
From: Jerin Jacob <jerinjacobk@gmail.com>
Sent: Sunday, April 5, 2020 9:06 AM
To: Dey, Souvik <sodey@rbbn.com>
Cc: Rasesh Mody <rmody@marvell.com>; Shahed Shaikh <shshaikh@marvell.com>; Jerin Jacob Kollanukkaran <jerinj@marvell.com>; ferruh.yigit@intel.com; thomas@monjalon.net; dev@dpdk.org; stable@dpdk.org
Subject: Re: [dpdk-dev] [PATCH v2] net/bnx2x: handle guest vlan for SR-IOV case
@@ -2216,11 +2216,25 @@ 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 rte_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));
+ } else {
+ tx_start_bd->vlan_or_ethertype =
+ (rte_cpu_to_le_16
+ (rte_be_to_cpu_16(eh->ether_type)));
+ }
}
}