Port improvements from start_civ to VM manager

docs/fields.md

@@ -165,4 +165,4 @@ Requirements
 ### [extra]
 - cmd: Set extra command.
 - service: Set extra services, use `:` split different services.
-
+- pwr_ctrl_multios: If set to "true", will create qmp socket in /tmp/ folder for suspend/hibernate feature. Setting to "false" will not create the sockeet.

src/guest/config_parser.cc

@@ -43,7 +43,7 @@ map<string_view, vector<string_view>> kConfigMap = {
     { kGroupPciPt,   { kPciPtDev }},
     { kGroupMed,     { kMedBattery, kMedThermal, kMedCamera } },
     { kGroupService, { kServTimeKeep, kServPmCtrl, kServVinput } },
-    { kGroupExtra,   { kExtraCmd, kExtraService } }
+    { kGroupExtra,   { kExtraCmd, kExtraService, kExtraPwrCtrlMultiOS } }
 };
 
 bool CivConfig::SanitizeOpts(void) {

src/guest/config_parser.h

@@ -87,6 +87,7 @@ constexpr char kServVinput[]   = "vinput";
 
 constexpr char kExtraCmd[]     = "cmd";
 constexpr char kExtraService[] = "service";
+constexpr char kExtraPwrCtrlMultiOS[] = "pwr_ctrl_multios";
 
 /* Options for Key to select */
 constexpr char kEmulTypeQemu[] = "QEMU";

src/guest/vm_builder_qemu.cc

@@ -28,6 +28,8 @@
 #include "utils/log.h"
 #include "utils/utils.h"
 
+#define MAX_NUM_GUEST 7
+
 namespace vm_manager {
 constexpr const char *kPciDevicePath = "/sys/bus/pci/devices/";
 constexpr const char *kPciDriverPath = "/sys/bus/pci/drivers/";
@@ -55,6 +57,15 @@ constexpr const char *kGvtgMdevV58Path = "/sys/bus/pci/devices/0000:00:02.0/mdev
 constexpr const char *kSys2MFreeHugePages = "/sys/kernel/mm/hugepages/hugepages-2048kB/free_hugepages";
 constexpr const char *kSys2MNrHugePages = "/sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages";
 
+constexpr const char *kDrmCard0Vf = "/sys/class/drm/card0/iov/vf";
+constexpr const char *kGtPreemptTimeoutUs = "/gt/preempt_timeout_us";
+constexpr const char *kGtExecQuantumMs = "/gt/exec_quantum_ms";
+
+constexpr const unsigned int kPreemptTimeout = 50000;
+constexpr const unsigned int kExecQuantum = 25;
+
+constexpr const char *kQmpPowerSocket = "/tmp/qmp-pwr-socket-";
+
 static bool CheckUuid(std::string uuid) {
     try {
         boost::uuids::string_generator gen;
@@ -202,12 +213,9 @@ static int SetAvailableVf(void) {
         return -1;
 
     if (current_vfs == 0) {
-        /* Limit VF's number to conserve memory */
-        int num_vfs = (totalvfs < 4) ? totalvfs : 4;
-
         WriteSysFile(kIntelGpuSriovAutoProbe, "0");
         WriteSysFile(kIntelGpuSriovNumVfs, "0");
-        WriteSysFile(kIntelGpuSriovNumVfs, std::to_string(num_vfs));
+        WriteSysFile(kIntelGpuSriovNumVfs, std::to_string(totalvfs));
         WriteSysFile(kIntelGpuSriovAutoProbe, "1");
     }
 
@@ -229,8 +237,16 @@ static int SetAvailableVf(void) {
         std::string sd(kIntelGpuDevPath);
         sd.replace(sd.end() - 2, sd.end(), std::to_string(i) + "/enable");
         int status = ReadSysFile(sd.c_str(), std::ios_base::dec);
-        if (status == 0)
+        if (status == 0) {
+            std::string timeoutPath = kDrmCard0Vf;
+            timeoutPath.append(std::to_string(i) + kGtPreemptTimeoutUs);
+            WriteSysFile(timeoutPath.c_str(), std::to_string(kPreemptTimeout));
+
+            std::string execQuantumPath = kDrmCard0Vf;
+            execQuantumPath.append(std::to_string(i) + kGtExecQuantumMs);
+            WriteSysFile(execQuantumPath.c_str(), std::to_string(kExecQuantum));
             return i;
+	}
     }
 
     LOG(error) << "Failed to find 1 available VF!";
@@ -265,6 +281,26 @@ bool VmBuilderQemu::SetupSriov(void) {
     return true;
 }
 
+void VmBuilderQemu::BuildExtraGuestPmCtrlCmd(void) {
+    std::string ex_cmd = cfg_.GetValue(kGroupExtra, kExtraPwrCtrlMultiOS);
+    if (ex_cmd == "true") {
+        static std::string socketPath;
+        for(int avail = 0; avail < MAX_NUM_GUEST; avail++) {
+            socketPath = kQmpPowerSocket + std::to_string(avail);
+            if(access(socketPath.c_str(), F_OK) != 0) {
+                std::string qmpCmd = " -qmp unix:" + socketPath + ",server,nowait";
+                emul_cmd_.append(qmpCmd);
+                break;
+            }
+        }
+
+        end_call_.emplace([](){
+            boost::filesystem::remove(socketPath);
+        });
+    } else
+        return;
+}
+
 enum PciPassthroughAction {
     kPciPassthrough,
     kPciRestore
@@ -794,6 +830,7 @@ bool VmBuilderQemu::BuildVmArgs(void) {
     BuildGuestTimeKeepCmd();
 
     BuildGuestPmCtrlCmd();
+    BuildExtraGuestPmCtrlCmd();
 
     BuildAudioCmd();
 

src/guest/vm_builder_qemu.h

@@ -60,6 +60,7 @@ class VmBuilderQemu : public VmBuilder {
     void BuildPtPciDevicesCmd(void);
     void BuildGuestTimeKeepCmd(void);
     void BuildGuestPmCtrlCmd(void);
+    void BuildExtraGuestPmCtrlCmd(void);
     void BuildAudioCmd(void);
     void BuildExtraCmd(void);