From d1a58ada1a43691ffba6813ba23b15a1cd3b2012 Mon Sep 17 00:00:00 2001 From: Cristian Dumitrescu Date: Mon, 13 Sep 2021 17:44:27 +0100 Subject: [PATCH] pipeline: create inline functions for learn instruction Create inline functions for the learn and forget instructions. Signed-off-by: Cristian Dumitrescu --- lib/pipeline/rte_swx_pipeline.c | 36 ++-------------- lib/pipeline/rte_swx_pipeline_internal.h | 55 ++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 33 deletions(-) diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c index 6c6d8e52a5..ca12f34b01 100644 --- a/lib/pipeline/rte_swx_pipeline.c +++ b/lib/pipeline/rte_swx_pipeline.c @@ -2230,27 +2230,8 @@ instr_learn_exec(struct rte_swx_pipeline *p) { struct thread *t = &p->threads[p->thread_id]; struct instruction *ip = t->ip; - uint64_t action_id = ip->learn.action_id; - uint32_t learner_id = t->learner_id; - struct rte_swx_table_state *ts = &t->table_state[p->n_tables + - p->n_selectors + learner_id]; - struct learner_runtime *l = &t->learners[learner_id]; - struct learner_statistics *stats = &p->learner_stats[learner_id]; - uint32_t status; - - /* Table. */ - status = rte_swx_table_learner_add(ts->obj, - l->mailbox, - t->time, - action_id, - l->action_data[action_id]); - - TRACE("[Thread %2u] learner %u learn %s\n", - p->thread_id, - learner_id, - status ? "ok" : "error"); - stats->n_pkts_learn[status] += 1; + __instr_learn_exec(p, t, ip); /* Thread. */ thread_ip_inc(p); @@ -2279,20 +2260,9 @@ static inline void instr_forget_exec(struct rte_swx_pipeline *p) { struct thread *t = &p->threads[p->thread_id]; - uint32_t learner_id = t->learner_id; - struct rte_swx_table_state *ts = &t->table_state[p->n_tables + - p->n_selectors + learner_id]; - struct learner_runtime *l = &t->learners[learner_id]; - struct learner_statistics *stats = &p->learner_stats[learner_id]; - - /* Table. */ - rte_swx_table_learner_delete(ts->obj, l->mailbox); - - TRACE("[Thread %2u] learner %u forget\n", - p->thread_id, - learner_id); + struct instruction *ip = t->ip; - stats->n_pkts_forget += 1; + __instr_forget_exec(p, t, ip); /* Thread. */ thread_ip_inc(p); diff --git a/lib/pipeline/rte_swx_pipeline_internal.h b/lib/pipeline/rte_swx_pipeline_internal.h index 312490f11a..24096a23b6 100644 --- a/lib/pipeline/rte_swx_pipeline_internal.h +++ b/lib/pipeline/rte_swx_pipeline_internal.h @@ -1960,4 +1960,59 @@ __instr_hdr_invalidate_exec(struct rte_swx_pipeline *p __rte_unused, t->valid_headers = MASK64_BIT_CLR(t->valid_headers, header_id); } +/* + * learn. + */ +static inline void +__instr_learn_exec(struct rte_swx_pipeline *p, + struct thread *t, + const struct instruction *ip) +{ + uint64_t action_id = ip->learn.action_id; + uint32_t learner_id = t->learner_id; + struct rte_swx_table_state *ts = &t->table_state[p->n_tables + + p->n_selectors + learner_id]; + struct learner_runtime *l = &t->learners[learner_id]; + struct learner_statistics *stats = &p->learner_stats[learner_id]; + uint32_t status; + + /* Table. */ + status = rte_swx_table_learner_add(ts->obj, + l->mailbox, + t->time, + action_id, + l->action_data[action_id]); + + TRACE("[Thread %2u] learner %u learn %s\n", + p->thread_id, + learner_id, + status ? "ok" : "error"); + + stats->n_pkts_learn[status] += 1; +} + +/* + * forget. + */ +static inline void +__instr_forget_exec(struct rte_swx_pipeline *p, + struct thread *t, + const struct instruction *ip __rte_unused) +{ + uint32_t learner_id = t->learner_id; + struct rte_swx_table_state *ts = &t->table_state[p->n_tables + + p->n_selectors + learner_id]; + struct learner_runtime *l = &t->learners[learner_id]; + struct learner_statistics *stats = &p->learner_stats[learner_id]; + + /* Table. */ + rte_swx_table_learner_delete(ts->obj, l->mailbox); + + TRACE("[Thread %2u] learner %u forget\n", + p->thread_id, + learner_id); + + stats->n_pkts_forget += 1; +} + #endif -- 2.20.1