lkml.org 
[lkml]   [2019]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 53/59] iommu/amd: Fix race in increase_address_space()
    Date
    From: Joerg Roedel <jroedel@suse.de>

    [ Upstream commit 754265bcab78a9014f0f99cd35e0d610fcd7dfa7 ]

    After the conversion to lock-less dma-api call the
    increase_address_space() function can be called without any
    locking. Multiple CPUs could potentially race for increasing
    the address space, leading to invalid domain->mode settings
    and invalid page-tables. This has been happening in the wild
    under high IO load and memory pressure.

    Fix the race by locking this operation. The function is
    called infrequently so that this does not introduce
    a performance regression in the dma-api path again.

    Reported-by: Qian Cai <cai@lca.pw>
    Fixes: 256e4621c21a ('iommu/amd: Make use of the generic IOVA allocator')
    Signed-off-by: Joerg Roedel <jroedel@suse.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/iommu/amd_iommu.c | 16 +++++++++++-----
    1 file changed, 11 insertions(+), 5 deletions(-)

    diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
    index 822c85226a29f..a1174e61daf4e 100644
    --- a/drivers/iommu/amd_iommu.c
    +++ b/drivers/iommu/amd_iommu.c
    @@ -1337,18 +1337,21 @@ static void domain_flush_devices(struct protection_domain *domain)
    * another level increases the size of the address space by 9 bits to a size up
    * to 64 bits.
    */
    -static bool increase_address_space(struct protection_domain *domain,
    +static void increase_address_space(struct protection_domain *domain,
    gfp_t gfp)
    {
    + unsigned long flags;
    u64 *pte;

    - if (domain->mode == PAGE_MODE_6_LEVEL)
    + spin_lock_irqsave(&domain->lock, flags);
    +
    + if (WARN_ON_ONCE(domain->mode == PAGE_MODE_6_LEVEL))
    /* address space already 64 bit large */
    - return false;
    + goto out;

    pte = (void *)get_zeroed_page(gfp);
    if (!pte)
    - return false;
    + goto out;

    *pte = PM_LEVEL_PDE(domain->mode,
    iommu_virt_to_phys(domain->pt_root));
    @@ -1356,7 +1359,10 @@ static bool increase_address_space(struct protection_domain *domain,
    domain->mode += 1;
    domain->updated = true;

    - return true;
    +out:
    + spin_unlock_irqrestore(&domain->lock, flags);
    +
    + return;
    }

    static u64 *alloc_pte(struct protection_domain *domain,
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-09-20 00:30    [W:4.957 / U:0.252 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site