diff options
| author |   Xavier Simonart <xavier.simonart@intel.com> | 2019-05-28 15:31:43 +0200 |
|---|---|---|
| committer | Xavier Simonart <xavier.simonart@intel.com> | 2019-10-09 15:50:26 +0200 |
| commit | 4cc4dabe80eb7d19c20920b7ec20899d6a76a1dd (patch) | |
| tree | ee67e444dbc9806f1d63ba3d821788b422cb8bbf /VNFs/DPPD-PROX/handle_classify.c | |
| parent | 73b79d29bc926a87e317c3881c197fc2db64e9d0 (diff) | |
Added support for DPDK 19.02 and 19.05
This includes supporting following API changes
- RTE_VER_... now in rte_config.h instead of rte_version.h
- <rte_ethdev.h> now seems required by <rte_eth_ctrl.h>
- rte_sched_port_pkt_write takes extra argument
- rte_sched_port_pkt_read_tree_path takes extra argument
- enum rte_meter_color replaced by rte_color
The extra argument, sched_port, is initialized based on qos_conf parameters.
Modes such as qinq_encap4 uses sched_port when doing classification, but does
not set qos_conf params. It inherits the sched_port from QoS
Change-Id: If8312918241e7d482161a7538f53faac6c303e86
Signed-off-by: Xavier Simonart <xavier.simonart@intel.com>
Diffstat (limited to 'VNFs/DPPD-PROX/handle_classify.c')
| -rw-r--r-- | VNFs/DPPD-PROX/handle_classify.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/VNFs/DPPD-PROX/handle_classify.c b/VNFs/DPPD-PROX/handle_classify.c index f4f96aaf..59b9b266 100644 --- a/VNFs/DPPD-PROX/handle_classify.c +++ b/VNFs/DPPD-PROX/handle_classify.c @@ -32,11 +32,14 @@ #include "log.h" #include "quit.h" #include "prox_shared.h" +#include "handle_sched.h" +#include "prox_compat.h" struct task_classify { struct task_base base; uint16_t *user_table; uint8_t *dscp; + struct rte_sched_port *sched_port; }; static inline void handle_classify(struct task_classify *task, struct rte_mbuf *mbuf) @@ -52,7 +55,7 @@ static inline void handle_classify(struct task_classify *task, struct rte_mbuf * uint32_t prev_tc; #if RTE_VERSION >= RTE_VERSION_NUM(1,8,0,0) uint32_t dummy; - rte_sched_port_pkt_read_tree_path(mbuf, &dummy, &dummy, &prev_tc, &dummy); + prox_rte_sched_port_pkt_read_tree_path(task->sched_port, mbuf, &dummy, &dummy, &prev_tc, &dummy); #else struct rte_sched_port_hierarchy *sched = (struct rte_sched_port_hierarchy *) &mbuf->pkt.hash.sched; prev_tc = sched->traffic_class; @@ -64,7 +67,7 @@ static inline void handle_classify(struct task_classify *task, struct rte_mbuf * uint8_t queue = dscp & 0x3; uint8_t tc = prev_tc? prev_tc : dscp >> 2; - rte_sched_port_pkt_write(mbuf, 0, task->user_table[qinq], tc, queue, 0); + prox_rte_sched_port_pkt_write(task->sched_port, mbuf, 0, task->user_table[qinq], tc, queue, 0); } static int handle_classify_bulk(struct task_base *tbase, struct rte_mbuf **mbufs, uint16_t n_pkts) @@ -117,6 +120,8 @@ static void init_task_classify(struct task_base *tbase, struct task_args *targ) PROX_PANIC(ret, "Failed to create dscp table from config\n"); prox_sh_add_socket(socket_id, targ->dscp, task->dscp); } + int rc = init_port_sched(&task->sched_port, targ); + PROX_PANIC(rc, "Did not find any QoS task to transmit to => undefined sched_port parameters\n"); } static struct task_init task_init_classify = { |