From patchwork Mon Aug 26 17:15:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 13778255 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 EC3CBC5321E for ; Mon, 26 Aug 2024 17:18:02 +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=JP4TZEK1BK3FCdoYwuXOrd9TRG8IyqaAd5V9ttXFyYQ=; b=N+lBPMvcdN9x7WwgWj47K+LTiQ /VFYka1SzfSiwP6HlQ/ScHDifSUIJx0FC140J7fXkKANV8kB9crnwvOXsWhsVA2Tmrk/EedsfjIkr 7zdppKFt3Y0YNmQNZd8TNKL/nFHVvzQDuFohTb1fvObdij5NSngjVX8SUt4/aoKwYoR1uX7HbsZ6s ZEVNZ88lN1sHZYCkKXeuhodCggaE0aruwunlc2N3HX3RshKwld0BXrfh6AsOpBdpD5zXXxuNLeQ+e Txwvq9/b4ASCFvkPze6gPcrZ5nxrICg1ijpNILon/kHVHZwuK6PcYm6cPTuK7nCVy1VdhciVnIDXa EdJ39/wQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sidLj-00000008Ae3-3as2; Mon, 26 Aug 2024 17:17:52 +0000 Received: from mail-il1-x135.google.com ([2607:f8b0:4864:20::135]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sidK0-00000008A8G-1ssI for linux-arm-kernel@lists.infradead.org; Mon, 26 Aug 2024 17:16:10 +0000 Received: by mail-il1-x135.google.com with SMTP id e9e14a558f8ab-39d3636e955so14539155ab.3 for ; Mon, 26 Aug 2024 10:16:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724692563; x=1725297363; 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=JP4TZEK1BK3FCdoYwuXOrd9TRG8IyqaAd5V9ttXFyYQ=; b=KPuvyP+NLiMV/DdBzkn5+MAW08NrcIAGCgy/PAGFdOupvPTo5/uGIfF4jOpqTX4EcF dy4TxKvdyNBNPB9gBFMT2JXNWL5PKJgT+SXvzfPpS80UEMcElC23dKY/zHz/zkksPhke I1Gbp+z+nQelZ2fqnf1f7xHXeMBVFSo5ru1SzHw8Eyt6m3sWsM/sZO/9qIXDZBFG948L 4NimORiryORqdtEDUhKtxXTOvLvGGh1kHld/Lcvypwg43euUarmSG7GrUQTV4SFcC4Ll hNRC36qePPNr+7/BcXWIo5yTQhE04iV5VgygO2KPSPj0g0ZqROH2iqpBQEFb0HwodTUB Lt6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724692563; x=1725297363; 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=JP4TZEK1BK3FCdoYwuXOrd9TRG8IyqaAd5V9ttXFyYQ=; b=uWbast1dPIwMb7xeDKlBmG5YS/lFbmiotXO9/557nglAMWv4QG5JXI1AFJ+AOVgmv6 aEvf71cmqZYMqKK19y9lYDbyfN+Q8wcEHIuDeJNI6dKdMwYrKBJRViYbwhTIIvhAhjC8 /5Iub1uAMuTioBw1vdjVPJ3kkgM2UOrOQ4yDEwSgc8IcfTIYo6+uVacgAbYvcWvVwAbM JmgeuyXLsojWk10qmaUwRBLdJFhnMc9sxSQczOKJDQRYaC6g39v8b4008QHFLX6cwnCR n7bsGPwiGnUrZyfLxxJ5tHwyNx4+uBupweEVNN8mCDRz90EOJhkYqYEOXpjHfz9CE3YY 4FKw== X-Forwarded-Encrypted: i=1; AJvYcCWtBDWiEzkRa1qKl+orjR3O3mqBO0NVPqY/NiXZ0ocKNGGDGml+gcBW8X4z+f0W4C73T6ln5Czumn6NyPENruAP@lists.infradead.org X-Gm-Message-State: AOJu0YwsY6rQ6uaNTsM2gyQp37gwImCK3Ko1GGH/X5KFZaLq9GrH5Cgx 4MuEAlCXwmhS+jezxLYos5LS1aG5ZJkIKEYFc86WVIi4bRQlVu+E X-Google-Smtp-Source: AGHT+IFzZhZ24BSgc0zToZ5EuWURN6G2xkvE2v3EkHzS1HwmPoHerM5RzvQaEMtBZgU9U98rh+O6OA== X-Received: by 2002:a05:6e02:1a8a:b0:39d:290b:6800 with SMTP id e9e14a558f8ab-39e3c9edf77mr129742785ab.28.1724692562965; Mon, 26 Aug 2024 10:16:02 -0700 (PDT) Received: from localhost ([2a00:79e1:2e00:1301:12e9:d196:a1e9:ab67]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7cd9ad55283sm7884302a12.74.2024.08.26.10.16.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2024 10:16:02 -0700 (PDT) From: Rob Clark To: iommu@lists.linux.dev Cc: Will Deacon , Robin Murphy , Rob Clark , Joerg Roedel , Jason Gunthorpe , Joao Martins , Kevin Tian , Shameer Kolothum , Boris Brezillon , linux-arm-kernel@lists.infradead.org (moderated list:ARM SMMU DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 3/4] iommu/io-pgtable-arm: Add way to debug pgtable walk Date: Mon, 26 Aug 2024 10:15:40 -0700 Message-ID: <20240826171546.6777-4-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_101604_601185_BB9DF9D3 X-CRM114-Status: GOOD ( 13.74 ) 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 f50ebea85dd8..2f57a50afe2c 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 *ptep, size_t size) +{ + struct arm_lpae_io_pgtable_walk_data *data = walk_data->data; + data->ptes[data->level++] = *ptep; + 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,