Merge pull request openshift#864 from zeeke/us/OCPBUGS-52853

kernel: Avoid setting `iommu.passthrough` on ARM system

Author: SchSeba

pkg/consts/constants.go

@@ -139,12 +139,11 @@ const (
 		`IMPORT{program}="/etc/udev/switchdev-vf-link-name.sh $attr{phys_port_name}", ` +
 		`NAME="%s_$env{NUMBER}"`
 
-	KernelArgPciRealloc       = "pci=realloc"
-	KernelArgIntelIommu       = "intel_iommu=on"
-	KernelArgIommuPt          = "iommu=pt"
-	KernelArgIommuPassthrough = "iommu.passthrough=1"
-	KernelArgRdmaShared       = "ib_core.netns_mode=1"
-	KernelArgRdmaExclusive    = "ib_core.netns_mode=0"
+	KernelArgPciRealloc    = "pci=realloc"
+	KernelArgIntelIommu    = "intel_iommu=on"
+	KernelArgIommuPt       = "iommu=pt"
+	KernelArgRdmaShared    = "ib_core.netns_mode=1"
+	KernelArgRdmaExclusive = "ib_core.netns_mode=0"
 
 	// Systemd consts
 	SriovSystemdConfigPath        = SriovConfBasePath + "/sriov-interface-config.yaml"

pkg/daemon/daemon_test.go

@@ -185,7 +185,6 @@ var _ = Describe("Daemon Controller", Ordered, func() {
 			hostHelper.EXPECT().IsKernelArgsSet("", constants.KernelArgPciRealloc).Return(true).AnyTimes()
 			hostHelper.EXPECT().IsKernelArgsSet("", constants.KernelArgIntelIommu).Return(true).AnyTimes()
 			hostHelper.EXPECT().IsKernelArgsSet("", constants.KernelArgIommuPt).Return(true).AnyTimes()
-			hostHelper.EXPECT().IsKernelArgsSet("", constants.KernelArgIommuPassthrough).Return(true).AnyTimes()
 			hostHelper.EXPECT().IsKernelArgsSet("", constants.KernelArgRdmaExclusive).Return(false).AnyTimes()
 			hostHelper.EXPECT().IsKernelArgsSet("", constants.KernelArgRdmaShared).Return(false).AnyTimes()
 			hostHelper.EXPECT().SetRDMASubsystem("").Return(nil).AnyTimes()

pkg/daemon/plugin_test.go

@@ -47,7 +47,6 @@ var _ = Describe("config daemon plugin loading tests", func() {
 			helperMock.EXPECT().IsKernelArgsSet("", consts.KernelArgPciRealloc).Return(false).AnyTimes()
 			helperMock.EXPECT().IsKernelArgsSet("", consts.KernelArgRdmaExclusive).Return(false).AnyTimes()
 			helperMock.EXPECT().IsKernelArgsSet("", consts.KernelArgRdmaShared).Return(false).AnyTimes()
-			helperMock.EXPECT().IsKernelArgsSet("", consts.KernelArgIommuPassthrough).Return(false).AnyTimes()
 
 			// k8s plugin is ATM the only plugin which require mocking/faking, as its New method performs additional logic
 			// other than simple plugin struct initialization

pkg/plugins/generic/generic_plugin.go

@@ -119,12 +119,11 @@ func NewGenericPlugin(helpers helper.HostHelpersInterface, options ...Option) (p
 		return nil, err
 	}
 	desiredKernelArgs := KargStateMapType{
-		consts.KernelArgPciRealloc:       helpers.IsKernelArgsSet(kargs, consts.KernelArgPciRealloc),
-		consts.KernelArgIntelIommu:       helpers.IsKernelArgsSet(kargs, consts.KernelArgIntelIommu),
-		consts.KernelArgIommuPt:          helpers.IsKernelArgsSet(kargs, consts.KernelArgIommuPt),
-		consts.KernelArgIommuPassthrough: helpers.IsKernelArgsSet(kargs, consts.KernelArgIommuPassthrough),
-		consts.KernelArgRdmaShared:       false,
-		consts.KernelArgRdmaExclusive:    false,
+		consts.KernelArgPciRealloc:    helpers.IsKernelArgsSet(kargs, consts.KernelArgPciRealloc),
+		consts.KernelArgIntelIommu:    helpers.IsKernelArgsSet(kargs, consts.KernelArgIntelIommu),
+		consts.KernelArgIommuPt:       helpers.IsKernelArgsSet(kargs, consts.KernelArgIommuPt),
+		consts.KernelArgRdmaShared:    false,
+		consts.KernelArgRdmaExclusive: false,
 	}
 
 	return &GenericPlugin{
@@ -438,9 +437,6 @@ func (p *GenericPlugin) addVfioDesiredKernelArg(state *sriovnetworkv1.SriovNetwo
 		hostTypes.CPUVendorAMD: func() {
 			p.enableDesiredKernelArgs(consts.KernelArgIommuPt)
 		},
-		hostTypes.CPUVendorARM: func() {
-			p.enableDesiredKernelArgs(consts.KernelArgIommuPassthrough)
-		},
 	}
 
 	if !driverState.DriverLoaded && driverState.NeedDriverFunc(state, driverState) {

pkg/plugins/generic/generic_plugin_test.go

@@ -41,7 +41,6 @@ var _ = Describe("Generic plugin", func() {
 		hostHelper.EXPECT().IsKernelArgsSet("", consts.KernelArgPciRealloc).Return(false).AnyTimes()
 		hostHelper.EXPECT().IsKernelArgsSet("", consts.KernelArgRdmaExclusive).Return(false).AnyTimes()
 		hostHelper.EXPECT().IsKernelArgsSet("", consts.KernelArgRdmaShared).Return(false).AnyTimes()
-		hostHelper.EXPECT().IsKernelArgsSet("", consts.KernelArgIommuPassthrough).Return(false).AnyTimes()
 
 		hostHelper.EXPECT().RunCommand(gomock.Any(), gomock.Any()).Return("", "", nil).AnyTimes()
 
@@ -935,12 +934,6 @@ var _ = Describe("Generic plugin", func() {
 				Expect(genericPlugin.(*GenericPlugin).DesiredKernelArgs[consts.KernelArgIommuPt]).To(BeTrue())
 			})
 
-			It("should set the correct kernel args on ARM CPUs", func() {
-				hostHelper.EXPECT().GetCPUVendor().Return(hostTypes.CPUVendorARM, nil)
-				genericPlugin.(*GenericPlugin).addVfioDesiredKernelArg(vfioNetworkNodeState)
-				Expect(genericPlugin.(*GenericPlugin).DesiredKernelArgs[consts.KernelArgIommuPassthrough]).To(BeTrue())
-			})
-
 			It("should enable rdma shared mode", func() {
 				hostHelper.EXPECT().SetRDMASubsystem(consts.RdmaSubsystemModeShared).Return(nil)
 				err := genericPlugin.(*GenericPlugin).configRdmaKernelArg(rdmaState)