i40e: fix VLAN filtering

[dpdk.git] / drivers / net / i40e / i40e_ethdev.c

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 1b5c315..87d8f4b 100644 (file)
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -2412,6 +2412,13 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)
        struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
        struct i40e_vsi *vsi = pf->main_vsi;
 
+       if (mask & ETH_VLAN_FILTER_MASK) {
+               if (dev->data->dev_conf.rxmode.hw_vlan_filter)
+                       i40e_vsi_config_vlan_filter(vsi, TRUE);
+               else
+                       i40e_vsi_config_vlan_filter(vsi, FALSE);
+       }
+
        if (mask & ETH_VLAN_STRIP_MASK) {
                /* Enable or disable VLAN stripping */
                if (dev->data->dev_conf.rxmode.hw_vlan_strip)
@@ -2663,7 +2670,10 @@ i40e_macaddr_add(struct rte_eth_dev *dev,
        }
 
        (void)rte_memcpy(&mac_filter.mac_addr, mac_addr, ETHER_ADDR_LEN);
-       mac_filter.filter_type = RTE_MACVLAN_PERFECT_MATCH;
+       if (dev->data->dev_conf.rxmode.hw_vlan_filter)
+               mac_filter.filter_type = RTE_MACVLAN_PERFECT_MATCH;
+       else
+               mac_filter.filter_type = RTE_MAC_PERFECT_MATCH;
 
        if (pool == 0)
                vsi = pf->main_vsi;
@@ -4236,6 +4246,63 @@ fail_mem:
        return NULL;
 }
 
+/* Configure vlan filter on or off */
+int
+i40e_vsi_config_vlan_filter(struct i40e_vsi *vsi, bool on)
+{
+       int i, num;
+       struct i40e_mac_filter *f;
+       struct i40e_mac_filter_info *mac_filter;
+       enum rte_mac_filter_type desired_filter;
+       int ret = I40E_SUCCESS;
+
+       if (on) {
+               /* Filter to match MAC and VLAN */
+               desired_filter = RTE_MACVLAN_PERFECT_MATCH;
+       } else {
+               /* Filter to match only MAC */
+               desired_filter = RTE_MAC_PERFECT_MATCH;
+       }
+
+       num = vsi->mac_num;
+
+       mac_filter = rte_zmalloc("mac_filter_info_data",
+                                num * sizeof(*mac_filter), 0);
+       if (mac_filter == NULL) {
+               PMD_DRV_LOG(ERR, "failed to allocate memory");
+               return I40E_ERR_NO_MEMORY;
+       }
+
+       i = 0;
+
+       /* Remove all existing mac */
+       TAILQ_FOREACH(f, &vsi->mac_list, next) {
+               mac_filter[i] = f->mac_info;
+               ret = i40e_vsi_delete_mac(vsi, &f->mac_info.mac_addr);
+               if (ret) {
+                       PMD_DRV_LOG(ERR, "Update VSI failed to %s vlan filter",
+                                   on ? "enable" : "disable");
+                       goto DONE;
+               }
+               i++;
+       }
+
+       /* Override with new filter */
+       for (i = 0; i < num; i++) {
+               mac_filter[i].filter_type = desired_filter;
+               ret = i40e_vsi_add_mac(vsi, &mac_filter[i]);
+               if (ret) {
+                       PMD_DRV_LOG(ERR, "Update VSI failed to %s vlan filter",
+                                   on ? "enable" : "disable");
+                       goto DONE;
+               }
+       }
+
+DONE:
+       rte_free(mac_filter);
+       return ret;
+}
+
 /* Configure vlan stripping on or off */
 int
 i40e_vsi_config_vlan_stripping(struct i40e_vsi *vsi, bool on)
