Print this page
8368 remove warlock leftovers from usr/src/uts

@@ -826,13 +826,10 @@
         tavor_qp_options_t      op;
         int                     status;
 
         TAVOR_TNF_ENTER(tavor_ci_alloc_qp);
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*attr_p))
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*queue_sizes_p))
-
         /* Check for valid HCA handle */
         if (hca == NULL) {
                 TNF_PROBE_0(tavor_ci_alloc_qp_invhca_fail,
                     TAVOR_TNF_ERROR, "");
                 TAVOR_TNF_EXIT(tavor_ci_alloc_qp);

@@ -881,13 +878,10 @@
         tavor_qp_options_t      op;
         int                     status;
 
         TAVOR_TNF_ENTER(tavor_ci_alloc_special_qp);
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*attr_p))
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*queue_sizes_p))
-
         /* Check for valid HCA handle */
         if (hca == NULL) {
                 TNF_PROBE_0(tavor_ci_alloc_special_qp_invhca_fail,
                     TAVOR_TNF_ERROR, "");
                 TAVOR_TNF_EXIT(tavor_ci_alloc_special_qp);

@@ -1473,12 +1467,10 @@
         tavor_mrhdl_t           mrhdl;
         int                     status;
 
         TAVOR_TNF_ENTER(tavor_ci_register_mr);
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr_desc))
-
         ASSERT(mr_attr != NULL);
         ASSERT(mr_p != NULL);
         ASSERT(mr_desc != NULL);
 
         /* Check for valid HCA handle */

@@ -1523,11 +1515,10 @@
                 TNF_PROBE_1(tavor_ci_register_mr_fail, TAVOR_TNF_ERROR, "",
                     tnf_uint, status, status);
                 TAVOR_TNF_EXIT(tavor_ci_register_mr);
                 return (status);
         }
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mrhdl))
 
         /* Fill in the mr_desc structure */
         mr_desc->md_vaddr = mrhdl->mr_bindinfo.bi_addr;
         mr_desc->md_lkey  = mrhdl->mr_lkey;
         /* Only set RKey if remote access was requested */

@@ -1570,12 +1561,10 @@
         int                     status;
         ibt_mr_flags_t          flags = attrp->mr_flags;
 
         TAVOR_TNF_ENTER(tavor_ci_register_buf);
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr_desc))
-
         ASSERT(mr_p != NULL);
         ASSERT(mr_desc != NULL);
 
         /* Check for valid HCA handle */
         if (hca == NULL) {

@@ -1619,11 +1608,10 @@
                 TNF_PROBE_1(tavor_ci_register_mr_fail, TAVOR_TNF_ERROR, "",
                     tnf_uint, status, status);
                 TAVOR_TNF_EXIT(tavor_ci_register_mr);
                 return (status);
         }
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mrhdl))
 
         /* Fill in the mr_desc structure */
         mr_desc->md_vaddr = mrhdl->mr_bindinfo.bi_addr;
         mr_desc->md_lkey  = mrhdl->mr_lkey;
         /* Only set RKey if remote access was requested */

@@ -1766,12 +1754,10 @@
         tavor_mrhdl_t           mrhdl, mrhdl_new;
         int                     status;
 
         TAVOR_TNF_ENTER(tavor_ci_register_shared_mr);
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr_desc))
-
         ASSERT(mr_attr != NULL);
         ASSERT(mr_p != NULL);
         ASSERT(mr_desc != NULL);
 
         /* Check for valid HCA handle */

@@ -1822,11 +1808,10 @@
                 TNF_PROBE_1(tavor_ci_register_shared_mr_fail, TAVOR_TNF_ERROR,
                     "", tnf_uint, status, status);
                 TAVOR_TNF_EXIT(tavor_ci_register_shared_mr);
                 return (status);
         }
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mrhdl_new))
 
         /* Fill in the mr_desc structure */
         mr_desc->md_vaddr = mrhdl_new->mr_bindinfo.bi_addr;
         mr_desc->md_lkey  = mrhdl_new->mr_lkey;
         /* Only set RKey if remote access was requested */

@@ -1868,12 +1853,10 @@
         tavor_mrhdl_t           mrhdl, mrhdl_new;
         int                     status;
 
         TAVOR_TNF_ENTER(tavor_ci_reregister_mr);
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr_desc))
-
         ASSERT(mr_attr != NULL);
         ASSERT(mr_new != NULL);
         ASSERT(mr_desc != NULL);
 
         /* Check for valid HCA handle */

@@ -1905,11 +1888,10 @@
                 TNF_PROBE_1(tavor_ci_reregister_mr_fail, TAVOR_TNF_ERROR, "",
                     tnf_uint, status, status);
                 TAVOR_TNF_EXIT(tavor_ci_reregister_mr);
                 return (status);
         }
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mrhdl_new))
 
         /* Fill in the mr_desc structure */
         mr_desc->md_vaddr = mrhdl_new->mr_bindinfo.bi_addr;
         mr_desc->md_lkey  = mrhdl_new->mr_lkey;
         /* Only set RKey if remote access was requested */

