Skip to content

Commit b87482d

Browse files
matt-auldjnikula
authored andcommitted
Revert "i915: use io_mapping_map_user"
This reverts commit b739f12. We are unfortunately seeing more issues like we did in 293837b ("Revert "i915: fix remap_io_sg to verify the pgprot""), except this is now for the vm_fault_gtt path, where we are now hitting the same BUG_ON(!pte_none(*pte)): [10887.466150] kernel BUG at mm/memory.c:2183! [10887.466162] invalid opcode: 0000 [Rust-for-Linux#1] PREEMPT SMP PTI [10887.466168] CPU: 0 PID: 7775 Comm: ffmpeg Tainted: G U 5.13.0-rc3-CI-Nightly Rust-for-Linux#1 [10887.466174] Hardware name: To Be Filled By O.E.M. To Be Filled By O.E.M./J4205-ITX, BIOS P1.40 07/14/2017 [10887.466177] RIP: 0010:remap_pfn_range_notrack+0x30f/0x440 [10887.466188] Code: e8 96 d7 e0 ff 84 c0 0f 84 27 01 00 00 48 ba 00 f0 ff ff ff ff 0f 00 4c 89 e0 48 c1 e0 0c 4d 85 ed 75 96 48 21 d0 31 f6 eb a9 <0f> 0b 48 39 37 0f 85 0e 01 00 00 48 8b 0c 24 48 39 4f 08 0f 85 00 [10887.466193] RSP: 0018:ffffc90006e33c50 EFLAGS: 00010286 [10887.466198] RAX: 800000000000002f RBX: 00007f5e01800000 RCX: 0000000000000028 [10887.466201] RDX: 0000000000000001 RSI: ffffea0000000000 RDI: 0000000000000000 [10887.466204] RBP: ffffea000033fea8 R08: 800000000000002f R09: ffff8881072256e0 [10887.466207] R10: ffffc9000b84fff8 R11: 0000000017dab000 R12: 0000000000089f9f [10887.466210] R13: 800000000000002f R14: 00007f5e017e4000 R15: ffff88800cffaf20 [10887.466213] FS: 00007f5e04849640(0000) GS:ffff888278000000(0000) knlGS:0000000000000000 [10887.466216] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [10887.466220] CR2: 00007fd9b191a2ac CR3: 00000001829ac000 CR4: 00000000003506f0 [10887.466223] Call Trace: [10887.466233] vm_fault_gtt+0x1ca/0x5d0 [i915] [10887.466381] ? ktime_get+0x38/0x90 [10887.466389] __do_fault+0x37/0x90 [10887.466395] __handle_mm_fault+0xc46/0x1200 [10887.466402] handle_mm_fault+0xce/0x2a0 [10887.466407] do_user_addr_fault+0x1c5/0x660 Reverting this commit is reported to fix the issue. Reported-by: Eero Tamminen <[email protected]> References: https://gitlab.freedesktop.org/drm/intel/-/issues/3519 Fixes: b739f12 ("i915: use io_mapping_map_user") Cc: Christoph Hellwig <[email protected]> Cc: Daniel Vetter <[email protected]> Signed-off-by: Matthew Auld <[email protected]> Acked-by: Daniel Vetter <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit 0e4fe0c) Signed-off-by: Jani Nikula <[email protected]>
1 parent 10c1f0c commit b87482d

File tree

4 files changed

+52
-5
lines changed

4 files changed

+52
-5
lines changed

drivers/gpu/drm/i915/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ config DRM_I915
2020
select INPUT if ACPI
2121
select ACPI_VIDEO if ACPI
2222
select ACPI_BUTTON if ACPI
23-
select IO_MAPPING
2423
select SYNC_FILE
2524
select IOSF_MBI
2625
select CRC32

drivers/gpu/drm/i915/gem/i915_gem_mman.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,10 +367,11 @@ static vm_fault_t vm_fault_gtt(struct vm_fault *vmf)
367367
goto err_unpin;
368368

369369
/* Finally, remap it using the new GTT offset */
370-
ret = io_mapping_map_user(&ggtt->iomap, area, area->vm_start +
371-
(vma->ggtt_view.partial.offset << PAGE_SHIFT),
372-
(ggtt->gmadr.start + vma->node.start) >> PAGE_SHIFT,
373-
min_t(u64, vma->size, area->vm_end - area->vm_start));
370+
ret = remap_io_mapping(area,
371+
area->vm_start + (vma->ggtt_view.partial.offset << PAGE_SHIFT),
372+
(ggtt->gmadr.start + vma->node.start) >> PAGE_SHIFT,
373+
min_t(u64, vma->size, area->vm_end - area->vm_start),
374+
&ggtt->iomap);
374375
if (ret)
375376
goto err_fence;
376377

drivers/gpu/drm/i915/i915_drv.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1905,6 +1905,9 @@ int i915_reg_read_ioctl(struct drm_device *dev, void *data,
19051905
struct drm_file *file);
19061906

19071907
/* i915_mm.c */
1908+
int remap_io_mapping(struct vm_area_struct *vma,
1909+
unsigned long addr, unsigned long pfn, unsigned long size,
1910+
struct io_mapping *iomap);
19081911
int remap_io_sg(struct vm_area_struct *vma,
19091912
unsigned long addr, unsigned long size,
19101913
struct scatterlist *sgl, resource_size_t iobase);

drivers/gpu/drm/i915/i915_mm.c

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,17 @@ struct remap_pfn {
3737
resource_size_t iobase;
3838
};
3939

40+
static int remap_pfn(pte_t *pte, unsigned long addr, void *data)
41+
{
42+
struct remap_pfn *r = data;
43+
44+
/* Special PTE are not associated with any struct page */
45+
set_pte_at(r->mm, addr, pte, pte_mkspecial(pfn_pte(r->pfn, r->prot)));
46+
r->pfn++;
47+
48+
return 0;
49+
}
50+
4051
#define use_dma(io) ((io) != -1)
4152

4253
static inline unsigned long sgt_pfn(const struct remap_pfn *r)
@@ -66,7 +77,40 @@ static int remap_sg(pte_t *pte, unsigned long addr, void *data)
6677
return 0;
6778
}
6879

80+
/**
81+
* remap_io_mapping - remap an IO mapping to userspace
82+
* @vma: user vma to map to
83+
* @addr: target user address to start at
84+
* @pfn: physical address of kernel memory
85+
* @size: size of map area
86+
* @iomap: the source io_mapping
87+
*
88+
* Note: this is only safe if the mm semaphore is held when called.
89+
*/
90+
int remap_io_mapping(struct vm_area_struct *vma,
91+
unsigned long addr, unsigned long pfn, unsigned long size,
92+
struct io_mapping *iomap)
93+
{
94+
struct remap_pfn r;
95+
int err;
96+
6997
#define EXPECTED_FLAGS (VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP)
98+
GEM_BUG_ON((vma->vm_flags & EXPECTED_FLAGS) != EXPECTED_FLAGS);
99+
100+
/* We rely on prevalidation of the io-mapping to skip track_pfn(). */
101+
r.mm = vma->vm_mm;
102+
r.pfn = pfn;
103+
r.prot = __pgprot((pgprot_val(iomap->prot) & _PAGE_CACHE_MASK) |
104+
(pgprot_val(vma->vm_page_prot) & ~_PAGE_CACHE_MASK));
105+
106+
err = apply_to_page_range(r.mm, addr, size, remap_pfn, &r);
107+
if (unlikely(err)) {
108+
zap_vma_ptes(vma, addr, (r.pfn - pfn) << PAGE_SHIFT);
109+
return err;
110+
}
111+
112+
return 0;
113+
}
70114

71115
/**
72116
* remap_io_sg - remap an IO mapping to userspace

0 commit comments

Comments
 (0)