@@ -4283,9 +4350,11 @@ i40e_dev_init_vlan(struct rte_eth_dev *dev)
 {
        struct rte_eth_dev_data *data = dev->data;
        int ret;
+       int mask = 0;
 
        /* Apply vlan offload setting */
-       i40e_vlan_offload_set(dev, ETH_VLAN_STRIP_MASK);
+       mask = ETH_VLAN_STRIP_MASK | ETH_VLAN_FILTER_MASK;
+       i40e_vlan_offload_set(dev, mask);
 
        /* Apply double-vlan setting, not implemented yet */
 
@@ -5877,6 +5946,12 @@ i40e_dev_get_filter_type(uint16_t filter_type, uint16_t *flag)
        case ETH_TUNNEL_FILTER_IMAC:
                *flag = I40E_AQC_ADD_CLOUD_FILTER_IMAC;
                break;
+       case ETH_TUNNEL_FILTER_OIP:
+               *flag = I40E_AQC_ADD_CLOUD_FILTER_OIP;
+               break;
+       case ETH_TUNNEL_FILTER_IIP:
+               *flag = I40E_AQC_ADD_CLOUD_FILTER_IIP;
+               break;
        default:
                PMD_DRV_LOG(ERR, "invalid tunnel filter type");
                return -EINVAL;
@@ -5891,7 +5966,9 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
                        uint8_t add)
 {
        uint16_t ip_type;
-       uint8_t tun_type = 0;
+       uint8_t i, tun_type = 0;
+       /* internal varialbe to convert ipv6 byte order */
+       uint32_t convert_ipv6[4];
        int val, ret = 0;
        struct i40e_hw *hw = I40E_PF_TO_HW(pf);
        struct i40e_vsi *vsi = pf->main_vsi;
@@ -5911,16 +5988,19 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
        ether_addr_copy(&tunnel_filter->outer_mac, (struct ether_addr*)&pfilter->outer_mac);
        ether_addr_copy(&tunnel_filter->inner_mac, (struct ether_addr*)&pfilter->inner_mac);
 
-       pfilter->inner_vlan = tunnel_filter->inner_vlan;
+       pfilter->inner_vlan = rte_cpu_to_le_16(tunnel_filter->inner_vlan);
        if (tunnel_filter->ip_type == RTE_TUNNEL_IPTYPE_IPV4) {
                ip_type = I40E_AQC_ADD_CLOUD_FLAGS_IPV4;
-               (void)rte_memcpy(&pfilter->ipaddr.v4.data,
-                               &tunnel_filter->ip_addr,
+               rte_memcpy(&pfilter->ipaddr.v4.data,
+                               &rte_cpu_to_le_32(tunnel_filter->ip_addr.ipv4_addr),
                                sizeof(pfilter->ipaddr.v4.data));
        } else {
                ip_type = I40E_AQC_ADD_CLOUD_FLAGS_IPV6;
-               (void)rte_memcpy(&pfilter->ipaddr.v6.data,
-                               &tunnel_filter->ip_addr,
+               for (i = 0; i < 4; i++) {
+                       convert_ipv6[i] =
+                       rte_cpu_to_le_32(tunnel_filter->ip_addr.ipv6_addr[i]);
+               }
+               rte_memcpy(&pfilter->ipaddr.v6.data, &convert_ipv6,
                                sizeof(pfilter->ipaddr.v6.data));
        }
 
@@ -5932,6 +6012,9 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
        case RTE_TUNNEL_TYPE_NVGRE:
                tun_type = I40E_AQC_ADD_CLOUD_TNL_TYPE_NVGRE_OMAC;
                break;
+       case RTE_TUNNEL_TYPE_IP_IN_GRE:
+               tun_type = I40E_AQC_ADD_CLOUD_TNL_TYPE_IP;
+               break;
        default:
                /* Other tunnel types is not supported. */
                PMD_DRV_LOG(ERR, "tunnel type is not supported.");
@@ -5946,10 +6029,11 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
                return -EINVAL;
        }
 
-       pfilter->flags |= I40E_AQC_ADD_CLOUD_FLAGS_TO_QUEUE | ip_type |
-               (tun_type << I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT);
-       pfilter->tenant_id = tunnel_filter->tenant_id;
-       pfilter->queue_number = tunnel_filter->queue_id;
+       pfilter->flags |= rte_cpu_to_le_16(
+               I40E_AQC_ADD_CLOUD_FLAGS_TO_QUEUE |
+               ip_type | (tun_type << I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT));
+       pfilter->tenant_id = rte_cpu_to_le_32(tunnel_filter->tenant_id);
+       pfilter->queue_number = rte_cpu_to_le_16(tunnel_filter->queue_id);
 
        if (add)
                ret = i40e_aq_add_cloud_filters(hw, vsi->seid, cld_filter, 1);