From: Lu Baolu <baolu.lu@linux.intel.com>
To: Joerg Roedel <joro@8bytes.org>
Cc: 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 v2 17/17] iommu/vt-d: Remove BUG_ON in dmar_insert_dev_scope()
Date: Thu, 13 Apr 2023 12:06:45 +0800 [thread overview]
Message-ID: <20230413040645.46157-18-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20230413040645.46157-1-baolu.lu@linux.intel.com>
From: Tina Zhang <tina.zhang@intel.com>
The dmar_insert_dev_scope() could fail if any unexpected condition is
encountered. However, in this situation, the kernel should attempt
recovery and proceed with execution. Remove BUG_ON with WARN_ON, so that
kernel can avoid being crashed when an unexpected condition occurs.
Signed-off-by: Tina Zhang <tina.zhang@intel.com>
Link: https://lore.kernel.org/r/20230406065944.2773296-8-tina.zhang@intel.com
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
drivers/iommu/intel/dmar.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c
index 9346c6e7ebae..e35be3786bde 100644
--- a/drivers/iommu/intel/dmar.c
+++ b/drivers/iommu/intel/dmar.c
@@ -262,7 +262,8 @@ int dmar_insert_dev_scope(struct dmar_pci_notify_info *info,
get_device(dev));
return 1;
}
- BUG_ON(i >= devices_cnt);
+ if (WARN_ON(i >= devices_cnt))
+ return -EINVAL;
}
return 0;
--
2.34.1
next prev parent reply other threads:[~2023-04-13 4:07 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-13 4:06 [PATCH v2 00/17] [PULL REQUEST] Intel IOMMU updates for Linux v6.4 Lu Baolu
2023-04-13 4:06 ` [PATCH v2 01/17] dmaengine: idxd: Add enable/disable device IOPF feature Lu Baolu
2023-04-13 4:06 ` [PATCH v2 02/17] iommu/vt-d: Allow SVA with device-specific IOPF Lu Baolu
2023-04-13 4:06 ` [PATCH v2 03/17] iommu/vt-d: Move iopf code from SVA to IOPF enabling path Lu Baolu
2023-04-13 4:06 ` [PATCH v2 04/17] iommu/vt-d: Move pfsid and ats_qdep calculation to device probe path Lu Baolu
2023-04-13 4:06 ` [PATCH v2 05/17] iommu/vt-d: Move PRI handling to IOPF feature path Lu Baolu
2023-04-13 4:06 ` [PATCH v2 06/17] iommu/vt-d: Remove unnecessary checks in iopf disabling path Lu Baolu
2023-04-13 4:06 ` [PATCH v2 07/17] iommu/vt-d: Do not use GFP_ATOMIC when not needed Lu Baolu
2023-04-13 4:06 ` [PATCH v2 08/17] iommu/vt-d: Remove extern from function prototypes Lu Baolu
2023-04-13 4:06 ` [PATCH v2 09/17] iommu/vt-d: Use non-privileged mode for all PASIDs Lu Baolu
2023-04-13 4:06 ` [PATCH v2 10/17] iommu/vt-d: Remove PASID supervisor request support Lu Baolu
2023-04-13 4:06 ` [PATCH v2 11/17] iommu/vt-d: Make size of operands same in bitwise operations Lu Baolu
2023-04-13 4:06 ` [PATCH v2 12/17] iommu/vt-d: Remove BUG_ON on checking valid pfn range Lu Baolu
2023-04-13 4:06 ` [PATCH v2 13/17] iommu/vt-d: Remove BUG_ON in handling iotlb cache invalidation Lu Baolu
2023-04-13 4:06 ` [PATCH v2 14/17] iommu/vt-d: Remove BUG_ON when domain->pgd is NULL Lu Baolu
2023-04-13 4:06 ` [PATCH v2 15/17] iommu/vt-d: Remove BUG_ON in map/unmap() Lu Baolu
2023-04-13 4:06 ` [PATCH v2 16/17] iommu/vt-d: Remove a useless BUG_ON(dev->is_virtfn) Lu Baolu
2023-04-13 4:06 ` Lu Baolu [this message]
2023-04-13 10:06 ` [PATCH v2 00/17] [PULL REQUEST] Intel IOMMU updates for Linux v6.4 Joerg Roedel
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=20230413040645.46157-18-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 \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.