From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 76590C35E for ; Wed, 17 Feb 2016 12:11:33 +0100 (CET) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP; 17 Feb 2016 03:11:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,460,1449561600"; d="scan'208";a="653495215" Received: from sie-lab-212-033.ir.intel.com (HELO silpixa00383881.ir.intel.com) ([10.237.212.33]) by FMSMGA003.fm.intel.com with ESMTP; 17 Feb 2016 03:11:32 -0800 From: Fan Zhang To: dev@dpdk.org Date: Wed, 17 Feb 2016 11:11:27 +0000 Message-Id: <1455707490-13826-2-git-send-email-roy.fan.zhang@intel.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1455707490-13826-1-git-send-email-roy.fan.zhang@intel.com> References: <1455707490-13826-1-git-send-email-roy.fan.zhang@intel.com> Subject: [dpdk-dev] [PATCH v2 1/4] lib/librte_port: add PCAP file support to source port X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Feb 2016 11:11:34 -0000 Originally, source ports in librte_port is an input port used as packet generator. Similar to Linux kernel /dev/zero character device, it generates null packets. This patch adds optional PCAP file support to source port: instead of sending NULL packets, the source port generates packets copied from a PCAP file. To increase the performance, the packets in the file are loaded to memory initially, and copied to mbufs in circular manner. Users can enable or disable this feature by setting CONFIG_RTE_PORT_PCAP compiler option "y" or "n". Signed-off-by: Fan Zhang Acked-by: Cristian Dumitrescu --- config/common_bsdapp | 1 + config/common_linuxapp | 1 + lib/librte_port/Makefile | 4 + lib/librte_port/rte_port_source_sink.c | 226 ++++++++++++++++++++++++++++++++- lib/librte_port/rte_port_source_sink.h | 7 + mk/rte.app.mk | 1 + 6 files changed, 239 insertions(+), 1 deletion(-) diff --git a/config/common_bsdapp b/config/common_bsdapp index ed7c31c..1eb36ae 100644 --- a/config/common_bsdapp +++ b/config/common_bsdapp @@ -459,6 +459,7 @@ CONFIG_RTE_LIBRTE_REORDER=y # CONFIG_RTE_LIBRTE_PORT=y CONFIG_RTE_PORT_STATS_COLLECT=n +CONFIG_RTE_PORT_PCAP=n # # Compile librte_table diff --git a/config/common_linuxapp b/config/common_linuxapp index 74bc515..776fcd3 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -476,6 +476,7 @@ CONFIG_RTE_LIBRTE_REORDER=y # CONFIG_RTE_LIBRTE_PORT=y CONFIG_RTE_PORT_STATS_COLLECT=n +CONFIG_RTE_PORT_PCAP=n # # Compile librte_table diff --git a/lib/librte_port/Makefile b/lib/librte_port/Makefile index 410053e..e3e4318 100644 --- a/lib/librte_port/Makefile +++ b/lib/librte_port/Makefile @@ -36,6 +36,10 @@ include $(RTE_SDK)/mk/rte.vars.mk # LIB = librte_port.a +ifeq ($(CONFIG_RTE_PORT_PCAP),y) +LDLIBS += -lpcap +endif + CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/lib/librte_port/rte_port_source_sink.c b/lib/librte_port/rte_port_source_sink.c index a06477e..086c51a 100644 --- a/lib/librte_port/rte_port_source_sink.c +++ b/lib/librte_port/rte_port_source_sink.c @@ -36,6 +36,11 @@ #include #include #include +#include + +#ifdef RTE_PORT_PCAP +#include +#endif #include "rte_port_source_sink.h" @@ -60,14 +65,175 @@ struct rte_port_source { struct rte_port_in_stats stats; struct rte_mempool *mempool; + + /* PCAP buffers and indexes */ + uint8_t **pkts; + uint8_t *pkt_buff; + uint32_t *pkt_len; + uint32_t n_pkts; + uint32_t pkt_index; }; +#ifdef RTE_PORT_PCAP + +/** + * Load PCAP file, allocate and copy packets in the file to memory + * + * @param p + * Parameters for source port + * @param port + * Handle to source port + * @param socket_id + * Socket id where the memory is created + * @return + * 0 on SUCCESS + * error code otherwise + */ +static int +pcap_source_load(struct rte_port_source_params *p, + struct rte_port_source *port, + int socket_id) +{ + uint32_t status = 0; + uint32_t n_pkts = 0; + uint32_t i; + uint32_t *pkt_len_aligns = NULL; + size_t total_buff_len = 0; + pcap_t *pcap_handle; + char pcap_errbuf[PCAP_ERRBUF_SIZE]; + uint32_t max_len; + struct pcap_pkthdr pcap_hdr; + const uint8_t *pkt; + uint8_t *buff = NULL; + uint32_t pktmbuf_maxlen = (uint32_t) + (rte_pktmbuf_data_room_size(port->mempool) - + RTE_PKTMBUF_HEADROOM); + + if (p->file_name == NULL) + return 0; + + if (p->n_bytes_per_pkt == 0) + max_len = pktmbuf_maxlen; + else + max_len = RTE_MIN(p->n_bytes_per_pkt, pktmbuf_maxlen); + + /* first time open, get packet number */ + pcap_handle = pcap_open_offline(p->file_name, pcap_errbuf); + if (pcap_handle == NULL) { + status = -ENOENT; + goto error_exit; + } + + while ((pkt = pcap_next(pcap_handle, &pcap_hdr)) != NULL) + n_pkts++; + + pcap_close(pcap_handle); + + port->pkt_len = rte_zmalloc_socket("PCAP", + (sizeof(*port->pkt_len) * n_pkts), 0, socket_id); + if (port->pkt_len == NULL) { + status = -ENOMEM; + goto error_exit; + } + + pkt_len_aligns = rte_malloc("PCAP", + (sizeof(*pkt_len_aligns) * n_pkts), 0); + if (pkt_len_aligns == NULL) { + status = -ENOMEM; + goto error_exit; + } + + port->pkts = rte_zmalloc_socket("PCAP", + (sizeof(*port->pkts) * n_pkts), 0, socket_id); + if (port->pkts == NULL) { + status = -ENOMEM; + goto error_exit; + } + + /* open 2nd time, get pkt_len */ + pcap_handle = pcap_open_offline(p->file_name, pcap_errbuf); + if (pcap_handle == NULL) { + status = -ENOENT; + goto error_exit; + } + + for (i = 0; i < n_pkts; i++) { + pkt = pcap_next(pcap_handle, &pcap_hdr); + port->pkt_len[i] = RTE_MIN(max_len, pcap_hdr.len); + pkt_len_aligns[i] = RTE_CACHE_LINE_ROUNDUP( + port->pkt_len[i]); + total_buff_len += pkt_len_aligns[i]; + } + + pcap_close(pcap_handle); + + /* allocate a big trunk of data for pcap file load */ + buff = rte_zmalloc_socket("PCAP", + total_buff_len, 0, socket_id); + if (buff == NULL) { + status = -ENOMEM; + goto error_exit; + } + + port->pkt_buff = buff; + + /* open file one last time to copy the pkt content */ + pcap_handle = pcap_open_offline(p->file_name, pcap_errbuf); + if (pcap_handle == NULL) { + status = -ENOENT; + goto error_exit; + } + + for (i = 0; i < n_pkts; i++) { + pkt = pcap_next(pcap_handle, &pcap_hdr); + rte_memcpy(buff, pkt, port->pkt_len[i]); + port->pkts[i] = buff; + buff += pkt_len_aligns[i]; + } + + pcap_close(pcap_handle); + + port->n_pkts = n_pkts; + + rte_free(pkt_len_aligns); + + return 0; + +error_exit: + if (pkt_len_aligns) + rte_free(pkt_len_aligns); + if (port->pkt_len) + rte_free(port->pkt_len); + if (port->pkts) + rte_free(port->pkts); + if (port->pkt_buff) + rte_free(port->pkt_buff); + + return status; +} + +#else +static int +pcap_source_load(__rte_unused struct rte_port_source_params *p, + struct rte_port_source *port, + __rte_unused int socket_id) +{ + port->pkt_buff = NULL; + port->pkt_len = NULL; + port->pkts = NULL; + port->pkt_index = 0; + + return -ENOTSUP; +} +#endif + static void * rte_port_source_create(void *params, int socket_id) { struct rte_port_source_params *p = (struct rte_port_source_params *) params; struct rte_port_source *port; + int status; /* Check input arguments*/ if ((p == NULL) || (p->mempool == NULL)) { @@ -79,23 +245,65 @@ rte_port_source_create(void *params, int socket_id) port = rte_zmalloc_socket("PORT", sizeof(*port), RTE_CACHE_LINE_SIZE, socket_id); if (port == NULL) { - RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__); + RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", + __func__); return NULL; } /* Initialization */ port->mempool = (struct rte_mempool *) p->mempool; + /* pcap file load and initialization */ + status = pcap_source_load(p, port, socket_id); + if (status == 0) { + if (port->pkt_buff != NULL) { + RTE_LOG(INFO, PORT, "Successfully load pcap file " + "'%s' with %u pkts\n", + p->file_name, port->n_pkts); + } + } else if (status != -ENOTSUP) { + /* ENOTSUP is not treated as error */ + switch (status) { + case -ENOENT: + RTE_LOG(ERR, PORT, "%s: Failed to open pcap file " + "'%s' for reading\n", + __func__, p->file_name); + break; + case -ENOMEM: + RTE_LOG(ERR, PORT, "%s: Not enough memory\n", + __func__); + break; + default: + RTE_LOG(ERR, PORT, "%s: Failed to enable PCAP " + "support for unknown reason\n", + __func__); + break; + } + + rte_free(port); + port = NULL; + } + return port; } static int rte_port_source_free(void *port) { + struct rte_port_source *p = + (struct rte_port_source *)port; + /* Check input parameters */ if (port == NULL) return 0; + if (p->pkt_len) + rte_free(p->pkt_len); + if (p->pkts) + rte_free(p->pkts); + if (p->pkt_buff) + rte_free(p->pkt_buff); + rte_free(port); return 0; @@ -115,6 +323,22 @@ rte_port_source_rx(void *port, struct rte_mbuf **pkts, uint32_t n_pkts) rte_pktmbuf_reset(pkts[i]); } + if (p->pkt_buff != NULL) { + for (i = 0; i < n_pkts; i++) { + uint8_t *pkt_data = rte_pktmbuf_mtod(pkts[i], + uint8_t *); + + rte_memcpy(pkt_data, p->pkts[p->pkt_index], + p->pkt_len[p->pkt_index]); + pkts[i]->data_len = p->pkt_len[p->pkt_index]; + pkts[i]->pkt_len = pkts[i]->data_len; + + p->pkt_index++; + if (p->pkt_index >= p->n_pkts) + p->pkt_index = 0; + } + } + RTE_PORT_SOURCE_STATS_PKTS_IN_ADD(p, n_pkts); return n_pkts; diff --git a/lib/librte_port/rte_port_source_sink.h b/lib/librte_port/rte_port_source_sink.h index 0f9be79..6f39bec 100644 --- a/lib/librte_port/rte_port_source_sink.h +++ b/lib/librte_port/rte_port_source_sink.h @@ -53,6 +53,13 @@ extern "C" { struct rte_port_source_params { /** Pre-initialized buffer pool */ struct rte_mempool *mempool; + /** The full path of the pcap file to read packets from */ + char *file_name; + /** The number of bytes to be read from each packet in the + * pcap file. If this value is 0, the whole packet is read; + * if it is bigger than packet size, the generated packets + * will contain the whole packet */ + uint32_t n_bytes_per_pkt; }; /** source port operations */ diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 8ecab41..39fdbe1 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -111,6 +111,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_XENVIRT) += -lxenstore _LDLIBS-$(CONFIG_RTE_LIBRTE_MPIPE_PMD) += -lgxio # QAT PMD has a dependency on libcrypto (from openssl) for calculating HMAC precomputes _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += -lcrypto +_LDLIBS-$(CONFIG_RTE_PORT_PCAP) += -lpcap endif # CONFIG_RTE_BUILD_COMBINE_LIBS or not CONFIG_RTE_BUILD_SHARED_LIBS _LDLIBS-y += --start-group -- 2.5.0