Commit e4ad37ea authored by Junxian Huang's avatar Junxian Huang Committed by ZhouJuan
Browse files

RDMA/hns: Get real-time port state of bonding slave 

driver inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I6ZAIM



---------------------------------------------------------------

Currently, when a change-lowerstate event occurs, the bonding driver
gets the slave's port state from the event notifier and stores it in
the bond_grp struct. Whenever the state needs to be configured to HW
or is queried, the driver reads from bond_grp.

But actually, the state read in this way is not real-time data, as there
is always a delay before the newly changed state is stored. So it is
uneccessary and also inaccurate to store the state. Whenever the state
is needed, just read it from kernel in real time.

Signed-off-by: default avatarJunxian Huang <huangjunxian6@hisilicon.com>
parent ab97048c

drivers/infiniband/hw/hns/hns_roce_bond.c

+14 −39
Original line number Diff line number Diff line
@@ -107,6 +107,15 @@ bool hns_roce_bond_is_active(struct hns_roce_dev *hr_dev) 
	return false;

}



static inline bool is_active_slave(struct net_device *net_dev,

				   struct hns_roce_bond_group *bond_grp)

{

	if (!bond_grp || !bond_grp->bond || !bond_grp->bond->curr_active_slave)

		return false;



	return net_dev == bond_grp->bond->curr_active_slave->dev;

}



struct net_device *hns_roce_get_bond_netdev(struct hns_roce_dev *hr_dev)

{

	struct hns_roce_bond_group *bond_grp = hns_roce_get_bond_grp(hr_dev);
@@ -127,8 +136,7 @@ struct net_device *hns_roce_get_bond_netdev(struct hns_roce_dev *hr_dev) 
	if (bond_grp->tx_type == NETDEV_LAG_TX_TYPE_ACTIVEBACKUP) {

		for (i = 0; i < ROCE_BOND_FUNC_MAX; i++) {

			net_dev = bond_grp->bond_func_info[i].net_dev;

			if (net_dev &&

			    bond_grp->bond_func_info[i].state.tx_enabled)

			if (net_dev && is_active_slave(net_dev, bond_grp))

				break;

		}

	} else {
@@ -153,7 +161,6 @@ static void hns_roce_queue_bond_work(struct hns_roce_bond_group *bond_grp, 


static void hns_roce_bond_get_active_slave(struct hns_roce_bond_group *bond_grp)

{

	struct netdev_lag_lower_state_info *state;

	struct net_device *net_dev;

	u32 active_slave_map = 0;

	u8 active_slave_num = 0;
@@ -162,24 +169,12 @@ static void hns_roce_bond_get_active_slave(struct hns_roce_bond_group *bond_grp) 


	for (i = 0; i < ROCE_BOND_FUNC_MAX; i++) {

		net_dev = bond_grp->bond_func_info[i].net_dev;

		state = &bond_grp->bond_func_info[i].state;

		if (!net_dev)

			continue;



		state->tx_enabled = (bond_grp->bond->curr_active_slave &&

			(net_dev == bond_grp->bond->curr_active_slave->dev)) ?

			1 : 0;

		state->link_up =

			(get_port_state(net_dev) == IB_PORT_ACTIVE) ? 1 : 0;



		/*

		 * For bond mode 1(active-backup), only the tx-enabled slave is

		 * considered active. For other bond mode, all the link-up

		 * slaves are considered active.

		 */

		active = (bond_grp->tx_type == NETDEV_LAG_TX_TYPE_ACTIVEBACKUP) ?

			bond_grp->bond_func_info[i].state.tx_enabled :

			bond_grp->bond_func_info[i].state.link_up;

			 is_active_slave(net_dev, bond_grp) :

			 (get_port_state(net_dev) == IB_PORT_ACTIVE);

		if (active) {

			active_slave_num++;

			active_slave_map |= (1 << i);
@@ -520,30 +515,13 @@ static bool hns_roce_bond_lowerstate_event(struct hns_roce_dev *hr_dev, 
{

	struct net_device *net_dev =

		netdev_notifier_info_to_dev((struct netdev_notifier_info *)info);

	struct netdev_lag_lower_state_info *bond_lower_info;

	int i;



	if (!netif_is_lag_port(net_dev))

	if (!netif_is_lag_port(net_dev) ||

	    (!bond_grp || hr_dev != bond_grp->main_hr_dev))

		return false;



	bond_lower_info = info->lower_state_info;

	if (!bond_lower_info)

		return false;



	if (!bond_grp || hr_dev != bond_grp->main_hr_dev) {

		hr_dev->slave_state = *bond_lower_info;

		return false;

	}



	mutex_lock(&bond_grp->bond_mutex);



	for (i = 0; i < ROCE_BOND_FUNC_MAX; i++) {

		if (net_dev == bond_grp->bond_func_info[i].net_dev) {

			bond_grp->bond_func_info[i].state = *bond_lower_info;

			break;

		}

	}



	if (bond_grp->bond_ready &&

	    bond_grp->bond_state == HNS_ROCE_BOND_IS_BONDED)

		bond_grp->bond_state = HNS_ROCE_BOND_SLAVE_CHANGESTATE;
@@ -598,9 +576,6 @@ static void hns_roce_bond_info_update(struct hns_roce_bond_group *bond_grp, 


				bond_grp->bond_func_info[func_idx].handle =

					priv->handle;



				bond_grp->bond_func_info[func_idx].state =

					hr_dev->slave_state;

			}

		}

	}

drivers/infiniband/hw/hns/hns_roce_bond.h

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ enum hns_roce_bond_cmd_type { 
struct hns_roce_func_info {

	struct net_device *net_dev;

	struct hnae3_handle *handle;

	struct netdev_lag_lower_state_info state;

};



struct hns_roce_bond_group {

drivers/infiniband/hw/hns/hns_roce_device.h

+0 −1
Original line number Diff line number Diff line
@@ -1124,7 +1124,6 @@ struct hns_roce_dev { 
	u64 dwqe_page;



	struct notifier_block bond_nb;

	struct netdev_lag_lower_state_info slave_state;

	struct hns_roce_port port_data[HNS_ROCE_MAX_PORTS];

	atomic64_t *dfx_cnt;

};