From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A6BEE8383C for ; Mon, 16 Feb 2026 21:44:13 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D89F040695; Mon, 16 Feb 2026 22:43:34 +0100 (CET) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id 2A2614067E for ; Mon, 16 Feb 2026 22:43:33 +0100 (CET) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-48375f1defeso28067305e9.0 for ; Mon, 16 Feb 2026 13:43:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1771278213; x=1771883013; darn=dpdk.org; 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=C6TCy4Ur/dQz8tCcTZaxxmpuYltEStJm8sEjs2c46QQ=; b=dN8xa6xhEaTeXby+njvGxlfLoYHkC2/91yHkNSl036JaIaxrQ7F9mqCY9WZaIXkGjZ HcyrsIwlnjfjCeG1kbVAdggsSqhUsGjmjxMPrwDeCIn65KO+s3QO0domMUSxGDmUF91o Vv44JvZrM5hpg/UsQ+SaSBFts8y3CyzxulJG2ZgR5o6tYXg51GipYGXT5PquM84AX/rH JeQDPBcepI63eHCzkGlBiFuKe3TY82trQbOdUB80i97xxYn2hzq87UbBOSF/rU675HXb +UeYDq4ea6Kv12brRclyv3kISxBtgxuS+bnysZCjXeQ4blGc7bmaoLTJrPcoum+gSpyD LdtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771278213; x=1771883013; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=C6TCy4Ur/dQz8tCcTZaxxmpuYltEStJm8sEjs2c46QQ=; b=iQJrz8iY2mq06323lubZL9YnXoDjlzn1QXPQ9077jcygwF9FMFkcLsu4XDg+mlShkL fy808OJytlyujCnLGbVBtvZIp80G7GCb1LFD23jCdgRm+VOcjUap0Iv+UYsFvsWBK0Us 6ib0amxKnfYIn5oPRM3gmwIKkJWddRXB8OLt8vfn+wXjUKY2rYkquohod2YOzFHx5Nvs 4Zt7SHQjuC78YYrfz9xgskx9OBVwKDUT/Wa2fKpqXMN6fZrlHQ8nPDixYDjEjG1cq1bI OcoagSsXG24oJofUS/FQaxDBv0z//7ZrbaRVfN6dG4Cu6HyHzJtJc4vwguyjlYpPjL0i hyZQ== X-Gm-Message-State: AOJu0Yx2+3wp4Paz65uL88CV32UU59J3hXWmVXvjraZhdFoYJFOVMLCc upiEQZFrUjv7q7RG5Xkr3u2qpqVpM3cPj+jOP9L1j2oVFNBtqUqIwHDsvFldLR/1NDiYAi197Wh pw70jOOs= X-Gm-Gg: AZuq6aIu+f5lXeh2TsexeKMjKna93AIdOAXGbyi8Zd5fKwg8q01v5zuNmU9kPNQMfZe tKOiK3KtUXpBcxLuGkBZAxhciJ1TOUTsAZmaMJ0H42OhSjMMVw4CUffl1X3lSOIigl1opKBkKBC 8NU2VQkV4YmKMgoJVgmzS33NpwVo9/ujsJyhDez0E0miZrRArIjGf2LFFV4OszJ11IZ88GYCHLt oNrI0IfTnoQUF1g2VxYw/KEisbU5XOocAxTQpKUS7xjSxWte2DOwcplB1t+3b1l1Np2qNaVEsYV Q4jL+C1V7yY21zYphLTTqmIdGKi3iqKAbe97NehwJJXubVUmba3FN0D6C9EJQSRdp4FQHtcNIKP hTtUrV0U9eDIaU/JBDacySAe/agRRlluXj241rcFXio4r1rcQ7/REuJvec0v/IFAZx0dTxscJOg +NjAUZN5uv9vrPRj4j604A6OaI10sa5sawUKKY8kk9baQKjRS5x0phXI2r1DwB+yTUooEPjRhn X-Received: by 2002:a05:6000:26cf:b0:437:a49:137d with SMTP id ffacd0b85a97d-437978e1929mr19298814f8f.21.1771278212648; Mon, 16 Feb 2026 13:43:32 -0800 (PST) Received: from phoenix.lan (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43796a5ac87sm32146354f8f.3.2026.02.16.13.43.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Feb 2026 13:43:32 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Reshma Pattan Subject: [PATCH v8 8/8] test/pcapng: add tests for comments Date: Mon, 16 Feb 2026 13:38:05 -0800 Message-ID: <20260216214311.717492-9-stephen@networkplumber.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260216214311.717492-1-stephen@networkplumber.org> References: <20260126210615.175816-1-stephen@networkplumber.org> <20260216214311.717492-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Expand pcapng test coverage to exercise comment handling and additional code paths: * Add packet comments of varying lengths, including strings longer than 256 bytes, to verify option block encoding. * Vary packet sizes randomly to test different capture lengths * Calculate inter-packet delays to ensure timestamp values wrap around 32 bits at least twice during the test. * Add a statistics block write before packet capture. * Use RFC 864 chargen pattern for predictable fill data. Increase total packets from 4096 to 10000 and refactor mbuf preparation for more flexible packet construction. Signed-off-by: Stephen Hemminger --- app/test/test_pcapng.c | 154 +++++++++++++++++++++++++++++++---------- 1 file changed, 116 insertions(+), 38 deletions(-) diff --git a/app/test/test_pcapng.c b/app/test/test_pcapng.c index 5d362ec70e..ad9ad51f4c 100644 --- a/app/test/test_pcapng.c +++ b/app/test/test_pcapng.c @@ -25,13 +25,11 @@ #define PCAPNG_TEST_DEBUG 0 -#define TOTAL_PACKETS 4096 +#define TOTAL_PACKETS 10000 #define MAX_BURST 64 -#define MAX_GAP_US 100000 -#define DUMMY_MBUF_NUM 3 +#define DUMMY_MBUF_NUM 2 static struct rte_mempool *mp; -static const uint32_t pkt_len = 200; static uint16_t port_id; static const char null_dev[] = "net_null0"; @@ -41,13 +39,43 @@ struct dummy_mbuf { uint8_t buf[DUMMY_MBUF_NUM][RTE_MBUF_DEFAULT_BUF_SIZE]; }; +#define MAX_DATA_SIZE (RTE_MBUF_DEFAULT_BUF_SIZE - RTE_PKTMBUF_HEADROOM) + +/* RFC 864 chargen pattern used for comment testing */ +#define FILL_LINE_LENGTH 72 +#define FILL_START 0x21 /* ! */ +#define FILL_END 0x7e /* ~ */ +#define FILL_RANGE (FILL_END - FILL_START) + static void -dummy_mbuf_prep(struct rte_mbuf *mb, uint8_t buf[], uint32_t buf_len, - uint32_t data_len) +fill_mbuf(struct rte_mbuf *mb) { - uint32_t i; - uint8_t *db; + unsigned int len = rte_pktmbuf_tailroom(mb); + char *buf = rte_pktmbuf_append(mb, len); + unsigned int n = 0; + unsigned int line = 0; + + if (len == 0) + return; + + while (n < len - 1) { + char ch = FILL_START + (line % FILL_RANGE); + unsigned int i; + for (i = 0; i < FILL_LINE_LENGTH && n < len - 1; i++) { + buf[n++] = ch; + if (++ch > FILL_END) + ch = FILL_START; + } + if (n < len - 1) + buf[n++] = '\n'; + line++; + } +} + +static void +dummy_mbuf_prep(struct rte_mbuf *mb, uint8_t buf[], uint32_t buf_len) +{ mb->buf_addr = buf; rte_mbuf_iova_set(mb, (uintptr_t)buf); mb->buf_len = buf_len; @@ -57,15 +85,11 @@ dummy_mbuf_prep(struct rte_mbuf *mb, uint8_t buf[], uint32_t buf_len, mb->pool = (void *)buf; rte_pktmbuf_reset(mb); - db = (uint8_t *)rte_pktmbuf_append(mb, data_len); - - for (i = 0; i != data_len; i++) - db[i] = i; } /* Make an IP packet consisting of chain of one packets */ static void -mbuf1_prepare(struct dummy_mbuf *dm, uint32_t plen) +mbuf1_prepare(struct dummy_mbuf *dm) { struct { struct rte_ether_hdr eth; @@ -84,32 +108,47 @@ mbuf1_prepare(struct dummy_mbuf *dm, uint32_t plen) .dst_addr = rte_cpu_to_be_32(RTE_IPV4_BROADCAST), }, .udp = { + .src_port = rte_cpu_to_be_16(19), /* Chargen port */ .dst_port = rte_cpu_to_be_16(9), /* Discard port */ }, }; memset(dm, 0, sizeof(*dm)); - dummy_mbuf_prep(&dm->mb[0], dm->buf[0], sizeof(dm->buf[0]), plen); + dummy_mbuf_prep(&dm->mb[0], dm->buf[0], sizeof(dm->buf[0])); + dummy_mbuf_prep(&dm->mb[1], dm->buf[1], sizeof(dm->buf[1])); rte_eth_random_addr(pkt.eth.src_addr.addr_bytes); - plen -= sizeof(struct rte_ether_hdr); + memcpy(rte_pktmbuf_append(&dm->mb[0], sizeof(pkt)), &pkt, sizeof(pkt)); - pkt.ip.total_length = rte_cpu_to_be_16(plen); - pkt.ip.hdr_checksum = rte_ipv4_cksum(&pkt.ip); + fill_mbuf(&dm->mb[1]); + rte_pktmbuf_chain(&dm->mb[0], &dm->mb[1]); - plen -= sizeof(struct rte_ipv4_hdr); - pkt.udp.src_port = rte_rand(); - pkt.udp.dgram_len = rte_cpu_to_be_16(plen); + rte_mbuf_sanity_check(&dm->mb[0], 1); + rte_mbuf_sanity_check(&dm->mb[1], 0); +} - memcpy(rte_pktmbuf_mtod(dm->mb, void *), &pkt, sizeof(pkt)); +static void +mbuf1_resize(struct dummy_mbuf *dm, uint16_t len) +{ + struct { + struct rte_ether_hdr eth; + struct rte_ipv4_hdr ip; + struct rte_udp_hdr udp; + } *pkt = rte_pktmbuf_mtod(&dm->mb[0], void *); - /* Idea here is to create mbuf chain big enough that after mbuf deep copy they won't be - * compressed into single mbuf to properly test store of chained mbufs - */ - dummy_mbuf_prep(&dm->mb[1], dm->buf[1], sizeof(dm->buf[1]), pkt_len); - dummy_mbuf_prep(&dm->mb[2], dm->buf[2], sizeof(dm->buf[2]), pkt_len); - rte_pktmbuf_chain(&dm->mb[0], &dm->mb[1]); - rte_pktmbuf_chain(&dm->mb[0], &dm->mb[2]); + dm->mb[1].data_len = len; + dm->mb[0].pkt_len = dm->mb[0].data_len + dm->mb[1].data_len; + + len += sizeof(struct rte_udp_hdr); + pkt->udp.dgram_len = rte_cpu_to_be_16(len); + + len += sizeof(struct rte_ipv4_hdr); + pkt->ip.total_length = rte_cpu_to_be_16(len); + pkt->ip.hdr_checksum = 0; + pkt->ip.hdr_checksum = rte_ipv4_cksum(&pkt->ip); + + rte_mbuf_sanity_check(&dm->mb[0], 1); + rte_mbuf_sanity_check(&dm->mb[1], 0); } static int @@ -126,7 +165,7 @@ test_setup(void) /* Make a pool for cloned packets */ mp = rte_pktmbuf_pool_create_by_ops("pcapng_test_pool", MAX_BURST * 32, 0, 0, - rte_pcapng_mbuf_size(pkt_len) + 128, + rte_pcapng_mbuf_size(MAX_DATA_SIZE), SOCKET_ID_ANY, "ring_mp_sc"); if (mp == NULL) { fprintf(stderr, "Cannot create mempool\n"); @@ -142,19 +181,44 @@ test_setup(void) } static int -fill_pcapng_file(rte_pcapng_t *pcapng, unsigned int num_packets) +fill_pcapng_file(rte_pcapng_t *pcapng) { struct dummy_mbuf mbfs; struct rte_mbuf *orig; unsigned int burst_size; unsigned int count; ssize_t len; + /* + * These are some silly comments to test various lengths and alignments sprinkle + * into the file. You can see these comments by using the dumpcap program on the file + */ + static const char * const examples[] = { + "Lockless and fearless - that’s how we roll in userspace.", + "Memory pool deep / Mbufs swim in lockless rings / Zero copy dreams,", + "Poll mode driver waits / No interrupts disturb its zen / Busy loop finds peace,", + "Memory barriers / rte_atomic_thread_fence() / Guards our shared state", + "Hugepages so vast / Two megabytes of glory / TLB misses weep", + "Packets flow like streams / Through the graph node pipeline / Iterate in place", + + /* Long one to make sure we can do > 256 characters */ + ("Dear future maintainer: I am sorry. This packet was captured at 3 AM while " + "debugging a priority flow control issue that turned out to be a loose cable. " + "The rte_eth_tx_burst() call you see here has been cargo-culted through four " + "generations of example code. The magic number 32 is not documented because " + "nobody remembers why. Trust the process."), + }; + /* How many microseconds does it take TSC to wrap around 32 bits */ + const unsigned wrap_us + = (US_PER_S * (uint64_t)UINT32_MAX) / rte_get_tsc_hz(); + + /* Want overall test to take to wraparound at least twice. */ + const unsigned int avg_gap = (2 * wrap_us) + / (TOTAL_PACKETS / (MAX_BURST / 2)); - /* make a dummy packet */ - mbuf1_prepare(&mbfs, pkt_len); + mbuf1_prepare(&mbfs); orig = &mbfs.mb[0]; - for (count = 0; count < num_packets; count += burst_size) { + for (count = 0; count < TOTAL_PACKETS; count += burst_size) { struct rte_mbuf *clones[MAX_BURST]; unsigned int i; @@ -162,9 +226,17 @@ fill_pcapng_file(rte_pcapng_t *pcapng, unsigned int num_packets) burst_size = rte_rand_max(MAX_BURST) + 1; for (i = 0; i < burst_size; i++) { struct rte_mbuf *mc; + const char *comment = NULL; + + /* Put randomized comment on every 100th packet (1%) */ + if (count % 100 == 0) + comment = examples[rte_rand_max(RTE_DIM(examples))]; + + /* Vary the size of the packets, okay to allow 0 sized packet */ + mbuf1_resize(&mbfs, rte_rand_max(MAX_DATA_SIZE)); mc = rte_pcapng_copy(port_id, 0, orig, mp, rte_pktmbuf_pkt_len(orig), - RTE_PCAPNG_DIRECTION_IN, NULL); + RTE_PCAPNG_DIRECTION_IN, comment); if (mc == NULL) { fprintf(stderr, "Cannot copy packet\n"); return -1; @@ -182,8 +254,7 @@ fill_pcapng_file(rte_pcapng_t *pcapng, unsigned int num_packets) return -1; } - /* Leave a small gap between packets to test for time wrap */ - usleep(rte_rand_max(MAX_GAP_US)); + rte_delay_us_block(rte_rand_max(2 * avg_gap)); } return count; @@ -386,7 +457,7 @@ static int test_write_packets(void) { char file_name[] = "/tmp/pcapng_test_XXXXXX.pcapng"; - static rte_pcapng_t *pcapng; + rte_pcapng_t *pcapng = NULL; int ret, tmp_fd, count; uint64_t now = current_timestamp(); @@ -413,7 +484,14 @@ test_write_packets(void) goto fail; } - count = fill_pcapng_file(pcapng, TOTAL_PACKETS); + /* write a statistics block */ + ret = rte_pcapng_write_stats(pcapng, port_id, 0, 0, NULL); + if (ret <= 0) { + fprintf(stderr, "Write of statistics failed\n"); + goto fail; + } + + count = fill_pcapng_file(pcapng); if (count < 0) goto fail; -- 2.51.0