From: David Ahern <dsahern@gmail.com>
To: Florian Westphal <fw@strlen.de>, netdev@vger.kernel.org
Subject: Re: [PATCH net-next v2 4/6] rtnetlink: add helper to dump ifalias
Date: Sat, 23 Sep 2017 11:14:19 -0600 [thread overview]
Message-ID: <5184e670-8061-16d5-1185-40efa90cac99@gmail.com> (raw)
In-Reply-To: <20170922061008.14723-5-fw@strlen.de>
On 9/22/17 12:10 AM, Florian Westphal wrote:
> ifalias is currently protected by rtnl mutex, add assertion
> as a reminder.
>
> Signed-off-by: Florian Westphal <fw@strlen.de>
> ---
> net/core/rtnetlink.c | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
> index ad3f27da37a8..42ff582a010e 100644
> --- a/net/core/rtnetlink.c
> +++ b/net/core/rtnetlink.c
> @@ -1345,6 +1345,16 @@ static int nla_put_qdisc(struct sk_buff *skb, struct net_device *dev)
> return ret;
> }
>
> +static noinline int nla_put_ifalias(struct sk_buff *skb, struct net_device *dev)
> +{
> + ASSERT_RTNL();
The assert is not needed given the code path.
> +
> + if (dev->ifalias)
> + return nla_put_string(skb, IFLA_IFALIAS, dev->ifalias);
> +
> + return 0;
> +}
> +
> static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
> int type, u32 pid, u32 seq, u32 change,
> unsigned int flags, u32 ext_filter_mask,
> @@ -1386,8 +1396,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
> put_master_ifindex(skb, dev) ||
> nla_put_u8(skb, IFLA_CARRIER, netif_carrier_ok(dev)) ||
> nla_put_qdisc(skb, dev) ||
> - (dev->ifalias &&
> - nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
> + nla_put_ifalias(skb, dev) ||
> nla_put_u32(skb, IFLA_CARRIER_CHANGES,
> atomic_read(&dev->carrier_changes)) ||
> nla_put_u8(skb, IFLA_PROTO_DOWN, dev->proto_down))
>
Reviewed-by: David Ahern <dsahern@gmail.com>
next prev parent reply other threads:[~2017-09-23 17:14 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-22 6:10 [PATCH net-next v2 0/6] rtnetlink: preparation patches for further rtnl lock pushdown/removal Florian Westphal
2017-09-22 6:10 ` [PATCH net-next v2 1/6] selftests: rtnetlink.sh: add rudimentary vrf test Florian Westphal
2017-09-23 16:59 ` David Ahern
2017-09-23 17:07 ` David Ahern
2017-09-22 6:10 ` [PATCH net-next v2 2/6] rtnetlink: add helper to put master ifindex Florian Westphal
2017-09-23 17:01 ` David Ahern
2017-09-22 6:10 ` [PATCH net-next v2 3/6] rtnetlink: add helper to dump qdisc name Florian Westphal
2017-09-23 17:03 ` David Ahern
2017-09-23 17:31 ` Eric Dumazet
2017-09-23 18:38 ` Florian Westphal
2017-09-22 6:10 ` [PATCH net-next v2 4/6] rtnetlink: add helper to dump ifalias Florian Westphal
2017-09-23 17:14 ` David Ahern [this message]
2017-09-22 6:10 ` [PATCH net-next v2 5/6] rtnetlink: add helpers to dump vf and netnsid information Florian Westphal
2017-09-23 17:12 ` David Ahern
2017-09-22 6:10 ` [PATCH net-next v2 6/6] rtnetlink: rtnl_have_link_slave_info doesn't need rtnl Florian Westphal
2017-09-23 17:17 ` David Ahern
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=5184e670-8061-16d5-1185-40efa90cac99@gmail.com \
--to=dsahern@gmail.com \
--cc=fw@strlen.de \
--cc=netdev@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.