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 EFF6AF43830 for ; Wed, 15 Apr 2026 14:50:48 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4940E40E0C; Wed, 15 Apr 2026 16:48:39 +0200 (CEST) Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170]) by mails.dpdk.org (Postfix) with ESMTP id 8288F40E0C for ; Wed, 15 Apr 2026 16:48:36 +0200 (CEST) Received: by mail-oi1-f170.google.com with SMTP id 5614622812f47-4710c186d8aso2091574b6e.3 for ; Wed, 15 Apr 2026 07:48:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20251104.gappssmtp.com; s=20251104; t=1776264516; x=1776869316; 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=0N/VQmY+9wlxj/i2Pt8c+ObP90OWk48ihoSb9B/7ikY=; b=igumYWGhzaNkeGZFrUJvTgacSnnO9xZdKH4ZpdaVrHJRSQac4vcnScgRsKWHYYddFv f5xpwhT0jnlizX83zSWAQr5/aB6K+um0ERhNJo9wl4gpdE4oE9sK4PySVlKYfNl5AR/Z BFLkZcAdHob8td0cu/WPYLYqB1Kp8jfmUH56FyUEvVoXrAQIxBqaZYkTxTbVAerIedAl 6GuygS2/+fQGQCuc351i85Ok2w4RE9kIuZFAVy7mXt7cx3QNhEQ0V1HBrgZqU3vBSScG EHBj63na7YF0BaLA2ADa9AZyZDUBJ59jqstR/wrq5/RepedO4cOybmKHW2JFFgz1X8zU zjzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776264516; x=1776869316; 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=0N/VQmY+9wlxj/i2Pt8c+ObP90OWk48ihoSb9B/7ikY=; b=b0w9rEWQ92IvxwggDbR2y2yWnWti9SuwRP8tCX0Qow2JSvejJroGyfXYFRWb9OzwyQ HNsaP4iDIWxSFSXf+0eCNx0zlrgPI6uSQNY6+ddSiQvhkO1zAylRs3wNFOdnWhTDXbEp kIUziJZ5MabGb9i8jaonN/OIPmaaQkqO2NoslzM88RfNiU5iWoloiY0enTULNOI1pS0c RNO8oeUOYQbPzGyJrOIIBaBCwRUBZ8ha60hqrgVJPK+GqqspW6TxAiZjTM/ol+AbVuCy s+bfRuOebGGwfHJkDt7+AdXh9xLVt4sE7PN/CUQ9me5OJR5/Wk31fD28H+t+4BXj+5LL hp7Q== X-Gm-Message-State: AOJu0YyJ//P8fturBFyZq1OjhojK4cNoPiVuX3mYlFAOz0Qu0zTha8Gw nKY30D7aTI0Uk8vZft+5DFgZw0wsmGEn7zZrF1qgPPq10D++09ZzDpv8qPzSsyhXZcypHbtqeh9 +LN+F X-Gm-Gg: AeBDieu0T+enyP3H3A9s+h8t4UQgx7tpzWFy45uhcQ8A1rAwgykkwBBtqYaHZ6alyn4 Z67tRVGnrW2jH+N9QGX+Lnh/I0su0+F3E/jfo7GPGFjqAfpLEPNrv2D6Dqe4KZAzAecCcZdhkYz ZWLkVF8hA0SRHgezFXNQfQnsmhwA1jDpuSdiDfXXITUy7uSO3T6r7Zihiah32L0sabxGGb5/c25 DO1pa6PK5/4KgbRYOjWyh9XSIhTZas97/pJQajSY65CfR+QjRoDuZ6Zm66i2aFPkUov4dMwIMrl RpaIEPAv8uTdZliX+WnDfPdCduZAEaptufXZxFNp84juUPYXRMtrBUGl6AHCXoc7p4ke0WwAvN8 p5YPfCICSlyx+iLHVfsvVrreU4NYO46KXhdjrHg6lVsS4HvTetrPuNjJ6i0nkbIfjxMCPVWoWvP b23ldxqWq3Wmkw44q6/XWFc9cJZXgIK6lBEqcFGOfZDJn4pgn308zqaA== X-Received: by 2002:a05:6808:e8b:b0:468:845:396e with SMTP id 5614622812f47-4789e71dd37mr9774557b6e.25.1776264515694; Wed, 15 Apr 2026 07:48:35 -0700 (PDT) Received: from phoenix.lan ([104.202.41.210]) by smtp.gmail.com with ESMTPSA id 5614622812f47-4797a53b1fesm945798b6e.16.2026.04.15.07.48.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2026 07:48:35 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v23 23/24] net/pcap: add EOF notification via link status change Date: Wed, 15 Apr 2026 07:46:12 -0700 Message-ID: <20260415144717.226161-24-stephen@networkplumber.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260415144717.226161-1-stephen@networkplumber.org> References: <20260106182823.192350-1-stephen@networkplumber.org> <20260415144717.226161-1-stephen@networkplumber.org> MIME-Version: 1.0 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 Add an "eof" devarg for rx_pcap mode that signals end-of-file by setting link down and generating an LSC event. This allows applications to detect when a pcap file has been fully consumed using the standard ethdev callback mechanism. The eof and infinite_rx options are mutually exclusive. On device restart, the EOF state is reset so the file can be replayed. Signed-off-by: Stephen Hemminger --- doc/guides/nics/pcap.rst | 12 ++++ doc/guides/rel_notes/release_26_07.rst | 2 + drivers/net/pcap/pcap_ethdev.c | 80 +++++++++++++++++++++++++- 3 files changed, 91 insertions(+), 3 deletions(-) diff --git a/doc/guides/nics/pcap.rst b/doc/guides/nics/pcap.rst index 91763c27c0..df7a54ae1f 100644 --- a/doc/guides/nics/pcap.rst +++ b/doc/guides/nics/pcap.rst @@ -161,6 +161,18 @@ Runtime Config Options so all queues on a device will either have this enabled or disabled. This option should only be provided once per device. +* Signal end-of-file via link status change + + In case ``rx_pcap=`` configuration is set, the user may want to be notified when + all packets in the pcap file have been read. This can be done with the ``eof`` + devarg, for example:: + + --vdev 'net_pcap0,rx_pcap=file_rx.pcap,eof=1' + + When enabled, the driver sets link down and generates an LSC event at end of file. + If the device is stopped and restarted, the EOF state is reset. + This option cannot be combined with ``infinite_rx``. + * Drop all packets on transmit To drop all packets on transmit for a device, diff --git a/doc/guides/rel_notes/release_26_07.rst b/doc/guides/rel_notes/release_26_07.rst index 741b987977..4f1ab1b113 100644 --- a/doc/guides/rel_notes/release_26_07.rst +++ b/doc/guides/rel_notes/release_26_07.rst @@ -70,6 +70,8 @@ New Features * Receive timestamps support nanosecond precision. * Added ``snaplen`` devarg to configure packet capture snapshot length. * Added support for Link State interrupt in ``iface`` mode. + * Added ``eof`` devarg to use link state to signal end of receive + file input. diff --git a/drivers/net/pcap/pcap_ethdev.c b/drivers/net/pcap/pcap_ethdev.c index 2276aaf513..08d3ab9e91 100644 --- a/drivers/net/pcap/pcap_ethdev.c +++ b/drivers/net/pcap/pcap_ethdev.c @@ -42,6 +42,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_EOF_ARG "eof" #define ETH_PCAP_SNAPSHOT_LEN_ARG "snaplen" #define ETH_PCAP_SNAPSHOT_LEN_DEFAULT 65535 @@ -115,6 +116,8 @@ struct pmd_internals { bool single_iface; bool phy_mac; bool infinite_rx; + bool eof; + RTE_ATOMIC(bool) eof_signaled; bool vlan_strip; bool rx_scatter; bool timestamp_offloading; @@ -150,6 +153,7 @@ struct pmd_devargs_all { bool is_rx_pcap; bool is_rx_iface; bool infinite_rx; + bool eof; }; static const char *valid_arguments[] = { @@ -161,6 +165,7 @@ static const char *valid_arguments[] = { ETH_PCAP_IFACE_ARG, ETH_PCAP_PHY_MAC_ARG, ETH_PCAP_INFINITE_RX_ARG, + ETH_PCAP_EOF_ARG, ETH_PCAP_SNAPSHOT_LEN_ARG, NULL }; @@ -308,15 +313,33 @@ eth_pcap_rx_infinite(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) return i; } +/* + * Deferred EOF alarm callback. + * + * Scheduled from the RX burst path when end-of-file is reached, + * so that rte_eth_dev_callback_process() runs outside the datapath. + * This avoids holding any locks that the application callback + * might also need, preventing potential deadlocks. + */ +static void +eth_pcap_eof_alarm(void *arg) +{ + struct rte_eth_dev *dev = arg; + + rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL); +} + static uint16_t eth_pcap_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) { + struct pcap_rx_queue *pcap_q = queue; + struct rte_eth_dev *dev = &rte_eth_devices[pcap_q->port_id]; + struct pmd_internals *internals = dev->data->dev_private; unsigned int i; struct pcap_pkthdr *header; struct pmd_process_private *pp; const u_char *packet; struct rte_mbuf *mbuf; - struct pcap_rx_queue *pcap_q = queue; uint16_t num_rx = 0; uint32_t rx_bytes = 0; pcap_t *pcap; @@ -337,6 +360,23 @@ eth_pcap_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) if (ret == PCAP_ERROR) pcap_q->rx_stat.err_pkts++; + /* + * EOF: if eof mode is enabled, set link down and + * defer notification via alarm to avoid calling + * rte_eth_dev_callback_process() from the datapath. + */ + else if (ret == PCAP_ERROR_BREAK) { + bool expected = false; + + if (internals->eof && + rte_atomic_compare_exchange_strong_explicit( + &internals->eof_signaled, &expected, true, + rte_memory_order_relaxed, rte_memory_order_relaxed)) { + eth_link_update(dev, 0); + rte_eal_alarm_set(1, eth_pcap_eof_alarm, dev); + } + } + break; } @@ -894,6 +934,7 @@ eth_dev_start(struct rte_eth_dev *dev) for (i = 0; i < dev->data->nb_tx_queues; i++) dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; + rte_atomic_store_explicit(&internals->eof_signaled, false, rte_memory_order_relaxed); dev->data->dev_link.link_status = RTE_ETH_LINK_UP; /* Start LSC polling for iface mode if application requested it */ @@ -917,6 +958,7 @@ eth_dev_stop(struct rte_eth_dev *dev) unsigned int i; struct pmd_internals *internals = dev->data->dev_private; struct pmd_process_private *pp = dev->process_private; + bool expected; /* Special iface case. Single pcap is open and shared between tx/rx. */ if (internals->single_iface) { @@ -956,6 +998,13 @@ eth_dev_stop(struct rte_eth_dev *dev) } status_down: + /* Cancel any pending EOF alarm */ + expected = true; + if (rte_atomic_compare_exchange_strong_explicit( + &internals->eof_signaled, &expected, false, + rte_memory_order_relaxed, rte_memory_order_relaxed)) + rte_eal_alarm_cancel(eth_pcap_eof_alarm, dev); + for (i = 0; i < dev->data->nb_rx_queues; i++) dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; @@ -1152,9 +1201,10 @@ eth_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused) if (internals->single_iface) { link.link_status = (osdep_iface_link_status(internals->rx_queue[0].name) > 0) ? RTE_ETH_LINK_UP : RTE_ETH_LINK_DOWN; + } else if (rte_atomic_load_explicit(&internals->eof_signaled, rte_memory_order_relaxed)) { + link.link_status = RTE_ETH_LINK_DOWN; } else { - link.link_status = dev->data->dev_started ? - RTE_ETH_LINK_UP : RTE_ETH_LINK_DOWN; + link.link_status = dev->data->dev_started ? RTE_ETH_LINK_UP : RTE_ETH_LINK_DOWN; } return rte_eth_linkstatus_set(dev, &link); @@ -1745,8 +1795,13 @@ eth_from_pcaps(struct rte_vdev_device *vdev, } internals->infinite_rx = infinite_rx; + internals->eof = devargs_all->eof; internals->snapshot_len = devargs_all->snapshot_len; + /* Enable LSC for eof mode (already set above for single_iface) */ + if (internals->eof) + eth_dev->data->dev_flags |= RTE_ETH_DEV_INTR_LSC; + /* Assign rx ops. */ if (infinite_rx) eth_dev->rx_pkt_burst = eth_pcap_rx_infinite; @@ -1934,6 +1989,24 @@ pmd_pcap_probe(struct rte_vdev_device *dev) "for %s", name); } + /* + * Check whether to signal EOF via link status change. + */ + if (rte_kvargs_count(kvlist, ETH_PCAP_EOF_ARG) == 1) { + ret = rte_kvargs_process(kvlist, ETH_PCAP_EOF_ARG, + &process_bool_flag, + &devargs_all.eof); + if (ret < 0) + goto free_kvlist; + } + + if (devargs_all.infinite_rx && devargs_all.eof) { + PMD_LOG(ERR, "Cannot use both infinite_rx and eof for %s", + name); + ret = -EINVAL; + goto free_kvlist; + } + ret = rte_kvargs_process(kvlist, ETH_PCAP_RX_PCAP_ARG, &open_rx_pcap, &pcaps); } else if (devargs_all.is_rx_iface) { @@ -2072,4 +2145,5 @@ RTE_PMD_REGISTER_PARAM_STRING(net_pcap, ETH_PCAP_IFACE_ARG "= " ETH_PCAP_PHY_MAC_ARG "=<0|1> " ETH_PCAP_INFINITE_RX_ARG "=<0|1> " + ETH_PCAP_EOF_ARG "=<0|1> " ETH_PCAP_SNAPSHOT_LEN_ARG "="); -- 2.53.0