feat(Ansible): 2M and 1G hugepages

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I55720cee8236c37e21881d1d8115d357d2a1f05f

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml
index 8b11288..8ece69a 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml
@@ -4,6 +4,7 @@
 hostname: "s17-t33-sut1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
   iommu.passthrough: "1"
   isolcpus: "1-10,17-26,33-42,49-58"
   nmi_watchdog: "0"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml
index 85e4c6a..14836b0 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml
@@ -4,6 +4,7 @@
 hostname: "s18-t33-sut2"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
   iommu.passthrough: "1"
   isolcpus: "1-10,17-26,33-42,49-58"
   nmi_watchdog: "0"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.44.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.44.yaml
index 38e85e9..725accc 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.44.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.44.yaml
@@ -4,6 +4,7 @@
 hostname: "s3-t21-sut1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"
@@ -22,7 +23,7 @@ sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
   vm:
-    nr_hugepages: 65536
+    nr_hugepages: 32768
     max_map_count: 20000
 
 inventory_ipmi_hostname: "10.30.50.41"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.45.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.45.yaml
index 6cf52e9..f6c3ae9 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.45.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.45.yaml
@@ -4,6 +4,7 @@
 hostname: "s4-t21-tg1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.46.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.46.yaml
index 595b612..79f6603 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.46.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.46.yaml
@@ -4,6 +4,7 @@
 hostname: "s11-t31-sut1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"
@@ -22,7 +23,7 @@ sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
   vm:
-    nr_hugepages: 36864
+    nr_hugepages: 32768
     max_map_count: 20000
 
 inventory_ipmi_hostname: "10.30.50.43"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.47.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.47.yaml
index 8a27fb9..f449c40 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.47.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.47.yaml
@@ -4,6 +4,7 @@
 hostname: "s12-t31-sut2"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"
@@ -22,7 +23,7 @@ sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
   vm:
-    nr_hugepages: 36864
+    nr_hugepages: 32768
     max_map_count: 20000
 
 inventory_ipmi_hostname: "10.30.50.44"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.48.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.48.yaml
index 0ddc81d..d36fad7 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.48.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.48.yaml
@@ -4,6 +4,7 @@
 hostname: "s13-t31-tg1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml
index 0e6e8c4..160c9d3 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml
@@ -4,6 +4,7 @@
 hostname: "s19-t33t211-tg1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=16384"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml
index fb0c4ba..9b9b914 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml
@@ -4,6 +4,7 @@
 hostname: "s5-t22-sut1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"
@@ -22,7 +23,7 @@ sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
   vm:
-    nr_hugepages: 65536
+    nr_hugepages: 32768
     max_map_count: 20000
 
 inventory_ipmi_hostname: "10.30.50.49"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
index d7da54a..b02dda7 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
@@ -4,6 +4,7 @@
 hostname: "s6-t22-tg1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml
index 5687f9d..fae5c0f 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml
@@ -4,6 +4,7 @@
 hostname: "s7-t23-sut1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"
@@ -22,7 +23,7 @@ sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
   vm:
-    nr_hugepages: 65536
+    nr_hugepages: 32768
     max_map_count: 20000
 
 inventory_ipmi_hostname: "10.30.50.51"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml
index 9925333..d72ebcd 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml
@@ -4,6 +4,7 @@
 hostname: "s8-t23-tg1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml
index 9e0a30d..f2dd621 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml
@@ -4,6 +4,7 @@
 hostname: "s9-t24-sut1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"
@@ -22,7 +23,7 @@ sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
   vm:
-    nr_hugepages: 65536
+    nr_hugepages: 32768
     max_map_count: 20000
 
 inventory_ipmi_hostname: "10.30.50.53"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml
index 847790c..07ab624 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml
@@ -4,6 +4,7 @@
 hostname: "s10-t24-tg1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml
index 29c9ede..f129225 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml
@@ -4,6 +4,7 @@
 hostname: "s14-t32-sut1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"
@@ -22,7 +23,7 @@ sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
   vm:
-    nr_hugepages: 36864
+    nr_hugepages: 32768
     max_map_count: 20000
 
 inventory_ipmi_hostname: "10.30.50.55"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml
index 67d8a7d..1917e50 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml
@@ -4,6 +4,7 @@
 hostname: "s15-t32-sut2"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"
@@ -22,7 +23,7 @@ sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
   vm:
-    nr_hugepages: 36864
+    nr_hugepages: 32768
     max_map_count: 20000
 
 inventory_ipmi_hostname: "10.30.50.56"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.60.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.60.yaml
index 4996389..6498fa5 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.60.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.60.yaml
@@ -4,6 +4,7 @@
 hostname: "s16-t32-tg1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml
index d65e624..1532cd3 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml
@@ -4,6 +4,7 @@
 hostname: "s27-t211-sut1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
   iommu.passthrough: "1"
   isolcpus: "1-10,29-38"
   nmi_watchdog: "0"
@@ -15,7 +16,7 @@ sysctl:
   kernel:
     watchdog_cpumask: "0,11-28,39-55"
   vm:
-    nr_hugepages: 57344
+    nr_hugepages: 32768
     max_map_count: 20000
 
 inventory_ipmi_hostname: "10.30.50.69"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.10.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.10.yaml
index 6f6dece..ad790fc 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.10.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.10.yaml
@@ -4,6 +4,7 @@
 hostname: "s28-t26t35-tg1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=16484"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.11.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.11.yaml
index 1038df5..e21568d 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.11.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.11.yaml
@@ -4,6 +4,7 @@
 hostname: "s29-t26-sut1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.12.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.12.yaml
