Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp2754471imm; Thu, 24 May 2018 15:33:21 -0700 (PDT) X-Google-Smtp-Source: AB8JxZouXGss2Wz1NuNPR/e8zS45pKOLtU7imFdoSmtQaGDP0O4DD30RPpJR2WMqIzlu/vESgTVk X-Received: by 2002:a17:902:9349:: with SMTP id g9-v6mr8969201plp.375.1527201201626; Thu, 24 May 2018 15:33:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527201201; cv=none; d=google.com; s=arc-20160816; b=eURUyTNqn1AXEfHsVAPjA4MZex4mO2szWvCDZ8QDk3lD8shUgAU3jAEj84QPGubSfj 2mWb9ezrJ6Pr946A3K4XiJjV4b/2BT5bUm7PgXixr9PvOO9Q5pFKo5yn7eqo2Z6tG8hi 3ArlFoXQD/feR9Bmt3/gLITLyF0F/URnzAe+0AwkqXfwqZFGM2WL0hAzC5qdiNWHJYMU BSLlHKdIaW0K5Ud16xlzN32pvd/5SgkgtXO5ZaVhf/C5w4P82AiY2GlIKV/F5zRuwByB vk6oB56niVWYs34iUbI8wE4CTp5VoC6d2+RJqoE9c1CFAZRdevBQCYbjLf1GuIQ6kwLa 3byQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:arc-authentication-results; bh=lQOnTrKm9rrv8A+/TBf/2FZBjtQyMUaAX+EwL7xVB8o=; b=PfidQfofsEjm4JiAUe5HAcmvsfVrEHsDCCNKKEbd2xeBI6o4EZfTJDBOupuOQZGA4A TKg4ySgrnFTm8BJpepmhBcsPzB/PN3s4X5mtlCQrMbidc1+k49ojGe6DJF/qJKz23tCO GmIcf6HW/VhRM4bh6piz2N4kePXvsMND3NDRLjvP8gs8xK2aZHgMjdWx9Odt1JGQzjic YpGWrhRNMMARUMdB7NW6sCzIp+H2lmssfy2NJM719kIltpNOEMiMGscz4w5RwKmcsDa7 ZqGIIM1Ncy5BwyiMpdfEGkR5aC8nn6zWG8d8Zhq+mQXZeodk1Hp3s6GAkkDT0GER9qr7 pfyQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x3-v6si21375030plo.62.2018.05.24.15.33.06; Thu, 24 May 2018 15:33:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935730AbeEXMlL (ORCPT + 99 others); Thu, 24 May 2018 08:41:11 -0400 Received: from foss.arm.com ([217.140.101.70]:43786 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935296AbeEXMlH (ORCPT ); Thu, 24 May 2018 08:41:07 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 303AF1596; Thu, 24 May 2018 05:41:07 -0700 (PDT) Received: from e107981-ln.cambridge.arm.com (e107981-ln.cambridge.arm.com [10.1.207.54]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D8A143F25D; Thu, 24 May 2018 05:41:04 -0700 (PDT) Date: Thu, 24 May 2018 13:41:01 +0100 From: Lorenzo Pieralisi To: Dexuan Cui Cc: 'Bjorn Helgaas' , "'linux-pci@vger.kernel.org'" , KY Srinivasan , Stephen Hemminger , "'olaf@aepfle.de'" , "'apw@canonical.com'" , "'jasowang@redhat.com'" , "'linux-kernel@vger.kernel.org'" , "'driverdev-devel@linuxdriverproject.org'" , Haiyang Zhang , "'vkuznets@redhat.com'" , "'marcelo.cerri@canonical.com'" Subject: Re: [PATCH] PCI: hv: Do not wait forever on a device that has disappeared Message-ID: <20180524124101.GB20732@e107981-ln.cambridge.arm.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, May 23, 2018 at 09:12:01PM +0000, Dexuan Cui wrote: > > Before the guest finishes the device initialization, the device can be > removed anytime by the host, and after that the host won't respond to > the guest's request, so the guest should be prepared to handle this > case. > > Signed-off-by: Dexuan Cui > Cc: Stephen Hemminger > Cc: K. Y. Srinivasan > --- > drivers/pci/host/pci-hyperv.c | 46 ++++++++++++++++++++++++++++++++----------- > 1 file changed, 34 insertions(+), 12 deletions(-) > > diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c > index ad6a64d..248765f 100644 > --- a/drivers/pci/host/pci-hyperv.c > +++ b/drivers/pci/host/pci-hyperv.c > @@ -556,6 +556,26 @@ static void put_pcichild(struct hv_pci_dev *hv_pcidev, > static void get_hvpcibus(struct hv_pcibus_device *hv_pcibus); > static void put_hvpcibus(struct hv_pcibus_device *hv_pcibus); > > +/* > + * There is no good way to get notified from vmbus_onoffer_rescind(), > + * so let's use polling here, since this is not a hot path. > + */ > +static int wait_for_response(struct hv_device *hdev, > + struct completion *comp) > +{ > + while (true) { > + if (hdev->channel->rescind) { > + dev_warn_once(&hdev->device, "The device is gone.\n"); > + return -ENODEV; > + } > + > + if (wait_for_completion_timeout(comp, HZ / 10)) > + break; > + } > + > + return 0; This is pretty racy, isn't it ? Also, I reckon you should consider the timeout return value as an error condition unless I am completely missing the point of what you are doing. Lorenzo > +} > + > /** > * devfn_to_wslot() - Convert from Linux PCI slot to Windows > * @devfn: The Linux representation of PCI slot > @@ -1569,7 +1589,8 @@ static struct hv_pci_dev *new_pcichild_device(struct hv_pcibus_device *hbus, > if (ret) > goto error; > > - wait_for_completion(&comp_pkt.host_event); > + if (wait_for_response(hbus->hdev, &comp_pkt.host_event)) > + goto error; > > hpdev->desc = *desc; > refcount_set(&hpdev->refs, 1); > @@ -2070,15 +2091,16 @@ static int hv_pci_protocol_negotiation(struct hv_device *hdev) > sizeof(struct pci_version_request), > (unsigned long)pkt, VM_PKT_DATA_INBAND, > VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); > + if (!ret) > + ret = wait_for_response(hdev, &comp_pkt.host_event); > + > if (ret) { > dev_err(&hdev->device, > - "PCI Pass-through VSP failed sending version reqquest: %#x", > + "PCI Pass-through VSP failed to request version: %d", > ret); > goto exit; > } > > - wait_for_completion(&comp_pkt.host_event); > - > if (comp_pkt.completion_status >= 0) { > pci_protocol_version = pci_protocol_versions[i]; > dev_info(&hdev->device, > @@ -2287,11 +2309,12 @@ static int hv_pci_enter_d0(struct hv_device *hdev) > ret = vmbus_sendpacket(hdev->channel, d0_entry, sizeof(*d0_entry), > (unsigned long)pkt, VM_PKT_DATA_INBAND, > VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); > + if (!ret) > + ret = wait_for_response(hdev, &comp_pkt.host_event); > + > if (ret) > goto exit; > > - wait_for_completion(&comp_pkt.host_event); > - > if (comp_pkt.completion_status < 0) { > dev_err(&hdev->device, > "PCI Pass-through VSP failed D0 Entry with status %x\n", > @@ -2331,11 +2354,10 @@ static int hv_pci_query_relations(struct hv_device *hdev) > > ret = vmbus_sendpacket(hdev->channel, &message, sizeof(message), > 0, VM_PKT_DATA_INBAND, 0); > - if (ret) > - return ret; > + if (!ret) > + ret = wait_for_response(hdev, &comp); > > - wait_for_completion(&comp); > - return 0; > + return ret; > } > > /** > @@ -2405,11 +2427,11 @@ static int hv_send_resources_allocated(struct hv_device *hdev) > size_res, (unsigned long)pkt, > VM_PKT_DATA_INBAND, > VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); > + if (!ret) > + ret = wait_for_response(hdev, &comp_pkt.host_event); > if (ret) > break; > > - wait_for_completion(&comp_pkt.host_event); > - > if (comp_pkt.completion_status < 0) { > ret = -EPROTO; > dev_err(&hdev->device, > -- > 2.7.4 >