From: Ursula Braun <ubraun@linux.vnet.ibm.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org,
jwi@linux.vnet.ibm.com, schwidefsky@de.ibm.com,
heiko.carstens@de.ibm.com, raspl@linux.vnet.ibm.com,
ubraun@linux.vnet.ibm.com
Subject: [PATCH net-next 10/10] net/smc: do not use IB_SEND_INLINE together with mapped data
Date: Mon, 10 Apr 2017 14:58:05 +0200 [thread overview]
Message-ID: <20170410125805.13653-11-ubraun@linux.vnet.ibm.com> (raw)
In-Reply-To: <20170410125805.13653-1-ubraun@linux.vnet.ibm.com>
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>
---
net/smc/smc_ib.c | 1 -
net/smc/smc_wr.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/smc/smc_ib.c b/net/smc/smc_ib.c
index b762577..16b7c80 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 eadf157..874ee9f 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 =
--
2.10.2
next prev parent reply other threads:[~2017-04-10 12:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-10 12:57 [PATCH net-next 00/10] net/smc: patches for net-next Ursula Braun
2017-04-10 12:57 ` [PATCH net-next 01/10] net/smc: get rid of old comment Ursula Braun
2017-04-10 12:57 ` [PATCH net-next 02/10] net/smc: remove useless smc_ib_devices_list check Ursula Braun
2017-04-10 12:57 ` [PATCH net-next 03/10] net/smc: return active RoCE port only Ursula Braun
2017-04-10 12:57 ` [PATCH net-next 04/10] net/smc: guarantee reset of write_blocked for heavy workload Ursula Braun
2017-04-10 12:58 ` [PATCH net-next 05/10] net/smc: always call the POLL_IN part of sk_wake_async Ursula Braun
2017-04-10 12:58 ` [PATCH net-next 06/10] net/smc: no socket state changes in tasklet context Ursula Braun
2017-04-10 12:58 ` [PATCH net-next 07/10] net/smc: guarantee ConnClosed send after shutdown SHUT_WR Ursula Braun
2017-04-10 12:58 ` [PATCH net-next 08/10] net/smc: remove duplicate unhash Ursula Braun
2017-04-10 12:58 ` [PATCH net-next 09/10] net/smc: destruct non-accepted sockets Ursula Braun
2017-04-10 12:58 ` Ursula Braun [this message]
2017-04-12 3:01 ` [PATCH net-next 00/10] net/smc: patches for net-next David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170410125805.13653-11-ubraun@linux.vnet.ibm.com \
--to=ubraun@linux.vnet.ibm.com \
--cc=davem@davemloft.net \
--cc=heiko.carstens@de.ibm.com \
--cc=jwi@linux.vnet.ibm.com \
--cc=linux-s390@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=raspl@linux.vnet.ibm.com \
--cc=schwidefsky@de.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).