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

@@ -488,11 +488,10 @@
          * Allocate an entry to track the mapping and unmapping (specifically,
          * partial unmapping) of this resource.
          */
         dvm_track = (hermon_devmap_track_t *)kmem_zalloc(
             sizeof (hermon_devmap_track_t), KM_SLEEP);
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*dvm_track))
         dvm_track->hdt_offset = off;
         dvm_track->hdt_state  = state;
         dvm_track->hdt_refcnt = 1;
         mutex_init(&dvm_track->hdt_lock, NULL, MUTEX_DRIVER,
             DDI_INTR_PRI(state->hs_intrmsi_pri));

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

@@ -633,11 +631,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 = (hermon_devmap_track_t *)kmem_zalloc(
             sizeof (hermon_devmap_track_t), KM_SLEEP);
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*new_dvm_track))
         new_dvm_track->hdt_offset = 0;
         new_dvm_track->hdt_state  = state;
         new_dvm_track->hdt_refcnt = 1;
         new_dvm_track->hdt_size   = 0;
         mutex_init(&new_dvm_track->hdt_lock, NULL, MUTEX_DRIVER,

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

@@ -893,11 +889,10 @@
          * Allocate an entry to track the mapping and unmapping (specifically,
          * partial unmapping) of this resource.
          */
         dvm_track = (hermon_devmap_track_t *)kmem_zalloc(
             sizeof (hermon_devmap_track_t), KM_SLEEP);
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*dvm_track))
         dvm_track->hdt_offset = off;
         dvm_track->hdt_state  = state;
         dvm_track->hdt_refcnt = 1;
         mutex_init(&dvm_track->hdt_lock, NULL, MUTEX_DRIVER,
             DDI_INTR_PRI(state->hs_intrmsi_pri));

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

@@ -1032,11 +1026,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 = (hermon_devmap_track_t *)kmem_zalloc(
             sizeof (hermon_devmap_track_t), KM_SLEEP);
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*new_dvm_track))
         new_dvm_track->hdt_offset = 0;
         new_dvm_track->hdt_state  = state;
         new_dvm_track->hdt_refcnt = 1;
         new_dvm_track->hdt_size   = 0;
         mutex_init(&new_dvm_track->hdt_lock, NULL, MUTEX_DRIVER,

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

@@ -1264,11 +1256,10 @@
          * are not subject to "partial" unmappings.  This makes these other
          * fields unnecessary.
          */
         dvm_track = (hermon_devmap_track_t *)kmem_zalloc(
             sizeof (hermon_devmap_track_t), KM_SLEEP);
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*dvm_track))
         dvm_track->hdt_state  = state;
         dvm_track->hdt_size   = (uint_t)PAGESIZE;
 
         /*
          * Pass the private "Hermon devmap tracking structure" back.  This

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

@@ -1356,11 +1346,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 = (hermon_devmap_track_t *)pvtp;
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*dvm_track))
         if (dvm_track == NULL) {
                 return;
         }
 
         kmem_free(dvm_track, sizeof (hermon_devmap_track_t));

@@ -1438,11 +1427,10 @@
 
         /* Check for valid MR input structure size */
         if (data_sz < sizeof (ibt_mr_data_in_t)) {
                 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.
          */

@@ -1555,11 +1543,10 @@
 
         /* Check for valid CQ mapping structure size */
         if (data_sz < sizeof (mlnx_umap_cq_data_out_t)) {
                 return (IBT_INSUFF_RESOURCE);
         }
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*data))
 
         /* deal with cq_alloc() verses cq_resize() */
         if (cq->cq_resize_hdl) {
                 data->mcq_maplen = cq->cq_resize_hdl->cq_cqinfo.qa_size;
                 data->mcq_numcqe = cq->cq_resize_hdl->cq_bufsz;

@@ -1618,11 +1605,10 @@
 
         /* Check for valid QP mapping structure size */
         if (data_sz < sizeof (mlnx_umap_qp_data_out_t)) {
                 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()

@@ -1709,11 +1695,10 @@
 
         /* Check for valid SRQ mapping structure size */
         if (data_sz < sizeof (mlnx_umap_srq_data_out_t)) {
                 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()

@@ -1770,11 +1755,10 @@
 
         /* Check for valid PD mapping structure size */
         if (data_sz < sizeof (mlnx_umap_pd_data_out_t)) {
                 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).
          */

@@ -1841,11 +1825,10 @@
         /* Allocate an entry to add to the "userland resources database" */
         umapdb = kmem_zalloc(sizeof (hermon_umap_db_entry_t), KM_NOSLEEP);
         if (umapdb == NULL) {
                 return (NULL);
         }
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*umapdb))
 
         /* Fill in the fields in the database entry */
         umapdb->hdbe_common.hdb_instance  = instance;
         umapdb->hdbe_common.hdb_type      = type;
         umapdb->hdbe_common.hdb_key       = key;

@@ -1890,12 +1873,10 @@
         hermon_umap_db_query_t  query;
         avl_index_t             where;
 
         ASSERT(MUTEX_HELD(&hermon_userland_rsrc_db.hdl_umapdb_lock));
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*umapdb))
-
         /*
          * Copy the common portion of the "to-be-added" database entry
          * into the "hermon_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.

@@ -1967,11 +1948,10 @@
         entry = (hermon_umap_db_entry_t *)avl_find(
             &hermon_userland_rsrc_db.hdl_umapdb_avl, &query, &where);
         if (entry == NULL) {
                 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.

@@ -2031,11 +2011,10 @@
          * to know after the entry is found using the other search criteria).
          */
         status = hermon_umap_db_find(0, (uint64_t)(uintptr_t)umem_cookie,
             MLNX_UMAP_MRMEM_RSRC, &value, (HERMON_UMAP_DB_REMOVE |
             HERMON_UMAP_DB_IGNORE_INSTANCE), &umapdb);
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*umapdb))
         if (status == DDI_SUCCESS) {
                 instance = umapdb->hdbe_common.hdb_instance;
                 state = ddi_get_soft_state(hermon_statep, instance);
                 if (state == NULL) {
                         cmn_err(CE_WARN, "Unable to match Hermon instance\n");

@@ -2090,12 +2069,10 @@
 hermon_umap_db_compare(const void *q, const void *e)
 {
         hermon_umap_db_common_t *entry_common, *query_common;
         uint_t                  query_flags;
 
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*((hermon_umap_db_query_t *)q)))
-
         entry_common = &((hermon_umap_db_entry_t *)e)->hdbe_common;
         query_common = &((hermon_umap_db_query_t *)q)->hqdb_common;
         query_flags  = ((hermon_umap_db_query_t *)q)->hqdb_flags;
 
         /*