Skip to content

Commit 67fa8bf

Browse files
lsgunthgregkh
authored andcommitted
ntb_transport: Fix bug with max_mw_size parameter
[ Upstream commit cbd2744 ] When using the max_mw_size parameter of ntb_transport to limit the size of the Memory windows, communication cannot be established and the queues freeze. This is because the mw_size that's reported to the peer is correctly limited but the size used locally is not. So the MW is initialized with a buffer smaller than the window but the TX side is using the full window. This means the TX side will be writing to a region of the window that points nowhere. This is easily fixed by applying the same limit to tx_size in ntb_transport_init_queue(). Fixes: e26a584 ("NTB: Split ntb_hw_intel and ntb_transport drivers") Signed-off-by: Logan Gunthorpe <[email protected]> Acked-by: Allen Hubbe <[email protected]> Cc: Dave Jiang <[email protected]> Signed-off-by: Jon Mason <[email protected]> Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent d810c54 commit 67fa8bf

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/ntb/ntb_transport.c

+3
Original file line numberDiff line numberDiff line change
@@ -998,6 +998,9 @@ static int ntb_transport_init_queue(struct ntb_transport_ctx *nt,
998998
mw_base = nt->mw_vec[mw_num].phys_addr;
999999
mw_size = nt->mw_vec[mw_num].phys_size;
10001000

1001+
if (max_mw_size && mw_size > max_mw_size)
1002+
mw_size = max_mw_size;
1003+
10011004
tx_size = (unsigned int)mw_size / num_qps_mw;
10021005
qp_offset = tx_size * (qp_num / mw_count);
10031006

0 commit comments

Comments
 (0)