Skip to contentSkip to conversation

iommu/vt-d: Add Kconfig option to enable/disable scalable mode

PATCH Superseded Lu Baolu 2 participants 3 messages Nov 6, 2019 – Nov 8, 2019 IOMMU

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Lu Baolu

author
#0 lore raw

PATCH 1/1 iommu/vt-d: Add Kconfig option to enable/disable scalable mode

This adds a Kconfig option INTEL_IOMMU_SCALABLE_MODE_ON to make it easier for distributions to enable or disable the Intel IOMMU scalable mode during kernel build.

---
 drivers/iommu/Kconfig       | 10 ++++++++++
 drivers/iommu/intel-iommu.c |  5 +++++
 2 files changed, 15 insertions(+)
drivers/iommu/Kconfig +10 -0
index e3842eabcfdd..32f30e27791c 100644
@@ -242,6 +242,16 @@ config INTEL_IOMMU_FLOPPY_WA
 	  workaround will setup a 1:1 mapping for the first
 	  16MiB to make floppy (an ISA device) work.
 
+config INTEL_IOMMU_SCALABLE_MODE_ON
+	def_bool n
+	prompt "Enable Intel IOMMU scalable mode by default"
+	depends on INTEL_IOMMU
+	help
+	  Selecting this option will enable the scalable mode if
+	  hardware presents the capability. If this option is not
+	  selected, scalable mode support could also be enabled
+	  by passing intel_iommu=sm_on to the kernel.
+
 config IRQ_REMAP
 	bool "Support for Interrupt Remapping"
 	depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI
drivers/iommu/intel-iommu.c +5 -0
index 0f2f7124c1ca..545eb3b5c083 100644
@@ -357,7 +357,12 @@ int dmar_disabled = 0;
 int dmar_disabled = 1;
 #endif /*CONFIG_INTEL_IOMMU_DEFAULT_ON*/
 
+#ifdef CONFIG_INTEL_IOMMU_SCALABLE_MODE_ON
+int intel_iommu_sm = 1;
+#else
 int intel_iommu_sm;
+#endif /* CONFIG_INTEL_IOMMU_SCALABLE_MODE_ON */
+
 int intel_iommu_enabled = 0;
 EXPORT_SYMBOL_GPL(intel_iommu_enabled);
 
Signature · 1 line
2.17.1
#1 lore raw
Quoted 18 lines · Lu Baolu

This adds a Kconfig option INTEL_IOMMU_SCALABLE_MODE_ON to make it easier for distributions to enable or disable the Intel IOMMU scalable mode during kernel build.

---
 drivers/iommu/Kconfig       | 10 ++++++++++
 drivers/iommu/intel-iommu.c |  5 +++++
 2 files changed, 15 insertions(+)
drivers/iommu/Kconfig +0 -0
index e3842eabcfdd..32f30e27791c 100644

drivers/iommu/Kconfig config INTEL_IOMMU_FLOPPY_WA · line 245

Quoted 4 lines
drivers/iommu/Kconfig +1 -0
@@ -242,6 +242,16 @@ config INTEL_IOMMU_FLOPPY_WA
 	  workaround will setup a 1:1 mapping for the first
 	  16MiB to make floppy (an ISA device) work.
 
+config INTEL_IOMMU_SCALABLE_MODE_ON

That should have a DEFAULT in the name as it is a default.

drivers/iommu/Kconfig config INTEL_IOMMU_FLOPPY_WA · line 246

Quoted 1 line
drivers/iommu/Kconfig +1 -0
+	def_bool n

n is the default default, so this can just be bool.

drivers/iommu/Kconfig config INTEL_IOMMU_FLOPPY_WA · line 251

Quoted 5 lines
drivers/iommu/Kconfig +4 -0
+#ifdef CONFIG_INTEL_IOMMU_SCALABLE_MODE_ON
+int intel_iommu_sm = 1;
+#else
 int intel_iommu_sm;
+#endif /* CONFIG_INTEL_IOMMU_SCALABLE_MODE_ON */

This can use IS_ENABLED().

But then again the distro can just add iommu=sm_on to CONFIG_CMDLINE and have the same effect, so I don't really get the point of the whole patch.

Or why we can't just enable it by default for that matter.

author
#2 lore raw

Hi Christoph,

Quoted 22 lines · Christoph Hellwig
Quoted 21 lines · Lu Baolu

This adds a Kconfig option INTEL_IOMMU_SCALABLE_MODE_ON to make it easier for distributions to enable or disable the Intel IOMMU scalable mode during kernel build.

---
  drivers/iommu/Kconfig       | 10 ++++++++++
  drivers/iommu/intel-iommu.c |  5 +++++
  2 files changed, 15 insertions(+)
drivers/iommu/Kconfig +0 -0
index e3842eabcfdd..32f30e27791c 100644
@@ -242,6 +242,16 @@ config INTEL_IOMMU_FLOPPY_WA
  	  workaround will setup a 1:1 mapping for the first
  	  16MiB to make floppy (an ISA device) work.
 
Quoted 3 lines

drivers/iommu/Kconfig config INTEL_IOMMU_FLOPPY_WA · line 245

Quoted 1 line
drivers/iommu/Kconfig +1 -0
+config INTEL_IOMMU_SCALABLE_MODE_ON

That should have a DEFAULT in the name as it is a default.

Agreed.

Quoted 4 lines

drivers/iommu/Kconfig config INTEL_IOMMU_FLOPPY_WA · line 246

Quoted 2 lines
drivers/iommu/Kconfig +1 -0
+	def_bool n

n is the default default, so this can just be bool.

Agreed.

Quoted 8 lines

drivers/iommu/Kconfig config INTEL_IOMMU_FLOPPY_WA · line 251

Quoted 6 lines
drivers/iommu/Kconfig +4 -0
+#ifdef CONFIG_INTEL_IOMMU_SCALABLE_MODE_ON
+int intel_iommu_sm = 1;
+#else
  int intel_iommu_sm;
+#endif /* CONFIG_INTEL_IOMMU_SCALABLE_MODE_ON */

This can use IS_ENABLED().

We already have below in the code

#ifdef CONFIG_INTEL_IOMMU_DEFAULT_ON
int dmar_disabled = 0;
#else
int dmar_disabled = 1;
#endif /*CONFIG_INTEL_IOMMU_DEFAULT_ON*/

I prefer to make the code style consistent if these two doesn't make much difference.

Quoted 7 lines

But then again the distro can just add iommu=sm_on to CONFIG_CMDLINE and have the same effect, so I don't really get the point of the whole patch.

Or why we can't just enable it by default for that matter.

Currently Intel IOMMU scalable mode is by default off since some related features are still under active development. We will make it default on later once all features are ready.

No matter scalable mode default on or off, we provide two ways to switch it between on and off: kernel command and Kconfig option. The former is mainly used for debugging and testing purpose and the later is liked by the distributions.

Best regards,
baolu