* [PATCH] iommu/vt-d:Add support for probing ACPI device in RMRR
@ 2020-08-18 2:46 FelixCuioc
2020-08-24 10:37 ` Dan Carpenter
0 siblings, 1 reply; 2+ messages in thread
From: FelixCuioc @ 2020-08-18 2:46 UTC (permalink / raw)
To: Joerg Roedel, iommu, linux-kernel, David Woodhouse, Lu Baolu; +Cc: CobeChen-oc
After acpi device in RMRR is detected,it is necessary
to establish a mapping for these devices.
In acpi_device_create_direct_mappings(),create a mapping
for the acpi device in RMRR.
Add a helper to achieve the acpi namespace device can
access the RMRR region.
Signed-off-by: FelixCuioc <FelixCui-oc@zhaoxin.com>
---
drivers/iommu/intel/iommu.c | 27 +++++++++++++++++++++++++++
drivers/iommu/iommu.c | 6 ++++++
include/linux/iommu.h | 3 +++
3 files changed, 36 insertions(+)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index f774ef63d473..b31f02f41c96 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -4797,6 +4797,20 @@ static int __init platform_optin_force_iommu(void)
return 1;
}
+static int acpi_device_create_direct_mappings(struct device *pn_dev, struct device *acpi_device)
+{
+ struct iommu_group *group;
+
+ acpi_device->bus->iommu_ops = &intel_iommu_ops;
+ group = iommu_group_get(pn_dev);
+ if (!group) {
+ pr_warn("ACPI name space devices create direct mappings wrong!\n");
+ return -1;
+ }
+ __acpi_device_create_direct_mappings(group, acpi_device);
+
+ return 0;
+}
static int __init probe_acpi_namespace_devices(void)
{
@@ -4812,6 +4826,7 @@ static int __init probe_acpi_namespace_devices(void)
struct acpi_device_physical_node *pn;
struct iommu_group *group;
struct acpi_device *adev;
+ struct device *pn_dev = NULL;
if (dev->bus != &acpi_bus_type)
continue;
@@ -4822,6 +4837,7 @@ static int __init probe_acpi_namespace_devices(void)
&adev->physical_node_list, node) {
group = iommu_group_get(pn->dev);
if (group) {
+ pn_dev = pn->dev;
iommu_group_put(group);
continue;
}
@@ -4830,7 +4846,18 @@ static int __init probe_acpi_namespace_devices(void)
ret = iommu_probe_device(pn->dev);
if (ret)
break;
+ pn_dev = pn->dev;
+ }
+ if (pn_dev == NULL) {
+ dev->bus->iommu_ops = &intel_iommu_ops;
+ ret = iommu_probe_device(dev);
+ if (ret) {
+ pr_err("acpi_device probe fail! ret:%d\n", ret);
+ return ret;
+ }
+ return 0;
}
+ ret = acpi_device_create_direct_mappings(pn_dev, dev);
mutex_unlock(&adev->physical_node_lock);
if (ret)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 609bd25bf154..4f714a2d5ef7 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -779,6 +779,12 @@ static bool iommu_is_attach_deferred(struct iommu_domain *domain,
return false;
}
+void __acpi_device_create_direct_mappings(struct iommu_group *group, struct device *acpi_device)
+{
+ iommu_create_device_direct_mappings(group, acpi_device);
+}
+EXPORT_SYMBOL_GPL(__acpi_device_create_direct_mappings);
+
/**
* iommu_group_add_device - add a device to an iommu group
* @group: the group into which to add the device (reference should be held)
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index fee209efb756..9be134775886 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -514,6 +514,9 @@ extern void iommu_domain_window_disable(struct iommu_domain *domain, u32 wnd_nr)
extern int report_iommu_fault(struct iommu_domain *domain, struct device *dev,
unsigned long iova, int flags);
+extern void __acpi_device_create_direct_mappings(struct iommu_group *group,
+ struct device *acpi_device);
+
static inline void iommu_flush_tlb_all(struct iommu_domain *domain)
{
if (domain->ops->flush_iotlb_all)
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] iommu/vt-d:Add support for probing ACPI device in RMRR
2020-08-18 2:46 [PATCH] iommu/vt-d:Add support for probing ACPI device in RMRR FelixCuioc
@ 2020-08-24 10:37 ` Dan Carpenter
0 siblings, 0 replies; 2+ messages in thread
From: Dan Carpenter @ 2020-08-24 10:37 UTC (permalink / raw)
To: kbuild, FelixCuioc, Joerg Roedel, iommu, linux-kernel,
David Woodhouse, Lu Baolu
Cc: kbuild-all, lkp, CobeChen-oc
[-- Attachment #1: Type: text/plain, Size: 6980 bytes --]
Hi FelixCuioc,
Thank you for the patch! Perhaps something to improve:
url: https://github.com/0day-ci/linux/commits/FelixCuioc/iommu-vt-d-Add-support-for-probing-ACPI-device-in-RMRR/20200818-104920
base: https://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git next
config: x86_64-randconfig-m001-20200820 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-15) 9.3.0
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
New smatch warnings:
drivers/iommu/intel/iommu.c:4850 probe_acpi_namespace_devices() warn: inconsistent returns 'adev->physical_node_lock'.
Old smatch warnings:
drivers/iommu/intel/iommu.c:836 device_to_iommu() error: we previously assumed 'pdev' could be null (see line 809)
drivers/iommu/intel/iommu.c:2272 __domain_mapping() error: we previously assumed 'sg' could be null (see line 2263)
drivers/iommu/intel/iommu.c:4371 intel_iommu_add() warn: should '(1 << sp)' be a 64 bit type?
# https://github.com/0day-ci/linux/commit/3adfd53a32c52833a34033fabaa5c1e65dfca688
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review FelixCuioc/iommu-vt-d-Add-support-for-probing-ACPI-device-in-RMRR/20200818-104920
git checkout 3adfd53a32c52833a34033fabaa5c1e65dfca688
vim +4850 drivers/iommu/intel/iommu.c
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4797 static int __init probe_acpi_namespace_devices(void)
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4798 {
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4799 struct dmar_drhd_unit *drhd;
af88ec3962010e3 drivers/iommu/intel-iommu.c Qian Cai 2019-06-03 4800 /* To avoid a -Wunused-but-set-variable warning. */
af88ec3962010e3 drivers/iommu/intel-iommu.c Qian Cai 2019-06-03 4801 struct intel_iommu *iommu __maybe_unused;
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4802 struct device *dev;
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4803 int i, ret = 0;
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4804
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4805 for_each_active_iommu(iommu, drhd) {
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4806 for_each_active_dev_scope(drhd->devices,
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4807 drhd->devices_cnt, i, dev) {
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4808 struct acpi_device_physical_node *pn;
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4809 struct iommu_group *group;
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4810 struct acpi_device *adev;
3adfd53a32c5283 drivers/iommu/intel/iommu.c FelixCuioc 2020-08-17 4811 struct device *pn_dev = NULL;
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4812
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4813 if (dev->bus != &acpi_bus_type)
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4814 continue;
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4815
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4816 adev = to_acpi_device(dev);
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4817 mutex_lock(&adev->physical_node_lock);
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4818 list_for_each_entry(pn,
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4819 &adev->physical_node_list, node) {
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4820 group = iommu_group_get(pn->dev);
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4821 if (group) {
3adfd53a32c5283 drivers/iommu/intel/iommu.c FelixCuioc 2020-08-17 4822 pn_dev = pn->dev;
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4823 iommu_group_put(group);
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4824 continue;
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4825 }
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4826
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4827 pn->dev->bus->iommu_ops = &intel_iommu_ops;
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4828 ret = iommu_probe_device(pn->dev);
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4829 if (ret)
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4830 break;
3adfd53a32c5283 drivers/iommu/intel/iommu.c FelixCuioc 2020-08-17 4831 pn_dev = pn->dev;
3adfd53a32c5283 drivers/iommu/intel/iommu.c FelixCuioc 2020-08-17 4832 }
3adfd53a32c5283 drivers/iommu/intel/iommu.c FelixCuioc 2020-08-17 4833 if (pn_dev == NULL) {
3adfd53a32c5283 drivers/iommu/intel/iommu.c FelixCuioc 2020-08-17 4834 dev->bus->iommu_ops = &intel_iommu_ops;
3adfd53a32c5283 drivers/iommu/intel/iommu.c FelixCuioc 2020-08-17 4835 ret = iommu_probe_device(dev);
3adfd53a32c5283 drivers/iommu/intel/iommu.c FelixCuioc 2020-08-17 4836 if (ret) {
3adfd53a32c5283 drivers/iommu/intel/iommu.c FelixCuioc 2020-08-17 4837 pr_err("acpi_device probe fail! ret:%d\n", ret);
3adfd53a32c5283 drivers/iommu/intel/iommu.c FelixCuioc 2020-08-17 4838 return ret;
Need to unlock.
3adfd53a32c5283 drivers/iommu/intel/iommu.c FelixCuioc 2020-08-17 4839 }
3adfd53a32c5283 drivers/iommu/intel/iommu.c FelixCuioc 2020-08-17 4840 return 0;
Here too.
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4841 }
3adfd53a32c5283 drivers/iommu/intel/iommu.c FelixCuioc 2020-08-17 4842 ret = acpi_device_create_direct_mappings(pn_dev, dev);
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4843 mutex_unlock(&adev->physical_node_lock);
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4844
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4845 if (ret)
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4846 return ret;
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4847 }
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4848 }
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4849
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 @4850 return 0;
fa212a97f3a366a drivers/iommu/intel-iommu.c Lu Baolu 2019-05-25 4851 }
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 36016 bytes --]
[-- Attachment #3: Type: text/plain, Size: 156 bytes --]
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-24 10:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-18 2:46 [PATCH] iommu/vt-d:Add support for probing ACPI device in RMRR FelixCuioc
2020-08-24 10:37 ` Dan Carpenter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).