public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Lu Baolu <baolu.lu@linux.intel.com>
To: Joerg Roedel <joro@8bytes.org>
Cc: Vinod Koul <vkoul@kernel.org>, Tina Zhang <tina.zhang@intel.com>,
	Jacob Pan <jacob.jun.pan@linux.intel.com>,
	Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
	iommu@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH 13/17] iommu/vt-d: Remove BUG_ON in handling iotlb cache invalidation
Date: Tue, 11 Apr 2023 14:48:11 +0800	[thread overview]
Message-ID: <20230411064815.31456-14-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20230411064815.31456-1-baolu.lu@linux.intel.com>

From: Tina Zhang <tina.zhang@intel.com>

VT-d iotlb cache invalidation request with unexpected type is considered
as a bug to developers, which can be fixed. So, when such kind of issue
comes out, it needs to be reported through the kernel log, instead of
halting the system. Replacing BUG_ON with warning reporting.

Signed-off-by: Tina Zhang <tina.zhang@intel.com>
Link: https://lore.kernel.org/r/20230406065944.2773296-4-tina.zhang@intel.com
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
 drivers/iommu/intel/iommu.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index c4847a5aaf52..dd61bb554aa7 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -1272,7 +1272,9 @@ static void __iommu_flush_context(struct intel_iommu *iommu,
 			| DMA_CCMD_SID(source_id) | DMA_CCMD_FM(function_mask);
 		break;
 	default:
-		BUG();
+		pr_warn("%s: Unexpected context-cache invalidation type 0x%llx\n",
+			iommu->name, type);
+		return;
 	}
 	val |= DMA_CCMD_ICC;
 
@@ -1308,7 +1310,9 @@ static void __iommu_flush_iotlb(struct intel_iommu *iommu, u16 did,
 		val_iva = size_order | addr;
 		break;
 	default:
-		BUG();
+		pr_warn("%s: Unexpected iotlb invalidation type 0x%llx\n",
+			iommu->name, type);
+		return;
 	}
 	/* Note: set drain read/write */
 #if 0
@@ -1483,7 +1487,8 @@ static void iommu_flush_iotlb_psi(struct intel_iommu *iommu,
 	uint64_t addr = (uint64_t)pfn << VTD_PAGE_SHIFT;
 	u16 did = domain_id_iommu(domain, iommu);
 
-	BUG_ON(pages == 0);
+	if (WARN_ON(!pages))
+		return;
 
 	if (ih)
 		ih = 1 << 6;
-- 
2.34.1


  parent reply	other threads:[~2023-04-11  6:51 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-11  6:47 [PATCH 00/17] [PULL REQUEST] Intel IOMMU updates for Linux v6.4 Lu Baolu
2023-04-11  6:47 ` [PATCH 01/17] dmaengine: idxd: Add enable/disable device IOPF feature Lu Baolu
2023-04-12  4:52   ` Vinod Koul
2023-04-11  6:48 ` [PATCH 02/17] iommu/vt-d: Allow SVA with device-specific IOPF Lu Baolu
2023-04-11  6:48 ` [PATCH 03/17] iommu/vt-d: Move iopf code from SVA to IOPF enabling path Lu Baolu
2023-04-11  6:48 ` [PATCH 04/17] iommu/vt-d: Move pfsid and ats_qdep calculation to device probe path Lu Baolu
2023-04-11  6:48 ` [PATCH 05/17] iommu/vt-d: Move PRI handling to IOPF feature path Lu Baolu
2023-04-11  6:48 ` [PATCH 06/17] iommu/vt-d: Remove unnecessary checks in iopf disabling path Lu Baolu
2023-04-11  6:48 ` [PATCH 07/17] iommu/vt-d: Do not use GFP_ATOMIC when not needed Lu Baolu
2023-04-11  6:48 ` [PATCH 08/17] iommu/vt-d: Remove extern from function prototypes Lu Baolu
2023-04-11  6:48 ` [PATCH 09/17] iommu/vt-d: Use non-privileged mode for all PASIDs Lu Baolu
2023-04-11  6:48 ` [PATCH 10/17] iommu/vt-d: Remove PASID supervisor request support Lu Baolu
2023-04-11  6:48 ` [PATCH 11/17] iommu/vt-d: Fix operand size in bitwise operation Lu Baolu
2023-04-11 21:22   ` David Laight
2023-04-12  1:31     ` Baolu Lu
2023-04-12  7:11       ` David Laight
2023-04-12  8:11         ` Zhang, Tina
2023-04-12 13:10         ` Baolu Lu
2023-04-12 13:27           ` David Laight
2023-04-12 14:02             ` Baolu Lu
2023-04-11  6:48 ` [PATCH 12/17] iommu/vt-d: Remove BUG_ON on checking valid pfn range Lu Baolu
2023-04-11  6:48 ` Lu Baolu [this message]
2023-04-11  6:48 ` [PATCH 14/17] iommu/vt-d: Remove BUG_ON when domain->pgd is NULL Lu Baolu
2023-04-11  6:48 ` [PATCH 15/17] iommu/vt-d: Remove BUG_ON in map/unmap() Lu Baolu
2023-04-11  6:48 ` [PATCH 16/17] iommu/vt-d: Remove a useless BUG_ON(dev->is_virtfn) Lu Baolu
2023-04-11  6:48 ` [PATCH 17/17] iommu/vt-d: Remove BUG_ON in dmar_insert_dev_scope() Lu Baolu
2023-04-13  4:12 ` [PATCH 00/17] [PULL REQUEST] Intel IOMMU updates for Linux v6.4 Baolu Lu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230411064815.31456-14-baolu.lu@linux.intel.com \
    --to=baolu.lu@linux.intel.com \
    --cc=christophe.jaillet@wanadoo.fr \
    --cc=iommu@lists.linux.dev \
    --cc=jacob.jun.pan@linux.intel.com \
    --cc=joro@8bytes.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tina.zhang@intel.com \
    --cc=vkoul@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox