From patchwork Wed May 22 16:12:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 140274 X-Patchwork-Delegate: thomas@monjalon.net 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 87B7144099; Wed, 22 May 2024 18:14:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2385540689; Wed, 22 May 2024 18:14:44 +0200 (CEST) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mails.dpdk.org (Postfix) with ESMTP id 7BA66402F0 for ; Wed, 22 May 2024 18:14:40 +0200 (CEST) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1f32b1b5429so4219415ad.2 for ; Wed, 22 May 2024 09:14:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1716394480; x=1716999280; 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=MjalrBySr7qzjIIpZNrJKVRuPrkLUZnmMi1fl292L1w=; b=OCRDTfaGW0nggCeJjF6jY8kImgV1PElFScx3A6y85LTy4MFW0SKQM39pWdss0hZ5x7 LSpYwTuMOK/SHvvV2qrT0V1vInxEMDPj8N3S0DRooTr7HasNhrg1QoYi4DEITVNlkuJW keHnsUkdA2mSea6aj7JFZzEDGAacPdQTk1zNKfRWkHCS22+Mnly7b6Z045CSn+sknwkF YWOhpdGDxX5w6CaP1xJg7FDuV4JY+B7EASPkBSVEdUx9xa8YNRVPv/64Qye2gzvfXLMw ugPuJW3MZ7ZUVrRGsGigKyTYKa0JnBLO0y+79TdjMkQXiSWupiGVSgzlyU7QvURHxzAQ hXqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716394480; x=1716999280; 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=MjalrBySr7qzjIIpZNrJKVRuPrkLUZnmMi1fl292L1w=; b=tLrxpo818WD78xBdT2GHBrAJaP1ugJ60b3ZwBcWJuJ7oOm6CDoUrB1HGr7rc11YNrv PeFamQPLmAidnQ2AZvMxFCQEfxNTx3qQJIizhMmkCsAQGyS7qDGwUmtdBbMBcC+I88OZ revFI0D5bee86sPx5itc3tXaVqFan5jr9YpNH4or7UzfGzLoJNKogUyVT9orLDmTPZZ7 bEowELK9ib7lIGizCJ5EgKmkhgw2MjhEKbpqvPgDuc4W6x9GjUH3Q1UmW3gfilk28vZq 0Uj3/5mYYy6BiM9eRPG9tc+nRV40fK7NI5EpGIbgjYOBcOXIQBFr7R9rHAu0NC2RvJST Yasg== X-Gm-Message-State: AOJu0Yz32+YZQ5PiRW5WM/0134/FjvS2KsY6AoRWuQtVDADA1i/kNthj CDhjGrg2Th9n1fkoYd3nTaQ2AOlEWTvvsj5EzkQu7jFdLrp1TSb8HVPTllbymx2AfsZzKY2f6To xxy8= X-Google-Smtp-Source: AGHT+IFNit6aBiLKbnz1BjBg6uWVvFlncVNZCNg0unThPHXhCi6kQTPNM6tM7xm833mWRHV08oTuHw== X-Received: by 2002:a17:902:ccc8:b0:1f0:98f2:7cc6 with SMTP id d9443c01a7336-1f31c9e6117mr40275815ad.45.1716394479731; Wed, 22 May 2024 09:14:39 -0700 (PDT) Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f327ae4647sm13684175ad.224.2024.05.22.09.14.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 09:14:39 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , "John W. Linville" Subject: [PATCH v10 3/8] net/af_packet: use generic SW stats Date: Wed, 22 May 2024 09:12:27 -0700 Message-ID: <20240522161427.64568-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522161427.64568-1-stephen@networkplumber.org> References: <20240510050507.14381-1-stephen@networkplumber.org> <20240522161427.64568-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. Add a note about how errors and kernel full should be handled. Signed-off-by: Stephen Hemminger --- drivers/net/af_packet/rte_eth_af_packet.c | 78 +++++------------------ 1 file changed, 17 insertions(+), 61 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..64fa519812 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 @@ -51,8 +52,7 @@ struct pkt_rx_queue { uint16_t in_port; uint8_t vlan_strip; - volatile unsigned long rx_pkts; - volatile unsigned long rx_bytes; + struct rte_eth_counters stats; }; struct pkt_tx_queue { @@ -64,11 +64,10 @@ struct pkt_tx_queue { unsigned int framecount; unsigned int framenum; - volatile unsigned long tx_pkts; - volatile unsigned long err_pkts; - volatile unsigned long tx_bytes; + struct rte_eth_counters stats; }; + struct pmd_internals { unsigned nb_queues; @@ -168,9 +167,10 @@ eth_af_packet_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) num_rx_bytes += mbuf->pkt_len; } pkt_q->framenum = framenum; - pkt_q->rx_pkts += num_rx; - pkt_q->rx_bytes += num_rx_bytes; - return num_rx; + + rte_eth_count_packets(&pkt_q->stats, num_rx, num_rx_bytes); + + return i; } /* @@ -294,19 +294,16 @@ eth_af_packet_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) if (sendto(pkt_q->sockfd, NULL, 0, MSG_DONTWAIT, NULL, 0) == -1 && errno != ENOBUFS && errno != EAGAIN) { /* - * In case of a ENOBUFS/EAGAIN error all of the enqueued - * packets will be considered successful even though only some - * are sent. + * FIXME: if sendto fails kernel is busy should return 0 + * and not free the mbufs. Other errors should free the + * buts and increment the tx error count. */ - 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; + rte_eth_count_packets(&pkt_q->stats, num_tx, num_tx_bytes); return i; } @@ -386,58 +383,17 @@ eth_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) } static int -eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_stats) +eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *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; + return rte_eth_counters_stats_get(dev, offsetof(struct pkt_tx_queue, stats), + offsetof(struct pkt_rx_queue, stats), stats); } 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; + return rte_eth_counters_reset(dev, offsetof(struct pkt_tx_queue, stats), + offsetof(struct pkt_rx_queue, stats)); } static int