]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
iommu/vt-d: Handle volatile descriptor status read
authorJacob Pan <jacob.jun.pan@linux.intel.com>
Tue, 2 Jul 2024 13:08:33 +0000 (21:08 +0800)
committerWill Deacon <will@kernel.org>
Wed, 3 Jul 2024 15:39:25 +0000 (16:39 +0100)
Queued invalidation wait descriptor status is volatile in that IOMMU
hardware writes the data upon completion.

Use READ_ONCE() to prevent compiler optimizations which ensures memory
reads every time. As a side effect, READ_ONCE() also enforces strict
types and may add an extra instruction. But it should not have negative
performance impact since we use cpu_relax anyway and the extra time(by
adding an instruction) may allow IOMMU HW request cacheline ownership
easier.

e.g. gcc 12.3
BEFORE:
81 38 ad de 00 00       cmpl   $0x2,(%rax)

AFTER (with READ_ONCE())
    772f:       8b 00                   mov    (%rax),%eax
    7731:       3d ad de 00 00          cmp    $0x2,%eax
                                        //status data is 32 bit

Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Reviewed-by: Yi Liu <yi.l.liu@intel.com>
Link: https://lore.kernel.org/r/20240607173817.3914600-1-jacob.jun.pan@linux.intel.com
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/20240702130839.108139-2-baolu.lu@linux.intel.com
Signed-off-by: Will Deacon <will@kernel.org>
drivers/iommu/intel/dmar.c

index 304e84949ca720dbb015e1b71ffd73c96925597a..1c8d3141cb55c05e1742ddd5414a92c5c3c2266e 100644 (file)
@@ -1446,7 +1446,7 @@ restart:
         */
        writel(qi->free_head << shift, iommu->reg + DMAR_IQT_REG);
 
-       while (qi->desc_status[wait_index] != QI_DONE) {
+       while (READ_ONCE(qi->desc_status[wait_index]) != QI_DONE) {
                /*
                 * We will leave the interrupts disabled, to prevent interrupt
                 * context to queue another cmd while a cmd is already submitted