diff options
| author | Karsten Graul <kgraul@linux.ibm.com> | 2018-05-15 17:04:55 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-16 11:49:19 -0400 |
| commit | 44aa81ce953aadd683765e6416ad53cc61d0624a (patch) | |
| tree | 143f1e7d085f8d87e3100fd4d37887af87ab1ddc /net/smc/af_smc.c | |
| parent | 569bc643656826d5305aebdc5d5500c99881b2e5 (diff) | |
| download | op-kernel-dev-44aa81ce953aadd683765e6416ad53cc61d0624a.zip op-kernel-dev-44aa81ce953aadd683765e6416ad53cc61d0624a.tar.gz | |
net/smc: register new rmbs with the peer
Register new rmb buffers with the remote peer by exchanging a
confirm_rkey llc message.
Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc/af_smc.c')
| -rw-r--r-- | net/smc/af_smc.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index 83403be..397ba21 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -293,14 +293,22 @@ static void smc_copy_sock_settings_to_smc(struct smc_sock *smc) smc_copy_sock_settings(&smc->sk, smc->clcsock->sk, SK_FLAGS_CLC_TO_SMC); } -/* register a new rmb */ -static int smc_reg_rmb(struct smc_link *link, struct smc_buf_desc *rmb_desc) +/* register a new rmb, optionally send confirm_rkey msg to register with peer */ +static int smc_reg_rmb(struct smc_link *link, struct smc_buf_desc *rmb_desc, + bool conf_rkey) { /* register memory region for new rmb */ if (smc_wr_reg_send(link, rmb_desc->mr_rx[SMC_SINGLE_LINK])) { rmb_desc->regerr = 1; return -EFAULT; } + if (!conf_rkey) + return 0; + /* exchange confirm_rkey msg with peer */ + if (smc_llc_do_confirm_rkey(link, rmb_desc)) { + rmb_desc->regerr = 1; + return -EFAULT; + } return 0; } @@ -334,7 +342,7 @@ static int smc_clnt_conf_first_link(struct smc_sock *smc) smc_wr_remember_qp_attr(link); - if (smc_reg_rmb(link, smc->conn.rmb_desc)) + if (smc_reg_rmb(link, smc->conn.rmb_desc, false)) return SMC_CLC_DECL_INTERR; /* send CONFIRM LINK response over RoCE fabric */ @@ -488,7 +496,7 @@ static int smc_connect_rdma(struct smc_sock *smc) } } else { if (!smc->conn.rmb_desc->reused) { - if (smc_reg_rmb(link, smc->conn.rmb_desc)) { + if (smc_reg_rmb(link, smc->conn.rmb_desc, true)) { reason_code = SMC_CLC_DECL_INTERR; goto decline_rdma_unlock; } @@ -729,7 +737,7 @@ static int smc_serv_conf_first_link(struct smc_sock *smc) link = &lgr->lnk[SMC_SINGLE_LINK]; - if (smc_reg_rmb(link, smc->conn.rmb_desc)) + if (smc_reg_rmb(link, smc->conn.rmb_desc, false)) return SMC_CLC_DECL_INTERR; /* send CONFIRM LINK request to client over the RoCE fabric */ @@ -866,7 +874,7 @@ static void smc_listen_work(struct work_struct *work) if (local_contact != SMC_FIRST_CONTACT) { if (!new_smc->conn.rmb_desc->reused) { - if (smc_reg_rmb(link, new_smc->conn.rmb_desc)) { + if (smc_reg_rmb(link, new_smc->conn.rmb_desc, true)) { reason_code = SMC_CLC_DECL_INTERR; goto decline_rdma_unlock; } |
