net/smc: unmapping of buffers to support multiple links

With the support of multiple links that are created and cleared there
is a need to unmap one link from all current buffers. Add unmapping by
link and by rmb. And make smcr_link_clear() available to be called from
the LLC layer.

Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Reviewed-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c
index de6bc36fe9a7016aeee30786afbf4e12f7177ffe..d5ecea490b4e8503f661ac75ec53f6718fd2e2b6 100644 (file)
--- a/net/smc/smc_core.c
+++ b/net/smc/smc_core.c
@@ -498,14 +498,69 @@ void smc_conn_free(struct smc_connection *conn)
                smc_lgr_schedule_free_work(lgr);
 }
 
-static void smcr_link_clear(struct smc_link *lnk)
+/* unregister a link from a buf_desc */
+static void smcr_buf_unmap_link(struct smc_buf_desc *buf_desc, bool is_rmb,
+                               struct smc_link *lnk)
+{
+       if (is_rmb)
+               buf_desc->is_reg_mr[lnk->link_idx] = false;
+       if (!buf_desc->is_map_ib[lnk->link_idx])
+               return;
+       if (is_rmb) {
+               if (buf_desc->mr_rx[lnk->link_idx]) {
+                       smc_ib_put_memory_region(
+                                       buf_desc->mr_rx[lnk->link_idx]);
+                       buf_desc->mr_rx[lnk->link_idx] = NULL;
+               }
+               smc_ib_buf_unmap_sg(lnk, buf_desc, DMA_FROM_DEVICE);
+       } else {
+               smc_ib_buf_unmap_sg(lnk, buf_desc, DMA_TO_DEVICE);
+       }
+       sg_free_table(&buf_desc->sgt[lnk->link_idx]);
+       buf_desc->is_map_ib[lnk->link_idx] = false;
+}
+
+/* unmap all buffers of lgr for a deleted link */
+static void smcr_buf_unmap_lgr(struct smc_link *lnk)
+{
+       struct smc_link_group *lgr = lnk->lgr;
+       struct smc_buf_desc *buf_desc, *bf;
+       int i;
+
+       for (i = 0; i < SMC_RMBE_SIZES; i++) {
+               mutex_lock(&lgr->rmbs_lock);
+               list_for_each_entry_safe(buf_desc, bf, &lgr->rmbs[i], list)
+                       smcr_buf_unmap_link(buf_desc, true, lnk);
+               mutex_unlock(&lgr->rmbs_lock);
+               mutex_lock(&lgr->sndbufs_lock);
+               list_for_each_entry_safe(buf_desc, bf, &lgr->sndbufs[i],
+                                        list)
+                       smcr_buf_unmap_link(buf_desc, false, lnk);
+               mutex_unlock(&lgr->sndbufs_lock);
+       }
+}
+
+static void smcr_rtoken_clear_link(struct smc_link *lnk)
+{
+       struct smc_link_group *lgr = lnk->lgr;
+       int i;
+
+       for (i = 0; i < SMC_RMBS_PER_LGR_MAX; i++) {
+               lgr->rtokens[i][lnk->link_idx].rkey = 0;
+               lgr->rtokens[i][lnk->link_idx].dma_addr = 0;
+       }
+}
+
+void smcr_link_clear(struct smc_link *lnk)
 {
        struct smc_ib_device *smcibdev;
 
-       if (lnk->peer_qpn == 0)
+       if (!lnk->lgr || lnk->state == SMC_LNK_UNUSED)
                return;
        lnk->peer_qpn = 0;
        smc_llc_link_clear(lnk);
+       smcr_buf_unmap_lgr(lnk);
+       smcr_rtoken_clear_link(lnk);
        smc_ib_modify_qp_reset(lnk);
        smc_wr_free_link(lnk);
        smc_ib_destroy_queue_pair(lnk);
@@ -522,23 +577,10 @@ static void smcr_link_clear(struct smc_link *lnk)
 static void smcr_buf_free(struct smc_link_group *lgr, bool is_rmb,
                          struct smc_buf_desc *buf_desc)
 {
-       struct smc_link *lnk;
        int i;
 
-       for (i = 0; i < SMC_LINKS_PER_LGR_MAX; i++) {
-               lnk = &lgr->lnk[i];
-               if (!buf_desc->is_map_ib[lnk->link_idx])
-                       continue;
-               if (is_rmb) {
-                       if (buf_desc->mr_rx[lnk->link_idx])
-                               smc_ib_put_memory_region(
-                                               buf_desc->mr_rx[lnk->link_idx]);
-                       smc_ib_buf_unmap_sg(lnk, buf_desc, DMA_FROM_DEVICE);
-               } else {
-                       smc_ib_buf_unmap_sg(lnk, buf_desc, DMA_TO_DEVICE);
-               }
-               sg_free_table(&buf_desc->sgt[lnk->link_idx]);
-       }
+       for (i = 0; i < SMC_LINKS_PER_LGR_MAX; i++)
+               smcr_buf_unmap_link(buf_desc, is_rmb, &lgr->lnk[i]);
 
        if (buf_desc->pages)
                __free_pages(buf_desc->pages, buf_desc->order);

diff --git a/net/smc/smc_core.h b/net/smc/smc_core.h
index fd512188d2c6776e959e91c4ddadfd4b86b09e91..fa532a423fd79449b5a0bd9a9971bc476bd85cde 100644 (file)
--- a/net/smc/smc_core.h
+++ b/net/smc/smc_core.h
@@ -367,6 +367,7 @@ void smc_lgr_schedule_free_work_fast(struct smc_link_group *lgr);
 int smc_core_init(void);
 void smc_core_exit(void);
 
+void smcr_link_clear(struct smc_link *lnk);
 int smcr_link_reg_rmb(struct smc_link *link, struct smc_buf_desc *rmb_desc);
 static inline struct smc_link_group *smc_get_lgr(struct smc_link *link)
 {