summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnand B Jyoti <anand.b.jyoti@intel.com>2017-06-05 08:34:23 +0530
committerAnand B Jyoti <anand.b.jyoti@intel.com>2017-06-09 11:08:33 +0530
commit532abcdd692ee2c0aef5a9e74088470d2e2e16f1 (patch)
tree9708c5528f86a7bb8784c2a6cf4ce40c26c55c06
parent44e700fcfe8655565076b9c3036c61b2e53a8bcd (diff)
vCGNAPT: remove unused function and a patch
JIRA: SAMPLEVNF-21 Removing unused function rte_pipeline_action_handler_port_ext() and a patch rte_pipeline.patch which was applied on top of DPDK 16.04. These are not used, hence cleaning up for DPDK migration. Change-Id: I33a646ad27857c880969574b37412236ed3d780c Signed-off-by: Anand B Jyoti <anand.b.jyoti@intel.com>
-rw-r--r--VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.h5
-rw-r--r--patches/dpdk_custom_patch/rte_pipeline.patch88
-rwxr-xr-xtools/vnf_build.sh1
3 files changed, 0 insertions, 94 deletions
diff --git a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.h b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.h
index 94f19f1e..34031192 100644
--- a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.h
+++ b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.h
@@ -756,11 +756,6 @@ int pipeline_cgnapt_msg_req_entry_addm_pair(
uint8_t type, uint8_t src_ipv6[16]);
/* CGNAPT Functions */
-extern void rte_pipeline_action_handler_port_ext(
- struct rte_pipeline *p,
- uint64_t pkts_mask,
- struct rte_pipeline_table_entry **entries);
-
uint64_t pkt_miss_cgnapt(
struct pipeline_cgnapt_entry_key *key,
struct rte_mbuf *pkt,
diff --git a/patches/dpdk_custom_patch/rte_pipeline.patch b/patches/dpdk_custom_patch/rte_pipeline.patch
deleted file mode 100644
index 3f52d326..00000000
--- a/patches/dpdk_custom_patch/rte_pipeline.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- lib/librte_pipeline/rte_pipeline.c 2016-08-10 21:50:46.625571187 +0530
-+++ lib/librte_pipeline/rte_pipeline.c 2016-08-10 21:51:02.333571628 +0530
-@@ -1241,6 +1241,85 @@
- }
- }
-
-+void
-+rte_pipeline_action_handler_port_ext(struct rte_pipeline *p,
-+ uint64_t pkts_mask,
-+ struct rte_pipeline_table_entry **entries);
-+
-+void
-+rte_pipeline_action_handler_port_ext(struct rte_pipeline *p,
-+ uint64_t pkts_mask,
-+ struct rte_pipeline_table_entry **entries)
-+{
-+ p->pkts_mask = pkts_mask;
-+
-+ if ((pkts_mask & (pkts_mask + 1)) == 0) {
-+ uint64_t n_pkts = __builtin_popcountll(pkts_mask);
-+ uint32_t i;
-+
-+ for (i = 0; i < n_pkts; i++) {
-+ struct rte_mbuf *pkt = p->pkts[i];
-+ uint32_t port_out_id = entries[i]->port_id;
-+ struct rte_port_out *port_out =
-+ &p->ports_out[port_out_id];
-+
-+ /* Output port user actions */
-+ if (port_out->f_action == NULL) /* Output port TX */
-+ port_out->ops.f_tx(port_out->h_port, pkt);
-+ else {
-+ uint64_t pkt_mask = 1LLU << i;
-+
-+ port_out->f_action(p,
-+ p->pkts,
-+ pkt_mask,
-+ port_out->arg_ah);
-+
-+ RTE_PIPELINE_STATS_AH_DROP_READ(p,
-+ port_out->n_pkts_dropped_by_ah);
-+
-+ /* Output port TX */
-+ if (pkt_mask & p->pkts_mask)
-+ port_out->ops.f_tx(port_out->h_port,
-+ pkt);
-+ }
-+ }
-+ } else {
-+ uint32_t i;
-+
-+ for (i = 0; i < RTE_PORT_IN_BURST_SIZE_MAX; i++) {
-+ uint64_t pkt_mask = 1LLU << i;
-+ struct rte_mbuf *pkt;
-+ struct rte_port_out *port_out;
-+ uint32_t port_out_id;
-+
-+ if ((pkt_mask & pkts_mask) == 0)
-+ continue;
-+
-+ pkt = p->pkts[i];
-+ port_out_id = entries[i]->port_id;
-+ port_out = &p->ports_out[port_out_id];
-+
-+ /* Output port user actions */
-+ if (port_out->f_action == NULL) /* Output port TX */
-+ port_out->ops.f_tx(port_out->h_port, pkt);
-+ else {
-+ port_out->f_action(p,
-+ p->pkts,
-+ pkt_mask,
-+ port_out->arg_ah);
-+
-+ RTE_PIPELINE_STATS_AH_DROP_READ(p,
-+ port_out->n_pkts_dropped_by_ah);
-+
-+ /* Output port TX */
-+ if (pkt_mask & p->pkts_mask)
-+ port_out->ops.f_tx(port_out->h_port,
-+ pkt);
-+ }
-+ }
-+ }
-+}
-+
- static inline void
- rte_pipeline_action_handler_port_meta(struct rte_pipeline *p,
- uint64_t pkts_mask)
diff --git a/tools/vnf_build.sh b/tools/vnf_build.sh
index f6afb879..7d552619 100755
--- a/tools/vnf_build.sh
+++ b/tools/vnf_build.sh
@@ -183,7 +183,6 @@ install_dpdk()
pushd $DPDK_DIR
echo "Apply dpdk custom patches..."
- patch -p0 < $VNF_CORE/patches/dpdk_custom_patch/rte_pipeline.patch
patch -p1 < $VNF_CORE/patches/dpdk_custom_patch/i40e-fix-link-management.patch
patch -p1 < $VNF_CORE/patches/dpdk_custom_patch/i40e-fix-Rx-hang-when-disable-LLDP.patch
patch -p1 < $VNF_CORE/patches/dpdk_custom_patch/i40e-fix-link-status-change-interrupt.patch