examples/vm_power_mgr: add VCPU to PCPU mapping

[dpdk.git] / examples / vm_power_manager / channel_manager.c

diff --git a/examples/vm_power_manager/channel_manager.c b/examples/vm_power_manager/channel_manager.c
index 34a395d..ab856bd 100644 (file)
--- a/examples/vm_power_manager/channel_manager.c
+++ b/examples/vm_power_manager/channel_manager.c
@@ -45,7 +45,6 @@
 #include <sys/socket.h>
 #include <sys/select.h>
 
-#include <rte_config.h>
 #include <rte_malloc.h>
 #include <rte_memory.h>
 #include <rte_mempool.h>
@@ -389,7 +388,7 @@ add_all_channels(const char *vm_name)
                errno = 0;
                channel_num = (unsigned)strtol(remaining, &tail_ptr, 0);
                if ((errno != 0) || (remaining[0] == '\0') ||
-                               (*tail_ptr != '\0') || tail_ptr == NULL) {
+                               tail_ptr == NULL || (*tail_ptr != '\0')) {
                        RTE_LOG(WARNING, CHANNEL_MANAGER, "Malformed channel name"
                                        "'%s' found it should be in the form of "
                                        "'<guest_name>.<channel_num>(decimal)'\n",
@@ -575,6 +574,73 @@ set_channel_status(const char *vm_name, unsigned *channel_list,
        return num_channels_changed;
 }
 
+void
+get_all_vm(int *num_vm, int *num_vcpu)
+{
+
+       virNodeInfo node_info;
+       virDomainPtr *domptr;
+       uint64_t mask;
+       int i, ii, numVcpus[MAX_VCPUS], cpu, n_vcpus;
+       unsigned int jj;
+       const char *vm_name;
+       unsigned int domain_flags = VIR_CONNECT_LIST_DOMAINS_RUNNING |
+                               VIR_CONNECT_LIST_DOMAINS_PERSISTENT;
+       unsigned int domain_flag = VIR_DOMAIN_VCPU_CONFIG;
+
+
+       memset(global_cpumaps, 0, CHANNEL_CMDS_MAX_CPUS*global_maplen);
+       if (virNodeGetInfo(global_vir_conn_ptr, &node_info)) {
+               RTE_LOG(ERR, CHANNEL_MANAGER, "Unable to retrieve node Info\n");
+               return;
+       }
+
+       /* Returns number of pcpus */
+       global_n_host_cpus = (unsigned int)node_info.cpus;
+
+       /* Returns number of active domains */
+       *num_vm = virConnectListAllDomains(global_vir_conn_ptr, &domptr,
+                                       domain_flags);
+       if (*num_vm <= 0) {
+               RTE_LOG(ERR, CHANNEL_MANAGER, "No Active Domains Running\n");
+               return;
+       }
+
+       for (i = 0; i < *num_vm; i++) {
+
+               /* Get Domain Names */
+               vm_name = virDomainGetName(domptr[i]);
+               lvm_info[i].vm_name = vm_name;
+
+               /* Get Number of Vcpus */
+               numVcpus[i] = virDomainGetVcpusFlags(domptr[i], domain_flag);
+
+               /* Get Number of VCpus & VcpuPinInfo */
+               n_vcpus = virDomainGetVcpuPinInfo(domptr[i],
+                               numVcpus[i], global_cpumaps,
+                               global_maplen, domain_flag);
+
+               if ((int)n_vcpus > 0) {
+                       *num_vcpu = n_vcpus;
+                       lvm_info[i].num_cpus = n_vcpus;
+               }
+
+               /* Save pcpu in use by libvirt VMs */
+               for (ii = 0; ii < n_vcpus; ii++) {
+                       mask = 0;
+                       for (jj = 0; jj < global_n_host_cpus; jj++) {
+                               if (VIR_CPU_USABLE(global_cpumaps,
+                                               global_maplen, ii, jj) > 0) {
+                                       mask |= 1ULL << jj;
+                               }
+                       }
+                       ITERATIVE_BITMASK_CHECK_64(mask, cpu) {
+                               lvm_info[i].pcpus[ii] = cpu;
+                       }
+               }
+       }
+}
+
 int
 get_info_vm(const char *vm_name, struct vm_info *info)
 {
@@ -668,6 +734,7 @@ add_vm(const char *vm_name)
                return -1;
        }
        strncpy(new_domain->name, vm_name, sizeof(new_domain->name));
+       new_domain->name[sizeof(new_domain->name) - 1] = '\0';
        new_domain->channel_mask = 0;
        new_domain->num_channels = 0;
 
@@ -734,7 +801,7 @@ connect_hypervisor(const char *path)
 int
 channel_manager_init(const char *path)
 {
-       int n_cpus;
+       virNodeInfo info;
 
        LIST_INIT(&vm_list_head);
        if (connect_hypervisor(path) < 0) {
@@ -756,19 +823,19 @@ channel_manager_init(const char *path)
                goto error;
        }
 
-       n_cpus = virNodeGetCPUMap(global_vir_conn_ptr, NULL, NULL, 0);
-       if (n_cpus <= 0) {
-               RTE_LOG(ERR, CHANNEL_MANAGER, "Unable to get the number of Host "
-                               "CPUs\n");
+       if (virNodeGetInfo(global_vir_conn_ptr, &info)) {
+               RTE_LOG(ERR, CHANNEL_MANAGER, "Unable to retrieve node Info\n");
                goto error;
        }
-       global_n_host_cpus = (unsigned)n_cpus;
 
-       if (global_n_host_cpus > CHANNEL_CMDS_MAX_CPUS) {
-               RTE_LOG(ERR, CHANNEL_MANAGER, "The number of host CPUs(%u) exceeds the "
-                               "maximum of %u\n", global_n_host_cpus, CHANNEL_CMDS_MAX_CPUS);
-               goto error;
+       global_n_host_cpus = (unsigned)info.cpus;
 
+       if (global_n_host_cpus > CHANNEL_CMDS_MAX_CPUS) {
+               RTE_LOG(WARNING, CHANNEL_MANAGER, "The number of host CPUs(%u) exceeds the "
+                               "maximum of %u. No cores over %u should be used.\n",
+                               global_n_host_cpus, CHANNEL_CMDS_MAX_CPUS,
+                               CHANNEL_CMDS_MAX_CPUS - 1);
+               global_n_host_cpus = CHANNEL_CMDS_MAX_CPUS;
        }
 
        return 0;
@@ -800,9 +867,7 @@ channel_manager_exit(void)
                rte_free(vm_info);
        }
 
-       if (global_cpumaps != NULL)
-               rte_free(global_cpumaps);
-       if (global_vircpuinfo != NULL)
-               rte_free(global_vircpuinfo);
+       rte_free(global_cpumaps);
+       rte_free(global_vircpuinfo);
        disconnect_hypervisor();
 }