From patchwork Fri Dec 14 16:05:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Wise X-Patchwork-Id: 10731825 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 D13EC924 for ; Fri, 14 Dec 2018 23:37:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75EE52AD56 for ; Fri, 14 Dec 2018 23:37:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A48F2D562; Fri, 14 Dec 2018 23:37:40 +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=-6.4 required=2.0 tests=BAYES_00,DATE_IN_PAST_06_12, 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 0F29E2AD56 for ; Fri, 14 Dec 2018 23:37:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728244AbeLNXhj (ORCPT ); Fri, 14 Dec 2018 18:37:39 -0500 Received: from opengridcomputing.com ([72.48.214.68]:47368 "EHLO smtp.opengridcomputing.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726423AbeLNXhj (ORCPT ); Fri, 14 Dec 2018 18:37:39 -0500 Received: by smtp.opengridcomputing.com (Postfix, from userid 503) id 3193B227A9; Fri, 14 Dec 2018 17:37:39 -0600 (CST) Message-Id: <69f5176272c93b5168b8df6ae71a5e285d124a86.1544826079.git.swise@opengridcomputing.com> In-Reply-To: References: From: Steve Wise Date: Fri, 14 Dec 2018 08:05:51 -0800 Subject: [PATCH v7 3/5] rdma_rxe: schedule ib_unregister_device_and_put() To: dledford@redhat.com, jgg@mellanox.com Cc: linux-rdma@vger.kernel.org, BMT@zurich.ibm.com, leon@kernel.org, markb@mellanox.com, yanjun.zhu@oracle.com 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 Schedule ib_unregister_device_and_put() to run in a workqueue context to avoid a deadlock when processing NETDEV_UNREGISTER events. Signed-off-by: Steve Wise --- drivers/infiniband/sw/rxe/rxe.c | 1 + drivers/infiniband/sw/rxe/rxe_net.c | 10 +++++++++- drivers/infiniband/sw/rxe/rxe_net.h | 1 + drivers/infiniband/sw/rxe/rxe_verbs.h | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c index 4069463f9a66..91ad339fd6e1 100644 --- a/drivers/infiniband/sw/rxe/rxe.c +++ b/drivers/infiniband/sw/rxe/rxe.c @@ -272,6 +272,7 @@ static int rxe_init(struct rxe_dev *rxe) spin_lock_init(&rxe->mmap_offset_lock); spin_lock_init(&rxe->pending_lock); INIT_LIST_HEAD(&rxe->pending_mmaps); + INIT_WORK(&rxe->netdev_unregister_work, rxe_netdev_unregister_work); mutex_init(&rxe->usdev_lock); diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c index 6a25b514d448..c05549d09268 100644 --- a/drivers/infiniband/sw/rxe/rxe_net.c +++ b/drivers/infiniband/sw/rxe/rxe_net.c @@ -585,6 +585,14 @@ void rxe_set_port_state(struct net_device *ndev, struct rxe_dev *rxe) rxe_port_down(rxe); } +void rxe_netdev_unregister_work(struct work_struct *work) +{ + struct rxe_dev *rxe; + + rxe = container_of(work, struct rxe_dev, netdev_unregister_work); + ib_unregister_device_and_put(&rxe->ib_dev); +} + static int rxe_notify(struct notifier_block *not_blk, unsigned long event, void *arg) @@ -597,7 +605,7 @@ static int rxe_notify(struct notifier_block *not_blk, switch (event) { case NETDEV_UNREGISTER: - ib_unregister_device_and_put(&rxe->ib_dev); + schedule_work(&rxe->netdev_unregister_work); return NOTIFY_OK; case NETDEV_UP: diff --git a/drivers/infiniband/sw/rxe/rxe_net.h b/drivers/infiniband/sw/rxe/rxe_net.h index 106c586dbb26..685aa98baf55 100644 --- a/drivers/infiniband/sw/rxe/rxe_net.h +++ b/drivers/infiniband/sw/rxe/rxe_net.h @@ -47,5 +47,6 @@ struct rxe_recv_sockets { int rxe_net_init(void); void rxe_net_exit(void); +void rxe_netdev_unregister_work(struct work_struct *work); #endif /* RXE_NET_H */ diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.h b/drivers/infiniband/sw/rxe/rxe_verbs.h index a0b635812784..ce63cbf0d738 100644 --- a/drivers/infiniband/sw/rxe/rxe_verbs.h +++ b/drivers/infiniband/sw/rxe/rxe_verbs.h @@ -412,6 +412,7 @@ struct rxe_dev { struct rxe_port port; struct crypto_shash *tfm; + struct work_struct netdev_unregister_work; }; static inline void rxe_counter_inc(struct rxe_dev *rxe, enum rxe_counters cnt)