Print this page
8368 remove warlock leftovers from usr/src/uts
@@ -41,12 +41,10 @@
/* statics */
static vmem_t *ibcm_local_sid_arena;
static vmem_t *ibcm_ip_sid_arena;
static ib_svc_id_t ibcm_local_sid_seed;
static ib_com_id_t ibcm_local_cid_seed;
-_NOTE(READ_ONLY_DATA({ibcm_local_sid_arena ibcm_local_sid_seed
- ibcm_ip_sid_arena ibcm_local_cid_seed}))
static void ibcm_delete_state_from_avl(ibcm_state_data_t *statep);
static void ibcm_init_conn_trace(ibcm_state_data_t *statep);
static void ibcm_fini_conn_trace(ibcm_state_data_t *statep);
static void ibcm_dump_conn_trbuf(void *statep, char *line_prefix,
char *buf, int buf_size);
@@ -170,12 +168,10 @@
(event_type == IBCM_OUTGOING_REQ)) {
/* fill in the new ibcm_state_data */
sp = *rstatep;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*sp))
-
/* initialize statep */
mutex_init(&sp->state_mutex, NULL, MUTEX_DEFAULT, NULL);
cv_init(&sp->block_client_cv, NULL, CV_DRIVER, NULL);
cv_init(&sp->block_mad_cv, NULL, CV_DRIVER, NULL);
@@ -190,18 +186,14 @@
sp->state = IBCM_STATE_REQ_RCVD;
sp->clnt_proceed = IBCM_BLOCK;
sp->close_nocb_state = IBCM_UNBLOCK;
sp->remote_hca_guid = remote_hca_guid;
sp->remote_qpn = remote_qpn;
-
} else if (event_type == IBCM_OUTGOING_REQ) { /* Active side */
sp->close_nocb_state = IBCM_UNBLOCK;
sp->state = IBCM_STATE_IDLE;
}
-
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*sp))
-
} else {
sp = *rstatep; /* for incoming REQ/REP STALE only */
}
if ((event_type == IBCM_INCOMING_REQ) ||
@@ -644,12 +636,10 @@
IBTF_DPRINTF_L5(cmlog, "ibcm_add_sidr_entry: lid=%x, guid=%llX, "
"grh = %x req_id = %x", srch_param->srch_lid,
srch_param->srch_gid.gid_guid, srch_param->srch_grh_exists,
srch_param->srch_req_id);
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*ud_statep))
-
/* didn't find the entry - so create new */
ud_statep = kmem_zalloc(sizeof (ibcm_ud_state_data_t), KM_SLEEP);
mutex_init(&ud_statep->ud_state_mutex, NULL, MUTEX_DEFAULT, NULL);
cv_init(&ud_statep->ud_block_client_cv, NULL, CV_DRIVER, NULL);
@@ -668,12 +658,10 @@
/* Update the list */
ud_statep->ud_nextp = hcap->hca_sidr_list;
hcap->hca_sidr_list = ud_statep;
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*ud_statep))
-
return (ud_statep);
}
/*
@@ -822,15 +810,10 @@
ibcm_status_t
ibcm_init_ids(void)
{
timespec_t tv;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(ibcm_local_sid_arena))
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(ibcm_ip_sid_arena))
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(ibcm_local_sid_seed))
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(ibcm_local_cid_seed))
-
ibcm_local_sid_arena = vmem_create("ibcm_local_sid",
(void *)IBCM_INITIAL_SID, IBCM_MAX_LOCAL_SIDS, 1, NULL, NULL, NULL,
0, VM_SLEEP | VMC_IDENTIFIER);
if (!ibcm_local_sid_arena)
@@ -848,14 +831,10 @@
ibcm_local_sid_seed = ((uint64_t)tv.tv_sec << 20) & 0x007FFFFFFFF00000;
ASSERT((ibcm_local_sid_seed & IB_SID_AGN_MASK) == 0);
ibcm_local_sid_seed |= IB_SID_AGN_LOCAL;
ibcm_local_cid_seed = (ib_com_id_t)tv.tv_sec;
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(ibcm_local_sid_arena))
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(ibcm_local_sid_seed))
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(ibcm_ip_sid_arena))
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(ibcm_local_cid_seed))
return (IBCM_SUCCESS);
}
@@ -1235,35 +1214,28 @@
ibcm_svc_info_t *svcp;
ibcm_svc_info_t *svcinfop;
ibcm_svc_lookup_t svc;
avl_index_t where = 0;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*svcinfop))
-
/* assume success, and avoid kmem while holding the writer lock */
svcinfop = kmem_zalloc(sizeof (*svcinfop), KM_SLEEP);
svcinfop->svc_id = sid;
svcinfop->svc_num_sids = num_sids;
svc.sid = sid;
svc.num_sids = num_sids;
mutex_enter(&ibcm_svc_info_lock);
-#ifdef __lock_lint
- ibcm_svc_compare(NULL, NULL);
-#endif
svcp = avl_find(&ibcm_svc_avl_tree, &svc, &where);
if (svcp != NULL) { /* overlab exists */
mutex_exit(&ibcm_svc_info_lock);
kmem_free(svcinfop, sizeof (*svcinfop));
return (NULL);
}
avl_insert(&ibcm_svc_avl_tree, (void *)svcinfop, where);
mutex_exit(&ibcm_svc_info_lock);
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*svcinfop))
-
return (svcinfop);
}
/*
* ibcm_find_svc_entry:
@@ -1286,13 +1258,10 @@
ASSERT(MUTEX_HELD(&ibcm_svc_info_lock));
svc.sid = sid;
svc.num_sids = 1;
-#ifdef __lock_lint
- ibcm_svc_compare(NULL, NULL);
-#endif
svcp = avl_find(&ibcm_svc_avl_tree, &svc, NULL);
if (svcp != NULL) {
IBTF_DPRINTF_L3(cmlog, "ibcm_find_svc_entry: "
"found SID = 0x%llX", sid);
return (svcp); /* found it */
@@ -1375,12 +1344,10 @@
{
ibcm_qp_list_t *entry;
ibmf_qp_handle_t ibmf_qp;
int ibmf_status;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*entry))
-
mutex_enter(&ibcm_qp_list_lock);
/*
* CM currently does not track port up and down status. If tracking of
* " port status" is added in the future, then CM could be optimized to
@@ -1439,12 +1406,10 @@
#ifdef DEBUG
ibcm_query_qp(hcap->hca_port_info[port_no-1].port_ibmf_hdl, ibmf_qp);
#endif
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*entry))
-
return (entry);
}
void
ibcm_release_qp(ibcm_qp_list_t *cm_qp_entry)
@@ -1579,21 +1544,19 @@
{
IBTF_DPRINTF_L5(cmlog, "ibcm_init_conn_trace: statep %p", sp);
/* Initialize trace related fields */
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*sp->conn_trace))
sp->conn_trace = kmem_zalloc(sizeof (ibcm_conn_trace_t), KM_SLEEP);
if ((ibcm_enable_trace & 1) == 0)
sp->conn_trace->conn_base_tm = gethrtime();
sp->conn_trace->conn_allocated_trcnt = ibcm_conn_max_trcnt;
sp->conn_trace->conn_trace_events =
kmem_zalloc(sp->conn_trace->conn_allocated_trcnt, KM_SLEEP);
sp->conn_trace->conn_trace_event_times =
kmem_zalloc(sp->conn_trace->conn_allocated_trcnt *
sizeof (tm_diff_type), KM_SLEEP);
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*sp->conn_trace))
}
void
ibcm_fini_conn_trace(ibcm_state_data_t *statep)
{
@@ -1991,13 +1954,10 @@
nr_resp = (sa_node_record_t *)(uchar_t *)res_p;
if ((nr_resp != NULL) && (num_rec > 0)) {
IBCM_DUMP_NODE_REC(nr_resp);
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(
- *node_info_p))
-
node_info_p->n_sys_img_guid =
nr_resp->NodeInfo.SystemImageGUID;
node_info_p->n_node_guid =
nr_resp->NodeInfo.NodeGUID;
node_info_p->n_port_guid =
@@ -2014,14 +1974,11 @@
nr_resp->NodeInfo.LocalPortNum;
node_info_p->n_node_type =
nr_resp->NodeInfo.NodeType;
(void) strncpy(node_info_p->n_description,
(char *)&nr_resp->NodeDescription, 64);
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(
- *node_info_p))
-
kmem_free(nr_resp, len);
}
ibcm_dec_hca_acc_cnt(hcap);
return (IBT_SUCCESS);
}