net: hns3: fix VLAN offload handle for VLAN inserted by port

Currently, in TX direction, driver implements the TX VLAN offload
by checking the VLAN header in skb, and filling it into TX descriptor.
Usually it works well, but if enable inserting VLAN header based on
port, it may conflict when out_tag field of TX descriptor is already
used, and cause RAS error.

In RX direction, hardware supports stripping max two VLAN headers.
For vlan_tci in skb can only store one VLAN tag, when RX VLAN offload
enabled, driver tells hardware to strip one VLAN header from RX
packet; when RX VLAN offload disabled, driver tells hardware not to
strip VLAN header from RX packet. Now if port based insert VLAN
enabled, all RX packets will have the port based VLAN header. This
header is useless for stack, driver needs to ask hardware to strip
it. Unfortunately, hardware can't drop this VLAN header, and always
fill it into RX descriptor, so driver has to identify and drop it.

Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
index f21932c9d13e2369fd999e0c1302ab26b8c5c329..681c1752c1e3cedb4f53953f7adffb96ec037421 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
@@ -585,6 +585,8 @@ struct hnae3_handle {
 
        u32 numa_node_mask;     /* for multi-chip support */
 
+       enum hnae3_port_base_vlan_state port_base_vlan_state;
+
        u8 netdev_flags;
        struct dentry *hnae3_dbgfs;
 };

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index b53b0911ec24123db5e37dbf7f54230b63149088..ec16b942634e84b31496a0bf8987187b43d23b11 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -963,6 +963,16 @@ static int hns3_fill_desc_vtags(struct sk_buff *skb,
 {
 #define HNS3_TX_VLAN_PRIO_SHIFT 13
 
+       struct hnae3_handle *handle = tx_ring->tqp->handle;
+
+       /* Since HW limitation, if port based insert VLAN enabled, only one VLAN
+        * header is allowed in skb, otherwise it will cause RAS error.
+        */
+       if (unlikely(skb_vlan_tagged_multi(skb) &&
+                    handle->port_base_vlan_state ==
+                    HNAE3_PORT_BASE_VLAN_ENABLE))
+               return -EINVAL;
+
        if (skb->protocol == htons(ETH_P_8021Q) &&
            !(tx_ring->tqp->handle->kinfo.netdev->features &
            NETIF_F_HW_VLAN_CTAG_TX)) {
@@ -984,8 +994,16 @@ static int hns3_fill_desc_vtags(struct sk_buff *skb,
                 * and use inner_vtag in one tag case.
                 */
                if (skb->protocol == htons(ETH_P_8021Q)) {
-                       hns3_set_field(*out_vlan_flag, HNS3_TXD_OVLAN_B, 1);
-                       *out_vtag = vlan_tag;
+                       if (handle->port_base_vlan_state ==
+                           HNAE3_PORT_BASE_VLAN_DISABLE){
+                               hns3_set_field(*out_vlan_flag,
+                                              HNS3_TXD_OVLAN_B, 1);
+                               *out_vtag = vlan_tag;
+                       } else {
+                               hns3_set_field(*inner_vlan_flag,
+                                              HNS3_TXD_VLAN_B, 1);
+                               *inner_vtag = vlan_tag;
+                       }
                } else {
                        hns3_set_field(*inner_vlan_flag, HNS3_TXD_VLAN_B, 1);
                        *inner_vtag = vlan_tag;
@@ -2390,6 +2408,7 @@ static bool hns3_parse_vlan_tag(struct hns3_enet_ring *ring,
                                struct hns3_desc *desc, u32 l234info,
                                u16 *vlan_tag)
 {
+       struct hnae3_handle *handle = ring->tqp->handle;
        struct pci_dev *pdev = ring->tqp->handle->pdev;
 
        if (pdev->revision == 0x20) {
@@ -2402,14 +2421,35 @@ static bool hns3_parse_vlan_tag(struct hns3_enet_ring *ring,
 
 #define HNS3_STRP_OUTER_VLAN   0x1
 #define HNS3_STRP_INNER_VLAN   0x2
+#define HNS3_STRP_BOTH         0x3
 
+       /* Hardware always insert VLAN tag into RX descriptor when
+        * remove the tag from packet, driver needs to determine
+        * reporting which tag to stack.
+        */
        switch (hnae3_get_field(l234info, HNS3_RXD_STRP_TAGP_M,
                                HNS3_RXD_STRP_TAGP_S)) {
        case HNS3_STRP_OUTER_VLAN:
+               if (handle->port_base_vlan_state !=
+                               HNAE3_PORT_BASE_VLAN_DISABLE)
+                       return false;
+
                *vlan_tag = le16_to_cpu(desc->rx.ot_vlan_tag);
                return true;
        case HNS3_STRP_INNER_VLAN:
+               if (handle->port_base_vlan_state !=
+                               HNAE3_PORT_BASE_VLAN_DISABLE)
+                       return false;
+
                *vlan_tag = le16_to_cpu(desc->rx.vlan_tag);
+               return true;
+       case HNS3_STRP_BOTH:
+               if (handle->port_base_vlan_state ==
+                               HNAE3_PORT_BASE_VLAN_DISABLE)
+                       *vlan_tag = le16_to_cpu(desc->rx.ot_vlan_tag);
+               else
+                       *vlan_tag = le16_to_cpu(desc->rx.vlan_tag);
+
                return true;
        default:
                return false;

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 630f7f88672e4a55ebc564578edaf169e2e29b03..4bc2c07c9df1b6d3ac30a3bc10df4715ae14a391 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -6915,10 +6915,16 @@ int hclge_en_hw_strip_rxvtag(struct hnae3_handle *handle, bool enable)
 {
        struct hclge_vport *vport = hclge_get_vport(handle);
 
-       vport->rxvlan_cfg.strip_tag1_en = false;
-       vport->rxvlan_cfg.strip_tag2_en = enable;
+       if (vport->port_base_vlan_cfg.state == HNAE3_PORT_BASE_VLAN_DISABLE) {
+               vport->rxvlan_cfg.strip_tag1_en = false;
+               vport->rxvlan_cfg.strip_tag2_en = enable;
+       } else {
+               vport->rxvlan_cfg.strip_tag1_en = enable;
+               vport->rxvlan_cfg.strip_tag2_en = true;
+       }
        vport->rxvlan_cfg.vlan1_vlan_prionly = false;
        vport->rxvlan_cfg.vlan2_vlan_prionly = false;
+       vport->rxvlan_cfg.rx_vlan_offload_en = enable;
 
        return hclge_set_vlan_rx_offload_cfg(vport);
 }