From nobody Thu Dec 18 23:47:13 2025 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7B9D11990AF for ; Mon, 26 Aug 2024 17:16:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724692562; cv=none; b=ahXHdcWZNC8buV7VJ9KNPEHpxMVNrpwfdscjLrhcSC6o3JK3jC33TnztA5BpJz4k/8Ih6QEMuJcKslBboeXC23INt+nN72s1uD5l9AdzOkKjx71drXpJPmBu2paJo1U8kY2xPJxO48iNDI05YQbneCEtb1x9cCTFwfk6mSaS8Gs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724692562; c=relaxed/simple; bh=XGTqvhBSomuWVnpuTB9nRwhF8NvYdo4ZB99rM+0HxIc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aCLpB51lM2lb7iznVR9+dUqjmlHYJd9v14RNPsVDzP3meh+lYV4UVPB4luKCNhJmn9feN68Tht5kyu4MQqfuvvGVP2VdcuvHbL4MuCf0Fq8t7i53c49sSgNBfKyJ46mMk6VtMCrcbxsBpySEqcNKKxHcbQS4+Q7IEj0qr7qwMj8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kqPjw/PY; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kqPjw/PY" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-201fba05363so35201425ad.3 for ; Mon, 26 Aug 2024 10:16:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724692560; x=1725297360; darn=vger.kernel.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=kqPjw/PYXvT8GPzAa4RfqCg6w4V0K0JNWWf9lWGGhy9taLr5LNRKjO6qF81G/EmgW7 B6MnVTr++9HbEyDaNwqNpbwrfp7wEgziBsese+F7QMsPG2p8kkqyhfrMe+i95UJdv/R6 MfdBCugEm3l7OmGdTCXmNBdlWbUD96xO5QX6IvUGM3aHH7BXN3upnmt7/Ifg0kEAjy53 3QemRJy75nETTm48Rv2K/+Id/BTd+jcsibutdeaC+7vKbdE29U5EeobQjNgBhT5jW5Sl 4JudbjAlU0LgxIAa1KVksyl5+L1l120i6QNATWFsA9b+CeYC60CtpD716qxoCa+gW3/M CW4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724692560; x=1725297360; 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=K29HYDAkUSZ1ch4L8J6IQss82iDzl9mXQCsouX7x3QQG03d4VPKQYkAdjQt/ZNwHwu H06/7D2cKj+GzwGeKERNxyG837B7jC3Pi1cmkp4ArYqtxxxVQq+rQEHbOUBYFh7w+A5g b6nX0kMB7rMppo47dTJKs3tQdfuYgVHdaAmZ/58Mea4x525sbS8cf69lGY0GIF7QGKMq OWE/WURhFBwmxmePfZWE28Jg7JMIvQ2BFF2pckNy+9/qDZd9J0YgWEKB73ukB/b71l11 K3DgMByWeP9C6mw0pQRZOoXIL2bMhSF4b1rBSgjtLG2/aiA2AsNpzNR+t/wfOtEPjv/N /+9Q== X-Forwarded-Encrypted: i=1; AJvYcCWRhQlpfISy1qbqXXhd9/IwMNmB0ZAFnIjIzutET91nFaFj0zxqQfcbi+Jqlw2W14/WjBXvEVPqrf9idcs=@vger.kernel.org X-Gm-Message-State: AOJu0YwSafKNiAWl4nX8KBJ7RtIQaNc88qvF64EdpaFOndZUYobsbVE+ BiQ/WjeP7p19IvTdUHMwDks9UlsJzNvtGHNfaY1+63RWYk0qi3C3 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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_o= ps *ops, unsigned long iov data->start_level, ptep); } =20 -static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops, - unsigned long iova) -{ - struct arm_lpae_io_pgtable *data =3D io_pgtable_ops_to_data(ops); - arm_lpae_iopte pte, *ptep =3D data->pgd; - int lvl =3D data->start_level; - - do { - /* Valid IOPTE pointer? */ - if (!ptep) - return 0; - - /* Grab the IOPTE we're interested in */ - ptep +=3D ARM_LPAE_LVL_IDX(iova, lvl, data); - pte =3D 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 =3D iopte_deref(pte, data); - } while (++lvl < ARM_LPAE_MAX_LEVELS); - - /* Ran out of page tables to walk */ - return 0; - -found_translation: - iova &=3D (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_pg= table *data, arm_lpae_iopte *ptep, int lvl); =20 +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 =3D walk_data->data; + data->pte =3D *ptep; + data->lvl =3D 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 =3D io_pgtable_ops_to_data(ops); + struct iova_to_phys_data d; + struct io_pgtable_walk_data walk_data =3D { + .data =3D &d, + .visit =3D visit_iova_to_phys, + .addr =3D iova, + .end =3D iova + 1, + }; + int ret; + + ret =3D __arm_lpae_iopte_walk(data, &walk_data, data->pgd, data->start_le= vel); + if (ret) + return 0; + + iova &=3D (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; } =20 - if (WARN_ON(!iopte_table(pte, lvl))) + if (WARN_ON(!iopte_table(pte, lvl) && !selftest_running)) return -EINVAL; =20 ptep =3D iopte_deref(pte, data); --=20 2.46.0