• Paul Mackerras's avatar
    KVM: PPC: Book3S HV: Take SRCU read lock around kvm_read_guest() call · c9438092
    Paul Mackerras authored
    Running a kernel with CONFIG_PROVE_RCU=y yields the following diagnostic:
    
    ===============================
    [ INFO: suspicious RCU usage. ]
    3.12.0-rc5-kvm+ #9 Not tainted
    -------------------------------
    
    include/linux/kvm_host.h:473 suspicious rcu_dereference_check() usage!
    
    other info that might help us debug this:
    
    rcu_scheduler_active = 1, debug_locks = 0
    1 lock held by qemu-system-ppc/4831:
    
    stack backtrace:
    CPU: 28 PID: 4831 Comm: qemu-system-ppc Not tainted 3.12.0-rc5-kvm+ #9
    Call Trace:
    [c000000be462b2a0] [c00000000001644c] .show_stack+0x7c/0x1f0 (unreliable)
    [c000000be462b370] [c000000000ad57c0] .dump_stack+0x88/0xb4
    [c000000be462b3f0] [c0000000001315e8] .lockdep_rcu_suspicious+0x138/0x180
    [c000000be462b480] [c00000000007862c] .gfn_to_memslot+0x13c/0x170
    [c000000be462b510] [c00000000007d384] .gfn_to_hva_prot+0x24/0x90
    [c000000be462b5a0] [c00000000007d420] .kvm_read_guest_page+0x30/0xd0
    [c000000be462b630] [c00000000007d528] .kvm_read_guest+0x68/0x110
    [c000000be462b6e0] [c000000000084594] .kvmppc_rtas_hcall+0x34/0x180
    [c000000be462b7d0] [c000000000097934] .kvmppc_pseries_do_hcall+0x74/0x830
    [c000000be462b880] [c0000000000990e8] .kvmppc_vcpu_run_hv+0xff8/0x15a0
    [c000000be462b9e0] [c0000000000839cc] .kvmppc_vcpu_run+0x2c/0x40
    [c000000be462ba50] [c0000000000810b4] .kvm_arch_vcpu_ioctl_run+0x54/0x1b0
    [c000000be462bae0] [c00000000007b508] .kvm_vcpu_ioctl+0x478/0x730
    [c000000be462bca0] [c00000000025532c] .do_vfs_ioctl+0x4dc/0x7a0
    [c000000be462bd80] [c0000000002556b4] .SyS_ioctl+0xc4/0xe0
    [c000000be462be30] [c000000000009ee4] syscall_exit+0x0/0x98
    
    To fix this, we take the SRCU read lock around the kvmppc_rtas_hcall()
    call.
    Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
    Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
    c9438092
book3s_hv.c 56.2 KB