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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1F2EC7EE2A for ; Mon, 22 May 2023 21:55:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234642AbjEVVzv (ORCPT ); Mon, 22 May 2023 17:55:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234366AbjEVVzq (ORCPT ); Mon, 22 May 2023 17:55:46 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13680DB for ; Mon, 22 May 2023 14:54:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684792498; 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: in-reply-to:in-reply-to:references:references; bh=0L203m2GVaQLYviFxGrtioouT9iWCn/rX/S2k2svONk=; b=Wff0qolQJW4kwLzkUcxvVRMz8UFcF/D6T/XU/5jJ5TxiLmDtzgUTArqOTAauwM/lpoxyCh qEP7VZ4/KiU8g6pmITHCIwXJFT1A/JDA1Q5ZnMQgj/kRyzb2SAsUyXizvRTsjeEDPAo9L/ ws07wkNO+MV0Xivvmr1FbizlbtdQELM= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-673-Lu0T30KuOLCLSYQgOfANHA-1; Mon, 22 May 2023 17:54:54 -0400 X-MC-Unique: Lu0T30KuOLCLSYQgOfANHA-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-30a8ba2debdso678925f8f.3 for ; Mon, 22 May 2023 14:54:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684792494; x=1687384494; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=0L203m2GVaQLYviFxGrtioouT9iWCn/rX/S2k2svONk=; b=bFeuOibgp9PbBi6evMREUhdeE38FA2zX9yy1UAIyV0F6UEnAdASW8UvhaYtmZ71kSQ +5E6xFwT9aGLqye7RNptqBxuIbcApyZYjk7jpZEvDRwUNs/pKUQGhOLk5XVw5iYygd8V maSWFWxGflcWqVSZrDDjDzBApz71Z+k9sYPoE+SK+g3ZAllQlLHlM1DrVVaN7NhztOBg t0wSAUKljkS77F2Gcy4a70NWJz7QbVC+8q2nF3H+LIpfCjjN4ywYUqyT7T71PAXwkNhE AxvnRHy1saAv1ZIN18Zvqdap2h9NEWMgV5PWaNvUU5JNEHtAS8BW89GvGHmGkIDskhql +i8g== X-Gm-Message-State: AC+VfDxTUxi4AcWlF2859uso+GKrHSmkACmBmkmVy+DDJYKpfTuiA2g8 sL6Cbh5M8roDiZ0+a+TRPXgiSEglAVR2IUQ24Op4bN+AN09zUhvrJ20PMNUAq19ZLV4bNVTHAFd ZCSxCv2mmIEQsghnAN/9sfQ== X-Received: by 2002:adf:f1ce:0:b0:306:64b7:5413 with SMTP id z14-20020adff1ce000000b0030664b75413mr8021976wro.71.1684792493777; Mon, 22 May 2023 14:54:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5FeA2pzJifNU77nJUGk9z4tuDbA0b89J6fc4WAGGvOFeetu5pLeSWt/hkyHu1VXNCroi2+DA== X-Received: by 2002:adf:f1ce:0:b0:306:64b7:5413 with SMTP id z14-20020adff1ce000000b0030664b75413mr8021967wro.71.1684792493488; Mon, 22 May 2023 14:54:53 -0700 (PDT) Received: from redhat.com ([2.52.20.68]) by smtp.gmail.com with ESMTPSA id z11-20020adff1cb000000b0030789698eebsm8895175wro.89.2023.05.22.14.54.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 14:54:52 -0700 (PDT) Date: Mon, 22 May 2023 17:54:49 -0400 From: "Michael S. Tsirkin" To: Bjorn Helgaas Cc: Igor Mammedov , linux-kernel@vger.kernel.org, rafael@kernel.org, lenb@kernel.org, bhelgaas@google.com, linux-acpi@vger.kernel.org, linux-pci@vger.kernel.org, mika.westerberg@linux.intel.com Subject: Re: [PATCH v2] PCI: acpiphp: Reassign resources on bridge if necessary Message-ID: <20230522175415-mutt-send-email-mst@kernel.org> References: <20230424191557.2464760-1-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org On Mon, May 22, 2023 at 04:51:41PM -0500, Bjorn Helgaas wrote: > On Mon, Apr 24, 2023 at 09:15:57PM +0200, Igor Mammedov wrote: > > When using ACPI PCI hotplug, hotplugging a device with > > large BARs may fail if bridge windows programmed by > > firmware are not large enough. > > > > Reproducer: > > $ qemu-kvm -monitor stdio -M q35 -m 4G \ > > -global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=on \ > > -device id=rp1,pcie-root-port,bus=pcie.0,chassis=4 \ > > disk_image > > > > wait till linux guest boots, then hotplug device > > (qemu) device_add qxl,bus=rp1 > > > > hotplug on guest side fails with: > > pci 0000:01:00.0: [1b36:0100] type 00 class 0x038000 > > pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x03ffffff] > > pci 0000:01:00.0: reg 0x14: [mem 0x00000000-0x03ffffff] > > pci 0000:01:00.0: reg 0x18: [mem 0x00000000-0x00001fff] > > pci 0000:01:00.0: reg 0x1c: [io 0x0000-0x001f] > > pci 0000:01:00.0: BAR 0: no space for [mem size 0x04000000] > > pci 0000:01:00.0: BAR 0: failed to assign [mem size 0x04000000] > > pci 0000:01:00.0: BAR 1: no space for [mem size 0x04000000] > > pci 0000:01:00.0: BAR 1: failed to assign [mem size 0x04000000] > > pci 0000:01:00.0: BAR 2: assigned [mem 0xfe800000-0xfe801fff] > > pci 0000:01:00.0: BAR 3: assigned [io 0x1000-0x101f] > > qxl 0000:01:00.0: enabling device (0000 -> 0003) > > Unable to create vram_mapping > > qxl: probe of 0000:01:00.0 failed with error -12 > > > > However when using native PCIe hotplug > > '-global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=off' > > it works fine, since kernel attempts to reassign unused resources. > > Use the same machinery as native PCIe hotplug to (re)assign resources. > > > > Signed-off-by: Igor Mammedov > > Tentatively applied to pci/hotplug for v6.5. > > Tentative only because I'm hoping for your ack or review, Rafael (I > see you acked v1, but this one is a little different). > > And I think you'd like a stable tag, Michael? I'm happy to add one, > but wasn't sure if you wanted a separate ack for that. I'd like a stable tag, yes. Just was not sure whom best to ask. > > --- > > tested in QEMU with Q35 machine on PCIE root port and also > > with nested conventional bridge attached to root port. > > > > v2: > > * fixup subject to match expected style > > * drop no longer needed __pci_bus_size_bridges() to avoid > > memory leak (Bjorn Helgaas ) > > --- > > drivers/pci/hotplug/acpiphp_glue.c | 5 +---- > > 1 file changed, 1 insertion(+), 4 deletions(-) > > > > diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c > > index 5b1f271c6034..328d1e416014 100644 > > --- a/drivers/pci/hotplug/acpiphp_glue.c > > +++ b/drivers/pci/hotplug/acpiphp_glue.c > > @@ -498,7 +498,6 @@ static void enable_slot(struct acpiphp_slot *slot, bool bridge) > > acpiphp_native_scan_bridge(dev); > > } > > } else { > > - LIST_HEAD(add_list); > > int max, pass; > > > > acpiphp_rescan_slot(slot); > > @@ -512,12 +511,10 @@ static void enable_slot(struct acpiphp_slot *slot, bool bridge) > > if (pass && dev->subordinate) { > > check_hotplug_bridge(slot, dev); > > pcibios_resource_survey_bus(dev->subordinate); > > - __pci_bus_size_bridges(dev->subordinate, > > - &add_list); > > } > > } > > } > > - __pci_bus_assign_resources(bus, &add_list, NULL); > > + pci_assign_unassigned_bridge_resources(bus->self); > > } > > > > acpiphp_sanitize_bus(bus); > > -- > > 2.39.1 > >