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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 1FCC4C27C4F for ; Thu, 13 Jun 2024 12:09:45 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHjFn-00082m-RG; Thu, 13 Jun 2024 08:08:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sHjFl-00082T-6u for qemu-devel@nongnu.org; Thu, 13 Jun 2024 08:08:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sHjFg-0003ef-Hm for qemu-devel@nongnu.org; Thu, 13 Jun 2024 08:08:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718280502; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=usxM7934CcJDHsMGhKGlPE7gFcZ/bMGGnoUJZyUD79g=; b=LAf0qKcvGXFzO9aDl9/P8Vyv7SmfXuK+Uh5AIacJwo7FNOKoQwTCepEKfUAITBQrVjMFzS ZLaEsN+4meC7VIIvJR4GTmdbsXkC2ImTrDF1fM0TzorL6mS06o4WOINSvwu+4Lw5/R1OBZ 7UKPRpfQpoUvUmPg6GMzG1ESvWivNS8= 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-484-e33rC-MIO0WOAlw5xktv4w-1; Thu, 13 Jun 2024 08:08:21 -0400 X-MC-Unique: e33rC-MIO0WOAlw5xktv4w-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-35f0ec7778bso288099f8f.2 for ; Thu, 13 Jun 2024 05:08:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718280500; x=1718885300; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:reply-to:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=usxM7934CcJDHsMGhKGlPE7gFcZ/bMGGnoUJZyUD79g=; b=o5I74lhjjVoStI4dz2FE0Q2od3NwpaLBroCtYT1nSqeiUnQ+qjSTVrTFenXKth63Al Q7h97wYLNSv87lGpHP57YlilPGP838vZKSzZUGUzdEEWt9NOfVa4AyW29WtG4dOg/+Pe SzR6ltiYHm/iDwovzMuJ2q8HruEgo4U3DG3UxK94Da94bPrrnqXGCG62uSQM1J6eKSXB tR2k50gHInlZUWRZkURUHNEb6pY/HZW+/vyX/WWB8aTyYi8rWe9qkzaxt+1YE8Iv5Q3h b3capt6ykCdiQWpuiLrFzzk37+fDbC/qSpkyLCxwP0HemhwOz7gNWsK1hEuGq267oZUC h4TQ== X-Forwarded-Encrypted: i=1; AJvYcCXWxejz55c52f9AmEMBgTVUwktNBEHFCHLUjFDUqzBXDewToSTfHW7RT9PBustI6C7N9o+cAvoZzws22QD7pJkVzRGipTs= X-Gm-Message-State: AOJu0YylUXBpR07qCK9eklObBaFRuFgLI+Kg6D907AJbRWn2YTiqlPoI IqFpjMlbQnmUvSDh08orlHQYRviCK+yhjPvmphHaV/jciduyC4Uz+5kcuIHKIUnHVosb9uyMP7V DwQAmgyIegE8j3S5KO1CKZ6y50is/SZ3JM2dnRScRUuYF71i5bVhM X-Received: by 2002:a5d:64e4:0:b0:35f:22e4:fb58 with SMTP id ffacd0b85a97d-35fdf79cf3amr4516687f8f.8.1718280499665; Thu, 13 Jun 2024 05:08:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHBXG33LNctqeXb467UYpQWEvlMlbxSArPd9GAe+G71snNXK4uSTQ2onNvRUAOQi33E6GF9gw== X-Received: by 2002:a5d:64e4:0:b0:35f:22e4:fb58 with SMTP id ffacd0b85a97d-35fdf79cf3amr4516658f8f.8.1718280499265; Thu, 13 Jun 2024 05:08:19 -0700 (PDT) Received: from ?IPV6:2a01:e0a:59e:9d80:527b:9dff:feef:3874? ([2a01:e0a:59e:9d80:527b:9dff:feef:3874]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36075104a0fsm1552557f8f.96.2024.06.13.05.08.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Jun 2024 05:08:18 -0700 (PDT) Message-ID: <107a70a8-b75f-48bb-8df2-7d779b7e889a@redhat.com> Date: Thu, 13 Jun 2024 14:08:17 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 4/7] virtio-iommu: Compute host reserved regions Content-Language: en-US To: "Duan, Zhenzhong" , "eric.auger.pro@gmail.com" , "qemu-devel@nongnu.org" , "qemu-arm@nongnu.org" , "mst@redhat.com" , "jean-philippe@linaro.org" , "peter.maydell@linaro.org" , "clg@redhat.com" , "yanghliu@redhat.com" Cc: "alex.williamson@redhat.com" , "jasowang@redhat.com" , "pbonzini@redhat.com" , "berrange@redhat.com" References: <20240613092359.847145-1-eric.auger@redhat.com> <20240613092359.847145-5-eric.auger@redhat.com> From: Eric Auger In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.145, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: eric.auger@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 6/13/24 12:00, Duan, Zhenzhong wrote: > Hi Eric, > >> -----Original Message----- >> From: Eric Auger >> Subject: [PATCH v3 4/7] virtio-iommu: Compute host reserved regions >> >> Compute the host reserved regions in virtio_iommu_set_iommu_device(). >> The usable IOVA regions are retrieved from the HOSTIOMMUDevice. >> The virtio_iommu_set_host_iova_ranges() helper turns usable regions >> into complementary reserved regions while testing the inclusion >> into existing ones. virtio_iommu_set_host_iova_ranges() reuse the >> implementation of virtio_iommu_set_iova_ranges() which will be >> removed in subsequent patches. rebuild_resv_regions() is just moved. >> >> Signed-off-by: Eric Auger >> >> --- >> >> - added g_assert(!sdev->probe_done) >> --- >> hw/virtio/virtio-iommu.c | 146 ++++++++++++++++++++++++++++++-------- >> - >> 1 file changed, 112 insertions(+), 34 deletions(-) >> >> diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c >> index db842555c8..04474ebd74 100644 >> --- a/hw/virtio/virtio-iommu.c >> +++ b/hw/virtio/virtio-iommu.c >> @@ -498,12 +498,109 @@ get_host_iommu_device(VirtIOIOMMU >> *viommu, PCIBus *bus, int devfn) { >> return g_hash_table_lookup(viommu->host_iommu_devices, &key); >> } >> >> +/** >> + * rebuild_resv_regions: rebuild resv regions with both the >> + * info of host resv ranges and property set resv ranges >> + */ >> +static int rebuild_resv_regions(IOMMUDevice *sdev) >> +{ >> + GList *l; >> + int i = 0; >> + >> + /* free the existing list and rebuild it from scratch */ >> + g_list_free_full(sdev->resv_regions, g_free); >> + sdev->resv_regions = NULL; >> + >> + /* First add host reserved regions if any, all tagged as RESERVED */ >> + for (l = sdev->host_resv_ranges; l; l = l->next) { >> + ReservedRegion *reg = g_new0(ReservedRegion, 1); >> + Range *r = (Range *)l->data; >> + >> + reg->type = VIRTIO_IOMMU_RESV_MEM_T_RESERVED; >> + range_set_bounds(®->range, range_lob(r), range_upb(r)); >> + sdev->resv_regions = resv_region_list_insert(sdev->resv_regions, reg); >> + trace_virtio_iommu_host_resv_regions(sdev- >>> iommu_mr.parent_obj.name, i, >> + range_lob(®->range), >> + range_upb(®->range)); >> + i++; >> + } >> + /* >> + * then add higher priority reserved regions set by the machine >> + * through properties >> + */ >> + add_prop_resv_regions(sdev); >> + return 0; >> +} >> + >> +static int virtio_iommu_set_host_iova_ranges(VirtIOIOMMU *s, PCIBus >> *bus, >> + int devfn, GList *iova_ranges, >> + Error **errp) >> +{ >> + IOMMUPciBus *sbus = g_hash_table_lookup(s->as_by_busptr, bus); > Here the bus/devfn parameters are real device BDF not aliased one, > But used to index s->as_by_busptr which expect aliased bus/devfn. > > Do we need a translation of bus/devfn? Hum that's a good point actually. I need to further study that. that's not easy to translate, is it? Now I am not totally sure why we don't use the alias as well for HostIOMMUDevices or at least store the aliased bdf. Thanks Eric > > Thanks > Zhenzhong > >> + IOMMUDevice *sdev; >> + GList *current_ranges; >> + GList *l, *tmp, *new_ranges = NULL; >> + int ret = -EINVAL; >> + >> + if (!sbus) { >> + error_report("%s no sbus", __func__); >> + } >> + >> + sdev = sbus->pbdev[devfn]; >> + >> + current_ranges = sdev->host_resv_ranges; >> + >> + g_assert(!sdev->probe_done); >> + >> + /* check that each new resv region is included in an existing one */ >> + if (sdev->host_resv_ranges) { >> + range_inverse_array(iova_ranges, >> + &new_ranges, >> + 0, UINT64_MAX); >> + >> + for (tmp = new_ranges; tmp; tmp = tmp->next) { >> + Range *newr = (Range *)tmp->data; >> + bool included = false; >> + >> + for (l = current_ranges; l; l = l->next) { >> + Range * r = (Range *)l->data; >> + >> + if (range_contains_range(r, newr)) { >> + included = true; >> + break; >> + } >> + } >> + if (!included) { >> + goto error; >> + } >> + } >> + /* all new reserved ranges are included in existing ones */ >> + ret = 0; >> + goto out; >> + } >> + >> + range_inverse_array(iova_ranges, >> + &sdev->host_resv_ranges, >> + 0, UINT64_MAX); >> + rebuild_resv_regions(sdev); >> + >> + return 0; >> +error: >> + error_setg(errp, "%s Conflicting host reserved ranges set!", >> + __func__); >> +out: >> + g_list_free_full(new_ranges, g_free); >> + return ret; >> +} >> + >> static bool virtio_iommu_set_iommu_device(PCIBus *bus, void *opaque, >> int devfn, >> HostIOMMUDevice *hiod, Error **errp) >> { >> VirtIOIOMMU *viommu = opaque; >> VirtioHostIOMMUDevice *vhiod; >> + HostIOMMUDeviceClass *hiodc = >> HOST_IOMMU_DEVICE_GET_CLASS(hiod); >> struct hiod_key *new_key; >> + GList *host_iova_ranges = NULL; >> >> assert(hiod); >> >> @@ -513,6 +610,20 @@ static bool >> virtio_iommu_set_iommu_device(PCIBus *bus, void *opaque, int devfn, >> return false; >> } >> >> + if (hiodc->get_iova_ranges) { >> + int ret; >> + host_iova_ranges = hiodc->get_iova_ranges(hiod, errp); >> + if (!host_iova_ranges) { >> + return true; /* some old kernels may not support that capability */ >> + } >> + ret = virtio_iommu_set_host_iova_ranges(viommu, bus, devfn, >> + host_iova_ranges, errp); >> + if (ret) { >> + g_list_free_full(host_iova_ranges, g_free); >> + return false; >> + } >> + } >> + >> vhiod = g_malloc0(sizeof(VirtioHostIOMMUDevice)); >> vhiod->bus = bus; >> vhiod->devfn = (uint8_t)devfn; >> @@ -525,6 +636,7 @@ static bool >> virtio_iommu_set_iommu_device(PCIBus *bus, void *opaque, int devfn, >> >> object_ref(hiod); >> g_hash_table_insert(viommu->host_iommu_devices, new_key, vhiod); >> + g_list_free_full(host_iova_ranges, g_free); >> >> return true; >> } >> @@ -1246,40 +1358,6 @@ static int >> virtio_iommu_set_page_size_mask(IOMMUMemoryRegion *mr, >> return 0; >> } >> >> -/** >> - * rebuild_resv_regions: rebuild resv regions with both the >> - * info of host resv ranges and property set resv ranges >> - */ >> -static int rebuild_resv_regions(IOMMUDevice *sdev) >> -{ >> - GList *l; >> - int i = 0; >> - >> - /* free the existing list and rebuild it from scratch */ >> - g_list_free_full(sdev->resv_regions, g_free); >> - sdev->resv_regions = NULL; >> - >> - /* First add host reserved regions if any, all tagged as RESERVED */ >> - for (l = sdev->host_resv_ranges; l; l = l->next) { >> - ReservedRegion *reg = g_new0(ReservedRegion, 1); >> - Range *r = (Range *)l->data; >> - >> - reg->type = VIRTIO_IOMMU_RESV_MEM_T_RESERVED; >> - range_set_bounds(®->range, range_lob(r), range_upb(r)); >> - sdev->resv_regions = resv_region_list_insert(sdev->resv_regions, reg); >> - trace_virtio_iommu_host_resv_regions(sdev- >>> iommu_mr.parent_obj.name, i, >> - range_lob(®->range), >> - range_upb(®->range)); >> - i++; >> - } >> - /* >> - * then add higher priority reserved regions set by the machine >> - * through properties >> - */ >> - add_prop_resv_regions(sdev); >> - return 0; >> -} >> - >> /** >> * virtio_iommu_set_iova_ranges: Conveys the usable IOVA ranges >> * >> -- >> 2.41.0