From patchwork Wed May 22 21:50:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 13671115 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 A54AFC25B78 for ; Wed, 22 May 2024 21:50:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7A8F310EF70; Wed, 22 May 2024 21:50:35 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WdVuFQI9"; dkim-atps=neutral Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by gabe.freedesktop.org (Postfix) with ESMTPS id D6C0410EF0C; Wed, 22 May 2024 21:50:29 +0000 (UTC) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1f32a3b9491so7864365ad.0; Wed, 22 May 2024 14:50:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716414629; x=1717019429; 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=2K8+gSIw4h67vM78HufTAFJM7Lhu4djthlJzN7dgn0c=; b=WdVuFQI9CbA/hbVSMkUhcyG+/hMu43/i1+hWF6M77aeiPBk7lJmVCFXhYg0PdaKPB9 Jrwir5v4Lc42qO8Lsh2kVQy0wc0iuYLMRzqLckasjsMy2KtXc03wjwKLQdVrVMsiezH3 V75K7P4OR3yFDFV6ZIM60dtCbLnA4SOo30hhxZTIomZZI35ErlVrrupTFk813MOzEiZN U8de8mwt3NroMomPnMT+qnXBuyafnTVTkVrMYnMJfMyRr/b2mgLUhWIQzdOoP+KSvZeI 3pdE8IYw6wLxPs3Y5/vVovAEMIq5lpPDojDcS503vRvaN9+9IsaWYmOQK79xvOKqEE7W osNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716414629; x=1717019429; 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=2K8+gSIw4h67vM78HufTAFJM7Lhu4djthlJzN7dgn0c=; b=qhO8WIctF+ZPWU07zBldb2G5U/rJ5DTVR9ODodck7vVlC8b4bO2VT1PFv2D/jXyw+S UsTtKv/cRBrP8/h4Z4lp5gqNCPYDOE4N6TGF/5wPIl7dhu0uzg48PZJZyG4x7frQYs3V 6qIzMPO5EZwJ7pc+on0HwQxH02qIXEz9DGCJpHURDmLbZTZwzMObgHXKHVy680XKjbub 52LDaX2phUdbw/NUAw6kcJNeZCk1A6X/2+/lwbgX8doVKKJ9XIe1K8rcFoVAEoG2M3Bk gRyvvV25vJSLcy7UdKauJbscWKIgn3tOE/H0ZtqJLDY7paBAxx+tJXx/yffEOAB/Xs85 jcTQ== X-Gm-Message-State: AOJu0YxeByg3QrqVFGHfOnxcL1iEkNrYQJB18W9T8tm+eBksmnzNAkb0 V+kpkLo2QTEyzEEVuffoNCre9nvdDCcyydp/vCXOKINxjyVo7nUk0PxlLg== X-Google-Smtp-Source: AGHT+IFIIpfLzA2F8YRHGJoHwYIzp1NwLhTR7zRlOfJiiosDMMxFWV3+xMEZwsF1wYLyTw/w3Kgo7A== X-Received: by 2002:a17:902:f544:b0:1f2:f854:f59 with SMTP id d9443c01a7336-1f31c9652d7mr38668525ad.15.1716414628554; Wed, 22 May 2024 14:50:28 -0700 (PDT) Received: from localhost ([2a00:79e1:2e00:1301:e1c5:6354:b45d:8ffc]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c03619csm243076425ad.209.2024.05.22.14.50.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 14:50:27 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Will Deacon , Rob Clark , Robin Murphy , Joerg Roedel , Jason Gunthorpe , Kevin Tian , Boris Brezillon , Joao Martins , linux-arm-kernel@lists.infradead.org (moderated list:ARM SMMU DRIVERS), iommu@lists.linux.dev (open list:IOMMU SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 1/2] iommu/io-pgtable-arm: Add way to debug pgtable walk Date: Wed, 22 May 2024 14:50:04 -0700 Message-ID: <20240522215014.26007-2-robdclark@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240522215014.26007-1-robdclark@gmail.com> References: <20240522215014.26007-1-robdclark@gmail.com> MIME-Version: 1.0 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 Add an io-pgtable method to walk the pgtable returning the raw PTEs that would be traversed for a given iova access. Signed-off-by: Rob Clark --- drivers/iommu/io-pgtable-arm.c | 50 ++++++++++++++++++++++++++++------ include/linux/io-pgtable.h | 4 +++ 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index f7828a7aad41..86d2b34d6f95 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -693,17 +693,19 @@ static size_t arm_lpae_unmap_pages(struct io_pgtable_ops *ops, unsigned long iov data->start_level, ptep); } -static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops, - unsigned long iova) +static int pgtable_walk(struct io_pgtable_ops *ops, unsigned long iova, + int (*cb)(void *cb_data, void *pte, int level), + void *cb_data) { struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops); arm_lpae_iopte pte, *ptep = data->pgd; int lvl = data->start_level; + int ret; do { /* Valid IOPTE pointer? */ if (!ptep) - return 0; + return -EFAULT; /* Grab the IOPTE we're interested in */ ptep += ARM_LPAE_LVL_IDX(iova, lvl, data); @@ -711,22 +713,52 @@ static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops, /* Valid entry? */ if (!pte) - return 0; + return -EFAULT; + + ret = cb(cb_data, &pte, lvl); + if (ret) + return ret; - /* Leaf entry? */ + /* Leaf entry? If so, we've found the translation */ if (iopte_leaf(pte, lvl, data->iop.fmt)) - goto found_translation; + return 0; /* Take it to the next level */ ptep = iopte_deref(pte, data); } while (++lvl < ARM_LPAE_MAX_LEVELS); /* Ran out of page tables to walk */ + return -EFAULT; +} + +struct iova_to_phys_walk_data { + arm_lpae_iopte pte; + int level; +}; + +static int iova_to_phys_walk_cb(void *cb_data, void *pte, int level) +{ + struct iova_to_phys_walk_data *d = cb_data; + + d->pte = *(arm_lpae_iopte *)pte; + d->level = level; + return 0; +} + +static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops, + unsigned long iova) +{ + struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops); + struct iova_to_phys_walk_data d; + int ret; + + ret = pgtable_walk(ops, iova, iova_to_phys_walk_cb, &d); + if (ret) + return 0; -found_translation: - iova &= (ARM_LPAE_BLOCK_SIZE(lvl, data) - 1); - return iopte_to_paddr(pte, data) | iova; + iova &= (ARM_LPAE_BLOCK_SIZE(d.level, data) - 1); + return iopte_to_paddr(d.pte, data) | iova; } static void arm_lpae_restrict_pgsizes(struct io_pgtable_cfg *cfg) diff --git a/include/linux/io-pgtable.h b/include/linux/io-pgtable.h index 86cf1f7ae389..261b48af068a 100644 --- a/include/linux/io-pgtable.h +++ b/include/linux/io-pgtable.h @@ -177,6 +177,7 @@ struct io_pgtable_cfg { * @map_pages: Map a physically contiguous range of pages of the same size. * @unmap_pages: Unmap a range of virtually contiguous pages of the same size. * @iova_to_phys: Translate iova to physical address. + * @pgtable_walk: (optional) Perform a page table walk for a given iova. * * These functions map directly onto the iommu_ops member functions with * the same names. @@ -190,6 +191,9 @@ struct io_pgtable_ops { struct iommu_iotlb_gather *gather); phys_addr_t (*iova_to_phys)(struct io_pgtable_ops *ops, unsigned long iova); + int (*pgtable_walk)(struct io_pgtable_ops *ops, unsigned long iova, + int (*cb)(void *cb_data, void *pte, int level), + void *cb_data); int (*read_and_clear_dirty)(struct io_pgtable_ops *ops, unsigned long iova, size_t size, unsigned long flags, From patchwork Wed May 22 21:50:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 13671116 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 0F4D2C25B7C for ; Wed, 22 May 2024 21:50:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C414710EF81; Wed, 22 May 2024 21:50:35 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="X+elvSav"; dkim-atps=neutral Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by gabe.freedesktop.org (Postfix) with ESMTPS id ADE6C10EF0C; Wed, 22 May 2024 21:50:32 +0000 (UTC) Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-66afccbee0cso1526496a12.1; Wed, 22 May 2024 14:50:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716414631; x=1717019431; 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=2sOHXqCncBU6birEuX4uwSPwzlGfl/T4qQvFWke/kK8=; b=X+elvSavGt8WbFY+1fmYV1KcIA1rxn5gVVS3NqaPEcpMGybNxpoXeqLEo/vG/leWi7 zlTSlRj2pP2qPIH8tyv8oQdWV9JujVQYfO5Z4Q8W4zGPBZT1OJ4wKVxzEZUVpw5O89tt jAXUvmmkMn3rbJ+ZSzNZwbTQJmbs5XGJb8rbYyEDE/nSq+Z9dzPDh1sb4kaWUFC38gId UKWW36aXRWSqRgXP/M1GMfrx4P0K01HZx7PmgGMOGTjtjyVoBTKxJ9oTfFRx+L4lmY4q DdI+/411rb5F3Zko80otKn1cshdxteWivN7tgvuoun1AFfriq5zWqHF+GvxZX3p5iUQ9 Sfeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716414631; x=1717019431; 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=2sOHXqCncBU6birEuX4uwSPwzlGfl/T4qQvFWke/kK8=; b=RV/s6gNhCvd91JIblnThZUAzmle5cZVPHG8gG1cWeUlreJKv1mC9axQ4Ja2YuaA7O6 Y0qI9+cEzyRQdCBxBjtb6pXopKTBPcKPYJwrGn7NiuWfop6H0Ro5TQunRiXEDhJYVW1O 3rGfj/5Y+vF2HhvtdGRlP8+fMiuycKKS82dqqXwn9bQ74tqrOXWkOSV9r2NgBnAeypoj 95bpYdH40oI0OLkV4MPIiFltXA2kulFbVkZKlGA8F52Q0hVjRAyqZ2K/PJn4Ra8BuZ+n we7Kod5wpUdEchvYRLfJhgAoYpIfuM4Fma1AV1gSbGnpNwprnZk+OzvJiFgs4yRyhkuo B16g== X-Gm-Message-State: AOJu0YwWcYLfFBSk1Qwi1+6jgT3Gb5jQb6dnquMzFELNCYTXG9ctUDvl 7ruqrjsUx0HzN18nopSYM0LcIoLYI40CIvSx0JMusK402y02hHWkGlp0lw== X-Google-Smtp-Source: AGHT+IGhcdngXeOZ1/FBm5uE53ZfqMOTB5KQa3ihColXh2Hmq51yPoqYvbtOiaX7FpcBfqnJz7jmYg== X-Received: by 2002:a17:90a:69c6:b0:2b4:329e:e363 with SMTP id 98e67ed59e1d1-2bd9f45675fmr3112466a91.1.1716414631285; Wed, 22 May 2024 14:50:31 -0700 (PDT) Received: from localhost ([2a00:79e1:2e00:1301:e1c5:6354:b45d:8ffc]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2bdd9f4c604sm252342a91.41.2024.05.22.14.50.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 14:50:30 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Will Deacon , Rob Clark , Rob Clark , Sean Paul , Konrad Dybcio , Abhinav Kumar , Dmitry Baryshkov , Marijn Suijten , David Airlie , Daniel Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 2/2] drm/msm: Extend gpu devcore dumps with pgtbl info Date: Wed, 22 May 2024 14:50:05 -0700 Message-ID: <20240522215014.26007-3-robdclark@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240522215014.26007-1-robdclark@gmail.com> References: <20240522215014.26007-1-robdclark@gmail.com> MIME-Version: 1.0 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 In the case of iova fault triggered devcore dumps, include additional debug information based on what we think is the current page tables, including the TTBR0 value (which should match what we have in adreno_smmu_fault_info unless things have gone horribly wrong), and the pagetable entries traversed in the process of resolving the faulting iova. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 10 ++++++++++ drivers/gpu/drm/msm/msm_gpu.c | 22 ++++++++++++++++++++++ drivers/gpu/drm/msm/msm_gpu.h | 8 ++++++++ drivers/gpu/drm/msm/msm_iommu.c | 18 ++++++++++++++++++ drivers/gpu/drm/msm/msm_mmu.h | 5 ++++- 5 files changed, 62 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index a00241e3373b..3b4c75df0a5f 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -861,6 +861,16 @@ void adreno_show(struct msm_gpu *gpu, struct msm_gpu_state *state, drm_printf(p, " - dir=%s\n", info->flags & IOMMU_FAULT_WRITE ? "WRITE" : "READ"); drm_printf(p, " - type=%s\n", info->type); drm_printf(p, " - source=%s\n", info->block); + + /* Information extracted from what we think are the current + * pgtables. Hopefully the TTBR0 matches what we've extracted + * from the SMMU registers in smmu_info! + */ + drm_puts(p, "pgtable-fault-info:\n"); + drm_printf(p, " - ttbr0: %.16llx\n", (u64)info->pgtbl_ttbr0); + drm_printf(p, " - asid: %d\n", info->asid); + drm_printf(p, " - ptes: %.16llx %.16llx %.16llx %.16llx\n", + info->ptes[0], info->ptes[1], info->ptes[2], info->ptes[3]); } drm_printf(p, "rbbm-status: 0x%08x\n", state->rbbm_status); diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 43cde0590250..647bddc897f2 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -256,6 +256,18 @@ static void msm_gpu_crashstate_get_bo(struct msm_gpu_state *state, state->nr_bos++; } +static int pgtable_walk_cb(void *cb_data, void *pte, int level) +{ + struct msm_gpu_fault_info *info = cb_data; + + if (level > ARRAY_SIZE(info->ptes)) + return -EINVAL; + + info->ptes[level] = *(u64 *)pte; + + return 0; +} + static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, struct msm_gem_submit *submit, char *comm, char *cmd) { @@ -281,6 +293,16 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, if (submit) { int i; + if (state->fault_info.ttbr0) { + struct msm_gpu_fault_info *info = &state->fault_info; + struct msm_mmu *mmu = submit->aspace->mmu; + + msm_iommu_pagetable_params(mmu, &info->pgtbl_ttbr0, + &info->asid); + msm_iommu_pagetable_walk(mmu, info->iova, + pgtable_walk_cb, info); + } + state->bos = kcalloc(submit->nr_bos, sizeof(struct msm_gpu_state_bo), GFP_KERNEL); diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 04a696ac4626..82fbb626461a 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -101,6 +101,14 @@ struct msm_gpu_fault_info { int flags; const char *type; const char *block; + + /* Information about what we think/expect is the current SMMU state, + * for example expected_ttbr0 should match smmu_info.ttbr0 which + * was read back from SMMU registers. + */ + phys_addr_t pgtbl_ttbr0; + u64 ptes[4]; + int asid; }; /** diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c index d5512037c38b..f46ed4667475 100644 --- a/drivers/gpu/drm/msm/msm_iommu.c +++ b/drivers/gpu/drm/msm/msm_iommu.c @@ -195,6 +195,24 @@ struct iommu_domain_geometry *msm_iommu_get_geometry(struct msm_mmu *mmu) return &iommu->domain->geometry; } +int msm_iommu_pagetable_walk(struct msm_mmu *mmu, unsigned long iova, + int (*cb)(void *cb_data, void *pte, int level), + void *cb_data) +{ + struct msm_iommu_pagetable *pagetable; + + if (mmu->type != MSM_MMU_IOMMU_PAGETABLE) + return -EINVAL; + + pagetable = to_pagetable(mmu); + + if (!pagetable->pgtbl_ops->pgtable_walk) + return -EINVAL; + + return pagetable->pgtbl_ops->pgtable_walk(pagetable->pgtbl_ops, iova, + cb, cb_data); +} + static const struct msm_mmu_funcs pagetable_funcs = { .map = msm_iommu_pagetable_map, .unmap = msm_iommu_pagetable_unmap, diff --git a/drivers/gpu/drm/msm/msm_mmu.h b/drivers/gpu/drm/msm/msm_mmu.h index 88af4f490881..46b2550b9b7a 100644 --- a/drivers/gpu/drm/msm/msm_mmu.h +++ b/drivers/gpu/drm/msm/msm_mmu.h @@ -53,7 +53,10 @@ static inline void msm_mmu_set_fault_handler(struct msm_mmu *mmu, void *arg, struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent); int msm_iommu_pagetable_params(struct msm_mmu *mmu, phys_addr_t *ttbr, - int *asid); + int *asid); +int msm_iommu_pagetable_walk(struct msm_mmu *mmu, unsigned long iova, + int (*cb)(void *cb_data, void *pte, int level), + void *cb_data); struct iommu_domain_geometry *msm_iommu_get_geometry(struct msm_mmu *mmu); #endif /* __MSM_MMU_H__ */