From patchwork Wed Feb 14 15:58:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 873399 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3zhPGC2Md9z9t3C; Thu, 15 Feb 2018 02:58:43 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1elzSB-0001V6-Jy; Wed, 14 Feb 2018 15:58:39 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1elzS8-0001SP-NA for kernel-team@lists.ubuntu.com; Wed, 14 Feb 2018 15:58:36 +0000 Received: from mail-qk0-f197.google.com ([209.85.220.197]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1elzS8-00082e-CW for kernel-team@lists.ubuntu.com; Wed, 14 Feb 2018 15:58:36 +0000 Received: by mail-qk0-f197.google.com with SMTP id v21so3442833qka.6 for ; Wed, 14 Feb 2018 07:58:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=muKVToBGi09qFj5tUbQ+EqOvz7Qkq/FwAiJHiGkdq3E=; b=ITeewv+2T98NA/DJNeIRxZ5dsE0VGcHG+cJ3BWWqHhpXeExDtzPkni1xpMqakAU+x7 +9A7dfatJr2udwnO7DRT1TfVi3mUoFzPypB0O/7/DEsAzD4xzbCEtUITdbhMQFIR9u0k tIKLxlQ71O3GGo3lQCBBZh7pYZ1gMES7kdaY3WwxdkcbhVjeYbw1hjof9jRkbMeRdW1a VZnDrlZcchzlaU++J2zTqi9nxZyYnuSkhSUmLqPWFQjsZnO1XVTf6wwMwUcHZQMxOmoy KbL91SqxnqCuNwgTKU7esn6OqDUu/5d+bSrJmULToMlgLHmvvehJUi3Oh7Damc6WZeRv +BIg== X-Gm-Message-State: APf1xPA5mMo6+C/8UD6Vo2MnfbEZ05nwldUnmEMO+ZmFnMLTL21cDT8o WiQmGyPIry/eSEwBUUKlhQ6WtP5iNfaOjNOtlmaX2eoLGn8kqbTqD7ck42I81ox7uI8adXdC//C YVdj30to+Lkq6Y1aZdCXuNvXjvNuV2r2/cl+Zs6gB X-Received: by 10.200.42.168 with SMTP id b37mr8458942qta.321.1518623915179; Wed, 14 Feb 2018 07:58:35 -0800 (PST) X-Google-Smtp-Source: AH8x224PoWo3VPvxPkIJssAjxy7GR+IR2yDj3Kid8ZEOXvmKQx7yw384b/29eiG+rv3IWO7LmOQNPg== X-Received: by 10.200.42.168 with SMTP id b37mr8458918qta.321.1518623914965; Wed, 14 Feb 2018 07:58:34 -0800 (PST) Received: from localhost.localdomain (189-19-106-18.dsl.telesp.net.br. [189.19.106.18]) by smtp.gmail.com with ESMTPSA id l78sm9312245qke.6.2018.02.14.07.58.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Feb 2018 07:58:33 -0800 (PST) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [azure:x/azure-edge:x][PATCH 4/6] UBUNTU: SAUCE: vmbus-rdma: ND144: don't wait forever for disconnection from remote connector Date: Wed, 14 Feb 2018 13:58:15 -0200 Message-Id: <1518623897-18991-5-git-send-email-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518623897-18991-1-git-send-email-marcelo.cerri@canonical.com> References: <1518623897-18991-1-git-send-email-marcelo.cerri@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Long Li BugLink: http://bugs.launchpad.net/bugs/1749332 Signed-off-by: Long Li Signed-off-by: Marcelo Henrique Cerri --- drivers/infiniband/hw/vmbus-rdma/vmbus-rdma-144.0/provider.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/vmbus-rdma/vmbus-rdma-144.0/provider.c b/drivers/infiniband/hw/vmbus-rdma/vmbus-rdma-144.0/provider.c index 58de2d439f29..f9179722156e 100644 --- a/drivers/infiniband/hw/vmbus-rdma/vmbus-rdma-144.0/provider.c +++ b/drivers/infiniband/hw/vmbus-rdma/vmbus-rdma-144.0/provider.c @@ -1012,7 +1012,10 @@ static int hvnd_destroy_qp(struct ib_qp *ib_qp) * Now wait for the disconnect. */ jiffies = get_jiffies_64(); - wait_for_completion(&qp->connector->disconnect_event); + if (!wait_for_completion_timeout(&qp->connector->disconnect_event, + 30*HZ)) + hvnd_warn("connector disconnect timed out\n"); + hvnd_debug("Completed disconnect connector=%p jiffies=%llu\n", qp->connector, get_jiffies_64() - jiffies);