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 D8810C3064D for ; Wed, 26 Jun 2024 16:57:21 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sMVwM-00027K-EO; Wed, 26 Jun 2024 12:56:14 -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 1sMVwK-00026d-8O for qemu-devel@nongnu.org; Wed, 26 Jun 2024 12:56:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMVwI-0005Vm-0i for qemu-devel@nongnu.org; Wed, 26 Jun 2024 12:56:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719420968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=J9GyteyiDhLDKVAvEnJxv3mY20o8HixaXlDGu/wi36k=; b=a2bZsKK6Iem1iOuksqzt2aECe5YZnYWpyFQAnjtwpuYYRrEpoYt92jFdGt+yDEOYrMjCf9 klSgPouH/hzsBR5XjuiyQFUR0Vu5uX61Pk7CzOYhR7NuYc8DlP0dT6c6Qw/VtBsqXf7daW FCkNwqUGLj4wMystb+Z5rJ7Ezfbq/4w= Received: from mail-ot1-f72.google.com (mail-ot1-f72.google.com [209.85.210.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-217-rCpSqWarMY6XMn0-SEjgdw-1; Wed, 26 Jun 2024 12:56:06 -0400 X-MC-Unique: rCpSqWarMY6XMn0-SEjgdw-1 Received: by mail-ot1-f72.google.com with SMTP id 46e09a7af769-700d61831baso516539a34.1 for ; Wed, 26 Jun 2024 09:56:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719420966; x=1720025766; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=J9GyteyiDhLDKVAvEnJxv3mY20o8HixaXlDGu/wi36k=; b=fNIl0yDGhxbKy7HIYxLaGFbiOS263mXb86FPTxT66g+j7E81Rx13UUvYMzer0P5MOL URbWNbbO8eBndUrM+tfhEsYXPGk7izixSbYj5u05dtb2f7T2Fmk4YvmKe0WaSm339z0K gR/Ze73vvZKwlHTtph218msfzFbjhZepvpMwsN5PwUlM67ThTGKvl6gvYhyEIKIgcn+C KspwCBOsc40PlX+u8w7Klah+X4Xxdi56kkks0heebjmmKwc9Qbjbb+d/Dhp2lCDB5OM0 kQBjOQpIhrf20xBpq7VUZAZm/HDUOkFwiVyo+Z/v8qs9zDXW5loYpyMOrm0sWCz3HW53 bO/A== X-Forwarded-Encrypted: i=1; AJvYcCWzv9y/p70i7IVSXu89uiwk6oh9dUa/G57FCsaXhO0rBQpVkp/D5OLNtjhoWbR1TeF0KSzvhKv+Q89fcSXBS2YrVLplwgo= X-Gm-Message-State: AOJu0YwhHdoHCrbHZKCHwx/Sgq4Msy6e7my5Pa0aQvSrR0AF4CY/7B+V dktz7QXSWyrLHxq0G9lTlprarWpsvoeTqqBE8azTgRRoWECFVpJCuvTPeVDVAHdYGKBqQpukWum ZAF3p1vkBhh4AOegyQeW8L+VvMG/F0mfohuex9545UEh5ELgmIww8 X-Received: by 2002:a9d:734b:0:b0:700:d3b7:4ede with SMTP id 46e09a7af769-700d3b74fd7mr2603496a34.27.1719420966068; Wed, 26 Jun 2024 09:56:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH9cVSTzDjraW8wV7e0X/FPLaAkThDcRD1ENQ6hIPGC5+4IUp7/IUwe8oUaNUMmEN7rK1dUmw== X-Received: by 2002:a9d:734b:0:b0:700:d3b7:4ede with SMTP id 46e09a7af769-700d3b74fd7mr2603462a34.27.1719420965677; Wed, 26 Jun 2024 09:56:05 -0700 (PDT) Received: from ?IPV6:2a01:e0a:280:24f0:9db0:474c:ff43:9f5c? ([2a01:e0a:280:24f0:9db0:474c:ff43:9f5c]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b51ed29b5csm56416576d6.46.2024.06.26.09.56.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Jun 2024 09:56:05 -0700 (PDT) Message-ID: Date: Wed, 26 Jun 2024 18:56:02 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 6/7] memory: remove IOMMU MR iommu_set_page_size_mask() callback To: Eric Auger , eric.auger.pro@gmail.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, mst@redhat.com, jean-philippe@linaro.org, peter.maydell@linaro.org, yanghliu@redhat.com, zhenzhong.duan@intel.com, alex.williamson@redhat.com References: <20240626082727.1278530-1-eric.auger@redhat.com> <20240626082727.1278530-7-eric.auger@redhat.com> Content-Language: en-US, fr From: =?UTF-8?Q?C=C3=A9dric_Le_Goater?= In-Reply-To: <20240626082727.1278530-7-eric.auger@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=clg@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.207, 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 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: , 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/26/24 10:26 AM, Eric Auger wrote: > Everything is now in place to use the Host IOMMU Device callbacks > to retrieve the page size mask usable with a given assigned device. > This new method brings the advantage to pass the info much earlier > to the virtual IOMMU and before the IOMMU MR gets enabled. So let's > remove the call to memory_region_iommu_set_page_size_mask in > vfio common.c and remove the single implementation of the IOMMU MR > callback in the virtio-iommu.c > > Signed-off-by: Eric Auger Reviewed-by: Cédric Le Goater Thanks, C. > --- > include/exec/memory.h | 38 --------------------------------- > hw/vfio/common.c | 8 ------- > hw/virtio/virtio-iommu.c | 45 ---------------------------------------- > system/memory.c | 13 ------------ > hw/virtio/trace-events | 1 - > 5 files changed, 105 deletions(-) > > diff --git a/include/exec/memory.h b/include/exec/memory.h > index 0903513d13..6f9c78cc14 100644 > --- a/include/exec/memory.h > +++ b/include/exec/memory.h > @@ -504,32 +504,6 @@ struct IOMMUMemoryRegionClass { > * @iommu: the IOMMUMemoryRegion > */ > int (*num_indexes)(IOMMUMemoryRegion *iommu); > - > - /** > - * @iommu_set_page_size_mask: > - * > - * Restrict the page size mask that can be supported with a given IOMMU > - * memory region. Used for example to propagate host physical IOMMU page > - * size mask limitations to the virtual IOMMU. > - * > - * Optional method: if this method is not provided, then the default global > - * page mask is used. > - * > - * @iommu: the IOMMUMemoryRegion > - * > - * @page_size_mask: a bitmask of supported page sizes. At least one bit, > - * representing the smallest page size, must be set. Additional set bits > - * represent supported block sizes. For example a host physical IOMMU that > - * uses page tables with a page size of 4kB, and supports 2MB and 4GB > - * blocks, will set mask 0x40201000. A granule of 4kB with indiscriminate > - * block sizes is specified with mask 0xfffffffffffff000. > - * > - * Returns 0 on success, or a negative error. In case of failure, the error > - * object must be created. > - */ > - int (*iommu_set_page_size_mask)(IOMMUMemoryRegion *iommu, > - uint64_t page_size_mask, > - Error **errp); > }; > > typedef struct RamDiscardListener RamDiscardListener; > @@ -1919,18 +1893,6 @@ int memory_region_iommu_attrs_to_index(IOMMUMemoryRegion *iommu_mr, > */ > int memory_region_iommu_num_indexes(IOMMUMemoryRegion *iommu_mr); > > -/** > - * memory_region_iommu_set_page_size_mask: set the supported page > - * sizes for a given IOMMU memory region > - * > - * @iommu_mr: IOMMU memory region > - * @page_size_mask: supported page size mask > - * @errp: pointer to Error*, to store an error if it happens. > - */ > -int memory_region_iommu_set_page_size_mask(IOMMUMemoryRegion *iommu_mr, > - uint64_t page_size_mask, > - Error **errp); > - > /** > * memory_region_name: get a memory region's name > * > diff --git a/hw/vfio/common.c b/hw/vfio/common.c > index 7cdb969fd3..6d15b36e0b 100644 > --- a/hw/vfio/common.c > +++ b/hw/vfio/common.c > @@ -622,14 +622,6 @@ static void vfio_listener_region_add(MemoryListener *listener, > int128_get64(llend), > iommu_idx); > > - ret = memory_region_iommu_set_page_size_mask(giommu->iommu_mr, > - bcontainer->pgsizes, > - &err); > - if (ret) { > - g_free(giommu); > - goto fail; > - } > - > ret = memory_region_register_iommu_notifier(section->mr, &giommu->n, > &err); > if (ret) { > diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c > index 631589735a..b24e10de81 100644 > --- a/hw/virtio/virtio-iommu.c > +++ b/hw/virtio/virtio-iommu.c > @@ -1363,50 +1363,6 @@ static int virtio_iommu_notify_flag_changed(IOMMUMemoryRegion *iommu_mr, > return 0; > } > > -/* > - * The default mask depends on the "granule" property. For example, with > - * 4k granule, it is -(4 * KiB). When an assigned device has page size > - * restrictions due to the hardware IOMMU configuration, apply this restriction > - * to the mask. > - */ > -static int virtio_iommu_set_page_size_mask(IOMMUMemoryRegion *mr, > - uint64_t new_mask, > - Error **errp) > -{ > - IOMMUDevice *sdev = container_of(mr, IOMMUDevice, iommu_mr); > - VirtIOIOMMU *s = sdev->viommu; > - uint64_t cur_mask = s->config.page_size_mask; > - > - trace_virtio_iommu_set_page_size_mask(mr->parent_obj.name, cur_mask, > - new_mask); > - > - if ((cur_mask & new_mask) == 0) { > - error_setg(errp, "virtio-iommu %s reports a page size mask 0x%"PRIx64 > - " incompatible with currently supported mask 0x%"PRIx64, > - mr->parent_obj.name, new_mask, cur_mask); > - return -1; > - } > - > - /* > - * Once the granule is frozen we can't change the mask anymore. If by > - * chance the hotplugged device supports the same granule, we can still > - * accept it. > - */ > - if (s->granule_frozen) { > - int cur_granule = ctz64(cur_mask); > - > - if (!(BIT_ULL(cur_granule) & new_mask)) { > - error_setg(errp, "virtio-iommu %s does not support frozen granule 0x%llx", > - mr->parent_obj.name, BIT_ULL(cur_granule)); > - return -1; > - } > - return 0; > - } > - > - s->config.page_size_mask &= new_mask; > - return 0; > -} > - > static void virtio_iommu_system_reset(void *opaque) > { > VirtIOIOMMU *s = opaque; > @@ -1731,7 +1687,6 @@ static void virtio_iommu_memory_region_class_init(ObjectClass *klass, > imrc->translate = virtio_iommu_translate; > imrc->replay = virtio_iommu_replay; > imrc->notify_flag_changed = virtio_iommu_notify_flag_changed; > - imrc->iommu_set_page_size_mask = virtio_iommu_set_page_size_mask; > } > > static const TypeInfo virtio_iommu_info = { > diff --git a/system/memory.c b/system/memory.c > index 2d69521360..5e6eb459d5 100644 > --- a/system/memory.c > +++ b/system/memory.c > @@ -1901,19 +1901,6 @@ static int memory_region_update_iommu_notify_flags(IOMMUMemoryRegion *iommu_mr, > return ret; > } > > -int memory_region_iommu_set_page_size_mask(IOMMUMemoryRegion *iommu_mr, > - uint64_t page_size_mask, > - Error **errp) > -{ > - IOMMUMemoryRegionClass *imrc = IOMMU_MEMORY_REGION_GET_CLASS(iommu_mr); > - int ret = 0; > - > - if (imrc->iommu_set_page_size_mask) { > - ret = imrc->iommu_set_page_size_mask(iommu_mr, page_size_mask, errp); > - } > - return ret; > -} > - > int memory_region_register_iommu_notifier(MemoryRegion *mr, > IOMMUNotifier *n, Error **errp) > { > diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events > index 599d855ff6..b7c04f0856 100644 > --- a/hw/virtio/trace-events > +++ b/hw/virtio/trace-events > @@ -131,7 +131,6 @@ virtio_iommu_fill_resv_property(uint32_t devid, uint8_t subtype, uint64_t start, > virtio_iommu_notify_map(const char *name, uint64_t virt_start, uint64_t virt_end, uint64_t phys_start, uint32_t flags) "mr=%s virt_start=0x%"PRIx64" virt_end=0x%"PRIx64" phys_start=0x%"PRIx64" flags=%d" > virtio_iommu_notify_unmap(const char *name, uint64_t virt_start, uint64_t virt_end) "mr=%s virt_start=0x%"PRIx64" virt_end=0x%"PRIx64 > virtio_iommu_remap(const char *name, uint64_t virt_start, uint64_t virt_end, uint64_t phys_start) "mr=%s virt_start=0x%"PRIx64" virt_end=0x%"PRIx64" phys_start=0x%"PRIx64 > -virtio_iommu_set_page_size_mask(const char *name, uint64_t old, uint64_t new) "mr=%s old_mask=0x%"PRIx64" new_mask=0x%"PRIx64 > virtio_iommu_update_page_size_mask(const char *name, uint64_t old, uint64_t new) "host iommu device=%s old_mask=0x%"PRIx64" new_mask=0x%"PRIx64 > virtio_iommu_notify_flag_add(const char *name) "add notifier to mr %s" > virtio_iommu_notify_flag_del(const char *name) "del notifier from mr %s"