From patchwork Fri Jun 7 10:25:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 13689625 X-Patchwork-Delegate: kuba@kernel.org Received: from codeconstruct.com.au (pi.codeconstruct.com.au [203.29.241.158]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A5F5D15B126 for ; Fri, 7 Jun 2024 10:25:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=203.29.241.158 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717755941; cv=none; b=hzq9cUnJ3LD2ptzB+hoShYFNE2Xpi5fLwgEu0vtCuIxBtuMQ+Uczi3eHDpbkiNo5xL23OrvBJtS3z+h2i8clTBDosSEzT9n6SGbIhxhd//PjZIkK4BhIMR/w4SIxXswa0wxwTf2aN+vD+fYMnaXdeOoeo+Fk068NigzlT+uwGSQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717755941; c=relaxed/simple; bh=AaS0MVDHsIviwS80bGsw+6Ul/ToVvQJ9omBDanURioE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RcGasnYUCQRtDuWL0b5ST1r27Wi80wBJocAuEPNqfatTIW4y4wyIN9q4FazWhdNpOFdmmnhfH30LyaFCkCdHW1gMZzw9Isnpw6DFuz9RFmWVpadE5ulleaz98EnFN8ayalusRwjP7xUUACmn2Ne/pettkRvulFZPQJxlP0RwSXg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=codeconstruct.com.au; spf=pass smtp.mailfrom=codeconstruct.com.au; dkim=pass (2048-bit key) header.d=codeconstruct.com.au header.i=@codeconstruct.com.au header.b=ULvVldvj; arc=none smtp.client-ip=203.29.241.158 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=codeconstruct.com.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=codeconstruct.com.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=codeconstruct.com.au header.i=@codeconstruct.com.au header.b="ULvVldvj" Received: by codeconstruct.com.au (Postfix, from userid 10000) id 8FDD920238; Fri, 7 Jun 2024 18:25:37 +0800 (AWST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codeconstruct.com.au; s=2022a; t=1717755937; bh=kPxrZD8ZnlmXNhcZBn+cUOOFrPj85ugqV8tA0BpTO7Y=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=ULvVldvjHu4qimPaNBPWM9p0zhMO85nUV9Srcft1DXzjnGKpUh4eXbvqhWveEZVbn rqm3DqgAN7En76l/DV7FYc+8eVPppJ4MEVoDDFUfX6DYhFtL7xBr10/zXX3/de5c1H BZraNuIjwa32WcPW+UAz/9CbvDhoFiR4MVjr7EtQ5CSdwxr8IajwW9zXFXGyquffba WeMDjia1Y/W+GAzwo/MDcTIbDaYGGGsIQ1afQ6VhL2x8ViTCXDyR8DFrmcXy56/MBX rRlKeY4YpWN4hASHuC2UB53gYiRv5Bh2m3QBaWfvswE1iheFphxlQ83BtcYoP7o1pr r2OIWqWrvYXxQ== From: Jeremy Kerr Date: Fri, 07 Jun 2024 18:25:24 +0800 Subject: [PATCH net-next v3 1/3] net: core,vrf: Change pcpu_dstat fields to u64_stats_t Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240607-dstats-v3-1-cc781fe116f7@codeconstruct.com.au> References: <20240607-dstats-v3-0-cc781fe116f7@codeconstruct.com.au> In-Reply-To: <20240607-dstats-v3-0-cc781fe116f7@codeconstruct.com.au> To: David Ahern , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org X-Mailer: b4 0.13.0 X-Patchwork-Delegate: kuba@kernel.org The pcpu_sw_netstats and pcpu_lstats structs both contain a set of u64_stats_t fields for individual stats, but pcpu_dstats uses u64s instead. Make this consistent by using u64_stats_t across all stats types. The per-cpu dstats are only used by the vrf driver at present, so update that driver as part of this change. Signed-off-by: Jeremy Kerr Reviewed-by: Simon Horman --- v2: - use proper accessor in rx drop accounting --- drivers/net/vrf.c | 38 ++++++++++++++++++++++---------------- include/linux/netdevice.h | 12 ++++++------ 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 3a252ac5dd28..5018831b2a79 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -126,8 +126,8 @@ static void vrf_rx_stats(struct net_device *dev, int len) struct pcpu_dstats *dstats = this_cpu_ptr(dev->dstats); u64_stats_update_begin(&dstats->syncp); - dstats->rx_packets++; - dstats->rx_bytes += len; + u64_stats_inc(&dstats->rx_packets); + u64_stats_add(&dstats->rx_bytes, len); u64_stats_update_end(&dstats->syncp); } @@ -150,11 +150,11 @@ static void vrf_get_stats64(struct net_device *dev, dstats = per_cpu_ptr(dev->dstats, i); do { start = u64_stats_fetch_begin(&dstats->syncp); - tbytes = dstats->tx_bytes; - tpkts = dstats->tx_packets; - tdrops = dstats->tx_drops; - rbytes = dstats->rx_bytes; - rpkts = dstats->rx_packets; + tbytes = u64_stats_read(&dstats->tx_bytes); + tpkts = u64_stats_read(&dstats->tx_packets); + tdrops = u64_stats_read(&dstats->tx_drops); + rbytes = u64_stats_read(&dstats->rx_bytes); + rpkts = u64_stats_read(&dstats->rx_packets); } while (u64_stats_fetch_retry(&dstats->syncp, start)); stats->tx_bytes += tbytes; stats->tx_packets += tpkts; @@ -408,10 +408,15 @@ static int vrf_local_xmit(struct sk_buff *skb, struct net_device *dev, skb->protocol = eth_type_trans(skb, dev); - if (likely(__netif_rx(skb) == NET_RX_SUCCESS)) + if (likely(__netif_rx(skb) == NET_RX_SUCCESS)) { vrf_rx_stats(dev, len); - else - this_cpu_inc(dev->dstats->rx_drops); + } else { + struct pcpu_dstats *dstats = this_cpu_ptr(dev->dstats); + + u64_stats_update_begin(&dstats->syncp); + u64_stats_inc(&dstats->rx_drops); + u64_stats_update_end(&dstats->syncp); + } return NETDEV_TX_OK; } @@ -599,19 +604,20 @@ static netdev_tx_t is_ip_tx_frame(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t vrf_xmit(struct sk_buff *skb, struct net_device *dev) { + struct pcpu_dstats *dstats = this_cpu_ptr(dev->dstats); + int len = skb->len; netdev_tx_t ret = is_ip_tx_frame(skb, dev); + u64_stats_update_begin(&dstats->syncp); if (likely(ret == NET_XMIT_SUCCESS || ret == NET_XMIT_CN)) { - struct pcpu_dstats *dstats = this_cpu_ptr(dev->dstats); - u64_stats_update_begin(&dstats->syncp); - dstats->tx_packets++; - dstats->tx_bytes += len; - u64_stats_update_end(&dstats->syncp); + u64_stats_inc(&dstats->tx_packets); + u64_stats_add(&dstats->tx_bytes, len); } else { - this_cpu_inc(dev->dstats->tx_drops); + u64_stats_inc(&dstats->tx_drops); } + u64_stats_update_end(&dstats->syncp); return ret; } diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index d20c6c99eb88..f148a01dd1d1 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2731,12 +2731,12 @@ struct pcpu_sw_netstats { } __aligned(4 * sizeof(u64)); struct pcpu_dstats { - u64 rx_packets; - u64 rx_bytes; - u64 rx_drops; - u64 tx_packets; - u64 tx_bytes; - u64 tx_drops; + u64_stats_t rx_packets; + u64_stats_t rx_bytes; + u64_stats_t rx_drops; + u64_stats_t tx_packets; + u64_stats_t tx_bytes; + u64_stats_t tx_drops; struct u64_stats_sync syncp; } __aligned(8 * sizeof(u64)); From patchwork Fri Jun 7 10:25:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 13689624 X-Patchwork-Delegate: kuba@kernel.org Received: from codeconstruct.com.au (pi.codeconstruct.com.au [203.29.241.158]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EB14115B967 for ; Fri, 7 Jun 2024 10:25:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=203.29.241.158 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717755941; cv=none; b=Al38hqsJHu82BaDBG9bSSqPBPnKQDO+eYAmp1FId63OJ07nwE3J0RlpYlpEbtUnSSBriNahb31iJzLtNmqSeP2XC1HpoK6xFpjKNGtQp2bWe+S/uqHOj2/wOzGRHOJd3J7EeOvyb6FSepOx496kZgNQh++3jS6MXVNTp20Z5V9E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717755941; c=relaxed/simple; bh=0shH0MIpU/+fHe3BpvoegYg1ty2d8Q96t4AIpk9WppA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aWNzx9E1g4ARjOkJQ8dH7spPd+Y3kledj4JCQVYpBDJjTANz0rHoy/Sq1jKfvc8eK6pM4mzBWJSUNK3UxiMKE3i+bwJZ4eNsLdU0VgzwJl8UMNrQ5uER+CCTo/eS8mx6sz1jWkKDXJMN/Ago2+jCUApvFtD7UHDRBxwJ7KIyhx4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=codeconstruct.com.au; spf=pass smtp.mailfrom=codeconstruct.com.au; dkim=pass (2048-bit key) header.d=codeconstruct.com.au header.i=@codeconstruct.com.au header.b=l2JZcSiL; arc=none smtp.client-ip=203.29.241.158 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=codeconstruct.com.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=codeconstruct.com.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=codeconstruct.com.au header.i=@codeconstruct.com.au header.b="l2JZcSiL" Received: by codeconstruct.com.au (Postfix, from userid 10000) id DABBD20239; Fri, 7 Jun 2024 18:25:37 +0800 (AWST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codeconstruct.com.au; s=2022a; t=1717755937; bh=yd4IJp7KEoVXYbhKe9PO348L7pYanHh9Dhj573+5fWg=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=l2JZcSiLp8fnkDCqR4wEQ22Ffr/fkAOT2JqAkC/vUB1dF2NIXjm6vDialcTSUng1D paorEcBU8VVcdL6O/UnFvDV7LyUo0Hn+XQZv9eBfyHGZVO3x7JBVEN0JyjU0eiAaS3 racdRGl/bb1lmBYM32opWHNLevKiea/rDaZZTml2JtDHxx95IgEWzf8c2pHOxpxRYk bqmflaT9yp7doviuYfNtNvJn7lVe49+kGrGRrc2dx1zu2+iTjJg5Zrj3barlBETU34 XpkUcE3S2ZPguRsRV3cETAlAqoLbUJ7hYwiSgMjlb2W1na3vrhhK2Kq3vMwbRV1ITE Vsmj+LlipwrXg== From: Jeremy Kerr Date: Fri, 07 Jun 2024 18:25:25 +0800 Subject: [PATCH net-next v3 2/3] net: core: Implement dstats-type stats collections Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240607-dstats-v3-2-cc781fe116f7@codeconstruct.com.au> References: <20240607-dstats-v3-0-cc781fe116f7@codeconstruct.com.au> In-Reply-To: <20240607-dstats-v3-0-cc781fe116f7@codeconstruct.com.au> To: David Ahern , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org X-Mailer: b4 0.13.0 X-Patchwork-Delegate: kuba@kernel.org We currently have dev_get_tstats64() for collecting per-cpu stats of type pcpu_sw_netstats ("tstats"). However, tstats doesn't allow for accounting tx/rx drops. We do have a stats variant that does have stats for dropped packets: struct pcpu_dstats, but there are no core helpers for using those stats. The VRF driver uses dstats, by providing its own collation/fetch functions to do so. This change adds a common implementation for dstats-type collection, used when pcpu_stat_type == NETDEV_PCPU_STAT_DSTAT. This is based on the VRF driver's existing stats collator (plus the unused tx_drops stat from there). We will switch the VRF driver to use this in the next change. Signed-off-by: Jeremy Kerr Reviewed-by: Simon Horman --- v3: - As suggested by Jakub: don't expose dev_get_dstats64 as a helper, but invoke automatically for NETDEV_PCPU_STAT_DSTAT devices. v2: - use correct percpu var ("stats", not "dstats") in dev_fetch_dstats --- net/core/dev.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/net/core/dev.c b/net/core/dev.c index e1bb6d7856d9..3dcfc8d6c51a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -10702,6 +10702,54 @@ void netdev_run_todo(void) wake_up(&netdev_unregistering_wq); } +/* Collate per-cpu network dstats statistics + * + * Read per-cpu network statistics from dev->dstats and populate the related + * fields in @s. + */ +static void dev_fetch_dstats(struct rtnl_link_stats64 *s, + const struct pcpu_dstats __percpu *dstats) +{ + int cpu; + + for_each_possible_cpu(cpu) { + u64 rx_packets, rx_bytes, rx_drops; + u64 tx_packets, tx_bytes, tx_drops; + const struct pcpu_dstats *stats; + unsigned int start; + + stats = per_cpu_ptr(dstats, cpu); + do { + start = u64_stats_fetch_begin(&stats->syncp); + rx_packets = u64_stats_read(&stats->rx_packets); + rx_bytes = u64_stats_read(&stats->rx_bytes); + rx_drops = u64_stats_read(&stats->rx_drops); + tx_packets = u64_stats_read(&stats->tx_packets); + tx_bytes = u64_stats_read(&stats->tx_bytes); + tx_drops = u64_stats_read(&stats->tx_drops); + } while (u64_stats_fetch_retry(&stats->syncp, start)); + + s->rx_packets += rx_packets; + s->rx_bytes += rx_bytes; + s->rx_dropped += rx_drops; + s->tx_packets += tx_packets; + s->tx_bytes += tx_bytes; + s->tx_dropped += tx_drops; + } +} + +/* ndo_get_stats64 implementation for dtstats-based accounting. + * + * Populate @s from dev->stats and dev->dstats. This is used internally by the + * core for NETDEV_PCPU_STAT_DSTAT-type stats collection. + */ +static void dev_get_dstats64(const struct net_device *dev, + struct rtnl_link_stats64 *s) +{ + netdev_stats_to_stats64(s, &dev->stats); + dev_fetch_dstats(s, dev->dstats); +} + /* Convert net_device_stats to rtnl_link_stats64. rtnl_link_stats64 has * all the same fields in the same order as net_device_stats, with only * the type differing, but rtnl_link_stats64 may have additional fields @@ -10778,6 +10826,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev, netdev_stats_to_stats64(storage, ops->ndo_get_stats(dev)); } else if (dev->pcpu_stat_type == NETDEV_PCPU_STAT_TSTATS) { dev_get_tstats64(dev, storage); + } else if (dev->pcpu_stat_type == NETDEV_PCPU_STAT_DSTATS) { + dev_get_dstats64(dev, storage); } else { netdev_stats_to_stats64(storage, &dev->stats); } From patchwork Fri Jun 7 10:25:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 13689626 X-Patchwork-Delegate: kuba@kernel.org Received: from codeconstruct.com.au (pi.codeconstruct.com.au [203.29.241.158]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 600FF15B99D for ; Fri, 7 Jun 2024 10:25:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=203.29.241.158 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717755942; cv=none; b=KD0GO6GyiMafPhgRKRDNe4pGPl0o39nPOb2ssAwSy4DBsUxeIuNpns10bFubZacE3LBswwcgCDdWkUrlofWWTZCLu4ML0exsuyN5WYhF7O+EkXn8IESmqkR8ki5V4NzIwJxXGLyI8M/rmQgUNTfZRdwEECuzuF3TceKHMCjy/0U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717755942; c=relaxed/simple; bh=piPU+g0nbMTOuvekb9iGPxz9qQk6qA1/h7C8xUzER2k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=N6vCbL78GgZR9SJZ6LNWl7h8ajAU+2VPzpybtYGhXyE9bDAawVO6yn1eWarvoL5fU3q1q90cjzjG0/zDyUrQoZdI+oirAAWbqfRSmAJR8lHBBNptZzaF7s34hQq+Y2Jl0WBINttqYDtOwwkRrf9zEwf5qtLgWW6IkFwr8mPcpzE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=codeconstruct.com.au; spf=pass smtp.mailfrom=codeconstruct.com.au; dkim=pass (2048-bit key) header.d=codeconstruct.com.au header.i=@codeconstruct.com.au header.b=LAtEr3+E; arc=none smtp.client-ip=203.29.241.158 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=codeconstruct.com.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=codeconstruct.com.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=codeconstruct.com.au header.i=@codeconstruct.com.au header.b="LAtEr3+E" Received: by codeconstruct.com.au (Postfix, from userid 10000) id 2D2F72024E; Fri, 7 Jun 2024 18:25:38 +0800 (AWST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codeconstruct.com.au; s=2022a; t=1717755938; bh=SGCjoIO9SaSjlyIO6j/HHQ1TU4mgED8jsS/7EgCYwaw=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=LAtEr3+EotKHF7pmCTS/trVrBjeaoxFjophkZBePCch+66IeWZLHxctUUtZLNfoKi 8c6DFGdOVxG5eEhsCnSFfUVpzvroYBpIGW9qfU+eTqPF6pXcla00qhcLIbblfKmhUM hmg/IVBZMGqML9TiD0WdoOPe1pmpz5Ly2io9ZNOqtGr6rd9ZUT0gZe6WFNNAK8/hrW ubyF2gFY8AJKW0auq1glXVe6fsyXV56opF696sYjmmZyaAqE+NT7o28gdTV62chYO6 TwUfzlPUTAtS7KKBFsE/r5j4+v6BHZtFpaBVgYLa5xu5S2pPY9wnFmeXt/ytJT8fDN fdqq4Zdq2nm+Q== From: Jeremy Kerr Date: Fri, 07 Jun 2024 18:25:26 +0800 Subject: [PATCH net-next v3 3/3] net: vrf: move to generic dstat helpers Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240607-dstats-v3-3-cc781fe116f7@codeconstruct.com.au> References: <20240607-dstats-v3-0-cc781fe116f7@codeconstruct.com.au> In-Reply-To: <20240607-dstats-v3-0-cc781fe116f7@codeconstruct.com.au> To: David Ahern , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org X-Mailer: b4 0.13.0 X-Patchwork-Delegate: kuba@kernel.org The vrf driver has its own dstats-to-rtnl_link_stats64 collection, but we now have a generic implementation for dstats collection, so switch to this. In doing so, we fix a minor issue where the (non-percpu) dev->stats->tx_errors value was never collected into rtnl_link_stats64, as the generic dev_get_dstats64() consumes the starting values from dev->stats. Signed-off-by: Jeremy Kerr Reviewed-by: Simon Horman --- v3: - we no longer need ->ndo_get_stats64, as the collection is now performed by default for NETDEV_PCPU_STAT_DSTATS devices. --- drivers/net/vrf.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 5018831b2a79..9af316cdd8b3 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -137,33 +137,6 @@ static void vrf_tx_error(struct net_device *vrf_dev, struct sk_buff *skb) kfree_skb(skb); } -static void vrf_get_stats64(struct net_device *dev, - struct rtnl_link_stats64 *stats) -{ - int i; - - for_each_possible_cpu(i) { - const struct pcpu_dstats *dstats; - u64 tbytes, tpkts, tdrops, rbytes, rpkts; - unsigned int start; - - dstats = per_cpu_ptr(dev->dstats, i); - do { - start = u64_stats_fetch_begin(&dstats->syncp); - tbytes = u64_stats_read(&dstats->tx_bytes); - tpkts = u64_stats_read(&dstats->tx_packets); - tdrops = u64_stats_read(&dstats->tx_drops); - rbytes = u64_stats_read(&dstats->rx_bytes); - rpkts = u64_stats_read(&dstats->rx_packets); - } while (u64_stats_fetch_retry(&dstats->syncp, start)); - stats->tx_bytes += tbytes; - stats->tx_packets += tpkts; - stats->tx_dropped += tdrops; - stats->rx_bytes += rbytes; - stats->rx_packets += rpkts; - } -} - static struct vrf_map *netns_vrf_map(struct net *net) { struct netns_vrf *nn_vrf = net_generic(net, vrf_net_id); @@ -1201,7 +1174,6 @@ static const struct net_device_ops vrf_netdev_ops = { .ndo_uninit = vrf_dev_uninit, .ndo_start_xmit = vrf_xmit, .ndo_set_mac_address = eth_mac_addr, - .ndo_get_stats64 = vrf_get_stats64, .ndo_add_slave = vrf_add_slave, .ndo_del_slave = vrf_del_slave, };