Commit 5071456f authored by Moni Shoua's avatar Moni Shoua Committed by Roland Dreier

IB/mlx4: Do IBoE GID table resets per-port

The IBoE code used to reset the GID table did it for all Ethernet
ports of the device.  Since the whole architecture of generating GIDs
and responding to events is port-based, this is inefficient and can
lead to wrong content in the GID table.  Change the reset flow to be
per-port.
Signed-off-by: default avatarMoni Shoua <monis@mellanox.co.il>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent ddf8bd34
...@@ -1408,7 +1408,6 @@ static void reset_gids_task(struct work_struct *work) ...@@ -1408,7 +1408,6 @@ static void reset_gids_task(struct work_struct *work)
struct mlx4_cmd_mailbox *mailbox; struct mlx4_cmd_mailbox *mailbox;
union ib_gid *gids; union ib_gid *gids;
int err; int err;
int i;
struct mlx4_dev *dev = gw->dev->dev; struct mlx4_dev *dev = gw->dev->dev;
mailbox = mlx4_alloc_cmd_mailbox(dev); mailbox = mlx4_alloc_cmd_mailbox(dev);
...@@ -1420,18 +1419,16 @@ static void reset_gids_task(struct work_struct *work) ...@@ -1420,18 +1419,16 @@ static void reset_gids_task(struct work_struct *work)
gids = mailbox->buf; gids = mailbox->buf;
memcpy(gids, gw->gids, sizeof(gw->gids)); memcpy(gids, gw->gids, sizeof(gw->gids));
for (i = 1; i < gw->dev->num_ports + 1; i++) { if (mlx4_ib_port_link_layer(&gw->dev->ib_dev, gw->port) ==
if (mlx4_ib_port_link_layer(&gw->dev->ib_dev, i) ==
IB_LINK_LAYER_ETHERNET) { IB_LINK_LAYER_ETHERNET) {
err = mlx4_cmd(dev, mailbox->dma, err = mlx4_cmd(dev, mailbox->dma,
MLX4_SET_PORT_GID_TABLE << 8 | i, MLX4_SET_PORT_GID_TABLE << 8 | gw->port,
1, MLX4_CMD_SET_PORT, 1, MLX4_CMD_SET_PORT,
MLX4_CMD_TIME_CLASS_B, MLX4_CMD_TIME_CLASS_B,
MLX4_CMD_WRAPPED); MLX4_CMD_WRAPPED);
if (err) if (err)
pr_warn(KERN_WARNING pr_warn(KERN_WARNING
"set port %d command failed\n", i); "set port %d command failed\n", gw->port);
}
} }
mlx4_free_cmd_mailbox(dev, mailbox); mlx4_free_cmd_mailbox(dev, mailbox);
...@@ -1506,7 +1503,7 @@ static void mlx4_make_default_gid(struct net_device *dev, union ib_gid *gid) ...@@ -1506,7 +1503,7 @@ static void mlx4_make_default_gid(struct net_device *dev, union ib_gid *gid)
} }
static int reset_gid_table(struct mlx4_ib_dev *dev) static int reset_gid_table(struct mlx4_ib_dev *dev, u8 port)
{ {
struct update_gid_work *work; struct update_gid_work *work;
...@@ -1514,10 +1511,12 @@ static int reset_gid_table(struct mlx4_ib_dev *dev) ...@@ -1514,10 +1511,12 @@ static int reset_gid_table(struct mlx4_ib_dev *dev)
work = kzalloc(sizeof(*work), GFP_ATOMIC); work = kzalloc(sizeof(*work), GFP_ATOMIC);
if (!work) if (!work)
return -ENOMEM; return -ENOMEM;
memset(dev->iboe.gid_table, 0, sizeof(dev->iboe.gid_table));
memset(dev->iboe.gid_table[port - 1], 0, sizeof(work->gids));
memset(work->gids, 0, sizeof(work->gids)); memset(work->gids, 0, sizeof(work->gids));
INIT_WORK(&work->work, reset_gids_task); INIT_WORK(&work->work, reset_gids_task);
work->dev = dev; work->dev = dev;
work->port = port;
queue_work(wq, &work->work); queue_work(wq, &work->work);
return 0; return 0;
} }
...@@ -1670,8 +1669,10 @@ static int mlx4_ib_init_gid_table(struct mlx4_ib_dev *ibdev) ...@@ -1670,8 +1669,10 @@ static int mlx4_ib_init_gid_table(struct mlx4_ib_dev *ibdev)
{ {
struct net_device *dev; struct net_device *dev;
struct mlx4_ib_iboe *iboe = &ibdev->iboe; struct mlx4_ib_iboe *iboe = &ibdev->iboe;
int i;
if (reset_gid_table(ibdev)) for (i = 1; i <= ibdev->num_ports; ++i)
if (reset_gid_table(ibdev, i))
return -1; return -1;
read_lock(&dev_base_lock); read_lock(&dev_base_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment