From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED970C0650E for ; Mon, 1 Jul 2019 09:25:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 837072089C for ; Mon, 1 Jul 2019 09:25:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 837072089C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hhsYt-0007Xp-H1 for qemu-devel@archiver.kernel.org; Mon, 01 Jul 2019 05:25:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47955) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hhsXM-00072E-QE for qemu-devel@nongnu.org; Mon, 01 Jul 2019 05:23:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hhsXL-0001lw-D9 for qemu-devel@nongnu.org; Mon, 01 Jul 2019 05:23:48 -0400 Received: from mail-qk1-f194.google.com ([209.85.222.194]:40626) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hhsXL-0001lX-8k for qemu-devel@nongnu.org; Mon, 01 Jul 2019 05:23:47 -0400 Received: by mail-qk1-f194.google.com with SMTP id c70so10401672qkg.7 for ; Mon, 01 Jul 2019 02:23:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=H8GScMll2LcoeW0HdUXAfCh8RyE+83qzpc4KDNU+PvI=; b=fzacq8Vc2t1KTwOhuLxYu0cvn126Nm2ZiNmBBiDZjuLIV7cl9R3KB7SyfOeyh0qmvW h8SMM79rr2JMFQVo7P9ShdGx43CttMopHbE9x6ZCu57p7qytIrq9zU8KXGd3JXDpY3yO Q+DdASDOBa9EJeWKnPSTOtri2I7XJ+LWb0hBEdsjn9/WCXQPD7sDSKHBrgdFm6puWtuu OxfR49uFV1UVpYshSdOrm81mX5dHs46hS4cdXTWsKg3j6V5eoCavZ1sC/x1WBcFvwF1u 2Akg8idPlr9WjDiKJVBroZ5uWlNZuOAn6OcNA3AKOGspLGsK7QwY9DfyJ6IAtIyZonPy Or+A== X-Gm-Message-State: APjAAAWK0Lr3llzeHt7uvLCBnPdJxVXqvuuMiKX/9y4J5wUYR+i1jToZ fVNC+a6eiQLaFw+sQGcy3k9KMXZQtueFtg== X-Google-Smtp-Source: APXvYqzjQq6/WZmxfElzFsvgi1ANiQSHanX1gOIp/8CAyFXpwBIgQiuUwaTaZQAvHvurKgdGorrVPA== X-Received: by 2002:a37:6152:: with SMTP id v79mr18426893qkb.488.1561973026739; Mon, 01 Jul 2019 02:23:46 -0700 (PDT) Received: from redhat.com ([37.26.146.159]) by smtp.gmail.com with ESMTPSA id h40sm5299840qth.4.2019.07.01.02.23.44 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 01 Jul 2019 02:23:45 -0700 (PDT) Date: Mon, 1 Jul 2019 05:23:37 -0400 From: "Michael S. Tsirkin" To: Igor Mammedov Message-ID: <20190701052237-mutt-send-email-mst@kernel.org> References: <20190621064615.20099-1-mst@redhat.com> <20190621064615.20099-3-mst@redhat.com> <20190625144511.239e112a@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190625144511.239e112a@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.222.194 Subject: Re: [Qemu-devel] [PATCH 2/3] pcie: check that slt ctrl changed before deleting X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, Jun 25, 2019 at 02:45:11PM +0200, Igor Mammedov wrote: > On Fri, 21 Jun 2019 02:46:48 -0400 > "Michael S. Tsirkin" wrote: > > > During boot, linux would sometimes overwrites control of a powered off > > slot before powering it on. Unfortunately QEMU interprets that as a > > power off request and ejects the device. > > > > For example: > > > > /x86_64-softmmu/qemu-system-x86_64 -enable-kvm -S -machine q35 \ > > -device pcie-root-port,id=pcie_root_port_0,slot=2,chassis=2,addr=0x2,bus=pcie.0 \ > > -monitor stdio disk.qcow2 > > (qemu)device_add virtio-balloon-pci,id=balloon,bus=pcie_root_port_0 > > (qemu)cont > > > > Balloon is deleted during guest boot. > > > > To fix, save control beforehand and check that power > > or led state actually change before ejecting. > > > > Note: this is more a hack than a solution, ideally we'd > > find a better way to detect ejects, or move away > > from ejects completely and instead monitor whether > > it's safe to delete device due to e.g. its power state. > > > > Signed-off-by: Michael S. Tsirkin > > --- > > include/hw/pci/pcie.h | 3 ++- > > hw/pci-bridge/pcie_root_port.c | 5 ++++- > > hw/pci-bridge/xio3130_downstream.c | 5 ++++- > > hw/pci/pcie.c | 14 ++++++++++++-- > > 4 files changed, 22 insertions(+), 5 deletions(-) > > > > diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h > > index e30334d74d..8d90c0e193 100644 > > --- a/include/hw/pci/pcie.h > > +++ b/include/hw/pci/pcie.h > > @@ -107,7 +107,8 @@ void pcie_cap_lnkctl_reset(PCIDevice *dev); > > > > void pcie_cap_slot_init(PCIDevice *dev, uint16_t slot); > > void pcie_cap_slot_reset(PCIDevice *dev); > > -void pcie_cap_slot_write_config(PCIDevice *dev, > > +void pcie_cap_slot_get(PCIDevice *dev, uint16_t *slot_ctl, uint16_t *slt_sta); > > +void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slot_ctl, uint16_t slt_sta, > > uint32_t addr, uint32_t val, int len); > > int pcie_cap_slot_post_load(void *opaque, int version_id); > > void pcie_cap_slot_push_attention_button(PCIDevice *dev); > > diff --git a/hw/pci-bridge/pcie_root_port.c b/hw/pci-bridge/pcie_root_port.c > > index 92f253c924..09019ca05d 100644 > > --- a/hw/pci-bridge/pcie_root_port.c > > +++ b/hw/pci-bridge/pcie_root_port.c > > @@ -31,10 +31,13 @@ static void rp_write_config(PCIDevice *d, uint32_t address, > > { > > uint32_t root_cmd = > > pci_get_long(d->config + d->exp.aer_cap + PCI_ERR_ROOT_COMMAND); > > + uint16_t slt_ctl, slt_sta; > > + > > + pcie_cap_slot_get(d, &slt_ctl, &slt_sta); > > > > pci_bridge_write_config(d, address, val, len); > > rp_aer_vector_update(d); > > - pcie_cap_slot_write_config(d, address, val, len); > > + pcie_cap_slot_write_config(d, slt_ctl, slt_sta, address, val, len); > > pcie_aer_write_config(d, address, val, len); > > pcie_aer_root_write_config(d, address, val, len, root_cmd); > > } > > diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_downstream.c > > index 264e37d6a6..899b0fd6c9 100644 > > --- a/hw/pci-bridge/xio3130_downstream.c > > +++ b/hw/pci-bridge/xio3130_downstream.c > > @@ -41,9 +41,12 @@ > > static void xio3130_downstream_write_config(PCIDevice *d, uint32_t address, > > uint32_t val, int len) > > { > > + uint16_t slt_ctl, slt_sta; > > + > > + pcie_cap_slot_get(d, &slt_sta, &slt_ctl); > > pci_bridge_write_config(d, address, val, len); > > pcie_cap_flr_write_config(d, address, val, len); > > - pcie_cap_slot_write_config(d, address, val, len); > > + pcie_cap_slot_write_config(d, slt_ctl, slt_sta, address, val, len); > > pcie_aer_write_config(d, address, val, len); > > } > > > > diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c > > index b22527000d..f8490a00de 100644 > > --- a/hw/pci/pcie.c > > +++ b/hw/pci/pcie.c > > @@ -594,7 +594,15 @@ void pcie_cap_slot_reset(PCIDevice *dev) > > hotplug_event_update_event_status(dev); > > } > > > > -void pcie_cap_slot_write_config(PCIDevice *dev, > > +void pcie_cap_slot_get(PCIDevice *dev, uint16_t *slt_ctl, uint16_t *slt_sta) > > +{ > > + uint32_t pos = dev->exp.exp_cap; > > + uint8_t *exp_cap = dev->config + pos; > > + *slt_ctl = pci_get_word(exp_cap + PCI_EXP_SLTCTL); > > + *slt_sta = pci_get_word(exp_cap + PCI_EXP_SLTSTA); > > +} > > + > > +void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_sta, > > uint32_t addr, uint32_t val, int len) > > { > > uint32_t pos = dev->exp.exp_cap; > > @@ -623,7 +631,9 @@ void pcie_cap_slot_write_config(PCIDevice *dev, > > * controller is off, it is safe to detach the devices. > > */ > comment above probably should be updated to account for new conditions It's actually the same condition: the change is that we do not eject if it was already true. > > if ((sltsta & PCI_EXP_SLTSTA_PDS) && (val & PCI_EXP_SLTCTL_PCC) && > > - ((val & PCI_EXP_SLTCTL_PIC_OFF) == PCI_EXP_SLTCTL_PIC_OFF)) { > > + (val & PCI_EXP_SLTCTL_PIC_OFF) == PCI_EXP_SLTCTL_PIC_OFF && > > + (!(slt_ctl & PCI_EXP_SLTCTL_PCC) || > > + (slt_ctl & PCI_EXP_SLTCTL_PIC_OFF) != PCI_EXP_SLTCTL_PIC_OFF)) { > > PCIBus *sec_bus = pci_bridge_get_sec_bus(PCI_BRIDGE(dev)); > > pci_for_each_device(sec_bus, pci_bus_num(sec_bus), > > pcie_unplug_device, NULL);