From: David Ahern <dsahern@gmail•com>
To: Florian Westphal <fw@strlen•de>, netdev@vger•kernel.org
Subject: Re: [PATCH net-next 5/7] rtnetlink: add helper to dump vf information
Date: Thu, 21 Sep 2017 11:17:47 -0600 [thread overview]
Message-ID: <bdc39ebf-e934-16ce-0834-e0795774a656@gmail.com> (raw)
In-Reply-To: <20170921165902.10746-6-fw@strlen.de>
On 9/21/17 10:59 AM, Florian Westphal wrote:
> similar to earlier patches, split out more parts of this function to
> better see what is happening and where we assume rtnl is locked.
>
> Signed-off-by: Florian Westphal <fw@strlen•de>
> ---
> net/core/rtnetlink.c | 80 ++++++++++++++++++++++++++++++++--------------------
> 1 file changed, 50 insertions(+), 30 deletions(-)
>
> diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
> index 1af3ef7f329d..7503021fe308 100644
> --- a/net/core/rtnetlink.c
> +++ b/net/core/rtnetlink.c
> @@ -1211,6 +1211,36 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,
> return -EMSGSIZE;
> }
>
> +static noinline_for_stack int rtnl_fill_vf(struct sk_buff *skb,
> + struct net_device *dev,
> + u32 ext_filter_mask)
> +{
> + struct nlattr *vfinfo;
> + int i, num_vfs;
> +
> + if (!dev->dev.parent || ((ext_filter_mask & RTEXT_FILTER_VF) == 0))
> + return 0;
> +
> + num_vfs = dev_num_vf(dev->dev.parent);
> + if (nla_put_u32(skb, IFLA_NUM_VF, num_vfs))
> + return -EMSGSIZE;
> +
> + if (!dev->netdev_ops->ndo_get_vf_config)
> + return 0;
> +
> + vfinfo = nla_nest_start(skb, IFLA_VFINFO_LIST);
> + if (!vfinfo)
> + return -EMSGSIZE;
> +
> + for (i = 0; i < num_vfs; i++) {
> + if (rtnl_fill_vfinfo(skb, dev, i, vfinfo))
> + return -EMSGSIZE;
> + }
> +
> + nla_nest_end(skb, vfinfo);
> + return 0;
> +}
> +
> static int rtnl_fill_link_ifmap(struct sk_buff *skb, struct net_device *dev)
> {
> struct rtnl_link_ifmap map;
> @@ -1355,6 +1385,23 @@ static int noinline nla_put_ifalias(struct sk_buff *skb, struct net_device *dev)
> return 0;
> }
>
> +static int noinline rtnl_fill_link_netnsid(struct sk_buff *skb,
> + const struct net_device *dev)
> +{
> + if (dev->rtnl_link_ops && dev->rtnl_link_ops->get_link_net) {
> + struct net *link_net = dev->rtnl_link_ops->get_link_net(dev);
> +
> + if (!net_eq(dev_net(dev), link_net)) {
> + int id = peernet2id_alloc(dev_net(dev), link_net);
> +
> + if (nla_put_s32(skb, IFLA_LINK_NETNSID, id))
> + return -EMSGSIZE;
> + }
> + }
> +
> + return 0;
> +}
> +
> static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
Similarly for this patch -- subject references vf helper yet the code
changes flips netnsid as well.
next prev parent reply other threads:[~2017-09-21 17:17 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-21 16:58 [PATCH net-next] rtnetlink: prepare for further rtnl lock pushdown/removal Florian Westphal
2017-09-21 16:58 ` [PATCH net-next 1/7] selftests: rtnetlink.sh: add rudimentary vrf test Florian Westphal
2017-09-21 16:58 ` [PATCH net-next 2/7] rtnetlink: add helper to put master ifindex Florian Westphal
2017-09-21 17:16 ` David Ahern
2017-09-21 16:58 ` [PATCH net-next 3/7] rtnetlink: add helper to dump qdisc name Florian Westphal
2017-09-21 16:58 ` [PATCH net-next 4/7] rtnetlink: add helper to dump ifalias Florian Westphal
2017-09-21 16:59 ` [PATCH net-next 5/7] rtnetlink: add helper to dump vf information Florian Westphal
2017-09-21 17:17 ` David Ahern [this message]
2017-09-21 17:25 ` Florian Westphal
2017-09-21 16:59 ` [PATCH net-next 6/7] rtnetlink: link ops lookup must occur with rtnl lock held Florian Westphal
2017-09-21 16:59 ` [PATCH net-next 7/7] rtnetlink: rtnl_have_link_slave_info doesn't need rtnl Florian Westphal
2017-09-21 17:24 ` David Ahern
2017-09-21 17:31 ` Florian Westphal
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=bdc39ebf-e934-16ce-0834-e0795774a656@gmail.com \
--to=dsahern@gmail$(echo .)com \
--cc=fw@strlen$(echo .)de \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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