From: Netanel Belgazal <netanel@annapurnalabs.com>
To: linux-kernel@vger.kernel.org, davem@davemloft.net,
netdev@vger.kernel.org
Cc: Netanel Belgazal <netanel@annapurnalabs.com>,
dwmw@amazon.com, zorik@annapurnalabs.com, alex@annapurnalabs.com,
saeed@annapurnalabs.com, msw@amazon.com, aliguori@amazon.com,
nafea@annapurnalabs.com, eric.dumazet@gmail.com
Subject: [PATCH V3 net-next 07/14] net/ena: refactor ena_get_stats64 to be atomic context safe
Date: Fri, 27 Jan 2017 00:18:09 +0200 [thread overview]
Message-ID: <1485469096-5271-8-git-send-email-netanel@annapurnalabs.com> (raw)
In-Reply-To: <1485469096-5271-1-git-send-email-netanel@annapurnalabs.com>
ndo_get_stat64() can be called from atomic context, but the current
implementation sends an admin command to retrieve the statistics from
the device. This admin command can sleep.
This patch re-factors the implementation of ena_get_stats64() to use
the {rx,tx}bytes/count from the driver's inner counters, and to obtain
the rx drop counter from the asynchronous keep alive (heart bit)
event.
Signed-off-by: Netanel Belgazal <netanel@annapurnalabs.com>
---
drivers/net/ethernet/amazon/ena/ena_admin_defs.h | 8 ++++
drivers/net/ethernet/amazon/ena/ena_netdev.c | 57 +++++++++++++++++-------
drivers/net/ethernet/amazon/ena/ena_netdev.h | 1 +
3 files changed, 51 insertions(+), 15 deletions(-)
diff --git a/drivers/net/ethernet/amazon/ena/ena_admin_defs.h b/drivers/net/ethernet/amazon/ena/ena_admin_defs.h
index e1594d6..5b6509d 100644
--- a/drivers/net/ethernet/amazon/ena/ena_admin_defs.h
+++ b/drivers/net/ethernet/amazon/ena/ena_admin_defs.h
@@ -873,6 +873,14 @@ struct ena_admin_aenq_link_change_desc {
u32 flags;
};
+struct ena_admin_aenq_keep_alive_desc {
+ struct ena_admin_aenq_common_desc aenq_common_desc;
+
+ u32 rx_drops_low;
+
+ u32 rx_drops_high;
+};
+
struct ena_admin_ena_mmio_req_read_less_resp {
u16 req_id;
diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index 639f0aa..ea3c801 100644
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -2169,28 +2169,46 @@ static struct rtnl_link_stats64 *ena_get_stats64(struct net_device *netdev,
struct rtnl_link_stats64 *stats)
{
struct ena_adapter *adapter = netdev_priv(netdev);
- struct ena_admin_basic_stats ena_stats;
- int rc;
+ struct ena_ring *rx_ring, *tx_ring;
+ unsigned int start;
+ u64 rx_drops;
+ int i;
if (!test_bit(ENA_FLAG_DEV_UP, &adapter->flags))
return NULL;
- rc = ena_com_get_dev_basic_stats(adapter->ena_dev, &ena_stats);
- if (rc)
- return NULL;
+ for (i = 0; i < adapter->num_queues; i++) {
+ u64 bytes, packets;
+
+ tx_ring = &adapter->tx_ring[i];
+
+ do {
+ start = u64_stats_fetch_begin_irq(&tx_ring->syncp);
+ packets = tx_ring->tx_stats.cnt;
+ bytes = tx_ring->tx_stats.bytes;
+ } while (u64_stats_fetch_retry_irq(&tx_ring->syncp, start));
+
+ stats->tx_packets += packets;
+ stats->tx_bytes += bytes;
- stats->tx_bytes = ((u64)ena_stats.tx_bytes_high << 32) |
- ena_stats.tx_bytes_low;
- stats->rx_bytes = ((u64)ena_stats.rx_bytes_high << 32) |
- ena_stats.rx_bytes_low;
+ rx_ring = &adapter->rx_ring[i];
+
+ do {
+ start = u64_stats_fetch_begin_irq(&rx_ring->syncp);
+ packets = rx_ring->rx_stats.cnt;
+ bytes = rx_ring->rx_stats.bytes;
+ } while (u64_stats_fetch_retry_irq(&rx_ring->syncp, start));
- stats->rx_packets = ((u64)ena_stats.rx_pkts_high << 32) |
- ena_stats.rx_pkts_low;
- stats->tx_packets = ((u64)ena_stats.tx_pkts_high << 32) |
- ena_stats.tx_pkts_low;
+ stats->rx_packets += packets;
+ stats->rx_bytes += bytes;
+ }
+
+ do {
+ start = u64_stats_fetch_begin_irq(&adapter->syncp);
+ rx_drops = adapter->dev_stats.rx_drops;
+ } while (u64_stats_fetch_retry_irq(&adapter->syncp, start));
- stats->rx_dropped = ((u64)ena_stats.rx_drops_high << 32) |
- ena_stats.rx_drops_low;
+ stats->rx_dropped = rx_drops;
stats->multicast = 0;
stats->collisions = 0;
@@ -3213,8 +3231,17 @@ static void ena_keep_alive_wd(void *adapter_data,
struct ena_admin_aenq_entry *aenq_e)
{
struct ena_adapter *adapter = (struct ena_adapter *)adapter_data;
+ struct ena_admin_aenq_keep_alive_desc *desc;
+ u64 rx_drops;
+ desc = (struct ena_admin_aenq_keep_alive_desc *)aenq_e;
adapter->last_keep_alive_jiffies = jiffies;
+
+ rx_drops = ((u64)desc->rx_drops_high << 32) | desc->rx_drops_low;
+
+ u64_stats_update_begin(&adapter->syncp);
+ adapter->dev_stats.rx_drops = rx_drops;
+ u64_stats_update_end(&adapter->syncp);
}
static void ena_notification(void *adapter_data,
diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.h b/drivers/net/ethernet/amazon/ena/ena_netdev.h
index 69d7e9e..f0ddc11 100644
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.h
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.h
@@ -241,6 +241,7 @@ struct ena_stats_dev {
u64 interface_up;
u64 interface_down;
u64 admin_q_pause;
+ u64 rx_drops;
};
enum ena_flags_t {
--
2.7.4
next prev parent reply other threads:[~2017-01-26 22:18 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-26 22:18 [PATCH V3 net-next 00/14] Bug Fixes in ENA driver Netanel Belgazal
2017-01-26 22:18 ` [PATCH V3 net-next 01/14] net/ena: remove ntuple filter support from device feature list Netanel Belgazal
2017-01-26 22:18 ` [PATCH V3 net-next 02/14] net/ena: fix error handling when probe fails Netanel Belgazal
2017-01-27 23:33 ` Lino Sanfilippo
2017-01-31 22:14 ` Netanel Belgazal
2017-01-26 22:18 ` [PATCH V3 net-next 03/14] net/ena: fix queues number calculation Netanel Belgazal
2017-01-26 22:18 ` [PATCH V3 net-next 04/14] net/ena: fix ethtool RSS flow configuration Netanel Belgazal
2017-01-26 22:18 ` [PATCH V3 net-next 05/14] net/ena: fix RSS default hash configuration Netanel Belgazal
2017-01-26 22:18 ` [PATCH V3 net-next 06/14] net/ena: fix NULL dereference when removing the driver after device reset failed Netanel Belgazal
2017-01-26 22:18 ` Netanel Belgazal [this message]
2017-01-26 22:18 ` [PATCH V3 net-next 08/14] net/ena: fix potential access to freed memory during device reset Netanel Belgazal
2017-01-26 22:18 ` [PATCH V3 net-next 09/14] net/ena: use napi_complete_done() return value Netanel Belgazal
2017-01-26 22:18 ` [PATCH V3 net-next 10/14] net/ena: use READ_ONCE to access completion descriptors Netanel Belgazal
2017-01-26 22:18 ` [PATCH V3 net-next 11/14] net/ena: reduce the severity of ena printouts Netanel Belgazal
2017-01-26 22:18 ` [PATCH V3 net-next 12/14] net/ena: change driver's default timeouts Netanel Belgazal
2017-01-26 22:18 ` [PATCH V3 net-next 13/14] net/ena: change condition for host attribute configuration Netanel Belgazal
2017-01-26 22:18 ` [PATCH V3 net-next 14/14] net/ena: update driver version to 1.1.2 Netanel Belgazal
2017-01-27 16:07 ` [PATCH V3 net-next 00/14] Bug Fixes in ENA driver David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1485469096-5271-8-git-send-email-netanel@annapurnalabs.com \
--to=netanel@annapurnalabs.com \
--cc=alex@annapurnalabs.com \
--cc=aliguori@amazon.com \
--cc=davem@davemloft.net \
--cc=dwmw@amazon.com \
--cc=eric.dumazet@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=msw@amazon.com \
--cc=nafea@annapurnalabs.com \
--cc=netdev@vger.kernel.org \
--cc=saeed@annapurnalabs.com \
--cc=zorik@annapurnalabs.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).