From patchwork Thu Feb 7 05:41:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 10800389 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 E6272922 for ; Thu, 7 Feb 2019 05:42:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D653A2CBD8 for ; Thu, 7 Feb 2019 05:42:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB1752CBF6; 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 713B32CBD8 for ; Thu, 7 Feb 2019 05:42:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726549AbfBGFmC (ORCPT ); Thu, 7 Feb 2019 00:42:02 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:42201 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726666AbfBGFmB (ORCPT ); Thu, 7 Feb 2019 00:42:01 -0500 Received: by mail-pf1-f196.google.com with SMTP id m6so850997pfa.9 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=NjKBCNcA7YJyWZCtFD3QA/1cCY64AQZMq8LNnDA1zls=; b=OMDcDJnDZhAeWoB7bloljNVZz4uyj6elK5wWvAgaDg3Uc7hVmVouU4cgnbTHV/3J7z 047v63dVkQUv32ydyUIxq3o8FMVp8CfY/vvei9PJHzROPi7EB5PEUKP1MCQN2PFOSMyo BfGDeJZkuxkZwwIbEEitT5mljzCrY2pnHQmX7e2IqYs6EWi4JHHzPOVe/Cw6EknbL6zY MCTzYF4ppC226dpqnkzFwfkmChSr82HZsfyWExhHt6ZUG+BRNVvctEhufLbPO82iq66b ctJYeLu2IcXTXupfWpt/c4u5bzXIkg0SDZVvFwrQDiib+NPkkzQu9e3Q5aGvaX2idNDW oSCg== 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=NjKBCNcA7YJyWZCtFD3QA/1cCY64AQZMq8LNnDA1zls=; b=iECK5ws1jx+BiKXc2wej6tX0FT81yC32IHZuEDZBGwOwayMg4vrCR/Ra6C5PzrnAaJ rBd/nCdcNaqDsrfVUP8uaXi3NUwcW8iI3aL3aERwOiZlsBliiFEH2eEl7Fsb1pqqBV5q wH1Yk3LE/SEDWFoI1odZuiD3kN+Mw/Es9qdyMH2egI3SrNbJbdO8s0LP1YrV6l26/pBO 7x/b/Uw5Dr8xzphlyRRtboQ3SdG3lHzeagmJa/IYcoRvUtQiYhO+kBZALpwXdyxUqknG 1OYAmda5ThfQ90a0LbPyUaoFdHJLnImLKbIVpOnQgPBrrQtpwjQNR46Ci/ZlpAMcIkne OPEw== X-Gm-Message-State: AHQUAubJBXjZBe8PSqXdBigvGi5J4Phs+A0mZgUeGIqRrTCLp2ajhqlu pRGOYMwQoVhgY3ByLMfaEbrS83sf3OY= X-Google-Smtp-Source: AHgI3IZwFEqYshJEgr3rlBW5J+qmTbuwy8sWtxql8/k6AcYrpZzxGUq12kqEEPF9AKaEjMdIWp2ZAA== X-Received: by 2002:a63:cf4b:: with SMTP id b11mr13431068pgj.405.1549518120788; Wed, 06 Feb 2019 21:42:00 -0800 (PST) Received: from ziepe.ca (S010614cc2056d97f.ed.shawcable.net. [174.3.196.123]) by smtp.gmail.com with ESMTPSA id l82sm22014128pfg.127.2019.02.06.21.41.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Feb 2019 21:41:58 -0800 (PST) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1grcRi-0006Db-3K; Wed, 06 Feb 2019 22:41:58 -0700 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe , Parav Pandit Subject: [PATCH v2 4/8] RDMA/device: Get rid of reg_state Date: Wed, 6 Feb 2019 22:41:50 -0700 Message-Id: <20190207054154.23806-5-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 This really has no purpose anymore, refcount can be used to tell if the device is still registered. Keeping it around just invites mis-use. Signed-off-by: Jason Gunthorpe Reviewed-by: Parav Pandit --- drivers/infiniband/core/device.c | 8 ++------ include/rdma/ib_verbs.h | 6 ------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c index 803df192b7750e..905d7b3780beca 100644 --- a/drivers/infiniband/core/device.c +++ b/drivers/infiniband/core/device.c @@ -243,7 +243,7 @@ static void ib_device_release(struct device *device) { struct ib_device *dev = container_of(device, struct ib_device, dev); - WARN_ON(dev->reg_state == IB_DEV_REGISTERED); + WARN_ON(refcount_read(&dev->refcount)); ib_cache_release_one(dev); ib_security_release_port_pkey_list(dev); kfree(dev->port_pkey_list); @@ -316,8 +316,7 @@ EXPORT_SYMBOL(_ib_alloc_device); void ib_dealloc_device(struct ib_device *device) { WARN_ON(!list_empty(&device->client_data_list)); - WARN_ON(device->reg_state != IB_DEV_UNREGISTERED && - device->reg_state != IB_DEV_UNINITIALIZED); + WARN_ON(refcount_read(&device->refcount)); rdma_restrack_clean(device); put_device(&device->dev); } @@ -601,7 +600,6 @@ int ib_register_device(struct ib_device *device, const char *name) } refcount_set(&device->refcount, 1); - device->reg_state = IB_DEV_REGISTERED; list_for_each_entry(client, &client_list, list) if (!add_client_context(device, client) && client->add) @@ -672,8 +670,6 @@ void ib_unregister_device(struct ib_device *device) } write_unlock_irqrestore(&device->client_data_lock, flags); up_write(&lists_rwsem); - - device->reg_state = IB_DEV_UNREGISTERED; } EXPORT_SYMBOL(ib_unregister_device); diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 2e1f1e885ee502..76138ef4f839ea 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -2558,12 +2558,6 @@ struct ib_device { struct kobject *ports_kobj; struct list_head port_list; - enum { - IB_DEV_UNINITIALIZED, - IB_DEV_REGISTERED, - IB_DEV_UNREGISTERED - } reg_state; - int uverbs_abi_ver; u64 uverbs_cmd_mask; u64 uverbs_ex_cmd_mask;