From patchwork Thu Jan 26 18:23:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 122586 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 85C8642495; Thu, 26 Jan 2023 19:23:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7273042D40; Thu, 26 Jan 2023 19:23:49 +0100 (CET) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mails.dpdk.org (Postfix) with ESMTP id C06B8400D7 for ; Thu, 26 Jan 2023 19:23:47 +0100 (CET) Received: by mail-pf1-f177.google.com with SMTP id g9so1675280pfo.5 for ; Thu, 26 Jan 2023 10:23:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QJT8/WY/Reap6WfT7a6JqSr6QOkgPmffnfsngLTsPmE=; b=okCckSptWUEqyUUwA3LbQxgNjYsuS4PvFWO1t5B+eFrOP3VnogKMPROAB1hnp5dQVt cKu17jWjaGqHSXbiHr/e2L7G+koEBOm/MyPEf7jN1e8Nnz6QmP15qH6MusyeYEj6xWgd 4gh9VDyBOIt+XpjdxVmQHBhntRdEfN49XxkXCBpxG0u/kGREs1YAL7/85HMYt9ztRHH3 XhBQajiYuhVzaDD+IgrPZ5zN/IJbeprT1FoJRtmH0vcZ9Zc11Z65SanRg2UrrzRTuNqK 3Qamu7YpZn97gfae2Z7tq8PYcnq4GF3m2cwtlVUacL/p4jGb/q6kqKWLNGGR/wwq3kNm oTMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QJT8/WY/Reap6WfT7a6JqSr6QOkgPmffnfsngLTsPmE=; b=U1gVGydM4E8Us3M0QpOhaxIHzlVGQI/Dkj+BflBw2hw8VMwHeGoMiYOsxw87iaKkQu js3h/u6IucEPHrdH7xq3ix4obe7nd/J3VnomUxucAV40TKe7eS5VZzI/r5Oc7RqzJpKm VSCLr+ODQFonitdZrNPyccNb2jbbxkpAi3nrx71nT76c7ZlvZKz4WMmZwzKPLOsAXOEZ LwTxB8Pu8yUZJoMOotsVJJEuWuaJiqHtaEdLmUCgeRJagKB3NlSoTOFbc3hllRJsbjsZ e4oHkqdwpXTdkMgZJ2hSuwtGABfLXHWAkudpqlrQdrpAr5YdjnavI4acl6zl5Bd9G+2l US+A== X-Gm-Message-State: AFqh2kpLOog1NYlFdsSzhqUsFhpxon9KHT0SgbMAl2jXbe3r3Tm4WsHZ 5d+r5jkZI4xsgmI+4K9fkdK6nztvyseIiIIC8p8= X-Google-Smtp-Source: AMrXdXvW9/f3pGBqpspfYQAmqFLvIKj4u6H2Em+88pcWOd9V4kuDNXfKd0TvMnJ8ZxZ75y1Gk1jJgA== X-Received: by 2002:a05:6a00:851:b0:58e:698:fe45 with SMTP id q17-20020a056a00085100b0058e0698fe45mr37504502pfk.14.1674757426622; Thu, 26 Jan 2023 10:23:46 -0800 (PST) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id r30-20020aa79ede000000b00582388bd80csm1139852pfq.83.2023.01.26.10.23.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 10:23:46 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH 1/3] dumpcap: add --interface to help Date: Thu, 26 Jan 2023 10:23:42 -0800 Message-Id: <20230126182344.90635-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230126182344.90635-1-stephen@networkplumber.org> References: <20230126182344.90635-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Make the help more complete, add all supported options. Signed-off-by: Stephen Hemminger --- app/dumpcap/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/dumpcap/main.c b/app/dumpcap/main.c index 2eb8414efaa5..297b6378aaf2 100644 --- a/app/dumpcap/main.c +++ b/app/dumpcap/main.c @@ -102,7 +102,8 @@ static void usage(void) { printf("Usage: %s [options] ...\n\n", progname); printf("Capture Interface:\n" - " -i name or port index of interface\n" + " -i , --interface \n" + " name or port index of interface\n" " -f packet filter in libpcap filter syntax\n"); printf(" -s , --snapshot-length \n" " packet snapshot length (def: %u)\n", From patchwork Thu Jan 26 18:23:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 122587 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3F16B42495; Thu, 26 Jan 2023 19:24:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 980B242D68; Thu, 26 Jan 2023 19:23:52 +0100 (CET) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mails.dpdk.org (Postfix) with ESMTP id 8B5B9400D7 for ; Thu, 26 Jan 2023 19:23:48 +0100 (CET) Received: by mail-pg1-f182.google.com with SMTP id 36so1620175pgp.10 for ; Thu, 26 Jan 2023 10:23:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7TbAFoTJtQwAUYoiyidfziT7q+e4TWVvfpffJMQjyuM=; b=pZbhvUc5OCxGrL7adCXjXyzn7P3iDdTH5I5lqlYnCl2mIRZ5rAcXiyA7qcuUgXO9J6 /FdW85yhswbOi1hVgP3OgE7jiCdJsb7/EFG30R98e3prsd2CrI/xyxI2lfA4ReoyFtD8 zG8UVN+YWO4Y4H/AgZHnuaIrFYNpjlNv3fz2va0xGsw8QsG3qlzKPaSr0jWOLbY8u5NR iRVRlq2h7UAdzv0CR4hf1tQqPcLNDaaAe+WEZP+8mdoZn9CSpPlr9OM0u1JJdajBr4X6 +irIc2eZVO9rvZMhs9VYQ5KLy6pU5bX+ReOptgIK+zYBEoHCeyGj+gutM9Ij+nNpJCYw nmCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7TbAFoTJtQwAUYoiyidfziT7q+e4TWVvfpffJMQjyuM=; b=yT2hdRYrEXxWWTUTok/v9tyqq0DXoAKRXXOwilAMhJ7jkB6h3qTNXEQq3DxkMRZZ9g QxVSuvsLwKU7xhsuLxe2tUaIVJmPUeMGwhTIvYWm5bin9TyIM8kW55CsQTGnsfTwD71/ ny24xj0BLLJeney6KF8Km1qiuK5GKkO+YrJ8PZTw7vCG27J9GsQswydsIQ7VkAloWWE7 /O4JU1T2XZEPWBcFj4oAC/PUf7L5F75wEyw3wxk3ZEUSU3abuXFoa9+2guchbydTrDVh r5H12QQOGuyT1VRNwgKtNUNqzy5Xr+X/PuV+Kr0KmghOjH41Y2qJydRdRmtNFhPmLf9Z AU+g== X-Gm-Message-State: AO0yUKVSLg5zEAzzXU04gzx5MDNOTs+eLPHLkQo/L6Vg9Hl0D6HuZ9t0 dUAk8YoJtHE2zpJoDj15i2qQpbkuJURYE+9Y3gw= X-Google-Smtp-Source: AK7set8A6MAUms1FOSfsgbkzuP5MWW01JsuUdHZ5KxGJq4Wh3U6fVftZg8geESWDLW/s/0Iok89W7A== X-Received: by 2002:a62:1692:0:b0:592:40cd:ce83 with SMTP id 140-20020a621692000000b0059240cdce83mr2146679pfw.4.1674757427449; Thu, 26 Jan 2023 10:23:47 -0800 (PST) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id r30-20020aa79ede000000b00582388bd80csm1139852pfq.83.2023.01.26.10.23.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 10:23:47 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH 2/3] dumpcap: support temp-dir option Date: Thu, 26 Jan 2023 10:23:43 -0800 Message-Id: <20230126182344.90635-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230126182344.90635-1-stephen@networkplumber.org> References: <20230126182344.90635-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Option for putting output files in different directory. Same syntax as wireshark. Signed-off-by: Stephen Hemminger --- app/dumpcap/main.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/dumpcap/main.c b/app/dumpcap/main.c index 297b6378aaf2..02bb8b2b2b4f 100644 --- a/app/dumpcap/main.c +++ b/app/dumpcap/main.c @@ -58,6 +58,7 @@ static bool quiet; static bool promiscuous_mode = true; static bool use_pcapng = true; static char *output_name; +static const char *tmp_dir = "/tmp"; static const char *filter_str; static unsigned int ring_size = 2048; static const char *capture_comment; @@ -126,6 +127,8 @@ static void usage(void) " -P use libpcap format instead of pcapng\n" " --capture-comment \n" " add a capture comment to the output file\n" + " --temp-dir write temporary files to this directory\n" + " (default: /tmp)\n" "\n" "Miscellaneous:\n" " --file-prefix= prefix to use for multi-process\n" @@ -327,6 +330,7 @@ static void parse_opts(int argc, char **argv) { "output-file", required_argument, NULL, 'w' }, { "ring-buffer", required_argument, NULL, 'b' }, { "snapshot-length", required_argument, NULL, 's' }, + { "temp-dir", required_argument, NULL, 0 }, { "version", no_argument, NULL, 'v' }, { NULL }, }; @@ -346,6 +350,9 @@ static void parse_opts(int argc, char **argv) } else if (!strcmp(long_options[option_index].name, "file-prefix")) { file_prefix = optarg; + } else if (!strcmp(long_options[option_index].name, + "temp-dir")) { + tmp_dir = optarg; } else { usage(); exit(1); @@ -642,7 +649,7 @@ static dumpcap_out_t create_output(void) strftime(ts, sizeof(ts), "%Y%m%d%H%M%S", tm); snprintf(tmp_path, sizeof(tmp_path), - "/tmp/%s_%u_%s_%s.%s", + "%s/%s_%u_%s_%s.%s", tmp_dir, progname, intf->port, intf->name, ts, use_pcapng ? "pcapng" : "pcap"); output_name = tmp_path; From patchwork Thu Jan 26 18:23:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 122588 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D145842495; Thu, 26 Jan 2023 19:24:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 741DC42D72; Thu, 26 Jan 2023 19:23:53 +0100 (CET) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mails.dpdk.org (Postfix) with ESMTP id 5BA9042B7E for ; Thu, 26 Jan 2023 19:23:49 +0100 (CET) Received: by mail-pg1-f171.google.com with SMTP id 141so1661549pgc.0 for ; Thu, 26 Jan 2023 10:23:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bpYpb4mVA++bpS0ADf93MZieHiFXUCIeNVaqvqtxg1k=; b=LgJ94zF8bqD9bnghAqHFuxi2maH+U5omKllNkCXBfyvwfAXCQ+8UR+hjMOF919lJip z1rtzdYVFWPb6ftkyxz77G3wzedno5aArlkyB/KXexarpdebHFp54GMe+8nrcPVvYuXd +GW9GWP428AI90pHy8Kc+yc7e67umtMkP1F8UUIk9Y3dKjrxBXM3X7Pjc1XzDS1+csa7 9sjzp6WTNTc/8KUpnoRW1oMD2EysmSn5JiUT4ZylbFXzlCb0/W6ajtOMecMGWJbtNxKB x1ceQJMWzN1AVJd0sdTAOQ+moJIFWm6aZuPeq8ngSUZgjwGeIHaL3UAKHSYM4jRMIGCq oJrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bpYpb4mVA++bpS0ADf93MZieHiFXUCIeNVaqvqtxg1k=; b=nkJnUJD89wpHQtgx5Q7YxnL398ciRA+CqaqJPvZFxKpIf2s1BgGJRTPUxAClmDhIfd Y8wpMRpcaEUUP/l8wftLOIIr7gnIq3QHyRYn+T6SRzjfd5lbWbKD+jIGEFy7d6kueU8F ax0VJaKtEFguZd3RccUM22jpJV7AelyPlb9dUNuOhXjaJgDStRJD5Od56e9rwtdBT4U5 kdCvcKaNd5H8v0FvG70R6yIOAsO3EnpGeOI650IMgI7DFpWodH0r0fsBoPlPXFckBM7S ek+uHxh7FlWPlzvBQ/Z2EqOwx9yeZ99kCBEz6g8jX0b9XLkUjGhYwpeF4o2qT17kZOmq D+iQ== X-Gm-Message-State: AO0yUKWgzdiQJ/tk6bsymlm+ILJvPsseRcKoUU4tvCLmc/snvk3UN8BC 8d0NIONxwfd9W11y1A/NRMO52pYDk9RPnzPu478= X-Google-Smtp-Source: AK7set/pnY9UJgxJtKwnJ8ARZKhpPFG4f2w9MCjx0HuDvYyPHB0SvhfdieH/qVy1xyg/ap8CIFneSw== X-Received: by 2002:a62:cd83:0:b0:58d:d7b9:fda4 with SMTP id o125-20020a62cd83000000b0058dd7b9fda4mr2606845pfg.27.1674757428293; Thu, 26 Jan 2023 10:23:48 -0800 (PST) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id r30-20020aa79ede000000b00582388bd80csm1139852pfq.83.2023.01.26.10.23.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 10:23:47 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH 3/3] dumpcap: add support statistics mode Date: Thu, 26 Jan 2023 10:23:44 -0800 Message-Id: <20230126182344.90635-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230126182344.90635-1-stephen@networkplumber.org> References: <20230126182344.90635-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This add new -S option which does the same thing as wireshark's dumpcap -S option. It loops over all interfaces and prints the number of received and dropped packets. In this mode, actual packet capture is not done. Signed-off-by: Stephen Hemminger --- app/dumpcap/main.c | 55 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 6 deletions(-) diff --git a/app/dumpcap/main.c b/app/dumpcap/main.c index 02bb8b2b2b4f..d1c70f769be5 100644 --- a/app/dumpcap/main.c +++ b/app/dumpcap/main.c @@ -66,6 +66,7 @@ static const char *file_prefix; static uint32_t snaplen = RTE_MBUF_DEFAULT_BUF_SIZE; static bool dump_bpf; static bool show_interfaces; +static bool print_stats; static bool select_interfaces; const char *interface_arg; @@ -113,6 +114,7 @@ static void usage(void) " don't capture in promiscuous mode\n" " -D, --list-interfaces print list of interfaces and exit\n" " -d print generated BPF code for capture filter\n" + " -S print statistics for each interface once per second\n" "\n" "Stop conditions:\n" " -c stop after n packets (def: infinite)\n" @@ -337,7 +339,7 @@ static void parse_opts(int argc, char **argv) int option_index, c; for (;;) { - c = getopt_long(argc, argv, "a:b:c:dDf:ghi:nN:pPqs:vw:", + c = getopt_long(argc, argv, "a:b:c:dDf:ghi:nN:pPqSs:vw:", long_options, &option_index); if (c == -1) break; @@ -406,6 +408,9 @@ static void parse_opts(int argc, char **argv) case 's': snaplen = get_uint(optarg, "snap_len", 0); break; + case 'S': + print_stats = true; + break; case 'w': output_name = optarg; break; @@ -427,6 +432,39 @@ signal_handler(int sig_num __rte_unused) __atomic_store_n(&quit_signal, true, __ATOMIC_RELAXED); } + +/* Instead of capturing, it tracks interface statistics */ +static void statistics_loop(void) +{ + struct rte_eth_stats stats; + char name[RTE_ETH_NAME_MAX_LEN]; + uint16_t p; + int r; + + printf("%-15s %10s %10s\n", + "Interface", "Received", "Dropped"); + + while (!__atomic_load_n(&quit_signal, __ATOMIC_RELAXED)) { + RTE_ETH_FOREACH_DEV(p) { + if (rte_eth_dev_get_name_by_port(p, name) < 0) + continue; + + r = rte_eth_stats_get(p, &stats); + if (r < 0) { + fprintf(stderr, + "stats_get for port %u failed: %d (%s)\n", + p, r, strerror(r)); + return; + } + + printf("%-15s %10"PRIu64" %10"PRIu64"\n", + name, stats.ipackets, + stats.imissed + stats.ierrors + stats.rx_nombuf); + } + sleep(1); + } +} + /* Return the time since 1/1/1970 in nanoseconds */ static uint64_t create_timestamp(void) { @@ -834,6 +872,16 @@ int main(int argc, char **argv) if (TAILQ_EMPTY(&interfaces)) set_default_interface(); + signal(SIGINT, signal_handler); + signal(SIGPIPE, SIG_IGN); + + enable_primary_monitor(); + + if (print_stats) { + statistics_loop(); + exit(0); + } + r = create_ring(); mp = create_mempool(); out = create_output(); @@ -841,11 +889,6 @@ int main(int argc, char **argv) start_time = create_timestamp(); enable_pdump(r, mp); - signal(SIGINT, signal_handler); - signal(SIGPIPE, SIG_IGN); - - enable_primary_monitor(); - if (!quiet) { fprintf(stderr, "Packets captured: "); show_count(0);