19 Oct, 2011
3 commits
-
If target_level == 0, current code breaks out of the while-loop if
SUPERPAGE bit is set. We should also break out if PTE is not present.
If we don't do this, KVM calls to iommu_iova_to_phys() will cause
pfn_to_dma_pte() to create mapping for 4KiB pages.Signed-off-by: Allen Kay
Signed-off-by: David Woodhouse -
set dmar->iommu_superpage field to the smallest common denominator
of super page sizes supported by all active VT-d engines. Initialize
this field in intel_iommu_domain_init() API so intel_iommu_map() API
will be able to use iommu_superpage field to determine the appropriate
super page size to use.Signed-off-by: Allen Kay
Signed-off-by: David Woodhouse -
iommu_unmap() API expects IOMMU drivers to return the actual page order
of the address being unmapped. Previous code was just returning page
order passed in from the caller. This patch fixes this problem.Signed-off-by: Allen Kay
Signed-off-by: David Woodhouse
15 Oct, 2011
2 commits
-
We really don't want this to work in the general case; device drivers
*shouldn't* care whether they are behind an IOMMU or not. But the
integrated graphics is a special case, because the IOMMU and the GTT are
all kind of smashed into one and generally horrifically buggy, so it's
reasonable for the graphics driver to want to know when the IOMMU is
active for the graphics hardware.Signed-off-by: David Woodhouse
-
To work around a hardware issue, we have to submit IOTLB flushes while
the graphics engine is idle. The graphics driver will (we hope) go to
great lengths to ensure that it gets that right on the affected
chipset(s)... so let's not screw it over by deferring the unmap and
doing it later. That wouldn't be very helpful.Signed-off-by: David Woodhouse
11 Oct, 2011
1 commit
-
When unbinding a device so that I could pass it through to a KVM VM, I
got the lockdep report below. It looks like a legitimate lock
ordering problem:- domain_context_mapping_one() takes iommu->lock and calls
iommu_support_dev_iotlb(), which takes device_domain_lock (inside
iommu->lock).- domain_remove_one_dev_info() starts by taking device_domain_lock
then takes iommu->lock inside it (near the end of the function).So this is the classic AB-BA deadlock. It looks like a safe fix is to
simply release device_domain_lock a bit earlier, since as far as I can
tell, it doesn't protect any of the stuff accessed at the end of
domain_remove_one_dev_info() anyway.BTW, the use of device_domain_lock looks a bit unsafe to me... it's
at least not obvious to me why we aren't vulnerable to the race below:iommu_support_dev_iotlb()
domain_remove_dev_info()lock device_domain_lock
find info
unlock device_domain_locklock device_domain_lock
find same info
unlock device_domain_lockfree_devinfo_mem(info)
do stuff with info after it's free
However I don't understand the locking here well enough to know if
this is a real problem, let alone what the best fix is.Anyway here's the full lockdep output that prompted all of this:
=======================================================
[ INFO: possible circular locking dependency detected ]
2.6.39.1+ #1
-------------------------------------------------------
bash/13954 is trying to acquire lock:
(&(&iommu->lock)->rlock){......}, at: [] domain_remove_one_dev_info+0x121/0x230but task is already holding lock:
(device_domain_lock){-.-...}, at: [] domain_remove_one_dev_info+0x208/0x230which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (device_domain_lock){-.-...}:
[] lock_acquire+0x9d/0x130
[] _raw_spin_lock_irqsave+0x55/0xa0
[] domain_context_mapping_one+0x600/0x750
[] domain_context_mapping+0x3f/0x120
[] iommu_prepare_identity_map+0x1c5/0x1e0
[] intel_iommu_init+0x88e/0xb5e
[] pci_iommu_init+0x16/0x41
[] do_one_initcall+0x45/0x190
[] kernel_init+0xe3/0x168
[] kernel_thread_helper+0x4/0x10-> #0 (&(&iommu->lock)->rlock){......}:
[] __lock_acquire+0x195e/0x1e10
[] lock_acquire+0x9d/0x130
[] _raw_spin_lock_irqsave+0x55/0xa0
[] domain_remove_one_dev_info+0x121/0x230
[] device_notifier+0x72/0x90
[] notifier_call_chain+0x8c/0xc0
[] __blocking_notifier_call_chain+0x78/0xb0
[] blocking_notifier_call_chain+0x16/0x20
[] __device_release_driver+0xbc/0xe0
[] device_release_driver+0x2f/0x50
[] driver_unbind+0xa3/0xc0
[] drv_attr_store+0x2c/0x30
[] sysfs_write_file+0xe6/0x170
[] vfs_write+0xce/0x190
[] sys_write+0x54/0xa0
[] system_call_fastpath+0x16/0x1bother info that might help us debug this:
6 locks held by bash/13954:
#0: (&buffer->mutex){+.+.+.}, at: [] sysfs_write_file+0x44/0x170
#1: (s_active#3){++++.+}, at: [] sysfs_write_file+0xcd/0x170
#2: (&__lockdep_no_validate__){+.+.+.}, at: [] driver_unbind+0x9b/0xc0
#3: (&__lockdep_no_validate__){+.+.+.}, at: [] device_release_driver+0x27/0x50
#4: (&(&priv->bus_notifier)->rwsem){.+.+.+}, at: [] __blocking_notifier_call_chain+0x5f/0xb0
#5: (device_domain_lock){-.-...}, at: [] domain_remove_one_dev_info+0x208/0x230stack backtrace:
Pid: 13954, comm: bash Not tainted 2.6.39.1+ #1
Call Trace:
[] print_circular_bug+0xf7/0x100
[] __lock_acquire+0x195e/0x1e10
[] ? trace_hardirqs_off+0xd/0x10
[] ? trace_hardirqs_on_caller+0x13d/0x180
[] lock_acquire+0x9d/0x130
[] ? domain_remove_one_dev_info+0x121/0x230
[] _raw_spin_lock_irqsave+0x55/0xa0
[] ? domain_remove_one_dev_info+0x121/0x230
[] ? trace_hardirqs_off+0xd/0x10
[] domain_remove_one_dev_info+0x121/0x230
[] device_notifier+0x72/0x90
[] notifier_call_chain+0x8c/0xc0
[] __blocking_notifier_call_chain+0x78/0xb0
[] blocking_notifier_call_chain+0x16/0x20
[] __device_release_driver+0xbc/0xe0
[] device_release_driver+0x2f/0x50
[] driver_unbind+0xa3/0xc0
[] drv_attr_store+0x2c/0x30
[] sysfs_write_file+0xe6/0x170
[] vfs_write+0xce/0x190
[] sys_write+0x54/0xa0
[] system_call_fastpath+0x16/0x1bSigned-off-by: Roland Dreier
Signed-off-by: David Woodhouse
14 Sep, 2011
1 commit
-
Mark this lowlevel IRQ handler as non-threaded. This prevents a boot
crash when "threadirqs" is on the kernel commandline. Also the
interrupt handler is handling hardware critical events which should
not be delayed into a thread.Signed-off-by: Thomas Gleixner
Cc: stable@kernel.org
Signed-off-by: Ingo Molnar
02 Sep, 2011
2 commits
-
The domain_flush_devices() function takes the domain->lock.
But this function is only called from update_domain() which
itself is already called unter the domain->lock. This causes
a deadlock situation when the dma-address-space of a domain
grows larger than 1GB.Cc: stable@kernel.org
Signed-off-by: Joerg Roedel -
The value is only set to true but never set back to false,
which causes to many completion-wait commands to be sent to
hardware. Fix it with this patch.Cc: stable@kernel.org
Signed-off-by: Joerg Roedel
06 Jul, 2011
1 commit
-
Reserve the MSI address range in the address allocator so
that MSI addresses are not handed out as dma handles.Cc: stable@kernel.org
Signed-off-by: Joerg Roedel
21 Jun, 2011
6 commits
-
Conflicts:
arch/x86/include/asm/amd_iommu_types.h
arch/x86/kernel/amd_iommu.cSigned-off-by: Joerg Roedel
-
A few parts of the driver were missing in drivers/iommu.
Move them there to have the complete driver in that
directory.Signed-off-by: Joerg Roedel
-
For better navigation this patch moves the drivers/iommu
drivers into its own submenu in Kconfig.Signed-off-by: Joerg Roedel
-
This should ease finding similarities with different platforms,
with the intention of solving problems once in a generic framework
which everyone can use.Note: to move intel-iommu.c, the declaration of pci_find_upstream_pcie_bridge()
has to move from drivers/pci/pci.h to include/linux/pci.h. This is handled
in this patch, too.As suggested, also drop DMAR's EXPERIMENTAL tag while we're at it.
Compile-tested on x86_64.
Signed-off-by: Ohad Ben-Cohen
Signed-off-by: Joerg Roedel -
This should ease finding similarities with different platforms,
with the intention of solving problems once in a generic framework
which everyone can use.Compile-tested on x86_64.
Signed-off-by: Ohad Ben-Cohen
Signed-off-by: Joerg Roedel -
This should ease finding similarities with different platforms,
with the intention of solving problems once in a generic framework
which everyone can use.Compile-tested for MSM8X60.
Signed-off-by: Ohad Ben-Cohen
Acked-by: David Brown
Signed-off-by: Joerg Roedel
14 Jun, 2011
1 commit
-
Create a dedicated folder for iommu drivers, and move the base
iommu implementation over there.Grouping the various iommu drivers in a single location will help
finding similar problems shared by different platforms, so they
could be solved once, in the iommu framework, instead of solved
differently (or duplicated) in each driver.Signed-off-by: Ohad Ben-Cohen
Signed-off-by: Joerg Roedel