forked from luck/tmp_suning_uos_patched
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>
242 lines
5.5 KiB
C
242 lines
5.5 KiB
C
/*
|
|
* Copyright (c) 2006, Intel Corporation.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along with
|
|
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple
|
|
* Place - Suite 330, Boston, MA 02111-1307 USA.
|
|
*
|
|
* Copyright (C) 2006-2008 Intel Corporation
|
|
* Copyright IBM Corporation, 2008
|
|
* Author: Allen M. Kay <allen.m.kay@intel.com>
|
|
* Author: Weidong Han <weidong.han@intel.com>
|
|
* Author: Ben-Ami Yassour <benami@il.ibm.com>
|
|
*/
|
|
|
|
#include <linux/list.h>
|
|
#include <linux/kvm_host.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/dmar.h>
|
|
#include <linux/iommu.h>
|
|
#include <linux/intel-iommu.h>
|
|
|
|
static int kvm_iommu_unmap_memslots(struct kvm *kvm);
|
|
static void kvm_iommu_put_pages(struct kvm *kvm,
|
|
gfn_t base_gfn, unsigned long npages);
|
|
|
|
int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot)
|
|
{
|
|
gfn_t gfn = slot->base_gfn;
|
|
unsigned long npages = slot->npages;
|
|
pfn_t pfn;
|
|
int i, r = 0;
|
|
struct iommu_domain *domain = kvm->arch.iommu_domain;
|
|
int flags;
|
|
|
|
/* check if iommu exists and in use */
|
|
if (!domain)
|
|
return 0;
|
|
|
|
flags = IOMMU_READ | IOMMU_WRITE;
|
|
if (kvm->arch.iommu_flags & KVM_IOMMU_CACHE_COHERENCY)
|
|
flags |= IOMMU_CACHE;
|
|
|
|
for (i = 0; i < npages; i++) {
|
|
/* check if already mapped */
|
|
if (iommu_iova_to_phys(domain, gfn_to_gpa(gfn)))
|
|
continue;
|
|
|
|
pfn = gfn_to_pfn_memslot(kvm, slot, gfn);
|
|
r = iommu_map_range(domain,
|
|
gfn_to_gpa(gfn),
|
|
pfn_to_hpa(pfn),
|
|
PAGE_SIZE, flags);
|
|
if (r) {
|
|
printk(KERN_ERR "kvm_iommu_map_address:"
|
|
"iommu failed to map pfn=%lx\n", pfn);
|
|
goto unmap_pages;
|
|
}
|
|
gfn++;
|
|
}
|
|
return 0;
|
|
|
|
unmap_pages:
|
|
kvm_iommu_put_pages(kvm, slot->base_gfn, i);
|
|
return r;
|
|
}
|
|
|
|
static int kvm_iommu_map_memslots(struct kvm *kvm)
|
|
{
|
|
int i, r = 0;
|
|
struct kvm_memslots *slots;
|
|
|
|
slots = kvm_memslots(kvm);
|
|
|
|
for (i = 0; i < slots->nmemslots; i++) {
|
|
r = kvm_iommu_map_pages(kvm, &slots->memslots[i]);
|
|
if (r)
|
|
break;
|
|
}
|
|
|
|
return r;
|
|
}
|
|
|
|
int kvm_assign_device(struct kvm *kvm,
|
|
struct kvm_assigned_dev_kernel *assigned_dev)
|
|
{
|
|
struct pci_dev *pdev = NULL;
|
|
struct iommu_domain *domain = kvm->arch.iommu_domain;
|
|
int r, last_flags;
|
|
|
|
/* check if iommu exists and in use */
|
|
if (!domain)
|
|
return 0;
|
|
|
|
pdev = assigned_dev->dev;
|
|
if (pdev == NULL)
|
|
return -ENODEV;
|
|
|
|
r = iommu_attach_device(domain, &pdev->dev);
|
|
if (r) {
|
|
printk(KERN_ERR "assign device %x:%x:%x.%x failed",
|
|
pci_domain_nr(pdev->bus),
|
|
pdev->bus->number,
|
|
PCI_SLOT(pdev->devfn),
|
|
PCI_FUNC(pdev->devfn));
|
|
return r;
|
|
}
|
|
|
|
last_flags = kvm->arch.iommu_flags;
|
|
if (iommu_domain_has_cap(kvm->arch.iommu_domain,
|
|
IOMMU_CAP_CACHE_COHERENCY))
|
|
kvm->arch.iommu_flags |= KVM_IOMMU_CACHE_COHERENCY;
|
|
|
|
/* Check if need to update IOMMU page table for guest memory */
|
|
if ((last_flags ^ kvm->arch.iommu_flags) ==
|
|
KVM_IOMMU_CACHE_COHERENCY) {
|
|
kvm_iommu_unmap_memslots(kvm);
|
|
r = kvm_iommu_map_memslots(kvm);
|
|
if (r)
|
|
goto out_unmap;
|
|
}
|
|
|
|
printk(KERN_DEBUG "assign device %x:%x:%x.%x\n",
|
|
assigned_dev->host_segnr,
|
|
assigned_dev->host_busnr,
|
|
PCI_SLOT(assigned_dev->host_devfn),
|
|
PCI_FUNC(assigned_dev->host_devfn));
|
|
|
|
return 0;
|
|
out_unmap:
|
|
kvm_iommu_unmap_memslots(kvm);
|
|
return r;
|
|
}
|
|
|
|
int kvm_deassign_device(struct kvm *kvm,
|
|
struct kvm_assigned_dev_kernel *assigned_dev)
|
|
{
|
|
struct iommu_domain *domain = kvm->arch.iommu_domain;
|
|
struct pci_dev *pdev = NULL;
|
|
|
|
/* check if iommu exists and in use */
|
|
if (!domain)
|
|
return 0;
|
|
|
|
pdev = assigned_dev->dev;
|
|
if (pdev == NULL)
|
|
return -ENODEV;
|
|
|
|
iommu_detach_device(domain, &pdev->dev);
|
|
|
|
printk(KERN_DEBUG "deassign device %x:%x:%x.%x\n",
|
|
assigned_dev->host_segnr,
|
|
assigned_dev->host_busnr,
|
|
PCI_SLOT(assigned_dev->host_devfn),
|
|
PCI_FUNC(assigned_dev->host_devfn));
|
|
|
|
return 0;
|
|
}
|
|
|
|
int kvm_iommu_map_guest(struct kvm *kvm)
|
|
{
|
|
int r;
|
|
|
|
if (!iommu_found()) {
|
|
printk(KERN_ERR "%s: iommu not found\n", __func__);
|
|
return -ENODEV;
|
|
}
|
|
|
|
kvm->arch.iommu_domain = iommu_domain_alloc();
|
|
if (!kvm->arch.iommu_domain)
|
|
return -ENOMEM;
|
|
|
|
r = kvm_iommu_map_memslots(kvm);
|
|
if (r)
|
|
goto out_unmap;
|
|
|
|
return 0;
|
|
|
|
out_unmap:
|
|
kvm_iommu_unmap_memslots(kvm);
|
|
return r;
|
|
}
|
|
|
|
static void kvm_iommu_put_pages(struct kvm *kvm,
|
|
gfn_t base_gfn, unsigned long npages)
|
|
{
|
|
gfn_t gfn = base_gfn;
|
|
pfn_t pfn;
|
|
struct iommu_domain *domain = kvm->arch.iommu_domain;
|
|
unsigned long i;
|
|
u64 phys;
|
|
|
|
/* check if iommu exists and in use */
|
|
if (!domain)
|
|
return;
|
|
|
|
for (i = 0; i < npages; i++) {
|
|
phys = iommu_iova_to_phys(domain, gfn_to_gpa(gfn));
|
|
pfn = phys >> PAGE_SHIFT;
|
|
kvm_release_pfn_clean(pfn);
|
|
gfn++;
|
|
}
|
|
|
|
iommu_unmap_range(domain, gfn_to_gpa(base_gfn), PAGE_SIZE * npages);
|
|
}
|
|
|
|
static int kvm_iommu_unmap_memslots(struct kvm *kvm)
|
|
{
|
|
int i;
|
|
struct kvm_memslots *slots;
|
|
|
|
slots = kvm_memslots(kvm);
|
|
|
|
for (i = 0; i < slots->nmemslots; i++) {
|
|
kvm_iommu_put_pages(kvm, slots->memslots[i].base_gfn,
|
|
slots->memslots[i].npages);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int kvm_iommu_unmap_guest(struct kvm *kvm)
|
|
{
|
|
struct iommu_domain *domain = kvm->arch.iommu_domain;
|
|
|
|
/* check if iommu exists and in use */
|
|
if (!domain)
|
|
return 0;
|
|
|
|
kvm_iommu_unmap_memslots(kvm);
|
|
iommu_domain_free(domain);
|
|
return 0;
|
|
}
|