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=-15.1 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,USER_AGENT_SANE_1 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 1F978C433B4 for ; Tue, 6 Apr 2021 14:55:54 +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 956BF613B8 for ; Tue, 6 Apr 2021 14:55:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 956BF613B8 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]:51248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTn7Q-00042f-MW for qemu-devel@archiver.kernel.org; Tue, 06 Apr 2021 10:55:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTn6M-0003c6-3B for qemu-devel@nongnu.org; Tue, 06 Apr 2021 10:54:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:44373) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTn6I-0001T5-Il for qemu-devel@nongnu.org; Tue, 06 Apr 2021 10:54:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617720881; h=from:from:reply-to: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=u1ikcF8cTS1wp43o4tsUhk/V/I11SrjUSElGBKcfcIE=; b=ORqhnAUjUl+KjSpVyr7DY7e+ufVHFxOOvihD38n+2yh92TZ0MDTcG5YUbhSFChzgRfULfJ K9AlqUDsZJrVeM8anqEy/STg9y7t3qBVKZy/ZzALrkTdLtfXZto6BSUjaRzWOSRdUDFmLo fqVkPUsgLJYTQUxm9rhzynOCqLO6Oaw= 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-165-GniFi8z6OZiMpEWd5ef3nA-1; Tue, 06 Apr 2021 10:54:29 -0400 X-MC-Unique: GniFi8z6OZiMpEWd5ef3nA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 175BBA0C04; Tue, 6 Apr 2021 14:54:28 +0000 (UTC) Received: from redhat.com (ovpn-114-172.ams2.redhat.com [10.36.114.172]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E256760854; Tue, 6 Apr 2021 14:54:26 +0000 (UTC) Date: Tue, 6 Apr 2021 15:54:24 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: "Michael S. Tsirkin" Subject: Re: [PULL v2 11/19] pci: acpi: ensure that acpi-index is unique Message-ID: References: <20210322225907.541943-1-mst@redhat.com> <20210322225907.541943-12-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210322225907.541943-12-mst@redhat.com> User-Agent: Mutt/2.0.5 (2021-01-21) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H4=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: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: Peter Maydell , qemu-devel@nongnu.org, Igor Mammedov Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, Mar 22, 2021 at 07:00:18PM -0400, Michael S. Tsirkin wrote: > From: Igor Mammedov > > it helps to avoid device naming conflicts when guest OS is > configured to use acpi-index for naming. > Spec ialso says so: > > PCI Firmware Specification Revision 3.2 > 4.6.7. _DSM for Naming a PCI or PCI Express Device Under Operating Systems > " > Instance number must be unique under \_SB scope. This instance number does not have to > be sequential in a given system configuration. > " > > Signed-off-by: Igor Mammedov > Message-Id: <20210315180102.3008391-4-imammedo@redhat.com> > Reviewed-by: Michael S. Tsirkin > Signed-off-by: Michael S. Tsirkin > --- > hw/acpi/pcihp.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 46 insertions(+) > > diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c > index ceab287bd3..f4cb3c979d 100644 > --- a/hw/acpi/pcihp.c > +++ b/hw/acpi/pcihp.c > @@ -52,6 +52,21 @@ typedef struct AcpiPciHpFind { > PCIBus *bus; > } AcpiPciHpFind; > > +static gint g_cmp_uint32(gconstpointer a, gconstpointer b, gpointer user_data) > +{ > + return a - b; > +} > + > +static GSequence *pci_acpi_index_list(void) > +{ > + static GSequence *used_acpi_index_list; > + > + if (!used_acpi_index_list) { > + used_acpi_index_list = g_sequence_new(NULL); > + } > + return used_acpi_index_list; > +} > + > static int acpi_pcihp_get_bsel(PCIBus *bus) > { > Error *local_err = NULL; > @@ -277,6 +292,23 @@ void acpi_pcihp_device_pre_plug_cb(HotplugHandler *hotplug_dev, > ONBOARD_INDEX_MAX); > return; > } > + > + /* > + * make sure that acpi-index is unique across all present PCI devices > + */ > + if (pdev->acpi_index) { > + GSequence *used_indexes = pci_acpi_index_list(); > + > + if (g_sequence_lookup(used_indexes, GINT_TO_POINTER(pdev->acpi_index), > + g_cmp_uint32, NULL)) { > + error_setg(errp, "a PCI device with acpi-index = %" PRIu32 > + " already exist", pdev->acpi_index); > + return; > + } > + g_sequence_insert_sorted(used_indexes, > + GINT_TO_POINTER(pdev->acpi_index), > + g_cmp_uint32, NULL); > + } This doesn't appear to ensure uniqueness when using PCIe topologies: $ ./build/x86_64-softmmu/qemu-system-x86_64 \ -device virtio-net,acpi-index=100 \ -device virtio-net,acpi-index=100 qemu-system-x86_64: -device virtio-net,acpi-index=100: a PCI device with acpi-index = 100 already exist $ ./build/x86_64-softmmu/qemu-system-x86_64 \ -M q35 \ -device virtio-net,acpi-index=100 -device virtio-net,acpi-index=100 ....happily running.... Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|