Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp1645481rwi; Wed, 19 Oct 2022 13:25:16 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6+5liIDWuUoW65NPW/qL613PBqfdEw8brF9JgXq8T2GZ1Ld04+tynPGKsjbD2XfySun+Uj X-Received: by 2002:a05:6402:524e:b0:45d:cc84:8b38 with SMTP id t14-20020a056402524e00b0045dcc848b38mr9257537edd.297.1666211115998; Wed, 19 Oct 2022 13:25:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666211115; cv=none; d=google.com; s=arc-20160816; b=rvC04Zd+AfRYIzfOcdc2V0w3o7Eea2M/5f+VuGiY2aSjkLUo6tT9EboIlsht2BwmYJ n0DcLZspiMAPG9SMHqVkRCwoBzGNnIk6t/DUg2g3onJ3/vGWJ+VjcsEX5csUd7VPeXmG jlzIi8poF0/3xgAsRTshjjaXW/NWSCPu5e8OYKcXJmYWl1PGjJvj/6zLvhhD4xpJczoA a/eWk+r69Hr6Y1gsA8O46AkwfypOqzc74Rtct4iQbDc+hkZrgy/kHjLjkfnnkV5xGHj8 nEbpnw6Wr7Hs9vJ3h4h+Knmj9a6YVKK5YKF4qfMWcUGh64irxMzvdAQ59KIoBAxZZc5V 83lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:user-agent:references:message-id :in-reply-to:subject:cc:to:from:date:dkim-signature; bh=mrsC51kv3YKQqbFT3jmK6G5Z+M74JmJjtVaYyoE7XFI=; b=l5W+N9fobdI9gDkBrcEJJgpYNewK+GcYgeshUWfQb5aWmDqNykv+gRgprC5B4IZo+m 1zmTLp40pch35dJLX0k1hr8qN+j0MmSsjfnI5/Sfx9j9OqG0Zl0XE4USZNjYwZ34uLY3 8QB8UCqeTtnR/RajWo/iWJDaBZxvV165LaDbuR7gdxhoAQzzgwJi9c3tBlRPYb70qilV Q0bQ4v7yIORYf5JUW4lKbAKIsCW/pYs+d7RLNIVojLutSmIL3UUnkQnWqpa/DIsUpZVn OcUdyWU6G+Fbkq/wfJEjWJgridjfCE2+W5yE67Ibq/3DW6BhOHUR4xbisAhKMol+G9o9 sN1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SRl92ku7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q19-20020a056402519300b00450e1ffe3edsi15986980edd.382.2022.10.19.13.24.47; Wed, 19 Oct 2022 13:25:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SRl92ku7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231199AbiJSUOW (ORCPT + 99 others); Wed, 19 Oct 2022 16:14:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230244AbiJSUOR (ORCPT ); Wed, 19 Oct 2022 16:14:17 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50F621B867E for ; Wed, 19 Oct 2022 13:14:15 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 0C060B825E2 for ; Wed, 19 Oct 2022 20:14:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4D1CC433C1; Wed, 19 Oct 2022 20:14:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666210452; bh=FF9KbNdQHNh5m0gRXO+KOo0OL+lC7nTVEehSa0aIgP8=; h=Date:From:To:cc:Subject:In-Reply-To:References:From; b=SRl92ku75ud54oQvG8QH8BzfmVKYxQYsk+dzgPMOj0s+FUkIoFBmtl2p6aI/i1Vnw VJLWRDlYIGUMfie9r2qSSh3u99HN5fM+tLMo3S6ZdwlnUXR+6Or3hIr+y7KTZRUVWy LpWhuVgdg0iV/YrS7ySBJcgTUbnQrEgnPR6oJBorUCtwTqOMHgEmRBKJTMal59osZv 21K41MB9XgMD1uzxwAzO5ShGfrHfQTlY0Iq6vlyhsMX+zKSZVT5Qn/pnjPCUh2SRJO clK5e1+MHMSwiPeBHcv3QjXeecWSLUamp+7RY3N9nsiiVomlolBnTivGON9yjPlovl tUmsYBorV9soQ== Date: Wed, 19 Oct 2022 13:14:10 -0700 (PDT) From: Stefano Stabellini X-X-Sender: sstabellini@ubuntu-linux-20-04-desktop To: Oleksandr Tyshchenko cc: Stefano Stabellini , "xen-devel@lists.xenproject.org" , "linux-kernel@vger.kernel.org" , Juergen Gross , Oleksandr Tyshchenko Subject: Re: [PATCH V2] xen/virtio: Handle PCI devices which Host controller is described in DT In-Reply-To: Message-ID: References: <20221015153409.918775-1-olekstysh@gmail.com> User-Agent: Alpine 2.22 (DEB 394 2020-01-19) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="8323329-1494198937-1666210452=:3873" X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --8323329-1494198937-1666210452=:3873 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT On Wed, 19 Oct 2022, Oleksandr Tyshchenko wrote: > On 19.10.22 03:58, Stefano Stabellini wrote: > > On Sat, 15 Oct 2022, Oleksandr Tyshchenko wrote: > >> From: Oleksandr Tyshchenko > >> > >> Use the same "xen-grant-dma" device concept for the PCI devices > >> behind device-tree based PCI Host controller, but with one modification. > >> Unlike for platform devices, we cannot use generic IOMMU bindings > >> (iommus property), as we need to support more flexible configuration. > >> The problem is that PCI devices under the single PCI Host controller > >> may have the backends running in different Xen domains and thus have > >> different endpoints ID (backend domains ID). > >> > >> So use generic PCI-IOMMU bindings instead (iommu-map/iommu-map-mask > >> properties) which allows us to describe relationship between PCI > >> devices and backend domains ID properly. > >> > >> Signed-off-by: Oleksandr Tyshchenko > > Now that I understood the approach and the reasons for it, I can review > > the patch :-) > > perfect, thanks. > > > > > > Please add an example of the bindings in the commit message. > > ok, will do > > > > > > > >> --- > >> Slightly RFC. This is needed to support Xen grant mappings for virtio-pci devices > >> on Arm at some point in the future. The Xen toolstack side is not completely ready yet. > >> Here, for PCI devices we use more flexible way to pass backend domid to the guest > >> than for platform devices. > >> > >> Changes V1 -> V2: > >> - update commit description > >> - rebase > >> - rework to use generic PCI-IOMMU bindings instead of generic IOMMU bindings > >> > >> Previous discussion is at: > >> https://urldefense.com/v3/__https://lore.kernel.org/xen-devel/20221006174804.2003029-1-olekstysh@gmail.com/__;!!GF_29dbcQIUBPA!xJPdZO3-3Wmgo_79HuDsD53RkH_eAN96NmwuwFE7dArt_xNYGdD6LeLsq4B_QPrrvX-x23tJl6jQlNqgyNjgzT2NE3Pqjg$ [lore[.]kernel[.]org] > >> > >> Based on: > >> https://urldefense.com/v3/__https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git/log/?h=for-linus-6.1__;!!GF_29dbcQIUBPA!xJPdZO3-3Wmgo_79HuDsD53RkH_eAN96NmwuwFE7dArt_xNYGdD6LeLsq4B_QPrrvX-x23tJl6jQlNqgyNjgzT2J40LOxg$ [git[.]kernel[.]org] > >> --- > >> drivers/xen/grant-dma-ops.c | 87 ++++++++++++++++++++++++++++++++----- > >> 1 file changed, 76 insertions(+), 11 deletions(-) > >> > >> diff --git a/drivers/xen/grant-dma-ops.c b/drivers/xen/grant-dma-ops.c > >> index daa525df7bdc..b79d9d6ce154 100644 > >> --- a/drivers/xen/grant-dma-ops.c > >> +++ b/drivers/xen/grant-dma-ops.c > >> @@ -10,6 +10,7 @@ > >> #include > >> #include > >> #include > >> +#include > >> #include > >> #include > >> #include > >> @@ -292,12 +293,55 @@ static const struct dma_map_ops xen_grant_dma_ops = { > >> .dma_supported = xen_grant_dma_supported, > >> }; > >> > >> +static struct device_node *xen_dt_get_pci_host_node(struct device *dev) > >> +{ > >> + struct pci_dev *pdev = to_pci_dev(dev); > >> + struct pci_bus *bus = pdev->bus; > >> + > >> + /* Walk up to the root bus to look for PCI Host controller */ > >> + while (!pci_is_root_bus(bus)) > >> + bus = bus->parent; > >> + > >> + return of_node_get(bus->bridge->parent->of_node); > >> +} > > It seems silly that we need to walk the hierachy that way, but I > > couldn't find another way to do it > > I also couldn't, but is it a really problem? This code is only gets > called during initialization. > > > > > > > >> +static struct device_node *xen_dt_get_node(struct device *dev) > >> +{ > >> + if (dev_is_pci(dev)) > >> + return xen_dt_get_pci_host_node(dev); > >> + > >> + return of_node_get(dev->of_node); > >> +} > >> + > >> +static int xen_dt_map_id(struct device *dev, struct device_node **iommu_np, > >> + u32 *sid) > >> +{ > >> + struct pci_dev *pdev = to_pci_dev(dev); > >> + u32 rid = PCI_DEVID(pdev->bus->number, pdev->devfn); > >> + struct device_node *host_np; > >> + int ret; > >> + > >> + host_np = xen_dt_get_pci_host_node(dev); > >> + if (!host_np) > >> + return -ENODEV; > >> + > >> + ret = of_map_id(host_np, rid, "iommu-map", "iommu-map-mask", iommu_np, sid); > >> + of_node_put(host_np); > >> + return ret; > >> +} > >> + > >> static bool xen_is_dt_grant_dma_device(struct device *dev) > >> { > >> - struct device_node *iommu_np; > >> + struct device_node *iommu_np = NULL; > >> bool has_iommu; > >> > >> - iommu_np = of_parse_phandle(dev->of_node, "iommus", 0); > >> + if (dev_is_pci(dev)) { > >> + if (xen_dt_map_id(dev, &iommu_np, NULL)) > >> + return false; > >> + } else > >> + iommu_np = of_parse_phandle(dev->of_node, "iommus", 0); > >> + > >> has_iommu = iommu_np && > >> of_device_is_compatible(iommu_np, "xen,grant-dma"); > >> of_node_put(iommu_np); > >> @@ -307,9 +351,17 @@ static bool xen_is_dt_grant_dma_device(struct device *dev) > >> > >> bool xen_is_grant_dma_device(struct device *dev) > >> { > >> + struct device_node *np; > >> + > >> /* XXX Handle only DT devices for now */ > >> - if (dev->of_node) > >> - return xen_is_dt_grant_dma_device(dev); > >> + np = xen_dt_get_node(dev); > >> + if (np) { > >> + bool ret; > >> + > >> + ret = xen_is_dt_grant_dma_device(dev); > >> + of_node_put(np); > >> + return ret; > >> + } > > We don't need to walk the PCI hierachy twice. Maybe we can add the > > of_node check directly to xen_is_dt_grant_dma_device? > > > Good point. I was thinking that we would likely need the following > construct is the future: > > > if (np) /* DT device */ >    return xen_is_dt_grant_dma_device(dev); > else /* ACPI device */ >    return xen_is_acpi_grant_dma_device(dev); > > > So, if we use the check directly in xen_is_dt_grant_dma_device() and it > returns false we won't be able to recognize a reason then > (whether dev is not related to DT, or it is related to DT but it is not > a "xen,grant-dma" device). That problem can easily be solved by having xen_is_dt_grant_dma_device return more than 2 possible values. It could return an int for example, with 3 valid values. > But, I am ok to eliminate one walk right now, then we will see. > > xen_is_grant_dma_device() will became the following: > > bool xen_is_grant_dma_device(struct device *dev) > { >     return xen_is_dt_grant_dma_device(dev); > } > > xen_is_dt_grant_dma_device() will need to gain a check that dev->of_node > is not a NULL. > > > Shall I? --8323329-1494198937-1666210452=:3873--