From patchwork Mon Aug 26 17:15:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 13778284 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 D75BDC5321D for ; Mon, 26 Aug 2024 17:28:54 +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=9+I4ZaCB/sqpP5JzZUXf+AGUdGSF6g4dYvIuEdY7CXs=; b=DxOS1jYim4REVNBpOuclXd3zN1 LOmPBDKyytWRAyf+rb+y0goDKHvnuYd0zVET8OojVYY8k99OcabsnwwJSBNlnrwoh9+E9jc4Yn+64 FvAgju0+kL/TIfCtu3WgmoB6G32NtqwBf47rnY+3Roov26UDNpI6Mkm+6EXiK3TOM3AXu5CNaDw6R Q96XoKPCKNl5Cwabkuj2FONrXKB7r3YGXahB/AXcqn9RfXFDjB5swlV8qGoFQzPnSp4Jij/geVFuF W7ozY8c3SLCNSeiRpMjT9yFdbPKXtC7c704apvmbfd03Pt4qSMzODMg5mUUU0TlUy8m2v0KL+uIgf 8BscV+0A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sidWF-00000008DYt-3Sv5; Mon, 26 Aug 2024 17:28:43 +0000 Received: from mail-qt1-x82d.google.com ([2607:f8b0:4864:20::82d]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sidSn-00000008CGV-2BhE for linux-arm-kernel@lists.infradead.org; Mon, 26 Aug 2024 17:25:10 +0000 Received: by mail-qt1-x82d.google.com with SMTP id d75a77b69052e-44ff99fcd42so25894441cf.0 for ; Mon, 26 Aug 2024 10:25:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724693106; x=1725297906; 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=9+I4ZaCB/sqpP5JzZUXf+AGUdGSF6g4dYvIuEdY7CXs=; b=VkgB6TsYZC9rvLbpHngsLAJ40DFb96KWbQLgCvU54IMZlgybyxV63sbloMiZKTFygx 7aeQV6PgmG8Td9BXYlXdPCYYKuNNuKgYPb2n3FdcR/KvGoVWT1zXpq6IDk555NSww0XL jnkdnm13BW/GarDZcVCgm/S77SwQBb4CKIZ66ifYJCph96rmwH1yQnxzWMbTAJRmV9lu Yr6pCWycJgNODxnX7fMIRh/AmEjvCf50SeryREliQkSAM/+w848u9uVrfxL/bvxdA8hc oF62joq29DIy235OWPncjoOrTScwmL7EvuJoMrhD3elXE+znYBLI10Ny63DXgPOSIVMB BDRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724693106; x=1725297906; 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=9+I4ZaCB/sqpP5JzZUXf+AGUdGSF6g4dYvIuEdY7CXs=; b=MRsxrDlO9Q5iKNg+NtidPQa7w4ifKeCxxWtzTHVGGz5KRUzNgdoQoIHnzHe3xhDiVu x1OwUrpzJV/rc6BROQIo8g1vekuafIEChd1TxVk6zJOHU8fn7Gm9AS87/gB6pD+50DBq +f0gLI9rgSdgZeiFnUTH6rxcSZ+YyCpS7CkSpfhJ4Q220AyCAyTK/HOCblN8huUOJsfU wSdlZpLuD3ZappM7qO5kDP/qrMIFPsSVc66YqZ8WYsCmqF6FLkvRuozQjeYEuXJfwTQx Yirrldp7BCzm5Fpv1+AP6hN0AFfE7LqLP06ETv7j4Ysghb+IvgiIShkmnIxZxoodQbi+ Lnpg== X-Forwarded-Encrypted: i=1; AJvYcCU1PUQ/TyYpHMYDTh6B44pWJRfnwxDUKqlslNn9ke65u51aqR+x7SWOA3wM0G8b5vloxOq3USOx9Z3THWkjr8iH@lists.infradead.org X-Gm-Message-State: AOJu0Yx5W17PlrTjNfyyyc0HQkc4wUMZAfSJuMAv4Q95NinyM19Dxfp3 KADZ9vw3vjqhZ4qNlZSkQKnhdVGGjpJjPVYsIovicbtkk61tpJ8qSDZdqQ== X-Google-Smtp-Source: AGHT+IFDqoQr7ndvoqg0WiXE2EFba86vbWS6GZn4EuCOqNm05J6X0ruWnhG+tYye9U/muYuTqrThgA== X-Received: by 2002:a17:902:daca:b0:1fd:8c25:415d with SMTP id d9443c01a7336-204df48723cmr2286975ad.36.1724692559502; Mon, 26 Aug 2024 10:15:59 -0700 (PDT) Received: from localhost ([2a00:79e1:2e00:1301:12e9:d196:a1e9:ab67]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20385ae6ebasm69617045ad.240.2024.08.26.10.15.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2024 10:15:58 -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 v8 2/4] iommu/io-pgtable-arm: Re-use the pgtable walk for iova_to_phys Date: Mon, 26 Aug 2024 10:15:39 -0700 Message-ID: <20240826171546.6777-3-robdclark@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240826171546.6777-1-robdclark@gmail.com> References: <20240826171546.6777-1-robdclark@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240826_102509_568797_C0605ADB X-CRM114-Status: GOOD ( 14.45 ) 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 0132f1eff688..f50ebea85dd8 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,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);