From: Vladimir Oltean <olteanv@gmail.com>
To: "David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org, "Andrew Lunn" <andrew@lunn.ch>,
"Florian Fainelli" <f.fainelli@gmail.com>,
"Paul Gortmaker" <paul.gortmaker@windriver.com>,
"Pablo Neira Ayuso" <pablo@netfilter.org>,
"Jiri Benc" <jbenc@redhat.com>,
"Cong Wang" <xiyou.wangcong@gmail.com>,
"Jamal Hadi Salim" <jhs@mojatatu.com>,
"Stephen Hemminger" <stephen@networkplumber.org>,
"Eric Dumazet" <edumazet@google.com>,
"George McCollister" <george.mccollister@gmail.com>,
"Oleksij Rempel" <o.rempel@pengutronix.de>,
"Jay Vosburgh" <j.vosburgh@gmail.com>,
"Veaceslav Falico" <vfalico@gmail.com>,
"Andy Gospodarek" <andy@greyhouse.net>,
"Arnd Bergmann" <arnd@arndb.de>,
"Alexei Starovoitov" <ast@kernel.org>,
"Andrii Nakryiko" <andriin@fb.com>,
"Daniel Borkmann" <daniel@iogearbox.net>,
"Taehee Yoo" <ap420073@gmail.com>,
"Jiri Pirko" <jiri@mellanox.com>,
"Björn Töpel" <bjorn.topel@intel.com>,
"Paolo Abeni" <pabeni@redhat.com>,
"Christian Brauner" <christian.brauner@ubuntu.com>,
"Florian Westphal" <fw@strlen.de>,
linux-s390@vger.kernel.org, intel-wired-lan@lists.osuosl.org,
linux-parisc@vger.kernel.org, linux-scsi@vger.kernel.org,
linux-usb@vger.kernel.org, dev@openvswitch.org
Subject: [RFC PATCH v2 net-next 11/12] net: mark ndo_get_stats64 as being able to sleep
Date: Tue, 5 Jan 2021 20:59:01 +0200 [thread overview]
Message-ID: <20210105185902.3922928-12-olteanv@gmail.com> (raw)
In-Reply-To: <20210105185902.3922928-1-olteanv@gmail.com>
From: Vladimir Oltean <vladimir.oltean@nxp.com>
Now that all callers have been converted to not use atomic context when
calling dev_get_stats, it is time to update the documentation and put a
notice in the function that it expects process context.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
Documentation/networking/netdevices.rst | 8 ++++++--
Documentation/networking/statistics.rst | 9 ++++-----
net/core/dev.c | 2 ++
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/Documentation/networking/netdevices.rst b/Documentation/networking/netdevices.rst
index 5a85fcc80c76..944599722c76 100644
--- a/Documentation/networking/netdevices.rst
+++ b/Documentation/networking/netdevices.rst
@@ -64,8 +64,12 @@ ndo_do_ioctl:
Context: process
ndo_get_stats:
- Synchronization: dev_base_lock rwlock.
- Context: nominally process, but don't sleep inside an rwlock
+ Synchronization:
+ none. netif_lists_lock(net) might be held, but not guaranteed.
+ It is illegal to hold rtnl_lock() in this method, since it will
+ cause a lock inversion with netif_lists_lock and a deadlock.
+ Context:
+ process
ndo_start_xmit:
Synchronization: __netif_tx_lock spinlock.
diff --git a/Documentation/networking/statistics.rst b/Documentation/networking/statistics.rst
index 234abedc29b2..ad3e353df0dd 100644
--- a/Documentation/networking/statistics.rst
+++ b/Documentation/networking/statistics.rst
@@ -155,11 +155,10 @@ Drivers must ensure best possible compliance with
Please note for example that detailed error statistics must be
added into the general `rx_error` / `tx_error` counters.
-The `.ndo_get_stats64` callback can not sleep because of accesses
-via `/proc/net/dev`. If driver may sleep when retrieving the statistics
-from the device it should do so periodically asynchronously and only return
-a recent copy from `.ndo_get_stats64`. Ethtool interrupt coalescing interface
-allows setting the frequency of refreshing statistics, if needed.
+Drivers may sleep when retrieving the statistics from the device, or they might
+read the counters periodically and only return in `.ndo_get_stats64` a recent
+copy collected asynchronously. In the latter case, the ethtool interrupt
+coalescing interface allows setting the frequency of refreshing statistics.
Retrieving ethtool statistics is a multi-syscall process, drivers are advised
to keep the number of statistics constant to avoid race conditions with
diff --git a/net/core/dev.c b/net/core/dev.c
index d48b75479b3e..6b7cdf8ab875 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -10389,6 +10389,8 @@ void dev_get_stats(struct net_device *dev, struct rtnl_link_stats64 *storage)
{
const struct net_device_ops *ops = dev->netdev_ops;
+ might_sleep();
+
if (ops->ndo_get_stats64) {
memset(storage, 0, sizeof(*storage));
ops->ndo_get_stats64(dev, storage);
--
2.25.1
next prev parent reply other threads:[~2021-01-05 18:59 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-05 18:58 [RFC PATCH v2 net-next 00/12] Make .ndo_get_stats64 sleepable Vladimir Oltean
2021-01-05 18:58 ` [RFC PATCH v2 net-next 01/12] net: mark dev_base_lock for deprecation Vladimir Oltean
2021-01-05 18:58 ` [RFC PATCH v2 net-next 02/12] net: introduce a mutex for the netns interface lists Vladimir Oltean
2021-01-05 18:58 ` [RFC PATCH v2 net-next 03/12] net: procfs: hold netif_lists_lock when retrieving device statistics Vladimir Oltean
2021-01-05 18:58 ` [RFC PATCH v2 net-next 04/12] net: sysfs: don't hold dev_base_lock while " Vladimir Oltean
2021-01-05 18:58 ` [RFC PATCH v2 net-next 05/12] s390/appldata_net_sum: hold the netdev lists lock when " Vladimir Oltean
2021-01-05 18:58 ` [RFC PATCH v2 net-next 06/12] parisc/led: reindent the code that gathers " Vladimir Oltean
2021-01-05 18:58 ` [RFC PATCH v2 net-next 07/12] parisc/led: hold the netdev lists lock when retrieving " Vladimir Oltean
2021-01-05 18:58 ` [RFC PATCH v2 net-next 08/12] net: make dev_get_stats return void Vladimir Oltean
2021-01-05 18:58 ` [RFC PATCH v2 net-next 09/12] net: net_failover: ensure .ndo_get_stats64 can sleep Vladimir Oltean
2021-01-05 18:59 ` [RFC PATCH v2 net-next 10/12] net: bonding: " Vladimir Oltean
2021-01-05 18:59 ` Vladimir Oltean [this message]
2021-01-05 18:59 ` [RFC PATCH v2 net-next 12/12] net: remove obsolete comments about ndo_get_stats64 context from eth drivers Vladimir Oltean
2021-01-06 13:45 ` [RFC PATCH v2 net-next 00/12] Make .ndo_get_stats64 sleepable Vladimir Oltean
2021-01-09 1:26 ` Jacob Keller
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=20210105185902.3922928-12-olteanv@gmail.com \
--to=olteanv@gmail.com \
--cc=andrew@lunn.ch \
--cc=andriin@fb.com \
--cc=andy@greyhouse.net \
--cc=ap420073@gmail.com \
--cc=arnd@arndb.de \
--cc=ast@kernel.org \
--cc=bjorn.topel@intel.com \
--cc=christian.brauner@ubuntu.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dev@openvswitch.org \
--cc=edumazet@google.com \
--cc=f.fainelli@gmail.com \
--cc=fw@strlen.de \
--cc=george.mccollister@gmail.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=j.vosburgh@gmail.com \
--cc=jbenc@redhat.com \
--cc=jhs@mojatatu.com \
--cc=jiri@mellanox.com \
--cc=kuba@kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=o.rempel@pengutronix.de \
--cc=pabeni@redhat.com \
--cc=pablo@netfilter.org \
--cc=paul.gortmaker@windriver.com \
--cc=stephen@networkplumber.org \
--cc=vfalico@gmail.com \
--cc=xiyou.wangcong@gmail.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