[{"id":1774056,"web_url":"http://patchwork.ozlabs.org/comment/1774056/","msgid":"<5184e670-8061-16d5-1185-40efa90cac99@gmail.com>","list_archive_url":null,"date":"2017-09-23T17:14:19","subject":"Re: [PATCH net-next v2 4/6] rtnetlink: add helper to dump ifalias","submitter":{"id":6918,"url":"http://patchwork.ozlabs.org/api/people/6918/","name":"David Ahern","email":"dsahern@gmail.com"},"content":"On 9/22/17 12:10 AM, Florian Westphal wrote:\n> ifalias is currently protected by rtnl mutex, add assertion\n> as a reminder.\n> \n> Signed-off-by: Florian Westphal \n> ---\n> net/core/rtnetlink.c | 13 +++++++++++--\n> 1 file changed, 11 insertions(+), 2 deletions(-)\n> \n> diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c\n> index ad3f27da37a8..42ff582a010e 100644\n> --- a/net/core/rtnetlink.c\n> +++ b/net/core/rtnetlink.c\n> @@ -1345,6 +1345,16 @@ static int nla_put_qdisc(struct sk_buff *skb, struct net_device *dev)\n> \treturn ret;\n> }\n> \n> +static noinline int nla_put_ifalias(struct sk_buff *skb, struct net_device *dev)\n> +{\n> +\tASSERT_RTNL();\n\nThe assert is not needed given the code path.\n\n> +\n> +\tif (dev->ifalias)\n> +\t\treturn nla_put_string(skb, IFLA_IFALIAS, dev->ifalias);\n> +\n> +\treturn 0;\n> +}\n> +\n> static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,\n> \t\t\t int type, u32 pid, u32 seq, u32 change,\n> \t\t\t unsigned int flags, u32 ext_filter_mask,\n> @@ -1386,8 +1396,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,\n> \t put_master_ifindex(skb, dev) ||\n> \t nla_put_u8(skb, IFLA_CARRIER, netif_carrier_ok(dev)) ||\n> \t nla_put_qdisc(skb, dev) ||\n> -\t (dev->ifalias &&\n> -\t nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||\n> +\t nla_put_ifalias(skb, dev) ||\n> \t nla_put_u32(skb, IFLA_CARRIER_CHANGES,\n> \t\t\tatomic_read(&dev->carrier_changes)) ||\n> \t nla_put_u8(skb, IFLA_PROTO_DOWN, dev->proto_down))\n> \n\nReviewed-by: David Ahern ","headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"Z+NWebf6\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xzxm01JL4z9tX4\n\tfor ;\n\tSun, 24 Sep 2017 03:14:24 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751833AbdIWROW (ORCPT );\n\tSat, 23 Sep 2017 13:14:22 -0400","from mail-pf0-f195.google.com ([209.85.192.195]:37119 \"EHLO\n\tmail-pf0-f195.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751495AbdIWROV (ORCPT\n\t); Sat, 23 Sep 2017 13:14:21 -0400","by mail-pf0-f195.google.com with SMTP id e69so1792739pfg.4\n\tfor ; Sat, 23 Sep 2017 10:14:21 -0700 (PDT)","from dsa-mb.local ([2601:282:800:7292:34fb:fcb:e9c2:fef8])\n\tby smtp.googlemail.com with ESMTPSA id\n\tn18sm4522339pgd.69.2017.09.23.10.14.19\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSat, 23 Sep 2017 10:14:20 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=gmail.com; s=20161025;\n\th=subject:to:references:from:message-id:date:user-agent:mime-version\n\t:in-reply-to:content-language:content-transfer-encoding;\n\tbh=EXADE7X/ea7KV1JUZZvTKOm2Ami1wmDUl9Bk5CnfeXQ=;\n\tb=Z+NWebf6DZx6RzgQOwbvH9VrHjOpQ1d5ui46g05Z+RCrGotQlamNdNK1ls19SzW7be\n\tgwXo5qIQvq7kS+w76kvDHzpZtfX8smTwZ6UN8zKJliecHl63+/Z/xrK0NNoucJla5td+\n\toFzIwevq16uQMe7wsFGU369F3V7DOSfKiP1ZAvS2zdxYRjZO9ywdq1F9i2ENTgqtjjQ6\n\t5wAPteBbAMJGZ3m9/y1Ed6qpwFYUUZdoUY3h3dBlcbjmC0WwSI4JB7z7LYFLKrSe0ukO\n\tWT8gE525kcuZ2116Rnsj0QjXBBBAlvRsg8GqyIP2RbTU18zJvW7SfMuYOeiQQGrA3HvF\n\tKGgA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:subject:to:references:from:message-id:date\n\t:user-agent:mime-version:in-reply-to:content-language\n\t:content-transfer-encoding;\n\tbh=EXADE7X/ea7KV1JUZZvTKOm2Ami1wmDUl9Bk5CnfeXQ=;\n\tb=YT5PcNRXpB3kB6pd12E5qEjR/EIazgMUMRwl2uqAP0AOnSUBpeKziIXS/dbGSupi2F\n\tv0o7IkKv/si5NHAzIdz8bInhSa/NIkhMqB9jcS+J7wZGTot0yWYPHVTEPJEh/t9fU26u\n\txRR8r2X+1trQzWEQ6tI/rtKyDDe/7cUxIKCJR2Hj6CuRmaFEBO3WKGQzOh8pyhE3rAQI\n\tu4AZGwLHApPnH/rXv1tec1Wa96dwGivbhTeZi/CAO9sM0a2VeEBHK8zm4SH1vo8SdaHr\n\tcFBtlTTSQ2oAy38hQsFYKHs886JYUfZb0z4FghpL2iXgivTUBrGigiuU9U1PpM4KhmDe\n\tURkw==","X-Gm-Message-State":"AHPjjUi2SbVkRjmtmWgedcm6mQAHXgYg172bc2Bj0JSZLXPMbyBtzsJM\n\tXf15dk/ZIYzbMbjxr+GNcxfHEw==","X-Google-Smtp-Source":"AOwi7QCUHm/DbRuAatOVd0ZfamQaG0ZVfTxo+n9F7hZqXZJ92gHKZYrR8Orq4ADi50n0/M11q95a+A==","X-Received":"by 10.101.69.8 with SMTP id n8mr2659750pgq.167.1506186860488;\n\tSat, 23 Sep 2017 10:14:20 -0700 (PDT)","Subject":"Re: [PATCH net-next v2 4/6] rtnetlink: add helper to dump ifalias","To":"Florian Westphal , netdev@vger.kernel.org","References":"<20170922061008.14723-1-fw@strlen.de>\n\t<20170922061008.14723-5-fw@strlen.de>","From":"David Ahern ","Message-ID":"<5184e670-8061-16d5-1185-40efa90cac99@gmail.com>","Date":"Sat, 23 Sep 2017 11:14:19 -0600","User-Agent":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0)\n\tGecko/20100101 Thunderbird/52.3.0","MIME-Version":"1.0","In-Reply-To":"<20170922061008.14723-5-fw@strlen.de>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"}}]