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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 242A0C4361B for ; Thu, 10 Dec 2020 10:31:38 +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 82F4B23AC4 for ; Thu, 10 Dec 2020 10:31:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 82F4B23AC4 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]:55066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knJEW-0004Ex-2O for qemu-devel@archiver.kernel.org; Thu, 10 Dec 2020 05:31:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knJBV-0001qG-1A for qemu-devel@nongnu.org; Thu, 10 Dec 2020 05:28:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:21918) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knJBR-0004V2-Ov for qemu-devel@nongnu.org; Thu, 10 Dec 2020 05:28:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607596104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vNh1CnFmK3fASxiwNe8ytas329Q9LCLmL9Tyr5YQLK0=; b=YD5w944e/CULU1H/IZj9RUfu09V9F+YWRetN7T1RMiNj/tM1mRPIwCXpnXLeT15GDhTHzk 3H+R0DfNa/8dwHdycVE0f697cSgRXp1spVIR8h7jnxafd7WTlIqfWASRv2uFOsiFDAtfdZ UbyxHKbqNCxnPUJ1FpWLH8Qcgzaiz4k= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-275-cFPxfPeuPcaI7cdPLS1DaA-1; Thu, 10 Dec 2020 05:28:22 -0500 X-MC-Unique: cFPxfPeuPcaI7cdPLS1DaA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D6E6184E240; Thu, 10 Dec 2020 10:28:20 +0000 (UTC) Received: from gondolin (ovpn-112-77.ams2.redhat.com [10.36.112.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id 031675B4CE; Thu, 10 Dec 2020 10:28:08 +0000 (UTC) Date: Thu, 10 Dec 2020 11:28:06 +0100 From: Cornelia Huck To: Matthew Rosato Subject: Re: [RFC 2/8] s390x/pci: MSI-X isn't strictly required for passthrough Message-ID: <20201210112806.61b0c854.cohuck@redhat.com> In-Reply-To: <1607546066-2240-3-git-send-email-mjrosato@linux.ibm.com> References: <1607546066-2240-1-git-send-email-mjrosato@linux.ibm.com> <1607546066-2240-3-git-send-email-mjrosato@linux.ibm.com> Organization: Red Hat GmbH MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=cohuck@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: thuth@redhat.com, pmorel@linux.ibm.com, david@redhat.com, schnelle@linux.ibm.com, richard.henderson@linaro.org, qemu-s390x@nongnu.org, qemu-devel@nongnu.org, pasic@linux.ibm.com, borntraeger@de.ibm.com, alex.williamson@redhat.com, mst@redhat.com, pbonzini@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, 9 Dec 2020 15:34:20 -0500 Matthew Rosato wrote: > s390 PCI currently disallows PCI devices without the MSI-X capability. > However, this fence doesn't make sense for passthrough devices. Move > the check to only fence emulated devices (e.g., virtio). > > Signed-off-by: Matthew Rosato > Reviewed-by: Pierre Morel > --- > hw/s390x/s390-pci-bus.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c > index 05f7460..afad048 100644 > --- a/hw/s390x/s390-pci-bus.c > +++ b/hw/s390x/s390-pci-bus.c > @@ -1028,12 +1028,12 @@ static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev, > s390_pci_get_clp_info(pbdev); > } else { > pbdev->fh |= FH_SHM_EMUL; > - } > > - if (s390_pci_msix_init(pbdev)) { > - error_setg(errp, "MSI-X support is mandatory " > - "in the S390 architecture"); > - return; > + if (s390_pci_msix_init(pbdev)) { > + error_setg(errp, "MSI-X support is mandatory " > + "in the S390 architecture"); > + return; > + } > } > > if (dev->hotplugged) { > @@ -1073,7 +1073,9 @@ static void s390_pcihost_unplug(HotplugHandler *hotplug_dev, DeviceState *dev, > devfn = pci_dev->devfn; > qdev_unrealize(dev); > > - s390_pci_msix_free(pbdev); > + if (pbdev->fh & FH_SHM_EMUL) { > + s390_pci_msix_free(pbdev); > + } > s390_pci_iommu_free(s, bus, devfn); > pbdev->pdev = NULL; > pbdev->state = ZPCI_FS_RESERVED; Remind me: Wasn't it only msi that was strictly required (i.e., not msi-x?) Can we generally relax this requirement, possibly with some changes in the adapter interrupt mapping? I might misremember, though.