diff options
| author |   Ursula Braun <ubraun@linux.vnet.ibm.com> | 2017-04-10 14:58:05 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-04-11 23:01:14 -0400 |
| commit | 2c9c16825ea08b94e013e6902486b53457555b8d (patch) | |
| tree | 1f2ebb6b23e8fb1a5434907746c82d97bb7fb892 | |
| parent | net/smc: destruct non-accepted sockets (diff) | |
| download | linux-dev-2c9c16825ea08b94e013e6902486b53457555b8d.tar.xz linux-dev-2c9c16825ea08b94e013e6902486b53457555b8d.zip | |
net/smc: do not use IB_SEND_INLINE together with mapped data
smc specifies IB_SEND_INLINE for IB_WR_SEND ib_post_send calls, but
provides a mapped buffer to be sent. This is inconsistent, since
IB_SEND_INLINE works without mapped buffer. Problem has not been
detected in the past, because tests had been limited to Connect X3 cards
from Mellanox, whose mlx4 driver just ignored the IB_SEND_INLINE flag.
For now, the IB_SEND_INLINE flag is removed.
Signed-off-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
Reviewed-by: Thomas Richter <tmricht@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/smc/smc_ib.c | 1 | ||||
| -rw-r--r-- | net/smc/smc_wr.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/net/smc/smc_ib.c b/net/smc/smc_ib.c index b76257798ba5..16b7c801f8b6 100644 --- a/net/smc/smc_ib.c +++ b/net/smc/smc_ib.c @@ -257,7 +257,6 @@ int smc_ib_create_queue_pair(struct smc_link *lnk) .max_recv_wr = SMC_WR_BUF_CNT * 3, .max_send_sge = SMC_IB_MAX_SEND_SGE, .max_recv_sge = 1, - .max_inline_data = SMC_WR_TX_SIZE, }, .sq_sig_type = IB_SIGNAL_REQ_WR, .qp_type = IB_QPT_RC, diff --git a/net/smc/smc_wr.c b/net/smc/smc_wr.c index eadf157418dc..874ee9f9d796 100644 --- a/net/smc/smc_wr.c +++ b/net/smc/smc_wr.c @@ -447,7 +447,7 @@ static void smc_wr_init_sge(struct smc_link *lnk) lnk->wr_tx_ibs[i].num_sge = 1; lnk->wr_tx_ibs[i].opcode = IB_WR_SEND; lnk->wr_tx_ibs[i].send_flags = - IB_SEND_SIGNALED | IB_SEND_SOLICITED | IB_SEND_INLINE; + IB_SEND_SIGNALED | IB_SEND_SOLICITED; } for (i = 0; i < lnk->wr_rx_cnt; i++) { lnk->wr_rx_sges[i].addr = |