net/cxgbe: support flow API for source MAC rewrite

[dpdk.git] / drivers / net / cxgbe / cxgbe_flow.c

diff --git a/drivers/net/cxgbe/cxgbe_flow.c b/drivers/net/cxgbe/cxgbe_flow.c
index 138d075..a46515d 100644 (file)
--- a/drivers/net/cxgbe/cxgbe_flow.c
+++ b/drivers/net/cxgbe/cxgbe_flow.c
@@ -159,9 +159,9 @@ cxgbe_fill_filter_region(struct adapter *adap,
                        ntuple_mask |= (u64)(fs->val.ovlan_vld << 16 |
                                             fs->mask.ovlan) << tp->vnic_shift;
                else if (fs->mask.pfvf_vld)
-                       ntuple_mask |= (u64)((fs->mask.pfvf_vld << 16) |
-                                            (fs->mask.pf << 13)) <<
-                                            tp->vnic_shift;
+                       ntuple_mask |= (u64)(fs->mask.pfvf_vld << 16 |
+                                            fs->mask.pf << 13 |
+                                            fs->mask.vf) << tp->vnic_shift;
        }
        if (tp->tos_shift >= 0)
                ntuple_mask |= (u64)fs->mask.tos << tp->tos_shift;
@@ -316,6 +316,34 @@ ch_rte_parsetype_pf(const void *dmask __rte_unused,
        return 0;
 }
 
+static int
+ch_rte_parsetype_vf(const void *dmask, const struct rte_flow_item *item,
+                   struct ch_filter_specification *fs,
+                   struct rte_flow_error *e)
+{
+       const struct rte_flow_item_vf *umask = item->mask;
+       const struct rte_flow_item_vf *val = item->spec;
+       const struct rte_flow_item_vf *mask;
+
+       /* If user has not given any mask, then use chelsio supported mask. */
+       mask = umask ? umask : (const struct rte_flow_item_vf *)dmask;
+
+       CXGBE_FILL_FS(1, 1, pfvf_vld);
+
+       if (!val)
+               return 0; /* Wildcard, match all Vf */
+
+       if (val->id > UCHAR_MAX)
+               return rte_flow_error_set(e, EINVAL,
+                                         RTE_FLOW_ERROR_TYPE_ITEM,
+                                         item,
+                                         "VF ID > MAX(255)");
+
+       CXGBE_FILL_FS(val->id, mask->id, vf);
+
+       return 0;
+}
+
 static int
 ch_rte_parsetype_udp(const void *dmask, const struct rte_flow_item *item,
                     struct ch_filter_specification *fs,
@@ -619,6 +647,7 @@ ch_rte_parse_atype_switch(const struct rte_flow_action *a,
        const struct rte_flow_action_set_ipv6 *ipv6;
        const struct rte_flow_action_set_tp *tp_port;
        const struct rte_flow_action_phy_port *port;
+       const struct rte_flow_action_set_mac *mac;
        int item_index;
        u16 tmp_vlan;
 
@@ -766,6 +795,31 @@ ch_rte_parse_atype_switch(const struct rte_flow_action *a,
                                                  "found");
                fs->swapmac = 1;
                break;
+       case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC:
+               item_index = cxgbe_get_flow_item_index(items,
+                                                      RTE_FLOW_ITEM_TYPE_ETH);
+               if (item_index < 0)
+                       return rte_flow_error_set(e, EINVAL,
+                                                 RTE_FLOW_ERROR_TYPE_ACTION, a,
+                                                 "No RTE_FLOW_ITEM_TYPE_ETH "
+                                                 "found");
+               mac = (const struct rte_flow_action_set_mac *)a->conf;
+
+               fs->newsmac = 1;
+               memcpy(fs->smac, mac->mac_addr, sizeof(fs->smac));
+               break;
+       case RTE_FLOW_ACTION_TYPE_SET_MAC_DST:
+               item_index = cxgbe_get_flow_item_index(items,
+                                                      RTE_FLOW_ITEM_TYPE_ETH);
+               if (item_index < 0)
+                       return rte_flow_error_set(e, EINVAL,
+                                                 RTE_FLOW_ERROR_TYPE_ACTION, a,
+                                                 "No RTE_FLOW_ITEM_TYPE_ETH found");
+               mac = (const struct rte_flow_action_set_mac *)a->conf;
+
+               fs->newdmac = 1;
+               memcpy(fs->dmac, mac->mac_addr, sizeof(fs->dmac));
+               break;
        default:
                /* We are not supposed to come here */
                return rte_flow_error_set(e, EINVAL,
@@ -842,6 +896,8 @@ cxgbe_rtef_parse_actions(struct rte_flow *flow,
                        goto action_switch;
                case RTE_FLOW_ACTION_TYPE_SET_TP_SRC:
                case RTE_FLOW_ACTION_TYPE_SET_TP_DST:
+               case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC:
+               case RTE_FLOW_ACTION_TYPE_SET_MAC_DST:
 action_switch:
                        /* We allow multiple switch actions, but switch is
                         * not compatible with either queue or drop
@@ -948,6 +1004,13 @@ static struct chrte_fparse parseitem[] = {
                .fptr = ch_rte_parsetype_pf,
                .dmask = NULL,
        },
+
+       [RTE_FLOW_ITEM_TYPE_VF] = {
+               .fptr = ch_rte_parsetype_vf,
+               .dmask = &(const struct rte_flow_item_vf){
+                       .id = 0xffffffff,
+               }
+       },
 };
 
 static int