From patchwork Tue Mar 23 19:13:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Cohen X-Patchwork-Id: 87748 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2NJCkqs000498 for ; Tue, 23 Mar 2010 19:12:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751533Ab0CWTMp (ORCPT ); Tue, 23 Mar 2010 15:12:45 -0400 Received: from mail.mellanox.co.il ([194.90.237.43]:34280 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751492Ab0CWTMp (ORCPT ); Tue, 23 Mar 2010 15:12:45 -0400 Received: from Internal Mail-Server by MTLPINE1 (envelope-from eli@mellanox.co.il) with SMTP; 23 Mar 2010 21:12:41 +0200 Received: from localhost ([10.4.1.30]) by mtlexch01.mtl.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 23 Mar 2010 21:12:40 +0200 Date: Tue, 23 Mar 2010 21:13:17 +0200 From: Eli Cohen To: Roland Dreier Cc: Linux RDMA list Subject: [PATCH] IB core: Fix locking on device numbers allocation Message-ID: <20100323191317.GA14496@mtldesk030.lab.mtl.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-OriginalArrivalTime: 23 Mar 2010 19:12:40.0843 (UTC) FILETIME=[CEF6E5B0:01CACABC] X-TM-AS-Product-Ver: SMEX-8.0.0.1181-6.000.1038-17272.001 X-TM-AS-Result: No--10.614100-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 23 Mar 2010 19:12:49 +0000 (UTC) diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c index d805cf3..9589c71 100644 --- a/drivers/infiniband/core/uverbs_main.c +++ b/drivers/infiniband/core/uverbs_main.c @@ -72,7 +72,7 @@ DEFINE_IDR(ib_uverbs_cq_idr); DEFINE_IDR(ib_uverbs_qp_idr); DEFINE_IDR(ib_uverbs_srq_idr); -static DEFINE_SPINLOCK(map_lock); +static DEFINE_MUTEX(map_lock); static DECLARE_BITMAP(dev_map, IB_UVERBS_MAX_DEVICES); static ssize_t (*uverbs_cmd_table[])(struct ib_uverbs_file *file, @@ -738,15 +738,15 @@ static void ib_uverbs_add_one(struct ib_device *device) kref_init(&uverbs_dev->ref); init_completion(&uverbs_dev->comp); - spin_lock(&map_lock); + mutex_lock(&map_lock); devnum = find_first_zero_bit(dev_map, IB_UVERBS_MAX_DEVICES); if (devnum >= IB_UVERBS_MAX_DEVICES) { - spin_unlock(&map_lock); devnum = find_overflow_devnum(); - if (devnum < 0) + if (devnum < 0) { + mutex_unlock(&map_lock); goto err; + } - spin_lock(&map_lock); uverbs_dev->devnum = devnum + IB_UVERBS_MAX_DEVICES; base = devnum + overflow_maj; set_bit(devnum, overflow_map); @@ -755,7 +755,7 @@ static void ib_uverbs_add_one(struct ib_device *device) base = devnum + IB_UVERBS_BASE_DEV; set_bit(devnum, dev_map); } - spin_unlock(&map_lock); + mutex_unlock(&map_lock); uverbs_dev->ib_dev = device; uverbs_dev->num_comp_vectors = device->num_comp_vectors;