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>,
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>,
Saeed Mahameed <saeedm@nvidia.com>
Subject: [PATCH v6 net-next 10/15] net: openvswitch: propagate errors from dev_get_stats
Date: Sat, 9 Jan 2021 19:26:19 +0200 [thread overview]
Message-ID: <20210109172624.2028156-11-olteanv@gmail.com> (raw)
In-Reply-To: <20210109172624.2028156-1-olteanv@gmail.com>
From: Vladimir Oltean <vladimir.oltean@nxp.com>
The dev_get_stats function can now return an error code, so the code
that retrieves vport statistics and sends them through netlink needs to
propagate that error code.
Modify the drastic BUG_ON checks to operate only on the -EMSGSIZE error
code (the only error code previously possible), and not crash the kernel
in case dev_get_stats fails. This is in line with what rtnetlink.c does.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
Changes in v6:
None.
Changes in v5:
Still keeping the BUG_ON condition except for the output of
ovs_vport_get_stats.
Changes in v4:
Patch is new (Eric's suggestion).
net/openvswitch/datapath.c | 25 +++++++++++++++++++------
net/openvswitch/vport.c | 10 ++++++++--
net/openvswitch/vport.h | 2 +-
3 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 9d6ef6cb9b26..160b8dc453da 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -1987,7 +1987,10 @@ static int ovs_vport_cmd_fill_info(struct vport *vport, struct sk_buff *skb,
goto nla_put_failure;
}
- ovs_vport_get_stats(vport, &vport_stats);
+ err = ovs_vport_get_stats(vport, &vport_stats);
+ if (err)
+ goto error;
+
if (nla_put_64bit(skb, OVS_VPORT_ATTR_STATS,
sizeof(struct ovs_vport_stats), &vport_stats,
OVS_VPORT_ATTR_PAD))
@@ -2028,7 +2031,9 @@ struct sk_buff *ovs_vport_cmd_build_info(struct vport *vport, struct net *net,
retval = ovs_vport_cmd_fill_info(vport, skb, net, portid, seq, 0, cmd,
GFP_KERNEL);
- BUG_ON(retval < 0);
+ BUG_ON(retval == -EMSGSIZE);
+ if (retval)
+ return ERR_PTR(retval);
return skb;
}
@@ -2173,6 +2178,9 @@ static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info)
err = ovs_vport_cmd_fill_info(vport, reply, genl_info_net(info),
info->snd_portid, info->snd_seq, 0,
OVS_VPORT_CMD_NEW, GFP_KERNEL);
+ BUG_ON(err == -EMSGSIZE);
+ if (err)
+ goto exit_unlock_free;
new_headroom = netdev_get_fwd_headroom(vport->dev);
@@ -2181,7 +2189,6 @@ static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info)
else
netdev_set_rx_headroom(vport->dev, dp->max_headroom);
- BUG_ON(err < 0);
ovs_unlock();
ovs_notify(&dp_vport_genl_family, reply, info);
@@ -2234,7 +2241,9 @@ static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info)
err = ovs_vport_cmd_fill_info(vport, reply, genl_info_net(info),
info->snd_portid, info->snd_seq, 0,
OVS_VPORT_CMD_SET, GFP_KERNEL);
- BUG_ON(err < 0);
+ BUG_ON(err == -EMSGSIZE);
+ if (err)
+ goto exit_unlock_free;
ovs_unlock();
ovs_notify(&dp_vport_genl_family, reply, info);
@@ -2274,7 +2283,9 @@ static int ovs_vport_cmd_del(struct sk_buff *skb, struct genl_info *info)
err = ovs_vport_cmd_fill_info(vport, reply, genl_info_net(info),
info->snd_portid, info->snd_seq, 0,
OVS_VPORT_CMD_DEL, GFP_KERNEL);
- BUG_ON(err < 0);
+ BUG_ON(err == -EMSGSIZE);
+ if (err)
+ goto exit_unlock_free;
/* the vport deletion may trigger dp headroom update */
dp = vport->dp;
@@ -2321,7 +2332,9 @@ static int ovs_vport_cmd_get(struct sk_buff *skb, struct genl_info *info)
err = ovs_vport_cmd_fill_info(vport, reply, genl_info_net(info),
info->snd_portid, info->snd_seq, 0,
OVS_VPORT_CMD_GET, GFP_ATOMIC);
- BUG_ON(err < 0);
+ BUG_ON(err == -EMSGSIZE);
+ if (err)
+ goto exit_unlock_free;
rcu_read_unlock();
return genlmsg_reply(reply, info);
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
index 215a818bf9ce..e66c949fd97a 100644
--- a/net/openvswitch/vport.c
+++ b/net/openvswitch/vport.c
@@ -267,11 +267,15 @@ void ovs_vport_del(struct vport *vport)
*
* Must be called with ovs_mutex or rcu_read_lock.
*/
-void ovs_vport_get_stats(struct vport *vport, struct ovs_vport_stats *stats)
+int ovs_vport_get_stats(struct vport *vport, struct ovs_vport_stats *stats)
{
struct rtnl_link_stats64 dev_stats;
+ int err;
+
+ err = dev_get_stats(vport->dev, &dev_stats);
+ if (err)
+ return err;
- dev_get_stats(vport->dev, &dev_stats);
stats->rx_errors = dev_stats.rx_errors;
stats->tx_errors = dev_stats.tx_errors;
stats->tx_dropped = dev_stats.tx_dropped;
@@ -281,6 +285,8 @@ void ovs_vport_get_stats(struct vport *vport, struct ovs_vport_stats *stats)
stats->rx_packets = dev_stats.rx_packets;
stats->tx_bytes = dev_stats.tx_bytes;
stats->tx_packets = dev_stats.tx_packets;
+
+ return 0;
}
/**
diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h
index 1eb7495ac5b4..8927ba5c491b 100644
--- a/net/openvswitch/vport.h
+++ b/net/openvswitch/vport.h
@@ -30,7 +30,7 @@ void ovs_vport_del(struct vport *);
struct vport *ovs_vport_locate(const struct net *net, const char *name);
-void ovs_vport_get_stats(struct vport *, struct ovs_vport_stats *);
+int ovs_vport_get_stats(struct vport *, struct ovs_vport_stats *);
int ovs_vport_set_options(struct vport *, struct nlattr *options);
int ovs_vport_get_options(const struct vport *, struct sk_buff *);
--
2.25.1
next prev parent reply other threads:[~2021-01-09 17:28 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
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 ` Vladimir Oltean [this message]
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=20210109172624.2028156-11-olteanv@gmail.com \
--to=olteanv@gmail.com \
--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=pshelar@ovn.org \
--cc=saeedm@nvidia.com \
--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).