Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1251819

[PATCH 01/12] iommu/amd: Do not BUG_ON in __detach_device()

From Joerg Roedel <joro@8bytes.org>
Newsgroups linux.kernel
Subject [PATCH 01/12] iommu/amd: Do not BUG_ON in __detach_device()
Date 2015-10-20 17:40 +0200
Message-ID <qlHb6-7U3-49@gated-at.bofh.it> (permalink)
References <qlHb4-7U3-5@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


From: Joerg Roedel <jroedel@suse.de>

The condition in the BUG_ON is an indicator of a BUG, but no
reason to kill the code path. Turn it into a WARN_ON and
bail out if it is hit.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
 drivers/iommu/amd_iommu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 08d2775..bde87be 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2213,7 +2213,8 @@ static void __detach_device(struct iommu_dev_data *dev_data)
 	struct protection_domain *domain;
 	unsigned long flags;
 
-	BUG_ON(!dev_data->domain);
+	if (WARN_ON(!dev_data->domain))
+		return;
 
 	domain = dev_data->domain;
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 00/12] AMD IOMMU alias handling cleanups and code removal Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200
  [PATCH 12/12] iommu/amd: Remove find_last_devid_on_pci() Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200
  [PATCH 10/12] iommu/amd: Initialize amd_iommu_last_bdf for DEV_ALL Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200
  [PATCH 03/12] iommu/amd: Don't disable IRQs in __detach_device Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200
  [PATCH 11/12] iommu/amd: Remove first/last_device handling Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200
  [PATCH 06/12] iommu/amd: Remove old alias handling code Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200
  [PATCH 01/12] iommu/amd: Do not BUG_ON in __detach_device() Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200
  [PATCH 02/12] iommu/amd: Do not iterate over alias-list in __[attach|detach]_device Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200
  [PATCH 09/12] iommu/amd: Cleanup buffer allocation Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200
  [PATCH 05/12] iommu/amd: Set alias DTE in do_attach/do_detach Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200
  [PATCH 07/12] iommu/amd: Align DTE flag definitions Joerg Roedel <joro@8bytes.org> - 2015-10-20 17:40 +0200

csiph-web