Re: [Patch net-next v2] bridge: do not expire mdb entry as long as bridge still uses it

[Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>]

Hello.

On 25-04-2013 12:21, Cong Wang wrote:

> This bug can be observed in virt environment, when a KVM guest
> communicates with the host via multicast. After some time (should
> be 260 sec, I didn't measure), the multicast traffic suddenly
> terminates.

> This is due to the mdb entry for bridge itself expires automatically,
> it should not expire as long as the bridge still generates multicast
> traffic. It should expire when the bridge leaves the multicast group,
> OR when there is no multicast traffic on this bridge.

> I fix this by adding another bool which is set when there is
> multicast traffic goes to the bridge, cleared in the expire timer and
> when IGMP leave is received. I ran omping for 15 minutes, everything
> looks good now.

> This might not be the best fix, but might be the simplest fix.

> (Adam, this problem is probably different with your problem,
> at least this problem can _not_ be workarounded by setting
> querier to 1.)

> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: Stephen Hemminger <stephen@networkplumber.org>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Adam Baker <linux@baker-net.org.uk>
> Signed-off-by: Cong Wang <amwang@redhat.com>
> ---
> v2: rename ->busy to ->for_br

> diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
> index 828e2bc..4f0e50f 100644
> --- a/net/bridge/br_input.c
> +++ b/net/bridge/br_input.c
> @@ -99,9 +99,12 @@ int br_handle_frame_finish(struct sk_buff *skb)
>   	else if (is_multicast_ether_addr(dest)) {
>   		mdst = br_mdb_get(br, skb, vid);
>   		if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) {
> -			if ((mdst && mdst->mglist) ||
> -			    br_multicast_is_router(br))
> +			bool to_br = mdst && mdst->mglist;

    Emoty line after declaration wouldn't hurt.

> +			if (to_br || br_multicast_is_router(br))
>   				skb2 = skb;

WBR, Sergei