From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by dpdk.space (Postfix) with ESMTP id 42792A0471
for <public@inbox.dpdk.org>; Thu, 20 Jun 2019 21:21:26 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id D79D91D479;
Thu, 20 Jun 2019 21:21:09 +0200 (CEST)
Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com
[209.85.215.194]) by dpdk.org (Postfix) with ESMTP id 69F481D469
for <dev@dpdk.org>; Thu, 20 Jun 2019 21:21:01 +0200 (CEST)
Received: by mail-pg1-f194.google.com with SMTP id p10so2092481pgn.1
for <dev@dpdk.org>; Thu, 20 Jun 2019 12:21:01 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=networkplumber-org.20150623.gappssmtp.com; s=20150623;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=CZA5zLe4tbSwvOo2ZG+jag13FB9U46jQ6ezncJjNY/o=;
b=IvnYuOvn335e1ljiZegMhPfH1rdT07XejsQUrsY/9pD3JUXOfV6cJAZ9mCeoZ09nKF
ljhSBtlCUqEpIDbSIjcLB906W7SBPN5wPRm247+XFhQc3WxWfRFf61CI1gz1kkTEJl0r
YzJeDyr0XHi/SsTQY3RbyBlDfnMsRNWV3KSckLAfzRy0CX/ztGPUTLeF7QGj8lEyvIuP
PtsAo7ZtYmHimI6shbGm/mMvjCAs4nZGta0WhWae4a3xnZoCsmZpeKyIDlKEWYaxQUm1
lom7EY3SaKDQ0QlsgS65W2yUeSHXVHTZKU1KsKpBuXsrO4GNkAZGrl2VOytn2UziGjOa
dMow==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=CZA5zLe4tbSwvOo2ZG+jag13FB9U46jQ6ezncJjNY/o=;
b=BjbOjc+DRbEmK6tPxx1HMMZkKl/2jRasCXcEHtzaIIKdLjTk/ClF7J+lkvedaqAbtK
9uNqxo216irBZnCyO2hWWob5NVuv7JuhN16/yEZ0Rw66PaLDncNuR3X6Zw3ogRRge67H
iAwstB+nxFwa5asFxX1OZk7tv6jcMX4Jjtx2B1ll65p71joB9hoyVus5q0SoYLMHQok2
yYPitzHHEFtl041KGlBBnL2fi8L4br4l9+PmEdiPyjW2DivXja6UcvB66cy5gh2dCSRS
ByTBs8EkJ3B2Jw9MUGG2DEesmyGDXg6guSePCUeEnS/3m/sHmAXpWhBDMH5EScq28aBD
nSCA==
X-Gm-Message-State: APjAAAXLAxv8/jqJGVA2KBFwsEeHN2a1vtLgzqg6Ti6xtTseG89JnVgQ
b7ywDDrEjRbF7LvdQnytWh/p4fEQ5zg=
X-Google-Smtp-Source: APXvYqy+3CYb9zLyvigJn5rcG+H/JT50ZHvofStj6rC9pNaikXrYa5OoQ6yOetnH4j5Npqw+XK32Kw==
X-Received: by 2002:a63:db05:: with SMTP id e5mr14191932pgg.121.1561058460097;
Thu, 20 Jun 2019 12:21:00 -0700 (PDT)
Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127])
by smtp.gmail.com with ESMTPSA id j11sm255703pfa.2.2019.06.20.12.20.59
(version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256);
Thu, 20 Jun 2019 12:20:59 -0700 (PDT)
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>
Date: Thu, 20 Jun 2019 12:20:42 -0700
Message-Id: <20190620192048.13814-4-stephen@networkplumber.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20190620192048.13814-1-stephen@networkplumber.org>
References: <20190610175155.21374-1-stephen@networkplumber.org>
<20190620192048.13814-1-stephen@networkplumber.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v5 3/9] kni: don't keep stats in kni_net
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Since kernel 2.6.28 the network subsystem has provided
dev->stats for devices to use statistics handling and is the
default if no ndo_get_stats is provided.
This allow allows for 64 bit (rather than just 32 bit)
statistics with KNI.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
kernel/linux/kni/kni_dev.h | 1 -
kernel/linux/kni/kni_net.c | 43 +++++++++++++-------------------------
2 files changed, 15 insertions(+), 29 deletions(-)
diff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h
index d57bce647e4a..21e4b0d92368 100644
--- a/kernel/linux/kni/kni_dev.h
+++ b/kernel/linux/kni/kni_dev.h
@@ -39,7 +39,6 @@ struct kni_dev {
/* kni list */
struct list_head list;
- struct net_device_stats stats;
int status;
uint16_t group_id; /* Group ID of a group of KNI devices */
uint32_t core_id; /* Core ID to bind */
diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
index cce5e7eb991f..06310fec57bb 100644
--- a/kernel/linux/kni/kni_net.c
+++ b/kernel/linux/kni/kni_net.c
@@ -291,15 +291,15 @@ kni_net_tx(struct sk_buff *skb, struct net_device *dev)
/* Free skb and update statistics */
dev_kfree_skb(skb);
- kni->stats.tx_bytes += len;
- kni->stats.tx_packets++;
+ dev->stats.tx_bytes += len;
+ dev->stats.tx_packets++;
return NETDEV_TX_OK;
drop:
/* Free skb and update statistics */
dev_kfree_skb(skb);
- kni->stats.tx_dropped++;
+ dev->stats.tx_dropped++;
return NETDEV_TX_OK;
}
@@ -343,7 +343,7 @@ kni_net_rx_normal(struct kni_dev *kni)
skb = netdev_alloc_skb(dev, len);
if (!skb) {
/* Update statistics */
- kni->stats.rx_dropped++;
+ dev->stats.rx_dropped++;
continue;
}
@@ -372,8 +372,8 @@ kni_net_rx_normal(struct kni_dev *kni)
netif_rx_ni(skb);
/* Update statistics */
- kni->stats.rx_bytes += len;
- kni->stats.rx_packets++;
+ dev->stats.rx_bytes += len;
+ dev->stats.rx_packets++;
}
/* Burst enqueue mbufs into free_q */
@@ -396,6 +396,7 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)
void *data_kva;
struct rte_kni_mbuf *alloc_kva;
void *alloc_data_kva;
+ struct net_device *dev = kni->net_dev;
/* Get the number of entries in rx_q */
num_rq = kni_fifo_count(kni->rx_q);
@@ -443,8 +444,8 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)
alloc_kva->pkt_len = len;
alloc_kva->data_len = len;
- kni->stats.tx_bytes += len;
- kni->stats.rx_bytes += len;
+ dev->stats.tx_bytes += len;
+ dev->stats.rx_bytes += len;
}
/* Burst enqueue mbufs into tx_q */
@@ -464,8 +465,8 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)
* Update statistic, and enqueue/dequeue failure is impossible,
* as all queues are checked at first.
*/
- kni->stats.tx_packets += num;
- kni->stats.rx_packets += num;
+ dev->stats.tx_packets += num;
+ dev->stats.rx_packets += num;
}
/*
@@ -518,7 +519,7 @@ kni_net_rx_lo_fifo_skb(struct kni_dev *kni)
/* Simulate real usage, allocate/copy skb twice */
skb = netdev_alloc_skb(dev, len);
if (skb == NULL) {
- kni->stats.rx_dropped++;
+ dev->stats.rx_dropped++;
continue;
}
@@ -542,8 +543,8 @@ kni_net_rx_lo_fifo_skb(struct kni_dev *kni)
skb->ip_summed = CHECKSUM_UNNECESSARY;
- kni->stats.rx_bytes += len;
- kni->stats.rx_packets++;
+ dev->stats.rx_bytes += len;
+ dev->stats.rx_packets++;
/* call tx interface */
kni_net_tx(skb, dev);
@@ -573,12 +574,10 @@ kni_net_rx(struct kni_dev *kni)
static void
kni_net_tx_timeout(struct net_device *dev)
{
- struct kni_dev *kni = netdev_priv(dev);
-
pr_debug("Transmit timeout at %ld, latency %ld\n", jiffies,
jiffies - dev_trans_start(dev));
- kni->stats.tx_errors++;
+ dev->stats.tx_errors++;
netif_wake_queue(dev);
}
@@ -627,17 +626,6 @@ kni_net_poll_resp(struct kni_dev *kni)
wake_up_interruptible(&kni->wq);
}
-/*
- * Return statistics to the caller
- */
-static struct net_device_stats *
-kni_net_stats(struct net_device *dev)
-{
- struct kni_dev *kni = netdev_priv(dev);
-
- return &kni->stats;
-}
-
/*
* Fill the eth header
*/
@@ -730,7 +718,6 @@ static const struct net_device_ops kni_net_netdev_ops = {
.ndo_change_rx_flags = kni_net_set_promiscusity,
.ndo_start_xmit = kni_net_tx,
.ndo_change_mtu = kni_net_change_mtu,
- .ndo_get_stats = kni_net_stats,
.ndo_tx_timeout = kni_net_tx_timeout,
.ndo_set_mac_address = kni_net_set_mac,
#ifdef HAVE_CHANGE_CARRIER_CB
--
2.20.1