From: Amit Prakash Shukla <amitprakashs@marvell.com>
To: Stephen Hemminger <stephen@networkplumber.org>,
"dev@dpdk.org" <dev@dpdk.org>
Cc: Jerin Jacob Kollanukkaran <jerinj@marvell.com>,
Kiran Kumar Kokkilagadda <kirankumark@marvell.com>,
Nithin Kumar Dabilpuram <ndabilpuram@marvell.com>
Subject: RE: [EXT] [RFT] graph: fix pcapng file support
Date: Wed, 31 May 2023 08:27:09 +0000 [thread overview]
Message-ID: <PH0PR18MB516780B920B5BE7EFCA3325CC8489@PH0PR18MB5167.namprd18.prod.outlook.com> (raw)
In-Reply-To: <20230530190834.142932-1-stephen@networkplumber.org>
> -----Original Message-----
> From: Stephen Hemminger <stephen@networkplumber.org>
> Sent: Wednesday, May 31, 2023 12:39 AM
> To: dev@dpdk.org
> Cc: Stephen Hemminger <stephen@networkplumber.org>; Jerin Jacob
> Kollanukkaran <jerinj@marvell.com>; Kiran Kumar Kokkilagadda
> <kirankumark@marvell.com>; Nithin Kumar Dabilpuram
> <ndabilpuram@marvell.com>
> Subject: [EXT] [RFT] graph: fix pcapng file support
>
> External Email
>
> ----------------------------------------------------------------------
> The interface to rte_pcapng changed in last release so that the interfaces
> used need to be added to the pcapng file via the API. If this step is missing
> the pcapng file will not be valid and can't be read by wireshark etc.
>
> I don't have setup to test graph, so needs a validation test.
>
> Fixes: d1da6d0d04c7 ("pcapng: require per-interface information")
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
> lib/graph/graph_pcap.c | 16 +++++++++++++++-
> 1 file changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/lib/graph/graph_pcap.c b/lib/graph/graph_pcap.c index
> 6c433300290b..eff7b2d060ed 100644
> --- a/lib/graph/graph_pcap.c
> +++ b/lib/graph/graph_pcap.c
> @@ -7,6 +7,7 @@
> #include <stdlib.h>
> #include <unistd.h>
>
> +#include <rte_ethdev.h>
> #include <rte_mbuf.h>
> #include <rte_pcapng.h>
>
> @@ -80,7 +81,8 @@ graph_pcap_default_path_get(char **dir_path) int
> graph_pcap_file_open(const char *filename) {
> - int fd;
> + int fd, ret;
> + uint16_t portid;
> char file_name[RTE_GRAPH_PCAP_FILE_SZ];
> char *pcap_dir;
>
> @@ -114,6 +116,18 @@ graph_pcap_file_open(const char *filename)
> return -1;
> }
>
> + /* Add the configured interfaces as possible capture ports */
> + RTE_ETH_FOREACH_DEV(portid) {
> + ret = rte_pcapng_add_interface(pcapng_fd, portid,
> + NULL, NULL, NULL);
> + if (ret < 0) {
> + graph_err("Graph rte_pcapng_add_interface failed:
> %d",
> + ret);
In error case, pcapng_fd shall be closed. rte_pcapng_close(pcapng_fd).
> + close(fd);
> + return -1;
> + }
> + }
> +
> done:
> return 0;
> }
> --
> 2.39.2
with above change, looks good to me.
Acked-by: Amit Prakash Shukla <amitprakashs@marvell.com>
next prev parent reply other threads:[~2023-05-31 8:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-30 19:08 Stephen Hemminger
2023-05-31 8:27 ` Amit Prakash Shukla [this message]
2023-05-31 17:27 ` [PATCH v2] " Stephen Hemminger
2023-06-01 11:22 ` [EXT] " Amit Prakash Shukla
2023-06-12 20:25 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=PH0PR18MB516780B920B5BE7EFCA3325CC8489@PH0PR18MB5167.namprd18.prod.outlook.com \
--to=amitprakashs@marvell.com \
--cc=dev@dpdk.org \
--cc=jerinj@marvell.com \
--cc=kirankumark@marvell.com \
--cc=ndabilpuram@marvell.com \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).