Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
---
lib/pipeline/rte_swx_pipeline.c | 38 ------------------
lib/pipeline/rte_swx_pipeline_internal.h | 51 ++++++++++++++++++++++++
2 files changed, 51 insertions(+), 38 deletions(-)
@@ -1517,44 +1517,6 @@ instr_rx_translate(struct rte_swx_pipeline *p,
return 0;
}
-static inline void
-instr_rx_exec(struct rte_swx_pipeline *p);
-
-static inline void
-instr_rx_exec(struct rte_swx_pipeline *p)
-{
- struct thread *t = &p->threads[p->thread_id];
- struct instruction *ip = t->ip;
- struct port_in_runtime *port = &p->in[p->port_id];
- struct rte_swx_pkt *pkt = &t->pkt;
- int pkt_received;
-
- /* Packet. */
- pkt_received = port->pkt_rx(port->obj, pkt);
- t->ptr = &pkt->pkt[pkt->offset];
- rte_prefetch0(t->ptr);
-
- TRACE("[Thread %2u] rx %s from port %u\n",
- p->thread_id,
- pkt_received ? "1 pkt" : "0 pkts",
- p->port_id);
-
- /* Headers. */
- t->valid_headers = 0;
- t->n_headers_out = 0;
-
- /* Meta-data. */
- METADATA_WRITE(t, ip->io.io.offset, ip->io.io.n_bits, p->port_id);
-
- /* Tables. */
- t->table_state = p->table_state;
-
- /* Thread. */
- pipeline_port_inc(p);
- thread_ip_inc_cond(t, pkt_received);
- thread_yield(p);
-}
-
/*
* tx.
*/
@@ -1439,4 +1439,55 @@ thread_yield_cond(struct rte_swx_pipeline *p, int cond)
p->thread_id = (p->thread_id + cond) & (RTE_SWX_PIPELINE_THREADS_MAX - 1);
}
+/*
+ * rx.
+ */
+static inline int
+__instr_rx_exec(struct rte_swx_pipeline *p, struct thread *t, const struct instruction *ip)
+{
+ struct port_in_runtime *port = &p->in[p->port_id];
+ struct rte_swx_pkt *pkt = &t->pkt;
+ int pkt_received;
+
+ /* Packet. */
+ pkt_received = port->pkt_rx(port->obj, pkt);
+ t->ptr = &pkt->pkt[pkt->offset];
+ rte_prefetch0(t->ptr);
+
+ TRACE("[Thread %2u] rx %s from port %u\n",
+ p->thread_id,
+ pkt_received ? "1 pkt" : "0 pkts",
+ p->port_id);
+
+ /* Headers. */
+ t->valid_headers = 0;
+ t->n_headers_out = 0;
+
+ /* Meta-data. */
+ METADATA_WRITE(t, ip->io.io.offset, ip->io.io.n_bits, p->port_id);
+
+ /* Tables. */
+ t->table_state = p->table_state;
+
+ /* Thread. */
+ pipeline_port_inc(p);
+
+ return pkt_received;
+}
+
+static inline void
+instr_rx_exec(struct rte_swx_pipeline *p)
+{
+ struct thread *t = &p->threads[p->thread_id];
+ struct instruction *ip = t->ip;
+ int pkt_received;
+
+ /* Packet. */
+ pkt_received = __instr_rx_exec(p, t, ip);
+
+ /* Thread. */
+ thread_ip_inc_cond(t, pkt_received);
+ thread_yield(p);
+}
+
#endif