From: Saeed Mahameed <saeed@kernel.org>
To: Vladimir Oltean <olteanv@gmail.com>,
"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>,
Cong Wang <xiyou.wangcong@gmail.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>, Taehee Yoo <ap420073@gmail.com>,
Jiri Pirko <jiri@resnulli.us>, Florian Westphal <fw@strlen.de>,
Nikolay Aleksandrov <nikolay@nvidia.com>,
Pravin B Shelar <pshelar@ovn.org>,
Sridhar Samudrala <sridhar.samudrala@intel.com>
Subject: Re: [PATCH v6 net-next 08/15] net: allow ndo_get_stats64 to return an int error code
Date: Mon, 11 Jan 2021 14:24:52 -0800 [thread overview]
Message-ID: <3e065920586e87e58a365eac94b69aabb3b244cb.camel@kernel.org> (raw)
In-Reply-To: <20210109172624.2028156-9-olteanv@gmail.com>
On Sat, 2021-01-09 at 19:26 +0200, Vladimir Oltean wrote:
> From: Vladimir Oltean <vladimir.oltean@nxp.com>
>
> Some drivers need to do special tricks to comply with the new policy
> of
> ndo_get_stats64 being sleepable. For example, the bonding driver,
> which
> derives its stats from its lower interfaces, must recurse with
> dev_get_stats into its lowers with no locks held. But for that to
> work,
> it needs to dynamically allocate some memory for a refcounted copy of
> its array of slave interfaces (because recursing unlocked means that
> the
> original one is subject to disappearing). And since memory allocation
> can fail under pressure, we should not let it go unnoticed, but
> instead
> propagate the error code.
>
> This patch converts all implementations of .ndo_get_stats64 to return
> int, and propagates that to the dev_get_stats calling site. Error
> checking will be done in further patches.
>
> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
> ---
> Changes in v6:
> Remove the unused "int err" from __bond_release_one and add it in the
> patch it belongs to.
>
> Changes in v5:
> None.
>
> Changes in v4:
> Patch is new (Eric's suggestion).
>
Just Give Eric the proper credit and add:
Suggested-by: Eric ..
[...]
> @@ -354,4 +356,4 @@ int rmnet_vnd_update_dev_mtu(struct rmnet_port
> *port,
> }
>
> return 0;
> -}
> \ No newline at end of file
> +}
Not related?
[...]
>
> -void dev_get_stats(struct net_device *dev, struct rtnl_link_stats64
> *storage)
> +int dev_get_stats(struct net_device *dev, struct rtnl_link_stats64
> *storage)
> {
> const struct net_device_ops *ops = dev->netdev_ops;
> + int err = 0;
>
> if (ops->ndo_get_stats64) {
> memset(storage, 0, sizeof(*storage));
> - ops->ndo_get_stats64(dev, storage);
> + err = ops->ndo_get_stats64(dev, storage);
> } else if (ops->ndo_get_stats) {
> netdev_stats_to_stats64(storage, ops-
> >ndo_get_stats(dev));
> } else {
> @@ -10418,6 +10419,8 @@ void dev_get_stats(struct net_device *dev,
> struct rtnl_link_stats64 *storage)
> storage->rx_dropped += (unsigned long)atomic_long_read(&dev-
> >rx_dropped);
> storage->tx_dropped += (unsigned long)atomic_long_read(&dev-
> >tx_dropped);
> storage->rx_nohandler += (unsigned long)atomic_long_read(&dev-
> >rx_nohandler);
Must be consistent here, if there was an error you should abort without
touching the caller provided storage, even if you can for some stats.
> +
> + return err;
> }
> EXPORT_SYMBOL(dev_get_stats);
>
next prev parent reply other threads:[~2021-01-11 22:26 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-09 17:26 [PATCH v6 net-next 00/15] Make .ndo_get_stats64 sleepable Vladimir Oltean
2021-01-09 17:26 ` [PATCH v6 net-next 01/15] net: mark dev_base_lock for deprecation Vladimir Oltean
2021-01-09 17:26 ` [PATCH v6 net-next 02/15] net: introduce a mutex for the netns interface lists Vladimir Oltean
2021-01-09 17:26 ` [PATCH v6 net-next 03/15] net: procfs: hold netif_lists_lock when retrieving device statistics Vladimir Oltean
2021-01-11 23:46 ` Saeed Mahameed
2021-01-12 13:44 ` Vladimir Oltean
2021-01-12 20:06 ` Saeed Mahameed
2021-01-09 17:26 ` [PATCH v6 net-next 04/15] net: sysfs: don't hold dev_base_lock while " Vladimir Oltean
2021-01-09 17:26 ` [PATCH v6 net-next 05/15] s390/appldata_net_sum: hold the netdev lists lock when " Vladimir Oltean
2021-01-09 17:26 ` [PATCH v6 net-next 06/15] parisc/led: " Vladimir Oltean
2021-01-09 17:26 ` [PATCH v6 net-next 07/15] net: remove return value from dev_get_stats Vladimir Oltean
2021-01-11 22:08 ` Saeed Mahameed
2021-01-09 17:26 ` [PATCH v6 net-next 08/15] net: allow ndo_get_stats64 to return an int error code Vladimir Oltean
2021-01-11 22:24 ` Saeed Mahameed [this message]
2021-01-11 22:43 ` Saeed Mahameed
2021-01-09 17:26 ` [PATCH v6 net-next 09/15] scsi: fcoe: propagate errors from dev_get_stats Vladimir Oltean
2021-01-09 17:26 ` [PATCH v6 net-next 10/15] net: openvswitch: " Vladimir Oltean
2021-01-09 17:26 ` [PATCH v6 net-next 11/15] net: catch " Vladimir Oltean
2021-01-11 22:54 ` Saeed Mahameed
2021-01-11 23:15 ` Vladimir Oltean
2021-01-11 23:51 ` Saeed Mahameed
2021-01-18 10:31 ` Vladimir Oltean
2021-01-09 17:26 ` [PATCH v6 net-next 12/15] net: openvswitch: ensure dev_get_stats can sleep Vladimir Oltean
2021-01-09 17:26 ` [PATCH v6 net-next 13/15] net: net_failover: ensure .ndo_get_stats64 " Vladimir Oltean
2021-01-09 17:26 ` [PATCH v6 net-next 14/15] net: bonding: " Vladimir Oltean
2021-01-11 23:38 ` Saeed Mahameed
2021-01-12 14:37 ` Vladimir Oltean
2021-01-12 20:10 ` Saeed Mahameed
2021-01-13 2:00 ` Jay Vosburgh
2021-01-09 17:26 ` [PATCH v6 net-next 15/15] net: mark ndo_get_stats64 as being able to sleep Vladimir Oltean
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=3e065920586e87e58a365eac94b69aabb3b244cb.camel@kernel.org \
--to=saeed@kernel.org \
--cc=andrew@lunn.ch \
--cc=andy@greyhouse.net \
--cc=ap420073@gmail.com \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=f.fainelli@gmail.com \
--cc=fw@strlen.de \
--cc=george.mccollister@gmail.com \
--cc=j.vosburgh@gmail.com \
--cc=jiri@resnulli.us \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nikolay@nvidia.com \
--cc=o.rempel@pengutronix.de \
--cc=olteanv@gmail.com \
--cc=pshelar@ovn.org \
--cc=sridhar.samudrala@intel.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;
as well as URLs for NNTP newsgroup(s).