| Message ID | 1686170042-10610-1-git-send-email-haiyangz@microsoft.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,V2] net: mana: Add support for vlan tagging | expand |
On Wed, 7 Jun 2023 13:34:02 -0700 Haiyang Zhang wrote: > To support vlan, use MANA_LONG_PKT_FMT if vlan tag is present in TX > skb. Then extract the vlan tag from the skb struct, and save it to > tx_oob for the NIC to transmit. For vlan tags on the payload, they > are accepted by the NIC too. > > For RX, extract the vlan tag from CQE and put it into skb. > > Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> > --- > V2: > Removed the code that extracts inband tag, because our NIC accepts > inband tags too. Please don't rush multiple versions, if your previous version is buggy you have to reply to it saying so and then wait before posting v2. Reviewing something just to find there is a v2 already posting is one of the more annoying experiences for maintainers and reviewers. Quoting documentation: Resending after review ~~~~~~~~~~~~~~~~~~~~~~ Allow at least 24 hours to pass between postings. This will ensure reviewers from all geographical locations have a chance to chime in. Do not wait too long (weeks) between postings either as it will make it harder for reviewers to recall all the context. Make sure you address all the feedback in your new posting. Do not post a new version of the code if the discussion about the previous version is still ongoing, unless directly instructed by a reviewer. See: https://www.kernel.org/doc/html/next/process/maintainer-netdev.html#resending-after-review
> -----Original Message----- > From: Jakub Kicinski <kuba@kernel.org> > Sent: Wednesday, June 7, 2023 4:38 PM > To: Haiyang Zhang <haiyangz@microsoft.com> > Cc: linux-hyperv@vger.kernel.org; netdev@vger.kernel.org; Dexuan Cui > <decui@microsoft.com>; KY Srinivasan <kys@microsoft.com>; Paul Rosswurm > <paulros@microsoft.com>; olaf@aepfle.de; vkuznets@redhat.com; > davem@davemloft.net; wei.liu@kernel.org; edumazet@google.com; > pabeni@redhat.com; leon@kernel.org; Long Li <longli@microsoft.com>; > ssengar@linux.microsoft.com; linux-rdma@vger.kernel.org; > daniel@iogearbox.net; john.fastabend@gmail.com; bpf@vger.kernel.org; > ast@kernel.org; Ajay Sharma <sharmaajay@microsoft.com>; > hawk@kernel.org; tglx@linutronix.de; shradhagupta@linux.microsoft.com; > linux-kernel@vger.kernel.org > Subject: Re: [PATCH net-next,V2] net: mana: Add support for vlan tagging > > On Wed, 7 Jun 2023 13:34:02 -0700 Haiyang Zhang wrote: > > To support vlan, use MANA_LONG_PKT_FMT if vlan tag is present in TX > > skb. Then extract the vlan tag from the skb struct, and save it to > > tx_oob for the NIC to transmit. For vlan tags on the payload, they > > are accepted by the NIC too. > > > > For RX, extract the vlan tag from CQE and put it into skb. > > > > Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> > > --- > > V2: > > Removed the code that extracts inband tag, because our NIC accepts > > inband tags too. > > Please don't rush multiple versions, if your previous version is buggy > you have to reply to it saying so and then wait before posting v2. Will do. Thanks.
diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index d907727c7b7a..cd4d5ceb9f2d 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -179,6 +179,14 @@ netdev_tx_t mana_start_xmit(struct sk_buff *skb, struct net_device *ndev) pkg.tx_oob.s_oob.short_vp_offset = txq->vp_offset; } + if (skb_vlan_tag_present(skb)) { + pkt_fmt = MANA_LONG_PKT_FMT; + pkg.tx_oob.l_oob.inject_vlan_pri_tag = 1; + pkg.tx_oob.l_oob.pcp = skb_vlan_tag_get_prio(skb); + pkg.tx_oob.l_oob.dei = skb_vlan_tag_get_cfi(skb); + pkg.tx_oob.l_oob.vlan_id = skb_vlan_tag_get_id(skb); + } + pkg.tx_oob.s_oob.pkt_fmt = pkt_fmt; if (pkt_fmt == MANA_SHORT_PKT_FMT) { @@ -1457,6 +1465,12 @@ static void mana_rx_skb(void *buf_va, struct mana_rxcomp_oob *cqe, skb_set_hash(skb, hash_value, PKT_HASH_TYPE_L3); } + if (cqe->rx_vlantag_present) { + u16 vlan_tci = cqe->rx_vlan_id; + + __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tci); + } + u64_stats_update_begin(&rx_stats->syncp); rx_stats->packets++; rx_stats->bytes += pkt_len; @@ -2451,8 +2465,9 @@ static int mana_probe_port(struct mana_context *ac, int port_idx, ndev->hw_features |= NETIF_F_RXCSUM; ndev->hw_features |= NETIF_F_TSO | NETIF_F_TSO6; ndev->hw_features |= NETIF_F_RXHASH; - ndev->features = ndev->hw_features; - ndev->vlan_features = 0; + ndev->features = ndev->hw_features | NETIF_F_HW_VLAN_CTAG_TX | + NETIF_F_HW_VLAN_CTAG_RX; + ndev->vlan_features = ndev->features; ndev->xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT | NETDEV_XDP_ACT_NDO_XMIT;
To support vlan, use MANA_LONG_PKT_FMT if vlan tag is present in TX skb. Then extract the vlan tag from the skb struct, and save it to tx_oob for the NIC to transmit. For vlan tags on the payload, they are accepted by the NIC too. For RX, extract the vlan tag from CQE and put it into skb. Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> --- V2: Removed the code that extracts inband tag, because our NIC accepts inband tags too. --- drivers/net/ethernet/microsoft/mana/mana_en.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)