From patchwork Wed Jun 26 20:40:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 13713422 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 0A0BDC30653 for ; Wed, 26 Jun 2024 20:43:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=l1ccrWAfm2+YAWyJm8Rli1gQgctwQczx9hjWBKBs/tM=; b=PRR2WaZn9l/1MKzvE3y7D58gjn fqZ5p6RjQcWXaNpPRxQswaylM3ge4ZOLznOc7EqcU3pdsusX8P2p7zqgY1axbz+n8cHBTvKfiGlLw pC093NY/5Nm/VE/abSPuOPJvPxDp0HoSudrGfmGeshmDvGD4bDuTPc/8VPy3v2MjVJf4bwWIF64bW Pda+3BDS7bbXGBOf1D1ArYUvgF2dVgw8tbggHLy2TuTJkBRfpo1o+bgzkpL0/NEfQI7cXXbcQ6SLe 2jAL9/SHPkBR7fxXJ+lzjMviDvujhnerPe5bz4tnPqKocO+ocw5MndMSHRncCOkgQIAkWDKKZS6LU FCk2JxCA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sMZTu-00000008IBU-3d4E; Wed, 26 Jun 2024 20:43:06 +0000 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sMZRc-00000008H1l-1rpv for linux-arm-kernel@lists.infradead.org; Wed, 26 Jun 2024 20:40:47 +0000 Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-2c81fe42e53so4499807a91.3 for ; Wed, 26 Jun 2024 13:40:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719434443; x=1720039243; 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=l1ccrWAfm2+YAWyJm8Rli1gQgctwQczx9hjWBKBs/tM=; b=TZYAgjoeuARuzPLpcHgk3mQdVVCXxoLISoqGzCK1we0rj/e8z9X0aKLbT8JTjAdrtZ fGbxtlZPwet2yj49zc6RacMEBChWiZxwnMY0YH7tLhGJIQUfRUyO2nk98wQMrXCF+g/t H1DOlCcLgtddJX1YRrEOY40Gxt7q1MsQF2y3iffOvTF2lIaDZdAj6ZxdnkuTsrmm1iae 50EJZ93RKUK/F1qaqO8yP1WAnAqi1xd1lRm3ParJP8y5l9jS4CXGSbtQkLhe8D0D0tFP CxzR0wCOpIddAzLmJqeci/I3G84YnRxpJvPk/sez0FL2MFkHQ3bzQecNNWkyUKmW9rNn Dl5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719434443; x=1720039243; 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=l1ccrWAfm2+YAWyJm8Rli1gQgctwQczx9hjWBKBs/tM=; b=WReXegkD/F+jkBKZFTby79we05AXVExC9O//ZmneL8b2RhP9PJ8NegTuExLlLlzUdD zQso8sU/+EURF570b5iokJ+jlyDnLKHpjhTeu8jTw4lacZSGOc6HA2vNhABVqnn/2AqK 7dWvnQLgj7tP0SN8+kRF9CALIbdXnLNf5d/1drFIRSClTHrMKGs0S7eq11gczRB2iSm3 TRVD7Dr4yDFxXcs8InCCxrCBFz/9+Zk1cJ3J2W9N2BX7EnKh9D+MoFN5Ag2QU1M1Q/7j wJB9hpmEfM5YLMHTOuvpr1C8RPuEa5+XtYPcz6Ya7C0Zwt5ExrwwAu0kQUAqERg0O43O PDDg== X-Forwarded-Encrypted: i=1; AJvYcCXLtfRUahtzvQSsujz2Hfz7A16ASgdezPupZ6aVSnuWwceNoeX6u4pwPsRPrmTJ0FlFNvgPurvC8knLDNznFrzCGu8zoBDM75jzz37+JlZ/rFOrX1Y= X-Gm-Message-State: AOJu0YyMRG2SxYlV/1RxQQRss2IfZsNQZfuAlcWyUExs0SH7dTK7yAnR dbn00AWpipZCyMd3kWo/wkq84z63ucIqy6O0TTq3DukRk2ICCdbh X-Google-Smtp-Source: AGHT+IHFbn9Mf226mkG84HxOEUEeVxy3S7mHjti4OIr1hTcwdtgFTCvCt4mnQxIt5on4rnPcSA7KNA== X-Received: by 2002:a17:90a:5d93:b0:2c8:50c1:52ab with SMTP id 98e67ed59e1d1-2c86127e28amr9802564a91.8.1719434443268; Wed, 26 Jun 2024 13:40:43 -0700 (PDT) Received: from localhost ([2a00:79e1:2e00:1301:e1c5:6354:b45d:8ffc]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2c8e2376e6asm1482166a91.2.2024.06.26.13.40.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jun 2024 13:40:42 -0700 (PDT) From: Rob Clark To: iommu@lists.linux.dev Cc: linux-arm-msm@vger.kernel.org, Will Deacon , Robin Murphy , Rob Clark , Joerg Roedel , Jason Gunthorpe , Steven Price , Boris Brezillon , Kevin Tian , Joao Martins , linux-arm-kernel@lists.infradead.org (moderated list:ARM SMMU DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v5 1/2] iommu/io-pgtable-arm: Add way to debug pgtable walk Date: Wed, 26 Jun 2024 13:40:26 -0700 Message-ID: <20240626204033.255813-2-robdclark@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240626204033.255813-1-robdclark@gmail.com> References: <20240626204033.255813-1-robdclark@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240626_134046_533211_AA69CDE6 X-CRM114-Status: GOOD ( 16.55 ) 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 --- drivers/iommu/io-pgtable-arm.c | 34 +++++++++++++++++++++++++--------- include/linux/io-pgtable.h | 16 ++++++++++++++++ 2 files changed, 41 insertions(+), 9 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index 3d23b924cec1..24bbfd9a8874 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -690,8 +690,8 @@ 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, + struct io_pgtable_walk_data *wd) { struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops); arm_lpae_iopte pte, *ptep = data->pgd; @@ -700,7 +700,7 @@ static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops, do { /* Valid IOPTE pointer? */ if (!ptep) - return 0; + return -ENOENT; /* Grab the IOPTE we're interested in */ ptep += ARM_LPAE_LVL_IDX(iova, lvl, data); @@ -708,22 +708,37 @@ static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops, /* Valid entry? */ if (!pte) - return 0; + return -ENOENT; - /* Leaf entry? */ + wd->ptes[wd->level++] = pte; + + /* 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 0; + return -ENOENT; +} + +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 io_pgtable_walk_data wd = {}; + int ret, lvl; + + ret = arm_lpae_pgtable_walk(ops, iova, &wd); + if (ret) + return 0; + + lvl = wd.level + data->start_level; -found_translation: iova &= (ARM_LPAE_BLOCK_SIZE(lvl, data) - 1); - return iopte_to_paddr(pte, data) | iova; + return iopte_to_paddr(wd.ptes[wd.level - 1], data) | iova; } static void arm_lpae_restrict_pgsizes(struct io_pgtable_cfg *cfg) @@ -804,6 +819,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..4d696724c7da 100644 --- a/include/linux/io-pgtable.h +++ b/include/linux/io-pgtable.h @@ -171,12 +171,26 @@ struct io_pgtable_cfg { }; }; +/** + * struct io_pgtable_walk_data - information from a pgtable walk + * + * @ptes: The recorded PTE values from the walk + * @level: The level of the last PTE + * + * @level also specifies the last valid index in @ptes + */ +struct io_pgtable_walk_data { + u64 ptes[4]; + int level; +}; + /** * struct io_pgtable_ops - Page table manipulation API for IOMMU drivers. * * @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 +204,8 @@ 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, + struct io_pgtable_walk_data *wd); int (*read_and_clear_dirty)(struct io_pgtable_ops *ops, unsigned long iova, size_t size, unsigned long flags,