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 8139FA0540; Tue, 14 Jul 2020 18:49:31 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1BA791C10F; Tue, 14 Jul 2020 18:49:31 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 755281C0B4 for ; Tue, 14 Jul 2020 18:49:29 +0200 (CEST) IronPort-SDR: CETZGUg7KjylEQQg3Xf+B4JGcPrLpfjCms1tCs0Lu4kQoK+esKi0bl/DKVv2u9YlhG3w0AUJdb LRDsNjaG0D9Q== X-IronPort-AV: E=McAfee;i="6000,8403,9681"; a="146461964" X-IronPort-AV: E=Sophos;i="5.75,352,1589266800"; d="scan'208";a="146461964" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2020 09:49:27 -0700 IronPort-SDR: vbbX0bEHcxoxSDQrsu5tgmSvjoO1fZeDbITU8sNcHAjWC2K7md5wCTMK1BxP16Tff10JUfjjLz 2EjRrZhIMDwA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,352,1589266800"; d="scan'208";a="360442223" Received: from fyigit-mobl.ger.corp.intel.com (HELO [10.252.20.74]) ([10.252.20.74]) by orsmga001.jf.intel.com with ESMTP; 14 Jul 2020 09:49:26 -0700 To: Zhike Wang , dev@dpdk.org Cc: reshma.pattan@intel.com References: <1593758842-6306-1-git-send-email-wangzhike@jd.com> <1594715212-29438-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: <05654d84-551f-fe9d-1934-f9c20d6ea3fe@intel.com> Date: Tue, 14 Jul 2020 17:49:25 +0100 MIME-Version: 1.0 In-Reply-To: <1594715212-29438-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 v4] 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/14/2020 9:26 AM, Zhike Wang wrote: > Introduced "snaplen=" option. It is convenient to truncate > large packets to only capture necessary headers. > > Signed-off-by: Zhike Wang <...> > diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c > index 668cbd1..0d2a4b3 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 > > @@ -86,6 +87,7 @@ struct pmd_internals { > int single_iface; > int phy_mac; > unsigned int infinite_rx; > + unsigned int snaplen; > }; > > struct pmd_process_private { > @@ -114,6 +116,7 @@ struct pmd_devargs_all { > unsigned int is_rx_pcap; > unsigned int is_rx_iface; > unsigned int infinite_rx; > + unsigned 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 > }; > > @@ -322,11 +326,13 @@ struct pmd_devargs_all { > pcap_dumper_t *dumper; > unsigned char temp_data[RTE_ETH_PCAP_SNAPLEN]; > size_t len, caplen; > + struct pmd_internals *internal; > > pp = rte_eth_devices[dumper_q->port_id].process_private; > dumper = pp->tx_dumper[dumper_q->queue_id]; > + internal = rte_eth_devices[dumper_q->port_id].data->dev_private; Instead of accesing 'internal' through the 'rte_eth_devices' can you put a reference to the queue struct and access from there? It is not good to access to the global array 'rte_eth_devices' and we should avoid it as much as possible. We have to do this for 'process_private' but can avoid for the 'internal' structure. > > - if (dumper == NULL || nb_pkts == 0) > + if (dumper == NULL || nb_pkts == 0 || internal == NULL) Can 'internal' be NULL at this stage? I don't think so. > return 0; > > /* writes the nb_pkts packets to the previously opened pcap file > @@ -339,6 +345,9 @@ struct pmd_devargs_all { > caplen = sizeof(temp_data); > } > > + if (caplen > internal->snaplen) > + caplen = internal->snaplen; > + > calculate_timestamp(&header.ts); > header.len = len; > header.caplen = caplen; > @@ -1083,6 +1092,21 @@ struct pmd_devargs_all { > } > > static int > +get_snaplen_arg(const char *key __rte_unused, > + const char *value, void *extra_args) > +{ > + if (extra_args) { > + unsigned int snaplen = (unsigned int)atoi(value); Not sure this is what we want, this may lead very unexpected 'snaplen' values. Please verify the values from users before using them. Please check if the value is negative and return error in that case, if positive you can cast it to unsigned. Also does any value "snaplen >= RTE_ETH_PCAP_SNAPLEN" make sense? That case can be ignored quitely and set 'snaplen =RTE_ETH_PCAP_SNAPLEN" I think. > + unsigned int *snaplen_p = extra_args; > + > + if (snaplen == 0) > + snaplen = RTE_ETH_PCAP_SNAPLEN; Why silently ignoring the value '0', if the user explicitly provided the 'snaplen' devarg, and explicitly set it to '0', I think better to give an error if '0' is not a valid value. Also this requirement can be higlighted below 'RTE_PMD_REGISTER_PARAM_STRING', something like: "ETH_PCAP_SNAPLEN_ARG "=X where X > 0"); > + *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, > @@ -1291,6 +1315,9 @@ struct pmd_devargs_all { > /* store weather we are using a single interface for rx/tx or not */ > internals->single_iface = single_iface; > > + if (devargs_all->is_tx_pcap) > + internals->snaplen = devargs_all->snaplen; > + Please don't add this in the middle of the 'single_iface' related block, in the below, just above the 'infinite_rx' assingment can be better place. And not sure if 'devargs_all->is_tx_pcap' check has a value here, I think can assign it directly without check. > if (single_iface) { > internals->if_index = if_nametoindex(rx_queues->queue[0].name); > > @@ -1341,6 +1368,7 @@ struct pmd_devargs_all { > .is_tx_pcap = 0, > .is_tx_iface = 0, > .infinite_rx = 0, > + .snaplen = RTE_ETH_PCAP_SNAPLEN, > }; > > name = rte_vdev_device_name(dev); > @@ -1464,6 +1492,13 @@ struct pmd_devargs_all { > if (ret < 0) > goto free_kvlist; > > + if (devargs_all.is_tx_pcap) { > + ret = rte_kvargs_process(kvlist, ETH_PCAP_SNAPLEN_ARG, > + &get_snaplen_arg, &devargs_all.snaplen); > + if (ret < 0) > + goto free_kvlist; > + } > + Why creating a new "if (devargs_all.is_tx_pcap) {" block, this check already exists a few lines below, what do you think adding 'ETH_PCAP_SNAPLEN_ARG' process withing that existing block? > /* > * We check whether we want to open a TX stream to a real NIC, > * a pcap file, or drop packets on tx > @@ -1587,4 +1622,5 @@ 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 "="); >