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

s390/pci: Fix s390_mmio_read/write syscall page fault handling

Browse Source 
[ Upstream commit 41a0926e82f4963046876ed9a1b5f681be8087a8 ]

The s390 MMIO syscalls when using the classic PCI instructions do not
cause a page fault when follow_pfnmap_start() fails due to the page not
being present. Besides being a general deficiency this breaks vfio-pci's
mmap() handling once VFIO_PCI_MMAP gets enabled as this lazily maps on
first access. Fix this by following a failed follow_pfnmap_start() with
fixup_user_page() and retrying the follow_pfnmap_start(). Also fix
a VM_READ vs VM_WRITE mixup in the read syscall.

Link: https://lore.kernel.org/r/20250226-vfio_pci_mmap-v7-1-c5c0f1d26efd@linux.ibm.com
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Niklas Schnelle
2025-02-26 13:07:45 +01:00
committed by Greg Kroah-Hartman
parent dd3edffae8
commit 43e5e2879d
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/s390/pci/pci_mmio.c
+13 -5
View File
@@ -171,8 +171,12 @@ SYSCALL_DEFINE3(s390_pci_mmio_write, unsigned long, mmio_addr,
args.address = mmio_addr; args.address = mmio_addr;
args.vma = vma; args.vma = vma;
ret = follow_pfnmap_start(&args); ret = follow_pfnmap_start(&args);
if (ret) if (ret) {
goto out_unlock_mmap; fixup_user_fault(current->mm, mmio_addr, FAULT_FLAG_WRITE, NULL);
ret = follow_pfnmap_start(&args);
if (ret)
goto out_unlock_mmap;
}
io_addr = (void __iomem *)((args.pfn << PAGE_SHIFT) | io_addr = (void __iomem *)((args.pfn << PAGE_SHIFT) |
(mmio_addr & ~PAGE_MASK)); (mmio_addr & ~PAGE_MASK));
@@ -305,14 +309,18 @@ SYSCALL_DEFINE3(s390_pci_mmio_read, unsigned long, mmio_addr,
if (!(vma->vm_flags & (VM_IO | VM_PFNMAP))) if (!(vma->vm_flags & (VM_IO | VM_PFNMAP)))
goto out_unlock_mmap; goto out_unlock_mmap;
ret = -EACCES; ret = -EACCES;
if (!(vma->vm_flags & VM_WRITE)) if (!(vma->vm_flags & VM_READ))
goto out_unlock_mmap; goto out_unlock_mmap;
args.vma = vma; args.vma = vma;
args.address = mmio_addr; args.address = mmio_addr;
ret = follow_pfnmap_start(&args); ret = follow_pfnmap_start(&args);
if (ret) if (ret) {
goto out_unlock_mmap; fixup_user_fault(current->mm, mmio_addr, 0, NULL);
ret = follow_pfnmap_start(&args);
if (ret)
goto out_unlock_mmap;
}
io_addr = (void __iomem *)((args.pfn << PAGE_SHIFT) | io_addr = (void __iomem *)((args.pfn << PAGE_SHIFT) |
(mmio_addr & ~PAGE_MASK)); (mmio_addr & ~PAGE_MASK));