From patchwork Thu Feb 7 05:41:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 10800391 X-Patchwork-Delegate: jgg@ziepe.ca Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 15DAD13B4 for ; Thu, 7 Feb 2019 05:42:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 05E302CBD8 for ; Thu, 7 Feb 2019 05:42:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE8C92CBF1; Thu, 7 Feb 2019 05:42:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 922512CBDD for ; Thu, 7 Feb 2019 05:42:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726666AbfBGFmC (ORCPT ); Thu, 7 Feb 2019 00:42:02 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:44400 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726715AbfBGFmC (ORCPT ); Thu, 7 Feb 2019 00:42:02 -0500 Received: by mail-pf1-f196.google.com with SMTP id u6so4275981pfh.11 for ; Wed, 06 Feb 2019 21:42:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YVocA36PkEdry6rLhEdM8Qa+GHo5bScrJiHASI19axc=; b=LYgbEUNEhj3Xx/ElCLI/cB1RKT518O8HvhhewfTR07C/Xy3d4CZigCw2s5u6b/JpQq kAI0xNN9ijLfGErD5UpQ9shaQY9aj+vPlQY5vSuassWGkJvdjd9byIfCyk90ivSlyAWA oZnJXpmFv/OL6LqX7G43umqWUAQsEeI8ziATEqOGaHZ0C88jo1mk5A7Sy/Tp3ROxV+JX gFvYSmLF5s6cZjPUlsNjHEm5lc0Mh9DZGbJZcN6Ry0SjLtQHibCv+IAI1/EhmSCKVVkV qcE6/9zAcQuzPdnOoH0wH62jO0NU1nIZMvdQC0G9UY/bNmEfQfFv9G+5V3QynAfKwEXu H86g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YVocA36PkEdry6rLhEdM8Qa+GHo5bScrJiHASI19axc=; b=ss+spGEb4obzjGI9d4NI3DO8gstjrn08/yQydVKEZsoF4nHvHiHUwGs9MdN5l4gf38 vapvs0b+2q7GiIfq3neiUg9oituAomzXS4IXr6irIKLuBbGZ0wbidAQf1VuNDJqIrYSS hGhr7PAtabsJ/G9V8JkZ3DNbmPQt3J4UZUvYS18k4Lt3+LvMgaQ5w30LTnRb4Z8Ef7+X OOqvbPnz5gwAQx9QKhra9kDqBWafcGrk/X/NoS9E23PIP5Q0lcErUiQ81p1CzhgZjaIp OY9Lu4vmwZyAb/sB+FyrQ8tHUiJA5zhT7rDPD5QCZVkR7l6Vd12btutdey+GYKlx8qvz fGzw== X-Gm-Message-State: AHQUAubpEM5mOpc+RX8xsL7fFUXBjLE8cKsBx3VWk7JyMp0bnYe0h0QR kk9AGwv947Hkdgussc8lYow26/gomzs= X-Google-Smtp-Source: AHgI3IaRiSlb/Us9fzrqeF4Gs/dMw1i+qBt0aUb1rS+33SrNUjyFESHokgeayFkpYTfJh16HTVv4gw== X-Received: by 2002:a62:6f49:: with SMTP id k70mr14342421pfc.7.1549518121332; Wed, 06 Feb 2019 21:42:01 -0800 (PST) Received: from ziepe.ca (S010614cc2056d97f.ed.shawcable.net. [174.3.196.123]) by smtp.gmail.com with ESMTPSA id t24sm10385660pfh.21.2019.02.06.21.41.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Feb 2019 21:41:59 -0800 (PST) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1grcRi-0006Dh-5t; Wed, 06 Feb 2019 22:41:58 -0700 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH v2 5/8] RDMA/device: Use an ida instead of a free page in alloc_name Date: Wed, 6 Feb 2019 22:41:51 -0700 Message-Id: <20190207054154.23806-6-jgg@ziepe.ca> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190207054154.23806-1-jgg@ziepe.ca> References: <20190207054154.23806-1-jgg@ziepe.ca> MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jason Gunthorpe ida is the proper data structure to hold list of clustered small integers and then allocate an unused integer. Get rid of the convoluted and limited open-coded bitmap. Signed-off-by: Jason Gunthorpe --- drivers/infiniband/core/device.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c index 905d7b3780beca..c16bff8cfba548 100644 --- a/drivers/infiniband/core/device.c +++ b/drivers/infiniband/core/device.c @@ -213,30 +213,36 @@ int ib_device_rename(struct ib_device *ibdev, const char *name) static int alloc_name(struct ib_device *ibdev, const char *name) { - unsigned long *inuse; struct ib_device *device; + struct ida inuse; + int rc; int i; - inuse = (unsigned long *) get_zeroed_page(GFP_KERNEL); - if (!inuse) - return -ENOMEM; - + ida_init(&inuse); list_for_each_entry(device, &device_list, core_list) { char buf[IB_DEVICE_NAME_MAX]; if (sscanf(dev_name(&device->dev), name, &i) != 1) continue; - if (i < 0 || i >= PAGE_SIZE * 8) + if (i < 0 || i >= INT_MAX) continue; snprintf(buf, sizeof buf, name, i); - if (!strcmp(buf, dev_name(&device->dev))) - set_bit(i, inuse); + if (strcmp(buf, dev_name(&device->dev)) != 0) + continue; + + rc = ida_alloc_range(&inuse, i, i, GFP_KERNEL); + if (rc < 0) + goto out; } - i = find_first_zero_bit(inuse, PAGE_SIZE * 8); - free_page((unsigned long) inuse); + rc = ida_alloc(&inuse, GFP_KERNEL); + if (rc < 0) + goto out; - return dev_set_name(&ibdev->dev, name, i); + rc = dev_set_name(&ibdev->dev, name, rc); +out: + ida_destroy(&inuse); + return rc; } static void ib_device_release(struct device *device)