@@ -1952,12 +1934,10 @@
         int                     status;
         ibt_mr_flags_t          flags = attrp->mr_flags;
 
         TAVOR_TNF_ENTER(tavor_ci_reregister_buf);
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr_desc))
-
         ASSERT(mr_new != NULL);
         ASSERT(mr_desc != NULL);
 
         /* Check for valid HCA handle */
         if (hca == NULL) {

@@ -1988,11 +1968,10 @@
                 TNF_PROBE_1(tavor_ci_reregister_buf_fail, TAVOR_TNF_ERROR, "",
                     tnf_uint, status, status);
                 TAVOR_TNF_EXIT(tavor_ci_reregister_buf);
                 return (status);
         }
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mrhdl_new))
 
         /* Fill in the mr_desc structure */
         mr_desc->md_vaddr = mrhdl_new->mr_bindinfo.bi_addr;
         mr_desc->md_lkey  = mrhdl_new->mr_lkey;
         /* Only set RKey if remote access was requested */

@@ -2101,11 +2080,10 @@
                 TNF_PROBE_1(tavor_ci_alloc_mw_fail, TAVOR_TNF_ERROR, "",
                     tnf_uint, status, status);
                 TAVOR_TNF_EXIT(tavor_ci_alloc_mw);
                 return (status);
         }
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mwhdl))
 
         /* Return the MW handle and RKey */
         *mw_p = (ibc_mw_hdl_t)mwhdl;
         *rkey_p = mwhdl->mr_rkey;
 

@@ -2214,12 +2192,10 @@
         tavor_state_t           *state;
         tavor_pdhdl_t           pdhdl;
         tavor_mrhdl_t           mrhdl;
         int                     status;
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr_desc))
-
         ASSERT(mr_attr != NULL);
         ASSERT(mr_p != NULL);
         ASSERT(mr_desc != NULL);
 
         /* Check for valid HCA handle */

@@ -2248,11 +2224,10 @@
 
         status = tavor_dma_mr_register(state, pdhdl, mr_attr, &mrhdl);
         if (status != DDI_SUCCESS) {
                 return (status);
         }
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mrhdl))
 
         /* Fill in the mr_desc structure */
         mr_desc->md_vaddr = mr_attr->dmr_paddr;
         mr_desc->md_lkey  = mrhdl->mr_lkey;
         /* Only set RKey if remote access was requested */

@@ -3071,15 +3046,11 @@
 
 struct ibc_mi_s {
         int                     imh_len;
         ddi_dma_handle_t        imh_dmahandle[1];
 };
-_NOTE(SCHEME_PROTECTS_DATA("safe sharing",
-    ibc_mi_s::imh_len
-    ibc_mi_s::imh_dmahandle))
 
-
 /*
  * tavor_ci_map_mem_iov()
  * Map the memory
  *    Context: Can be called from interrupt or base context.
  */

@@ -3101,12 +3072,10 @@
         ibt_wr_ds_t             *sgl;
         tavor_state_t           *state;
         int                     kmflag;
         int                     (*callback)(caddr_t);
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*wr))
-
         if (mi_hdl_p == NULL)
                 return (IBT_MI_HDL_INVALID);
 
         /* Check for valid HCA handle */
         if (hca == NULL)

@@ -3141,11 +3110,10 @@
         if (iov_attr->iov_flags & IBT_IOV_BUF) {
                 mi_hdl = kmem_alloc(sizeof (*mi_hdl), kmflag);
                 if (mi_hdl == NULL)
                         return (IBT_INSUFF_RESOURCE);
                 sgl = wr->send.wr_sgl;
-                _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*sgl))
 
                 status = ddi_dma_alloc_handle(state->ts_dip, &dma_attr,
                     callback, NULL, &dmahdl);
                 if (status != DDI_SUCCESS) {
                         kmem_free(mi_hdl, sizeof (*mi_hdl));

@@ -3181,11 +3149,10 @@
 
         if (iov_attr->iov_flags & IBT_IOV_RECV)
                 sgl = wr->recv.wr_sgl;
         else
                 sgl = wr->send.wr_sgl;
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*sgl))
 
         len = iov_attr->iov_list_len;
         for (i = 0, j = 0; j < len; j++) {
                 if (iov_attr->iov[j].iov_len == 0)
                         continue;

@@ -3466,11 +3433,10 @@
         }
 
         memhdl = (tavor_mem_alloc_hdl_t)mem_alloc_hdl;
 
         /* free the memory */
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*memhdl))
         ddi_dma_mem_free(&memhdl->tavor_acc_hdl);
         ddi_dma_free_handle(&memhdl->tavor_dma_hdl);
 
         kmem_free(memhdl, sizeof (*memhdl));
         TAVOR_TNF_EXIT(tavor_dma_free);

@@ -3528,11 +3494,10 @@
                 ddi_dma_free_handle(&dma_hdl);
                 TNF_PROBE_0(tavor_dma_alloc_memory_fail, TAVOR_TNF_ERROR, "");
                 TAVOR_TNF_EXIT(tavor_mem_alloc);
                 return (DDI_FAILURE);
         }
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(**mem_hdl))
         (*mem_hdl)->tavor_dma_hdl = dma_hdl;
         (*mem_hdl)->tavor_acc_hdl = acc_hdl;
 
         TAVOR_TNF_EXIT(tavor_mem_alloc);
         return (DDI_SUCCESS);