Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <278221fe-e836-9794-374f-0955cc10f8be@blackwall.org>
Date:   Mon, 8 Aug 2022 15:44:02 +0300
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.10.0
Subject: Re: [PATCH v1] net:bonding:support balance-alb interface with vlan to
 bridge
Content-Language: en-US
To:     Sun Shouxin <sunshouxin@chinatelecom.cn>, j.vosburgh@gmail.com,
        vfalico@gmail.com, andy@greyhouse.net, davem@davemloft.net,
        edumazet@google.com, kuba@kernel.org, pabeni@redhat.com
Cc:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        huyd12@chinatelecom.cn
References: <20220808094107.6150-1-sunshouxin@chinatelecom.cn>
From:   Nikolay Aleksandrov <razor@blackwall.org>
In-Reply-To: <20220808094107.6150-1-sunshouxin@chinatelecom.cn>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 08/08/2022 12:41, Sun Shouxin wrote:
> In my test, balance-alb bonding with two slaves eth0 and eth1,
> and then Bond0.150 is created with vlan id attached bond0.
> After adding bond0.150 into one linux bridge, I noted that Bond0,
> bond0.150 and  bridge were assigned to the same MAC as eth0.
> Once bond0.150 receives a packet whose dest IP is bridge's
> and dest MAC is eth1's, the linux bridge cannot process it as expected.
> The patch fix the issue, and diagram as below:
> 
> eth1(mac:eth1_mac)--bond0(balance-alb,mac:eth0_mac)--eth0(mac:eth0_mac)
>                       |
>                    bond0.150(mac:eth0_mac)
>                       |
>                    bridge(ip:br_ip, mac:eth0_mac)--other port
> 
> Suggested-by: Hu Yadi <huyd12@chinatelecom.cn>
> Signed-off-by: Sun Shouxin <sunshouxin@chinatelecom.cn>
> ---
>  drivers/net/bonding/bond_alb.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
> index 007d43e46dcb..0dea04f00f12 100644
> --- a/drivers/net/bonding/bond_alb.c
> +++ b/drivers/net/bonding/bond_alb.c
> @@ -654,6 +654,7 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond)
>  {
>  	struct slave *tx_slave = NULL;
>  	struct arp_pkt *arp;
> +	struct net_device *dev;

reverse xmas tree order

>  
>  	if (!pskb_network_may_pull(skb, sizeof(*arp)))
>  		return NULL;
> @@ -665,6 +666,13 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond)
>  	if (!bond_slave_has_mac_rx(bond, arp->mac_src))
>  		return NULL;
>  
> +	dev = ip_dev_find(dev_net(bond->dev), arp->ip_src);
> +	if (dev) {
> +		if (netif_is_bridge_master(dev)) {
> +			return NULL;
> +		}

nit: the {} aren't needed

> +	}
> +
>  	if (arp->op_code == htons(ARPOP_REPLY)) {
>  		/* the arp must be sent on the selected rx channel */
>  		tx_slave = rlb_choose_channel(skb, bond, arp);

Aside from the small cosmetic comments, have you tried adding the second mac address
as permanent in the bridge?
i.e.: 
$ bridge fdb add <eth1_mac> dev bond0.150 master permanent

That should fix your problem without any bonding hacks.

Cheers,
 Nik