if (tp->vlan_shift >= 0 && fs->mask.ivlan_vld)
ntuple_mask |= (u64)(F_FT_VLAN_VLD | fs->mask.ivlan) <<
tp->vlan_shift;
- if (tp->vnic_shift >= 0 && fs->mask.ovlan_vld)
- ntuple_mask |= (u64)(F_FT_VLAN_VLD | fs->mask.ovlan) <<
- tp->vnic_shift;
+ if (tp->vnic_shift >= 0) {
+ if (fs->mask.ovlan_vld)
+ 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 |
+ fs->mask.vf) << tp->vnic_shift;
+ }
if (tp->tos_shift >= 0)
ntuple_mask |= (u64)fs->mask.tos << tp->tos_shift;
return 0;
/* we don't support SRC_MAC filtering*/
- if (!rte_is_zero_ether_addr(&mask->src))
+ if (!rte_is_zero_ether_addr(&spec->src) ||
+ (umask && !rte_is_zero_ether_addr(&umask->src)))
return rte_flow_error_set(e, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM,
item,
"src mac filtering not supported");
- if (!rte_is_zero_ether_addr(&mask->dst)) {
- const u8 *addr = (const u8 *)&spec->dst.addr_bytes[0];
- const u8 *m = (const u8 *)&mask->dst.addr_bytes[0];
- struct rte_flow *flow = (struct rte_flow *)fs->private;
- struct port_info *pi = (struct port_info *)
- (flow->dev->data->dev_private);
- int idx;
-
- idx = cxgbe_mpstcam_alloc(pi, addr, m);
- if (idx <= 0)
- return rte_flow_error_set(e, idx,
- RTE_FLOW_ERROR_TYPE_ITEM,
- NULL, "unable to allocate mac"
- " entry in h/w");
- CXGBE_FILL_FS(idx, 0x1ff, macidx);
+ if (!rte_is_zero_ether_addr(&spec->dst) ||
+ (umask && !rte_is_zero_ether_addr(&umask->dst))) {
+ CXGBE_FILL_FS(0, 0x1ff, macidx);
+ CXGBE_FILL_FS_MEMCPY(spec->dst.addr_bytes, mask->dst.addr_bytes,
+ dmac);
}
- CXGBE_FILL_FS(be16_to_cpu(spec->type),
- be16_to_cpu(mask->type), ethtype);
+ if (spec->type || (umask && umask->type))
+ CXGBE_FILL_FS(be16_to_cpu(spec->type),
+ be16_to_cpu(mask->type), ethtype);
return 0;
}
mask = umask ? umask : (const struct rte_flow_item_phy_port *)dmask;
+ if (!val)
+ return 0; /* Wildcard, match all physical ports */
+
if (val->index > 0x7)
return rte_flow_error_set(e, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM,
item,
- "port index upto 0x7 is supported");
+ "port index up to 0x7 is supported");
- CXGBE_FILL_FS(val->index, mask->index, iport);
+ if (val->index || (umask && umask->index))
+ CXGBE_FILL_FS(val->index, mask->index, iport);
return 0;
}
if (fs->val.ethtype == RTE_ETHER_TYPE_QINQ) {
CXGBE_FILL_FS(1, 1, ovlan_vld);
if (spec) {
- CXGBE_FILL_FS(be16_to_cpu(spec->tci),
- be16_to_cpu(mask->tci), ovlan);
-
+ if (spec->tci || (umask && umask->tci))
+ CXGBE_FILL_FS(be16_to_cpu(spec->tci),
+ be16_to_cpu(mask->tci), ovlan);
fs->mask.ethtype = 0;
fs->val.ethtype = 0;
}
} else if (fs->val.ethtype == RTE_ETHER_TYPE_VLAN) {
CXGBE_FILL_FS(1, 1, ivlan_vld);
if (spec) {
- CXGBE_FILL_FS(be16_to_cpu(spec->tci),
- be16_to_cpu(mask->tci), ivlan);
-
+ if (spec->tci || (umask && umask->tci))
+ CXGBE_FILL_FS(be16_to_cpu(spec->tci),
+ be16_to_cpu(mask->tci), ivlan);
fs->mask.ethtype = 0;
fs->val.ethtype = 0;
}
}
- if (spec)
+ if (spec && (spec->inner_type || (umask && umask->inner_type)))
CXGBE_FILL_FS(be16_to_cpu(spec->inner_type),
be16_to_cpu(mask->inner_type), ethtype);
return 0;
}
+static int
+ch_rte_parsetype_pf(const void *dmask __rte_unused,
+ const struct rte_flow_item *item __rte_unused,
+ struct ch_filter_specification *fs,
+ struct rte_flow_error *e __rte_unused)
+{
+ struct rte_flow *flow = (struct rte_flow *)fs->private;
+ struct rte_eth_dev *dev = flow->dev;
+ struct adapter *adap = ethdev2adap(dev);
+
+ CXGBE_FILL_FS(1, 1, pfvf_vld);
+
+ CXGBE_FILL_FS(adap->pf, 0x7, pf);
+ 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)");
+
+ if (val->id || (umask && umask->id))
+ 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,
CXGBE_FILL_FS(IPPROTO_UDP, 0xff, proto);
if (!val)
return 0;
- CXGBE_FILL_FS(be16_to_cpu(val->hdr.src_port),
- be16_to_cpu(mask->hdr.src_port), fport);
- CXGBE_FILL_FS(be16_to_cpu(val->hdr.dst_port),
- be16_to_cpu(mask->hdr.dst_port), lport);
+
+ if (val->hdr.src_port || (umask && umask->hdr.src_port))
+ CXGBE_FILL_FS(be16_to_cpu(val->hdr.src_port),
+ be16_to_cpu(mask->hdr.src_port), fport);
+
+ if (val->hdr.dst_port || (umask && umask->hdr.dst_port))
+ CXGBE_FILL_FS(be16_to_cpu(val->hdr.dst_port),
+ be16_to_cpu(mask->hdr.dst_port), lport);
+
return 0;
}
CXGBE_FILL_FS(IPPROTO_TCP, 0xff, proto);
if (!val)
return 0;
- CXGBE_FILL_FS(be16_to_cpu(val->hdr.src_port),
- be16_to_cpu(mask->hdr.src_port), fport);
- CXGBE_FILL_FS(be16_to_cpu(val->hdr.dst_port),
- be16_to_cpu(mask->hdr.dst_port), lport);
+
+ if (val->hdr.src_port || (umask && umask->hdr.src_port))
+ CXGBE_FILL_FS(be16_to_cpu(val->hdr.src_port),
+ be16_to_cpu(mask->hdr.src_port), fport);
+
+ if (val->hdr.dst_port || (umask && umask->hdr.dst_port))
+ CXGBE_FILL_FS(be16_to_cpu(val->hdr.dst_port),
+ be16_to_cpu(mask->hdr.dst_port), lport);
+
return 0;
}
if (!val)
return 0; /* ipv4 wild card */
- CXGBE_FILL_FS(val->hdr.next_proto_id, mask->hdr.next_proto_id, proto);
- CXGBE_FILL_FS_MEMCPY(val->hdr.dst_addr, mask->hdr.dst_addr, lip);
- CXGBE_FILL_FS_MEMCPY(val->hdr.src_addr, mask->hdr.src_addr, fip);
- CXGBE_FILL_FS(val->hdr.type_of_service, mask->hdr.type_of_service, tos);
+ if (val->hdr.next_proto_id || (umask && umask->hdr.next_proto_id))
+ CXGBE_FILL_FS(val->hdr.next_proto_id, mask->hdr.next_proto_id,
+ proto);
+
+ if (val->hdr.dst_addr || (umask && umask->hdr.dst_addr))
+ CXGBE_FILL_FS_MEMCPY(val->hdr.dst_addr, mask->hdr.dst_addr,
+ lip);
+
+ if (val->hdr.src_addr || (umask && umask->hdr.src_addr))
+ CXGBE_FILL_FS_MEMCPY(val->hdr.src_addr, mask->hdr.src_addr,
+ fip);
+
+ if (val->hdr.type_of_service || (umask && umask->hdr.type_of_service))
+ CXGBE_FILL_FS(val->hdr.type_of_service,
+ mask->hdr.type_of_service, tos);
return 0;
}
const struct rte_flow_item_ipv6 *umask = item->mask;
const struct rte_flow_item_ipv6 *mask;
u32 vtc_flow, vtc_flow_mask;
+ u8 z[16] = { 0 };
mask = umask ? umask : (const struct rte_flow_item_ipv6 *)dmask;
if (!val)
return 0; /* ipv6 wild card */
- CXGBE_FILL_FS(val->hdr.proto, mask->hdr.proto, proto);
+ if (val->hdr.proto || (umask && umask->hdr.proto))
+ CXGBE_FILL_FS(val->hdr.proto, mask->hdr.proto, proto);
vtc_flow = be32_to_cpu(val->hdr.vtc_flow);
- CXGBE_FILL_FS((vtc_flow & RTE_IPV6_HDR_TC_MASK) >>
- RTE_IPV6_HDR_TC_SHIFT,
- (vtc_flow_mask & RTE_IPV6_HDR_TC_MASK) >>
- RTE_IPV6_HDR_TC_SHIFT,
- tos);
-
- CXGBE_FILL_FS_MEMCPY(val->hdr.dst_addr, mask->hdr.dst_addr, lip);
- CXGBE_FILL_FS_MEMCPY(val->hdr.src_addr, mask->hdr.src_addr, fip);
+ if (val->hdr.vtc_flow || (umask && umask->hdr.vtc_flow))
+ CXGBE_FILL_FS((vtc_flow & RTE_IPV6_HDR_TC_MASK) >>
+ RTE_IPV6_HDR_TC_SHIFT,
+ (vtc_flow_mask & RTE_IPV6_HDR_TC_MASK) >>
+ RTE_IPV6_HDR_TC_SHIFT,
+ tos);
+
+ if (memcmp(val->hdr.dst_addr, z, sizeof(val->hdr.dst_addr)) ||
+ (umask &&
+ memcmp(umask->hdr.dst_addr, z, sizeof(umask->hdr.dst_addr))))
+ CXGBE_FILL_FS_MEMCPY(val->hdr.dst_addr, mask->hdr.dst_addr,
+ lip);
+
+ if (memcmp(val->hdr.src_addr, z, sizeof(val->hdr.src_addr)) ||
+ (umask &&
+ memcmp(umask->hdr.src_addr, z, sizeof(umask->hdr.src_addr))))
+ CXGBE_FILL_FS_MEMCPY(val->hdr.src_addr, mask->hdr.src_addr,
+ fip);
return 0;
}
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;
"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,
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
.fptr = ch_rte_parsetype_tcp,
.dmask = &rte_flow_item_tcp_mask,
},
+
+ [RTE_FLOW_ITEM_TYPE_PF] = {
+ .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
repeat[i->type] = 1;
- /* No spec found for this pattern item. Skip it */
- if (!i->spec)
- break;
-
/* validate the item */
ret = cxgbe_validate_item(i, e);
if (ret)
}
}
- cxgbe_fill_filter_region(adap, &flow->fs);
cxgbe_tweak_filter_spec(adap, &flow->fs);
+ cxgbe_fill_filter_region(adap, &flow->fs);
return 0;
}
return ctx.result;
}
- fs = &flow->fs;
- if (fs->mask.macidx) {
- struct port_info *pi = (struct port_info *)
- (dev->data->dev_private);
- int ret;
-
- ret = cxgbe_mpstcam_remove(pi, fs->val.macidx);
- if (!ret)
- return ret;
- }
-
return 0;
}
flow->item_parser = parseitem;
flow->dev = dev;
+ flow->fs.private = (void *)flow;
ret = cxgbe_flow_parse(flow, attr, item, action, e);
if (ret) {
git.droids-corp.org / dpdk.git / blobdiff