From patchwork Tue Aug 27 18:17:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 13780006 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 C347BC5472F for ; Tue, 27 Aug 2024 18:19:37 +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=aKDm3s2TCTU5rY2IssAZFvBpqQYJOpn3EVObKPXkHYI=; b=PqR3P4XjyDcPhB16/Aih55hUdC Gz4tZRBPC4BzGjp63i1ajn17QCsBkhervKhWLlmhl9HjRZXr3n9+mX/g/uNPV6RC/9vH4syq+1N4w 87fOHrmI0MXD1lBCt8AIdvRAswU01lyPfdj+sVLaPRMup7S/MoWaG5HVP6Fgea684qbWo/F0SRGC2 fYJorB9Jn3hDcJZ2uGBeyPuek+6SLNCnj4gJpuzkb6OreXEvixcbiiaGgkWwIFKYjRh8sjvLTUAxN 6WhydpFBps/BN06k2fRGHeLjcXJ5xbFoxMwwBLhQn56EZW0SjtK7muCNsqayY4LYiz6BeDkmXmJ66 3MZZdgqQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sj0mv-0000000CT3w-12WY; Tue, 27 Aug 2024 18:19:29 +0000 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sj0kw-0000000CSTC-0XXL for linux-arm-kernel@lists.infradead.org; Tue, 27 Aug 2024 18:17:29 +0000 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-715cc93694fso367459b3a.2 for ; Tue, 27 Aug 2024 11:17:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724782645; x=1725387445; 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=aKDm3s2TCTU5rY2IssAZFvBpqQYJOpn3EVObKPXkHYI=; b=G1Vh/+pZFD1deso+jtcniLVzUgapGY6+jC5bZNWwMPysaV+DwpKvc7zoc1N6nhN8pZ Bv8ZgEDW3GHG6DhqhZQUEMIWQN9ifFT4UIkiHgGMPKmVMsHG9SNxBcwY1vdx57/0NjIW mUIozNicp7pNhY09rvMi57B3aMklLCmDl+Xbv1sieCJP63lrEcRVebvxa4p30MRpoQbt S5X04fvpNVUjQnRsCst1Q9EaC9JVa+jK/pv8kAPaKL/UAq3LQ/OEaEuDLiaEizWw+WxU 1ENfq8meXxJ0ajsqYtCY9TNgZN28FXiE6Jo08CfYTY+T/upxub1SymgWWIztIE5Yxt1f kXvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724782645; x=1725387445; 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=aKDm3s2TCTU5rY2IssAZFvBpqQYJOpn3EVObKPXkHYI=; b=vqZLDFKIc7JIbkt5AtPBqwPpYdXLcPZQMM2gwsrWJuLPz5PszaauJ8xeJdU1+JhIEp psRrUL5NScbUfHi2gGGQehpPQD1rmlxeKcSnTIs4SwghXt3FgE6FcvT2vH82ITBL2MVn STc1ZyZfqof7GgIYtBn2eG1KpXISqlfAvEiVaXTHTccmvOdgcyZrdUoSF0hCYf6E65ah fsje2pEsTc3AEFFOJBPj99HzEqyThowQghuYDevIB9Hfol40zDntoCaWXkWUmqll3TY5 0rP9jlaGjBMFHqLp3P+HLfLSQkfm3AZaXuNAKv8IRFbCpvnAWRVTHFMKpm+WXIh0z3Pu xLhQ== X-Forwarded-Encrypted: i=1; AJvYcCUvFNKvx5TrCDlHXIKh8IL4emOeamJQI89uU5WYXnoSSO/gpEQTxggtiHuv5wX3Exn2jKxY/4vp34Cm7sOhHnZL@lists.infradead.org X-Gm-Message-State: AOJu0YwzHBXZc1Ff12RJSik7hLdcFwgFkHeH0kjikNlhWkXtAmwALMSJ 26meQwA7Jt8doZze/zB/ORKizVnzbvfmbfR8NGvZYSnDhqaCK0pl X-Google-Smtp-Source: AGHT+IEdQtuPGHWLGK9dVGESUarAI6mwcJzwOmeoDY/at/WLDRJDTKjtiierrP3Jt3uEQb5wm9aMDQ== X-Received: by 2002:a05:6a00:3cd2:b0:714:1bcf:3d93 with SMTP id d2e1a72fcca58-715bff709c3mr4918008b3a.5.1724782644533; Tue, 27 Aug 2024 11:17:24 -0700 (PDT) Received: from localhost ([2a00:79e1:2e00:1301:12e9:d196:a1e9:ab67]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-714342316e8sm9196285b3a.16.2024.08.27.11.17.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Aug 2024 11:17:23 -0700 (PDT) From: Rob Clark To: iommu@lists.linux.dev Cc: Will Deacon , Robin Murphy , Rob Clark , Joerg Roedel , linux-arm-kernel@lists.infradead.org (moderated list:ARM SMMU DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v9 1/4] iommu/io-pgtable-arm: Make pgtable walker more generic Date: Tue, 27 Aug 2024 11:17:09 -0700 Message-ID: <20240827181717.187245-2-robdclark@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827181717.187245-1-robdclark@gmail.com> References: <20240827181717.187245-1-robdclark@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240827_111726_413157_4F7FA91F X-CRM114-Status: GOOD ( 14.87 ) 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 We can re-use this basic pgtable walk logic in a few places. Signed-off-by: Rob Clark --- drivers/iommu/io-pgtable-arm.c | 59 +++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 23 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index f5d9fd1f45bf..0132f1eff688 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -747,33 +747,31 @@ static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops, } struct io_pgtable_walk_data { - struct iommu_dirty_bitmap *dirty; + void *data; + int (*visit)(struct io_pgtable_walk_data *walk_data, int lvl, + arm_lpae_iopte *ptep, size_t size); unsigned long flags; u64 addr; const u64 end; }; -static int __arm_lpae_iopte_walk_dirty(struct arm_lpae_io_pgtable *data, - struct io_pgtable_walk_data *walk_data, - arm_lpae_iopte *ptep, - int lvl); +static int __arm_lpae_iopte_walk(struct arm_lpae_io_pgtable *data, + struct io_pgtable_walk_data *walk_data, + arm_lpae_iopte *ptep, + int lvl); -static int io_pgtable_visit_dirty(struct arm_lpae_io_pgtable *data, - struct io_pgtable_walk_data *walk_data, - arm_lpae_iopte *ptep, int lvl) +static int io_pgtable_visit(struct arm_lpae_io_pgtable *data, + struct io_pgtable_walk_data *walk_data, + arm_lpae_iopte *ptep, int lvl) { struct io_pgtable *iop = &data->iop; arm_lpae_iopte pte = READ_ONCE(*ptep); if (iopte_leaf(pte, lvl, iop->fmt)) { size_t size = ARM_LPAE_BLOCK_SIZE(lvl, data); - - if (iopte_writeable_dirty(pte)) { - iommu_dirty_bitmap_record(walk_data->dirty, - walk_data->addr, size); - if (!(walk_data->flags & IOMMU_DIRTY_NO_CLEAR)) - iopte_set_writeable_clean(ptep); - } + int ret = walk_data->visit(walk_data, lvl, ptep, size); + if (ret) + return ret; walk_data->addr += size; return 0; } @@ -782,13 +780,13 @@ static int io_pgtable_visit_dirty(struct arm_lpae_io_pgtable *data, return -EINVAL; ptep = iopte_deref(pte, data); - return __arm_lpae_iopte_walk_dirty(data, walk_data, ptep, lvl + 1); + return __arm_lpae_iopte_walk(data, walk_data, ptep, lvl + 1); } -static int __arm_lpae_iopte_walk_dirty(struct arm_lpae_io_pgtable *data, - struct io_pgtable_walk_data *walk_data, - arm_lpae_iopte *ptep, - int lvl) +static int __arm_lpae_iopte_walk(struct arm_lpae_io_pgtable *data, + struct io_pgtable_walk_data *walk_data, + arm_lpae_iopte *ptep, + int lvl) { u32 idx; int max_entries, ret; @@ -803,7 +801,7 @@ static int __arm_lpae_iopte_walk_dirty(struct arm_lpae_io_pgtable *data, for (idx = ARM_LPAE_LVL_IDX(walk_data->addr, lvl, data); (idx < max_entries) && (walk_data->addr < walk_data->end); ++idx) { - ret = io_pgtable_visit_dirty(data, walk_data, ptep + idx, lvl); + ret = io_pgtable_visit(data, walk_data, ptep + idx, lvl); if (ret) return ret; } @@ -811,6 +809,20 @@ static int __arm_lpae_iopte_walk_dirty(struct arm_lpae_io_pgtable *data, return 0; } +static int visit_dirty(struct io_pgtable_walk_data *walk_data, int lvl, + arm_lpae_iopte *ptep, size_t size) +{ + struct iommu_dirty_bitmap *dirty = walk_data->data; + + if (iopte_writeable_dirty(*ptep)) { + iommu_dirty_bitmap_record(dirty, walk_data->addr, size); + if (!(walk_data->flags & IOMMU_DIRTY_NO_CLEAR)) + iopte_set_writeable_clean(ptep); + } + + return 0; +} + static int arm_lpae_read_and_clear_dirty(struct io_pgtable_ops *ops, unsigned long iova, size_t size, unsigned long flags, @@ -819,7 +831,8 @@ static int arm_lpae_read_and_clear_dirty(struct io_pgtable_ops *ops, struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops); struct io_pgtable_cfg *cfg = &data->iop.cfg; struct io_pgtable_walk_data walk_data = { - .dirty = dirty, + .data = dirty, + .visit = visit_dirty, .flags = flags, .addr = iova, .end = iova + size, @@ -834,7 +847,7 @@ static int arm_lpae_read_and_clear_dirty(struct io_pgtable_ops *ops, if (data->iop.fmt != ARM_64_LPAE_S1) return -EINVAL; - return __arm_lpae_iopte_walk_dirty(data, &walk_data, ptep, lvl); + return __arm_lpae_iopte_walk(data, &walk_data, ptep, lvl); } static void arm_lpae_restrict_pgsizes(struct io_pgtable_cfg *cfg) From patchwork Tue Aug 27 18:17:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 13780007 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 A1BF7C5472F for ; Tue, 27 Aug 2024 18:20:29 +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=VlnDL4DTfIpU6WguUty7oq+VmfQ4+6diTuDRQNVtIjA=; b=wWB+6jQqaBBCuAOAYxqoGN4S+A AvM0M/AKLq8rd6C3HH7sKG2G7+7JGET2Jn1zR/ZHGJLedf8kCU8RlT1IVbZB8JAOoDYzLEYBYHjmn hD+8VKboYpYVoLn2TsZTvWQJyycjqKmvfxpdooSaHsQGLCJmai5LwiLNaCCyAGquCfds76+H1Kxxr rHbKx23ilOjf5e1pFWsFiXK8EQDpMmshgsGwJSf7mKgszxVvXByWXPOx710foeV+qVNC+LiPZMiM1 bro7J5zRO8ALIEsC9dqIxpdDFJz1gt/YdQM3ubzZZAIMVxcxKHGF0Jyor7nFSUuJY87tVocBrFa4+ nCDdp74w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sj0ni-0000000CTIO-2kOf; Tue, 27 Aug 2024 18:20:18 +0000 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sj0ky-0000000CSUS-423q for linux-arm-kernel@lists.infradead.org; Tue, 27 Aug 2024 18:17:30 +0000 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-202318c4f45so60078555ad.0 for ; Tue, 27 Aug 2024 11:17:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724782647; x=1725387447; 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=VlnDL4DTfIpU6WguUty7oq+VmfQ4+6diTuDRQNVtIjA=; b=C9QJHyrLOlsBbXaFmczYwwBj6dvVnOYhSQo+fg3h4QPbY4xyDJE0Zrd1YAGJxlw+tr sPDRAxVgUbWshgxUCC85HYSvO4iK+eBtqxg/u7XXz45ft8RvIcWNHFJ85in3eW8j2oUU dSDPQzCqOMfV4GnZNzsMyVFBhReMrxLU8x4BLj8b2lTTCFkoQDYj7NPx2lhpF+kCR7gP rBuzTVhs9586Wle0UGyWIMDshZFU7Tq3n87c6HH7difGNcfCDGeQRV89fqXbbs416KN/ 3oYpq8PFgtjZSt++0gpB+1Hhsk5Nfm8GThG5ZMx9ydJWCUM1wjZFFcNHflv+JNhHJhpw qtsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724782647; x=1725387447; 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=VlnDL4DTfIpU6WguUty7oq+VmfQ4+6diTuDRQNVtIjA=; b=OVsAR0t8UnVwgd6eDBahs5CxgwQqoGbFdDd9KdNjEivrcBgjXTG6gwtXJfbLy6j9Px fWR069FAf8i3oHvrNu25GOMwuOtPirrJcZsZ6v5mY6qSyd4KNscNhUdnAAnMuEcJToGJ JzSgZBNV8fGf0klWk4cACu3g6/E/SM5t6tu6l8FSud9Z3Al0vOYzWjAgGy68FoCsF7Dy npWCF3L4Ir7IroGD1fBcvLXVbayFKL8W21TxtShI+C5U/lN7giOgp+1bVeRdWU3zBT5p ol/m0EbMxboceL5fjMqMTxmX5yFu4U6v7Vnet+kItul/1Vhb63fNMVK+sfyttfGXCpX/ WScg== X-Forwarded-Encrypted: i=1; AJvYcCUinEsugGfnNUxgEgNp/8vSFYyFUSyrfnDccLsS8uCFfGVYUgkrVwxI6BUvS19V+Hq4kbwL9yNSD+dQCDt5ZlJi@lists.infradead.org X-Gm-Message-State: AOJu0Ywb3/fdr1cw1IGjoUzZn58YNvRa1HbU01HegrCDnntWNhlWtaxZ RQFNWXX8IDw0BGpkvP/Ub0xwKXr1QbCw78xWGSZaQ/dNtwZ4l7bT X-Google-Smtp-Source: AGHT+IH740SM6E9kgQZAZ/5lLwngeaj4TPfrfm6aQ5M9xb8MdaSEXtw7CS0r0ewtH7ZBKZzhgIkHbQ== X-Received: by 2002:a17:902:f60a:b0:203:a279:a144 with SMTP id d9443c01a7336-204df45d558mr40520575ad.25.1724782647112; Tue, 27 Aug 2024 11:17:27 -0700 (PDT) Received: from localhost ([2a00:79e1:2e00:1301:12e9:d196:a1e9:ab67]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20385566551sm86532335ad.13.2024.08.27.11.17.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Aug 2024 11:17:26 -0700 (PDT) From: Rob Clark To: iommu@lists.linux.dev Cc: Will Deacon , Robin Murphy , Rob Clark , Joerg Roedel , linux-arm-kernel@lists.infradead.org (moderated list:ARM SMMU DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v9 2/4] iommu/io-pgtable-arm: Re-use the pgtable walk for iova_to_phys Date: Tue, 27 Aug 2024 11:17:10 -0700 Message-ID: <20240827181717.187245-3-robdclark@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827181717.187245-1-robdclark@gmail.com> References: <20240827181717.187245-1-robdclark@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240827_111729_034912_4C0C19E4 X-CRM114-Status: GOOD ( 14.01 ) 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 Re-use the generic pgtable walk path. Signed-off-by: Rob Clark --- drivers/iommu/io-pgtable-arm.c | 75 +++++++++++++++++----------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index 0132f1eff688..efed8e519111 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -710,42 +710,6 @@ 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) -{ - struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops); - arm_lpae_iopte pte, *ptep = data->pgd; - int lvl = data->start_level; - - do { - /* Valid IOPTE pointer? */ - if (!ptep) - return 0; - - /* Grab the IOPTE we're interested in */ - ptep += ARM_LPAE_LVL_IDX(iova, lvl, data); - pte = READ_ONCE(*ptep); - - /* Valid entry? */ - if (!pte) - return 0; - - /* Leaf entry? */ - if (iopte_leaf(pte, lvl, data->iop.fmt)) - goto found_translation; - - /* 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; - -found_translation: - iova &= (ARM_LPAE_BLOCK_SIZE(lvl, data) - 1); - return iopte_to_paddr(pte, data) | iova; -} - struct io_pgtable_walk_data { void *data; int (*visit)(struct io_pgtable_walk_data *walk_data, int lvl, @@ -760,6 +724,41 @@ static int __arm_lpae_iopte_walk(struct arm_lpae_io_pgtable *data, arm_lpae_iopte *ptep, int lvl); +struct iova_to_phys_data { + arm_lpae_iopte pte; + int lvl; +}; + +static int visit_iova_to_phys(struct io_pgtable_walk_data *walk_data, int lvl, + arm_lpae_iopte *ptep, size_t size) +{ + struct iova_to_phys_data *data = walk_data->data; + data->pte = *ptep; + data->lvl = lvl; + 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_data d; + struct io_pgtable_walk_data walk_data = { + .data = &d, + .visit = visit_iova_to_phys, + .addr = iova, + .end = iova + 1, + }; + int ret; + + ret = __arm_lpae_iopte_walk(data, &walk_data, data->pgd, data->start_level); + if (ret) + return 0; + + iova &= (ARM_LPAE_BLOCK_SIZE(d.lvl, data) - 1); + return iopte_to_paddr(d.pte, data) | iova; +} + static int io_pgtable_visit(struct arm_lpae_io_pgtable *data, struct io_pgtable_walk_data *walk_data, arm_lpae_iopte *ptep, int lvl) @@ -776,8 +775,10 @@ static int io_pgtable_visit(struct arm_lpae_io_pgtable *data, return 0; } - if (WARN_ON(!iopte_table(pte, lvl))) + if (!iopte_table(pte, lvl)) { + WARN_ON(!selftest_running); return -EINVAL; + } ptep = iopte_deref(pte, data); return __arm_lpae_iopte_walk(data, walk_data, ptep, lvl + 1); From patchwork Tue Aug 27 18:17:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 13780008 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 E16A1C5472F for ; Tue, 27 Aug 2024 18:21:16 +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=VLUmHTIZzlGw27lOXBe2/x1CsKIYYG9Yp6GcbVarkT4=; b=VoDzq2L0UeIQY3uaiV7251cDyH rYD6zOCQMkGr3CYeFzISGlfEBZbEDcBg4c6nhp8wpORpMREuae/mF22RoMI2EcYSv0Cvayb70fG1L vv+k77UuwiXAJLt+loe/3k8jxDL9iJMSRWtiAjTLhuPkEN3e/67ZxEkglx/TqtNcurfGAlaFtuygA dFjo09qqKPPo4iGYl5a3Z/4qdQ6Yevr0S73diBL/rFQWLPt6hSnuoyHVwZ+a5WnEkc+JfUHvSrnFy BbupkmeaNY7Zg5hclyArjU8PquPQRVMI+rR8XIGdn3Mzn6E4ZDXZ2+/S1/YhcqifbRbekruXlZv+V aNDc5PnQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sj0oW-0000000CTWq-0oY7; Tue, 27 Aug 2024 18:21:08 +0000 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sj0l2-0000000CSWK-2wR6 for linux-arm-kernel@lists.infradead.org; Tue, 27 Aug 2024 18:17:33 +0000 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-201f2b7fe0dso50189125ad.1 for ; Tue, 27 Aug 2024 11:17:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724782651; x=1725387451; 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=VLUmHTIZzlGw27lOXBe2/x1CsKIYYG9Yp6GcbVarkT4=; b=DXk4oOveJ+/GPA5FwwwQlfKHN1QzLJa2kinuFbU4co+IbqnfWWWYKCUElmKvp/cHxQ Qkf3HOWV0IF3libVpYNp/OzmGO5nH9ExU9+6yr7madv+IrhnKqcHPP5vYZDGJ7EzZCmL jQju5pHZq91Eji1Qukr9+dbrvCHrqYIc0tLzUusSbMDi8tfrOH+gqg77nxceLTFWpdj/ SHihvFwChWeWa7dV//tqdVvB/dPc7PlFgsZxuddrymkhleQA7mH3Km3bzmT6n5bI3XID FhKzTSLAC5rToswnYyqhrR5mBsYbnIkJTsQzWAEsMGcKnzlcHjZeHFUrjNywIIaw+YV+ 4LfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724782651; x=1725387451; 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=VLUmHTIZzlGw27lOXBe2/x1CsKIYYG9Yp6GcbVarkT4=; b=utd0v9ofWfEb1rXAp3Nwv1PMLcLND40ZVzU0GkwV98RO0M4US9i2iPYM2qhukDygEo kD25tc2qRyRlP+R671nFyTGA8MexKDVGT0KH42Y1ZHDSU0XpQuDTY44JqT+GxVWYnnyB jT5y0yi707HfdBydpvUoRw6+3fUu3sJdMLWia8Mibl+nSMmn1lrQ0Hl96MirJ2FsV0PL KhCwL2F1HurK5iuP4BGtDDEo5pdBkha/PH+DkeVnwgUcsySGs+X4kwA8fdBZpCqXV9kP t8muVAk4gNFs6A9s1YDUT/S1PebM7HUnG7dmNwypYH3la9AZga1hlrvDWbOAEFo/5J4K P1yQ== X-Forwarded-Encrypted: i=1; AJvYcCUnyPFnehGVJpatvvw8Nl93pr4z3GIQBPyhS4fdGnv7iVs57cJxNFLW074nIO1q/91sowmULLDDBo7xorcOHkBq@lists.infradead.org X-Gm-Message-State: AOJu0YxoxoD4cJDnvx3B1g3sErwZrgZWh3G1pstmFXwXev1KNjcGDAHo rIQpt8mTc8SqWzc4AzbPq58rsXl/wR+F7i4/f/4AjOZ9U4QkCTeY X-Google-Smtp-Source: AGHT+IHYyoolcYxZtR5c29wHJT7jmBszW3F5rBHLKaZnAGuTG+FmizoxCTxOLMcJ10P4+O/V0/dwMA== X-Received: by 2002:a17:902:ce0c:b0:203:a0c3:b342 with SMTP id d9443c01a7336-203a0c3b4a4mr132648915ad.9.1724782650615; Tue, 27 Aug 2024 11:17:30 -0700 (PDT) Received: from localhost ([2a00:79e1:2e00:1301:12e9:d196:a1e9:ab67]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20385704048sm85663225ad.215.2024.08.27.11.17.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Aug 2024 11:17:29 -0700 (PDT) From: Rob Clark To: iommu@lists.linux.dev Cc: Will Deacon , Robin Murphy , Rob Clark , Joerg Roedel , Jason Gunthorpe , Joao Martins , Kevin Tian , Steven Price , Lu Baolu , Boris Brezillon , linux-arm-kernel@lists.infradead.org (moderated list:ARM SMMU DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v9 3/4] iommu/io-pgtable-arm: Add way to debug pgtable walk Date: Tue, 27 Aug 2024 11:17:11 -0700 Message-ID: <20240827181717.187245-4-robdclark@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827181717.187245-1-robdclark@gmail.com> References: <20240827181717.187245-1-robdclark@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240827_111732_765470_479D5B4F X-CRM114-Status: GOOD ( 13.83 ) 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 | 25 +++++++++++++++++++++++++ include/linux/io-pgtable.h | 15 +++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index efed8e519111..11af49119f37 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -759,6 +759,30 @@ static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops, return iopte_to_paddr(d.pte, data) | iova; } +static int visit_pgtable_walk(struct io_pgtable_walk_data *walk_data, int lvl, + arm_lpae_iopte *ptep, size_t size) +{ + struct arm_lpae_io_pgtable_walk_data *data = walk_data->data; + data->ptes[data->level++] = *ptep; + return 0; +} + +static int arm_lpae_pgtable_walk(struct io_pgtable_ops *ops, unsigned long iova, + void *wd) +{ + struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops); + struct io_pgtable_walk_data walk_data = { + .data = wd, + .visit = visit_pgtable_walk, + .addr = iova, + .end = iova + 1, + }; + + ((struct arm_lpae_io_pgtable_walk_data *)wd)->level = 0; + + return __arm_lpae_iopte_walk(data, &walk_data, data->pgd, data->start_level); +} + static int io_pgtable_visit(struct arm_lpae_io_pgtable *data, struct io_pgtable_walk_data *walk_data, arm_lpae_iopte *ptep, int lvl) @@ -930,6 +954,7 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg) .unmap_pages = arm_lpae_unmap_pages, .iova_to_phys = arm_lpae_iova_to_phys, .read_and_clear_dirty = arm_lpae_read_and_clear_dirty, + .pgtable_walk = arm_lpae_pgtable_walk, }; return data; diff --git a/include/linux/io-pgtable.h b/include/linux/io-pgtable.h index f9a81761bfce..76eabd890e6a 100644 --- a/include/linux/io-pgtable.h +++ b/include/linux/io-pgtable.h @@ -174,12 +174,26 @@ struct io_pgtable_cfg { }; }; +/** + * struct arm_lpae_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 arm_lpae_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. @@ -193,6 +207,7 @@ 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, void *wd); int (*read_and_clear_dirty)(struct io_pgtable_ops *ops, unsigned long iova, size_t size, unsigned long flags,