From patchwork Wed Aug 5 15:26:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stuart Haslam X-Patchwork-Id: 51957 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by patches.linaro.org (Postfix) with ESMTPS id DC314229FD for ; Wed, 5 Aug 2015 15:28:35 +0000 (UTC) Received: by labth1 with SMTP id th1sf16832167lab.2 for ; Wed, 05 Aug 2015 08:28:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :mime-version:content-type:content-transfer-encoding:errors-to :sender:x-original-sender:x-original-authentication-results :mailing-list; bh=eZGgN1HlfyYzG9TBxcE+QS8UMvkSDQ7PMmCuVY9RSYA=; b=ldhlUjKU+MmugY1esPZKR+6PTO3ljzfm3iPAKhpyFrlNajXxd/K125R3d08cYVgTH9 TF5GRLwQ9Gh+30aLnpwkYpM3seLWfTkpejbR3og1EZMLdGJbEfMQtdDwm+wbjPuEpGHG JEEjIQ8dY5s/bzjQCruUL4NxcwjV35PP0t8+ayKYOZ88sabRySrA5GDc9YiBcp6j2LWW aOwYCgjp3A7sjojqCXwnLUKHdmvsIVOGguPGcEPkgCJNbxuu25cLOdV5HWc34D+saUQ2 rn7z6CFmigeRkJG2+mRet/yfG9dUP3bVVi/haiQZ1duNa6JnGUHJ0XPxah8q8tdp9M/H mWaA== X-Gm-Message-State: ALoCoQnFqUOTh4LJ2RLJqbBnAjQg/U8bIRLugxPKdPC9RIESsg8CZtq4YjtsAzJOJQFDHGQF4MQm X-Received: by 10.194.188.104 with SMTP id fz8mr2919939wjc.1.1438788514828; Wed, 05 Aug 2015 08:28:34 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.205.107 with SMTP id lf11ls206573lac.40.gmail; Wed, 05 Aug 2015 08:28:34 -0700 (PDT) X-Received: by 10.152.9.137 with SMTP id z9mr9903335laa.68.1438788514511; Wed, 05 Aug 2015 08:28:34 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id be2si2362831lab.80.2015.08.05.08.28.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Aug 2015 08:28:34 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by labgo9 with SMTP id go9so31073109lab.3 for ; Wed, 05 Aug 2015 08:28:34 -0700 (PDT) X-Received: by 10.152.6.69 with SMTP id y5mr9688455lay.72.1438788514398; Wed, 05 Aug 2015 08:28:34 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.7.198 with SMTP id l6csp435288lba; Wed, 5 Aug 2015 08:28:33 -0700 (PDT) X-Received: by 10.107.11.67 with SMTP id v64mr1473748ioi.105.1438788512532; Wed, 05 Aug 2015 08:28:32 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id ft3si12076897igb.38.2015.08.05.08.28.29; Wed, 05 Aug 2015 08:28:32 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Received: by lists.linaro.org (Postfix, from userid 109) id 9279761FBE; Wed, 5 Aug 2015 15:28:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252.ec2.internal X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from ip-10-142-244-252.ec2.internal (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 160BF61FC5; Wed, 5 Aug 2015 15:27:24 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id D99E561FBA; Wed, 5 Aug 2015 15:27:01 +0000 (UTC) Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by lists.linaro.org (Postfix) with ESMTPS id E34AC61CCF for ; Wed, 5 Aug 2015 15:26:58 +0000 (UTC) Received: by wicgj17 with SMTP id gj17so197481165wic.1 for ; Wed, 05 Aug 2015 08:26:58 -0700 (PDT) X-Received: by 10.180.74.69 with SMTP id r5mr11462146wiv.84.1438788418206; Wed, 05 Aug 2015 08:26:58 -0700 (PDT) Received: from e106441.cambridge.arm.com ([2001:41d0:a:3cb4::abcd]) by smtp.gmail.com with ESMTPSA id y13sm4637638wjq.26.2015.08.05.08.26.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Aug 2015 08:26:55 -0700 (PDT) From: Stuart Haslam To: lng-odp@lists.linaro.org Date: Wed, 5 Aug 2015 16:26:41 +0100 Message-Id: <1438788402-9250-3-git-send-email-stuart.haslam@linaro.org> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1438788402-9250-1-git-send-email-stuart.haslam@linaro.org> References: <1438788402-9250-1-git-send-email-stuart.haslam@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH 3/4] linux-generic: pktio: add pcap pktio type X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: stuart.haslam@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Create a new pktio type that allows for reading from and writing to a pcap capture file. This is intended to be used as a simple way of injecting test packets into an application for functional testing and can be used as it is with some of the existing example applications. To use this interface the name passed to odp_pktio_open() must begin with "pcap:" and be in the format; pcap:in=test.pcap:out=test_out.pcap:loops=10 in the name of the input pcap file. If no input file is given attempts to receive from the pktio will just return no packets. out the name of the output pcap file. If no output file is given any packets transmitted over the interface will just be freed. loops the number of times to iterate through the input file, set to 0 to loop indefinitely. The default value is 1. Signed-off-by: Stuart Haslam --- platform/linux-generic/Makefile.am | 4 + .../linux-generic/include/odp_packet_io_internal.h | 21 ++ platform/linux-generic/m4/configure.m4 | 16 ++ platform/linux-generic/pktio/io_ops.c | 3 + platform/linux-generic/pktio/pcap.c | 312 +++++++++++++++++++++ 5 files changed, 356 insertions(+) create mode 100644 platform/linux-generic/pktio/pcap.c diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 34ceb20..524c0b6 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -161,3 +161,7 @@ __LIB__libodp_la_SOURCES = \ odp_version.c \ odp_weak.c \ arch/@ARCH@/odp_time.c + +if HAVE_PCAP +__LIB__libodp_la_SOURCES += pktio/pcap.c +endif diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 14532a3..14f7e0c 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -38,6 +38,21 @@ typedef struct { odp_bool_t promisc; /**< promiscuous mode state */ } pkt_loop_t; +#ifdef HAVE_PCAP +typedef struct { + char *fname_rx; /**< name of pcap file for rx */ + char *fname_tx; /**< name of pcap file for tx */ + void *rx; /**< rx pcap handle */ + void *tx; /**< tx pcap handle */ + void *tx_dump; /**< tx pcap dumper handle */ + odp_pool_t pool; /**< rx pool */ + unsigned char *buf; /**< per-pktio temp buffer */ + odp_bool_t promisc; /**< promiscuous mode requested state */ + int loops; /**< number of times to loop rx pcap */ + int loop_cnt; /**< number of loops completed */ +} pkt_pcap_t; +#endif + struct pktio_entry { const struct pktio_if_ops *ops; /**< Implementation specific methods */ odp_spinlock_t lock; /**< entry spinlock */ @@ -51,6 +66,9 @@ struct pktio_entry { pkt_sock_t pkt_sock; /**< using socket API for IO */ pkt_sock_mmap_t pkt_sock_mmap; /**< using socket mmap * API for IO */ +#ifdef HAVE_PCAP + pkt_pcap_t pkt_pcap; /**< Using pcap for IO */ +#endif }; classifier_t cls; /**< classifier linked with this pktio*/ char name[PKTIO_NAME_LEN]; /**< name of pktio provided to @@ -110,6 +128,9 @@ extern const pktio_if_ops_t sock_basic_pktio_ops; extern const pktio_if_ops_t sock_mmsg_pktio_ops; extern const pktio_if_ops_t sock_mmap_pktio_ops; extern const pktio_if_ops_t loopback_pktio_ops; +#ifdef HAVE_PCAP +extern const pktio_if_ops_t pcap_pktio_ops; +#endif extern const pktio_if_ops_t * const pktio_if_ops[]; #ifdef __cplusplus diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 55124f1..d13d694 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -17,3 +17,19 @@ AC_LINK_IFELSE( exit -1) AC_CONFIG_FILES([platform/linux-generic/test/Makefile]) + +######################################################################### +# Check for libpcap availability +######################################################################### +have_pcap=no +AC_CHECK_HEADER(pcap/pcap.h, + [AC_CHECK_HEADER(pcap/bpf.h, + [AC_CHECK_LIB(pcap, pcap_open_offline, have_pcap=yes, [])], + [])], +[]) + +AM_CONDITIONAL([HAVE_PCAP], [test $have_pcap = yes]) +if test $have_pcap == yes; then + AM_CFLAGS="$AM_CFLAGS -DHAVE_PCAP" + LIBS="$LIBS -lpcap" +fi diff --git a/platform/linux-generic/pktio/io_ops.c b/platform/linux-generic/pktio/io_ops.c index 6cd3d00..044c2aa 100644 --- a/platform/linux-generic/pktio/io_ops.c +++ b/platform/linux-generic/pktio/io_ops.c @@ -12,6 +12,9 @@ * Array must be NULL terminated */ const pktio_if_ops_t * const pktio_if_ops[] = { &loopback_pktio_ops, +#ifdef HAVE_PCAP + &pcap_pktio_ops, +#endif &sock_mmap_pktio_ops, &sock_mmsg_pktio_ops, &sock_basic_pktio_ops, diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c new file mode 100644 index 0000000..7bb9115 --- /dev/null +++ b/platform/linux-generic/pktio/pcap.c @@ -0,0 +1,312 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * PCAP pktio type + * + * This file provides a pktio interface that allows for reading from + * and writing to pcap capture files. It is intended to be used as + * simple way of injecting test packets into an application for the + * purpose of functional testing. + * + * To use this interface the name passed to odp_pktio_open() must begin + * with "pcap:" and be in the format; + * + * pcap:in=test.pcap:out=test_out.pcap:loops=10 + * + * in the name of the input pcap file. If no input file is given + * attempts to receive from the pktio will just return no + * packets. If an input file is specified it must exist and be + * a readable pcap file with a link type of DLT_EN10MB. + * out the name of the output pcap file. If no output file is + * given any packets transmitted over the interface will just + * be freed. If an output file is specified and the file + * doesn't exist it will be created, if it does exist it will + * be overwritten. + * loops the number of times to iterate through the input file, set + * to 0 to loop indefinitely. The default value is 1. + * + * The total length of the string is limited by PKTIO_NAME_LEN. + */ + +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif + +#include +#include +#include + +#include + +#include +#include + +#define PKTIO_PCAP_MTU 65536 + +static int _pcapif_parse_devname(pkt_pcap_t *pcap, const char *devname) +{ + char *tok; + char in[PKTIO_NAME_LEN]; + + if (strncmp(devname, "pcap:", 5) != 0) + return -1; + + snprintf(in, sizeof(in), "%s", devname); + + for (tok = strtok(in + 5, ":"); tok; tok = strtok(NULL, ":")) { + if (strncmp(tok, "in=", 3) == 0 && !pcap->fname_rx) { + tok += 3; + pcap->fname_rx = strdup(tok); + } else if (strncmp(tok, "out=", 4) == 0 && !pcap->fname_tx) { + tok += 4; + pcap->fname_tx = strdup(tok); + } else if (strncmp(tok, "loops=", 6) == 0) { + pcap->loops = atoi(tok + 6); + if (pcap->loops < 0) { + ODP_ERR("invalid loop count\n"); + return -1; + } + } + } + + return 0; +} + +static int _pcapif_init_rx(pkt_pcap_t *pcap) +{ + char errbuf[PCAP_ERRBUF_SIZE]; + int linktype; + + pcap->rx = pcap_open_offline(pcap->fname_rx, errbuf); + if (!pcap->rx) { + ODP_ERR("failed to open pcap file %s (%s)\n", + pcap->fname_rx, errbuf); + return -1; + } + + linktype = pcap_datalink(pcap->rx); + if (linktype != DLT_EN10MB) { + ODP_ERR("unsupported datalink type: %d\n", linktype); + return -1; + } + + return 0; +} + +static int _pcapif_init_tx(pkt_pcap_t *pcap) +{ + pcap_t *tx = pcap->rx; + + if (!tx) { + /* if there is no rx pcap_t already open for rx, a dummy + * one needs to be opened for writing the dump */ + tx = pcap_open_dead(DLT_EN10MB, PKTIO_PCAP_MTU); + if (!tx) { + ODP_ERR("failed to open TX dump\n"); + return -1; + } + + pcap->tx = tx; + } + + pcap->buf = malloc(PKTIO_PCAP_MTU); + if (!pcap->buf) { + ODP_ERR("failed to malloc temp buffer\n"); + return -1; + } + + pcap->tx_dump = pcap_dump_open(tx, pcap->fname_tx); + if (!pcap->tx_dump) { + ODP_ERR("failed to open dump file %s (%s)\n", + pcap->fname_tx, pcap_geterr(tx)); + return -1; + } + + return pcap_dump_flush(pcap->tx_dump); +} + +static int pcapif_init(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry, + const char *devname, odp_pool_t pool) +{ + pkt_pcap_t *pcap = &pktio_entry->s.pkt_pcap; + int ret; + + memset(pcap, 0, sizeof(pkt_pcap_t)); + pcap->loop_cnt = 1; + pcap->loops = 1; + pcap->pool = pool; + + ret = _pcapif_parse_devname(pcap, devname); + + if (ret == 0 && pcap->fname_rx) + ret = _pcapif_init_rx(pcap); + + if (ret == 0 && pcap->fname_tx) + ret = _pcapif_init_tx(pcap); + + if (ret == 0 && (!pcap->rx && !pcap->tx_dump)) + ret = -1; + + return ret; +} + +static int pcapif_close(pktio_entry_t *pktio_entry) +{ + pkt_pcap_t *pcap = &pktio_entry->s.pkt_pcap; + + if (pcap->tx_dump) + pcap_dump_close(pcap->tx_dump); + + if (pcap->tx) + pcap_close(pcap->tx); + + if (pcap->rx) + pcap_close(pcap->rx); + + free(pcap->buf); + free(pcap->fname_rx); + free(pcap->fname_tx); + + return 0; +} + +static int _pcapif_reopen(pkt_pcap_t *pcap) +{ + char errbuf[PCAP_ERRBUF_SIZE]; + + if (pcap->loops != 0 && ++pcap->loop_cnt >= pcap->loops) + return 1; + + if (pcap->rx) + pcap_close(pcap->rx); + + pcap->rx = pcap_open_offline(pcap->fname_rx, errbuf); + if (!pcap->rx) { + ODP_ERR("failed to reopen pcap file %s (%s)\n", + pcap->fname_rx, errbuf); + return 1; + } + + return 0; +} + +static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, odp_packet_t pkts[], + unsigned len) +{ + unsigned i; + struct pcap_pkthdr *hdr; + const u_char *data; + pkt_pcap_t *pcap = &pktio_entry->s.pkt_pcap; + + if (!pcap->rx) + return 0; + + for (i = 0; i < len; ) { + int ret = pcap_next_ex(pcap->rx, &hdr, &data); + + if (ret == -2) { + /* end of file */ + if (_pcapif_reopen(pcap) == 0) + continue; + else + break; + } else if (ret != 1) { + break; + } + + pkts[i] = odp_packet_alloc(pcap->pool, hdr->caplen); + if (odp_unlikely(pkts[i] == ODP_PACKET_INVALID)) + break; + + if (odp_packet_copydata_in(pkts[i], 0, hdr->caplen, data) != 0) + break; + + _odp_packet_reset_parse(pkts[i]); + + i++; + } + + return i; +} + +static int _pcapif_dump_pkt(pkt_pcap_t *pcap, odp_packet_t pkt) +{ + struct pcap_pkthdr hdr; + + if (!pcap->tx_dump) + return 0; + + hdr.caplen = odp_packet_len(pkt); + hdr.len = hdr.caplen; + (void)gettimeofday(&hdr.ts, NULL); + + if (odp_packet_copydata_out(pkt, 0, hdr.len, pcap->buf) != 0) + return -1; + + pcap_dump(pcap->tx_dump, &hdr, pcap->buf); + (void)pcap_dump_flush(pcap->tx_dump); + + return 0; +} + +static int pcapif_send_pkt(pktio_entry_t *pktio_entry, odp_packet_t pkts[], + unsigned len) +{ + pkt_pcap_t *pcap = &pktio_entry->s.pkt_pcap; + unsigned i; + + for (i = 0; i < len; ++i) { + if (_pcapif_dump_pkt(pcap, pkts[i]) != 0) + break; + odp_packet_free(pkts[i]); + } + + return i; +} + +static int pcapif_mtu_get(pktio_entry_t *pktio_entry ODP_UNUSED) +{ + return PKTIO_PCAP_MTU; +} + +static int pcapif_mac_addr_get(pktio_entry_t *pktio_entry ODP_UNUSED, + void *mac_addr) +{ + /* this isn't used for anything, it's just here to keep callers of this + * API happy in cases where the pcap interface is used as a test mock */ + static const char pcap_mac[] = {0x02, 0xe9, 0x34, 0x80, 0x73, 0x02}; + + memcpy(mac_addr, pcap_mac, ODPH_ETHADDR_LEN); + + return ODPH_ETHADDR_LEN; +} + +static int pcapif_promisc_mode_set(pktio_entry_t *pktio_entry, + odp_bool_t enable) +{ + pktio_entry->s.pkt_pcap.promisc = enable; + + return 0; +} + +static int pcapif_promisc_mode_get(pktio_entry_t *pktio_entry) +{ + return pktio_entry->s.pkt_pcap.promisc; +} + +const pktio_if_ops_t pcap_pktio_ops = { + .open = pcapif_init, + .close = pcapif_close, + .recv = pcapif_recv_pkt, + .send = pcapif_send_pkt, + .mtu_get = pcapif_mtu_get, + .promisc_mode_set = pcapif_promisc_mode_set, + .promisc_mode_get = pcapif_promisc_mode_get, + .mac_get = pcapif_mac_addr_get +};