Skip to content

Commit 1e56310

Browse files
hegdevasantjoergroedel
authored andcommitted
iommu/amd/pgtbl: Fix possible race while increase page table level
The AMD IOMMU host page table implementation supports dynamic page table levels (up to 6 levels), starting with a 3-level configuration that expands based on IOVA address. The kernel maintains a root pointer and current page table level to enable proper page table walks in alloc_pte()/fetch_pte() operations. The IOMMU IOVA allocator initially starts with 32-bit address and onces its exhuasted it switches to 64-bit address (max address is determined based on IOMMU and device DMA capability). To support larger IOVA, AMD IOMMU driver increases page table level. But in unmap path (iommu_v1_unmap_pages()), fetch_pte() reads pgtable->[root/mode] without lock. So its possible that in exteme corner case, when increase_address_space() is updating pgtable->[root/mode], fetch_pte() reads wrong page table level (pgtable->mode). It does compare the value with level encoded in page table and returns NULL. This will result is iommu_unmap ops to fail and upper layer may retry/log WARN_ON. CPU 0 CPU 1 ------ ------ map pages unmap pages alloc_pte() -> increase_address_space() iommu_v1_unmap_pages() -> fetch_pte() pgtable->root = pte (new root value) READ pgtable->[mode/root] Reads new root, old mode Updates mode (pgtable->mode += 1) Since Page table level updates are infrequent and already synchronized with a spinlock, implement seqcount to enable lock-free read operations on the read path. Fixes: 754265b ("iommu/amd: Fix race in increase_address_space()") Reported-by: Alejandro Jimenez <alejandro.j.jimenez@oracle.com> Cc: stable@vger.kernel.org Cc: Joao Martins <joao.m.martins@oracle.com> Cc: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com> Signed-off-by: Vasant Hegde <vasant.hegde@amd.com> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
1 parent a0c17ed commit 1e56310

2 files changed

Lines changed: 22 additions & 4 deletions

File tree

drivers/iommu/amd/amd_iommu_types.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,7 @@ struct gcr3_tbl_info {
555555
};
556556

557557
struct amd_io_pgtable {
558+
seqcount_t seqcount; /* Protects root/mode update */
558559
struct io_pgtable pgtbl;
559560
int mode;
560561
u64 *root;

drivers/iommu/amd/io_pgtable.c

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <linux/slab.h>
1818
#include <linux/types.h>
1919
#include <linux/dma-mapping.h>
20+
#include <linux/seqlock.h>
2021

2122
#include <asm/barrier.h>
2223

@@ -130,8 +131,11 @@ static bool increase_address_space(struct amd_io_pgtable *pgtable,
130131

131132
*pte = PM_LEVEL_PDE(pgtable->mode, iommu_virt_to_phys(pgtable->root));
132133

134+
write_seqcount_begin(&pgtable->seqcount);
133135
pgtable->root = pte;
134136
pgtable->mode += 1;
137+
write_seqcount_end(&pgtable->seqcount);
138+
135139
amd_iommu_update_and_flush_device_table(domain);
136140

137141
pte = NULL;
@@ -153,6 +157,7 @@ static u64 *alloc_pte(struct amd_io_pgtable *pgtable,
153157
{
154158
unsigned long last_addr = address + (page_size - 1);
155159
struct io_pgtable_cfg *cfg = &pgtable->pgtbl.cfg;
160+
unsigned int seqcount;
156161
int level, end_lvl;
157162
u64 *pte, *page;
158163

@@ -170,8 +175,14 @@ static u64 *alloc_pte(struct amd_io_pgtable *pgtable,
170175
}
171176

172177

173-
level = pgtable->mode - 1;
174-
pte = &pgtable->root[PM_LEVEL_INDEX(level, address)];
178+
do {
179+
seqcount = read_seqcount_begin(&pgtable->seqcount);
180+
181+
level = pgtable->mode - 1;
182+
pte = &pgtable->root[PM_LEVEL_INDEX(level, address)];
183+
} while (read_seqcount_retry(&pgtable->seqcount, seqcount));
184+
185+
175186
address = PAGE_SIZE_ALIGN(address, page_size);
176187
end_lvl = PAGE_SIZE_LEVEL(page_size);
177188

@@ -249,15 +260,20 @@ static u64 *fetch_pte(struct amd_io_pgtable *pgtable,
249260
unsigned long *page_size)
250261
{
251262
int level;
263+
unsigned int seqcount;
252264
u64 *pte;
253265

254266
*page_size = 0;
255267

256268
if (address > PM_LEVEL_SIZE(pgtable->mode))
257269
return NULL;
258270

259-
level = pgtable->mode - 1;
260-
pte = &pgtable->root[PM_LEVEL_INDEX(level, address)];
271+
do {
272+
seqcount = read_seqcount_begin(&pgtable->seqcount);
273+
level = pgtable->mode - 1;
274+
pte = &pgtable->root[PM_LEVEL_INDEX(level, address)];
275+
} while (read_seqcount_retry(&pgtable->seqcount, seqcount));
276+
261277
*page_size = PTE_LEVEL_PAGE_SIZE(level);
262278

263279
while (level > 0) {
@@ -541,6 +557,7 @@ static struct io_pgtable *v1_alloc_pgtable(struct io_pgtable_cfg *cfg, void *coo
541557
if (!pgtable->root)
542558
return NULL;
543559
pgtable->mode = PAGE_MODE_3_LEVEL;
560+
seqcount_init(&pgtable->seqcount);
544561

545562
cfg->pgsize_bitmap = amd_iommu_pgsize_bitmap;
546563
cfg->ias = IOMMU_IN_ADDR_BIT_SIZE;

0 commit comments

Comments
 (0)