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 70451C4707B for ; Thu, 18 Jan 2024 12:35:14 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQRbS-0001BS-SH; Thu, 18 Jan 2024 07:34:38 -0500 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 1rQRbN-00018a-GH for qemu-devel@nongnu.org; Thu, 18 Jan 2024 07:34:34 -0500 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 1rQRbK-0000jc-JZ for qemu-devel@nongnu.org; Thu, 18 Jan 2024 07:34:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705581269; 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=oi2CbwwfHRUnncLRFlcnjvfocKxuBcW4Rb/BoBy2rKo=; b=T7r1zbYa6kYUaL9CLpBqDpDyOKbR/RIdDin8V4CJn9oRx7HIvQvKlSjsawSWAioO7UZ0of 4oFifwH6JWQdUVECVSve1j1j1DHT8KdhorHELW3tocvC6PiyzHKecaWWn9QDRqizIRXImr 3mOd+QBPsaWJVJdUTrO8Icewjj2nmUA= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-155-HYVnoqQxNlGFgcmwrsfyFQ-1; Thu, 18 Jan 2024 07:34:28 -0500 X-MC-Unique: HYVnoqQxNlGFgcmwrsfyFQ-1 Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-68194fcd1f1so5093966d6.0 for ; Thu, 18 Jan 2024 04:34:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705581267; x=1706186067; 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=oi2CbwwfHRUnncLRFlcnjvfocKxuBcW4Rb/BoBy2rKo=; b=PB49GaBHRJ+lUYba9aDxYlMh+AmK80DZV8R48y/w57Gw0uYZRgruBXWh+Vd9tQ7jUB +nfCGRD6TIHktRQNSi/D58DA2ri1cF2hX5ahVihajel23vE5DiifcoDtOknVE1wEBICb qsIfqYg6nDxExyxfkb6d9aDgMYS/U+8uxtssy6EQq92HuuZ3ZA/8G1f60o1Ceh/pSjWP 3yzwxN306xxTS6mkcrJGx18HqNBAxeUgtSD0tnBD+SujoN2n/2Dbqw133YkjLUOnrCC6 90WGqzU+SRzjPmyPB2EqU02V2A2cHb7kSPqxY2/otqIBsJZ44q6TC7e9H3UB1atP6Vsx vLbg== X-Gm-Message-State: AOJu0Yy+Tp1QHuMXajwsxex35fxuSWeliVebNFkBpyZmx5mUR1lLKssD tZFRCHbaAMSkeGTxm0wbQiPZvPq6lX2sEAbG3pyvbaT+QGsDKTH51QpYsSUzUEL70p2QScI4l98 xYbGHIUFUf6lgt5hdss4Q6tfm85NAmgFzm1wh/T/VVMzEtP4PfgFy X-Received: by 2002:ad4:5ecf:0:b0:67f:87f7:8954 with SMTP id jm15-20020ad45ecf000000b0067f87f78954mr1319892qvb.26.1705581267627; Thu, 18 Jan 2024 04:34:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IGcx9aTxobFvQqnJulyXmkptYTECFay71xzk1wnt/r0/VzegQV0+8BcjggNQ3zGlGM0WjsEtg== X-Received: by 2002:ad4:5ecf:0:b0:67f:87f7:8954 with SMTP id jm15-20020ad45ecf000000b0067f87f78954mr1319867qvb.26.1705581267329; Thu, 18 Jan 2024 04:34:27 -0800 (PST) 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 cw9-20020ad44dc9000000b0068174386320sm1968806qvb.19.2024.01.18.04.34.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 18 Jan 2024 04:34:26 -0800 (PST) Message-ID: Date: Thu, 18 Jan 2024 13:34:22 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH rfcv1 3/6] intel_iommu: add set/unset_iommu_device callback Content-Language: en-US To: "Duan, Zhenzhong" , "qemu-devel@nongnu.org" Cc: "alex.williamson@redhat.com" , "clg@redhat.com" , "peterx@redhat.com" , "jasowang@redhat.com" , "mst@redhat.com" , "jgg@nvidia.com" , "nicolinc@nvidia.com" , "joao.m.martins@oracle.com" , "Tian, Kevin" , "Liu, Yi L" , "Sun, Yi Y" , "Peng, Chao P" , Yi Sun , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost References: <20240115101313.131139-1-zhenzhong.duan@intel.com> <20240115101313.131139-4-zhenzhong.duan@intel.com> <4db1ddc3-efef-47ff-bc34-4cb3eb3fc5e9@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.129.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -38 X-Spam_score: -3.9 X-Spam_bar: --- X-Spam_report: (-3.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.806, 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=ham 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 1/18/24 09:43, Duan, Zhenzhong wrote: > >> -----Original Message----- >> From: Eric Auger >> Subject: Re: [PATCH rfcv1 3/6] intel_iommu: add set/unset_iommu_device >> callback >> >> Hi Zhenzhong, >> >> On 1/15/24 11:13, Zhenzhong Duan wrote: >>> From: Yi Liu >>> >>> This adds set/unset_iommu_device() implementation in Intel vIOMMU. >>> In set call, IOMMUFDDevice is recorded in hash table indexed by >>> PCI BDF. >>> >>> Signed-off-by: Yi Liu >>> Signed-off-by: Yi Sun >>> Signed-off-by: Zhenzhong Duan >>> --- >>> include/hw/i386/intel_iommu.h | 10 +++++ >>> hw/i386/intel_iommu.c | 79 >> +++++++++++++++++++++++++++++++++++ >>> 2 files changed, 89 insertions(+) >>> >>> diff --git a/include/hw/i386/intel_iommu.h >> b/include/hw/i386/intel_iommu.h >>> index 7fa0a695c8..c65fdde56f 100644 >>> --- a/include/hw/i386/intel_iommu.h >>> +++ b/include/hw/i386/intel_iommu.h >>> @@ -62,6 +62,7 @@ typedef union VTD_IR_TableEntry VTD_IR_TableEntry; >>> typedef union VTD_IR_MSIAddress VTD_IR_MSIAddress; >>> typedef struct VTDPASIDDirEntry VTDPASIDDirEntry; >>> typedef struct VTDPASIDEntry VTDPASIDEntry; >>> +typedef struct VTDIOMMUFDDevice VTDIOMMUFDDevice; >>> >>> /* Context-Entry */ >>> struct VTDContextEntry { >>> @@ -148,6 +149,13 @@ struct VTDAddressSpace { >>> IOVATree *iova_tree; >>> }; >>> >>> +struct VTDIOMMUFDDevice { >>> + PCIBus *bus; >>> + uint8_t devfn; >>> + IOMMUFDDevice *idev; >>> + IntelIOMMUState *iommu_state; >>> +}; >>> + >> Just wondering whether we shouldn't reuse the VTDAddressSpace to store >> the idev, if any. How have you made your choice. What will it become >> when PASID gets added? > VTDAddressSpace is indexed by aliased BDF, but VTDIOMMUFDDevice is indexed > by device's BDF. So we can't just store VTDIOMMUFDDevice as a pointer in > VTDAddressSpace, may need a list in case more than one device in same address > space. Then a global VTDIOMMUFDDevice list is better for lookup. OK but if several devices are hidden under an aliased BDF, can't they share the host properties (DMAR ecap/cap)? > > For PASID in modern mode which support stage-1 page table, we have > VTDPASIDAddressSpace indexed by device's BDF+PASID, We didn't use > VTDAddressSpace which is for stage-2 page table. OK Thanks Eric > > Thanks > Zhenzhong > >>> struct VTDIOTLBEntry { >>> uint64_t gfn; >>> uint16_t domain_id; >>> @@ -292,6 +300,8 @@ struct IntelIOMMUState { >>> /* list of registered notifiers */ >>> QLIST_HEAD(, VTDAddressSpace) vtd_as_with_notifiers; >>> >>> + GHashTable *vtd_iommufd_dev; /* VTDIOMMUFDDevice */ >>> + >>> /* interrupt remapping */ >>> bool intr_enabled; /* Whether guest enabled IR */ >>> dma_addr_t intr_root; /* Interrupt remapping table pointer */ >>> diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c >>> index ed5677c0ae..95faf697eb 100644 >>> --- a/hw/i386/intel_iommu.c >>> +++ b/hw/i386/intel_iommu.c >>> @@ -237,6 +237,13 @@ static gboolean vtd_as_equal(gconstpointer v1, >> gconstpointer v2) >>> (key1->pasid == key2->pasid); >>> } >>> >>> +static gboolean vtd_as_idev_equal(gconstpointer v1, gconstpointer v2) >>> +{ >>> + const struct vtd_as_key *key1 = v1; >>> + const struct vtd_as_key *key2 = v2; >>> + >>> + return (key1->bus == key2->bus) && (key1->devfn == key2->devfn); >>> +} >>> /* >>> * Note that we use pointer to PCIBus as the key, so hashing/shifting >>> * based on the pointer value is intended. Note that we deal with >>> @@ -3812,6 +3819,74 @@ VTDAddressSpace >> *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus, >>> return vtd_dev_as; >>> } >>> >>> +static int vtd_dev_set_iommu_device(PCIBus *bus, void *opaque, >> int32_t devfn, >>> + IOMMUFDDevice *idev, Error **errp) >>> +{ >>> + IntelIOMMUState *s = opaque; >>> + VTDIOMMUFDDevice *vtd_idev; >>> + struct vtd_as_key key = { >>> + .bus = bus, >>> + .devfn = devfn, >>> + }; >>> + struct vtd_as_key *new_key; >>> + >>> + assert(0 <= devfn && devfn < PCI_DEVFN_MAX); >>> + >>> + /* None IOMMUFD case */ >>> + if (!idev) { >>> + return 0; >>> + } >>> + >>> + vtd_iommu_lock(s); >>> + >>> + vtd_idev = g_hash_table_lookup(s->vtd_iommufd_dev, &key); >>> + >>> + if (vtd_idev) { >>> + error_setg(errp, "IOMMUFD device already exist"); >>> + return -1; >>> + } >>> + >>> + new_key = g_malloc(sizeof(*new_key)); >>> + new_key->bus = bus; >>> + new_key->devfn = devfn; >>> + >>> + vtd_idev = g_malloc0(sizeof(VTDIOMMUFDDevice)); >>> + vtd_idev->bus = bus; >>> + vtd_idev->devfn = (uint8_t)devfn; >>> + vtd_idev->iommu_state = s; >>> + vtd_idev->idev = idev; >>> + >>> + g_hash_table_insert(s->vtd_iommufd_dev, new_key, vtd_idev); >>> + >>> + vtd_iommu_unlock(s); >>> + >>> + return 0; >>> +} >>> + >>> +static void vtd_dev_unset_iommu_device(PCIBus *bus, void *opaque, >> int32_t devfn) >>> +{ >>> + IntelIOMMUState *s = opaque; >>> + VTDIOMMUFDDevice *vtd_idev; >>> + struct vtd_as_key key = { >>> + .bus = bus, >>> + .devfn = devfn, >>> + }; >>> + >>> + assert(0 <= devfn && devfn < PCI_DEVFN_MAX); >>> + >>> + vtd_iommu_lock(s); >>> + >>> + vtd_idev = g_hash_table_lookup(s->vtd_iommufd_dev, &key); >>> + if (!vtd_idev) { >>> + vtd_iommu_unlock(s); >>> + return; >>> + } >>> + >>> + g_hash_table_remove(s->vtd_iommufd_dev, &key); >>> + >>> + vtd_iommu_unlock(s); >>> +} >>> + >>> /* Unmap the whole range in the notifier's scope. */ >>> static void vtd_address_space_unmap(VTDAddressSpace *as, >> IOMMUNotifier *n) >>> { >>> @@ -4107,6 +4182,8 @@ static AddressSpace >> *vtd_host_dma_iommu(PCIBus *bus, void *opaque, int devfn) >>> static PCIIOMMUOps vtd_iommu_ops = { >>> .get_address_space = vtd_host_dma_iommu, >>> + .set_iommu_device = vtd_dev_set_iommu_device, >>> + .unset_iommu_device = vtd_dev_unset_iommu_device, >>> }; >>> >>> static bool vtd_decide_config(IntelIOMMUState *s, Error **errp) >>> @@ -4230,6 +4307,8 @@ static void vtd_realize(DeviceState *dev, Error >> **errp) >>> g_free, g_free); >>> s->vtd_address_spaces = g_hash_table_new_full(vtd_as_hash, >> vtd_as_equal, >>> g_free, g_free); >>> + s->vtd_iommufd_dev = g_hash_table_new_full(vtd_as_hash, >> vtd_as_idev_equal, >>> + g_free, g_free); >>> vtd_init(s); >>> pci_setup_iommu(bus, &vtd_iommu_ops, dev); >>> /* Pseudo address space under root PCI bus. */ >> Thanks >> >> Eric