From patchwork Fri May 10 05:01:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 140014 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 5009243FEC; Fri, 10 May 2024 07:05:26 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2CE8D402ED; Fri, 10 May 2024 07:05:16 +0200 (CEST) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mails.dpdk.org (Postfix) with ESMTP id 9C493402DD for ; Fri, 10 May 2024 07:05:13 +0200 (CEST) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1ecc23e6c9dso11224745ad.2 for ; Thu, 09 May 2024 22:05:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1715317513; x=1715922313; 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=j57IIvqJXPSUEUdVEK4npGeF72BYO1ygFDwmfO4HNSs=; b=Uwhqui4zpB7+gx8WhF0P1gd/aScIkm5hvyptVtm4QD/ErvxkEWgfyRizI3GqioZkUH IQ4SUMNBEkIgtIIS6w5rZ6hRwwAb8N5S4SzVdwEOike/KxIqO8jdlay784tHCuaWhUP4 7qHPbthmMZ2DUrAhZyKx7DGLBEZVe8vX10zCQlD49uYPawGmYKfqXwfFt1YQ8mWFWamc +9dr0nMcaO9eLLF0GXwXkMzhu6DAvJyDPx17BvyMNALSoy86/usCOtHU4qYhIKq4Mp4i AI+qinUgtn8dlMQE6si9D+H0MMfRmM04IExGlOJpnvEWZUvntveJOeV4TxWaSW0O3joH 7Myw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715317513; x=1715922313; 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=j57IIvqJXPSUEUdVEK4npGeF72BYO1ygFDwmfO4HNSs=; b=FDOAavz47JlGk9l5VaaNH0zQPLL7LfaTdsj9IuKwGMh50PlQICnPQ/rWvyectqmrgV utwnPHg5Yzyfigz+cphYnul9FdPc4EUY1/r0x4TrJxnfDQ7DTCBEHeA5yPLo2QKGc/Fn t6eUu5D2DsvsG49+1tTMYQjldhIgfAztP8S2Jn27Iu5umqitF66Kk8H3ywYdz3DIq4XT VrfbDzEGu3R2t0YBZZuIwnCNEjuYtC5l2Hr6vmGoVrd4KKLBZzwM3vdnmf8Shq7w7TwP 7hM/+5npUIdX5kWxYe5PLgkLC7rHIL6Eeh6grM4LAPPsEY6go/JgGgdzreYMYyVX0XRO mQZQ== X-Gm-Message-State: AOJu0Yw1Iiy71+6FT8v/GXq6hZiOlm9FbnSszaijdHTbL0af/fANBDvi L8aQsZMWEgbhKHr7Us9PmkqrXSNgndrMlV27CV582AGMFNzrQ0SbdhN/9t0JEit0hyMZ+TWEUJm RtBs= X-Google-Smtp-Source: AGHT+IHLyL2+r7j8zAD+q0y1vbvzEesabFKdwOT/ujp44mwEJb6ytn18pUf1ioc2HtIjlhiGFinNlA== X-Received: by 2002:a17:902:d3d5:b0:1eb:86c:ed70 with SMTP id d9443c01a7336-1ef44060dfemr15991385ad.59.1715317512701; Thu, 09 May 2024 22:05:12 -0700 (PDT) Received: from hermes.lan (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c25566asm23007385ad.283.2024.05.09.22.05.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 22:05:12 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [RFC 2/3] net/af_packet: use SW stats helper Date: Thu, 9 May 2024 22:01:22 -0700 Message-ID: <20240510050507.14381-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240510050507.14381-1-stephen@networkplumber.org> References: <20240425174617.2126159-1-ferruh.yigit@amd.com> <20240510050507.14381-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 Use the new generic SW stats. Signed-off-by: Stephen Hemminger --- drivers/net/af_packet/rte_eth_af_packet.c | 97 ++++------------------- 1 file changed, 16 insertions(+), 81 deletions(-) diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c index 397a32db58..8fac37a1b1 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -29,6 +30,7 @@ #include #include + #define ETH_AF_PACKET_IFACE_ARG "iface" #define ETH_AF_PACKET_NUM_Q_ARG "qpairs" #define ETH_AF_PACKET_BLOCKSIZE_ARG "blocksz" @@ -40,6 +42,8 @@ #define DFLT_FRAME_COUNT (1 << 9) struct pkt_rx_queue { + struct rte_eth_qsw_stats stats; /* must be first */ + int sockfd; struct iovec *rd; @@ -50,12 +54,11 @@ struct pkt_rx_queue { struct rte_mempool *mb_pool; uint16_t in_port; uint8_t vlan_strip; - - volatile unsigned long rx_pkts; - volatile unsigned long rx_bytes; }; struct pkt_tx_queue { + struct rte_eth_qsw_stats stats; /* must be first */ + int sockfd; unsigned int frame_data_size; @@ -63,10 +66,6 @@ struct pkt_tx_queue { uint8_t *map; unsigned int framecount; unsigned int framenum; - - volatile unsigned long tx_pkts; - volatile unsigned long err_pkts; - volatile unsigned long tx_bytes; }; struct pmd_internals { @@ -118,8 +117,6 @@ eth_af_packet_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) struct rte_mbuf *mbuf; uint8_t *pbuf; struct pkt_rx_queue *pkt_q = queue; - uint16_t num_rx = 0; - unsigned long num_rx_bytes = 0; unsigned int framecount, framenum; if (unlikely(nb_pkts == 0)) @@ -164,13 +161,11 @@ eth_af_packet_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) /* account for the receive frame */ bufs[i] = mbuf; - num_rx++; - num_rx_bytes += mbuf->pkt_len; + rte_eth_qsw_update(&pkt_q->stats, mbuf); } pkt_q->framenum = framenum; - pkt_q->rx_pkts += num_rx; - pkt_q->rx_bytes += num_rx_bytes; - return num_rx; + + return i; } /* @@ -205,8 +200,6 @@ eth_af_packet_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) unsigned int framecount, framenum; struct pollfd pfd; struct pkt_tx_queue *pkt_q = queue; - uint16_t num_tx = 0; - unsigned long num_tx_bytes = 0; int i; if (unlikely(nb_pkts == 0)) @@ -285,8 +278,7 @@ eth_af_packet_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) framenum = 0; ppd = (struct tpacket2_hdr *) pkt_q->rd[framenum].iov_base; - num_tx++; - num_tx_bytes += mbuf->pkt_len; + rte_eth_qsw_update(&pkt_q->stats, mbuf); rte_pktmbuf_free(mbuf); } @@ -298,15 +290,9 @@ eth_af_packet_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) * packets will be considered successful even though only some * are sent. */ - - num_tx = 0; - num_tx_bytes = 0; } pkt_q->framenum = framenum; - pkt_q->tx_pkts += num_tx; - pkt_q->err_pkts += i - num_tx; - pkt_q->tx_bytes += num_tx_bytes; return i; } @@ -385,61 +371,6 @@ eth_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) return 0; } -static int -eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_stats) -{ - unsigned i, imax; - unsigned long rx_total = 0, tx_total = 0, tx_err_total = 0; - unsigned long rx_bytes_total = 0, tx_bytes_total = 0; - const struct pmd_internals *internal = dev->data->dev_private; - - imax = (internal->nb_queues < RTE_ETHDEV_QUEUE_STAT_CNTRS ? - internal->nb_queues : RTE_ETHDEV_QUEUE_STAT_CNTRS); - for (i = 0; i < imax; i++) { - igb_stats->q_ipackets[i] = internal->rx_queue[i].rx_pkts; - igb_stats->q_ibytes[i] = internal->rx_queue[i].rx_bytes; - rx_total += igb_stats->q_ipackets[i]; - rx_bytes_total += igb_stats->q_ibytes[i]; - } - - imax = (internal->nb_queues < RTE_ETHDEV_QUEUE_STAT_CNTRS ? - internal->nb_queues : RTE_ETHDEV_QUEUE_STAT_CNTRS); - for (i = 0; i < imax; i++) { - igb_stats->q_opackets[i] = internal->tx_queue[i].tx_pkts; - igb_stats->q_obytes[i] = internal->tx_queue[i].tx_bytes; - tx_total += igb_stats->q_opackets[i]; - tx_err_total += internal->tx_queue[i].err_pkts; - tx_bytes_total += igb_stats->q_obytes[i]; - } - - igb_stats->ipackets = rx_total; - igb_stats->ibytes = rx_bytes_total; - igb_stats->opackets = tx_total; - igb_stats->oerrors = tx_err_total; - igb_stats->obytes = tx_bytes_total; - return 0; -} - -static int -eth_stats_reset(struct rte_eth_dev *dev) -{ - unsigned i; - struct pmd_internals *internal = dev->data->dev_private; - - for (i = 0; i < internal->nb_queues; i++) { - internal->rx_queue[i].rx_pkts = 0; - internal->rx_queue[i].rx_bytes = 0; - } - - for (i = 0; i < internal->nb_queues; i++) { - internal->tx_queue[i].tx_pkts = 0; - internal->tx_queue[i].err_pkts = 0; - internal->tx_queue[i].tx_bytes = 0; - } - - return 0; -} - static int eth_dev_close(struct rte_eth_dev *dev) { @@ -634,8 +565,12 @@ static const struct eth_dev_ops ops = { .rx_queue_setup = eth_rx_queue_setup, .tx_queue_setup = eth_tx_queue_setup, .link_update = eth_link_update, - .stats_get = eth_stats_get, - .stats_reset = eth_stats_reset, + + .stats_get = rte_eth_qsw_stats_get, + .stats_reset = rte_eth_qsw_stats_reset, + .xstats_get = rte_eth_qsw_xstats_get, + .xstats_get_names = rte_eth_qsw_xstats_get_names, + .xstats_reset = rte_eth_qsw_stats_reset, }; /*