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

@@ -452,11 +452,10 @@
          * Allocate an entry to track the mapping and unmapping (specifically,
          * partial unmapping) of this resource.
          */
         dvm_track = (tavor_devmap_track_t *)kmem_zalloc(
             sizeof (tavor_devmap_track_t), KM_SLEEP);
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*dvm_track))
         dvm_track->tdt_offset = off;
         dvm_track->tdt_state  = state;
         dvm_track->tdt_refcnt = 1;
         mutex_init(&dvm_track->tdt_lock, NULL, MUTEX_DRIVER,
             DDI_INTR_PRI(state->ts_intrmsi_pri));

@@ -566,11 +565,10 @@
         /*
          * Extract the Tavor softstate pointer from "Tavor devmap tracking
          * structure" (in "pvtp").
          */
         dvm_track = (tavor_devmap_track_t *)pvtp;
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*dvm_track))
         state = dvm_track->tdt_state;
 
         /*
          * Since this devmap_dup() entry point is generally called
          * when a process does fork(2), it is incumbent upon the driver

@@ -596,11 +594,10 @@
          * that this mapping is invalid, and that its subsequent unmapping
          * should not affect any of the parent's CQ or QP resources.
          */
         new_dvm_track = (tavor_devmap_track_t *)kmem_zalloc(
             sizeof (tavor_devmap_track_t), KM_SLEEP);
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*new_dvm_track))
         new_dvm_track->tdt_offset = 0;
         new_dvm_track->tdt_state  = state;
         new_dvm_track->tdt_refcnt = 1;
         new_dvm_track->tdt_size   = 0;
         mutex_init(&new_dvm_track->tdt_lock, NULL, MUTEX_DRIVER,

@@ -638,11 +635,10 @@
         /*
          * Extract the Tavor softstate pointer from "Tavor devmap tracking
          * structure" (in "pvtp").
          */
         dvm_track = (tavor_devmap_track_t *)pvtp;
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*dvm_track))
         state     = dvm_track->tdt_state;
 
         /*
          * Extract the "offset" from the "Tavor devmap tracking structure".
          * Note: The input argument "off" is ignored here because the

@@ -840,11 +836,10 @@
          * are not subject to "partial" unmappings.  This makes these other
          * fields unnecessary.
          */
         dvm_track = (tavor_devmap_track_t *)kmem_zalloc(
             sizeof (tavor_devmap_track_t), KM_SLEEP);
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*dvm_track))
         dvm_track->tdt_state  = state;
         dvm_track->tdt_size   = PAGESIZE;
 
         /*
          * Pass the private "Tavor devmap tracking structure" back.  This

@@ -884,11 +879,10 @@
                 *new_pvtp = NULL;
                 TAVOR_TNF_EXIT(tavor_devmap_devmem_dup);
                 return (DDI_SUCCESS);
         }
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*dvm_track))
         state = dvm_track->tdt_state;
 
         /*
          * Since this devmap_dup() entry point is generally called
          * when a process does fork(2), it is incumbent upon the driver

@@ -940,11 +934,10 @@
          * are single pages.  Note: If the tracking structure is NULL here,
          * it means that the mapping corresponds to an invalid mapping.  In
          * this case, it can be safely ignored.
          */
         dvm_track = (tavor_devmap_track_t *)pvtp;
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*dvm_track))
         if (dvm_track == NULL) {
                 TAVOR_TNF_EXIT(tavor_devmap_devmem_unmap);
                 return;
         }
 

@@ -1047,11 +1040,10 @@
                 TNF_PROBE_0(tavor_umap_mr_data_in_invdatasz_fail,
                     TAVOR_TNF_ERROR, "");
                 TAVOR_TNF_EXIT(tavor_umap_mr_data_in);
                 return (IBT_INSUFF_RESOURCE);
         }
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*data))
 
         /*
          * Ensure that the MR corresponds to userland memory and that it is
          * a currently valid memory region as well.
          */

