#include "base/t4_tcb.h"
#include "base/t4_regs.h"
#include "cxgbe_filter.h"
+#include "mps_tcam.h"
#include "clip_tbl.h"
#include "l2t.h"
#include "smt.h"
/*
* Check for unconfigured fields being used.
*/
- fconf = adapter->params.tp.vlan_pri_map;
+ fconf = fs->cap ? adapter->params.tp.filter_mask :
+ adapter->params.tp.vlan_pri_map;
iconf = adapter->params.tp.ingress_config;
return pos < size ? pos : -1;
}
+/**
+ * Clear a filter and release any of its resources that we own. This also
+ * clears the filter's "pending" status.
+ */
+static void clear_filter(struct filter_entry *f)
+{
+ struct port_info *pi = ethdev2pinfo(f->dev);
+
+ if (f->clipt)
+ cxgbe_clip_release(f->dev, f->clipt);
+
+ if (f->l2t)
+ cxgbe_l2t_release(f->l2t);
+
+ if (f->fs.mask.macidx)
+ cxgbe_mpstcam_remove(pi, f->fs.val.macidx);
+
+ if (f->smt)
+ cxgbe_smt_release(f->smt);
+
+ /* The zeroing of the filter rule below clears the filter valid,
+ * pending, locked flags etc. so it's all we need for
+ * this operation.
+ */
+ memset(f, 0, sizeof(*f));
+}
+
/**
* Construct hash filter ntuple.
*/
f = t4_os_alloc(sizeof(*f));
if (!f)
- goto out_err;
+ return -ENOMEM;
f->fs = *fs;
f->ctx = ctx;
f->dev = dev;
f->fs.iq = iq;
+ /* Allocate MPS TCAM entry to match Destination MAC. */
+ if (f->fs.mask.macidx) {
+ int idx;
+
+ idx = cxgbe_mpstcam_alloc(pi, f->fs.val.dmac, f->fs.mask.dmac);
+ if (idx <= 0) {
+ ret = -ENOMEM;
+ goto out_err;
+ }
+
+ f->fs.val.macidx = idx;
+ }
+
/*
* If the new filter requires loopback Destination MAC and/or VLAN
* rewriting then we need to allocate a Layer 2 Table (L2T) entry for
mbuf = rte_pktmbuf_alloc(ctrlq->mb_pool);
if (!mbuf) {
ret = -ENOMEM;
- goto free_clip;
+ goto free_atid;
}
mbuf->data_len = size;
t4_mgmt_tx(ctrlq, mbuf);
return 0;
-free_clip:
- cxgbe_clip_release(f->dev, f->clipt);
free_atid:
cxgbe_free_atid(t, atid);
out_err:
+ clear_filter(f);
t4_os_free(f);
return ret;
}
-/**
- * Clear a filter and release any of its resources that we own. This also
- * clears the filter's "pending" status.
- */
-static void clear_filter(struct filter_entry *f)
-{
- if (f->clipt)
- cxgbe_clip_release(f->dev, f->clipt);
-
- /*
- * The zeroing of the filter rule below clears the filter valid,
- * pending, locked flags etc. so it's all we need for
- * this operation.
- */
- memset(f, 0, sizeof(*f));
-}
-
/**
* t4_mk_filtdelwr - create a delete filter WR
* @adap: adapter context
unsigned int port_id = ethdev2pinfo(dev)->port_id;
int ret;
- /*
- * If the new filter requires loopback Destination MAC and/or VLAN
- * rewriting then we need to allocate a Layer 2 Table (L2T) entry for
- * the filter.
- */
- if (f->fs.newvlan || f->fs.newdmac) {
- /* allocate L2T entry for new filter */
- f->l2t = cxgbe_l2t_alloc_switching(f->dev, f->fs.vlan,
- f->fs.eport, f->fs.dmac);
-
- if (!f->l2t)
- return -ENOMEM;
- }
-
- /* If the new filter requires Source MAC rewriting then we need to
- * allocate a SMT entry for the filter
- */
- if (f->fs.newsmac) {
- f->smt = cxgbe_smt_alloc_switching(f->dev, f->fs.smac);
- if (!f->smt) {
- if (f->l2t) {
- cxgbe_l2t_release(f->l2t);
- f->l2t = NULL;
- }
- return -ENOMEM;
- }
- }
-
ctrlq = &adapter->sge.ctrlq[port_id];
mbuf = rte_pktmbuf_alloc(ctrlq->mb_pool);
if (!mbuf) {
return ret;
}
- /*
- * Allocate a clip table entry only if we have non-zero IPv6 address
- */
- if (chip_ver > CHELSIO_T5 && fs->type &&
- memcmp(fs->val.lip, bitoff, sizeof(bitoff))) {
- f->clipt = cxgbe_clip_alloc(dev, (u32 *)&fs->val.lip);
- if (!f->clipt)
- goto free_tid;
- }
-
/*
* Convert the filter specification into our internal format.
* We copy the PF/VF specification into the Outer VLAN field
f->fs.iq = iq;
f->dev = dev;
+ /* Allocate MPS TCAM entry to match Destination MAC. */
+ if (f->fs.mask.macidx) {
+ int idx;
+
+ idx = cxgbe_mpstcam_alloc(pi, f->fs.val.dmac, f->fs.mask.dmac);
+ if (idx <= 0) {
+ ret = -ENOMEM;
+ goto free_tid;
+ }
+
+ f->fs.val.macidx = idx;
+ }
+
+ /* Allocate a clip table entry only if we have non-zero IPv6 address. */
+ if (chip_ver > CHELSIO_T5 && f->fs.type &&
+ memcmp(f->fs.val.lip, bitoff, sizeof(bitoff))) {
+ f->clipt = cxgbe_clip_alloc(dev, (u32 *)&f->fs.val.lip);
+ if (!f->clipt) {
+ ret = -ENOMEM;
+ goto free_tid;
+ }
+ }
+
+ /* If the new filter requires loopback Destination MAC and/or VLAN
+ * rewriting then we need to allocate a Layer 2 Table (L2T) entry for
+ * the filter.
+ */
+ if (f->fs.newvlan || f->fs.newdmac) {
+ f->l2t = cxgbe_l2t_alloc_switching(f->dev, f->fs.vlan,
+ f->fs.eport, f->fs.dmac);
+ if (!f->l2t) {
+ ret = -ENOMEM;
+ goto free_tid;
+ }
+ }
+
+ /* If the new filter requires Source MAC rewriting then we need to
+ * allocate a SMT entry for the filter
+ */
+ if (f->fs.newsmac) {
+ f->smt = cxgbe_smt_alloc_switching(f->dev, f->fs.smac);
+ if (!f->smt) {
+ ret = -ENOMEM;
+ goto free_tid;
+ }
+ }
+
iconf = adapter->params.tp.ingress_config;
/* Either PFVF or OVLAN can be active, but not both
}
cxgbe_free_atid(t, ftid);
+ clear_filter(f);
t4_os_free(f);
}
}
ctx = f->ctx;
- f->ctx = NULL;
-
- f->valid = 0;
-
- if (f->clipt)
- cxgbe_clip_release(f->dev, f->clipt);
+ clear_filter(f);
cxgbe_remove_tid(t, 0, tid, 0);
t4_os_free(f);
git.droids-corp.org / dpdk.git / blobdiff