From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 82422A0547; Fri, 10 Sep 2021 14:31:34 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0CBAB41172; Fri, 10 Sep 2021 14:30:34 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id E10B0410EB for ; Fri, 10 Sep 2021 14:30:22 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10102"; a="243386255" X-IronPort-AV: E=Sophos;i="5.85,282,1624345200"; d="scan'208";a="243386255" 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:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,282,1624345200"; d="scan'208";a="514279703" 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:07 -0700 From: Cristian Dumitrescu To: dev@dpdk.org Date: Fri, 10 Sep 2021 13:29:43 +0100 Message-Id: <20210910123003.85448-4-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 04/24] pipeline: create inline functions for TX instruction X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Cristian Dumitrescu --- lib/pipeline/rte_swx_pipeline.c | 86 +--------------------- lib/pipeline/rte_swx_pipeline_internal.h | 90 ++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 84 deletions(-) diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c index ad1ecfc640..bcf796f8c3 100644 --- a/lib/pipeline/rte_swx_pipeline.c +++ b/lib/pipeline/rte_swx_pipeline.c @@ -1567,84 +1567,13 @@ instr_drop_translate(struct rte_swx_pipeline *p, return 0; } -static inline void -emit_handler(struct thread *t) -{ - struct header_out_runtime *h0 = &t->headers_out[0]; - struct header_out_runtime *h1 = &t->headers_out[1]; - uint32_t offset = 0, i; - - /* No header change or header decapsulation. */ - if ((t->n_headers_out == 1) && - (h0->ptr + h0->n_bytes == t->ptr)) { - TRACE("Emit handler: no header change or header decap.\n"); - - t->pkt.offset -= h0->n_bytes; - t->pkt.length += h0->n_bytes; - - return; - } - - /* Header encapsulation (optionally, with prior header decasulation). */ - if ((t->n_headers_out == 2) && - (h1->ptr + h1->n_bytes == t->ptr) && - (h0->ptr == h0->ptr0)) { - uint32_t offset; - - TRACE("Emit handler: header encapsulation.\n"); - - offset = h0->n_bytes + h1->n_bytes; - memcpy(t->ptr - offset, h0->ptr, h0->n_bytes); - t->pkt.offset -= offset; - t->pkt.length += offset; - - return; - } - - /* Header insertion. */ - /* TBD */ - - /* Header extraction. */ - /* TBD */ - - /* For any other case. */ - TRACE("Emit handler: complex case.\n"); - - for (i = 0; i < t->n_headers_out; i++) { - struct header_out_runtime *h = &t->headers_out[i]; - - memcpy(&t->header_out_storage[offset], h->ptr, h->n_bytes); - offset += h->n_bytes; - } - - if (offset) { - memcpy(t->ptr - offset, t->header_out_storage, offset); - t->pkt.offset -= offset; - t->pkt.length += offset; - } -} - -static inline void -instr_tx_exec(struct rte_swx_pipeline *p); - static inline void instr_tx_exec(struct rte_swx_pipeline *p) { struct thread *t = &p->threads[p->thread_id]; struct instruction *ip = t->ip; - uint64_t port_id = METADATA_READ(t, ip->io.io.offset, ip->io.io.n_bits); - struct port_out_runtime *port = &p->out[port_id]; - struct rte_swx_pkt *pkt = &t->pkt; - TRACE("[Thread %2u]: tx 1 pkt to port %u\n", - p->thread_id, - (uint32_t)port_id); - - /* Headers. */ - emit_handler(t); - - /* Packet. */ - port->pkt_tx(port->obj, pkt); + __instr_tx_exec(p, t, ip); /* Thread. */ thread_ip_reset(p, t); @@ -1656,19 +1585,8 @@ instr_tx_i_exec(struct rte_swx_pipeline *p) { struct thread *t = &p->threads[p->thread_id]; struct instruction *ip = t->ip; - uint64_t port_id = ip->io.io.val; - struct port_out_runtime *port = &p->out[port_id]; - struct rte_swx_pkt *pkt = &t->pkt; - - TRACE("[Thread %2u]: tx (i) 1 pkt to port %u\n", - p->thread_id, - (uint32_t)port_id); - - /* Headers. */ - emit_handler(t); - /* Packet. */ - port->pkt_tx(port->obj, pkt); + __instr_tx_i_exec(p, t, ip); /* Thread. */ thread_ip_reset(p, t); diff --git a/lib/pipeline/rte_swx_pipeline_internal.h b/lib/pipeline/rte_swx_pipeline_internal.h index 9814b5685a..e9fe6632b6 100644 --- a/lib/pipeline/rte_swx_pipeline_internal.h +++ b/lib/pipeline/rte_swx_pipeline_internal.h @@ -1490,4 +1490,94 @@ instr_rx_exec(struct rte_swx_pipeline *p) thread_yield(p); } +/* + * tx. + */ +static inline void +emit_handler(struct thread *t) +{ + struct header_out_runtime *h0 = &t->headers_out[0]; + struct header_out_runtime *h1 = &t->headers_out[1]; + uint32_t offset = 0, i; + + /* No header change or header decapsulation. */ + if ((t->n_headers_out == 1) && + (h0->ptr + h0->n_bytes == t->ptr)) { + TRACE("Emit handler: no header change or header decap.\n"); + + t->pkt.offset -= h0->n_bytes; + t->pkt.length += h0->n_bytes; + + return; + } + + /* Header encapsulation (optionally, with prior header decasulation). */ + if ((t->n_headers_out == 2) && + (h1->ptr + h1->n_bytes == t->ptr) && + (h0->ptr == h0->ptr0)) { + uint32_t offset; + + TRACE("Emit handler: header encapsulation.\n"); + + offset = h0->n_bytes + h1->n_bytes; + memcpy(t->ptr - offset, h0->ptr, h0->n_bytes); + t->pkt.offset -= offset; + t->pkt.length += offset; + + return; + } + + /* For any other case. */ + TRACE("Emit handler: complex case.\n"); + + for (i = 0; i < t->n_headers_out; i++) { + struct header_out_runtime *h = &t->headers_out[i]; + + memcpy(&t->header_out_storage[offset], h->ptr, h->n_bytes); + offset += h->n_bytes; + } + + if (offset) { + memcpy(t->ptr - offset, t->header_out_storage, offset); + t->pkt.offset -= offset; + t->pkt.length += offset; + } +} + +static inline void +__instr_tx_exec(struct rte_swx_pipeline *p, struct thread *t, const struct instruction *ip) +{ + uint64_t port_id = METADATA_READ(t, ip->io.io.offset, ip->io.io.n_bits); + struct port_out_runtime *port = &p->out[port_id]; + struct rte_swx_pkt *pkt = &t->pkt; + + TRACE("[Thread %2u]: tx 1 pkt to port %u\n", + p->thread_id, + (uint32_t)port_id); + + /* Headers. */ + emit_handler(t); + + /* Packet. */ + port->pkt_tx(port->obj, pkt); +} + +static inline void +__instr_tx_i_exec(struct rte_swx_pipeline *p, struct thread *t, const struct instruction *ip) +{ + uint64_t port_id = ip->io.io.val; + struct port_out_runtime *port = &p->out[port_id]; + struct rte_swx_pkt *pkt = &t->pkt; + + TRACE("[Thread %2u]: tx (i) 1 pkt to port %u\n", + p->thread_id, + (uint32_t)port_id); + + /* Headers. */ + emit_handler(t); + + /* Packet. */ + port->pkt_tx(port->obj, pkt); +} + #endif -- 2.17.1