Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp6899773imu; Mon, 3 Dec 2018 04:46:44 -0800 (PST) X-Google-Smtp-Source: AFSGD/VW5aahh9VV62KEjfy5o0KrU2UO6/v/8eVvLLFE2FiCV4fOC64WPcps0WGDu8LaJz7RxoJo X-Received: by 2002:a63:1a0c:: with SMTP id a12mr12881595pga.157.1543841204541; Mon, 03 Dec 2018 04:46:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543841204; cv=none; d=google.com; s=arc-20160816; b=FKD05+IOZtuv7Y/9QGjiL8n2B6k3fNbxcxvUM3NQFGUa/1l3GjPnRURc66IS6IUbtz omumetq7vaMe+7BmTY4VmF4ymmwFw/JZoSnyzYBhIfnYSUOOrz0KWLpSsmGfv21HyMyF OgqkCNsvv7d/no/NM/GWaRrcTuDknI55JKqVp2iHalNvrT4+MJk605Bed0wYntxHXKPj Y5dCW4JZx/Vb+KGKaIeWrFANgUE99tnpBSm7QmCJZaFQFPy8pVlBhkLS4sGmIvJ6M5/F vA9WIerECSLNd7A/OPkuptv4Qf4ho8I1pfDrf8wTFibQ09dpw3q0RJfTHFDwPYxjnxKj NiAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject; bh=ijr4ZCdkb6pi7pjbqHdOyQrsEAqg6hLI4W2wSsMPBXM=; b=BhvhnL7HX867Efe4gq9ZHFof2q1ScN9TOPDS7uTP2hV5cia/zr7nVUkyKXMOcLSupg VS7q+MHglajGTE4o1eUj6KAGF3XZ6F8gyPS74tuQFEJQZ0eIHqDERYtqUtK2a27DraFv MtgLdisXzZzyioyRAE5lWOI77AU/UBG1dD507wH95VOcPeC4XCMf0ZKFE11hvLaLVabY 9EJAzb7wJ5zGiyC2Tunn11Eh62ouHHtqGBCLuekD5PJpIdr30FDYmFV943gY9xXf/ngD N26jwVQwJcCceU+RT7A1ZyL1RU1WJ54xZpCWn/RRsDd11QGTWo/zPIhOpOlbqyzoQABX QXXA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l14si12250831pgi.147.2018.12.03.04.46.28; Mon, 03 Dec 2018 04:46:44 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726456AbeLCMqq (ORCPT + 99 others); Mon, 3 Dec 2018 07:46:46 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:36562 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726386AbeLCMqq (ORCPT ); Mon, 3 Dec 2018 07:46:46 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5A34D1688; Mon, 3 Dec 2018 04:45:51 -0800 (PST) Received: from [10.1.196.75] (e110467-lin.cambridge.arm.com [10.1.196.75]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 84B763F614; Mon, 3 Dec 2018 04:45:48 -0800 (PST) Subject: Re: [PATCH] of/device: add blacklist for iommu dma_ops To: Rob Clark , iommu@lists.linux-foundation.org Cc: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Vivek Gautam , Tomasz Figa , hch@lst.de, Will Deacon , David Airlie , freedreno@lists.freedesktop.org, Archit Taneja , Sean Paul , Douglas Anderson , Daniel Vetter , Rob Herring , Frank Rowand , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org References: <20181201165348.24140-1-robdclark@gmail.com> From: Robin Murphy Message-ID: Date: Mon, 3 Dec 2018 12:45:46 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: <20181201165348.24140-1-robdclark@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Rob, On 01/12/2018 16:53, Rob Clark wrote: > This solves a problem we see with drm/msm, caused by getting > iommu_dma_ops while we attach our own domain and manage it directly at > the iommu API level: > > [0000000000000038] user address but active_mm is swapper > Internal error: Oops: 96000005 [#1] PREEMPT SMP > Modules linked in: > CPU: 7 PID: 70 Comm: kworker/7:1 Tainted: G W 4.19.3 #90 > Hardware name: xxx (DT) > Workqueue: events deferred_probe_work_func > pstate: 80c00009 (Nzcv daif +PAN +UAO) > pc : iommu_dma_map_sg+0x7c/0x2c8 > lr : iommu_dma_map_sg+0x40/0x2c8 > sp : ffffff80095eb4f0 > x29: ffffff80095eb4f0 x28: 0000000000000000 > x27: ffffffc0f9431578 x26: 0000000000000000 > x25: 00000000ffffffff x24: 0000000000000003 > x23: 0000000000000001 x22: ffffffc0fa9ac010 > x21: 0000000000000000 x20: ffffffc0fab40980 > x19: ffffffc0fab40980 x18: 0000000000000003 > x17: 00000000000001c4 x16: 0000000000000007 > x15: 000000000000000e x14: ffffffffffffffff > x13: ffff000000000000 x12: 0000000000000028 > x11: 0101010101010101 x10: 7f7f7f7f7f7f7f7f > x9 : 0000000000000000 x8 : ffffffc0fab409a0 > x7 : 0000000000000000 x6 : 0000000000000002 > x5 : 0000000100000000 x4 : 0000000000000000 > x3 : 0000000000000001 x2 : 0000000000000002 > x1 : ffffffc0f9431578 x0 : 0000000000000000 > Process kworker/7:1 (pid: 70, stack limit = 0x0000000017d08ffb) > Call trace: > iommu_dma_map_sg+0x7c/0x2c8 > __iommu_map_sg_attrs+0x70/0x84 > get_pages+0x170/0x1e8 > msm_gem_get_iova+0x8c/0x128 > _msm_gem_kernel_new+0x6c/0xc8 > msm_gem_kernel_new+0x4c/0x58 > dsi_tx_buf_alloc_6g+0x4c/0x8c > msm_dsi_host_modeset_init+0xc8/0x108 > msm_dsi_modeset_init+0x54/0x18c > _dpu_kms_drm_obj_init+0x430/0x474 > dpu_kms_hw_init+0x5f8/0x6b4 > msm_drm_bind+0x360/0x6c8 > try_to_bring_up_master.part.7+0x28/0x70 > component_master_add_with_match+0xe8/0x124 > msm_pdev_probe+0x294/0x2b4 > platform_drv_probe+0x58/0xa4 > really_probe+0x150/0x294 > driver_probe_device+0xac/0xe8 > __device_attach_driver+0xa4/0xb4 > bus_for_each_drv+0x98/0xc8 > __device_attach+0xac/0x12c > device_initial_probe+0x24/0x30 > bus_probe_device+0x38/0x98 > deferred_probe_work_func+0x78/0xa4 > process_one_work+0x24c/0x3dc > worker_thread+0x280/0x360 > kthread+0x134/0x13c > ret_from_fork+0x10/0x18 > Code: d2800004 91000725 6b17039f 5400048a (f9401f40) > ---[ end trace f22dda57f3648e2c ]--- > Kernel panic - not syncing: Fatal exception > SMP: stopping secondary CPUs > Kernel Offset: disabled > CPU features: 0x0,22802a18 > Memory Limit: none > > The problem is that when drm/msm does it's own iommu_attach_device(), > now the domain returned by iommu_get_domain_for_dev() is drm/msm's > domain, and it doesn't have domain->iova_cookie. Does this crash still happen with 4.20-rc? Because as of 6af588fed391 it really shouldn't. > We kind of avoided this problem prior to sdm845/dpu because the iommu > was attached to the mdp node in dt, which is a child of the toplevel > mdss node (which corresponds to the dev passed in dma_map_sg()). But > with sdm845, now the iommu is attached at the mdss level so we hit the > iommu_dma_ops in dma_map_sg(). > > But auto allocating/attaching a domain before the driver is probed was > already a blocking problem for enabling per-context pagetables for the > GPU. This problem is also now solved with this patch. s/solved/worked around/ If you want a guarantee of actually getting a specific hardware context allocated for a given domain, there needs to be code in the IOMMU driver to understand and honour that. Implicitly depending on whatever happens to fall out of current driver behaviour on current systems is not a real solution. > Fixes: 97890ba9289c dma-mapping: detect and configure IOMMU in of_dma_configure That's rather misleading, since the crash described above depends on at least two other major changes which came long after that commit. It's not that I don't understand exactly what you want here - just that this commit message isn't a coherent justification for that ;) > Tested-by: Douglas Anderson > Signed-off-by: Rob Clark > --- > This is an alternative/replacement for [1]. What it lacks in elegance > it makes up for in practicality ;-) > > [1] https://patchwork.freedesktop.org/patch/264930/ > > drivers/of/device.c | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/drivers/of/device.c b/drivers/of/device.c > index 5957cd4fa262..15ffee00fb22 100644 > --- a/drivers/of/device.c > +++ b/drivers/of/device.c > @@ -72,6 +72,14 @@ int of_device_add(struct platform_device *ofdev) > return device_add(&ofdev->dev); > } > > +static const struct of_device_id iommu_blacklist[] = { > + { .compatible = "qcom,mdp4" }, > + { .compatible = "qcom,mdss" }, > + { .compatible = "qcom,sdm845-mdss" }, > + { .compatible = "qcom,adreno" }, > + {} > +}; > + > /** > * of_dma_configure - Setup DMA configuration > * @dev: Device to apply DMA configuration > @@ -164,6 +172,20 @@ int of_dma_configure(struct device *dev, struct device_node *np, bool force_dma) > dev_dbg(dev, "device is%sbehind an iommu\n", > iommu ? " " : " not "); > > + /* > + * There is at least one case where the driver wants to directly > + * manage the IOMMU, but if we end up with iommu dma_ops, that > + * interferes with the drivers ability to use dma_map_sg() for > + * cache operations. Since we don't currently have a better > + * solution, and this code runs before the driver is probed and > + * has a chance to intervene, use a simple blacklist to avoid > + * ending up with iommu dma_ops: > + */ > + if (of_match_device(iommu_blacklist, dev)) { > + dev_dbg(dev, "skipping iommu hookup\n"); > + iommu = NULL; > + } Given that a default domain will already have been allocated by the time we get here, regardless of whether we pretend of_iommu_configure() did nothing, I'm puzzled as to how this change is 'solving' that aspect as claimed :/ Is CONFIG_IOMMU_DEFAULT_PASSTHROUGH a sufficient workaround for msm at the moment, or do you have other devices which do actually want iommu_dma_ops? Robin. > + > arch_setup_dma_ops(dev, dma_addr, size, iommu, coherent); > > return 0; >