From patchwork Wed Feb 14 15:58:12 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: 873396 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 3zhPG707mBz9t3H; Thu, 15 Feb 2018 02:58:39 +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 1elzS4-0001QF-Rx; Wed, 14 Feb 2018 15:58:32 +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 1elzS2-0001OX-1J for kernel-team@lists.ubuntu.com; Wed, 14 Feb 2018 15:58:30 +0000 Received: from mail-qk0-f198.google.com ([209.85.220.198]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1elzS1-00082E-NI for kernel-team@lists.ubuntu.com; Wed, 14 Feb 2018 15:58:29 +0000 Received: by mail-qk0-f198.google.com with SMTP id j206so13647384qke.15 for ; Wed, 14 Feb 2018 07:58:29 -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=Qd7akSqTsmJJzqv3vxAvRZWq5DboJ63WVNz/K6c1td4=; b=swfuEx8BqWUy+G+4qc7uFmP8E6K0XxPlJsWoFYwYW01TrfQNrwgE/DlLRSU1PgihVf nRYNMRSDBIfn9rBuoo6TnuFt2kYbVZg7m8jlpw+cfxkUlyEOTRb4OYCenWHA6O8Hwha1 jwnbKp7T1IPNb3oH5Meegm/62wNBDWHWhbsLNNffdreROIBSTXX7ut9owAH2yN+diN2p BIjPAC/wyNcciNaqkKmbB4v/KTpFSyPSA3+sY6Pp6nJvk3vQWW2MtmJFcacNC/8hz6j+ 25kZ/DiTD05VAs+WnElLKN0DGzKPvpsUq130ISRPqp6x4JHufUsXhsBog82sTB61UCr+ sVjA== X-Gm-Message-State: APf1xPDjByxS0DhBir8Ll/DRHUIM9/c0qZzTHw3iAj38/CZSCC258c7m 5FPR5l9KwKmlUGO9lhDdvI01vL63w+YTgQ4YiIyuXx+sjCV/x5vDJw8hP1Wvbc8t6qTftJwFzjQ /EVfi1BYOKWWskeRdmC7e5OmbGPY8rEdCbkMmr7Il X-Received: by 10.55.49.74 with SMTP id x71mr8553923qkx.133.1518623908481; Wed, 14 Feb 2018 07:58:28 -0800 (PST) X-Google-Smtp-Source: AH8x227rR+FL4kubVKEA05MQaqQuuBsL04S7CmLFb7coCyXF8IOXaOVCebts2wdXt74ThMqvlpyNWw== X-Received: by 10.55.49.74 with SMTP id x71mr8553901qkx.133.1518623908262; Wed, 14 Feb 2018 07:58:28 -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.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Feb 2018 07:58:27 -0800 (PST) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [azure:x/azure-edge:x][PATCH 1/6] UBUNTU: SAUCE: vmbus-rdma: ND142: don't wait forever for disconnection from remote connector Date: Wed, 14 Feb 2018 13:58:12 -0200 Message-Id: <1518623897-18991-2-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-142.0/provider.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/vmbus-rdma/vmbus-rdma-142.0/provider.c b/drivers/infiniband/hw/vmbus-rdma/vmbus-rdma-142.0/provider.c index 58de2d439f29..f9179722156e 100644 --- a/drivers/infiniband/hw/vmbus-rdma/vmbus-rdma-142.0/provider.c +++ b/drivers/infiniband/hw/vmbus-rdma/vmbus-rdma-142.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);