Print this page
8368 remove warlock leftovers from usr/src/uts
@@ -38,12 +38,10 @@
uint8_t hca_port_num;
ibt_recycle_handler_t func;
void *arg;
} ibcm_taskq_recycle_arg_t;
-_NOTE(READ_ONLY_DATA(ibcm_taskq_recycle_arg_s))
-
static ibt_status_t ibcm_init_reply_addr(ibcm_hca_info_t *hcap,
ibcm_mad_addr_t *reply_addr, ibt_chan_open_args_t *chan_args,
ibt_chan_open_flags_t flags, ib_time_t *cm_pkt_lt, ib_lid_t prim_slid);
static void ibcm_process_abort_via_taskq(void *args);
static ibt_status_t ibcm_process_rc_recycle_ret(void *recycle_arg);
@@ -76,25 +74,11 @@
#ifdef DEBUG
static void ibcm_print_reply_addr(ibt_channel_hdl_t channel,
ibcm_mad_addr_t *cm_reply_addr);
#endif
-_NOTE(DATA_READABLE_WITHOUT_LOCK(ibcm_port_info_s::{port_ibmf_hdl}))
-
-/* access is controlled between ibcm_sm.c and ibcm_ti.c by CVs */
-_NOTE(SCHEME_PROTECTS_DATA("Serialized access by CV", {ibt_rc_returns_t
- ibt_ud_returns_t ibt_ap_returns_t ibt_ar_t}))
-
/*
- * Typically, clients initialize these args in one api call, and use in
- * another api
- */
-_NOTE(SCHEME_PROTECTS_DATA("Expected usage of ibtl api by client",
- {ibt_path_info_s ibt_cep_path_s ibt_adds_vect_s ibt_mcg_info_s ib_gid_s
- ibt_ud_dest_attr_s ibt_ud_dest_s ibt_srv_data_s ibt_redirect_info_s}))
-
-/*
* ibt_open_rc_channel()
* ibt_open_rc_channel opens a communication channel on the specified
* channel to the specified service. For connection service type qp's
* the CM initiates the CEP to establish the connection and transitions
* the QP/EEC to the "Ready to send" State modifying the QP/EEC's
@@ -574,12 +558,10 @@
ibcm_inc_hca_res_cnt(hcap);
/* Once a resource created on hca, no need to hold the acc cnt */
ibcm_dec_hca_acc_cnt(hcap);
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*statep))
-
statep->timerid = 0;
statep->local_hca_guid = hca_guid;
statep->local_qpn = local_qpn;
statep->stored_reply_addr.cm_qp_entry = cm_qp_entry;
statep->prim_port = IBCM_PRIM_CEP_PATH(chan_args).cep_hca_port_num;
@@ -591,12 +573,10 @@
IBCM_SET_CHAN_PRIVATE(statep->channel, statep);
statep->stored_msg = ibmf_msg;
statep->dreq_msg = ibmf_msg_dreq;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*req_msgp))
-
/* Start filling in the REQ MAD */
req_msgp = (ibcm_req_msg_t *)IBCM_OUT_MSGP(statep->stored_msg);
req_msgp->req_local_comm_id = h2b32(local_comid);
req_msgp->req_svc_id = h2b64(chan_args->oc_path->pi_sid);
req_msgp->req_local_ca_guid = h2b64(hca_guid);
@@ -808,12 +788,10 @@
len = min(chan_args->oc_priv_data_len, IBT_REQ_PRIV_DATA_SZ);
if ((len > 0) && chan_args->oc_priv_data)
bcopy(chan_args->oc_priv_data, req_msgp->req_private_data, len);
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*req_msgp))
-
/* return_data is filled up in the state machine code */
if (ret_args != NULL) {
statep->open_return_data = ret_args;
}
@@ -869,12 +847,10 @@
IBCM_OUT_HDRP(statep->stored_msg)->TransactionID =
h2b64(ibcm_generate_tranid(IBCM_INCOMING_REQ, statep->local_comid,
0));
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*statep))
-
ibtl_cm_chan_is_opening(channel);
ibcm_open_enqueue(statep);
mutex_enter(&statep->state_mutex);
@@ -938,12 +914,10 @@
boolean_t cm_grh;
ibt_status_t status;
IBTF_DPRINTF_L5(cmlog, "ibcm_init_reply_addr:");
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*reply_addr))
-
/*
* sending side CM lid/gid/port num are not based on any redirect
* params. These values are set to primary RC path lid/gid/port num.
* In the future, these values can be set based on framework policy
* decisions ensuring reachability.
@@ -1104,12 +1078,10 @@
reply_addr->grh_hdr.ig_hop_limit =
(cm_grh == B_TRUE) ? cm_adds->av_hop : 1;
reply_addr->rcvd_addr.ia_service_level =
cm_adds->av_srvl;
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*reply_addr))
-
return (IBT_SUCCESS);
}
/*
@@ -1332,11 +1304,10 @@
ibcm_close_rc_channel(ibt_channel_hdl_t channel, ibcm_state_data_t *statep,
ibt_execution_mode_t mode)
{
ibcm_hca_info_t *hcap;
- _NOTE(LOCK_RELEASED_AS_SIDE_EFFECT(&statep->state_mutex));
ASSERT(MUTEX_HELD(&statep->state_mutex));
IBTF_DPRINTF_L3(cmlog, "ibcm_close_rc_channel: chan 0x%p statep %p",
channel, statep);
@@ -1651,34 +1622,28 @@
return (IBT_CHAN_SRV_TYPE_INVALID);
if (qp_attr.qp_info.qp_state != IBT_STATE_ERROR)
return (IBT_CHAN_STATE_INVALID);
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*ibcm_tq_recycle_arg))
-
ibcm_tq_recycle_arg = kmem_alloc(sizeof (ibcm_taskq_recycle_arg_t),
KM_SLEEP);
ibcm_tq_recycle_arg->rc_chan = rc_chan;
ibcm_tq_recycle_arg->control = control;
ibcm_tq_recycle_arg->hca_port_num = hca_port_num;
ibcm_tq_recycle_arg->func = func;
ibcm_tq_recycle_arg->arg = arg;
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*ibcm_tq_recycle_arg))
-
IBCM_GET_CHAN_PRIVATE(rc_chan, statep);
/*
* If non-blocking ie., func specified and channel has not yet completed
* the timewait, then schedule the work for later
*/
if ((func != NULL) && (statep != NULL)) {
IBCM_RELEASE_CHAN_PRIVATE(rc_chan);
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(statep->recycle_arg))
statep->recycle_arg = ibcm_tq_recycle_arg;
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(statep->recycle_arg))
return (IBT_SUCCESS);
}
/*
* if blocking ie., func specified, and channel has not yet completed
@@ -1800,12 +1765,10 @@
ibt_cm_ud_handler_t actual_cm_handler;
void *actual_cm_private;
ibt_ud_dest_t *dest_hdl;
} ibcm_local_handler_t;
-_NOTE(READ_ONLY_DATA(ibcm_local_handler_s))
-
/*
* Local UD CM Handler, used when ibt_alloc_ud_dest() is issued in
* NON-Blocking mode.
*
* Out here, we update the UD Destination handle with
@@ -1971,12 +1934,10 @@
"Failed to convert index2pkey: %d", retval);
ibcm_dec_hca_acc_cnt(hcap);
return (retval);
}
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(sidr_entry))
-
/* Allocate a new request id */
if (ibcm_alloc_reqid(hcap, &sidr_entry.srch_req_id) == IBCM_FAILURE) {
IBTF_DPRINTF_L2(cmlog, "ibcm_ud_get_dqpn: "
"no req id available");
ibcm_dec_hca_acc_cnt(hcap);
@@ -2014,12 +1975,10 @@
sidr_entry.srch_lid = port.hp_base_lid;
sidr_entry.srch_gid = attr->ud_addr->av_sgid;
sidr_entry.srch_grh_exists = attr->ud_addr->av_send_grh;
sidr_entry.srch_mode = IBCM_ACTIVE_MODE;
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(sidr_entry))
-
/* do various allocations needed here */
rw_enter(&hcap->hca_sidr_list_lock, RW_WRITER);
(void) ibcm_find_sidr_entry(&sidr_entry, hcap, &ud_statep,
IBCM_FLAG_ADD);
@@ -2029,12 +1988,10 @@
ibcm_inc_hca_res_cnt(hcap);
/* After a resource created on hca, no need to hold the acc cnt */
ibcm_dec_hca_acc_cnt(hcap);
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*ud_statep))
-
/* Initialize some ud_statep fields */
ud_statep->ud_stored_msg = ibmf_msg;
ud_statep->ud_svc_id = attr->ud_sid;
ud_statep->ud_pkt_life_time =
ibt_ib2usec(attr->ud_pkt_lt);
@@ -2083,12 +2040,10 @@
* redirect rej mad responses. This would be the place to specify
* appropriate remote qno
*/
ud_statep->ud_stored_reply_addr.rcvd_addr.ia_remote_qno = 1;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*sidr_req_msgp))
-
/* Initialize the SIDR REQ message fields */
sidr_req_msgp =
(ibcm_sidr_req_msg_t *)IBCM_OUT_MSGP(ud_statep->ud_stored_msg);
sidr_req_msgp->sidr_req_request_id = h2b32(ud_statep->ud_req_id);
@@ -2114,13 +2069,10 @@
ud_statep->ud_req_id, 0));
IBTF_DPRINTF_L4(cmlog, "ibcm_ud_get_dqpn: timer_value in HZ = %x",
ud_statep->ud_timer_value);
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*ud_statep))
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*sidr_req_msgp))
-
ibcm_post_ud_mad(ud_statep, ud_statep->ud_stored_msg,
ibcm_post_sidr_req_complete, ud_statep);
mutex_enter(&ud_statep->ud_state_mutex);
@@ -2211,18 +2163,14 @@
/* Allocate memory for local handler's private data. */
local_handler_priv =
kmem_alloc(sizeof (*local_handler_priv), KM_SLEEP);
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*local_handler_priv))
-
local_handler_priv->actual_cm_handler = attr->ud_cm_handler;
local_handler_priv->actual_cm_private = attr->ud_cm_private;
local_handler_priv->dest_hdl = ud_destp;
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*local_handler_priv))
-
attr->ud_cm_handler = ibcm_local_cm_handler;
attr->ud_cm_private = local_handler_priv;
}
/* In order to get DQPN and Destination QKey, perform SIDR */
@@ -2343,12 +2291,10 @@
"IBMF MSG allocation failed", statep->channel);
return (status);
}
}
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mra_msgp))
-
mra_msgp = (ibcm_mra_msg_t *)IBCM_OUT_MSGP(statep->mra_msg);
mra_msgp->mra_local_comm_id = h2b32(statep->local_comid);
mra_msgp->mra_remote_comm_id = h2b32(statep->remote_comid);
/* fill in rest of MRA's fields - Message MRAed and Service Timeout */
@@ -2368,12 +2314,10 @@
bcopy(priv_data, mra_msgp->mra_private_data, len);
IBCM_OUT_HDRP(statep->mra_msg)->AttributeID =
h2b16(IBCM_INCOMING_MRA + IBCM_ATTR_BASE_ID);
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*mra_msgp))
-
mutex_enter(&statep->state_mutex);
if ((statep->mode == IBCM_ACTIVE_MODE) &&
(statep->state == IBCM_STATE_REP_RCVD)) {
statep->state = IBCM_STATE_MRA_REP_SENT;
@@ -2463,12 +2407,10 @@
IBTF_DPRINTF_L2(cmlog, "ibt_register_service(%p (%s), %p, 0x%llX, %d)",
ibt_hdl, ibtl_cm_get_clnt_name(ibt_hdl), srv, (longlong_t)sid,
num_sids);
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*svcinfop))
-
*srv_hdl = NULL;
if (num_sids <= 0) {
IBTF_DPRINTF_L2(cmlog, "ibt_register_service: "
"Invalid number of service-ids specified (%d)", num_sids);
@@ -2514,12 +2456,10 @@
/* If this message isn't seen, then ibt_register_service failed. */
IBTF_DPRINTF_L2(cmlog, "ibt_register_service: done (%p, %llX)",
svcinfop, sid);
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*svcinfop))
-
return (IBT_SUCCESS);
}
static ibt_status_t
@@ -2627,16 +2567,12 @@
*
* Get ServiceID info from Response Buf, other
* attributes are already filled-in.
*/
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(srec->ServiceID))
-
srec->ServiceID = srv_resp->ServiceID;
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(srec->ServiceID))
-
(void) ibcm_write_service_record(saa_handle, srec,
IBMF_SAA_DELETE);
}
/* Deallocate the memory for results_p. */
@@ -2695,12 +2631,10 @@
*sb_hdl_p = NULL; /* return value for error cases */
IBTF_DPRINTF_L2(cmlog, "ibt_bind_service: srv_hdl %p, gid (%llX:%llX)",
srv_hdl, (longlong_t)gid.gid_prefix, (longlong_t)gid.gid_guid);
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*sbindp))
-
/* Call ibtl_cm_get_hca_port to get the port number and the HCA GUID. */
if ((status = ibtl_cm_get_hca_port(gid, 0, &port)) != IBT_SUCCESS) {
IBTF_DPRINTF_L2(cmlog, "ibt_bind_service: "
"ibtl_cm_get_hca_port failed: %d", status);
return (status);
@@ -2890,12 +2824,10 @@
srv_hdl, gid.gid_prefix, gid.gid_guid);
if (sb_hdl_p != NULL)
*sb_hdl_p = sbindp;
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*sbindp))
-
return (IBT_SUCCESS);
}
ibt_status_t
ibt_unbind_service(ibt_srv_hdl_t srv_hdl, ibt_sbind_hdl_t sbindp)
@@ -3064,13 +2996,10 @@
svc.sid = srv_hdl->svc_id;
svc.num_sids = 1;
IBTF_DPRINTF_L3(cmlog, "ibt_deregister_service: SID 0x%llX, numsids %d",
srv_hdl->svc_id, srv_hdl->svc_num_sids);
-#ifdef __lock_lint
- ibcm_svc_compare(NULL, NULL);
-#endif
svcp = avl_find(&ibcm_svc_avl_tree, &svc, NULL);
if (svcp != srv_hdl) {
mutex_exit(&ibcm_svc_info_lock);
IBTF_DPRINTF_L2(cmlog, "ibt_deregister_service(): "
"srv_hdl %p not found", srv_hdl);
@@ -4009,12 +3938,10 @@
ASSERT(statep->clnt_proceed == IBCM_UNBLOCK);
statep->clnt_proceed = IBCM_FAIL;
mutex_exit(&statep->state_mutex);
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*proceed_targs))
-
/* the state machine processing is done in a separate thread */
/* proceed_targs is freed in ibcm_proceed_via_taskq */
proceed_targs = kmem_alloc(sizeof (ibcm_proceed_targs_t),
KM_SLEEP);
@@ -4027,12 +3954,10 @@
proceed_targs->tst.rc.statep = statep;
bcopy(cm_event_data, &proceed_targs->tst.rc.rc_cm_event_data,
sizeof (ibt_cm_proceed_reply_t));
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*proceed_targs))
-
(void) taskq_dispatch(ibcm_taskq, ibcm_proceed_via_taskq,
proceed_targs, TQ_SLEEP);
return (IBT_SUCCESS);
}
@@ -4174,12 +4099,10 @@
ASSERT(ud_statep->ud_clnt_proceed == IBCM_UNBLOCK);
ud_statep->ud_clnt_proceed = IBCM_FAIL;
mutex_exit(&ud_statep->ud_state_mutex);
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*proceed_targs))
-
/* the state machine processing is done in a separate thread */
/* proceed_targs is freed in ibcm_proceed_via_taskq */
proceed_targs = kmem_zalloc(sizeof (ibcm_proceed_targs_t),
KM_SLEEP);
@@ -4200,12 +4123,10 @@
/* copy redirect info based on status */
if (status == IBT_CM_REDIRECT)
bcopy(redirect_infop, &proceed_targs->tst.ud.ud_redirect_info,
sizeof (ibt_redirect_info_t));
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*proceed_targs))
-
(void) taskq_dispatch(ibcm_taskq, ibcm_ud_proceed_via_taskq,
proceed_targs, TQ_SLEEP);
return (IBT_SUCCESS);
}
@@ -4442,12 +4363,10 @@
/* Allocate MAD for LAP */
IBTF_DPRINTF_L5(cmlog, "ibt_set_alt_path:"
" statep's mad addr = 0x%p", IBCM_OUT_HDRP(statep->lapr_msg));
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*lap_msgp))
-
lap_msgp = (ibcm_lap_msg_t *)IBCM_OUT_MSGP(statep->lapr_msg);
lap_msgp->lap_alt_l_port_lid = h2b16(alternate_slid);
lap_msgp->lap_alt_r_port_lid =
h2b16(alt_path->ap_alt_cep_path.cep_adds_vect.av_dlid);
@@ -4495,30 +4414,24 @@
if ((len > 0) && priv_data) {
bcopy(priv_data, lap_msgp->lap_private_data, len);
}
/* only rc_alt_pkt_lt and ap_return_data fields are initialized */
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*statep))
-
statep->rc_alt_pkt_lt = ibt_ib2usec(alt_path->ap_alt_pkt_lt);
/* return_data is filled up in the state machine code */
statep->ap_return_data = ret_args;
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*statep))
-
IBCM_OUT_HDRP(statep->lapr_msg)->AttributeID =
h2b16(IBCM_INCOMING_LAP + IBCM_ATTR_BASE_ID);
IBCM_OUT_HDRP(statep->lapr_msg)->TransactionID =
h2b64(ibcm_generate_tranid(IBCM_INCOMING_LAP, statep->local_comid,
0));
IBTF_DPRINTF_L3(cmlog, "ibt_set_alt_path: statep %p, tid %llx",
statep, IBCM_OUT_HDRP(statep->lapr_msg)->TransactionID);
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*lap_msgp))
-
/* Send LAP */
ibcm_post_rc_mad(statep, statep->lapr_msg, ibcm_post_lap_complete,
statep);
mutex_enter(&statep->state_mutex);
@@ -4665,23 +4578,18 @@
uint8_t ml_jstate;
} ibcm_mcg_list_t;
ibcm_mcg_list_t *ibcm_mcglist = NULL;
-_NOTE(MUTEX_PROTECTS_DATA(ibcm_mcglist_lock, ibcm_mcg_list_s))
-_NOTE(MUTEX_PROTECTS_DATA(ibcm_mcglist_lock, ibcm_mcglist))
-
typedef struct ibcm_join_mcg_tqarg_s {
ib_gid_t rgid;
ibt_mcg_attr_t mcg_attr;
ibt_mcg_info_t *mcg_infop;
ibt_mcg_handler_t func;
void *arg;
} ibcm_join_mcg_tqarg_t;
-_NOTE(READ_ONLY_DATA(ibcm_join_mcg_tqarg_s))
-
void
ibcm_add_incr_mcg_entry(sa_mcmember_record_t *mcg_req,
sa_mcmember_record_t *mcg_resp)
{
ibcm_mcg_list_t *new = NULL;
@@ -4874,12 +4782,10 @@
if (mcg_info_p == NULL) {
IBTF_DPRINTF_L2(cmlog, "ibt_join_mcg: mcg_info_p is NULL");
return (IBT_INVALID_PARAM);
}
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mcg_tq))
-
mcg_tq = kmem_alloc(sizeof (ibcm_join_mcg_tqarg_t), flag);
if (mcg_tq == NULL) {
IBTF_DPRINTF_L2(cmlog, "ibt_join_mcg: "
"Unable to allocate memory for local usage.");
return (IBT_INSUFF_KERNEL_RESOURCE);
@@ -4889,12 +4795,10 @@
bcopy(mcg_attr, &mcg_tq->mcg_attr, sizeof (ibt_mcg_attr_t));
mcg_tq->mcg_infop = mcg_info_p;
mcg_tq->func = func;
mcg_tq->arg = arg;
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*mcg_tq))
-
if (func != NULL) { /* Non-Blocking */
IBTF_DPRINTF_L3(cmlog, "ibt_join_mcg: Non-Blocking Call");
if (taskq_dispatch(ibcm_taskq, ibcm_process_async_join_mcg,
mcg_tq, TQ_NOSLEEP) == 0) {
IBTF_DPRINTF_L2(cmlog, "ibt_join_mcg: Failed to "
@@ -5827,13 +5731,10 @@
/* Validate the returned number of records. */
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 =
@@ -5851,13 +5752,10 @@
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))
-
/*
* Deallocate the memory allocated by SA for
* 'nr_resp'.
*/
ibcm_dec_hca_acc_cnt(hcap);
@@ -6025,13 +5923,10 @@
/* Validate the returned number of records. */
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 =
@@ -6049,13 +5944,10 @@
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))
-
/*
* Deallocate the memory allocated by SA for
* 'nr_resp'.
*/
ibcm_dec_hca_acc_cnt(hcap);
@@ -6570,13 +6462,11 @@
if ((sattr->sip_zoneid != ALL_ZONES) &&
(sattr->sip_zoneid != ipp->ip_zoneid))
continue;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*s_ip))
s_ip[j].ip_addr.family = ipp->ip_inet_family;
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*s_ip))
if (s_ip[j].ip_addr.family == AF_INET) {
bcopy(&ipp->ip_cm_sin.sin_addr,
&s_ip[j].ip_addr.un.ip4addr,
sizeof (in_addr_t));
} else if (s_ip[j].ip_addr.family == AF_INET6) {
@@ -6682,13 +6572,10 @@
ibt_get_ip_dst_port(ib_svc_id_t sid)
{
return (sid & IB_SID_IPADDR_PORTNUM_MASK);
}
-_NOTE(SCHEME_PROTECTS_DATA("Unshared data", ibt_ip_cm_info_t))
-_NOTE(SCHEME_PROTECTS_DATA("Unshared data", ibcm_ip_pvtdata_t))
-
ibt_status_t
ibt_format_ip_private_data(ibt_ip_cm_info_t *ip_cm_info,
ibt_priv_data_len_t priv_data_len, void *priv_data_p)
{
ibcm_ip_pvtdata_t ip_data;
@@ -6774,79 +6661,6 @@
}
IBCM_PRINT_IP("ibt_get_ip_data: src", &ip_cm_infop->src_addr);
IBCM_PRINT_IP("ibt_get_ip_data: dst", &ip_cm_infop->dst_addr);
return (IBT_SUCCESS);
-}
-
-
-/* Routines for warlock */
-
-/* ARGSUSED */
-static void
-ibcm_dummy_mcg_handler(void *arg, ibt_status_t retval, ibt_mcg_info_t *minfo)
-{
- ibcm_join_mcg_tqarg_t dummy_mcg;
-
- dummy_mcg.func = ibcm_dummy_mcg_handler;
-
- IBTF_DPRINTF_L5(cmlog, "ibcm_dummy_mcg_handler: "
- "dummy_mcg.func %p", dummy_mcg.func);
-}
-
-
-/* ARGSUSED */
-static void
-ibcm_dummy_recycle_rc_handler(ibt_status_t retval, void *arg)
-{
- ibcm_taskq_recycle_arg_t dummy_rc_recycle;
-
- dummy_rc_recycle.func = ibcm_dummy_recycle_rc_handler;
-
- IBTF_DPRINTF_L5(cmlog, "ibcm_dummy_recycle_rc_handler: "
- "dummy_rc_recycle.func %p", dummy_rc_recycle.func);
-}
-
-
-/* ARGSUSED */
-static ibt_cm_status_t
-ibcm_dummy_ud_handler(void *priv, ibt_cm_ud_event_t *event,
- ibt_cm_ud_return_args_t *ret_args,
- void *priv_data, ibt_priv_data_len_t len)
-{
- /*
- * Let warlock see that ibcm_local_handler_s::actual_cm_handler
- * points to this routine.
- */
- ibcm_local_handler_t p;
- ibcm_ud_state_data_t dummy_ud;
-
- p.actual_cm_handler = ibcm_dummy_ud_handler;
- dummy_ud.ud_cm_handler = ibcm_dummy_ud_handler;
-
- IBTF_DPRINTF_L5(cmlog, "ibcm_dummy_ud_handler: p.actual_cm_handler %p"
- "dummy_ud.ud_cm_handler %p", p.actual_cm_handler,
- dummy_ud.ud_cm_handler);
- /*
- * Call all routines that the client's callback routine could call.
- */
-
- return (IBT_CM_ACCEPT);
-}
-
-/* ARGSUSED */
-static ibt_cm_status_t
-ibcm_dummy_rc_handler(void *priv, ibt_cm_event_t *event,
- ibt_cm_return_args_t *ret_args, void *priv_data, ibt_priv_data_len_t len)
-{
- ibcm_state_data_t dummy_rc;
-
- dummy_rc.cm_handler = ibcm_dummy_rc_handler;
-
- IBTF_DPRINTF_L5(cmlog, "ibcm_dummy_rc_handler: "
- "dummy_ud.ud_cm_handler %p", dummy_rc.cm_handler);
- /*
- * Call all routines that the client's callback routine could call.
- */
-
- return (IBT_CM_ACCEPT);
}