index 196fd5f..9c6c0b7 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.12.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.12.yaml
@@ -4,6 +4,7 @@
 hostname: "s30-t35-sut1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.13.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.13.yaml
index 69733ed..9055404 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.13.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.13.yaml
@@ -4,6 +4,7 @@
 hostname: "s31-t35-sut2"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml
index a6c87e3..1029d03 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml
@@ -4,6 +4,7 @@
 hostname: "s33-t27-sut1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"
@@ -22,7 +23,7 @@ sysctl:
   kernel:
     watchdog_cpumask: "0,24,48,72"
   vm:
-    nr_hugepages: 65536
+    nr_hugepages: 32768
     max_map_count: 20000
 
 inventory_ipmi_hostname: "10.30.55.18"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml
index 4fd37fb..92574a7 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml
@@ -4,6 +4,7 @@
 hostname: "s34-t27-tg1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml
index c463577..d1a8201 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml
@@ -4,6 +4,7 @@
 hostname: "s35-t28-sut1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"
@@ -22,7 +23,7 @@ sysctl:
   kernel:
     watchdog_cpumask: "0,24,48,72"
   vm:
-    nr_hugepages: 65536
+    nr_hugepages: 32768
     max_map_count: 20000
 
 inventory_ipmi_hostname: "10.30.55.20"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml
index dd903ae..0284846 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml
@@ -4,6 +4,7 @@
 hostname: "s36-t28-tg1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml
index ddba226..ef7d9c8 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml
@@ -4,6 +4,7 @@
 hostname: "s37-t29-sut1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"
@@ -22,7 +23,7 @@ sysctl:
   kernel:
     watchdog_cpumask: "0,24,48,72"
   vm:
-    nr_hugepages: 65536
+    nr_hugepages: 32768
     max_map_count: 20000
 
 inventory_ipmi_hostname: "10.30.55.22"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml
index 4b4c867..1c352a6 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml
@@ -4,6 +4,7 @@
 hostname: "s38-t29-tg1"
 grub:
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192"
   hpet: "disable"
   intel_idle.max_cstate: "1"
   intel_iommu: "on"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml
index 397ea57..56b1fd9 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml
@@ -5,6 +5,7 @@ hostname: "s60-t210-sut1"
 grub:
   amd_iommu: "on"
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
   hpet: "disable"
   iommu: "pt"
   isolcpus: "1-15,17-31,33-47,49-63"
@@ -19,7 +20,7 @@ sysctl:
   kernel:
     watchdog_cpumask: "0,16,32,48"
   vm:
-    nr_hugepages: 8192
+    nr_hugepages: 32768
     max_map_count: 20000
 
 inventory_ipmi_hostname: "10.30.55.24"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml
index a0c8b73..1fd7e02 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml
@@ -5,6 +5,7 @@ hostname: "s61-t210-tg1"
 grub:
   amd_iommu: "on"
   audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192"
   hpet: "disable"
   iommu: "pt"
   isolcpus: "1-15,17-31,33-47,49-63"
@@ -19,7 +20,7 @@ sysctl:
   kernel:
     watchdog_cpumask: "0,16,32,48"
   vm:
-    nr_hugepages: 65536
+    nr_hugepages: 8192
     max_map_count: 20000
 
 inventory_ipmi_hostname: "10.30.55.25"

diff --git a/fdio.infra.ansible/roles/performance_tuning/tasks/main.yaml b/fdio.infra.ansible/roles/performance_tuning/tasks/main.yaml
index b123be0..79fa03f 100644 (file)
--- a/fdio.infra.ansible/roles/performance_tuning/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/performance_tuning/tasks/main.yaml
@@ -25,18 +25,6 @@
   tags:
     - perf-conf-turbo-boost
 
-- name: Conf - Adjust nr_hugepages
-  # change the minimum size of the hugepage pool.
-  # 2G VPP, 4GB per VNF/CNF, 2G reserve
-  sysctl:
-    name: "vm.nr_hugepages"
-    value: "{{ sysctl.vm.nr_hugepages  }}"
-    state: "present"
-    sysctl_file: "/etc/sysctl.d/90-csit.conf"
-    reload: "yes"
-  tags:
-    - perf-conf-sysctl
-
 - name: Conf - Adjust max_map_count
   # this file contains the maximum number of memory map areas a process
   # may have. memory map areas are used as a side-effect of calling
@@ -186,4 +174,42 @@
   tags:
     - perf-conf-load-kernel-modules
 
+- name: Conf - Create a directory for 1G HugeTLBs hugepages
+  file:
+    path: "/dev/hugepages1G"
+    state: "directory"
+    mode: 0755
+  tags:
+    - perf-conf-hugepages-1g
+
+- name: Conf - Mount 1G HugeTLBs hugepages
+  mount:
+    path: "/dev/hugepages1G"
+    src: "hugetlbfs"
+    opts: "pagesize=1G"
+    boot: false
+    state: "mounted"
+    fstype: "hugetlbfs"
+  tags:
+    - perf-conf-hugepages-1g
+
+- name: Create a directory if it does not exist
+  file:
+    path: "/dev/hugepages2M"
+    state: "directory"
+    mode: 0755
+  tags:
+    - perf-conf-hugepages-2m
+
+- name: Conf - Create a directory for 2M HugeTLBs hugepages
+  mount:
+    path: "/dev/hugepages2M"
+    src: "hugetlbfs"
+    opts: "pagesize=2M"
+    boot: false
+    state: "mounted"
+    fstype: "hugetlbfs"
+  tags:
+    - perf-conf-hugepages-2m
+
 - meta: flush_handlers