net/ifc: use vhost lib function for used ring logging

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

diff --git a/drivers/net/cxgbe/cxgbe_filter.c b/drivers/net/cxgbe/cxgbe_filter.c
index dcb1dd0..3a7912e 100644 (file)
--- a/drivers/net/cxgbe/cxgbe_filter.c
+++ b/drivers/net/cxgbe/cxgbe_filter.c
@@ -89,6 +89,12 @@ int validate_filter(struct adapter *adapter, struct ch_filter_specification *fs)
        if (fs->val.iport >= adapter->params.nports)
                return -ERANGE;
 
+       if (!fs->cap && fs->nat_mode && !adapter->params.filter2_wr_support)
+               return -EOPNOTSUPP;
+
+       if (!fs->cap && fs->swapmac && !adapter->params.filter2_wr_support)
+               return -EOPNOTSUPP;
+
        return 0;
 }
 
@@ -257,8 +263,8 @@ static u64 hash_filter_ntuple(const struct filter_entry *f)
        u64 ntuple = 0;
        u16 tcp_proto = IPPROTO_TCP; /* TCP Protocol Number */
 
-       if (tp->port_shift >= 0)
-               ntuple |= (u64)f->fs.mask.iport << tp->port_shift;
+       if (tp->port_shift >= 0 && f->fs.mask.iport)
+               ntuple |= (u64)f->fs.val.iport << tp->port_shift;
 
        if (tp->protocol_shift >= 0) {
                if (!f->fs.val.proto)
@@ -272,9 +278,6 @@ static u64 hash_filter_ntuple(const struct filter_entry *f)
        if (tp->macmatch_shift >= 0 && f->fs.mask.macidx)
                ntuple |= (u64)(f->fs.val.macidx) << tp->macmatch_shift;
 
-       if (ntuple != tp->hash_filter_mask)
-               return 0;
-
        return ntuple;
 }
 
@@ -453,6 +456,7 @@ static void mk_act_open_req6(struct filter_entry *f, struct rte_mbuf *mbuf,
                            V_RSS_QUEUE(f->fs.iq) |
                            F_T5_OPT_2_VALID |
                            F_RX_CHANNEL |
+                           V_SACK_EN(f->fs.swapmac) |
                            V_CONG_CNTRL((f->fs.action == FILTER_DROP) |
                                         (f->fs.dirsteer << 1)) |
                            V_CCTRL_ECN(f->fs.action == FILTER_SWITCH));
@@ -499,6 +503,7 @@ static void mk_act_open_req(struct filter_entry *f, struct rte_mbuf *mbuf,
                            V_RSS_QUEUE(f->fs.iq) |
                            F_T5_OPT_2_VALID |
                            F_RX_CHANNEL |
+                           V_SACK_EN(f->fs.swapmac) |
                            V_CONG_CNTRL((f->fs.action == FILTER_DROP) |
                                         (f->fs.dirsteer << 1)) |
                            V_CCTRL_ECN(f->fs.action == FILTER_SWITCH));
@@ -627,6 +632,7 @@ void clear_filter(struct filter_entry *f)
 
 /**
  * t4_mk_filtdelwr - create a delete filter WR
+ * @adap: adapter context
  * @ftid: the filter ID
  * @wr: the filter work request to populate
  * @qid: ingress queue to receive the delete notification
@@ -634,10 +640,14 @@ void clear_filter(struct filter_entry *f)
  * Creates a filter work request to delete the supplied filter.  If @qid is
  * negative the delete notification is suppressed.
  */
