tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BACKPORT: FROMLIST: iommu/io-pgtable-arm: Add way to debug pgtable walk

Browse Source 
Add an io-pgtable method to walk the pgtable returning the raw PTEs that
would be traversed for a given iova access.

Link: https://lore.kernel.org/linux-iommu/20241028213146.238941-1-robdclark@gmail.com/T/#m16ed9fe871111641e1c2673ec0fcb7bcb7771658

Bug: 357781595
Bug: 384432312

Change-Id: I24f14d5ccb8a7f91e243f4ec29695b546cbe2bdd
Signed-off-by: Rob Clark <robdclark@chromium.org>
This commit is contained in:
Rob Clark
2024-10-28 14:31:39 -07:00
committed by Mostafa Saleh
parent d778c7a232
commit 599bc2230b
2 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/iommu/io-pgtable-arm.c
+25
View File
@@ -774,6 +774,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)
@@ -949,6 +973,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;
include/linux/io-pgtable.h
+15
View File
@@ -178,12 +178,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.
@@ -197,6 +211,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,