From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id DC418A0528; Sat, 11 Jul 2020 03:56:03 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 87FDD1DA7A; Sat, 11 Jul 2020 03:56:02 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id E62AC1D8D0 for ; Sat, 11 Jul 2020 03:55:59 +0200 (CEST) IronPort-SDR: q6mBNlLkamkqhuo0gJbwgmJw/spNAAVJso9LlvCg6Fz8IKRBG+nphTeWjNGbdJjxvbb+OGTzig +isteQSlYkmw== X-IronPort-AV: E=McAfee;i="6000,8403,9678"; a="213199509" X-IronPort-AV: E=Sophos;i="5.75,337,1589266800"; d="scan'208";a="213199509" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jul 2020 18:55:58 -0700 IronPort-SDR: a3mGacrWrxVRXh6kKat73jM/BOFRj8eIJHbWCQheuyIhP5tH5WXvT8aLt6oEM46P6I10hqaxb3 XzFkQmKy3DeA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,337,1589266800"; d="scan'208";a="428737467" Received: from sagallag-mobl.ger.corp.intel.com (HELO [10.213.224.90]) ([10.213.224.90]) by orsmga004.jf.intel.com with ESMTP; 10 Jul 2020 18:55:57 -0700 To: Zhike Wang , dev@dpdk.org Cc: reshma.pattan@intel.com References: <1593758842-6306-1-git-send-email-wangzhike@jd.com> From: Ferruh Yigit Autocrypt: addr=ferruh.yigit@intel.com; prefer-encrypt=mutual; keydata= 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 dYuOYKR9nbPv+2zK9pwwQ2NXbUBystaGyQ== Message-ID: <832ea60a-3721-9262-19ea-5ae0fb42e185@intel.com> Date: Sat, 11 Jul 2020 02:55:56 +0100 MIME-Version: 1.0 In-Reply-To: <1593758842-6306-1-git-send-email-wangzhike@jd.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-dev] [PATCH v2] net/pcap: support snaplen option to truncate packet X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" On 7/3/2020 7:47 AM, Zhike Wang wrote: > Introduced "snaplen=" option. It is convenient to truncate > large packets to only capture necessary headers. > > Signed-off-by: Zhike Wang > --- > app/pdump/main.c | 32 +++++++++++++++++++++++++++++++- > drivers/net/pcap/rte_eth_pcap.c | 35 ++++++++++++++++++++++++++++++++++- > 2 files changed, 65 insertions(+), 2 deletions(-) > > diff --git a/app/pdump/main.c b/app/pdump/main.c > index c38c537..241346b 100644 > --- a/app/pdump/main.c > +++ b/app/pdump/main.c > @@ -41,10 +41,12 @@ > #define PDUMP_RING_SIZE_ARG "ring-size" > #define PDUMP_MSIZE_ARG "mbuf-size" > #define PDUMP_NUM_MBUFS_ARG "total-num-mbufs" > +#define PDUMP_SNAPLEN_ARG "snaplen" > > #define VDEV_NAME_FMT "net_pcap_%s_%d" > #define VDEV_PCAP_ARGS_FMT "tx_pcap=%s" > #define VDEV_IFACE_ARGS_FMT "tx_iface=%s" > +#define VDEV_SNAPLEN_ARGS_FMT "snaplen=%d" > #define TX_STREAM_SIZE 64 > > #define MP_NAME "pdump_pool_%d" > @@ -97,6 +99,7 @@ enum pdump_by { > PDUMP_RING_SIZE_ARG, > PDUMP_MSIZE_ARG, > PDUMP_NUM_MBUFS_ARG, > + PDUMP_SNAPLEN_ARG, > NULL > }; > > @@ -116,6 +119,7 @@ struct pdump_tuples { > uint32_t ring_size; > uint16_t mbuf_data_size; > uint32_t total_num_mbufs; > + uint16_t snaplen; > > /* params for library API call */ > uint32_t dir; > @@ -160,7 +164,8 @@ struct parse_val { > " tx-dev=," > "[ring-size=default:16384]," > "[mbuf-size=default:2176]," > - "[total-num-mbufs=default:65535]'\n", > + "[total-num-mbufs=default:65535],", > + "[snaplen=default:0, meaning no truncation]'\n", > prgname); > } > > @@ -370,6 +375,19 @@ struct parse_val { > } else > pt->total_num_mbufs = MBUFS_PER_POOL; > > + /* snaplen parsing and validation */ > + cnt1 = rte_kvargs_count(kvlist, PDUMP_SNAPLEN_ARG); > + if (cnt1 == 1) { > + v.min = 1; > + v.max = UINT16_MAX; > + ret = rte_kvargs_process(kvlist, PDUMP_SNAPLEN_ARG, > + &parse_uint_value, &v); > + if (ret < 0) > + goto free_kvlist; > + pt->snaplen = (uint16_t) v.val; > + } else > + pt->snaplen = 0; > + > num_tuples++; > > free_kvlist: > @@ -692,6 +710,9 @@ struct parse_val { > VDEV_IFACE_ARGS_FMT, pt->rx_dev) : > snprintf(vdev_args, sizeof(vdev_args), > VDEV_PCAP_ARGS_FMT, pt->rx_dev); > + snprintf(vdev_args + strlen(vdev_args), > + sizeof(vdev_args) - strlen(vdev_args), > + ","VDEV_SNAPLEN_ARGS_FMT, pt->snaplen); > if (rte_eal_hotplug_add("vdev", vdev_name, > vdev_args) < 0) { > cleanup_rings(); > @@ -722,6 +743,9 @@ struct parse_val { > VDEV_IFACE_ARGS_FMT, pt->tx_dev) : > snprintf(vdev_args, sizeof(vdev_args), > VDEV_PCAP_ARGS_FMT, pt->tx_dev); > + snprintf(vdev_args + strlen(vdev_args), > + sizeof(vdev_args) - strlen(vdev_args), > + ","VDEV_SNAPLEN_ARGS_FMT, pt->snaplen); > if (rte_eal_hotplug_add("vdev", vdev_name, > vdev_args) < 0) { > cleanup_rings(); > @@ -762,6 +786,9 @@ struct parse_val { > VDEV_IFACE_ARGS_FMT, pt->rx_dev) : > snprintf(vdev_args, sizeof(vdev_args), > VDEV_PCAP_ARGS_FMT, pt->rx_dev); > + snprintf(vdev_args + strlen(vdev_args), > + sizeof(vdev_args) - strlen(vdev_args), > + ","VDEV_SNAPLEN_ARGS_FMT, pt->snaplen); > if (rte_eal_hotplug_add("vdev", vdev_name, > vdev_args) < 0) { > cleanup_rings(); > @@ -799,6 +826,9 @@ struct parse_val { > VDEV_IFACE_ARGS_FMT, pt->tx_dev) : > snprintf(vdev_args, sizeof(vdev_args), > VDEV_PCAP_ARGS_FMT, pt->tx_dev); > + snprintf(vdev_args + strlen(vdev_args), > + sizeof(vdev_args) - strlen(vdev_args), > + ","VDEV_SNAPLEN_ARGS_FMT, pt->snaplen); > if (rte_eal_hotplug_add("vdev", vdev_name, > vdev_args) < 0) { > cleanup_rings(); > diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c > index 13a3d0a..d51ea48 100644 > --- a/drivers/net/pcap/rte_eth_pcap.c > +++ b/drivers/net/pcap/rte_eth_pcap.c > @@ -40,6 +40,7 @@ > #define ETH_PCAP_IFACE_ARG "iface" > #define ETH_PCAP_PHY_MAC_ARG "phy_mac" > #define ETH_PCAP_INFINITE_RX_ARG "infinite_rx" > +#define ETH_PCAP_SNAPLEN_ARG "snaplen" > > #define ETH_PCAP_ARG_MAXLEN 64 > > @@ -92,6 +93,7 @@ struct pmd_process_private { > pcap_t *rx_pcap[RTE_PMD_PCAP_MAX_QUEUES]; > pcap_t *tx_pcap[RTE_PMD_PCAP_MAX_QUEUES]; > pcap_dumper_t *tx_dumper[RTE_PMD_PCAP_MAX_QUEUES]; > + int snaplen; As it shouldn't be negative, choosing "unsigned int" or "size_t" type can be better. Also is the variable added to 'process_private' memmory intentionally? Why not in the shared device data ('pmd_internals') memory? > }; > > struct pmd_devargs { > @@ -114,6 +116,7 @@ struct pmd_devargs_all { > unsigned int is_rx_pcap; > unsigned int is_rx_iface; > unsigned int infinite_rx; > + int snaplen; > }; > > static const char *valid_arguments[] = { > @@ -125,6 +128,7 @@ struct pmd_devargs_all { > ETH_PCAP_IFACE_ARG, > ETH_PCAP_PHY_MAC_ARG, > ETH_PCAP_INFINITE_RX_ARG, > + ETH_PCAP_SNAPLEN_ARG, > NULL > }; > > @@ -339,6 +343,9 @@ struct pmd_devargs_all { > caplen = sizeof(temp_data); > } > > + if ((pp->snaplen > 0) && (caplen > pp->snaplen)) > + caplen = pp->snaplen; This "is 'snaplen' set" check done per packet, and it will hit both 'snaplen' set or not, I wonder if there is a way to get rid of per packet check? > calculate_timestamp(&header.ts); > header.len = len; > header.caplen = caplen; > @@ -949,6 +956,7 @@ struct pmd_devargs_all { > { > const char *pcap_filename = value; > struct pmd_devargs *dumpers = extra_args; > + int snaplen; This is not used at all, I guess added by mistake. > pcap_dumper_t *dumper; > > if (open_single_tx_pcap(pcap_filename, &dumper) < 0) > @@ -1083,6 +1091,19 @@ struct pmd_devargs_all { > } > > static int > +get_snaplen_arg(const char *key __rte_unused, > + const char *value, void *extra_args) > +{ > + if (extra_args) { > + const int snaplen = atoi(value); 'const' qualifier is not needed. And some error checks can be better. > + int *snaplen_p = extra_args; > + > + *snaplen_p = snaplen; > + } > + return 0; > +} > + > +static int > pmd_init_internals(struct rte_vdev_device *vdev, > const unsigned int nb_rx_queues, > const unsigned int nb_tx_queues, > @@ -1335,6 +1356,7 @@ struct pmd_devargs_all { > struct rte_eth_dev *eth_dev = NULL; > struct pmd_internals *internal; > int ret = 0; > + unsigned int snaplen_cnt; > > struct pmd_devargs_all devargs_all = { > .single_iface = 0, > @@ -1412,6 +1434,15 @@ struct pmd_devargs_all { > rte_kvargs_count(kvlist, ETH_PCAP_TX_IFACE_ARG) ? 1 : 0; > dumpers.num_of_queue = 0; > > + snaplen_cnt = rte_kvargs_count(kvlist, > + ETH_PCAP_SNAPLEN_ARG); > + if (snaplen_cnt == 1) { No need to get the count of the devargs. Just calling 'rte_kvargs_process()' should be enough. > + ret = rte_kvargs_process(kvlist, ETH_PCAP_SNAPLEN_ARG, > + &get_snaplen_arg, &devargs_all.snaplen); 'snaplen' make sense only for 'is_tx_pcap' case, so you can process the 'ETH_PCAP_SNAPLEN_ARG' arg only for 'is_tx_pcap' case. > + if (ret < 0) > + goto free_kvlist; > + } > + > if (devargs_all.is_rx_pcap) { > /* > * We check whether we want to infinitely rx the pcap file. > @@ -1518,6 +1549,7 @@ struct pmd_devargs_all { > pp->tx_pcap[i] = dumpers.queue[i].pcap; > } > > + pp->snaplen = devargs_all.snaplen; This is inside the "rte_eal_process_type() == RTE_PROC_SECONDARY" block, why 'snaplen' only used for secondary process? > eth_dev->process_private = pp; > eth_dev->rx_pkt_burst = eth_pcap_rx; > if (devargs_all.is_tx_pcap) > @@ -1587,7 +1619,8 @@ struct pmd_devargs_all { > ETH_PCAP_TX_IFACE_ARG "= " > ETH_PCAP_IFACE_ARG "= " > ETH_PCAP_PHY_MAC_ARG "=" > - ETH_PCAP_INFINITE_RX_ARG "=<0|1>"); > + ETH_PCAP_INFINITE_RX_ARG "=<0|1>" > + ETH_PCAP_SNAPLEN_ARG "="); > > RTE_INIT(eth_pcap_init_log) > { >