Commit d31d410b authored by Junxian Huang's avatar Junxian Huang Committed by Leon Romanovsky
Browse files

RDMA/hns: Add bonding event handler 



Register netdev notifier for two bonding events NETDEV_CHANGEUPPER
and NETDEV_CHANGELOWERSTATE.

In NETDEV_CHANGEUPPER event handler, check some rules about the HW
constraints when trying to link a new slave to the masteri, and
store some bonding information from the notifier. In unlinking case,
simply check the number of the rest slaves to decide whether the
bond is still supported.

In NETDEV_CHANGELOWERSTATE event handler, not much is done. It
simply sets the bond state when the bond is ready, which will be
used later.

Signed-off-by: default avatarJunxian Huang <huangjunxian6@hisilicon.com>
Link: https://patch.msgid.link/20251112093510.3696363-4-huangjunxian6@hisilicon.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent b37ad2e2

drivers/infiniband/hw/hns/hns_roce_bond.c

+314 −0
Original line number Diff line number Diff line
@@ -9,6 +9,17 @@ 


static DEFINE_XARRAY(roce_bond_xa);



static struct hns_roce_dev *hns_roce_get_hrdev_by_netdev(struct net_device *net_dev)

{

	struct ib_device *ibdev =

		ib_device_get_by_netdev(net_dev, RDMA_DRIVER_HNS);



	if (!ibdev)

		return NULL;



	return container_of(ibdev, struct hns_roce_dev, ib_dev);

}



static struct net_device *get_upper_dev_from_ndev(struct net_device *net_dev)

{

	struct net_device *upper_dev;
@@ -131,6 +142,291 @@ static int remove_bond_id(int bus_num, u8 bond_id) 
	return 0;

}



static bool is_dev_bond_supported(struct hns_roce_bond_group *bond_grp,

				  struct net_device *net_dev)

{

	struct hns_roce_dev *hr_dev = hns_roce_get_hrdev_by_netdev(net_dev);

	bool ret = true;



	if (!hr_dev) {

		if (bond_grp &&

		    get_netdev_bond_slave_id(net_dev, bond_grp) >= 0)

			return true;

		else

			return false;

	}



	if (!(hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_BOND)) {

		ret = false;

		goto out;

	}



	if (hr_dev->is_vf || pci_num_vf(hr_dev->pci_dev) > 0) {

		ret = false;

		goto out;

	}



	if (bond_grp->bus_num != get_hr_bus_num(hr_dev))

		ret = false;



out:

	ib_device_put(&hr_dev->ib_dev);

	return ret;

}



static bool check_slave_support(struct hns_roce_bond_group *bond_grp,

				struct net_device *upper_dev)

{

	struct net_device *net_dev;

	u8 slave_num = 0;



	rcu_read_lock();

	for_each_netdev_in_bond_rcu(upper_dev, net_dev) {

		if (is_dev_bond_supported(bond_grp, net_dev)) {

			slave_num++;

			continue;

		}

		rcu_read_unlock();

		return false;

	}

	rcu_read_unlock();



	return (slave_num > 1 && slave_num <= ROCE_BOND_FUNC_MAX);

}



static void hns_roce_attach_bond_grp(struct hns_roce_bond_group *bond_grp,

				     struct hns_roce_dev *hr_dev,

				     struct net_device *upper_dev)

{

	bond_grp->upper_dev = upper_dev;

	bond_grp->main_hr_dev = hr_dev;

	bond_grp->bond_state = HNS_ROCE_BOND_NOT_BONDED;

	bond_grp->bond_ready = false;

}



static bool lowerstate_event_filter(struct hns_roce_bond_group *bond_grp,

				    struct net_device *net_dev)

{

	struct hns_roce_bond_group *bond_grp_tmp;



	bond_grp_tmp = hns_roce_get_bond_grp(net_dev, bond_grp->bus_num);

	return bond_grp_tmp == bond_grp;

}



static void lowerstate_event_setting(struct hns_roce_bond_group *bond_grp,

				     struct netdev_notifier_changelowerstate_info *info)

{

	mutex_lock(&bond_grp->bond_mutex);



	if (bond_grp->bond_ready &&

	    bond_grp->bond_state == HNS_ROCE_BOND_IS_BONDED)

		bond_grp->bond_state = HNS_ROCE_BOND_SLAVE_CHANGESTATE;



	mutex_unlock(&bond_grp->bond_mutex);

}



static bool hns_roce_bond_lowerstate_event(struct hns_roce_bond_group *bond_grp,

					   struct netdev_notifier_changelowerstate_info *info)

{

	struct net_device *net_dev =

		netdev_notifier_info_to_dev((struct netdev_notifier_info *)info);



	if (!netif_is_lag_port(net_dev))

		return false;



	if (!lowerstate_event_filter(bond_grp, net_dev))

		return false;



	lowerstate_event_setting(bond_grp, info);



	return true;

}



static bool is_bond_setting_supported(struct netdev_lag_upper_info *bond_info)

