Commit eff74233 authored by Taehee Yoo's avatar Taehee Yoo Committed by David S. Miller
Browse files

net: core: introduce struct netdev_nested_priv for nested interface infrastructure 



Functions related to nested interface infrastructure such as
netdev_walk_all_{ upper | lower }_dev() pass both private functions
and "data" pointer to handle their own things.
At this point, the data pointer type is void *.
In order to make it easier to expand common variables and functions,
this new netdev_nested_priv structure is added.

In the following patch, a new member variable will be added into this
struct to fix the lockdep issue.

Signed-off-by: default avatarTaehee Yoo <ap420073@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fe8300fd

drivers/infiniband/core/cache.c

+7 −3
Original line number Diff line number Diff line
@@ -1320,9 +1320,10 @@ struct net_device *rdma_read_gid_attr_ndev_rcu(const struct ib_gid_attr *attr) 
}

EXPORT_SYMBOL(rdma_read_gid_attr_ndev_rcu);



static int get_lower_dev_vlan(struct net_device *lower_dev, void *data)

static int get_lower_dev_vlan(struct net_device *lower_dev,

			      struct netdev_nested_priv *priv)

{

	u16 *vlan_id = data;

	u16 *vlan_id = (u16 *)priv->data;



	if (is_vlan_dev(lower_dev))

		*vlan_id = vlan_dev_vlan_id(lower_dev);
@@ -1348,6 +1349,9 @@ static int get_lower_dev_vlan(struct net_device *lower_dev, void *data) 
int rdma_read_gid_l2_fields(const struct ib_gid_attr *attr,

			    u16 *vlan_id, u8 *smac)

{

	struct netdev_nested_priv priv = {

		.data = (void *)vlan_id,

	};

	struct net_device *ndev;



	rcu_read_lock();
@@ -1368,7 +1372,7 @@ int rdma_read_gid_l2_fields(const struct ib_gid_attr *attr, 
			 * the lower vlan device for this gid entry.

			 */

			netdev_walk_all_lower_dev_rcu(attr->ndev,

					get_lower_dev_vlan, vlan_id);

					get_lower_dev_vlan, &priv);

		}

	}

	rcu_read_unlock();

drivers/infiniband/core/cma.c

+6 −3
Original line number Diff line number Diff line
@@ -2865,9 +2865,10 @@ struct iboe_prio_tc_map { 
	bool found;

};



static int get_lower_vlan_dev_tc(struct net_device *dev, void *data)

static int get_lower_vlan_dev_tc(struct net_device *dev,

				 struct netdev_nested_priv *priv)

{

	struct iboe_prio_tc_map *map = data;

	struct iboe_prio_tc_map *map = (struct iboe_prio_tc_map *)priv->data;



	if (is_vlan_dev(dev))

		map->output_tc = get_vlan_ndev_tc(dev, map->input_prio);
@@ -2886,16 +2887,18 @@ static int iboe_tos_to_sl(struct net_device *ndev, int tos) 
{

	struct iboe_prio_tc_map prio_tc_map = {};

	int prio = rt_tos2priority(tos);

	struct netdev_nested_priv priv;



	/* If VLAN device, get it directly from the VLAN netdev */

	if (is_vlan_dev(ndev))

		return get_vlan_ndev_tc(ndev, prio);



	prio_tc_map.input_prio = prio;

	priv.data = (void *)&prio_tc_map;

	rcu_read_lock();

	netdev_walk_all_lower_dev_rcu(ndev,

				      get_lower_vlan_dev_tc,

				      &prio_tc_map);

				      &priv);

	rcu_read_unlock();

