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 065A84408C; Tue, 21 May 2024 19:05:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CF68B4068E; Tue, 21 May 2024 19:05:09 +0200 (CEST) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mails.dpdk.org (Postfix) with ESMTP id 83C7C40395 for ; Tue, 21 May 2024 19:05:06 +0200 (CEST) Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-2b2b42b5126so532921a91.3 for ; Tue, 21 May 2024 10:05:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1716311106; x=1716915906; 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=N3gSBY47nmOHTU0eBZYjMIvowsCzOyiSTBEucCba6KzgKwO21Y5OkrmsV3v8uCg3xh RatcMfQgvZYLtKYTrUc2oL5toi8tkAajnAm2FVaj/TqzDeizEzg19z2fnkBiorr3FyXS vaKd6UJehFImvO833jGp6wPQ4yWTeCKhg0OZVTK0y8tCNHl9iGv1gvZmBdilt0dGTB3J 9ojxWgpa/hZMBC+v5ai2GNl0kcP68TpNIeuq1Xdo1pW2yevdJQUGDG/eOVN/Vum0lfln K6WLfAa3PSnfquyREkXRs5QtoU8LIJCIat+gMUExVvo6oFsQQ21iLyufi2M4tealjnbX BPgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716311106; x=1716915906; 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=iFpfFkwKVyTD8xm3oYaidVEqvZqIo0ujN/ddmj5Xa7DGIkUWRZpew7e96cYCAhDlta Hfrerko8jj5qyb+Cj5FAdvoZiVfeM5t2YVfuysLN+HWa/NLbM/f89Th4dXQbYy35VaUv Z5UnoUwmVlBnbXc6B4530HKlxkD5LpWSyl9A1duuh+NzDjehrCu7sAAWHElpazzzJJca h4g9kU66NJ7DZ8cx2y3WTt817/GPDxx4iDjyFeUi/KkgUzlWfvBdzp4oERP1A95BQpP1 aeGg1h2wU5/KPuj0exYpLnx6AwZ3WTUwjbXKwvbHKUv97D7WkOyQG7Z0wLeQBneHTjca fbyQ== X-Gm-Message-State: AOJu0YwLyp3tIPnTdafpfYTB87dsXzd/70YOsAoiEK0Be1Pdhi9RW/96 v6gLJsxSoMDRWcDxP4v/KCvtKJnM6PnsWVtnXbCkh4EUjjRj5rqWXzJ4bfXLBiLfi9E0EYwxFET c X-Google-Smtp-Source: AGHT+IG6JWZQX/mxhYWz8iynqE+ssKD4tnB5u6+/J8/qrlxq/uqzXrNi7hKgAkWUYbYTy87FSXT8yA== X-Received: by 2002:a17:90a:b702:b0:2b2:7986:229b with SMTP id 98e67ed59e1d1-2b6ccc7304bmr31309993a91.37.1716311105609; Tue, 21 May 2024 10:05:05 -0700 (PDT) Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2bd7a0867fcsm4297018a91.29.2024.05.21.10.05.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 10:05:05 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , "John W. Linville" Subject: [PATCH v8 3/8] net/af_packet: use generic SW stats Date: Tue, 21 May 2024 10:00:50 -0700 Message-ID: <20240521170453.119036-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240521170453.119036-1-stephen@networkplumber.org> References: <20240510050507.14381-1-stephen@networkplumber.org> <20240521170453.119036-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 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 -- 2.43.0