From patchwork Fri Mar 4 18:06:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Dumitrescu X-Patchwork-Id: 108542 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1914BA034E; Fri, 4 Mar 2022 19:06:29 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8BF70427D8; Fri, 4 Mar 2022 19:06:28 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id BC50A427A9 for ; Fri, 4 Mar 2022 19:06:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646417186; x=1677953186; h=from:to:subject:date:message-id; bh=YXYlQJD0pyYbAW9NOnPJU3/4d3DQQACx2yeMk+s3PE4=; b=m1thyj1r9nv0qLF/qycEEuSNgYFbfU3CTOCJJSBUidV1IwpoDyUl2H9m gDe0DJzLxgtoxdFQcS9CiimQcHm9xNE139KKO8a6/EywKxKXKNBfzPUET 9khQA+AHVT3epv4bpd1/zg3YODMPU9CoOw0XG2s1NBIrC3eDnB7x7HpDT WUkPCWoH0hQEaKgOu9SXD7QC3l4QR4I66vx+5riaHRbbw/Q9ghB2tpcwe mazaZLCPgA7+W618hrg05MFz8/uh/dT1NistmhIyb/4lOTy/TAxXoq+5j 1PvqmrAdHFWXQ0ksjkHS9cTtMsrfhh1v3QNXujLxu0lK5ZjHvg218SaGj w==; X-IronPort-AV: E=McAfee;i="6200,9189,10276"; a="251604396" X-IronPort-AV: E=Sophos;i="5.90,155,1643702400"; d="scan'208";a="251604396" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 10:06:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,155,1643702400"; d="scan'208";a="552309330" Received: from silpixa00400573.ir.intel.com (HELO silpixa00400573.ger.corp.intel.com) ([10.237.223.107]) by orsmga008.jf.intel.com with ESMTP; 04 Mar 2022 10:06:23 -0800 From: Cristian Dumitrescu To: dev@dpdk.org Subject: [PATCH 1/3] port: support packet mirroring Date: Fri, 4 Mar 2022 18:06:21 +0000 Message-Id: <20220304180623.74893-1-cristian.dumitrescu@intel.com> X-Mailer: git-send-email 2.17.1 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 Add packet clone operation to the output ports in order to support packet mirroring. Signed-off-by: Cristian Dumitrescu --- lib/pipeline/rte_swx_pipeline.c | 2 ++ lib/pipeline/rte_swx_pipeline_internal.h | 1 + lib/port/rte_swx_port.h | 15 ++++++++++ lib/port/rte_swx_port_ethdev.c | 29 ++++++++++++++++++++ lib/port/rte_swx_port_fd.c | 29 ++++++++++++++++++++ lib/port/rte_swx_port_ring.c | 28 +++++++++++++++++++ lib/port/rte_swx_port_source_sink.c | 35 ++++++++++++++++++++++++ 7 files changed, 139 insertions(+) diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c index 8c4670e111..bde20c5660 100644 --- a/lib/pipeline/rte_swx_pipeline.c +++ b/lib/pipeline/rte_swx_pipeline.c @@ -423,6 +423,7 @@ rte_swx_pipeline_port_out_type_register(struct rte_swx_pipeline *p, CHECK(ops->create, EINVAL); CHECK(ops->free, EINVAL); CHECK(ops->pkt_tx, EINVAL); + CHECK(ops->pkt_clone_tx, EINVAL); CHECK(ops->stats_read, EINVAL); CHECK(!port_out_type_find(p, name), EEXIST); @@ -509,6 +510,7 @@ port_out_build(struct rte_swx_pipeline *p) struct port_out_runtime *out = &p->out[port->id]; out->pkt_tx = port->type->ops.pkt_tx; + out->pkt_clone_tx = port->type->ops.pkt_clone_tx; out->flush = port->type->ops.flush; out->obj = port->obj; } diff --git a/lib/pipeline/rte_swx_pipeline_internal.h b/lib/pipeline/rte_swx_pipeline_internal.h index da3e88bfa8..6ccd9948fa 100644 --- a/lib/pipeline/rte_swx_pipeline_internal.h +++ b/lib/pipeline/rte_swx_pipeline_internal.h @@ -104,6 +104,7 @@ TAILQ_HEAD(port_out_tailq, port_out); struct port_out_runtime { rte_swx_port_out_pkt_tx_t pkt_tx; + rte_swx_port_out_pkt_clone_tx_t pkt_clone_tx; rte_swx_port_out_flush_t flush; void *obj; }; diff --git a/lib/port/rte_swx_port.h b/lib/port/rte_swx_port.h index ecf109d2ca..e305a580fe 100644 --- a/lib/port/rte_swx_port.h +++ b/lib/port/rte_swx_port.h @@ -147,6 +147,18 @@ typedef void (*rte_swx_port_out_pkt_tx_t)(void *port, struct rte_swx_pkt *pkt); +/** + * Output port packet clone and transmit + * + * @param[in] port + * Output port handle. + * @param[in] pkt + * Packet to be transmitted. + */ +typedef void +(*rte_swx_port_out_pkt_clone_tx_t)(void *port, + struct rte_swx_pkt *pkt); + /** * Output port flush * @@ -188,6 +200,9 @@ struct rte_swx_port_out_ops { /** Packet transmission. Must be non-NULL. */ rte_swx_port_out_pkt_tx_t pkt_tx; + /** Packet clone transmission. Must be non-NULL. */ + rte_swx_port_out_pkt_clone_tx_t pkt_clone_tx; + /** Flush. May be NULL. */ rte_swx_port_out_flush_t flush; diff --git a/lib/port/rte_swx_port_ethdev.c b/lib/port/rte_swx_port_ethdev.c index 18d1c0b5db..a9101e805d 100644 --- a/lib/port/rte_swx_port_ethdev.c +++ b/lib/port/rte_swx_port_ethdev.c @@ -264,6 +264,34 @@ writer_pkt_tx(void *port, struct rte_swx_pkt *pkt) __writer_flush(p); } +static void +writer_pkt_clone_tx(void *port, struct rte_swx_pkt *pkt) +{ + struct writer *p = port; + struct rte_mbuf *m = pkt->handle; + + TRACE("[Ethdev TX port %u queue %u] Pkt %d (%u bytes at offset %u) (clone)\n", + (uint32_t)p->params.port_id, + (uint32_t)p->params.queue_id, + p->n_pkts - 1, + pkt->length, + pkt->offset); + if (TRACE_LEVEL) + rte_hexdump(stdout, NULL, &pkt->pkt[pkt->offset], pkt->length); + + m->pkt_len = pkt->length; + m->data_len = (uint16_t)pkt->length; + m->data_off = (uint16_t)pkt->offset; + rte_mbuf_refcnt_update(m, 1); + + p->stats.n_pkts++; + p->stats.n_bytes += pkt->length; + + p->pkts[p->n_pkts++] = m; + if (p->n_pkts == (int)p->params.burst_size) + __writer_flush(p); +} + static void writer_flush(void *port) { @@ -308,6 +336,7 @@ struct rte_swx_port_out_ops rte_swx_port_ethdev_writer_ops = { .create = writer_create, .free = writer_free, .pkt_tx = writer_pkt_tx, + .pkt_clone_tx = writer_pkt_clone_tx, .flush = writer_flush, .stats_read = writer_stats_read, }; diff --git a/lib/port/rte_swx_port_fd.c b/lib/port/rte_swx_port_fd.c index 51bcd3bb7b..1806772c04 100644 --- a/lib/port/rte_swx_port_fd.c +++ b/lib/port/rte_swx_port_fd.c @@ -249,6 +249,34 @@ writer_pkt_tx(void *port, struct rte_swx_pkt *pkt) __writer_flush(p); } +static void +writer_pkt_clone_tx(void *port, struct rte_swx_pkt *pkt) +{ + struct writer *p = port; + struct rte_mbuf *m = pkt->handle; + + TRACE("[FD %u] Pkt %u (%u bytes at offset %u) (clone)\n", + (uint32_t)p->params.fd, + p->n_pkts - 1, + pkt->length, + pkt->offset); + + if (TRACE_LEVEL) + rte_hexdump(stdout, NULL, &pkt->pkt[pkt->offset], pkt->length); + + m->pkt_len = pkt->length; + m->data_len = (uint16_t)pkt->length; + m->data_off = (uint16_t)pkt->offset; + rte_mbuf_refcnt_update(m, 1); + + p->stats.n_pkts++; + p->stats.n_bytes += pkt->length; + + p->pkts[p->n_pkts++] = m; + if (p->n_pkts == p->params.burst_size) + __writer_flush(p); +} + static void writer_flush(void *port) { @@ -293,6 +321,7 @@ struct rte_swx_port_out_ops rte_swx_port_fd_writer_ops = { .create = writer_create, .free = writer_free, .pkt_tx = writer_pkt_tx, + .pkt_clone_tx = writer_pkt_clone_tx, .flush = writer_flush, .stats_read = writer_stats_read, }; diff --git a/lib/port/rte_swx_port_ring.c b/lib/port/rte_swx_port_ring.c index 8a076a2135..f6a36e7fa1 100644 --- a/lib/port/rte_swx_port_ring.c +++ b/lib/port/rte_swx_port_ring.c @@ -264,6 +264,33 @@ writer_pkt_tx(void *port, struct rte_swx_pkt *pkt) __writer_flush(p); } +static void +writer_pkt_clone_tx(void *port, struct rte_swx_pkt *pkt) +{ + struct writer *p = port; + struct rte_mbuf *m = pkt->handle; + + TRACE("[Ring %s] Pkt %d (%u bytes at offset %u) (clone)\n", + p->params.name, + p->n_pkts - 1, + pkt->length, + pkt->offset); + if (TRACE_LEVEL) + rte_hexdump(stdout, NULL, &pkt->pkt[pkt->offset], pkt->length); + + m->pkt_len = pkt->length; + m->data_len = (uint16_t)pkt->length; + m->data_off = (uint16_t)pkt->offset; + rte_mbuf_refcnt_update(m, 1); + + p->stats.n_pkts++; + p->stats.n_bytes += pkt->length; + + p->pkts[p->n_pkts++] = m; + if (p->n_pkts == (int)p->params.burst_size) + __writer_flush(p); +} + static void writer_flush(void *port) { @@ -312,6 +339,7 @@ struct rte_swx_port_out_ops rte_swx_port_ring_writer_ops = { .create = writer_create, .free = writer_free, .pkt_tx = writer_pkt_tx, + .pkt_clone_tx = writer_pkt_clone_tx, .flush = writer_flush, .stats_read = writer_stats_read, }; diff --git a/lib/port/rte_swx_port_source_sink.c b/lib/port/rte_swx_port_source_sink.c index 93c346cfb1..1dd446f3ab 100644 --- a/lib/port/rte_swx_port_source_sink.c +++ b/lib/port/rte_swx_port_source_sink.c @@ -319,6 +319,40 @@ sink_pkt_tx(void *port, struct rte_swx_pkt *pkt) rte_pktmbuf_free(m); } +static void +sink_pkt_clone_tx(void *port, struct rte_swx_pkt *pkt) +{ + struct sink *p = port; + struct rte_mbuf *m = pkt->handle; + + TRACE("[Sink port] Pkt TX (%u bytes at offset %u)\n", + pkt->length, + pkt->offset); + if (TRACE_LEVEL) + rte_hexdump(stdout, NULL, &pkt->pkt[pkt->offset], pkt->length); + + m->pkt_len = pkt->length; + m->data_len = (uint16_t)pkt->length; + m->data_off = (uint16_t)pkt->offset; + + p->stats.n_pkts++; + p->stats.n_bytes += pkt->length; + +#ifdef RTE_PORT_PCAP + if (p->f_dump) { + struct pcap_pkthdr pcap_pkthdr; + uint8_t *m_data = rte_pktmbuf_mtod(m, uint8_t *); + + pcap_pkthdr.len = m->pkt_len; + pcap_pkthdr.caplen = m->data_len; + gettimeofday(&pcap_pkthdr.ts, NULL); + + pcap_dump((uint8_t *)p->f_dump, &pcap_pkthdr, m_data); + pcap_dump_flush(p->f_dump); + } +#endif +} + static void sink_stats_read(void *port, struct rte_swx_port_out_stats *stats) { @@ -337,6 +371,7 @@ struct rte_swx_port_out_ops rte_swx_port_sink_ops = { .create = sink_create, .free = sink_free, .pkt_tx = sink_pkt_tx, + .pkt_clone_tx = sink_pkt_clone_tx, .flush = NULL, .stats_read = sink_stats_read, }; From patchwork Fri Mar 4 18:06:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Dumitrescu X-Patchwork-Id: 108543 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 296B9A034E; Fri, 4 Mar 2022 19:06:37 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C1A73427E3; Fri, 4 Mar 2022 19:06:29 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id 8884F427A9 for ; Fri, 4 Mar 2022 19:06:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646417187; x=1677953187; h=from:to:subject:date:message-id:in-reply-to:references; bh=+92DOQ1xX2XdcFSdDA68rDTMiZq06Pd11ESobSuKGHQ=; b=GK/S58FVOeq6PEHzSmVat7k4fjXVBDEtbDDQwU5L3CcGk+OC4b9zf22p XVSscMEuORWvpegqVTiPQT+phLI6seTWxqarF4TnDg9bYS+msPEhEVUk9 IxnNYfaUOJWf+0y8Qz9Ml9rol8/ZxUdpLPdpZZ8AMd2rKsUCbIEEvW1JO o8g34YYXhYFYI1fLVu2LvDhlY8f7Rp5C3vib/SB9yNYbNV1onQqKdR3/z j2PMOfT3Y4DBfpcX7uDUxsUnDgSHJ1LFiu4EQVbQobnXMQR7vRauitET9 aCybawm3Cmp81KjeWqgHqEKJtbIWwX/bvsIdYjXe6GX6Jn8vY5ykh06kO A==; X-IronPort-AV: E=McAfee;i="6200,9189,10276"; a="251604400" X-IronPort-AV: E=Sophos;i="5.90,155,1643702400"; d="scan'208";a="251604400" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 10:06:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,155,1643702400"; d="scan'208";a="552309338" Received: from silpixa00400573.ir.intel.com (HELO silpixa00400573.ger.corp.intel.com) ([10.237.223.107]) by orsmga008.jf.intel.com with ESMTP; 04 Mar 2022 10:06:25 -0800 From: Cristian Dumitrescu To: dev@dpdk.org Subject: [PATCH 2/3] pipeline: support packet mirroring Date: Fri, 4 Mar 2022 18:06:22 +0000 Message-Id: <20220304180623.74893-2-cristian.dumitrescu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220304180623.74893-1-cristian.dumitrescu@intel.com> References: <20220304180623.74893-1-cristian.dumitrescu@intel.com> 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 The packet mirroring is configured through slots and sessions, with the number of slots and sessions set at init. The new "mirror" instruction assigns one of the existing sessions to a specific slot, which results in scheduling a mirror operation for the current packet to be executed later at the time the packet is either transmitted or dropped. Several copies of the same input packet can be mirrored to different output ports by using multiple slots. Signed-off-by: Cristian Dumitrescu --- lib/pipeline/rte_swx_ctl.h | 36 +++++ lib/pipeline/rte_swx_pipeline.c | 192 +++++++++++++++++++++++ lib/pipeline/rte_swx_pipeline.h | 30 ++++ lib/pipeline/rte_swx_pipeline_internal.h | 68 ++++++++ lib/pipeline/version.map | 2 + 5 files changed, 328 insertions(+) diff --git a/lib/pipeline/rte_swx_ctl.h b/lib/pipeline/rte_swx_ctl.h index ed752ad5eb..71dd19e16f 100644 --- a/lib/pipeline/rte_swx_ctl.h +++ b/lib/pipeline/rte_swx_ctl.h @@ -41,6 +41,12 @@ struct rte_swx_ctl_pipeline_info { /** Number of input ports. */ uint32_t n_ports_out; + /** Number of packet mirroring slots. */ + uint32_t n_mirroring_slots; + + /** Number of packet mirroring sessions. */ + uint32_t n_mirroring_sessions; + /** Number of actions. */ uint32_t n_actions; @@ -655,6 +661,36 @@ rte_swx_ctl_pipeline_learner_stats_read(struct rte_swx_pipeline *p, const char *learner_name, struct rte_swx_learner_stats *stats); +/* + * Packet mirroring API. + */ + +/** Packet mirroring session parameters. */ +struct rte_swx_pipeline_mirroring_session_params { + /** Output port ID. */ + uint32_t port_id; +}; + +/** + * Packet mirroring session set + * + * @param[in] p + * Pipeline handle. + * @param[in] session_id + * Packet mirroring session ID. + * @param[in] params + * Packet mirroring session parameters. + * @return + * 0 on success or the following error codes otherwise: + * -EINVAL: Invalid argument; + * -EEXIST: Pipeline was already built successfully. + */ +__rte_experimental +int +rte_swx_ctl_pipeline_mirroring_session_set(struct rte_swx_pipeline *p, + uint32_t session_id, + struct rte_swx_pipeline_mirroring_session_params *params); + /* * Table Update API. */ diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c index bde20c5660..7cf6dd1fb6 100644 --- a/lib/pipeline/rte_swx_pipeline.c +++ b/lib/pipeline/rte_swx_pipeline.c @@ -556,6 +556,81 @@ port_out_free(struct rte_swx_pipeline *p) } } +/* + * Packet mirroring. + */ +int +rte_swx_pipeline_mirroring_config(struct rte_swx_pipeline *p, + struct rte_swx_pipeline_mirroring_params *params) +{ + CHECK(p, EINVAL); + CHECK(params, EINVAL); + CHECK(params->n_slots, EINVAL); + CHECK(params->n_sessions, EINVAL); + CHECK(!p->build_done, EEXIST); + + p->n_mirroring_slots = rte_align32pow2(params->n_slots); + if (p->n_mirroring_slots > 64) + p->n_mirroring_slots = 64; + + p->n_mirroring_sessions = rte_align32pow2(params->n_sessions); + + return 0; +} + +static void +mirroring_build_free(struct rte_swx_pipeline *p) +{ + uint32_t i; + + for (i = 0; i < RTE_SWX_PIPELINE_THREADS_MAX; i++) { + struct thread *t = &p->threads[i]; + + /* mirroring_slots. */ + free(t->mirroring_slots); + t->mirroring_slots = NULL; + } + + /* mirroring_sessions. */ + free(p->mirroring_sessions); + p->mirroring_sessions = NULL; +} + +static void +mirroring_free(struct rte_swx_pipeline *p) +{ + mirroring_build_free(p); +} + +static int +mirroring_build(struct rte_swx_pipeline *p) +{ + uint32_t i; + + if (!p->n_mirroring_slots || !p->n_mirroring_sessions) + return 0; + + for (i = 0; i < RTE_SWX_PIPELINE_THREADS_MAX; i++) { + struct thread *t = &p->threads[i]; + + /* mirroring_slots. */ + t->mirroring_slots = calloc(p->n_mirroring_slots, sizeof(uint32_t)); + if (!t->mirroring_slots) + goto error; + } + + /* mirroring_sessions. */ + p->mirroring_sessions = calloc(p->n_mirroring_sessions, sizeof(struct mirroring_session)); + if (!p->mirroring_sessions) + goto error; + + return 0; + +error: + mirroring_build_free(p); + return -ENOMEM; +} + /* * Extern object. */ @@ -1655,6 +1730,56 @@ instr_drop_exec(struct rte_swx_pipeline *p) instr_rx_exec(p); } +/* + * mirror. + */ +static int +instr_mirror_translate(struct rte_swx_pipeline *p, + struct action *action, + char **tokens, + int n_tokens, + struct instruction *instr, + struct instruction_data *data __rte_unused) +{ + char *dst = tokens[1], *src = tokens[2]; + struct field *fdst, *fsrc; + uint32_t dst_struct_id = 0, src_struct_id = 0; + + CHECK(n_tokens == 3, EINVAL); + + fdst = struct_field_parse(p, action, dst, &dst_struct_id); + CHECK(fdst, EINVAL); + CHECK(dst[0] != 'h', EINVAL); + CHECK(!fdst->var_size, EINVAL); + + fsrc = struct_field_parse(p, action, src, &src_struct_id); + CHECK(fsrc, EINVAL); + CHECK(src[0] != 'h', EINVAL); + CHECK(!fsrc->var_size, EINVAL); + + instr->type = INSTR_MIRROR; + instr->mirror.dst.struct_id = (uint8_t)dst_struct_id; + instr->mirror.dst.n_bits = fdst->n_bits; + instr->mirror.dst.offset = fdst->offset / 8; + instr->mirror.src.struct_id = (uint8_t)src_struct_id; + instr->mirror.src.n_bits = fsrc->n_bits; + instr->mirror.src.offset = fsrc->offset / 8; + + return 0; +} + +static inline void +instr_mirror_exec(struct rte_swx_pipeline *p) +{ + struct thread *t = &p->threads[p->thread_id]; + struct instruction *ip = t->ip; + + __instr_mirror_exec(p, t, ip); + + /* Thread. */ + thread_ip_inc(p); +} + /* * extract. */ @@ -5655,6 +5780,14 @@ instr_translate(struct rte_swx_pipeline *p, instr, data); + if (!strcmp(tokens[tpos], "mirror")) + return instr_mirror_translate(p, + action, + &tokens[tpos], + n_tokens - tpos, + instr, + data); + if (!strcmp(tokens[tpos], "extract")) return instr_hdr_extract_translate(p, action, @@ -6679,6 +6812,7 @@ static instr_exec_t instruction_table[] = { [INSTR_TX] = instr_tx_exec, [INSTR_TX_I] = instr_tx_i_exec, [INSTR_DROP] = instr_drop_exec, + [INSTR_MIRROR] = instr_mirror_exec, [INSTR_HDR_EXTRACT] = instr_hdr_extract_exec, [INSTR_HDR_EXTRACT2] = instr_hdr_extract2_exec, @@ -9028,6 +9162,7 @@ rte_swx_pipeline_free(struct rte_swx_pipeline *p) header_free(p); extern_func_free(p); extern_obj_free(p); + mirroring_free(p); port_out_free(p); port_in_free(p); struct_free(p); @@ -9236,6 +9371,10 @@ rte_swx_pipeline_build(struct rte_swx_pipeline *p) if (status) goto error; + status = mirroring_build(p); + if (status) + goto error; + status = struct_build(p); if (status) goto error; @@ -9307,6 +9446,7 @@ rte_swx_pipeline_build(struct rte_swx_pipeline *p) header_build_free(p); extern_func_build_free(p); extern_obj_build_free(p); + mirroring_build_free(p); port_out_build_free(p); port_in_build_free(p); struct_build_free(p); @@ -9358,6 +9498,8 @@ rte_swx_ctl_pipeline_info_get(struct rte_swx_pipeline *p, pipeline->n_ports_in = p->n_ports_in; pipeline->n_ports_out = p->n_ports_out; + pipeline->n_mirroring_slots = p->n_mirroring_slots; + pipeline->n_mirroring_sessions = p->n_mirroring_sessions; pipeline->n_actions = n_actions; pipeline->n_tables = n_tables; pipeline->n_selectors = p->n_selectors; @@ -10045,6 +10187,25 @@ rte_swx_ctl_meter_stats_read(struct rte_swx_pipeline *p, return 0; } +int +rte_swx_ctl_pipeline_mirroring_session_set(struct rte_swx_pipeline *p, + uint32_t session_id, + struct rte_swx_pipeline_mirroring_session_params *params) +{ + struct mirroring_session *s; + + CHECK(p, EINVAL); + CHECK(p->build_done, EEXIST); + CHECK(session_id < p->n_mirroring_sessions, EINVAL); + CHECK(params, EINVAL); + CHECK(params->port_id < p->n_ports_out, EINVAL); + + s = &p->mirroring_sessions[session_id]; + s->port_id = params->port_id; + + return 0; +} + /* * Pipeline compilation. */ @@ -10057,6 +10218,7 @@ instr_type_to_name(struct instruction *instr) case INSTR_TX: return "INSTR_TX"; case INSTR_TX_I: return "INSTR_TX_I"; case INSTR_DROP: return "INSTR_DROP"; + case INSTR_MIRROR: return "INSTR_MIRROR"; case INSTR_HDR_EXTRACT: return "INSTR_HDR_EXTRACT"; case INSTR_HDR_EXTRACT2: return "INSTR_HDR_EXTRACT2"; @@ -10359,6 +10521,34 @@ instr_io_export(struct instruction *instr, FILE *f) "\t},\n"); } +static void +instr_mirror_export(struct instruction *instr, FILE *f) +{ + fprintf(f, + "\t{\n" + "\t\t.type = %s,\n" + "\t\t.mirror = {\n" + "\t\t\t.dst = {\n" + "\t\t\t\t.struct_id = %u,\n" + "\t\t\t\t.n_bits = %u,\n" + "\t\t\t\t.offset = %u,\n" + "\t\t\t}\n," + "\t\t\t.src = {\n" + "\t\t\t\t.struct_id = %u,\n" + "\t\t\t\t.n_bits = %u,\n" + "\t\t\t\t.offset = %u,\n" + "\t\t\t}\n," + "\t\t},\n" + "\t},\n", + instr_type_to_name(instr), + instr->mirror.dst.struct_id, + instr->mirror.dst.n_bits, + instr->mirror.dst.offset, + instr->mirror.src.struct_id, + instr->mirror.src.n_bits, + instr->mirror.src.offset); +} + static void instr_hdr_validate_export(struct instruction *instr, FILE *f) { @@ -10926,6 +11116,7 @@ static instruction_export_t export_table[] = { [INSTR_TX] = instr_io_export, [INSTR_TX_I] = instr_io_export, [INSTR_DROP] = instr_io_export, + [INSTR_MIRROR] = instr_mirror_export, [INSTR_HDR_EXTRACT] = instr_io_export, [INSTR_HDR_EXTRACT2] = instr_io_export, @@ -11144,6 +11335,7 @@ instr_type_to_func(struct instruction *instr) case INSTR_TX: return "__instr_tx_exec"; case INSTR_TX_I: return "__instr_tx_i_exec"; case INSTR_DROP: return "__instr_drop_exec"; + case INSTR_MIRROR: return "__instr_mirror_exec"; case INSTR_HDR_EXTRACT: return "__instr_hdr_extract_exec"; case INSTR_HDR_EXTRACT2: return "__instr_hdr_extract2_exec"; diff --git a/lib/pipeline/rte_swx_pipeline.h b/lib/pipeline/rte_swx_pipeline.h index 430e458335..1cfd1c542f 100644 --- a/lib/pipeline/rte_swx_pipeline.h +++ b/lib/pipeline/rte_swx_pipeline.h @@ -159,6 +159,36 @@ rte_swx_pipeline_port_out_config(struct rte_swx_pipeline *p, uint32_t port_id, const char *port_type_name, void *args); +/* + * Packet mirroring + */ + +/** Packet mirroring parameters. */ +struct rte_swx_pipeline_mirroring_params { + /** Number of packet mirroring slots. */ + uint32_t n_slots; + + /** Maximum number of packet mirroring sessions. */ + uint32_t n_sessions; +}; + +/** + * Packet mirroring configure + * + * @param[in] p + * Pipeline handle. + * @param[in] params + * Packet mirroring parameters. + * @return + * 0 on success or the following error codes otherwise: + * -EINVAL: Invalid argument; + * -ENOMEM: Not enough memory; + * -EEXIST: Pipeline was already built successfully. + */ +__rte_experimental +int +rte_swx_pipeline_mirroring_config(struct rte_swx_pipeline *p, + struct rte_swx_pipeline_mirroring_params *params); /* * Extern objects and functions diff --git a/lib/pipeline/rte_swx_pipeline_internal.h b/lib/pipeline/rte_swx_pipeline_internal.h index 6ccd9948fa..18c7fd60f8 100644 --- a/lib/pipeline/rte_swx_pipeline_internal.h +++ b/lib/pipeline/rte_swx_pipeline_internal.h @@ -109,6 +109,13 @@ struct port_out_runtime { void *obj; }; +/* + * Packet mirroring. + */ +struct mirroring_session { + uint32_t port_id; +}; + /* * Extern object. */ @@ -228,6 +235,13 @@ enum instruction_type { INSTR_TX_I, /* port_out = I */ INSTR_DROP, + /* + * mirror slot_id session_id + * slot_id = MEFT + * session_id = MEFT + */ + INSTR_MIRROR, + /* extract h.header */ INSTR_HDR_EXTRACT, INSTR_HDR_EXTRACT2, @@ -671,6 +685,7 @@ struct instruction { enum instruction_type type; union { struct instr_io io; + struct instr_dst_src mirror; struct instr_hdr_validity valid; struct instr_dst_src mov; struct instr_regarray regarray; @@ -903,6 +918,8 @@ struct thread { /* Packet. */ struct rte_swx_pkt pkt; uint8_t *ptr; + uint32_t *mirroring_slots; + uint64_t mirroring_slots_mask; /* Structures. */ uint8_t **structs; @@ -1400,6 +1417,7 @@ struct rte_swx_pipeline { struct port_in_runtime *in; struct port_out_runtime *out; + struct mirroring_session *mirroring_sessions; struct instruction **action_instructions; action_func_t *action_funcs; struct rte_swx_table_state *table_state; @@ -1417,6 +1435,8 @@ struct rte_swx_pipeline { uint32_t n_structs; uint32_t n_ports_in; uint32_t n_ports_out; + uint32_t n_mirroring_slots; + uint32_t n_mirroring_sessions; uint32_t n_extern_objs; uint32_t n_extern_funcs; uint32_t n_actions; @@ -1512,6 +1532,8 @@ __instr_rx_exec(struct rte_swx_pipeline *p, struct thread *t, const struct instr pkt_received ? "1 pkt" : "0 pkts", p->port_id); + t->mirroring_slots_mask = 0; + /* Headers. */ t->valid_headers = 0; t->n_headers_out = 0; @@ -1597,6 +1619,29 @@ emit_handler(struct thread *t) } } +static inline void +mirroring_handler(struct rte_swx_pipeline *p, struct thread *t, struct rte_swx_pkt *pkt) +{ + uint64_t slots_mask = t->mirroring_slots_mask, slot_mask; + uint32_t slot_id; + + for (slot_id = 0, slot_mask = 1LLU ; slots_mask; slot_id++, slot_mask <<= 1) + if (slot_mask & slots_mask) { + struct port_out_runtime *port; + struct mirroring_session *session; + uint32_t port_id, session_id; + + session_id = t->mirroring_slots[slot_id]; + session = &p->mirroring_sessions[session_id]; + + port_id = session->port_id; + port = &p->out[port_id]; + port->pkt_clone_tx(port->obj, pkt); + + slots_mask &= ~slot_mask; + } +} + static inline void __instr_tx_exec(struct rte_swx_pipeline *p, struct thread *t, const struct instruction *ip) { @@ -1612,6 +1657,7 @@ __instr_tx_exec(struct rte_swx_pipeline *p, struct thread *t, const struct instr emit_handler(t); /* Packet. */ + mirroring_handler(p, t, pkt); port->pkt_tx(port->obj, pkt); } @@ -1630,6 +1676,7 @@ __instr_tx_i_exec(struct rte_swx_pipeline *p, struct thread *t, const struct ins emit_handler(t); /* Packet. */ + mirroring_handler(p, t, pkt); port->pkt_tx(port->obj, pkt); } @@ -1649,9 +1696,30 @@ __instr_drop_exec(struct rte_swx_pipeline *p, emit_handler(t); /* Packet. */ + mirroring_handler(p, t, pkt); port->pkt_tx(port->obj, pkt); } +static inline void +__instr_mirror_exec(struct rte_swx_pipeline *p, + struct thread *t, + const struct instruction *ip) +{ + uint64_t slot_id = instr_operand_hbo(t, &ip->mirror.dst); + uint64_t session_id = instr_operand_hbo(t, &ip->mirror.src); + + slot_id &= p->n_mirroring_slots - 1; + session_id &= p->n_mirroring_sessions - 1; + + TRACE("[Thread %2u]: mirror pkt (slot = %u, session = %u)\n", + p->thread_id, + (uint32_t)slot_id, + (uint32_t)session_id); + + t->mirroring_slots[slot_id] = session_id; + t->mirroring_slots_mask |= 1LLU << slot_id; +} + /* * extract. */ diff --git a/lib/pipeline/version.map b/lib/pipeline/version.map index 8bc90e7cd7..44332aad26 100644 --- a/lib/pipeline/version.map +++ b/lib/pipeline/version.map @@ -67,6 +67,7 @@ EXPERIMENTAL { rte_swx_ctl_pipeline_create; rte_swx_ctl_pipeline_free; rte_swx_ctl_pipeline_info_get; + rte_swx_ctl_pipeline_mirroring_session_set; rte_swx_ctl_pipeline_numa_node_get; rte_swx_ctl_pipeline_port_in_stats_read; rte_swx_ctl_pipeline_port_out_stats_read; @@ -90,6 +91,7 @@ EXPERIMENTAL { rte_swx_pipeline_flush; rte_swx_pipeline_free; rte_swx_pipeline_instructions_config; + rte_swx_pipeline_mirroring_config; rte_swx_pipeline_packet_header_register; rte_swx_pipeline_packet_metadata_register; rte_swx_pipeline_port_in_config; From patchwork Fri Mar 4 18:06:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Dumitrescu X-Patchwork-Id: 108544 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9431BA034E; Fri, 4 Mar 2022 19:06:43 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BDC65427E9; Fri, 4 Mar 2022 19:06:30 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id 801C4427A9 for ; Fri, 4 Mar 2022 19:06:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646417188; x=1677953188; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=gRddU94qQSV69vqT0JKEiNgCoD5fLLKswPVkP2D8Nyc=; b=TivZGX5g8w4l+De0KjrTMW3uEO23iKx9BTNEgpFP6NIzD7ziXNHTAvEd qNxLsOyGlBB2sIkQetk0rTAjSmXed/4bKjmfhDO9AIZFY8LIJN3ylaHYF 0VPUMoXj4g53dbzK/UheMCaUf635JDcSATuzcfIovdYmxh0G3Bv0vs8PX ov+j4OfMaf4ViOPZKQuOZXAPMCgkb2VCx8/hJVsXCBFmJnS6WdbDxxe4M nYME1sXpeRhD4+7MYK4fL2mygI3+2kZfrjR3UVGUKjRL6gNDepw2czcOx qXOAgbgIFPO1rcgSz/CtiB/+J8vpadAzBp1yrvbO38UZPFQ40GBzWSJK7 g==; X-IronPort-AV: E=McAfee;i="6200,9189,10276"; a="251604403" X-IronPort-AV: E=Sophos;i="5.90,155,1643702400"; d="scan'208";a="251604403" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 10:06:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,155,1643702400"; d="scan'208";a="552309349" Received: from silpixa00400573.ir.intel.com (HELO silpixa00400573.ger.corp.intel.com) ([10.237.223.107]) by orsmga008.jf.intel.com with ESMTP; 04 Mar 2022 10:06:26 -0800 From: Cristian Dumitrescu To: dev@dpdk.org Cc: Yogesh Jangra Subject: [PATCH 3/3] examples/pipeline: support packet mirroring Date: Fri, 4 Mar 2022 18:06:23 +0000 Message-Id: <20220304180623.74893-3-cristian.dumitrescu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220304180623.74893-1-cristian.dumitrescu@intel.com> References: <20220304180623.74893-1-cristian.dumitrescu@intel.com> 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 Add CLI commands for packet mirroring. Signed-off-by: Cristian Dumitrescu Signed-off-by: Yogesh Jangra --- examples/pipeline/cli.c | 154 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/examples/pipeline/cli.c b/examples/pipeline/cli.c index edae63dae6..e983cdd21d 100644 --- a/examples/pipeline/cli.c +++ b/examples/pipeline/cli.c @@ -2697,6 +2697,131 @@ cmd_pipeline_stats(char **tokens, } } +static const char cmd_pipeline_mirror_help[] = +"pipeline mirror slots sessions \n"; + +static void +cmd_pipeline_mirror(char **tokens, + uint32_t n_tokens, + char *out, + size_t out_size, + void *obj) +{ + struct rte_swx_pipeline_mirroring_params params; + struct pipeline *p; + int status; + + if (n_tokens != 7) { + snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]); + return; + } + + if (strcmp(tokens[0], "pipeline")) { + snprintf(out, out_size, MSG_ARG_NOT_FOUND, "pipeline"); + return; + } + + p = pipeline_find(obj, tokens[1]); + if (!p) { + snprintf(out, out_size, MSG_ARG_INVALID, "pipeline_name"); + return; + } + + if (strcmp(tokens[2], "mirror")) { + snprintf(out, out_size, MSG_ARG_NOT_FOUND, "mirror"); + return; + } + + if (strcmp(tokens[3], "slots")) { + snprintf(out, out_size, MSG_ARG_NOT_FOUND, "slots"); + return; + } + + if (parser_read_uint32(¶ms.n_slots, tokens[4])) { + snprintf(out, out_size, MSG_ARG_INVALID, "n_slots"); + return; + } + + if (strcmp(tokens[5], "sessions")) { + snprintf(out, out_size, MSG_ARG_NOT_FOUND, "sessions"); + return; + } + + if (parser_read_uint32(¶ms.n_sessions, tokens[6])) { + snprintf(out, out_size, MSG_ARG_INVALID, "n_sessions"); + return; + } + + status = rte_swx_pipeline_mirroring_config(p->p, ¶ms); + if (status) { + snprintf(out, out_size, "Command failed!\n"); + return; + } +} + +static const char cmd_pipeline_mirror_session_help[] = +"pipeline mirror session port \n"; + +static void +cmd_pipeline_mirror_session(char **tokens, + uint32_t n_tokens, + char *out, + size_t out_size, + void *obj) +{ + struct rte_swx_pipeline_mirroring_session_params params; + struct pipeline *p; + uint32_t session_id; + int status; + + if (n_tokens != 7) { + snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]); + return; + } + + if (strcmp(tokens[0], "pipeline")) { + snprintf(out, out_size, MSG_ARG_NOT_FOUND, "pipeline"); + return; + } + + p = pipeline_find(obj, tokens[1]); + if (!p || !p->ctl) { + snprintf(out, out_size, MSG_ARG_INVALID, "pipeline_name"); + return; + } + + if (strcmp(tokens[2], "mirror")) { + snprintf(out, out_size, MSG_ARG_NOT_FOUND, "mirror"); + return; + } + + if (strcmp(tokens[3], "session")) { + snprintf(out, out_size, MSG_ARG_NOT_FOUND, "session"); + return; + } + + if (parser_read_uint32(&session_id, tokens[4])) { + snprintf(out, out_size, MSG_ARG_INVALID, "session_id"); + return; + } + + if (strcmp(tokens[5], "port")) { + snprintf(out, out_size, MSG_ARG_NOT_FOUND, "port"); + return; + } + + if (parser_read_uint32(¶ms.port_id, tokens[6])) { + snprintf(out, out_size, MSG_ARG_INVALID, "port_id"); + return; + } + + status = rte_swx_ctl_pipeline_mirroring_session_set(p->p, session_id, ¶ms); + if (status) { + snprintf(out, out_size, "Command failed!\n"); + return; + } +} + static const char cmd_thread_pipeline_enable_help[] = "thread pipeline enable\n"; @@ -2837,6 +2962,8 @@ cmd_help(char **tokens, "\tpipeline meter set\n" "\tpipeline meter stats\n" "\tpipeline stats\n" + "\tpipeline mirror\n" + "\tpipeline mirror session\n" "\tthread pipeline enable\n" "\tthread pipeline disable\n\n"); return; @@ -3056,6 +3183,19 @@ cmd_help(char **tokens, return; } + if (!strcmp(tokens[0], "pipeline") && + (n_tokens == 2) && !strcmp(tokens[1], "mirror")) { + snprintf(out, out_size, "\n%s\n", cmd_pipeline_mirror_help); + return; + } + + if (!strcmp(tokens[0], "pipeline") && + (n_tokens == 3) && !strcmp(tokens[1], "mirror") + && !strcmp(tokens[2], "session")) { + snprintf(out, out_size, "\n%s\n", cmd_pipeline_mirror_session_help); + return; + } + if ((n_tokens == 3) && (strcmp(tokens[0], "thread") == 0) && (strcmp(tokens[1], "pipeline") == 0)) { @@ -3310,6 +3450,20 @@ cli_process(char *in, char *out, size_t out_size, void *obj) obj); return; } + + if ((n_tokens >= 4) && + (strcmp(tokens[2], "mirror") == 0) && + (strcmp(tokens[3], "slots") == 0)) { + cmd_pipeline_mirror(tokens, n_tokens, out, out_size, obj); + return; + } + + if ((n_tokens >= 4) && + (strcmp(tokens[2], "mirror") == 0) && + (strcmp(tokens[3], "session") == 0)) { + cmd_pipeline_mirror_session(tokens, n_tokens, out, out_size, obj); + return; + } } if (strcmp(tokens[0], "thread") == 0) {