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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 17F41C3ABDD for ; Mon, 19 May 2025 17:58:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 274D910E4B2; Mon, 19 May 2025 17:58:53 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fiho0MBe"; dkim-atps=neutral Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by gabe.freedesktop.org (Postfix) with ESMTPS id B7A4210E4A8; Mon, 19 May 2025 17:58:41 +0000 (UTC) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-742c46611b6so2412914b3a.1; Mon, 19 May 2025 10:58:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747677521; x=1748282321; darn=lists.freedesktop.org; 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=zsDuMkK6+ntYHJetvzHtNuC1/rYImV4dSwAsx5YSXi4=; b=fiho0MBeAzfAhL7z7RbYzBgnW9GENF4awT4pbh9GYhaoVTxiAKtN4BBNFb6nrRJ2Zv 4TXYv98BreHn+KSQmImeKZTcoSqdiorw5sTScBLEqUQy0h5K0WyZ5CeAuY2NamqpgOyB ODPlifowLlXVwA643n3kl6hgE/vpm+jvIT879cj0Lj3oo1r5S4p2Pf/CVUNwRiFO6ARk rBma0c7VP7rO9sc05rN/rhFOWNLGhdxna5GWhjMZaQfLqpD3uYIxBCoU+dBhUH2yQtFL SpQwroFVC7Vi3lv7uMdlP9pVOn5MXMwRCNr1wRQQVJ01MUW8pYmULljyR6dZRVxsjGOx lLYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747677521; x=1748282321; 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=zsDuMkK6+ntYHJetvzHtNuC1/rYImV4dSwAsx5YSXi4=; b=jg0ggerROAxQPR7AHB3oVwylpoqvVFhgVjZ5cL+eaNZmUx3BhjRO+FcVuvPyDdldR6 OGPNQ23xHb0JB2Z9L5FZGAyx4+KoV+5V1eATXZe9lPkMEqoWqL2f5HKagS+tuThtTqNa q0jJQO6JIFgKmQSaUcxoGyV8pYcGwE+VDlAV8OtM/3x3Hg7E5gYLxlqMQ3PuDBTGylpf kvJrK8WKsISRIVvGv6ZJyo43dFBCHDv7p0MAqBBbjUHLtlbE6TrxYWfGJzfx0MtQA7gI YMH7Hs/csaL3OAsGWYmPB7W+slsPNBs2N9m+Yy5M/f+DLJT6UiT43IZJizqQG0RDQbrW lnXA== X-Gm-Message-State: AOJu0YwAGlf2KpGX1ddJfSpj2KJCXP+/T00+tKf5XTStQ80NIO/EbYyi Ox7sib0BUJSvddTwhPYkLI2zYrXBxAXhUTTt4qvtoeLIUhvzps5wPfugjzzDEg== X-Gm-Gg: ASbGncsR1IasFQeOKCifc3aCj3XgakR49HT1pvTyCO/xUOHmHchRV6kPgU271Mle8Xg yc6GIarMbFK7NAHZDkGaCrTf0YhAlZEPTlARJalpyzJeGvRh1XcT0kU6wWDbE1dsiO02pzXtPEA GvIgQ2YEey3SbQKi2LQgRY8V1vC/7/CJpHrcqnyzh1qkwoLP6QHXzppxr4mdzbQhOBeyxv/3X9u p4HIBNqO1m/IE+1e4gtxHL5OEjrRu0dOx4MyV06G75Mk8uFwIC5NeIAoedT218BrXMPHxcApZ4P Rv02GPfFXVqK2HKTvx61jJ2AWLDWxoBaEYMEhBwmuPnU2e0FfHGfFNYvIhsj6/MOjVtHblKjasA OdGs5+FHbXLLJ3IdtMrW5O7/0wg== X-Google-Smtp-Source: AGHT+IEpPUhsp2Km3MfeKJLcLTe8fytrJtiMjwY97/JiD5mpGxU47A0gjeAM8i2SRnvZ5UivSJVNRw== X-Received: by 2002:a05:6a00:4fc2:b0:73e:598:7e5b with SMTP id d2e1a72fcca58-742acc906ccmr17537689b3a.1.1747677520798; Mon, 19 May 2025 10:58:40 -0700 (PDT) Received: from localhost ([2a00:79e0:3e00:2601:3afc:446b:f0df:eadc]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a970954asm6498324b3a.46.2025.05.19.10.58.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 May 2025 10:58:40 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Connor Abbott , Rob Clark , Rob Clark , Sean Paul , Konrad Dybcio , Abhinav Kumar , Dmitry Baryshkov , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v5 32/40] drm/msm: Support IO_PGTABLE_QUIRK_NO_WARN_ON Date: Mon, 19 May 2025 10:57:29 -0700 Message-ID: <20250519175755.13037-20-robdclark@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250519175755.13037-1-robdclark@gmail.com> References: <20250519175348.11924-1-robdclark@gmail.com> <20250519175755.13037-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Rob Clark With user managed VMs and multiple queues, it is in theory possible to trigger map/unmap errors. These will (in a later patch) mark the VM as unusable. But we want to tell the io-pgtable helpers not to spam the log. In addition, in the unmap path, we don't want to bail early from the unmap, to ensure we don't leave some dangling pages mapped. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- drivers/gpu/drm/msm/msm_iommu.c | 23 ++++++++++++++++++----- drivers/gpu/drm/msm/msm_mmu.h | 2 +- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index f0e37733c65d..83fba02ca1df 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -2267,7 +2267,7 @@ a6xx_create_private_vm(struct msm_gpu *gpu, bool kernel_managed) { struct msm_mmu *mmu; - mmu = msm_iommu_pagetable_create(to_msm_vm(gpu->vm)->mmu); + mmu = msm_iommu_pagetable_create(to_msm_vm(gpu->vm)->mmu, kernel_managed); if (IS_ERR(mmu)) return ERR_CAST(mmu); diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c index 756bd55ee94f..237d298d0eeb 100644 --- a/drivers/gpu/drm/msm/msm_iommu.c +++ b/drivers/gpu/drm/msm/msm_iommu.c @@ -94,15 +94,24 @@ static int msm_iommu_pagetable_unmap(struct msm_mmu *mmu, u64 iova, { struct msm_iommu_pagetable *pagetable = to_pagetable(mmu); struct io_pgtable_ops *ops = pagetable->pgtbl_ops; + int ret = 0; while (size) { - size_t unmapped, pgsize, count; + size_t pgsize, count; + ssize_t unmapped; pgsize = calc_pgsize(pagetable, iova, iova, size, &count); unmapped = ops->unmap_pages(ops, iova, pgsize, count, NULL); - if (!unmapped) - break; + if (unmapped <= 0) { + ret = -EINVAL; + /* + * Continue attempting to unamp the remained of the + * range, so we don't end up with some dangling + * mapped pages + */ + unmapped = PAGE_SIZE; + } iova += unmapped; size -= unmapped; @@ -110,7 +119,7 @@ static int msm_iommu_pagetable_unmap(struct msm_mmu *mmu, u64 iova, iommu_flush_iotlb_all(to_msm_iommu(pagetable->parent)->domain); - return (size == 0) ? 0 : -EINVAL; + return ret; } static int msm_iommu_pagetable_map_prr(struct msm_mmu *mmu, u64 iova, size_t len, int prot) @@ -324,7 +333,7 @@ static const struct iommu_flush_ops tlb_ops = { static int msm_gpu_fault_handler(struct iommu_domain *domain, struct device *dev, unsigned long iova, int flags, void *arg); -struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent) +struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent, bool kernel_managed) { struct adreno_smmu_priv *adreno_smmu = dev_get_drvdata(parent->dev); struct msm_iommu *iommu = to_msm_iommu(parent); @@ -358,6 +367,10 @@ struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent) ttbr0_cfg.quirks &= ~IO_PGTABLE_QUIRK_ARM_TTBR1; ttbr0_cfg.tlb = &tlb_ops; + if (!kernel_managed) { + ttbr0_cfg.quirks |= IO_PGTABLE_QUIRK_NO_WARN_ON; + } + pagetable->pgtbl_ops = alloc_io_pgtable_ops(ARM_64_LPAE_S1, &ttbr0_cfg, pagetable); diff --git a/drivers/gpu/drm/msm/msm_mmu.h b/drivers/gpu/drm/msm/msm_mmu.h index c874852b7331..c70c71fb1a4a 100644 --- a/drivers/gpu/drm/msm/msm_mmu.h +++ b/drivers/gpu/drm/msm/msm_mmu.h @@ -52,7 +52,7 @@ static inline void msm_mmu_set_fault_handler(struct msm_mmu *mmu, void *arg, mmu->handler = handler; } -struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent); +struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent, bool kernel_managed); int msm_iommu_pagetable_params(struct msm_mmu *mmu, phys_addr_t *ttbr, int *asid); -- 2.49.0