From patchwork Tue Oct 25 16:20:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Tyshchenko X-Patchwork-Id: 10884 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1101990wru; Tue, 25 Oct 2022 09:33:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4GF1n7lViho3BMKGR5U8CE+fEfTPZajSgDtS3dhUKRgbIlyJjaBlFWKDNtEpBZdUOW7zZl X-Received: by 2002:a17:907:3f85:b0:733:3f0e:2f28 with SMTP id hr5-20020a1709073f8500b007333f0e2f28mr32105969ejc.376.1666715622937; Tue, 25 Oct 2022 09:33:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666715622; cv=none; d=google.com; s=arc-20160816; b=XjoUlghqK+xbZGIGsojNTZVk84dENJyDMS1Us6tWkK4wpoY8vW9WeZD4j3XqGBixb2 iGeA+YZr/ITTcQsrV20FPP8D4GeP9y746MfZ+pmu4ga4oHEX6vnw/Rfv5wzCz+mUPrVs akzxozHskL9JVrxJGJPzBcfl15dD83lX0rHWDOhmaXjrtiu4H5MT45hCahuUbPuYQuOJ aF8Pgu0rlWcXIJFgBEuJ3uiAmNTJ3DhJhxNVTP9VI5Iyxw+fLrYLss+s7JIEINfM8Iq+ mEqxv7Q0dQKIY2eeO59ALhRbMQSPnmJuq5LETAMb4Q6kXMuN2QbW0C8SebAuj5ftGBav hkGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UV2oUhVEfu6LblayNLcdu/AQ1PbbiXWA9+mIDyTGomE=; b=Tl6+IJHBeL1d4zqxbnaWFhqQO8cKVUKUxKUc1JmZrzyM6YOeXrSJhfTDOf9J0JY0Yj 9YHYTn7Kr1lJK+2QbOwRP0UNfWL9fN5hyZ1On7VZDp1EBXQAcpjPnAix61lHCNVdyNxe JPsrM0XYxgjkptTBuxjFWSKjYqDscd8QIlUSU58PPl0Z6EThlU4lyi+dNdSZQlDCK4iM nY3KAa+BcJxcIIMPMRgBwN4qMChmwExSRrTnFsTypKKMhQ6dEKwX075aAkYalcuOWgSe jzD84yOKudDl2YMu8H5DXG0VpXxKjeeAf1Vi1mFRIjVXgz4hu5vygb5rwdQygGIzJBho z81w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=jHP8brom; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b23-20020aa7cd17000000b0045d4f995ac0si2661027edw.588.2022.10.25.09.33.18; Tue, 25 Oct 2022 09:33:42 -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=@gmail.com header.s=20210112 header.b=jHP8brom; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232742AbiJYQUU (ORCPT + 99 others); Tue, 25 Oct 2022 12:20:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232324AbiJYQUQ (ORCPT ); Tue, 25 Oct 2022 12:20:16 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B18638050E for ; Tue, 25 Oct 2022 09:20:12 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id b1so22988571lfs.7 for ; Tue, 25 Oct 2022 09:20:12 -0700 (PDT) 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=FX1wprVa6KGGZHpQ/x7r61paYNkOuGGcdC5hbRR/lau9TJzv8Da9QK8D2YW1lF66Ib XHAklBfnU9WgQDpQf6e5d1aaQxm1MJbA1bs/LPkKeXSrhPEIxLCah7Y0VshizNQFxrst Pq6QYTzY/pGIWKlf7+PNCqEjbSGSLy57CaH4TGuyJrjf/a8mAH4QhUK7ErofnUbxomgD h4oaOqpvVjRMvot3Oxd2c4ZPU6s9AF18yZdYAnCIzA3+bfVxwloN3schyNg6I7dkh6lr jNNj83rCb02Umc3T8pchVlrcGGDIv1IDKf4BYze2+tVRuqzXxUJnA5Y0BUZ67jUkXuUc a22g== X-Gm-Message-State: ACrzQf0FtbLRnN6ny+q4NwM7mBL0bOPLrSxPwKaFnSW10lgPjjENEtUE 7nR9Z+tpI7rQXUF/NDkWkAg= 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) 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) 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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747678001256103499?= X-GMAIL-MSGID: =?utf-8?q?1747678001256103499?= 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: Xenia Ragiadakou Reviewed-by: Stefano Stabellini --- 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; 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); 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 = { .dma_supported = xen_grant_dma_supported, }; -static bool xen_is_dt_grant_dma_device(struct device *dev) -{ - struct device_node *iommu_np; - bool has_iommu; - - 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); - - 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; 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; } if (!of_device_is_compatible(iommu_spec.np, "xen,grant-dma") || iommu_spec.args_count != 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 device *dev, * The endpoint ID here means the ID of the domain where the * corresponding backend is running */ - data->backend_domid = iommu_spec.args[0]; + *backend_domid = iommu_spec.args[0]; return 0; } -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 = -ENODEV; + + if (dev->of_node) { + ret = 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 = 0; + ret = 0; + } + + return ret; +} + +static void xen_grant_setup_dma_ops(struct device *dev, domid_t backend_domid) { struct xen_grant_dma_data *data; @@ -365,16 +351,7 @@ void xen_grant_setup_dma_ops(struct device *dev) if (!data) goto err; - 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 = 0; - } else { - /* XXX ACPI device unsupported for now */ - goto err; - } + data->backend_domid = backend_domid; 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) bool xen_virtio_restricted_mem_acc(struct virtio_device *dev) { - bool ret = xen_virtio_mem_acc(dev); + domid_t backend_domid; - 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; + } - return ret; + return false; } 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 = &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 */ #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; -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;