iommu/amd: serialize sequence allocation under concurrent TLB invalidations

[ Upstream commit 9e249c48412828e807afddc21527eb734dc9bd3d ]

With concurrent TLB invalidations, completion wait randomly gets timed out
because cmd_sem_val was incremented outside the IOMMU spinlock, allowing
CMD_COMPL_WAIT commands to be queued out of sequence and breaking the
ordering assumption in wait_on_sem().
Move the cmd_sem_val increment under iommu->lock so completion sequence
allocation is serialized with command queuing.
And remove the unnecessary return.

Fixes: d2a0cac10597 ("iommu/amd: move wait_on_sem() out of spinlock")
Tested-by: Srikanth Aithal <sraithal@amd.com>
Reported-by: Srikanth Aithal <sraithal@amd.com>
Signed-off-by: Ankit Soni <Ankit.Soni@amd.com>
Reviewed-by: Vasant Hegde <vasant.hegde@amd.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/iommu/amd/amd_iommu_types.h b/drivers/iommu/amd/amd_iommu_types.h
index 320733e7d8b423d8573c73eb9a9a8eebd8e8f2d7..3b09da3ffb74f5e604046d53cc0682148f39437e 100644 (file)
--- a/drivers/iommu/amd/amd_iommu_types.h
+++ b/drivers/iommu/amd/amd_iommu_types.h
@@ -706,7 +706,7 @@ struct amd_iommu {
 
        u32 flags;
        volatile u64 *cmd_sem;
-       atomic64_t cmd_sem_val;
+       u64 cmd_sem_val;
        /*
         * Track physical address to directly use it in build_completion_wait()
         * and avoid adding any special checks and handling for kdump.

diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index 62a7a718acf8fbea6f4a3455fca3fc6adc89a32a..58d6f5ae155f21952cd2237819ecc9c1e5b1d8d1 100644 (file)
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -1877,7 +1877,7 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h,
        iommu->pci_seg = pci_seg;
 
        raw_spin_lock_init(&iommu->lock);
-       atomic64_set(&iommu->cmd_sem_val, 0);
+       iommu->cmd_sem_val = 0;
 
        /* Add IOMMU to internal data structures */
        list_add_tail(&iommu->list, &amd_iommu_list);

diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index c5f7e003d01c9fe936d18f81ff00bef5d8f5241c..e216b5a13d49d336508a85996af85ac919123b00 100644 (file)
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -1417,6 +1417,12 @@ static int iommu_queue_command(struct amd_iommu *iommu, struct iommu_cmd *cmd)
        return iommu_queue_command_sync(iommu, cmd, true);
 }
 
+static u64 get_cmdsem_val(struct amd_iommu *iommu)
+{
+       lockdep_assert_held(&iommu->lock);
+       return ++iommu->cmd_sem_val;
+}
+
 /*
  * This function queues a completion wait command into the command
  * buffer of an IOMMU
@@ -1431,11 +1437,11 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
        if (!iommu->need_sync)
                return 0;
 
-       data = atomic64_inc_return(&iommu->cmd_sem_val);
-       build_completion_wait(&cmd, iommu, data);
-
        raw_spin_lock_irqsave(&iommu->lock, flags);
 
+       data = get_cmdsem_val(iommu);
+       build_completion_wait(&cmd, iommu, data);
+
        ret = __iommu_queue_command_sync(iommu, &cmd, false);
        raw_spin_unlock_irqrestore(&iommu->lock, flags);
 
@@ -3113,10 +3119,11 @@ static void iommu_flush_irt_and_complete(struct amd_iommu *iommu, u16 devid)
                return;
 
        build_inv_irt(&cmd, devid);
-       data = atomic64_inc_return(&iommu->cmd_sem_val);
-       build_completion_wait(&cmd2, iommu, data);
 
        raw_spin_lock_irqsave(&iommu->lock, flags);
+       data = get_cmdsem_val(iommu);
+       build_completion_wait(&cmd2, iommu, data);
+
        ret = __iommu_queue_command_sync(iommu, &cmd, true);
        if (ret)
                goto out_err;
@@ -3130,7 +3137,6 @@ static void iommu_flush_irt_and_complete(struct amd_iommu *iommu, u16 devid)
 
 out_err:
        raw_spin_unlock_irqrestore(&iommu->lock, flags);
-       return;
 }
 
 static inline u8 iommu_get_int_tablen(struct iommu_dev_data *dev_data)