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)