From patchwork Wed Jun 5 09:42:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 13686519 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 779B218FC95 for ; Wed, 5 Jun 2024 09:43:08 +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=1717580590; cv=none; b=DKUKIxHMXTYUPYsG7nhr25fnUSU0+1JrVhIbpPwPS3eTxqNBEzyasu+I74lYUG8/zf3PGRMihWuUtx5juzYFLHfPOJkUB1hBIIoRSZbFa3Gzlr8MM8N1UqdWmLXHNBts35dEmojqDF/tnWUO4kR/HZBaGXO7SEmLd6ciE4zdVNY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717580590; c=relaxed/simple; bh=AaS0MVDHsIviwS80bGsw+6Ul/ToVvQJ9omBDanURioE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FxS+VTZjaAOlHn8BEqk689RsGdQ1Ucjfz6NAPUSxYVnl0c1P0/GAUnsL0lBk1IEqr61rMWJtmGZbar284J1aBCBmstEb+4MV0QRM+gEzBS2vLenNqj3GwUjz6fFmH5a13FtQ/Rdh+7wKJv+0etxzbabkbLck6DTzzyO5dSo/FEY= 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=VAH+EPJX; 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="VAH+EPJX" Received: by codeconstruct.com.au (Postfix, from userid 10000) id 7F0AD201C2; Wed, 5 Jun 2024 17:43:06 +0800 (AWST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codeconstruct.com.au; s=2022a; t=1717580586; bh=kPxrZD8ZnlmXNhcZBn+cUOOFrPj85ugqV8tA0BpTO7Y=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=VAH+EPJXDIC/eArg1iV7uIkXl8OLT+RVVdE1Htlww1wxCaVMzSEgpu8wFdw2PM1mM /AcPfLzu42TXFTSFeuYAhfToexYTeGw1O30NIBgniNJoukIGXuvOaypWux28yh4MAF 66MYYZXw9j/pVxNljD2RICU/qgFfimiE6OJ9IEK+M4rqV0FNWvHY3MjesWjp4kJ13H OEWKAQJqmuYAu1GbLeM22HYwWF1Hr1CRrLx386gT5uP1rqfxgnGoz7q9nKrYGNxOa6 Y37WJV1hM/kStYcly4DNGu67eeuI0hVbh4slwZNvs5LMdUL3iGSOjZZLsVsjrUBG3w aiTXv/zGHrCFA== From: Jeremy Kerr Date: Wed, 05 Jun 2024 17:42:57 +0800 Subject: [PATCH net-next v2 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: <20240605-dstats-v2-1-7fae03f813f3@codeconstruct.com.au> References: <20240605-dstats-v2-0-7fae03f813f3@codeconstruct.com.au> In-Reply-To: <20240605-dstats-v2-0-7fae03f813f3@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 --- 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 Wed Jun 5 09:42:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 13686520 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 C738618FDC8 for ; Wed, 5 Jun 2024 09:43:08 +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=1717580590; cv=none; b=U1WHurCBwL2Cv0jOrVbyvDFemLZpogdhiyqFY6zTEree0JrhOoXBKHdSHRrSwtfDtP7sOgwf1G6m+TvMKWqpJGdp75ahDuo54K/CeWTEQdvGmuX1V3CiG1DFK5LNPnyC5xD2NSF13KC2VXZWG0PMxNOt+E7YlbPq/ktfmyRu3YU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717580590; c=relaxed/simple; bh=RvonyTAQrTPrx1inN9IxvWdAJ/ATe5CdwojXaFdAYc4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Y9kbZZ1C+KqR9LGLs5xrDouABrX3CASpZ0g1sWA9cHXunuGK2A8PA0bFagHft20csKWJWkRLvWocddVL3l4Rro07r4t12afllisAgNNWKczcgqZMiN75gHcX5RiYExmdBkuIqqkE2P/HKWbT9HcbxI6a7kn1ABkKah9C0l3kAFQ= 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=l2FJXP/V; 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="l2FJXP/V" Received: by codeconstruct.com.au (Postfix, from userid 10000) id CFCDC201EF; Wed, 5 Jun 2024 17:43:06 +0800 (AWST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codeconstruct.com.au; s=2022a; t=1717580586; bh=6UXINpL/S5T3XjfUpv5PfnzjKYjGnFYJ9GL4lGoc5zw=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=l2FJXP/VN0tf3LOGjQN6NzjAw61TBeV2jhxCnA2W0o5tmqSsT3qBRGCM8+4tArAmD CxQ1ariNmCx2HMn1J2rmaWerR0qGFcMMyc+HhPDT7ElcmCc7CFKgm3BtLWOqXZEJ// Y0x8tcgof3xQ7K3O1Mi9U8dzmzs+t4L4ZQeZU8yBXbByeNVJiCV706eKG6FyhHDC/+ VfTB1kmOtEQe6tujktTn2EI08xQyBrmAqvxKIVabNy7BLKb1c2sIuuwAiRZbbJ1IId mPQ5OdSzaI7TGqvkjyR/aFqQJzPdzibt1TkCIhgs6lhqFRRQub8vRnIolr1K2fo+4N SKjHTnwBDGNuw== From: Jeremy Kerr Date: Wed, 05 Jun 2024 17:42:58 +0800 Subject: [PATCH net-next v2 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: <20240605-dstats-v2-2-7fae03f813f3@codeconstruct.com.au> References: <20240605-dstats-v2-0-7fae03f813f3@codeconstruct.com.au> In-Reply-To: <20240605-dstats-v2-0-7fae03f813f3@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 helpers for dstats-type collection, based on the VRF driver's own (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 --- v2: - use correct percpu var ("stats", not "dstats") in dev_fetch_dstats --- include/linux/netdevice.h | 3 +++ net/core/dev.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index f148a01dd1d1..fdc3d8a6c0f4 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -4690,6 +4690,9 @@ void netdev_stats_to_stats64(struct rtnl_link_stats64 *stats64, void dev_fetch_sw_netstats(struct rtnl_link_stats64 *s, const struct pcpu_sw_netstats __percpu *netstats); void dev_get_tstats64(struct net_device *dev, struct rtnl_link_stats64 *s); +void dev_fetch_dstats(struct rtnl_link_stats64 *s, + const struct pcpu_dstats __percpu *dstats); +void dev_get_dstats64(struct net_device *dev, struct rtnl_link_stats64 *s); enum { NESTED_SYNC_IMM_BIT, diff --git a/net/core/dev.c b/net/core/dev.c index e1bb6d7856d9..7536a80aefcc 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -10849,6 +10849,62 @@ void dev_get_tstats64(struct net_device *dev, struct rtnl_link_stats64 *s) } EXPORT_SYMBOL_GPL(dev_get_tstats64); +/** + * dev_fetch_dstats - collate per-cpu network dstats statistics + * @s: place to store stats + * @dstats: per-cpu network stats to read from + * + * Read per-cpu network statistics from dev->dstats and populate the + * related fields in @s. + */ +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; + } +} +EXPORT_SYMBOL_GPL(dev_fetch_dstats); + +/** + * dev_get_dstats64 - ndo_get_stats64 implementation for dtstats-based + * account. + * @dev: device to get statistics from + * @s: place to store stats + * + * Populate @s from dev->stats and dev->dstats. Can be used as + * ndo_get_stats64() callback. + */ +void dev_get_dstats64(struct net_device *dev, struct rtnl_link_stats64 *s) +{ + netdev_stats_to_stats64(s, &dev->stats); + dev_fetch_dstats(s, dev->dstats); +} +EXPORT_SYMBOL_GPL(dev_get_dstats64); + struct netdev_queue *dev_ingress_queue_create(struct net_device *dev) { struct netdev_queue *queue = dev_ingress_queue(dev); From patchwork Wed Jun 5 09:42:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 13686521 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 10BF418FDC9 for ; Wed, 5 Jun 2024 09:43:08 +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=1717580590; cv=none; b=K3N4M3O7jawrlG9/TPNQWtOQdXR9TTvFgaaJ2kIo3XSLXMgQyTn4O39kD0DciwtWqZJ91zGaEvJEaUwy8C3ch0BPMPC3pJFUb+9l/s1fx/r16yW434NnENruoTyUA8ZbUgOU60XTSmvj+0HGk/aee3HLcDOknTZr5upjP0sKWiE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717580590; c=relaxed/simple; bh=8h4KA730AC68bPqqFEuhTfKfCsp4IXk916+cvlcF4u4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gPrjYKSow3z2et0o47tyrFJ1qhazFkAb3P/TsRihJouR1nfoikhqUdZSMRR3m2hDaK2NzI/wMDzC7waJ18fmipYeTwvBk8GCBhvJRBErQ+SQp/NwITMFsZR7IZ8Hzh1I0UupBtpZuuVQIHlMncGg0bzZCKI3t7CyX4ZGFNRTsKU= 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=Uq+Tzt3s; 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="Uq+Tzt3s" Received: by codeconstruct.com.au (Postfix, from userid 10000) id 2B2832023C; Wed, 5 Jun 2024 17:43:07 +0800 (AWST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codeconstruct.com.au; s=2022a; t=1717580587; bh=e6aXlOyS5hCIHkSa9U6t3BEST756oDv8nTcE+MOWgXY=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=Uq+Tzt3s++kICaq8IL9H90BWV0KVGtcTSWCQxVcT5KRC5ovcT3ni2ogLq+LmPTBo9 zYO2pj+LfWO9/2TZIykbMIZSJ4ZN78c0+RJu4xYXxaiaP57HeG5G2xxg0A9gO0mH52 hNH1P2WPmcYTcqwksNFSH15ORY64/mjG4NWwfZ9ULeZttMV0L5ESlDWS7IOHphRIfz WQ/gF/rfq6OIL4+ozfZj5ADcIC9gCJ66xsbbveHAftlQQqpSvI1Ccxo7eZLCxkQgjK HlCvgqwD1Ypq6X6fhgLOUrW8zMFj0fj2z7dDoM+jTtvdIXgQNi3e9ySQ4qxTONZdwd t1Mulr1zkhjDg== From: Jeremy Kerr Date: Wed, 05 Jun 2024 17:42:59 +0800 Subject: [PATCH net-next v2 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: <20240605-dstats-v2-3-7fae03f813f3@codeconstruct.com.au> References: <20240605-dstats-v2-0-7fae03f813f3@codeconstruct.com.au> In-Reply-To: <20240605-dstats-v2-0-7fae03f813f3@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 helper for this. Switch to the generic helper. 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 --- drivers/net/vrf.c | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 5018831b2a79..b1083620aeea 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,7 @@ 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_get_stats64 = dev_get_dstats64, .ndo_add_slave = vrf_add_slave, .ndo_del_slave = vrf_del_slave, };