Skip to content

Commit

Permalink
IB/core: Flip to the new dev walk API
Browse files Browse the repository at this point in the history
Convert rdma_is_upper_dev_rcu, handle_netdev_upper and
ipoib_get_net_dev_match_addr to the new upper device walk API.
This is just a code conversion; no functional change is intended.

v2
- removed typecast of data

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David Ahern authored and David S. Miller committed Oct 18, 2016
1 parent b3208b2 commit 453d393
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 27 deletions.
9 changes: 1 addition & 8 deletions drivers/infiniband/core/core_priv.h
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,7 @@ void ib_cache_release_one(struct ib_device *device);
static inline bool rdma_is_upper_dev_rcu(struct net_device *dev,
struct net_device *upper)
{
struct net_device *_upper = NULL;
struct list_head *iter;

netdev_for_each_all_upper_dev_rcu(dev, _upper, iter)
if (_upper == upper)
break;

return _upper == upper;
return netdev_has_upper_dev_all_rcu(dev, upper);
}

int addr_init(void);
Expand Down
42 changes: 23 additions & 19 deletions drivers/infiniband/core/roce_gid_mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -437,37 +437,41 @@ static void callback_for_addr_gid_device_scan(struct ib_device *device,
&parsed->gid_attr);
}

struct upper_list {
struct list_head list;
struct net_device *upper;
};

static int netdev_upper_walk(struct net_device *upper, void *data)
{
struct upper_list *entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
struct list_head *upper_list = data;

if (!entry) {
pr_info("roce_gid_mgmt: couldn't allocate entry to delete ndev\n");
return 0;
}

list_add_tail(&entry->list, upper_list);
dev_hold(upper);
entry->upper = upper;

return 0;
}

static void handle_netdev_upper(struct ib_device *ib_dev, u8 port,
void *cookie,
void (*handle_netdev)(struct ib_device *ib_dev,
u8 port,
struct net_device *ndev))
{
struct net_device *ndev = (struct net_device *)cookie;
struct upper_list {
struct list_head list;
struct net_device *upper;
};
struct net_device *upper;
struct list_head *iter;
struct upper_list *upper_iter;
struct upper_list *upper_temp;
LIST_HEAD(upper_list);

rcu_read_lock();
netdev_for_each_all_upper_dev_rcu(ndev, upper, iter) {
struct upper_list *entry = kmalloc(sizeof(*entry),
GFP_ATOMIC);

if (!entry) {
pr_info("roce_gid_mgmt: couldn't allocate entry to delete ndev\n");
continue;
}

list_add_tail(&entry->list, &upper_list);
dev_hold(upper);
entry->upper = upper;
}
netdev_walk_all_upper_dev_rcu(ndev, netdev_upper_walk, &upper_list);
rcu_read_unlock();

handle_netdev(ib_dev, port, ndev);
Expand Down

0 comments on commit 453d393

Please sign in to comment.