	/* If map is found from lower device, use it; Otherwise

	 * continue with the current netdevice to get priority to tc map.

drivers/infiniband/core/roce_gid_mgmt.c

+6 −3
Original line number Diff line number Diff line
@@ -531,10 +531,11 @@ struct upper_list { 
	struct net_device *upper;

};



static int netdev_upper_walk(struct net_device *upper, void *data)

static int netdev_upper_walk(struct net_device *upper,

			     struct netdev_nested_priv *priv)

{

	struct upper_list *entry = kmalloc(sizeof(*entry), GFP_ATOMIC);

	struct list_head *upper_list = data;

	struct list_head *upper_list = (struct list_head *)priv->data;



	if (!entry)

		return 0;
@@ -553,12 +554,14 @@ static void handle_netdev_upper(struct ib_device *ib_dev, u8 port, 
						      struct net_device *ndev))

{

	struct net_device *ndev = cookie;

	struct netdev_nested_priv priv;

	struct upper_list *upper_iter;

	struct upper_list *upper_temp;

	LIST_HEAD(upper_list);



	priv.data = &upper_list;

	rcu_read_lock();

	netdev_walk_all_upper_dev_rcu(ndev, netdev_upper_walk, &upper_list);

	netdev_walk_all_upper_dev_rcu(ndev, netdev_upper_walk, &priv);

	rcu_read_unlock();



	handle_netdev(ib_dev, port, ndev);

drivers/infiniband/ulp/ipoib/ipoib_main.c

+6 −3
Original line number Diff line number Diff line
@@ -342,9 +342,10 @@ struct ipoib_walk_data { 
	struct net_device *result;

};



static int ipoib_upper_walk(struct net_device *upper, void *_data)

static int ipoib_upper_walk(struct net_device *upper,

			    struct netdev_nested_priv *priv)

{

	struct ipoib_walk_data *data = _data;

	struct ipoib_walk_data *data = (struct ipoib_walk_data *)priv->data;

	int ret = 0;



	if (ipoib_is_dev_match_addr_rcu(data->addr, upper)) {
@@ -368,10 +369,12 @@ static int ipoib_upper_walk(struct net_device *upper, void *_data) 
static struct net_device *ipoib_get_net_dev_match_addr(

		const struct sockaddr *addr, struct net_device *dev)

{

	struct netdev_nested_priv priv;

	struct ipoib_walk_data data = {

		.addr = addr,

	};



	priv.data = (void *)&data;

	rcu_read_lock();

	if (ipoib_is_dev_match_addr_rcu(addr, dev)) {

		dev_hold(dev);
@@ -379,7 +382,7 @@ static struct net_device *ipoib_get_net_dev_match_addr( 
		goto out;

	}



	netdev_walk_all_upper_dev_rcu(dev, ipoib_upper_walk, &data);

	netdev_walk_all_upper_dev_rcu(dev, ipoib_upper_walk, &priv);

out:

	rcu_read_unlock();

	return data.result;

drivers/net/bonding/bond_alb.c

+6 −3
Original line number Diff line number Diff line
@@ -942,9 +942,10 @@ struct alb_walk_data { 
	bool strict_match;

};



static int alb_upper_dev_walk(struct net_device *upper, void *_data)

static int alb_upper_dev_walk(struct net_device *upper,

			      struct netdev_nested_priv *priv)

{

	struct alb_walk_data *data = _data;

	struct alb_walk_data *data = (struct alb_walk_data *)priv->data;

	bool strict_match = data->strict_match;

	struct bonding *bond = data->bond;

	struct slave *slave = data->slave;
@@ -983,6 +984,7 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[], 
				      bool strict_match)

{

	struct bonding *bond = bond_get_bond_by_slave(slave);

	struct netdev_nested_priv priv;

	struct alb_walk_data data = {

		.strict_match = strict_match,

		.mac_addr = mac_addr,
@@ -990,6 +992,7 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[], 
		.bond = bond,

	};



	priv.data = (void *)&data;

	/* send untagged */

	alb_send_lp_vid(slave, mac_addr, 0, 0);
@@ -997,7 +1000,7 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[], 
	 * for that device.

	 */

	rcu_read_lock();

	netdev_walk_all_upper_dev_rcu(bond->dev, alb_upper_dev_walk, &data);

	netdev_walk_all_upper_dev_rcu(bond->dev, alb_upper_dev_walk, &priv);

	rcu_read_unlock();

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE