Revision 9a291a7c9428155e8e623e4a3989f8be47134df5 authored by James Morse on 02 June 2017, 21:46:46 UTC, committed by Linus Torvalds on 02 June 2017, 22:07:38 UTC
KVM uses get_user_pages() to resolve its stage2 faults.  KVM sets the
FOLL_HWPOISON flag causing faultin_page() to return -EHWPOISON when it
finds a VM_FAULT_HWPOISON.  KVM handles these hwpoison pages as a
special case.  (check_user_page_hwpoison())

When huge pages are involved, this doesn't work so well.
get_user_pages() calls follow_hugetlb_page(), which stops early if it
receives VM_FAULT_HWPOISON from hugetlb_fault(), eventually returning
-EFAULT to the caller.  The step to map this to -EHWPOISON based on the
FOLL_ flags is missing.  The hwpoison special case is skipped, and
-EFAULT is returned to user-space, causing Qemu or kvmtool to exit.

Instead, move this VM_FAULT_ to errno mapping code into a header file
and use it from faultin_page() and follow_hugetlb_page().

With this, KVM works as expected.

This isn't a problem for arm64 today as we haven't enabled
MEMORY_FAILURE, but I can't see any reason this doesn't happen on x86
too, so I think this should be a fix.  This doesn't apply earlier than
stable's v4.11.1 due to all sorts of cleanup.

[james.morse@arm.com: add vm_fault_to_errno() call to faultin_page()]
suggested.
  Link: http://lkml.kernel.org/r/20170525171035.16359-1-james.morse@arm.com
[akpm@linux-foundation.org: coding-style fixes]
Link: http://lkml.kernel.org/r/20170524160900.28786-1-james.morse@arm.com
Signed-off-by: James Morse <james.morse@arm.com>
Acked-by: Punit Agrawal <punit.agrawal@arm.com>
Acked-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>
Cc: <stable@vger.kernel.org>	[4.11.1+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 70feee0
History
File Mode Size
9p
adfs
affs
afs
autofs4
befs
bfs
btrfs
cachefiles
ceph
cifs
coda
configfs
cramfs
crypto
debugfs
devpts
dlm
ecryptfs
efivarfs
efs
exofs
exportfs
ext2
ext4
f2fs
fat
freevxfs
fscache
fuse
gfs2
hfs
hfsplus
hostfs
hpfs
hugetlbfs
isofs
jbd2
jffs2
jfs
kernfs
lockd
minix
ncpfs
nfs
nfs_common
nfsd
nilfs2
nls
notify
ntfs
ocfs2
omfs
openpromfs
orangefs
overlayfs
proc
pstore
qnx4
qnx6
quota
ramfs
reiserfs
romfs
squashfs
sysfs
sysv
tracefs
ubifs
udf
ufs
xfs
Kconfig -rw-r--r-- 7.2 KB
Kconfig.binfmt -rw-r--r-- 7.2 KB
Makefile -rw-r--r-- 4.2 KB
aio.c -rw-r--r-- 45.9 KB
anon_inodes.c -rw-r--r-- 4.9 KB
attr.c -rw-r--r-- 9.2 KB
bad_inode.c -rw-r--r-- 5.3 KB
binfmt_aout.c -rw-r--r-- 10.8 KB
binfmt_elf.c -rw-r--r-- 61.3 KB
binfmt_elf_fdpic.c -rw-r--r-- 47.0 KB
binfmt_em86.c -rw-r--r-- 2.8 KB
binfmt_flat.c -rw-r--r-- 27.9 KB
binfmt_misc.c -rw-r--r-- 18.3 KB
binfmt_script.c -rw-r--r-- 3.0 KB
block_dev.c -rw-r--r-- 52.9 KB
buffer.c -rw-r--r-- 91.1 KB
char_dev.c -rw-r--r-- 16.1 KB
compat.c -rw-r--r-- 5.1 KB
compat_binfmt_elf.c -rw-r--r-- 3.4 KB
compat_ioctl.c -rw-r--r-- 45.8 KB
coredump.c -rw-r--r-- 21.3 KB
dax.c -rw-r--r-- 41.2 KB
dcache.c -rw-r--r-- 93.8 KB
dcookies.c -rw-r--r-- 6.9 KB
direct-io.c -rw-r--r-- 38.3 KB
drop_caches.c -rw-r--r-- 1.6 KB
eventfd.c -rw-r--r-- 12.9 KB
eventpoll.c -rw-r--r-- 62.1 KB
exec.c -rw-r--r-- 44.5 KB
fcntl.c -rw-r--r-- 20.6 KB
fhandle.c -rw-r--r-- 6.8 KB
file.c -rw-r--r-- 23.6 KB
file_table.c -rw-r--r-- 8.6 KB
filesystems.c -rw-r--r-- 6.4 KB
fs-writeback.c -rw-r--r-- 70.5 KB
fs_pin.c -rw-r--r-- 2.0 KB
fs_struct.c -rw-r--r-- 3.3 KB
inode.c -rw-r--r-- 54.9 KB
internal.h -rw-r--r-- 4.6 KB
ioctl.c -rw-r--r-- 17.3 KB
iomap.c -rw-r--r-- 22.7 KB
libfs.c -rw-r--r-- 30.5 KB
locks.c -rw-r--r-- 73.3 KB
mbcache.c -rw-r--r-- 11.9 KB
mount.h -rw-r--r-- 3.7 KB
mpage.c -rw-r--r-- 20.5 KB
namei.c -rw-r--r-- 120.9 KB
namespace.c -rw-r--r-- 85.3 KB
no-block.c -rw-r--r-- 688 bytes
nsfs.c -rw-r--r-- 5.6 KB
open.c -rw-r--r-- 28.2 KB
pipe.c -rw-r--r-- 27.3 KB
pnode.c -rw-r--r-- 12.1 KB
pnode.h -rw-r--r-- 1.9 KB
posix_acl.c -rw-r--r-- 21.4 KB
proc_namespace.c -rw-r--r-- 7.8 KB
read_write.c -rw-r--r-- 47.2 KB
readdir.c -rw-r--r-- 11.2 KB
select.c -rw-r--r-- 35.6 KB
seq_file.c -rw-r--r-- 22.7 KB
signalfd.c -rw-r--r-- 9.2 KB
splice.c -rw-r--r-- 40.0 KB
stack.c -rw-r--r-- 2.5 KB
stat.c -rw-r--r-- 19.1 KB
statfs.c -rw-r--r-- 9.7 KB
super.c -rw-r--r-- 38.9 KB
sync.c -rw-r--r-- 9.9 KB
timerfd.c -rw-r--r-- 13.4 KB
userfaultfd.c -rw-r--r-- 47.4 KB
utimes.c -rw-r--r-- 7.1 KB
xattr.c -rw-r--r-- 23.3 KB

back to top