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

Commit b57259ca authored by Parav Pandit's avatar Parav Pandit Committed by Greg Kroah-Hartman
Browse files

IB/core: Fix calculation of maximum RoCE MTU 


[ Upstream commit 99260132fde7bddc6e0132ce53da94d1c9ccabcb ]

The original code only took into consideration the largest header
possible after the IB_BTH_BYTES.  This was incorrect, as the largest
possible header size is the largest possible combination of headers we
might run into.  The new code accounts for all possible headers in the
largest possible combination and subtracts that from the MTU to make
sure that all packets will fit on the wire.

Link: https://www.spinics.net/lists/linux-rdma/msg54558.html


Fixes: 3c86aa70 ("RDMA/cm: Add RDMA CM support for IBoE devices")
Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Reviewed-by: default avatarDaniel Jurgens <danielj@mellanox.com>
Reported-by: default avatarRoland Dreier <roland@purestorage.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9cb27c88

include/rdma/ib_addr.h

+4 −3
Original line number Diff line number Diff line
@@ -245,10 +245,11 @@ static inline void rdma_addr_set_dgid(struct rdma_dev_addr *dev_addr, union ib_g 
static inline enum ib_mtu iboe_get_mtu(int mtu)

{

	/*

	 * reduce IB headers from effective IBoE MTU. 28 stands for

	 * atomic header which is the biggest possible header after BTH

	 * Reduce IB headers from effective IBoE MTU.

	 */

	mtu = mtu - IB_GRH_BYTES - IB_BTH_BYTES - 28;

	mtu = mtu - (IB_GRH_BYTES + IB_UDP_BYTES + IB_BTH_BYTES +

		     IB_EXT_XRC_BYTES + IB_EXT_ATOMICETH_BYTES +

		     IB_ICRC_BYTES);



	if (mtu >= ib_mtu_enum_to_int(IB_MTU_4096))

		return IB_MTU_4096;

include/rdma/ib_pack.h

+11 −8
Original line number Diff line number Diff line
@@ -44,7 +44,10 @@ enum { 
	IB_IP4_BYTES		= 20,

	IB_UDP_BYTES		= 8,

	IB_BTH_BYTES		= 12,

	IB_DETH_BYTES = 8

	IB_DETH_BYTES		= 8,

	IB_EXT_ATOMICETH_BYTES	= 28,

	IB_EXT_XRC_BYTES	= 4,

	IB_ICRC_BYTES		= 4

};



struct ib_field {