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);