{

	if (!bond_info)

		return false;



	if (bond_info->tx_type != NETDEV_LAG_TX_TYPE_ACTIVEBACKUP &&

	    bond_info->tx_type != NETDEV_LAG_TX_TYPE_HASH)

		return false;



	if (bond_info->tx_type == NETDEV_LAG_TX_TYPE_HASH &&

	    bond_info->hash_type > NETDEV_LAG_HASH_L23)

		return false;



	return true;

}



static void upper_event_setting(struct hns_roce_bond_group *bond_grp,

				struct netdev_notifier_changeupper_info *info)

{

	struct netdev_lag_upper_info *bond_upper_info = NULL;

	bool slave_inc = info->linking;



	if (slave_inc)

		bond_upper_info = info->upper_info;



	if (bond_upper_info) {

		bond_grp->tx_type = bond_upper_info->tx_type;

		bond_grp->hash_type = bond_upper_info->hash_type;

	}

}



static bool check_unlinking_bond_support(struct hns_roce_bond_group *bond_grp)

{

	struct net_device *net_dev;

	u8 slave_num = 0;



	rcu_read_lock();

	for_each_netdev_in_bond_rcu(bond_grp->upper_dev, net_dev) {

		if (get_netdev_bond_slave_id(net_dev, bond_grp) >= 0)

			slave_num++;

	}

	rcu_read_unlock();



	return (slave_num > 1);

}



static bool check_linking_bond_support(struct netdev_lag_upper_info *bond_info,

				       struct hns_roce_bond_group *bond_grp,

				       struct net_device *upper_dev)

{

	if (!is_bond_setting_supported(bond_info))

		return false;



	return check_slave_support(bond_grp, upper_dev);

}



static enum bond_support_type

	check_bond_support(struct hns_roce_bond_group *bond_grp,

			   struct net_device *upper_dev,

			   struct netdev_notifier_changeupper_info *info)

{

	bool bond_grp_exist = false;

	bool support;



	if (upper_dev == bond_grp->upper_dev)

		bond_grp_exist = true;



	if (!info->linking && !bond_grp_exist)

		return BOND_NOT_SUPPORT;



	if (info->linking)

		support = check_linking_bond_support(info->upper_info, bond_grp,

						     upper_dev);

	else

		support = check_unlinking_bond_support(bond_grp);



	if (support)

		return BOND_SUPPORT;



	return bond_grp_exist ? BOND_EXISTING_NOT_SUPPORT : BOND_NOT_SUPPORT;

}



static bool upper_event_filter(struct netdev_notifier_changeupper_info *info,

			       struct hns_roce_bond_group *bond_grp,

			       struct net_device *net_dev)

{

	struct net_device *upper_dev = info->upper_dev;

	struct hns_roce_bond_group *bond_grp_tmp;

	struct hns_roce_dev *hr_dev;

	bool ret = true;

	u8 bus_num;



	if (!info->linking ||

	    bond_grp->bond_state != HNS_ROCE_BOND_NOT_ATTACHED)

		return bond_grp->upper_dev == upper_dev;



	hr_dev = hns_roce_get_hrdev_by_netdev(net_dev);

	if (!hr_dev)

		return false;



	bus_num = get_hr_bus_num(hr_dev);

	if (bond_grp->bus_num != bus_num) {

		ret = false;

		goto out;

	}



	bond_grp_tmp = hns_roce_get_bond_grp(net_dev, bus_num);

	if (bond_grp_tmp && bond_grp_tmp != bond_grp)

		ret = false;

out:

	ib_device_put(&hr_dev->ib_dev);

	return ret;

}



static bool hns_roce_bond_upper_event(struct hns_roce_bond_group *bond_grp,

				      struct netdev_notifier_changeupper_info *info)

{

	struct net_device *net_dev =

		netdev_notifier_info_to_dev((struct netdev_notifier_info *)info);

	struct net_device *upper_dev = info->upper_dev;

	enum bond_support_type support = BOND_SUPPORT;

	struct hns_roce_dev *hr_dev;

	int slave_id;



	if (!upper_dev || !netif_is_lag_master(upper_dev))

		return false;



	if (!upper_event_filter(info, bond_grp, net_dev))

		return false;



	mutex_lock(&bond_grp->bond_mutex);

	support = check_bond_support(bond_grp, upper_dev, info);

	if (support == BOND_NOT_SUPPORT) {

		mutex_unlock(&bond_grp->bond_mutex);

		return false;

	}



	if (bond_grp->bond_state == HNS_ROCE_BOND_NOT_ATTACHED) {

		hr_dev = hns_roce_get_hrdev_by_netdev(net_dev);

		if (!hr_dev) {

			mutex_unlock(&bond_grp->bond_mutex);

			return false;

		}

		hns_roce_attach_bond_grp(bond_grp, hr_dev, upper_dev);

		ib_device_put(&hr_dev->ib_dev);

	}



	/* In the case of netdev being unregistered, the roce

	 * instance shouldn't be inited.

	 */

