From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C0A1C43387 for ; Thu, 17 Jan 2019 19:27:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EF21020859 for ; Thu, 17 Jan 2019 19:27:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="J/YXEGw8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728063AbfAQT1a (ORCPT ); Thu, 17 Jan 2019 14:27:30 -0500 Received: from mail-ed1-f65.google.com ([209.85.208.65]:42188 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726795AbfAQT1a (ORCPT ); Thu, 17 Jan 2019 14:27:30 -0500 Received: by mail-ed1-f65.google.com with SMTP id y20so9253696edw.9 for ; Thu, 17 Jan 2019 11:27:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:openpgp:autocrypt:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=iBiFS7COboLkGChhdMKsjsz2+RPovasVekoSWZlZouM=; b=J/YXEGw8DZQJKAB0lrKeX3zxuPg6eacnphEtGnIVr2pITQrlRwLBr8qwJGVkAbYvLW 9OiTgb+Rom5BtIA1dKap4j2u+yJIBC2namW6yrdDPcJzqdkU1M/jk4C7e41LmRSKWrb+ uD9rLHauzTCJL/TVZxf7L0vX2YEwELGr0JXkHeXA9FvlCADCkl5Lss5h8ZIdygtizz9F Boj5Oj2gfqpYFayfBHEFbufM6FGSmg0D7JVjWG/N9MMQem0XWvqDKKAKwb9rBWIToZ7y d93afYUGXxcf1zal6wp/5CYP9vwtgRsO26wbb329jl7+JxnbAvVbdSQnITxE478JMy50 ATxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=iBiFS7COboLkGChhdMKsjsz2+RPovasVekoSWZlZouM=; b=PluQrSip0KKcz7OzFoZUd0ftLMN00xyaahfc6ErI/EOvLZ+FWpPwSfcLVZ5tJTDZnC A4ZJXqJ6AJ0fbGA3DbYs15zDWB5mAYrVttNroKSg+9bNDpLup+JQvpp6dlCpuLGu8aH/ fHsJdZMpsKHEEvoVatHIs3QwLPNHKUM71/Y8+n0wJ6x+vC/zTq10cbVxb2S46JiKMQiB B3SsTCumvdIJJsMtGh4Jrp5dKAuqeSVPWJUgfBfHL/Y3QtGGGu8+9mAlMh7G7cdrDKNl cG4gtCEL/ycLB6MJi9hDXqY4qeL+iOQlMWeDfN+BMtazCZzuwQ0QnR0gzEr1TivzqA1L aV+g== X-Gm-Message-State: AJcUukdGzfHqx5Fs0all0oqOMy+T/xy9Qt41RoQkEbDnGa9nritgNWEE VBWDwiik8ur5CBmtFJavFVs= X-Google-Smtp-Source: ALg8bN7T9yWRZdD4bBOLUx5D7WzBltn57ErZS6MQuI8ERecbdF2u3DisLnwGIvXa+14L14srduT+CA== X-Received: by 2002:a50:8d8c:: with SMTP id r12mr7248607edh.105.1547753247386; Thu, 17 Jan 2019 11:27:27 -0800 (PST) Received: from [10.67.49.9] ([192.19.223.250]) by smtp.googlemail.com with ESMTPSA id c23-v6sm3656431ejb.62.2019.01.17.11.27.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Jan 2019 11:27:26 -0800 (PST) Subject: Re: [PATCH net-next 01/14] net: bridge: multicast: Propagate br_mc_disabled_update() return To: Ido Schimmel Cc: "netdev@vger.kernel.org" , "andrew@lunn.ch" , "vivien.didelot@gmail.com" , "davem@davemloft.net" , Jiri Pirko , "ilias.apalodimas@linaro.org" , "ivan.khoronzhuk@linaro.org" , "roopa@cumulusnetworks.com" , "nikolay@cumulusnetworks.com" References: <20190116200102.2749-1-f.fainelli@gmail.com> <20190116200102.2749-2-f.fainelli@gmail.com> <20190117134738.GA20176@splinter> From: Florian Fainelli Openpgp: preference=signencrypt Autocrypt: addr=f.fainelli@gmail.com; prefer-encrypt=mutual; keydata= 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 M5kY0ACeNhCZJvZ5g4C2Lc9fcTHu8jxmEkI= Message-ID: <89a9019b-2adc-1806-c893-297e603a73c9@gmail.com> Date: Thu, 17 Jan 2019 11:27:18 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: <20190117134738.GA20176@splinter> 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 On 1/17/19 5:47 AM, Ido Schimmel wrote: > On Wed, Jan 16, 2019 at 12:00:49PM -0800, Florian Fainelli wrote: >> Some Ethernet switches might not be able to support disabling multicast >> flooding globally when e.g: several bridges span the same physical >> device, propagate the return value of br_mc_disabled_update() such that >> this propagates correctly to user-space. >> >> Signed-off-by: Florian Fainelli >> --- >> net/bridge/br_multicast.c | 19 ++++++++++++++----- >> 1 file changed, 14 insertions(+), 5 deletions(-) >> >> diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c >> index 3aeff0895669..09fc92541873 100644 >> --- a/net/bridge/br_multicast.c >> +++ b/net/bridge/br_multicast.c >> @@ -813,7 +813,7 @@ static void br_ip6_multicast_port_query_expired(struct timer_list *t) >> } >> #endif >> >> -static void br_mc_disabled_update(struct net_device *dev, bool value) >> +static int br_mc_disabled_update(struct net_device *dev, bool value) >> { >> struct switchdev_attr attr = { >> .orig_dev = dev, >> @@ -822,11 +822,13 @@ static void br_mc_disabled_update(struct net_device *dev, bool value) >> .u.mc_disabled = !value, >> }; >> >> - switchdev_port_attr_set(dev, &attr); >> + return switchdev_port_attr_set(dev, &attr); > > Did you test this for veth? If switchdev ops are not defined, this > returns -EOPNOTSUPP. See __br_vlan_filter_toggle() for reference I did not, good catch, I will add a check on -EOPNOTSUPP and silence that error code: if (err && err != -ENOTSUPP) return err; > >> } >> >> int br_multicast_add_port(struct net_bridge_port *port) >> { >> + int ret; >> + >> port->multicast_router = MDB_RTR_TYPE_TEMP_QUERY; >> >> timer_setup(&port->multicast_router_timer, >> @@ -837,8 +839,11 @@ int br_multicast_add_port(struct net_bridge_port *port) >> timer_setup(&port->ip6_own_query.timer, >> br_ip6_multicast_port_query_expired, 0); >> #endif >> - br_mc_disabled_update(port->dev, >> - br_opt_get(port->br, BROPT_MULTICAST_ENABLED)); >> + ret = br_mc_disabled_update(port->dev, >> + br_opt_get(port->br, >> + BROPT_MULTICAST_ENABLED)); >> + if (ret) >> + return ret; >> >> port->mcast_stats = netdev_alloc_pcpu_stats(struct bridge_mcast_stats); >> if (!port->mcast_stats) >> @@ -1937,12 +1942,16 @@ static void br_multicast_start_querier(struct net_bridge *br, >> int br_multicast_toggle(struct net_bridge *br, unsigned long val) >> { >> struct net_bridge_port *port; >> + int err; >> >> spin_lock_bh(&br->multicast_lock); >> if (!!br_opt_get(br, BROPT_MULTICAST_ENABLED) == !!val) >> goto unlock; >> >> - br_mc_disabled_update(br->dev, val); >> + err = br_mc_disabled_update(br->dev, val); >> + if (err) >> + goto unlock; >> + >> br_opt_toggle(br, BROPT_MULTICAST_ENABLED, !!val); >> if (!br_opt_get(br, BROPT_MULTICAST_ENABLED)) >> goto unlock; > > You never return the error Huh, indeed, thanks! -- Florian