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 12/17] iommu/vt-d: Remove BUG_ON on checking valid pfn range
Date: Tue, 11 Apr 2023 14:48:10 +0800 [thread overview]
Message-ID: <20230411064815.31456-13-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20230411064815.31456-1-baolu.lu@linux.intel.com>
From: Tina Zhang <tina.zhang@intel.com>
When encountering an unexpected invalid pfn range, the kernel should
attempt recovery and proceed with execution. Therefore, using WARN_ON to
replace BUG_ON to avoid halting the machine.
Besides, one redundant checking is reduced.
Signed-off-by: Tina Zhang <tina.zhang@intel.com>
Link: https://lore.kernel.org/r/20230406065944.2773296-3-tina.zhang@intel.com
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
drivers/iommu/intel/iommu.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index acbf82fa90e7..c4847a5aaf52 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -1005,9 +1005,9 @@ static void dma_pte_clear_range(struct dmar_domain *domain,
unsigned int large_page;
struct dma_pte *first_pte, *pte;
- BUG_ON(!domain_pfn_supported(domain, start_pfn));
- BUG_ON(!domain_pfn_supported(domain, last_pfn));
- BUG_ON(start_pfn > last_pfn);
+ if (WARN_ON(!domain_pfn_supported(domain, last_pfn)) ||
+ WARN_ON(start_pfn > last_pfn))
+ return;
/* we don't need lock here; nobody else touches the iova range */
do {
@@ -1166,9 +1166,9 @@ static void dma_pte_clear_level(struct dmar_domain *domain, int level,
static void domain_unmap(struct dmar_domain *domain, unsigned long start_pfn,
unsigned long last_pfn, struct list_head *freelist)
{
- BUG_ON(!domain_pfn_supported(domain, start_pfn));
- BUG_ON(!domain_pfn_supported(domain, last_pfn));
- BUG_ON(start_pfn > last_pfn);
+ if (WARN_ON(!domain_pfn_supported(domain, last_pfn)) ||
+ WARN_ON(start_pfn > last_pfn))
+ return;
/* we don't need lock here; nobody else touches the iova range */
dma_pte_clear_level(domain, agaw_to_level(domain->agaw),
--
2.34.1
next prev parent reply other threads:[~2023-04-11 6:50 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 ` Lu Baolu [this message]
2023-04-11 6:48 ` [PATCH 13/17] iommu/vt-d: Remove BUG_ON in handling iotlb cache invalidation Lu Baolu
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-13-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