From patchwork Tue Aug 20 17:16:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 13770509 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 5B9EFC3DA4A for ; Tue, 20 Aug 2024 17:18:42 +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=3n/7p2U9ieS4fxPWTOeYgrS5HGZLrK9VdS3pHhqiNE0=; b=MLT86/pFQ1Cwui+vYfUf4ilCmG BjO5d7T4SCVA3ddM0byPMvga2jcS9bI29MUWSJPE6Du/4mV4ug/xqZpfpofWd08jKaIHkFOAg5sU5 hkRpittjHtuxT6jj9KvLxgnrCmlkb4aHg/z9/06Dnl1Z6ZcQfWoF4Z3bIVE9VwXxbaaegT+P35nH7 fLFWJB9Otds9Rj7rUtXREMBni7UH51co99RKhwCPxt6/BbIjWJsM89wScvmg2+FVJhMPK746iTI0h 1Z85mVNQKr8YYW1HjqQJA/plUAxpy2/q0zFSh47zdTMNQvBtaIrSIEwgzHYxQXOB1g7gBvlliIeuB 8D4hzhyQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgSV6-000000068vz-44jc; Tue, 20 Aug 2024 17:18:32 +0000 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgSTm-000000068Y0-3znQ for linux-arm-kernel@lists.infradead.org; Tue, 20 Aug 2024 17:17:12 +0000 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-70d28023accso4240894b3a.0 for ; Tue, 20 Aug 2024 10:17:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724174230; x=1724779030; 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=3n/7p2U9ieS4fxPWTOeYgrS5HGZLrK9VdS3pHhqiNE0=; b=AxPUAVJu4vacOKeLeq+W6uRse/sBvsJ/o4BVacpoHDCX3KEgHDyXWzZsT6EVGrdrS0 3AM5ap5oX7wyelobA9sf950doyd80E1jDg8jTgNk19FJGAx8kTr2iq+y70NJOuzyiRUd Cyt1g5vNeP4JuCucYWWPnZLMM1u/XpomT8hw6N7PVciUuqYS4LiX8FR5M70+ZsPp1WMn w1a/gSj0ap2q6h0P9rcftZudmY8WdDyf35CoQUpd3SmwyqWiPL7p2nV/9qCHjPt2H3Xu nU9Br3SOi65gsMnCmCIdqlNAjHsMLvTRuI8xRqT9laCwRqvx2dh0FzcIeWaKog6b3auG gBvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724174230; x=1724779030; 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=3n/7p2U9ieS4fxPWTOeYgrS5HGZLrK9VdS3pHhqiNE0=; b=CqsHA4XRwTECTaVgKWjbxzlJXRVRtaWURSuWPlRtl2zVqUng1ddVyqVyFh65I2+bav 1lU08qRN32ntwkKxhF6kdM/ntcLOn1ztwsXMPU3vFQT0KWAzUway/mjaBwu43K4qnjGU grAefM7O3hEw7lquDgmjSFB0rB/X+MCr5DprIx/MCFqwWrKQThQy894/VQQbbeV1Xpch WJ1xcvFcyEB7mxLOnj16cFQwWp653A3/CoUrh6b9tQDKO1150MrHXJrl1HAxshKuTvuP INsv0dv1KHszucINzOVdGcRuDFYyHoadhnYhWuqiafc5jdwOOzuaE2hR+6sdFiHL4WgO 7Xag== X-Forwarded-Encrypted: i=1; AJvYcCXUeu+/Q5Xu6NWjUaLPRHAiuJxWAFSQeYwUdE5E9LuIro13EVGaHfNqIb1bREmvFBPpCVlceSyY6ctTw0ZEcfeR@lists.infradead.org X-Gm-Message-State: AOJu0YwZ7qAvlMaWvwNB1Xiqqb7e3vOZ3IHk4+xalflLFHvIpD6rnYdX vyZJ5fGTR3KtqV0Xj+f37T4QNHGOhjgAsIHyVw0sW5isF9RCSZbN X-Google-Smtp-Source: AGHT+IGN8V4SYWFCRpzsemtnMPx/Ae6udueJVGLrFDaSeEfYPszwWWE/tbOvS5tDdOuR5xJpXoGzfQ== X-Received: by 2002:a05:6a20:6f87:b0:1c4:dfa7:d3ce with SMTP id adf61e73a8af0-1cad7f954b6mr103988637.17.1724174229744; Tue, 20 Aug 2024 10:17:09 -0700 (PDT) Received: from localhost ([2a00:79e1:abd:bd02:d0ce:e791:dc08:a375]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-201f0379031sm80590295ad.159.2024.08.20.10.17.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2024 10:17:09 -0700 (PDT) From: Rob Clark To: iommu@lists.linux.dev Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Mostafa Saleh , Will Deacon , Rob Clark , Robin Murphy , Joerg Roedel , linux-arm-kernel@lists.infradead.org (moderated list:ARM SMMU DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v7 1/4] iommu/io-pgtable-arm: Make pgtable walker more generic Date: Tue, 20 Aug 2024 10:16:44 -0700 Message-ID: <20240820171652.145673-2-robdclark@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240820171652.145673-1-robdclark@gmail.com> References: <20240820171652.145673-1-robdclark@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240820_101711_025240_99F6C5E5 X-CRM114-Status: GOOD ( 14.85 ) 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..b4bc358740e0 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 pte, 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, pte, 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 pte, size_t size) +{ + struct iommu_dirty_bitmap *dirty = walk_data->data; + + if (iopte_writeable_dirty(pte)) { + iommu_dirty_bitmap_record(dirty, walk_data->addr, size); + if (!(walk_data->flags & IOMMU_DIRTY_NO_CLEAR)) + iopte_set_writeable_clean(&pte); + } + + 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 20 17:16:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 13770510 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 E7EB7C531DC for ; Tue, 20 Aug 2024 17:19:24 +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=I2hM9IXnWJCIXdGneHBR3ODZityq3OdYqAzA4dSYz3U=; b=GwXYpUAiwlE+xl6xKo+ocCynT9 Eyo/2KVZrl5nLNYURDLhVkbwuhtFV6/n7Fe1HKXnq9UH3hTbISaQ9txiHesfM2kbRrHCp42KGJU/g 5l2X5uA/CbD9bAhn2Oz7DSsPD0DcL/wqwGRNH8XhFirHow4ZkD1brQaMbWwfRrINJfCOIXWt3b6jc KLBXwjX4v/QaQQSWq5fUTQEo7Dt8w/wyMdLaRTXc6i+0b7vlMWF6O6hgF034v4VsdYrBlrNTKgt5M nQU/RvtPWL+LxNxI18jwmTYkoFHaYq0MZLNT6KJwSCF+D0+nknJMzMF+13VPJnWO4pypByqSX9Ftq C9ihzJ5w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgSVl-0000000698Z-2t2B; Tue, 20 Aug 2024 17:19:13 +0000 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgSTp-000000068Yv-3pBu for linux-arm-kernel@lists.infradead.org; Tue, 20 Aug 2024 17:17:15 +0000 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-20208830de8so34648195ad.1 for ; Tue, 20 Aug 2024 10:17:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724174232; x=1724779032; 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=I2hM9IXnWJCIXdGneHBR3ODZityq3OdYqAzA4dSYz3U=; b=he81W4+i5eIwA5ppEuCMX3xH9d3kBTbhF3ta6ym/zC5pmj2HUrZsuHd/wHpoY7O9z9 k0rJC3fh8zcS2fHbzyuzzM3ZgqLPELfkzJkgJnUA5ujtWqqd14PAXUI1Qf+X8ZY0xxQA NUN7VEgRTkdQUCop6IIZ75lSk8nlyaZaJoAViR0m+9szv+tQCeeQoO19aqX2BjoL/YCM b5BGSSEziCozeMbB+VtonqKBLNBcMWW1Cl8oTGPZkSxBc0C9otEpOVwBJ9UDGIu8ydhM KSrGRVeJVfNW+swpvth3VTU35E6xpI/qX8tWTlPIXE4PXXoLI1dUSeTjX2Rel/W/t0jk DKww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724174232; x=1724779032; 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=I2hM9IXnWJCIXdGneHBR3ODZityq3OdYqAzA4dSYz3U=; b=g+usSgJoa5CqHfv2kR6/hkuIePrqqOb7ojC30hG3RNk4m4DLIqvs3C6FeCKUkZtb// pxMtbCL742YAkAqKAuUJU7JYcaVPPcthLrKYJQ3bAFzwTgpW6rEuTHYKOyK0RzT9yx4v 2p0eJSzkKP28OKXS8DgbWvEmzMpF2MBAeyJQ3YEuP0NxzphV2UMnD6JRdgdJsftQulY9 jI5ABtdIT5NVRE09bDksWhdqFowyI1zNmRTdGaCT0kbXChJ3qLszEIIwIIO6J+/JzOR0 eNWedfshapx3jf4sBPvWPbWekQ0vQsZcnWDAL2gGCwDUWCMHUzzNNfy+NGnRsaAAX+eB LlNw== X-Forwarded-Encrypted: i=1; AJvYcCUbPIw7NkaPC0fJFpZ3C9MgwR6rbBn8QKOPNSo3UxmunUtZl2EovD8gIG5LgJ5UCk3RLUBNxFbZGafiFRLFwqnk4wifjs5zcDed69WS7Jw4ISDq2us= X-Gm-Message-State: AOJu0Yzuw/vKZKGnhPLnGQetv/hVZqYMVRKsoSD9WEIV+6D5B536aPNZ eHq0RNdK2+f/jVvmmPxIBAxvG6PYEtNwfP5lwOz2ukniayNkZQAj X-Google-Smtp-Source: AGHT+IHS+4WBqpl7XNll/ytEzf6YHrvGP09TiR7krwtGsSYQlPFlo0KfVRx52A+btS5AqAL/na8UQw== X-Received: by 2002:a17:902:db10:b0:1fb:4a57:7cba with SMTP id d9443c01a7336-2031512dbbbmr29303395ad.34.1724174232313; Tue, 20 Aug 2024 10:17:12 -0700 (PDT) Received: from localhost ([2a00:79e1:abd:bd02:d0ce:e791:dc08:a375]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-201f0303285sm80066795ad.26.2024.08.20.10.17.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2024 10:17:11 -0700 (PDT) From: Rob Clark To: iommu@lists.linux.dev Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Mostafa Saleh , Will Deacon , Rob Clark , Robin Murphy , Joerg Roedel , linux-arm-kernel@lists.infradead.org (moderated list:ARM SMMU DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v7 2/4] iommu/io-pgtable-arm: Re-use the pgtable walk for iova_to_phys Date: Tue, 20 Aug 2024 10:16:45 -0700 Message-ID: <20240820171652.145673-3-robdclark@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240820171652.145673-1-robdclark@gmail.com> References: <20240820171652.145673-1-robdclark@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240820_101713_980562_9D56DD36 X-CRM114-Status: GOOD ( 14.53 ) 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 | 73 +++++++++++++++++----------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index b4bc358740e0..5fa1274a665a 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 pte, size_t size) +{ + struct iova_to_phys_data *data = walk_data->data; + data->pte = pte; + 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,7 +775,7 @@ static int io_pgtable_visit(struct arm_lpae_io_pgtable *data, return 0; } - if (WARN_ON(!iopte_table(pte, lvl))) + if (WARN_ON(!iopte_table(pte, lvl) && !selftest_running)) return -EINVAL; ptep = iopte_deref(pte, data); From patchwork Tue Aug 20 17:16:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 13770511 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 04710C3DA4A for ; Tue, 20 Aug 2024 17:20:04 +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=4fyhtVpDgygfT5fUkGsgqPbatgiu5TzPiPLAt109+iE=; b=MHyDqqAf3ErnzXBmfKu7sS2e80 xDb0DBDDkTTHYIWIlAG/ezLhjuDkPjX4jqPZ0U7vq4njZf0t9+Y65mptddyxki1DAR1ngFF24DapR cID4P+cvxDXSR3JcBR587bJbVE4lGBHhQS5R2hIa9wSscB4O914Q4EDmopnPdv7mMqW+QeHy362ne OorRQl/gykkISNtwr7C8sunGK7PcQmVmVvflE9tj8B/fynvMYMKqlWMFTF8d/ERfQDByW7WBvV8zC 7eO0bJ0XzI1pVbODLjbjv8PH7KGQ9dEXUyIAy4wO++b8Vr9IGslNj2sfb2VJcxtcnw8ZM01WkGeEy cz6b2rTQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgSWR-000000069Lj-2gho; Tue, 20 Aug 2024 17:19:55 +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 1sgSTt-000000068a6-0UMC for linux-arm-kernel@lists.infradead.org; Tue, 20 Aug 2024 17:17:18 +0000 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-201cd78c6a3so44394895ad.1 for ; Tue, 20 Aug 2024 10:17:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724174236; x=1724779036; 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=4fyhtVpDgygfT5fUkGsgqPbatgiu5TzPiPLAt109+iE=; b=mnZxBA1oT9ADQToS8puitk670NdyIFYoVQkLeelx/b05EQ2Le77LGYDq69NdhSNovP Pt3VyOYpO2cT+5Iz5iaOPT6u20gbLNmP13lKxU/zvhjw76BaQzKMN3fO/nmCWdsQRuFZ VK9M2ndW1A8ytU2gPx6sEmhJeVNwTs2HOdnm5Rpblaw6BMnWWiDxCV3zXYqgUG09Rwb/ CNTRRtpSzyeBOw0DFvEBFA96913WgT3e/sGz2KCoW4cV/Ax40Vi8p0yL/w15ve0szT0U doKKMBKDTqXlozQziruTktG9vSrFzBvmQbH05t76g7RU5pk8GmIygc8eZ0TFtFS/TeB0 Cplg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724174236; x=1724779036; 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=4fyhtVpDgygfT5fUkGsgqPbatgiu5TzPiPLAt109+iE=; b=V+58/UHzjaHjQYZcXNIQl2qZCuunid4lqroPQ7Z/hgS+4TC1i/Qb81mBW9qHs808fR qshbhrwTn92y5LdCZWPALNmD0QI2GjgNQfUNPwscX8taKyUu4rHEbOfG+cyCp79yKtzK DXGBQdDVc9piP5XRQF4ul0FKTpS2BjdNHR4uXzsx7vEUCIG35LFhdSrnh6voe9cCtlbg GEqjgCogaDj04hgtFHCUIeGkOpB7ir+5yK+0cxU7dUpY1c3CZ8QqAgd7RojhPLvLVttN cdv9CZab1MOdp2hHoeXnoJ1wDOtge5bLT4tmvLvxPnQo1HLHPziPmU4GoTvs/nMVLm4G jT/Q== X-Forwarded-Encrypted: i=1; AJvYcCXbz8WsUwHBOLKJaJIiw+FbLoIyjLzgh/oEP0uo0a7NAJaBo7EhOdB5F/gJiHUG3afybhx0bgzkHwzg2THKs0HW@lists.infradead.org X-Gm-Message-State: AOJu0Yx+Vv45y/LtDjQA+foBS7d6ZVbr7uowy38jRphi1DcTpSkFTqXU khbTVei6w8H6nk3Qh/hIDO5k5bk9E+xpBni0MmI4EFdFtLA39sdU X-Google-Smtp-Source: AGHT+IG89nPNiTxJdoeWAd4I9+Nt1kCBeEpf+Ehrfj9fghEkvWbqdwi+s8kDEywa2ecTlYbOssqipA== X-Received: by 2002:a17:902:e549:b0:202:671:e5bd with SMTP id d9443c01a7336-2020671f9b0mr167387315ad.42.1724174235653; Tue, 20 Aug 2024 10:17:15 -0700 (PDT) Received: from localhost ([2a00:79e1:abd:bd02:d0ce:e791:dc08:a375]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-201f038b303sm80401575ad.192.2024.08.20.10.17.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2024 10:17:15 -0700 (PDT) From: Rob Clark To: iommu@lists.linux.dev Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Mostafa Saleh , Will Deacon , Rob Clark , Robin Murphy , Joerg Roedel , Jason Gunthorpe , Kevin Tian , Joao Martins , Boris Brezillon , linux-arm-kernel@lists.infradead.org (moderated list:ARM SMMU DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v7 3/4] iommu/io-pgtable-arm: Add way to debug pgtable walk Date: Tue, 20 Aug 2024 10:16:46 -0700 Message-ID: <20240820171652.145673-4-robdclark@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240820171652.145673-1-robdclark@gmail.com> References: <20240820171652.145673-1-robdclark@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240820_101717_183180_63F6D5D2 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 5fa1274a665a..a666ee03de47 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 pte, size_t size) +{ + struct arm_lpae_io_pgtable_walk_data *data = walk_data->data; + data->ptes[data->level++] = pte; + 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) @@ -928,6 +952,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,