From patchwork Fri Sep 24 15:21:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 99622 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 28A52A0548; Fri, 24 Sep 2021 17:22:10 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A3DD64126F; Fri, 24 Sep 2021 17:22:09 +0200 (CEST) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mails.dpdk.org (Postfix) with ESMTP id 8993940041 for ; Fri, 24 Sep 2021 17:22:08 +0200 (CEST) Received: by mail-pf1-f171.google.com with SMTP id c1so9122124pfp.10 for ; Fri, 24 Sep 2021 08:22:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=opdJhyXRVu19fXQFjlAq9RezcvWpCz09XsUtUP+hMi8=; b=b3wTF2fI4TZS1wTMOjGjJZ+id45GAjg52Y5QfrgHqmpfAyNcY1gy3t/i2Taiheemqb ZBb/2E9hwpgzV6649k6vVdQ3tjpZrR/Gpwt3lQ1601oZo+y9gLnBCQ7YQU22YFA45td7 fwi/4O4ChEKbXURF+186ZXO1qMc2BWaBFhwqR9Z5foLiyrakD3P60gZ14OjKuPWqReYv oqAZnixra0iKFrOQc77TPV/DSNP3IXIiJrG+6bMI5MxVIpLjpha7z/Wny7UN3o5xNYdP crbD3ICSz+O+qw3RoRNOtPWZACEWMJ+x3y6S4qMSlqIDqiU3rhilo0LFxslTblH5GnvK 0Lag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=opdJhyXRVu19fXQFjlAq9RezcvWpCz09XsUtUP+hMi8=; b=nVzrR9n1+Z1bWoEvFGwFpQ3v3guISKUPuOVnZGZYfX9v0puAIiNrF65GGKcmlpU9E7 XQBZaLxoFOfOfrcb92r8e7yc+0/wk1PTiNSkyRnUJFO9fUiKi+nP3nG0nuPAyhcy+cHN sQFXpFHvyjNekUiQ1RMthQVrbI4qrYNXjs/YiU9GOobPe9TjAmt7kA1GbEmz0I3ktjMF 3ECCOAhv+8w8UPIqQb8aeqhm8X+Rl6i0ECJIkBERB15Sw+x7mpQX2Qdm6JZ6S41eo7TI M2pOj59ErThBT9pHF9ru4qoP/Tl+zj94YrtCvO8Xy9UNH+DvEJfCF0+SwF6k9qOzRKDS p1AA== X-Gm-Message-State: AOAM531QzLXuHBtGAB63gFRnMxgGSWnjrX5vFK8RkmtNeho6ebF0bl6u /ynaWFtLydjbZU//qTgST9xsMYWqWx4ynw== X-Google-Smtp-Source: ABdhPJz2YNurOl6uGdZlTqTyXjmnI875asQq9ypjzuWKyHYWHGs3KRokuFCR/KGTaDGO9H/eDudZsQ== X-Received: by 2002:a63:7807:: with SMTP id t7mr4241256pgc.474.1632496927146; Fri, 24 Sep 2021 08:22:07 -0700 (PDT) Received: from hermes.local (204-195-33-123.wavecable.com. [204.195.33.123]) by smtp.gmail.com with ESMTPSA id v2sm8587493pje.15.2021.09.24.08.22.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 08:22:05 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Fri, 24 Sep 2021 08:21:50 -0700 Message-Id: <20210924152202.7592-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210903004732.109023-1-stephen@networkplumber.org> References: <20210903004732.109023-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v11 00/12] Packet capture framework enhancements 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 Sender: "dev" This patch set is a more complete version of the the enhanced packet capture support described last year. The new capture library and utility are: - faster avoids lots of extra I/O, does bursting, etc. - gives more information (multiple ports, queues, etc) - has a better user interface (same as Wireshark dumpcap) - fixes structural problems with VLAN's and timestamps There are no blocker items. The following are worth noting: * bogus checkpatch warnings - the correct flag to open is O_CREAT - intentionally keeping macro with goto since that was in original code and is clearer - the tempfile name can not be const since it is overwritten by tmpfile() call * enabling BPF tests causes CI to see a pre-existing bug https://bugs.dpdk.org/show_bug.cgi?id=811 * filtering for stripped VLAN tags requires changes to libpcap (to be addressed in future) v11 - address review comments for pdump (patch 6) v10: - fix to rte_bpf_dump to handle more instructions make sure all bpf_test cases are decoded v9: - incorporate suggested change to BPF XOR - make autotest for pcapng more complete by reading the resulting file with libpcap v8: - enable BPF tests in autotest - add more BPF test strings - use rte_strscpy to satisfy checkpatch - merge MAINTAINERS (put this in with existing pdump) v7: - add functional tests for pcapng lib - bug fix for error returns in pcapng lib - handle long osname on FreeBSD - resolve almost all checkpatch issues v5: - minor build and checkpatch fixes for RHEL/FreeBSD - disable lib/pdump on Windows. It was not useful before and now pdump depends on bpf. v4: - minor checkpatch fixes. Note: some of the checkpatch warnings are bogus and won't be fixed. - fix build of dumpcap on FreeBSD v3: - introduce packet filters using classic BPF to eBPF converter required small fix to DPDK BPF interpreter - introduce function to decode eBPF instructions - add option to dumpcap to show both classic BPF and eBPF result - drop some un-useful stubs - minor checkpatch warning cleanup v2: fix formatting of packet blocks fix the new packet capture statistics fix crash when primary process exits record start/end time various whitespace/checkpatch warnings Stephen Hemminger (12): librte_pcapng: add new library for writing pcapng files lib: pdump is not supported on Windows bpf: allow self-xor operation bpf: add function to convert classic BPF to DPDK BPF bpf: add function to dump eBPF instructions pdump: support pcapng and filtering app/dumpcap: add new packet capture application test: add test for bpf_convert test: add a test for pcapng library test: enable bpf autotest doc: changes for new pcapng and dumpcap MAINTAINERS: add entry for new packet capture features MAINTAINERS | 11 +- app/dumpcap/main.c | 844 ++++++++++++++++++ app/dumpcap/meson.build | 16 + app/meson.build | 1 + app/test/meson.build | 6 + app/test/test_bpf.c | 200 +++++ app/test/test_pcapng.c | 272 ++++++ doc/api/doxy-api-index.md | 1 + doc/api/doxy-api.conf.in | 1 + .../howto/img/packet_capture_framework.svg | 96 +- doc/guides/howto/packet_capture_framework.rst | 67 +- doc/guides/prog_guide/index.rst | 1 + doc/guides/prog_guide/pcapng_lib.rst | 24 + doc/guides/prog_guide/pdump_lib.rst | 28 +- doc/guides/rel_notes/release_21_11.rst | 10 + doc/guides/tools/dumpcap.rst | 86 ++ doc/guides/tools/index.rst | 1 + lib/bpf/bpf_convert.c | 575 ++++++++++++ lib/bpf/bpf_dump.c | 139 +++ lib/bpf/bpf_validate.c | 9 +- lib/bpf/meson.build | 6 + lib/bpf/rte_bpf.h | 39 + lib/bpf/version.map | 7 + lib/meson.build | 6 +- lib/pcapng/meson.build | 8 + lib/pcapng/pcapng_proto.h | 129 +++ lib/pcapng/rte_pcapng.c | 574 ++++++++++++ lib/pcapng/rte_pcapng.h | 194 ++++ lib/pcapng/version.map | 12 + lib/pdump/meson.build | 2 +- lib/pdump/rte_pdump.c | 427 ++++++--- lib/pdump/rte_pdump.h | 113 ++- lib/pdump/version.map | 8 + 33 files changed, 3694 insertions(+), 219 deletions(-) create mode 100644 app/dumpcap/main.c create mode 100644 app/dumpcap/meson.build create mode 100644 app/test/test_pcapng.c create mode 100644 doc/guides/prog_guide/pcapng_lib.rst create mode 100644 doc/guides/tools/dumpcap.rst create mode 100644 lib/bpf/bpf_convert.c create mode 100644 lib/bpf/bpf_dump.c create mode 100644 lib/pcapng/meson.build create mode 100644 lib/pcapng/pcapng_proto.h create mode 100644 lib/pcapng/rte_pcapng.c create mode 100644 lib/pcapng/rte_pcapng.h create mode 100644 lib/pcapng/version.map