public inbox for netdev@vger.kernel.org 
 help / color / mirror / Atom feed

From: Toshiaki Makita <makita.toshiaki@lab•ntt.co.jp>
To: "Michael S. Tsirkin" <mst@redhat•com>
Cc: Vlad Yasevich <vyasevic@redhat•com>,
	netdev@vger•kernel.org, bridge@lists•linux-foundation.org,
	Stephen Hemminger <stephen@networkplumber•org>,
	David Laight <David.Laight@ACULAB•COM>,
	"David S . Miller" <davem@davemloft•net>
Subject: Re: [PATCH v2 net-next] bridge: Fix incorrect judgment of promisc
Date: Thu, 05 Jun 2014 22:01:23 +0900	[thread overview]
Message-ID: <53906A23.5040006@lab.ntt.co.jp> (raw)
In-Reply-To: <20140605123039.GA18310@redhat.com>

(2014/06/05 21:30), Michael S. Tsirkin wrote:
> On Thu, Jun 05, 2014 at 08:53:32PM +0900, Toshiaki Makita wrote:
>> br_manage_promisc() incorrectly expects br_auto_port() to return only 0
>> or 1, while it actually returns flags, i.e., a subset of BR_AUTO_MASK.
>>
>> Signed-off-by: Toshiaki Makita <makita.toshiaki@lab•ntt.co.jp>
>> ---
>>  net/bridge/br_if.c | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
>> index a08d2b8..3eca3fd 100644
>> --- a/net/bridge/br_if.c
>> +++ b/net/bridge/br_if.c
>> @@ -153,7 +153,8 @@ void br_manage_promisc(struct net_bridge *br)
>>  			 * This lets us disable promiscuous mode and write
>>  			 * this config to hw.
>>  			 */
>> -			if (br->auto_cnt <= br_auto_port(p))
>> +			if (br->auto_cnt == 0 ||
>> +			    (br->auto_cnt == 1 && br_auto_port(p)))
>>  				br_port_clear_promisc(p);
>>  			else
>>  				br_port_set_promisc(p);
> 
> It's all a nasty side-effect of using macros IMHO.
> 
> How about we just make these inline functions returning bool?
> 
> The bugfix will fall out naturally.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat•com>
> 
> Warning: untested.
> 
> 
> diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
> index 53d6e32..5818dd2 100644
> --- a/net/bridge/br_private.h
> +++ b/net/bridge/br_private.h
> @@ -200,8 +200,15 @@ struct net_bridge_port
>  #endif
>  };
>  
> -#define br_auto_port(p) ((p)->flags & BR_AUTO_MASK)
> -#define br_promisc_port(p) ((p)->flags & BR_PROMISC)
> +static inline bool br_auto_port(struct net_bridge_port *p)
> +{
> +	return p->flags & BR_AUTO_MASK;
> +}
> +
> +static inline bool br_promisc_port(struct net_bridge_port *p)
> +{
> +	return p->flags & BR_PROMISC;
> +}
>  
>  #define br_port_exists(dev) (dev->priv_flags & IFF_BRIDGE_PORT)

This also looks good.

IMHO, the caller side should not assume these macros (or inline
functions) return boolean value.  There exists similar macro such as
br_port_exists() that doesn't return boolean.

Ohterwise, we should change all macros into boolean functions, but it
might affect performance a little if such a macro is used in fast path?
(I'm worried about the cost of casting non-zero values into 1.)

Thanks,
Toshiaki Makita

next prev parent reply	other threads:[~2014-06-05 13:01 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-05 11:53 [PATCH v2 net-next] bridge: Fix incorrect judgment of promisc Toshiaki Makita
2014-06-05 12:30 ` Michael S. Tsirkin
2014-06-05 13:01   ` Toshiaki Makita [this message]
2014-06-05 14:57     ` Vlad Yasevich
2014-06-05 22:21 ` David Miller
2014-06-06  8:48   ` David Laight
2014-06-06 14:13     ` Vlad Yasevich

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=53906A23.5040006@lab.ntt.co.jp \
    --to=makita.toshiaki@lab$(echo .)ntt.co.jp \
    --cc=David.Laight@ACULAB$(echo .)COM \
    --cc=bridge@lists$(echo .)linux-foundation.org \
    --cc=davem@davemloft$(echo .)net \
    --cc=mst@redhat$(echo .)com \
    --cc=netdev@vger$(echo .)kernel.org \
    --cc=stephen@networkplumber$(echo .)org \
    --cc=vyasevic@redhat$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox