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

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/ib/ibtl/ibtl_cq.c
          +++ new/usr/src/uts/common/io/ib/ibtl/ibtl_cq.c
↓ open down ↓ 87 lines elided ↑ open up ↑
  88   88          ibt_status_t            status;
  89   89          ibt_cq_hdl_t            ibt_cq;
  90   90  
  91   91          IBTF_DPRINTF_L3(ibtf_cq, "ibt_alloc_cq(%p, %p)",
  92   92              hca_hdl, cq_attr);
  93   93  
  94   94  
  95   95          ibt_cq = kmem_zalloc(sizeof (struct ibtl_cq_s), KM_SLEEP);
  96   96          *ibt_cq_p = ibt_cq;
  97   97  
  98      -        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(ibt_cq->cq_in_thread))
  99      -        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(ibt_cq->cq_ibc_cq_hdl))
 100      -        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(ibt_cq->cq_hca))
 101   98          /*
 102   99           * Set the following values before creating CI CQ, to avoid race
 103  100           * conditions on async callback.
 104  101           */
 105  102          ibt_cq->cq_hca = hca_hdl;
 106  103  
 107  104          ibtl_qp_flow_control_enter();
 108  105          status = IBTL_HCA2CIHCAOPS_P(hca_hdl)->ibc_alloc_cq(
 109  106              IBTL_HCA2CIHCA(hca_hdl), ibt_cq, cq_attr, &ibt_cq->cq_ibc_cq_hdl,
 110  107              real_size);
↓ open down ↓ 5 lines elided ↑ open up ↑
 116  113                  kmem_free(ibt_cq, sizeof (struct ibtl_cq_s));
 117  114                  *ibt_cq_p = NULL;
 118  115                  return (status);
 119  116          }
 120  117  
 121  118          if (cq_attr->cq_flags & IBT_CQ_HANDLER_IN_THREAD) {
 122  119                  ibt_cq->cq_in_thread = 1;
 123  120                  /* We may want additional CQ threads now. */
 124  121                  ibtl_another_cq_handler_in_thread();
 125  122          }
 126      -        _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(ibt_cq->cq_in_thread))
 127      -        _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(ibt_cq->cq_ibc_cq_hdl))
 128      -        _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(ibt_cq->cq_hca))
 129  123  
 130  124          mutex_init(&ibt_cq->cq_mutex, NULL, MUTEX_DEFAULT, NULL);
 131  125  
 132  126          /* Update the cq resource count */
 133  127          atomic_inc_32(&hca_hdl->ha_cq_cnt);
 134  128  
 135  129          return (IBT_SUCCESS);
 136  130  }
 137  131  
 138  132  
↓ open down ↓ 87 lines elided ↑ open up ↑
 226  220  ibt_status_t
 227  221  ibt_poll_cq(ibt_cq_hdl_t ibt_cq, ibt_wc_t *work_completions, uint_t num_wc,
 228  222      uint_t *num_polled)
 229  223  {
 230  224          IBTF_DPRINTF_L4(ibtf_cq, "ibt_poll_cq(%p)", ibt_cq);
 231  225  
 232  226          return (IBTL_CQ2CIHCAOPS_P(ibt_cq)->ibc_poll_cq(IBTL_CQ2CIHCA(ibt_cq),
 233  227              ibt_cq->cq_ibc_cq_hdl, work_completions, num_wc, num_polled));
 234  228  }
 235  229  
 236      -_NOTE(SCHEME_PROTECTS_DATA("client managed", ibtl_cq_s::cq_clnt_private))
 237      -
 238  230  /*
 239  231   * ibt_set_cq_private - Sets the private data on a given CQ
 240  232   *
 241  233   *      ibt_cq          The ibt_cq_hdl_t of the allocated CQ.
 242  234   *      clnt_private    The client private data.
 243  235   */
 244  236  void
 245  237  ibt_set_cq_private(ibt_cq_hdl_t ibt_cq, void *clnt_private)
 246  238  {
 247  239          ibt_cq->cq_clnt_private = clnt_private;
↓ open down ↓ 27 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX