From dcda81db3eb61bdf69751ce6963b564abf7b7e0c Mon Sep 17 00:00:00 2001
From: Feng Pan <fpan@redhat.com>
Date: Sun, 17 Sep 2017 22:47:51 -0400
Subject: Add vhost-user configurations

This patch adds capability for configuring the following options in
vhost-user section:
- coalesce-frames
- coalesce-time
- dont-dump-memory

JIRA: PUP-8

Change-Id: I906e7d3c937d2f1133e2bfc0838c16063b535b87
Signed-off-by: Feng Pan <fpan@redhat.com>
---
 manifests/config.pp |  8 ++++++++
 manifests/init.pp   | 36 +++++++++++++++++++++++++++---------
 manifests/params.pp |  3 +++
 3 files changed, 38 insertions(+), 9 deletions(-)

(limited to 'manifests')

diff --git a/manifests/config.pp b/manifests/config.pp
index d3773b7..2a99ea2 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -17,6 +17,14 @@ class fdio::config {
       'dpdk/dev/default': value => $fdio::vpp_dpdk_dev_default_options;
       'dpdk/uio-driver': value => $fdio::vpp_dpdk_uio_driver;
       'dpdk/socket-mem': value => $fdio::vpp_dpdk_socket_mem;
+      'vhost-user/coalesce-frames': value => $fdio::vpp_vhostuser_coalesce_frames;
+      'vhost-user/coalesce-time': value => $fdio::vpp_vhostuser_coalesce_time;
+    }
+
+    if $fdio::vpp_vhostuser_dont_dump_memory {
+      vpp_config {
+        'vhost-user/dont-dump-memory': ensure => present;
+      }
     }
 
     fdio::config::vpp_devices {  $fdio::vpp_dpdk_devs: }
diff --git a/manifests/init.pp b/manifests/init.pp
index 8e0b9bf..eda67f7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -42,20 +42,38 @@
 #   Example: '2,3'.
 #   Defaults to undef (no pinning)
 #
+# [*vpp_vhostuser_coalesce_frames*]
+#   (optional) vhost-user coalesce frames.
+#   Example: 32
+#   Defaults to undef
+#
+# [*vpp_vhostuser_coalesce_time*]
+#   (optional) vhost-user coalesce time in seconds
+#   Example: 0.005
+#   Defaults to undef
+#
+# [*vpp_vhostuser_dont_dump_memory*]
+#   (optional) vhost-user dont-dump-memory option. Avoids dumping vhost-user
+#   shared memory segments to core files.
+#   Defaults to false
+#
 # [*copy_kernel_nic_ip*]
 #   (optional) Configures VPP interface with IP settings found on its corresponding kernel NIC.
 #   Defaults to true
 #
 class fdio (
-  $repo_branch                  = $::fdio::params::repo_branch,
-  $vpp_dpdk_support             = $::fdio::params::vpp_dpdk_support,
-  $vpp_dpdk_devs                = $::fdio::params::vpp_dpdk_devs,
-  $vpp_dpdk_uio_driver          = $::fdio::params::vpp_dpdk_uio_driver,
-  $vpp_dpdk_dev_default_options = $::fdio::params::vpp_dpdk_dev_default_options,
-  $vpp_dpdk_socket_mem          = $::fdio::params::vpp_dpdk_socket_mem,
-  $vpp_cpu_main_core            = $::fdio::params::vpp_cpu_main_core,
-  $vpp_cpu_corelist_workers     = $::fdio::params::vpp_cpu_corelist_workers,
-  $copy_kernel_nic_ip           = $::fdio::params::copy_kernel_nic_ip,
+  $repo_branch                    = $::fdio::params::repo_branch,
+  $vpp_dpdk_support               = $::fdio::params::vpp_dpdk_support,
+  $vpp_dpdk_devs                  = $::fdio::params::vpp_dpdk_devs,
+  $vpp_dpdk_uio_driver            = $::fdio::params::vpp_dpdk_uio_driver,
+  $vpp_dpdk_dev_default_options   = $::fdio::params::vpp_dpdk_dev_default_options,
+  $vpp_dpdk_socket_mem            = $::fdio::params::vpp_dpdk_socket_mem,
+  $vpp_cpu_main_core              = $::fdio::params::vpp_cpu_main_core,
+  $vpp_cpu_corelist_workers       = $::fdio::params::vpp_cpu_corelist_workers,
+  $vpp_vhostuser_coalesce_frames  = $::fdio::params::vpp_vhostuser_coalesce_frames,
+  $vpp_vhostuser_coalesce_time    = $::fdio::params::vpp_vhostuser_coalesce_time,
+  $vpp_vhostuser_dont_dump_memory = $::fdio::params::vpp_vhostuser_dont_dump_memory,
+  $copy_kernel_nic_ip             = $::fdio::params::copy_kernel_nic_ip,
 ) inherits ::fdio::params {
 
   validate_array($vpp_dpdk_devs)
diff --git a/manifests/params.pp b/manifests/params.pp
index 796b198..8859667 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -11,5 +11,8 @@ class fdio::params {
   $vpp_dpdk_socket_mem = undef
   $vpp_cpu_main_core = undef
   $vpp_cpu_corelist_workers = undef
+  $vpp_vhostuser_coalesce_frames = undef
+  $vpp_vhostuser_coalesce_time = undef
+  $vpp_vhostuser_dont_dump_memory = false
   $copy_kernel_nic_ip = true
 }
-- 
cgit 1.2.3-korg