-static void t4_mk_filtdelwr(unsigned int ftid, struct fw_filter_wr *wr, int qid)
+static void t4_mk_filtdelwr(struct adapter *adap, unsigned int ftid,
+                           struct fw_filter2_wr *wr, int qid)
 {
        memset(wr, 0, sizeof(*wr));
-       wr->op_pkd = cpu_to_be32(V_FW_WR_OP(FW_FILTER_WR));
+       if (adap->params.filter2_wr_support)
+               wr->op_pkd = cpu_to_be32(V_FW_WR_OP(FW_FILTER2_WR));
+       else
+               wr->op_pkd = cpu_to_be32(V_FW_WR_OP(FW_FILTER_WR));
        wr->len16_pkd = cpu_to_be32(V_FW_WR_LEN16(sizeof(*wr) / 16));
        wr->tid_to_iq = cpu_to_be32(V_FW_FILTER_WR_TID(ftid) |
                                    V_FW_FILTER_WR_NOREPLY(qid < 0));
@@ -655,7 +665,7 @@ static int del_filter_wr(struct rte_eth_dev *dev, unsigned int fidx)
        struct adapter *adapter = ethdev2adap(dev);
        struct filter_entry *f = &adapter->tids.ftid_tab[fidx];
        struct rte_mbuf *mbuf;
-       struct fw_filter_wr *fwr;
+       struct fw_filter2_wr *fwr;
        struct sge_ctrl_txq *ctrlq;
        unsigned int port_id = ethdev2pinfo(dev)->port_id;
 
@@ -667,8 +677,8 @@ static int del_filter_wr(struct rte_eth_dev *dev, unsigned int fidx)
        mbuf->data_len = sizeof(*fwr);
        mbuf->pkt_len = mbuf->data_len;
 
-       fwr = rte_pktmbuf_mtod(mbuf, struct fw_filter_wr *);
-       t4_mk_filtdelwr(f->tid, fwr, adapter->sge.fw_evtq.abs_id);
+       fwr = rte_pktmbuf_mtod(mbuf, struct fw_filter2_wr *);
+       t4_mk_filtdelwr(adapter, f->tid, fwr, adapter->sge.fw_evtq.abs_id);
 
        /*
         * Mark the filter as "pending" and ship off the Filter Work Request.
@@ -684,7 +694,7 @@ int set_filter_wr(struct rte_eth_dev *dev, unsigned int fidx)
        struct adapter *adapter = ethdev2adap(dev);
        struct filter_entry *f = &adapter->tids.ftid_tab[fidx];
        struct rte_mbuf *mbuf;
-       struct fw_filter_wr *fwr;
+       struct fw_filter2_wr *fwr;
        struct sge_ctrl_txq *ctrlq;
        unsigned int port_id = ethdev2pinfo(dev)->port_id;
        int ret;
@@ -712,13 +722,16 @@ int set_filter_wr(struct rte_eth_dev *dev, unsigned int fidx)
        mbuf->data_len = sizeof(*fwr);
        mbuf->pkt_len = mbuf->data_len;
 
-       fwr = rte_pktmbuf_mtod(mbuf, struct fw_filter_wr *);
+       fwr = rte_pktmbuf_mtod(mbuf, struct fw_filter2_wr *);
        memset(fwr, 0, sizeof(*fwr));
 
        /*
         * Construct the work request to set the filter.
         */
-       fwr->op_pkd = cpu_to_be32(V_FW_WR_OP(FW_FILTER_WR));
+       if (adapter->params.filter2_wr_support)
+               fwr->op_pkd = cpu_to_be32(V_FW_WR_OP(FW_FILTER2_WR));
+       else
+               fwr->op_pkd = cpu_to_be32(V_FW_WR_OP(FW_FILTER_WR));
        fwr->len16_pkd = cpu_to_be32(V_FW_WR_LEN16(sizeof(*fwr) / 16));
        fwr->tid_to_iq =
                cpu_to_be32(V_FW_FILTER_WR_TID(f->tid) |
@@ -762,6 +775,20 @@ int set_filter_wr(struct rte_eth_dev *dev, unsigned int fidx)
        fwr->fp = cpu_to_be16(f->fs.val.fport);
        fwr->fpm = cpu_to_be16(f->fs.mask.fport);
 
+       if (adapter->params.filter2_wr_support) {
+               fwr->filter_type_swapmac =
+                        V_FW_FILTER2_WR_SWAPMAC(f->fs.swapmac);
+               fwr->natmode_to_ulp_type =
+                       V_FW_FILTER2_WR_ULP_TYPE(f->fs.nat_mode ?
+                                                ULP_MODE_TCPDDP :
+                                                ULP_MODE_NONE) |
+                       V_FW_FILTER2_WR_NATMODE(f->fs.nat_mode);
+               memcpy(fwr->newlip, f->fs.nat_lip, sizeof(fwr->newlip));
+               memcpy(fwr->newfip, f->fs.nat_fip, sizeof(fwr->newfip));
+               fwr->newlport = cpu_to_be16(f->fs.nat_lport);
+               fwr->newfport = cpu_to_be16(f->fs.nat_fport);
+       }
+
        /*
         * Mark the filter as "pending" and ship off the Filter Work Request.
         * When we get the Work Request Reply we'll clear the pending status.