@@ -1197,11 +1189,10 @@
                 TNF_PROBE_0(tavor_umap_cq_data_out_invdatasz_fail,
                     TAVOR_TNF_ERROR, "");
                 TAVOR_TNF_EXIT(tavor_umap_cq_data_out);
                 return (IBT_INSUFF_RESOURCE);
         }
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*data))
 
         /*
          * If it has passed all the above checks, then fill in all the useful
          * mapping information (including the mapping offset that will be
          * passed back to the devmap() interface during a subsequent mmap()

@@ -1253,11 +1244,10 @@
                 TNF_PROBE_0(tavor_umap_qp_data_out_invdatasz_fail,
                     TAVOR_TNF_ERROR, "");
                 TAVOR_TNF_EXIT(tavor_umap_qp_data_out);
                 return (IBT_INSUFF_RESOURCE);
         }
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*data))
 
         /*
          * If it has passed all the checks, then fill in all the useful
          * mapping information (including the mapping offset that will be
          * passed back to the devmap() interface during a subsequent mmap()

@@ -1338,11 +1328,10 @@
                 TNF_PROBE_0(tavor_umap_srq_data_out_invdatasz_fail,
                     TAVOR_TNF_ERROR, "");
                 TAVOR_TNF_EXIT(tavor_umap_srq_data_out);
                 return (IBT_INSUFF_RESOURCE);
         }
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*data))
 
         /*
          * If it has passed all the checks, then fill in all the useful
          * mapping information (including the mapping offset that will be
          * passed back to the devmap() interface during a subsequent mmap()

@@ -1401,11 +1390,10 @@
                 TNF_PROBE_0(tavor_umap_pd_data_out_invdatasz_fail,
                     TAVOR_TNF_ERROR, "");
                 TAVOR_TNF_EXIT(tavor_umap_pd_data_out);
                 return (IBT_INSUFF_RESOURCE);
         }
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*data))
 
         /*
          * If it has passed all the checks, then fill the PD table index
          * (the PD table allocated index for the PD pd_pdnum)
          */

@@ -1484,11 +1472,10 @@
         if (umapdb == NULL) {
                 TNF_PROBE_0(tavor_umap_db_alloc_kmz_fail, TAVOR_TNF_ERROR, "");
                 TAVOR_TNF_EXIT(tavor_umap_db_alloc);
                 return (NULL);
         }
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*umapdb))
 
         /* Fill in the fields in the database entry */
         umapdb->tdbe_common.tdb_instance  = instance;
         umapdb->tdbe_common.tdb_type      = type;
         umapdb->tdbe_common.tdb_key       = key;

@@ -1544,12 +1531,10 @@
 
         TAVOR_TNF_ENTER(tavor_umap_db_add_nolock);
 
         ASSERT(MUTEX_HELD(&tavor_userland_rsrc_db.tdl_umapdb_lock));
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*umapdb))
-
         /*
          * Copy the common portion of the "to-be-added" database entry
          * into the "tavor_umap_db_query_t" structure.  We use this structure
          * (with no flags set) to find the appropriate location in the
          * "userland resources database" for the new entry to be added.

@@ -1629,11 +1614,10 @@
             &tavor_userland_rsrc_db.tdl_umapdb_avl, &query, &where);
         if (entry == NULL) {
                 TAVOR_TNF_EXIT(tavor_umap_db_find_nolock);
                 return (DDI_FAILURE);
         }
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*entry))
 
         /*
          * If the flags argument specifies that the entry should
          * be removed if found, then call avl_remove() to remove
          * the entry from the database.

@@ -1696,11 +1680,10 @@
          * to know after the entry is found using the other search criteria).
          */
         status = tavor_umap_db_find(0, (uint64_t)(uintptr_t)umem_cookie,
             MLNX_UMAP_MRMEM_RSRC, &value, (TAVOR_UMAP_DB_REMOVE |
             TAVOR_UMAP_DB_IGNORE_INSTANCE), &umapdb);
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*umapdb))
         if (status == DDI_SUCCESS) {
                 instance = umapdb->tdbe_common.tdb_instance;
                 state = ddi_get_soft_state(tavor_statep, instance);
                 if (state == NULL) {
                         cmn_err(CE_WARN, "Unable to match Tavor instance\n");

@@ -1765,12 +1748,10 @@
         tavor_umap_db_common_t  *entry_common, *query_common;
         uint_t                  query_flags;
 
         TAVOR_TNF_ENTER(tavor_umap_db_compare);
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*((tavor_umap_db_query_t *)q)))
-
         entry_common = &((tavor_umap_db_entry_t *)e)->tdbe_common;
         query_common = &((tavor_umap_db_query_t *)q)->tqdb_common;
         query_flags  = ((tavor_umap_db_query_t *)q)->tqdb_flags;
 
         /*