	if (net_dev->reg_state >= NETREG_UNREGISTERING) {

		slave_id = get_netdev_bond_slave_id(net_dev, bond_grp);

		if (slave_id >= 0) {

			bond_grp->bond_func_info[slave_id].net_dev = NULL;

			bond_grp->bond_func_info[slave_id].handle = NULL;

		}

	}



	if (support == BOND_SUPPORT) {

		bond_grp->bond_ready = true;

		if (bond_grp->bond_state != HNS_ROCE_BOND_NOT_BONDED)

			bond_grp->bond_state = HNS_ROCE_BOND_SLAVE_CHANGE_NUM;

	}

	mutex_unlock(&bond_grp->bond_mutex);

	if (support == BOND_SUPPORT)

		upper_event_setting(bond_grp, info);



	return true;

}



static int hns_roce_bond_event(struct notifier_block *self,

			       unsigned long event, void *ptr)

{

	struct hns_roce_bond_group *bond_grp =

		container_of(self, struct hns_roce_bond_group, bond_nb);

	bool changed = false;



	if (event == NETDEV_CHANGEUPPER)

		changed = hns_roce_bond_upper_event(bond_grp, ptr);

	if (event == NETDEV_CHANGELOWERSTATE)

		changed = hns_roce_bond_lowerstate_event(bond_grp, ptr);



	return NOTIFY_DONE;

}



int hns_roce_alloc_bond_grp(struct hns_roce_dev *hr_dev)

{

	struct hns_roce_bond_group *bgrps[ROCE_BOND_NUM_MAX];
@@ -149,6 +445,10 @@ int hns_roce_alloc_bond_grp(struct hns_roce_dev *hr_dev) 
			goto mem_err;

		}



		mutex_init(&bond_grp->bond_mutex);



		bond_grp->bond_ready = false;

		bond_grp->bond_state = HNS_ROCE_BOND_NOT_ATTACHED;

		bond_grp->bus_num = bus_num;



		ret = alloc_bond_id(bond_grp);
@@ -158,16 +458,28 @@ int hns_roce_alloc_bond_grp(struct hns_roce_dev *hr_dev) 
			goto alloc_id_err;

		}



		bond_grp->bond_nb.notifier_call = hns_roce_bond_event;

		ret = register_netdevice_notifier(&bond_grp->bond_nb);

		if (ret) {

			ibdev_err(&hr_dev->ib_dev,

				  "failed to register bond nb, ret = %d.\n", ret);

			goto register_nb_err;

		}

		bgrps[i] = bond_grp;

	}



	return 0;



register_nb_err:

	remove_bond_id(bond_grp->bus_num, bond_grp->bond_id);

alloc_id_err:

	mutex_destroy(&bond_grp->bond_mutex);

	kvfree(bond_grp);

mem_err:

	for (i--; i >= 0; i--) {

		unregister_netdevice_notifier(&bgrps[i]->bond_nb);

		remove_bond_id(bgrps[i]->bus_num, bgrps[i]->bond_id);

		mutex_destroy(&bgrps[i]->bond_mutex);

		kvfree(bgrps[i]);

	}

	return ret;
@@ -185,7 +497,9 @@ void hns_roce_dealloc_bond_grp(void) 
			bond_grp = die_info->bgrps[i];

			if (!bond_grp)

				continue;

			unregister_netdevice_notifier(&bond_grp->bond_nb);

			remove_bond_id(bond_grp->bus_num, bond_grp->bond_id);

			mutex_destroy(&bond_grp->bond_mutex);

			kvfree(bond_grp);

		}

	}

drivers/infiniband/hw/hns/hns_roce_bond.h

+26 −0
Original line number Diff line number Diff line
@@ -14,15 +14,41 @@ 


#define BOND_ID(id) BIT(id)



enum bond_support_type {

	BOND_NOT_SUPPORT,

	/*

	 * bond_grp already exists, but in the current

	 * conditions it's no longer supported

	 */

	BOND_EXISTING_NOT_SUPPORT,

	BOND_SUPPORT,

};



enum hns_roce_bond_state {

	HNS_ROCE_BOND_NOT_ATTACHED,

	HNS_ROCE_BOND_NOT_BONDED,

	HNS_ROCE_BOND_IS_BONDED,

	HNS_ROCE_BOND_SLAVE_CHANGE_NUM,

	HNS_ROCE_BOND_SLAVE_CHANGESTATE,

};



struct hns_roce_func_info {

	struct net_device *net_dev;

	struct hnae3_handle *handle;

};



struct hns_roce_bond_group {

	struct net_device *upper_dev;

	struct hns_roce_dev *main_hr_dev;

	u8 bond_id;

	u8 bus_num;

	struct hns_roce_func_info bond_func_info[ROCE_BOND_FUNC_MAX];

	bool bond_ready;

	enum hns_roce_bond_state bond_state;

	enum netdev_lag_tx_type tx_type;

	enum netdev_lag_hash hash_type;

	struct mutex bond_mutex;

	struct notifier_block bond_nb;

};



struct hns_roce_die_info {