From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id A0019A0548;
Fri, 10 Sep 2021 14:31:54 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 8F2E54117B;
Fri, 10 Sep 2021 14:30:37 +0200 (CEST)
Received: from mga01.intel.com (mga01.intel.com [192.55.52.88])
by mails.dpdk.org (Postfix) with ESMTP id A779541130
for <dev@dpdk.org>; Fri, 10 Sep 2021 14:30:23 +0200 (CEST)
X-IronPort-AV: E=McAfee;i="6200,9189,10102"; a="243386267"
X-IronPort-AV: E=Sophos;i="5.85,282,1624345200"; d="scan'208";a="243386267"
Received: from orsmga001.jf.intel.com ([10.7.209.18])
by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
10 Sep 2021 05:30:11 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.85,282,1624345200"; d="scan'208";a="514279729"
Received: from silpixa00400573.ir.intel.com (HELO
silpixa00400573.ger.corp.intel.com) ([10.237.223.107])
by orsmga001.jf.intel.com with ESMTP; 10 Sep 2021 05:30:10 -0700
From: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
To: dev@dpdk.org
Date: Fri, 10 Sep 2021 13:29:47 +0100
Message-Id: <20210910123003.85448-8-cristian.dumitrescu@intel.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20210910123003.85448-1-cristian.dumitrescu@intel.com>
References: <20210910123003.85448-1-cristian.dumitrescu@intel.com>
Subject: [dpdk-dev] [PATCH 08/24] pipeline: create inline functions for
learn instruction
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
---
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.17.1