Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Denys Vlasenko <dvlasenk@redhat.com>
To:     Tom Lendacky <thomas.lendacky@amd.com>,
        Joerg Roedel <jroedel@suse.de>
Cc:     Denys Vlasenko <dvlasenk@redhat.com>, linux-kernel@vger.kernel.org
Subject: [PATCH] iommu/amd: Do not re-fetch iommu->cmd_buf_tail
Date:   Thu, 24 Oct 2019 14:54:10 +0200
Message-Id: <20191024125410.19224-1-dvlasenk@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=WINDOWS-1252
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

The compiler is not smart enough to realize that iommu->cmd_buf_tail
can't be modified across memcpy:

41 8b 45 74          mov    0x74(%r13),%eax   # iommu->cmd_buf_tail
44 8d 78 10          lea    0x10(%rax),%r15d  # +=3D sizeof(*cmd)
41 81 e7 ff 1f 00 00 and    $0x1fff,%r15d     # %=3D CMD_BUFFER_SIZE
49 03 45 68          add    0x68(%r13),%rax   # target =3D iommu->cmd_buf +=
 iommu->cmd_buf_tail
45 89 7d 74          mov    %r15d,0x74(%r13)  # store to iommu->cmd_buf_tai=
l
49 8b 34 24          mov    (%r12),%rsi       # memcpy
49 8b 7c 24 08       mov    0x8(%r12),%rdi    # memcpy
48 89 30             mov    %rsi,(%rax)       # memcpy
48 89 78 08          mov    %rdi,0x8(%rax)    # memcpy
49 8b 55 38          mov    0x38(%r13),%rdx   # iommu->mmio_base
41 8b 45 74          mov    0x74(%r13),%eax   # redundant load of iommu->cm=
d_buf_tail
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
89 82 08 20 00 00    mov    %eax,0x2008(%rdx) # writel

CC: Tom Lendacky <thomas.lendacky@amd.com>
CC: Joerg Roedel <jroedel@suse.de>
CC: linux-kernel@vger.kernel.org
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
---
 drivers/iommu/amd_iommu.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index dd555078258c..34c497c4b0a7 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -876,17 +876,18 @@ static void copy_cmd_to_buffer(struct amd_iommu *iomm=
u,
 =09=09=09       struct iommu_cmd *cmd)
 {
 =09u8 *target;
-
-=09target =3D iommu->cmd_buf + iommu->cmd_buf_tail;
-
-=09iommu->cmd_buf_tail +=3D sizeof(*cmd);
-=09iommu->cmd_buf_tail %=3D CMD_BUFFER_SIZE;
+=09u32 tail;
=20
 =09/* Copy command to buffer */
+=09tail =3D iommu->cmd_buf_tail;
+=09target =3D iommu->cmd_buf + tail;
 =09memcpy(target, cmd, sizeof(*cmd));
=20
+=09tail =3D (tail + sizeof(*cmd)) % CMD_BUFFER_SIZE;
+=09iommu->cmd_buf_tail =3D tail;
+
 =09/* Tell the IOMMU about it */
-=09writel(iommu->cmd_buf_tail, iommu->mmio_base + MMIO_CMD_TAIL_OFFSET);
+=09writel(tail, iommu->mmio_base + MMIO_CMD_TAIL_OFFSET);
 }
=20
 static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
--=20
2.21.0