From nobody Fri May 17 07:47:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1666714839; cv=none; d=zohomail.com; s=zohoarc; b=Xm+/9UghwqcOzV++NxztuInv2ZNVaD24/++2PZj4o0MzbPkvddwJoFthLG7tgHPeFaijnDORKf/psnun2l8eIJ6RtVI+WwLH3JcZbkDNUbENCwY3M+two9qUxbGEWF+AiFAtGjcPNgKYhS+yPf0wMPOyHl6P/wkYt62ac5/j0N0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666714839; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UV2oUhVEfu6LblayNLcdu/AQ1PbbiXWA9+mIDyTGomE=; b=b7/7BZbEnrtWoWEpInDXXLRMHLYnahQG7zUbVcarDMbIzI2DDcuqhO4No/2Lb6UJOOAj/+f4QUen07eeD6scjmX+IS+RlD4zZFbbh8yHqXotRUtbpzE7Rb0/k2uCQ5b7ib4bCq5yHqTc9Ny52ooJ5An/4WH05tQiJIR6Dsmz8eM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1666714839248242.87690183630536; Tue, 25 Oct 2022 09:20:39 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.429990.681405 (Exim 4.92) (envelope-from ) id 1onMf1-0001vz-EK; Tue, 25 Oct 2022 16:20:15 +0000 Received: by outflank-mailman (output) from mailman id 429990.681405; Tue, 25 Oct 2022 16:20:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1onMf1-0001vs-BX; Tue, 25 Oct 2022 16:20:15 +0000 Received: by outflank-mailman (input) for mailman id 429990; Tue, 25 Oct 2022 16:20:13 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1onMez-0001rM-D1 for xen-devel@lists.xenproject.org; Tue, 25 Oct 2022 16:20:13 +0000 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [2a00:1450:4864:20::136]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e685419e-5480-11ed-8fd0-01056ac49cbb; Tue, 25 Oct 2022 18:20:11 +0200 (CEST) Received: by mail-lf1-x136.google.com with SMTP id j16so3396894lfe.12 for ; Tue, 25 Oct 2022 09:20:11 -0700 (PDT) Received: from otyshchenko.router ([212.22.223.21]) by smtp.gmail.com with ESMTPSA id a16-20020a2eb550000000b002770302bdffsm540136ljn.105.2022.10.25.09.20.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Oct 2022 09:20:10 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e685419e-5480-11ed-8fd0-01056ac49cbb DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UV2oUhVEfu6LblayNLcdu/AQ1PbbiXWA9+mIDyTGomE=; b=jHP8bromagJtShAR4OXQqOiiJnYOMZ99PKWZmleaWTvbqPcpz+1WleJuAYpfL7lg2D I6Qaq/wQzFvNdBhh5APfDP0dBEMs9x9bSepGL4BZxmDiKWc5lcm8z3EQV65vVVayn0+8 eYL9t7oKfgH94k2clhjYAywHHF36WGOQy5Iu6BFyV//AMTlyEjF+bSTCVbTV9FHTFPjO lqhAEbSWveWcXPsD08vtJi9A/YilEMzV0lx/zp6Yu7wh5+vA0nGuC/8wGquRG/5J4vby 1gSkgUzUP5Qj2w+8mVKNvowFNLA+aBXoBtFAtG3qAUkgv0b++3IOaYgwC25AgKLHpNB1 W/dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UV2oUhVEfu6LblayNLcdu/AQ1PbbiXWA9+mIDyTGomE=; b=Yfdc2TVcKlWId91w8GxeRjn9e1SzwUAr0Jjl/mkVIjw+j/PVgb5H4UKzvzqzYa+Utv ukhB2LmK/V1cQAQ6iIU6hxLq6HSP7nG4Pjz8oyeotWSiDhYH18SA3qiuRoYd6YM/PoXE S53o+e6v6BgL/kgv0L9GpmvJRF9MXWft7I7vnHp03+87kzGZu3aDgB8JmzXSIysWwKue Wz9uJWXv/zfg451Efp5Wu6PVTCP3BFPyKXzGQ7scrLIQyfs7RWgihfLBbfrbjsPDieT2 CgPWtqkkKlpazNKi70pFUnygg8lfvhLRkyD5kmQPJ4LwTc4Bm+TXipq5jfQH7h44XlQQ Fi7Q== X-Gm-Message-State: ACrzQf2Io71zMAmii4ocktpBVoR9gZ3TBaFoP0d5FQP8jdcWln5VVkFE U13v+QRSNCDNqlnVGCz4goDYipsj9q8= X-Google-Smtp-Source: AMsMyM7vTkKKKxpLC2kahjXumjJuMQ9qspfZXCsmk6MxMMlz27MpanKsalOSPJ4gBzGwfkX8DmkhEg== X-Received: by 2002:a19:3857:0:b0:4ac:eca1:9275 with SMTP id d23-20020a193857000000b004aceca19275mr2862744lfj.97.1666714810866; Tue, 25 Oct 2022 09:20:10 -0700 (PDT) From: Oleksandr Tyshchenko To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Oleksandr Tyshchenko , Catalin Marinas , Russell King , Stefano Stabellini , Juergen Gross , Xenia Ragiadakou Subject: [PATCH V4 1/2] xen/virtio: Optimize the setup of "xen-grant-dma" devices Date: Tue, 25 Oct 2022 19:20:03 +0300 Message-Id: <20221025162004.8501-2-olekstysh@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221025162004.8501-1-olekstysh@gmail.com> References: <20221025162004.8501-1-olekstysh@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1666714839763100001 Content-Type: text/plain; charset="utf-8" From: Oleksandr Tyshchenko This is needed to avoid having to parse the same device-tree several times for a given device. For this to work we need to install the xen_virtio_restricted_mem_acc callback in Arm's xen_guest_init() which is same callback as x86's PV and HVM modes already use and remove the manual assignment in xen_setup_dma_ops(). Also we need to split the code to initialize backend_domid into a separate function. Prior to current patch we parsed the device-tree three times: 1. xen_setup_dma_ops()->...->xen_is_dt_grant_dma_device() 2. xen_setup_dma_ops()->...->xen_dt_grant_init_backend_domid() 3. xen_virtio_mem_acc()->...->xen_is_dt_grant_dma_device() With current patch we parse the device-tree only once in xen_virtio_restricted_mem_acc()->...->xen_dt_grant_init_backend_domid() Other benefits are: - Not diverge from x86 when setting up Xen grant DMA ops - Drop several global functions Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Stefano Stabellini Reviewed-by: Xenia Ragiadakou --- New patch --- arch/arm/xen/enlighten.c | 2 +- drivers/xen/grant-dma-ops.c | 77 ++++++++++++++----------------------- include/xen/arm/xen-ops.h | 4 +- include/xen/xen-ops.h | 16 -------- 4 files changed, 30 insertions(+), 69 deletions(-) diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 93c8ccbf2982..7d59765aef22 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -445,7 +445,7 @@ static int __init xen_guest_init(void) return 0; =20 if (IS_ENABLED(CONFIG_XEN_VIRTIO)) - virtio_set_mem_acc_cb(xen_virtio_mem_acc); + virtio_set_mem_acc_cb(xen_virtio_restricted_mem_acc); =20 if (!acpi_disabled) xen_acpi_guest_init(); diff --git a/drivers/xen/grant-dma-ops.c b/drivers/xen/grant-dma-ops.c index daa525df7bdc..1e797a043980 100644 --- a/drivers/xen/grant-dma-ops.c +++ b/drivers/xen/grant-dma-ops.c @@ -292,50 +292,20 @@ static const struct dma_map_ops xen_grant_dma_ops =3D= { .dma_supported =3D xen_grant_dma_supported, }; =20 -static bool xen_is_dt_grant_dma_device(struct device *dev) -{ - struct device_node *iommu_np; - bool has_iommu; - - iommu_np =3D of_parse_phandle(dev->of_node, "iommus", 0); - has_iommu =3D iommu_np && - of_device_is_compatible(iommu_np, "xen,grant-dma"); - of_node_put(iommu_np); - - return has_iommu; -} - -bool xen_is_grant_dma_device(struct device *dev) -{ - /* XXX Handle only DT devices for now */ - if (dev->of_node) - return xen_is_dt_grant_dma_device(dev); - - return false; -} - -bool xen_virtio_mem_acc(struct virtio_device *dev) -{ - if (IS_ENABLED(CONFIG_XEN_VIRTIO_FORCE_GRANT) || xen_pv_domain()) - return true; - - return xen_is_grant_dma_device(dev->dev.parent); -} - static int xen_dt_grant_init_backend_domid(struct device *dev, - struct xen_grant_dma_data *data) + domid_t *backend_domid) { struct of_phandle_args iommu_spec; =20 if (of_parse_phandle_with_args(dev->of_node, "iommus", "#iommu-cells", 0, &iommu_spec)) { - dev_err(dev, "Cannot parse iommus property\n"); + dev_dbg(dev, "Cannot parse iommus property\n"); return -ESRCH; } =20 if (!of_device_is_compatible(iommu_spec.np, "xen,grant-dma") || iommu_spec.args_count !=3D 1) { - dev_err(dev, "Incompatible IOMMU node\n"); + dev_dbg(dev, "Incompatible IOMMU node\n"); of_node_put(iommu_spec.np); return -ESRCH; } @@ -346,12 +316,28 @@ static int xen_dt_grant_init_backend_domid(struct dev= ice *dev, * The endpoint ID here means the ID of the domain where the * corresponding backend is running */ - data->backend_domid =3D iommu_spec.args[0]; + *backend_domid =3D iommu_spec.args[0]; =20 return 0; } =20 -void xen_grant_setup_dma_ops(struct device *dev) +static int xen_grant_init_backend_domid(struct device *dev, + domid_t *backend_domid) +{ + int ret =3D -ENODEV; + + if (dev->of_node) { + ret =3D xen_dt_grant_init_backend_domid(dev, backend_domid); + } else if (IS_ENABLED(CONFIG_XEN_VIRTIO_FORCE_GRANT) || xen_pv_domain()) { + dev_info(dev, "Using dom0 as backend\n"); + *backend_domid =3D 0; + ret =3D 0; + } + + return ret; +} + +static void xen_grant_setup_dma_ops(struct device *dev, domid_t backend_do= mid) { struct xen_grant_dma_data *data; =20 @@ -365,16 +351,7 @@ void xen_grant_setup_dma_ops(struct device *dev) if (!data) goto err; =20 - if (dev->of_node) { - if (xen_dt_grant_init_backend_domid(dev, data)) - goto err; - } else if (IS_ENABLED(CONFIG_XEN_VIRTIO_FORCE_GRANT)) { - dev_info(dev, "Using dom0 as backend\n"); - data->backend_domid =3D 0; - } else { - /* XXX ACPI device unsupported for now */ - goto err; - } + data->backend_domid =3D backend_domid; =20 if (store_xen_grant_dma_data(dev, data)) { dev_err(dev, "Cannot store Xen grant DMA data\n"); @@ -392,12 +369,14 @@ void xen_grant_setup_dma_ops(struct device *dev) =20 bool xen_virtio_restricted_mem_acc(struct virtio_device *dev) { - bool ret =3D xen_virtio_mem_acc(dev); + domid_t backend_domid; =20 - if (ret) - xen_grant_setup_dma_ops(dev->dev.parent); + if (!xen_grant_init_backend_domid(dev->dev.parent, &backend_domid)) { + xen_grant_setup_dma_ops(dev->dev.parent, backend_domid); + return true; + } =20 - return ret; + return false; } =20 MODULE_DESCRIPTION("Xen grant DMA-mapping layer"); diff --git a/include/xen/arm/xen-ops.h b/include/xen/arm/xen-ops.h index b0766a660338..70073f5a2b54 100644 --- a/include/xen/arm/xen-ops.h +++ b/include/xen/arm/xen-ops.h @@ -8,9 +8,7 @@ static inline void xen_setup_dma_ops(struct device *dev) { #ifdef CONFIG_XEN - if (xen_is_grant_dma_device(dev)) - xen_grant_setup_dma_ops(dev); - else if (xen_swiotlb_detect()) + if (xen_swiotlb_detect()) dev->dma_ops =3D &xen_swiotlb_dma_ops; #endif } diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h index a34f4271a2e9..47f11bec5e90 100644 --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h @@ -216,26 +216,10 @@ static inline void xen_preemptible_hcall_end(void) { } #endif /* CONFIG_XEN_PV && !CONFIG_PREEMPTION */ =20 #ifdef CONFIG_XEN_GRANT_DMA_OPS -void xen_grant_setup_dma_ops(struct device *dev); -bool xen_is_grant_dma_device(struct device *dev); -bool xen_virtio_mem_acc(struct virtio_device *dev); bool xen_virtio_restricted_mem_acc(struct virtio_device *dev); #else -static inline void xen_grant_setup_dma_ops(struct device *dev) -{ -} -static inline bool xen_is_grant_dma_device(struct device *dev) -{ - return false; -} - struct virtio_device; =20 -static inline bool xen_virtio_mem_acc(struct virtio_device *dev) -{ - return false; -} - static inline bool xen_virtio_restricted_mem_acc(struct virtio_device *dev) { return false; --=20 2.25.1 From nobody Fri May 17 07:47:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1666714841; cv=none; d=zohomail.com; s=zohoarc; b=NnzkCcS8CWHELdAymIQ+JFDfS/gyTbboQ1OwDgBhhnwmS1cGS6vUvG2rXvij4N/L7CeS3l4TvcQRjPffzmAl1qqjwgury7YmswSElD2ODnty0wKEiJSbHaEZgCrH9lqZ9mQPklWWepq3fWkTt1l+HFh1s/k9P6S3dZOcB82Xtd0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666714841; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CPiIK7IlsJ7E5VINPN3ej70LIynHg49PxYxMULv6O+g=; b=itFWd8pjebjJNZ2RvOCo38fpy2pnuX7erNmk2Wci4aZfCL6xznE1Z833Fgg20s2rtU/9KTVJMuW7NT7Ew9YOuuanhr571hzIlLy7TE68KWues4clY7JJjxCLXS26+UI+q8mOXvrz/B/LWzhibyMQ63EBJILHxhYZKpdWOGV3RfI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1666714841268140.57978833579443; Tue, 25 Oct 2022 09:20:41 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.429991.681412 (Exim 4.92) (envelope-from ) id 1onMf1-000202-QG; Tue, 25 Oct 2022 16:20:15 +0000 Received: by outflank-mailman (output) from mailman id 429991.681412; Tue, 25 Oct 2022 16:20:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1onMf1-0001zi-ME; Tue, 25 Oct 2022 16:20:15 +0000 Received: by outflank-mailman (input) for mailman id 429991; Tue, 25 Oct 2022 16:20:14 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1onMf0-0001rM-6V for xen-devel@lists.xenproject.org; Tue, 25 Oct 2022 16:20:14 +0000 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [2a00:1450:4864:20::235]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e7435efd-5480-11ed-8fd0-01056ac49cbb; Tue, 25 Oct 2022 18:20:13 +0200 (CEST) Received: by mail-lj1-x235.google.com with SMTP id bn35so8968089ljb.5 for ; Tue, 25 Oct 2022 09:20:13 -0700 (PDT) Received: from otyshchenko.router ([212.22.223.21]) by smtp.gmail.com with ESMTPSA id a16-20020a2eb550000000b002770302bdffsm540136ljn.105.2022.10.25.09.20.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Oct 2022 09:20:11 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e7435efd-5480-11ed-8fd0-01056ac49cbb DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CPiIK7IlsJ7E5VINPN3ej70LIynHg49PxYxMULv6O+g=; b=Mcz2WFP8uCN+2nT+Y2LCXeXAkKPmjH58QmfnmrZDOcN5K+WTU1Mcmjc/sFiQ90Bg/t iXNEQCCA+E/XCB83vWVHG0V6MPAib92POhRWkYfk5ka1gkSSEt+bQpjEWq/8lbYkIU47 Qs6eTgoLMfjLQlEgA0MhoYBOoKGLl1E/5LpfAyhxMTJBUIZSjejfGvCjir8IMkmKJ0Kp hMc/y55iOxg9vqAcs2CTMCZNI+Vxr0Pwzx00U42fhwCvw8zAFp4qDdkLj+YdFzQCuhQp mbrxa+MAlZEHS/+kprmjC+KVPUcTjOvZTzB2rAWsHtjgStKg5yumkz3HxKOEOf2ahil3 Yy2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CPiIK7IlsJ7E5VINPN3ej70LIynHg49PxYxMULv6O+g=; b=OV/kwUaeNWj+fOf9jTrHyQC8LanWvG0CM+gXb0NU2WZ+cbcssYjXGuLMgpE6/bDJJs pgBoeewYeOnmg1vgn6Vq/lbEIF0yoOQuVHfyYWa29e7eEy6Wl8ybQt3QGICDokOFO8v4 O5qIMnKVFgk0Ej7voJpNzPho+gg7tHCejEgkGPyC15wUyfABbhcUmssL7MAY7RCUYT/g 0FpfsHNvazkCLBgmLKoH6o/pKiL7BYN81+TCJtU2QYHzkEr88VXGW31hxKRxLyLwwP58 eknWsd9mWDL8dmAqpPxmmNZknDKRxRvf5ovv4EaJAK2AA7bK//i7d1o1GpieJV2bpf2n CZDQ== X-Gm-Message-State: ACrzQf1hUvuCBYCekm+HLWuLWmO6sbVyZcgf7/sa6lcg8NbPv2a537e6 21bVxFrluW5Igty7V9oLLEOHFui8KNE= X-Google-Smtp-Source: AMsMyM62fltFfmb8eUA4lFmsFonT3s3D9baIIhB+ZUg06Ktu/2pzGx7vkhjbjBeMjDCfkQWNML2TEg== X-Received: by 2002:a05:651c:33c:b0:277:e2b:de4a with SMTP id b28-20020a05651c033c00b002770e2bde4amr3738346ljp.55.1666714812379; Tue, 25 Oct 2022 09:20:12 -0700 (PDT) From: Oleksandr Tyshchenko To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org Cc: Oleksandr Tyshchenko , Stefano Stabellini , Juergen Gross , Xenia Ragiadakou Subject: [PATCH V4 2/2] xen/virtio: Handle PCI devices which Host controller is described in DT Date: Tue, 25 Oct 2022 19:20:04 +0300 Message-Id: <20221025162004.8501-3-olekstysh@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221025162004.8501-1-olekstysh@gmail.com> References: <20221025162004.8501-1-olekstysh@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1666714841707100003 Content-Type: text/plain; charset="utf-8" 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). Add ability to deal with generic PCI-IOMMU bindings (iommu-map/ iommu-map-mask properties) which allows us to describe relationship between PCI devices and backend domains ID properly. To avoid having to look up for the PCI Host bridge twice and reduce the amount of checks pass an extra struct device_node *np to xen_dt_grant_init_backend_domid(). So with current patch the code expects iommus property for the platform devices and iommu-map/iommu-map-mask properties for PCI devices. The example of generated by the toolstack iommu-map property for two PCI devices 0000:00:01.0 and 0000:00:02.0 whose backends are running in different Xen domains with IDs 1 and 2 respectively: iommu-map =3D <0x08 0xfde9 0x01 0x08 0x10 0xfde9 0x02 0x08>; Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Stefano Stabellini Reviewed-by: Xenia Ragiadakou --- Slightly RFC. This is needed to support Xen grant mappings for virtio-pci d= evices on Arm at some point in the future. The Xen toolstack side is not completel= y 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 bind= ings Changes V2 -> V3: - update commit description, add an example - drop xen_dt_map_id() and squash xen_dt_get_pci_host_node() with xen_dt_get_node() - pass struct device_node *np to xen_is_dt_grant_dma_device() and xen_dt_grant_init_backend_domid() - pass domid_t *backend_domid instead of struct xen_grant_dma_data *data to xen_dt_grant_init_backend_domid() Changes V3 -> V4: - just rebase on new prereq patch "xen/virtio: Optimize the setup of "xen-grant-dma" devices" Previous discussion is at: https://lore.kernel.org/xen-devel/20221006174804.2003029-1-olekstysh@gmail.= com/ https://lore.kernel.org/xen-devel/20221015153409.918775-1-olekstysh@gmail.c= om/ https://lore.kernel.org/xen-devel/20221021172408.77397-1-olekstysh@gmail.co= m/ Based on: https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git/log/?h=3Dfor-li= nus-6.1 --- --- drivers/xen/grant-dma-ops.c | 46 +++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 7 deletions(-) diff --git a/drivers/xen/grant-dma-ops.c b/drivers/xen/grant-dma-ops.c index 1e797a043980..9784a77fa3c9 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,15 +293,43 @@ static const struct dma_map_ops xen_grant_dma_ops =3D= { .dma_supported =3D xen_grant_dma_supported, }; =20 +static struct device_node *xen_dt_get_node(struct device *dev) +{ + if (dev_is_pci(dev)) { + struct pci_dev *pdev =3D to_pci_dev(dev); + struct pci_bus *bus =3D pdev->bus; + + /* Walk up to the root bus to look for PCI Host controller */ + while (!pci_is_root_bus(bus)) + bus =3D bus->parent; + + return of_node_get(bus->bridge->parent->of_node); + } + + return of_node_get(dev->of_node); +} + static int xen_dt_grant_init_backend_domid(struct device *dev, + struct device_node *np, domid_t *backend_domid) { - struct of_phandle_args iommu_spec; + struct of_phandle_args iommu_spec =3D { .args_count =3D 1 }; =20 - if (of_parse_phandle_with_args(dev->of_node, "iommus", "#iommu-cells", - 0, &iommu_spec)) { - dev_dbg(dev, "Cannot parse iommus property\n"); - return -ESRCH; + if (dev_is_pci(dev)) { + struct pci_dev *pdev =3D to_pci_dev(dev); + u32 rid =3D PCI_DEVID(pdev->bus->number, pdev->devfn); + + if (of_map_id(np, rid, "iommu-map", "iommu-map-mask", &iommu_spec.np, + iommu_spec.args)) { + dev_dbg(dev, "Cannot translate ID\n"); + return -ESRCH; + } + } else { + if (of_parse_phandle_with_args(np, "iommus", "#iommu-cells", + 0, &iommu_spec)) { + dev_dbg(dev, "Cannot parse iommus property\n"); + return -ESRCH; + } } =20 if (!of_device_is_compatible(iommu_spec.np, "xen,grant-dma") || @@ -324,10 +353,13 @@ static int xen_dt_grant_init_backend_domid(struct dev= ice *dev, static int xen_grant_init_backend_domid(struct device *dev, domid_t *backend_domid) { + struct device_node *np; int ret =3D -ENODEV; =20 - if (dev->of_node) { - ret =3D xen_dt_grant_init_backend_domid(dev, backend_domid); + np =3D xen_dt_get_node(dev); + if (np) { + ret =3D xen_dt_grant_init_backend_domid(dev, np, backend_domid); + of_node_put(np); } else if (IS_ENABLED(CONFIG_XEN_VIRTIO_FORCE_GRANT) || xen_pv_domain()) { dev_info(dev, "Using dom0 as backend\n"); *backend_domid =3D 0; --=20 2.25.1