From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7C525A00C5 for ; Thu, 25 Aug 2022 09:18:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0918A42847; Thu, 25 Aug 2022 09:18:53 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id 270334282D; Thu, 25 Aug 2022 09:18:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661411930; x=1692947930; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=0wCxq4rjjCffiPa9wiAJ5jmiRjuTrfvWCNe/5iF/aDg=; b=NpJpmgm4MaqDq9OPFuY41TNAn9SvlXVXwZYW2K4rk6C8wOce+i3FhJQo eO+eRF1jLPFs2+cTSUYj+bXzj8lr1vLOeErPhG0s1AO2UkhU2GUYTGrxr L604PAh8Rx4C5iWEFkvPeLsEaU+LegZuiEJ708zSUr6Iy7iW7Tik+vEu/ UYwUudCaEVBxVPw/3SYqWEXYfvdm7SpFOGBp1BJcEOS814Y73zOk7IyjR LtuEEWHrrRWCoa/lUlhP1nNMgth5IiHqCuHZ65Q+sT+dEUEL+i3XEHtvs DMIcsp87SQBjHXeDLkKOJcAovuV+/3rz6bqOIvGqt4SFpKBuQJhz1iAQF Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10449"; a="295447172" X-IronPort-AV: E=Sophos;i="5.93,262,1654585200"; d="scan'208";a="295447172" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Aug 2022 00:18:49 -0700 X-IronPort-AV: E=Sophos;i="5.93,262,1654585200"; d="scan'208";a="639472956" Received: from unknown (HELO dpdkserver..) ([10.239.252.174]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Aug 2022 00:18:47 -0700 From: Yiding Zhou To: dev@dpdk.org Cc: qi.z.zhang@intel.com, stable@dpdk.org, Yiding Zhou Subject: [PATCH] net/pcap: reduce time for stopping device Date: Thu, 25 Aug 2022 15:20:41 +0800 Message-Id: <20220825072041.10768-1-yidingx.zhou@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org The pcap file will be synchronized to the disk when stopping the device. It takes a long time if the file is large that would cause the 'detach sync request' timeout when the device is closed under multi-process scenario. This commit fixes the issue by performing synchronization in Tx path Fixes: 4c173302c307 ("pcap: add new driver") Cc: stable@dpdk.org Signed-off-by: Yiding Zhou --- drivers/net/pcap/pcap_ethdev.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/net/pcap/pcap_ethdev.c b/drivers/net/pcap/pcap_ethdev.c index ec29fd6bc5..52eafa5674 100644 --- a/drivers/net/pcap/pcap_ethdev.c +++ b/drivers/net/pcap/pcap_ethdev.c @@ -3,7 +3,7 @@ * Copyright(c) 2014 6WIND S.A. * All rights reserved. */ - +#include #include #include @@ -38,6 +38,8 @@ #define RTE_PMD_PCAP_MAX_QUEUES 16 +#define ETH_PCAP_SYNC_THRESHOLD 0x20000000 + static char errbuf[PCAP_ERRBUF_SIZE]; static struct timespec start_time; static uint64_t start_cycles; @@ -47,6 +49,8 @@ static uint8_t iface_idx; static uint64_t timestamp_rx_dynflag; static int timestamp_dynfield_offset = -1; +RTE_DEFINE_PER_LCORE(uint64_t, _pcap_cached_bytes); + struct queue_stat { volatile unsigned long pkts; volatile unsigned long bytes; @@ -144,6 +148,16 @@ static struct rte_eth_link pmd_link = { RTE_LOG_REGISTER_DEFAULT(eth_pcap_logtype, NOTICE); +static inline void +pcap_dumper_data_sync(pcap_dumper_t *dumper, uint32_t bytes) +{ + RTE_PER_LCORE(_pcap_cached_bytes) += bytes; + if (unlikely(RTE_PER_LCORE(_pcap_cached_bytes) > ETH_PCAP_SYNC_THRESHOLD)) { + if (!fdatasync(fileno(pcap_dump_file(dumper)))) + RTE_PER_LCORE(_pcap_cached_bytes) = 0; + } +} + static struct queue_missed_stat* queue_missed_stat_update(struct rte_eth_dev *dev, unsigned int qid) { @@ -421,7 +435,7 @@ eth_pcap_tx_dumper(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) * process stops and to make sure the pcap file is actually written, * we flush the pcap dumper within each burst. */ - pcap_dump_flush(dumper); + pcap_dumper_data_sync(dumper, tx_bytes); dumper_q->tx_stat.pkts += num_tx; dumper_q->tx_stat.bytes += tx_bytes; dumper_q->tx_stat.err_pkts += nb_pkts - num_tx; -- 2.34.1