IB/mlx4: Handle protocol field in multicast table

The newest device firmware stores IB vs. Ethernet protocol in two bits in members_count field of multicast group table (0: Infiniband, 1: Ethernet). When changing the QP members count for a multicast group, it important not to reset this information. When calling multicast attach first time, the protocol type should be specified. In this patch we always set it IB, but in the future we will handle Ethernet too. When looking for a QP, the protocol type shoud be checked too.

Aleksey Senin committed 15 years ago

Commit da995a81 parent 4979d184 files · +27 −21Browse files

Unified · Split

4 files

drivers/infiniband/hw/mlx4/main.c +5 −4
drivers/net/mlx4/mcg.c +13 −10
include/linux/mlx4/device.h +8 −2
include/linux/mlx4/driver.h +1 −5

drivers/infiniband/hw/mlx4/main.c+5−4

@@ -623,8 +623,9 @@ static int mlx4_ib_mcg_attach(struct ib_qp ibqp, union ib_gid gid, u16 lid) · 622 unmodified lines
623	623	struct mlx4_ib_dev *mdev = to_mdev(ibqp->device);
624	624	struct mlx4_ib_qp *mqp = to_mqp(ibqp);
625	625
626		− err = mlx4_multicast_attach(mdev->dev, &mqp->mqp, gid->raw, !!(mqp->flags &
627		− MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK));
	626	+ err = mlx4_multicast_attach(mdev->dev, &mqp->mqp, gid->raw,
	627	+ !!(mqp->flags & MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK),
	628	+ MLX4_PROTOCOL_IB);
628	629	if (err)
629	630	return err;
630	631
@@ -635,7 +636,7 @@ static int mlx4_ib_mcg_attach(struct ib_qp ibqp, union ib_gid gid, u16 lid) · 4 unmodified lines
635	636	return 0;
636	637
637	638	err_add:
638		− mlx4_multicast_detach(mdev->dev, &mqp->mqp, gid->raw);
	639	+ mlx4_multicast_detach(mdev->dev, &mqp->mqp, gid->raw, MLX4_PROTOCOL_IB);
639	640	return err;
640	641	}
641	642
@@ -665,7 +666,7 @@ static int mlx4_ib_mcg_detach(struct ib_qp ibqp, union ib_gid gid, u16 lid) · 23 unmodified lines
665	666	struct mlx4_ib_gid_entry *ge;
666	667
667	668	err = mlx4_multicast_detach(mdev->dev,
668		− &mqp->mqp, gid->raw);
	669	+ &mqp->mqp, gid->raw, MLX4_PROTOCOL_IB);
669	670	if (err)
670	671	return err;
671	672

drivers/net/mlx4/mcg.c+13−10

@@ -95,7 +95,8 @@ static int mlx4_MGID_HASH(struct mlx4_dev dev, struct mlx4_cmd_mailbox mailbox · 94 unmodified lines
95	95	* entry in hash chain and *mgm holds end of hash chain.
96	96	*/
97	97	static int find_mgm(struct mlx4_dev *dev,
98		− u8 gid, struct mlx4_cmd_mailbox mgm_mailbox,
	98	+ u8 *gid, enum mlx4_protocol protocol,
	99	+ struct mlx4_cmd_mailbox *mgm_mailbox,
99	100	u16 hash, int prev, int *index)
100	101	{
101	102	struct mlx4_cmd_mailbox *mailbox;
@@ -134,7 +135,8 @@ static int find_mgm(struct mlx4_dev *dev, · 32 unmodified lines
134	135	return err;
135	136	}
136	137
137		− if (!memcmp(mgm->gid, gid, 16))
	138	+ if (!memcmp(mgm->gid, gid, 16) &&
	139	+ be32_to_cpu(mgm->members_count) >> 30 == protocol)
138	140	return err;
139	141
140	142	prev = index;
@@ -146,7 +148,7 @@ static int find_mgm(struct mlx4_dev *dev, · 5 unmodified lines
146	148	}
147	149
148	150	int mlx4_multicast_attach(struct mlx4_dev dev, struct mlx4_qp qp, u8 gid[16],
149		− int block_mcast_loopback)
	151	+ int block_mcast_loopback, enum mlx4_protocol protocol)
150	152	{
151	153	struct mlx4_priv *priv = mlx4_priv(dev);
152	154	struct mlx4_cmd_mailbox *mailbox;
@@ -165,7 +167,7 @@ int mlx4_multicast_attach(struct mlx4_dev dev, struct mlx4_qp qp, u8 gid[16], · 12 unmodified lines
165	167
166	168	mutex_lock(&priv->mcg_table.mutex);
167	169
168		− err = find_mgm(dev, gid, mailbox, &hash, &prev, &index);
	170	+ err = find_mgm(dev, gid, protocol, mailbox, &hash, &prev, &index);
169	171	if (err)
170	172	goto out;
171	173
@@ -187,7 +189,7 @@ int mlx4_multicast_attach(struct mlx4_dev dev, struct mlx4_qp qp, u8 gid[16], · 15 unmodified lines
187	189	memcpy(mgm->gid, gid, 16);
188	190	}
189	191
190		− members_count = be32_to_cpu(mgm->members_count);
	192	+ members_count = be32_to_cpu(mgm->members_count) & 0xffffff;
191	193	if (members_count == MLX4_QP_PER_MGM) {
192	194	mlx4_err(dev, "MGM at index %x is full.\n", index);
193	195	err = -ENOMEM;
@@ -207,7 +209,7 @@ int mlx4_multicast_attach(struct mlx4_dev dev, struct mlx4_qp qp, u8 gid[16], · 13 unmodified lines
207	209	else
208	210	mgm->qp[members_count++] = cpu_to_be32(qp->qpn & MGM_QPN_MASK);
209	211
210		− mgm->members_count = cpu_to_be32(members_count);
	212	+ mgm->members_count = cpu_to_be32(members_count \| (u32) protocol << 30);
211	213
212	214	err = mlx4_WRITE_MCG(dev, index, mailbox);
213	215	if (err)
@@ -242,7 +244,8 @@ out: · 28 unmodified lines
242	244	}
243	245	EXPORT_SYMBOL_GPL(mlx4_multicast_attach);
244	246
245		−int mlx4_multicast_detach(struct mlx4_dev dev, struct mlx4_qp qp, u8 gid[16])
	247	+int mlx4_multicast_detach(struct mlx4_dev dev, struct mlx4_qp qp, u8 gid[16],
	248	+ enum mlx4_protocol protocol)
246	249	{
247	250	struct mlx4_priv *priv = mlx4_priv(dev);
248	251	struct mlx4_cmd_mailbox *mailbox;
@@ -260,7 +263,7 @@ int mlx4_multicast_detach(struct mlx4_dev dev, struct mlx4_qp qp, u8 gid[16]) · 11 unmodified lines
260	263
261	264	mutex_lock(&priv->mcg_table.mutex);
262	265
263		− err = find_mgm(dev, gid, mailbox, &hash, &prev, &index);
	266	+ err = find_mgm(dev, gid, protocol, mailbox, &hash, &prev, &index);
264	267	if (err)
265	268	goto out;
266	269
@@ -270,7 +273,7 @@ int mlx4_multicast_detach(struct mlx4_dev dev, struct mlx4_qp qp, u8 gid[16]) · 3 unmodified lines
270	273	goto out;
271	274	}
272	275
273		− members_count = be32_to_cpu(mgm->members_count);
	276	+ members_count = be32_to_cpu(mgm->members_count) & 0xffffff;
274	277	for (loc = -1, i = 0; i < members_count; ++i)
275	278	if ((be32_to_cpu(mgm->qp[i]) & MGM_QPN_MASK) == qp->qpn)
276	279	loc = i;
@@ -282,7 +285,7 @@ int mlx4_multicast_detach(struct mlx4_dev dev, struct mlx4_qp qp, u8 gid[16]) · 5 unmodified lines
282	285	}
283	286
284	287
285		− mgm->members_count = cpu_to_be32(--members_count);
	288	+ mgm->members_count = cpu_to_be32(--members_count \| (u32) protocol << 30);
286	289	mgm->qp[loc] = mgm->qp[i - 1];
287	290	mgm->qp[i - 1] = 0;
288	291

include/linux/mlx4/device.h+8−2

@@ -144,6 +144,11 @@ enum { · 143 unmodified lines
144	144	MLX4_STAT_RATE_OFFSET = 5
145	145	};
146	146
	147	+enum mlx4_protocol {
	148	+ MLX4_PROTOCOL_IB,
	149	+ MLX4_PROTOCOL_EN,
	150	+};
	151	+
147	152	enum {
148	153	MLX4_MTT_FLAG_PRESENT = 1
149	154	};
@@ -500,8 +505,9 @@ int mlx4_INIT_PORT(struct mlx4_dev *dev, int port); · 350 unmodified lines
500	505	int mlx4_CLOSE_PORT(struct mlx4_dev *dev, int port);
501	506
502	507	int mlx4_multicast_attach(struct mlx4_dev dev, struct mlx4_qp qp, u8 gid[16],
503		− int block_mcast_loopback);
504		−int mlx4_multicast_detach(struct mlx4_dev dev, struct mlx4_qp qp, u8 gid[16]);
	508	+ int block_mcast_loopback, enum mlx4_protocol protocol);
	509	+int mlx4_multicast_detach(struct mlx4_dev dev, struct mlx4_qp qp, u8 gid[16],
	510	+ enum mlx4_protocol protocol);
505	511
506	512	int mlx4_register_mac(struct mlx4_dev dev, u8 port, u64 mac, int index);
507	513	void mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, int index);

include/linux/mlx4/driver.h+1−5

@@ -34,6 +34,7 @@ · 33 unmodified lines
34	34	#define MLX4_DRIVER_H
35	35
36	36	#include <linux/device.h>
	37	+#include <linux/mlx4/device.h>
37	38
38	39	struct mlx4_dev;
39	40
@@ -44,11 +45,6 @@ enum mlx4_dev_event { · 4 unmodified lines
44	45	MLX4_DEV_EVENT_PORT_REINIT,
45	46	};
46	47
47		−enum mlx4_protocol {
48		− MLX4_PROTOCOL_IB,
49		− MLX4_PROTOCOL_EN,
50		−};
51		−
52	48	struct mlx4_interface {
53	49	void * (add) (struct mlx4_dev dev);
54	50	void (remove)(struct mlx4_dev dev, void *context);

IB/mlx4: Handle protocol field in multicast table

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code