From patchwork Thu May 23 17:52:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 13672147 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 44F26C25B75 for ; Thu, 23 May 2024 17:52:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=RhqlSnFQ1qp+6eN/2C50DyK1N4HLGqYFAuB6ZgAY7tI=; b=R4vasJik1DQXjE oVCFicV99IBvfZB5HCNOPvmYH0Lq3y43QTCIlK4yzmTSv+MZYLjoTB4LdC0A6RywB/2Nsexpen9T/ XEdAeyTkfEPA1RpLQ1z2IQKwmcomb5OFQjeINVTqAhSwQ23N0Eqd/oXakA8ngTznMO2xmpYcaWMW4 2/sEqa7JM2xMODK3v2Ou1VRLbk4R/lrN7RbfiY6FlSKYsCh6w5LBEoQet+u3m6wQGQYcZfcL24cUm 5wzFnrKXLeQMTvRS58tNpAGw9ykRSDXpEVZFLhjhbueNRilRMRfaH70bO9xQZyg1YDqAdkRBOSSdw 9HzKGtsa99bt9xmhC/GQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sACcN-00000006wPm-425F; Thu, 23 May 2024 17:52:43 +0000 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sACcI-00000006wNI-0rFf for linux-arm-kernel@lists.infradead.org; Thu, 23 May 2024 17:52:39 +0000 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1f082d92864so124842945ad.1 for ; Thu, 23 May 2024 10:52:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716486752; x=1717091552; darn=lists.infradead.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=wABXq7eXvgE4oT9T1Y9/oyMqa6vAj39hBqoQ2M3pSr8=; b=MbmrRFc3JCzkkLAg9GjqlTbLPLvBkR9aGDbElFL6ukC4MMW14dPfUj0CPIrUdisK7u YsjBsvTmaZzv5/EdtjilDn2TgLoJ6vhXc5I2JyRz/JjP/OzVS+pJVeWjKEFEL7FVc252 MMkTSAjlgygwbO+scj9GuyfeOPwJjCjRy4mBJ7o2F1v3s77UHGeTTu4stKeT2nGnBXvN gkxNlTD4jwXB04H3s2v2IrF9fyBUrSqAqVYF/jR8PD8mb7pzZK3B7vnkq1JJspSQHm5q pMz4gEJ5pBOViDLpa98qcGbVse3H3oZsJOrL/0xvc1FoF2Tzppzk/0YSdI93MpyblgLg rlWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716486752; x=1717091552; 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=wABXq7eXvgE4oT9T1Y9/oyMqa6vAj39hBqoQ2M3pSr8=; b=p78lA903RtIOG+9PT7MnJythEb3MpTDbch4bqb2pVSZr+ilqrJwJSGEYEE7GaydPPl 1pQv4E1o4p4Hb/dPbsIy9dUQXmBbgSd2EM/NbgN1y22yAHq3nzF0j0Rb0xtVyj+WpuWw fKvU6K4eg29rV/PB8+9zSlv7TrIbBhHdUWXHPYRDfCpDBbLe64vixidMXSxuwGWrbjXt ydSH5qPZKS/9QqIGeg3JSLlVPrCMvML+MKIGPcM2xusy+3cs6uranclKi6F0bc1a6CNz L+hML8IUaw+YW/+dhw3M04WQmDF7y4BzavEnIR2ZPZfxH6l3OaFU5H0hPDjOSCPNok9B FDvg== X-Forwarded-Encrypted: i=1; AJvYcCUrpOpxvEdJ04gFBentbZqKtGSbtHoHVrj6gHvEHGhwf0wRiAVvSj4Kd15t9HdrNAa4BKgEr0RUXIkXpObKgIjHueg8TAkXSvdrzKz7v/7HjFGWy30= X-Gm-Message-State: AOJu0YyUEfFINcUA9ki2s4sITyknaK4HJmusQGfN0QKGj212q14MmJgJ o2Qi79L9md+ylzmOML5Dq8i3Pvx8B9IE1uvltdKE0QjwNOG7Aui3 X-Google-Smtp-Source: AGHT+IFBPjfPlLDxDBNEdpWCZ7OpFK84HiZnku+Zm5KcsQ3+xnkFTJMGfUhkA5lhqjC+tpNwMNZFoQ== X-Received: by 2002:a17:902:e889:b0:1f3:4b2a:1ac8 with SMTP id d9443c01a7336-1f4486bd92cmr964985ad.13.1716486752590; Thu, 23 May 2024 10:52:32 -0700 (PDT) Received: from localhost ([2a00:79e1:2e00:1301:e1c5:6354:b45d:8ffc]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f326c0cec2sm31874455ad.174.2024.05.23.10.52.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 10:52:31 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Will Deacon , Rob Clark , Robin Murphy , Joerg Roedel , Jason Gunthorpe , Boris Brezillon , Kevin Tian , 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 v4 1/2] iommu/io-pgtable-arm: Add way to debug pgtable walk Date: Thu, 23 May 2024 10:52:21 -0700 Message-ID: <20240523175227.117984-2-robdclark@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240523175227.117984-1-robdclark@gmail.com> References: <20240523175227.117984-1-robdclark@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240523_105238_270008_486C08E0 X-CRM114-Status: GOOD ( 16.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 Acked-by: Joerg Roedel --- drivers/iommu/io-pgtable-arm.c | 51 ++++++++++++++++++++++++++++------ include/linux/io-pgtable.h | 4 +++ 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index f7828a7aad41..f47a0e64bb35 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 arm_lpae_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 = arm_lpae_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) @@ -807,6 +839,7 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg) .map_pages = arm_lpae_map_pages, .unmap_pages = arm_lpae_unmap_pages, .iova_to_phys = arm_lpae_iova_to_phys, + .pgtable_walk = arm_lpae_pgtable_walk, }; return data; 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,