forked from Minki/linux
90d83dc3d4
The RCU/SRCU API have already changed for proving RCU usage. I got the following dmesg when PROVE_RCU=y because we used incorrect API. This patch coverts rcu_deference() to srcu_dereference() or family API. =================================================== [ INFO: suspicious rcu_dereference_check() usage. ] --------------------------------------------------- arch/x86/kvm/mmu.c:3020 invoked rcu_dereference_check() without protection! other info that might help us debug this: rcu_scheduler_active = 1, debug_locks = 0 2 locks held by qemu-system-x86/8550: #0: (&kvm->slots_lock){+.+.+.}, at: [<ffffffffa011a6ac>] kvm_set_memory_region+0x29/0x50 [kvm] #1: (&(&kvm->mmu_lock)->rlock){+.+...}, at: [<ffffffffa012262d>] kvm_arch_commit_memory_region+0xa6/0xe2 [kvm] stack backtrace: Pid: 8550, comm: qemu-system-x86 Not tainted 2.6.34-rc4-tip-01028-g939eab1 #27 Call Trace: [<ffffffff8106c59e>] lockdep_rcu_dereference+0xaa/0xb3 [<ffffffffa012f6c1>] kvm_mmu_calculate_mmu_pages+0x44/0x7d [kvm] [<ffffffffa012263e>] kvm_arch_commit_memory_region+0xb7/0xe2 [kvm] [<ffffffffa011a5d7>] __kvm_set_memory_region+0x636/0x6e2 [kvm] [<ffffffffa011a6ba>] kvm_set_memory_region+0x37/0x50 [kvm] [<ffffffffa015e956>] vmx_set_tss_addr+0x46/0x5a [kvm_intel] [<ffffffffa0126592>] kvm_arch_vm_ioctl+0x17a/0xcf8 [kvm] [<ffffffff810a8692>] ? unlock_page+0x27/0x2c [<ffffffff810bf879>] ? __do_fault+0x3a9/0x3e1 [<ffffffffa011b12f>] kvm_vm_ioctl+0x364/0x38d [kvm] [<ffffffff81060cfa>] ? up_read+0x23/0x3d [<ffffffff810f3587>] vfs_ioctl+0x32/0xa6 [<ffffffff810f3b19>] do_vfs_ioctl+0x495/0x4db [<ffffffff810e6b2f>] ? fget_light+0xc2/0x241 [<ffffffff810e416c>] ? do_sys_open+0x104/0x116 [<ffffffff81382d6d>] ? retint_swapgs+0xe/0x13 [<ffffffff810f3ba6>] sys_ioctl+0x47/0x6a [<ffffffff810021db>] system_call_fastpath+0x16/0x1b Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com> Signed-off-by: Avi Kivity <avi@redhat.com>
101 lines
2.9 KiB
C
101 lines
2.9 KiB
C
/*
|
|
* kvm_s390.h - definition for kvm on s390
|
|
*
|
|
* Copyright IBM Corp. 2008,2009
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License (version 2 only)
|
|
* as published by the Free Software Foundation.
|
|
*
|
|
* Author(s): Carsten Otte <cotte@de.ibm.com>
|
|
* Christian Borntraeger <borntraeger@de.ibm.com>
|
|
* Christian Ehrhardt <ehrhardt@de.ibm.com>
|
|
*/
|
|
|
|
#ifndef ARCH_S390_KVM_S390_H
|
|
#define ARCH_S390_KVM_S390_H
|
|
|
|
#include <linux/hrtimer.h>
|
|
#include <linux/kvm.h>
|
|
#include <linux/kvm_host.h>
|
|
|
|
/* The current code can have up to 256 pages for virtio */
|
|
#define VIRTIODESCSPACE (256ul * 4096ul)
|
|
|
|
typedef int (*intercept_handler_t)(struct kvm_vcpu *vcpu);
|
|
|
|
/* negativ values are error codes, positive values for internal conditions */
|
|
#define SIE_INTERCEPT_RERUNVCPU (1<<0)
|
|
int kvm_handle_sie_intercept(struct kvm_vcpu *vcpu);
|
|
|
|
#define VM_EVENT(d_kvm, d_loglevel, d_string, d_args...)\
|
|
do { \
|
|
debug_sprintf_event(d_kvm->arch.dbf, d_loglevel, d_string "\n", \
|
|
d_args); \
|
|
} while (0)
|
|
|
|
#define VCPU_EVENT(d_vcpu, d_loglevel, d_string, d_args...)\
|
|
do { \
|
|
debug_sprintf_event(d_vcpu->kvm->arch.dbf, d_loglevel, \
|
|
"%02d[%016lx-%016lx]: " d_string "\n", d_vcpu->vcpu_id, \
|
|
d_vcpu->arch.sie_block->gpsw.mask, d_vcpu->arch.sie_block->gpsw.addr,\
|
|
d_args); \
|
|
} while (0)
|
|
|
|
static inline int __cpu_is_stopped(struct kvm_vcpu *vcpu)
|
|
{
|
|
return atomic_read(&vcpu->arch.sie_block->cpuflags) & CPUSTAT_STOP_INT;
|
|
}
|
|
|
|
int kvm_s390_handle_wait(struct kvm_vcpu *vcpu);
|
|
enum hrtimer_restart kvm_s390_idle_wakeup(struct hrtimer *timer);
|
|
void kvm_s390_tasklet(unsigned long parm);
|
|
void kvm_s390_deliver_pending_interrupts(struct kvm_vcpu *vcpu);
|
|
int kvm_s390_inject_vm(struct kvm *kvm,
|
|
struct kvm_s390_interrupt *s390int);
|
|
int kvm_s390_inject_vcpu(struct kvm_vcpu *vcpu,
|
|
struct kvm_s390_interrupt *s390int);
|
|
int kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code);
|
|
int kvm_s390_inject_sigp_stop(struct kvm_vcpu *vcpu, int action);
|
|
|
|
static inline long kvm_s390_vcpu_get_memsize(struct kvm_vcpu *vcpu)
|
|
{
|
|
return vcpu->arch.sie_block->gmslm
|
|
- vcpu->arch.sie_block->gmsor
|
|
- VIRTIODESCSPACE + 1ul;
|
|
}
|
|
|
|
static inline void kvm_s390_vcpu_set_mem(struct kvm_vcpu *vcpu)
|
|
{
|
|
int idx;
|
|
struct kvm_memory_slot *mem;
|
|
struct kvm_memslots *memslots;
|
|
|
|
idx = srcu_read_lock(&vcpu->kvm->srcu);
|
|
memslots = kvm_memslots(vcpu->kvm);
|
|
|
|
mem = &memslots->memslots[0];
|
|
|
|
vcpu->arch.sie_block->gmsor = mem->userspace_addr;
|
|
vcpu->arch.sie_block->gmslm =
|
|
mem->userspace_addr +
|
|
(mem->npages << PAGE_SHIFT) +
|
|
VIRTIODESCSPACE - 1ul;
|
|
|
|
srcu_read_unlock(&vcpu->kvm->srcu, idx);
|
|
}
|
|
|
|
/* implemented in priv.c */
|
|
int kvm_s390_handle_b2(struct kvm_vcpu *vcpu);
|
|
|
|
/* implemented in sigp.c */
|
|
int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu);
|
|
|
|
/* implemented in kvm-s390.c */
|
|
int __kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu,
|
|
unsigned long addr);
|
|
/* implemented in diag.c */
|
|
int kvm_s390_handle_diag(struct kvm_vcpu *vcpu);
|
|
|
|
#endif
|