ansible: match vpp device config to perf config

We're not using unsafe noiommu on perf testbeds and we should mirror
that config in vpp device.
As a side note, on arm vpp device, enabling unsafe noiommu leads to
corrupted packets, so it must be disabled at least on arm vpp device.

Also update arm vpp device kernel parameters to match perf testbeds.

Change-Id: Id3d3e8fcf71583cc04887b4180cd20561856d902
Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
index 5c65ef0..cb82c28 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
@@ -7,7 +7,7 @@ vfs_data_file: "csit-initialize-vfs-tx2.sh"
 grub:
   hugepagesz: "2M"
   hugepages: 32768
-  iommu: "on"
+  iommu.passthrough: "1"
 cpu_microarchitecture: "thunderx2"
 
 # User management.

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
index 9ac0211..35b6477 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
@@ -7,7 +7,7 @@ vfs_data_file: "csit-initialize-vfs-tx2.sh"
 grub:
   hugepagesz: "2M"
   hugepages: 32768
-  iommu: "on"
+  iommu.passthrough: "1"
 cpu_microarchitecture: "thunderx2"
 
 # User management.

diff --git a/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml b/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml
index 0114b05..280b8bf 100644 (file)
--- a/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml
@@ -129,12 +129,3 @@
     - "Update GRUB"
   tags:
     - set-grub
-
-- name: Configure unsafe noiommu
-  lineinfile:
-    path: "/etc/modprobe.d/vfio-noiommu.conf"
-    state: "present"
-    line: "options vfio enable_unsafe_noiommu_mode=1"
-    create: "yes"
-  tags:
-    - configure-unsafe-noiommu