lkml.org 
[lkml]   [2006]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 27 of 28] IB/ipath - fix races with ib_resize_cq()
    Date
    From
    The resize CQ function changes the memory used to store the queue.
    Other routines need to honor the lock before accessing the pointer
    to the queue and verify that the head and tail are in range.

    Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com>

    diff -r 8b45b43df5ad -r 944d7e53a049 drivers/infiniband/hw/ipath/ipath_cq.c
    --- a/drivers/infiniband/hw/ipath/ipath_cq.c Thu Sep 28 08:57:13 2006 -0700
    +++ b/drivers/infiniband/hw/ipath/ipath_cq.c Thu Sep 28 08:57:13 2006 -0700
    @@ -46,7 +46,7 @@
    */
    void ipath_cq_enter(struct ipath_cq *cq, struct ib_wc *entry, int solicited)
    {
    - struct ipath_cq_wc *wc = cq->queue;
    + struct ipath_cq_wc *wc;
    unsigned long flags;
    u32 head;
    u32 next;
    @@ -57,6 +57,7 @@ void ipath_cq_enter(struct ipath_cq *cq,
    * Note that the head pointer might be writable by user processes.
    * Take care to verify it is a sane value.
    */
    + wc = cq->queue;
    head = wc->head;
    if (head >= (unsigned) cq->ibcq.cqe) {
    head = cq->ibcq.cqe;
    @@ -109,21 +110,27 @@ int ipath_poll_cq(struct ib_cq *ibcq, in
    int ipath_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *entry)
    {
    struct ipath_cq *cq = to_icq(ibcq);
    - struct ipath_cq_wc *wc = cq->queue;
    + struct ipath_cq_wc *wc;
    unsigned long flags;
    int npolled;
    + u32 tail;

    spin_lock_irqsave(&cq->lock, flags);

    + wc = cq->queue;
    + tail = wc->tail;
    + if (tail > (u32) cq->ibcq.cqe)
    + tail = (u32) cq->ibcq.cqe;
    for (npolled = 0; npolled < num_entries; ++npolled, ++entry) {
    - if (wc->tail == wc->head)
    + if (tail == wc->head)
    break;
    - *entry = wc->queue[wc->tail];
    - if (wc->tail >= cq->ibcq.cqe)
    - wc->tail = 0;
    + *entry = wc->queue[tail];
    + if (tail >= cq->ibcq.cqe)
    + tail = 0;
    else
    - wc->tail++;
    - }
    + tail++;
    + }
    + wc->tail = tail;

    spin_unlock_irqrestore(&cq->lock, flags);

    @@ -322,10 +329,16 @@ int ipath_req_notify_cq(struct ib_cq *ib
    return 0;
    }

    +/**
    + * ipath_resize_cq - change the size of the CQ
    + * @ibcq: the completion queue
    + *
    + * Returns 0 for success.
    + */
    int ipath_resize_cq(struct ib_cq *ibcq, int cqe, struct ib_udata *udata)
    {
    struct ipath_cq *cq = to_icq(ibcq);
    - struct ipath_cq_wc *old_wc = cq->queue;
    + struct ipath_cq_wc *old_wc;
    struct ipath_cq_wc *wc;
    u32 head, tail, n;
    int ret;
    @@ -361,6 +374,7 @@ int ipath_resize_cq(struct ib_cq *ibcq,
    * Make sure head and tail are sane since they
    * might be user writable.
    */
    + old_wc = cq->queue;
    head = old_wc->head;
    if (head > (u32) cq->ibcq.cqe)
    head = (u32) cq->ibcq.cqe;
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-09-28 18:11    [W:3.215 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site