Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0626b20 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Sasha Levin
Browse files

IB/mlx4: Properly initialize GRH TClass and FlowLabel in AHs 



[ Upstream commit 8c5122e45a10a9262f872b53f151a592e870f905 ]

When this code was reworked for IBoE support the order of assignments
for the sl_tclass_flowlabel got flipped around resulting in
TClass & FlowLabel being permanently set to 0 in the packet headers.

This breaks IB routers that rely on these headers, but only affects
kernel users - libmlx4 does this properly for user space.

Cc: stable@vger.kernel.org
Fixes: fa417f7b ("IB/mlx4: Add support for IBoE")
Signed-off-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent eefeb9a2

drivers/infiniband/hw/mlx4/ah.c

+1 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ static struct ib_ah *create_ib_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr, 


	ah->av.ib.port_pd = cpu_to_be32(to_mpd(pd)->pdn | (ah_attr->port_num << 24));

	ah->av.ib.g_slid  = ah_attr->src_path_bits;

	ah->av.ib.sl_tclass_flowlabel = cpu_to_be32(ah_attr->sl << 28);

	if (ah_attr->ah_flags & IB_AH_GRH) {

		ah->av.ib.g_slid   |= 0x80;

		ah->av.ib.gid_index = ah_attr->grh.sgid_index;
@@ -63,7 +64,6 @@ static struct ib_ah *create_ib_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr, 
		       !(1 << ah->av.ib.stat_rate & dev->caps.stat_rate_support))

			--ah->av.ib.stat_rate;

	}

	ah->av.ib.sl_tclass_flowlabel = cpu_to_be32(ah_attr->sl << 28);



	return &ah->ibah;

}