Re: [GIT PULL] AMD IOMMU fixes for 2.6.27-rc6

Previous thread: [PATCH] [2.6.27] ehea: Fix memory hotplug support by Hannes Hering on Wednesday, September 17, 2008 - 7:19 am. (6 messages)

Next thread: aacraid: Adaptec 2200S support broken on x86_64 by commit 94cf6ba11b068b8a8f68a1e88bffb6827e92124b by Hillier, Gernot on Wednesday, September 17, 2008 - 7:03 am. (7 messages)
From: Joerg Roedel
Date: Wednesday, September 17, 2008 - 7:23 am

Hi Ingo,

please pull two fixes for possible race conditions in the AMD IOMMU
command buffer handling code from

  git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git iommu-2.6.27

These patches should be merged into 2.6.27 because they are important
bugfixes. The diff is small enough so I attached it to this email.

Joerg Roedel (2):
      AMD IOMMU: set iommu sunc flag after command queuing
      AMD IOMMU: protect comletion wait loop with iommu lock

 arch/x86/kernel/amd_iommu.c |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index 01c68c3..40509eb 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -101,10 +101,10 @@ static int iommu_queue_command(struct amd_iommu *iommu, struct iommu_cmd *cmd)
  */
 static int iommu_completion_wait(struct amd_iommu *iommu)
 {
-	int ret, ready = 0;
+	int ret = 0, ready = 0;
 	unsigned status = 0;
 	struct iommu_cmd cmd;
-	unsigned long i = 0;
+	unsigned long flags, i = 0;
 
 	memset(&cmd, 0, sizeof(cmd));
 	cmd.data[0] = CMD_COMPL_WAIT_INT_MASK;
@@ -112,10 +112,12 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
 
 	iommu->need_sync = 0;
 
-	ret = iommu_queue_command(iommu, &cmd);
+	spin_lock_irqsave(&iommu->lock, flags);
+
+	ret = __iommu_queue_command(iommu, &cmd);
 
 	if (ret)
-		return ret;
+		goto out;
 
 	while (!ready && (i < EXIT_LOOP_COUNT)) {
 		++i;
@@ -130,6 +132,8 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
 
 	if (unlikely((i == EXIT_LOOP_COUNT) && printk_ratelimit()))
 		printk(KERN_WARNING "AMD IOMMU: Completion wait loop failed\n");
+out:
+	spin_unlock_irqrestore(&iommu->lock, flags);
 
 	return 0;
 }
@@ -140,6 +144,7 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
 static int iommu_queue_inv_dev_entry(struct amd_iommu *iommu, u16 devid)
 {
 	struct iommu_cmd cmd;
+	int ret;
 
 	BUG_ON(iommu == NULL);
 ...
From: Ingo Molnar
Date: Thursday, September 18, 2008 - 12:27 am

(FYI, i respun the commits, to fix the s/comletion/completion typo, and 
to rebase the fixes to -git.)

	Ingo
--

Previous thread: [PATCH] [2.6.27] ehea: Fix memory hotplug support by Hannes Hering on Wednesday, September 17, 2008 - 7:19 am. (6 messages)

Next thread: aacraid: Adaptec 2200S support broken on x86_64 by commit 94cf6ba11b068b8a8f68a1e88bffb6827e92124b by Hillier, Gernot on Wednesday, September 17, 2008 - 7:03 am. (7 messages)