Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/48847/?format=api
{ "id": 48847, "url": "https://patches.dpdk.org/api/patches/48847/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20181214114946.21570-4-david.hunt@intel.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20181214114946.21570-4-david.hunt@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20181214114946.21570-4-david.hunt@intel.com", "date": "2018-12-14T11:49:45", "name": "[v2,3/4] examples/power: allow vms to use lcores over 63", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "27d822da4caefeb2f46bd5b918e8d7eae8d3866d", "submitter": { "id": 342, "url": "https://patches.dpdk.org/api/people/342/?format=api", "name": "Hunt, David", "email": "david.hunt@intel.com" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20181214114946.21570-4-david.hunt@intel.com/mbox/", "series": [ { "id": 2777, "url": "https://patches.dpdk.org/api/series/2777/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=2777", "date": "2018-12-14T11:49:42", "name": "examples/power: allow use of more than 64 cores", "version": 2, "mbox": "https://patches.dpdk.org/series/2777/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/48847/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/48847/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 3A86B1B9C9;\n\tFri, 14 Dec 2018 12:50:04 +0100 (CET)", "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n\tby dpdk.org (Postfix) with ESMTP id C2BDD1B9A8\n\tfor <dev@dpdk.org>; Fri, 14 Dec 2018 12:49:59 +0100 (CET)", "from orsmga005.jf.intel.com ([10.7.209.41])\n\tby fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t14 Dec 2018 03:49:59 -0800", "from silpixa00399952.ir.intel.com (HELO\n\tsilpixa00399952.ger.corp.intel.com) ([10.237.223.64])\n\tby orsmga005.jf.intel.com with ESMTP; 14 Dec 2018 03:49:58 -0800" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.56,352,1539673200\"; d=\"scan'208\";a=\"283557686\"", "From": "David Hunt <david.hunt@intel.com>", "To": "dev@dpdk.org", "Cc": "lei.a.yao@intel.com, anatoly.burakov@intel.com,\n\tDavid Hunt <david.hunt@intel.com>", "Date": "Fri, 14 Dec 2018 11:49:45 +0000", "Message-Id": "<20181214114946.21570-4-david.hunt@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20181214114946.21570-1-david.hunt@intel.com>", "References": "<20181122170220.55482-2-david.hunt@intel.com>\n\t<20181214114946.21570-1-david.hunt@intel.com>", "Subject": "[dpdk-dev] [PATCH v2 3/4] examples/power: allow vms to use lcores\n\tover 63", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Extending the functionality to allow vms to power manage cores beyond 63.\n\nSigned-off-by: David Hunt <david.hunt@intel.com>\n---\n examples/vm_power_manager/channel_manager.c | 74 +++++++++------------\n examples/vm_power_manager/channel_manager.h | 30 ++-------\n examples/vm_power_manager/channel_monitor.c | 56 ++++++----------\n examples/vm_power_manager/vm_power_cli.c | 4 +-\n 4 files changed, 57 insertions(+), 107 deletions(-)", "diff": "diff --git a/examples/vm_power_manager/channel_manager.c b/examples/vm_power_manager/channel_manager.c\nindex 71f4a0ccf..8756b53b8 100644\n--- a/examples/vm_power_manager/channel_manager.c\n+++ b/examples/vm_power_manager/channel_manager.c\n@@ -49,7 +49,7 @@ static bool global_hypervisor_available;\n */\n struct virtual_machine_info {\n \tchar name[CHANNEL_MGR_MAX_NAME_LEN];\n-\trte_atomic64_t pcpu_mask[CHANNEL_CMDS_MAX_CPUS];\n+\tuint16_t pcpu_map[CHANNEL_CMDS_MAX_CPUS];\n \tstruct channel_info *channels[CHANNEL_CMDS_MAX_VM_CHANNELS];\n \tchar channel_mask[POWER_MGR_MAX_CPUS];\n \tuint8_t num_channels;\n@@ -79,7 +79,6 @@ update_pcpus_mask(struct virtual_machine_info *vm_info)\n \tvirVcpuInfoPtr cpuinfo;\n \tunsigned i, j;\n \tint n_vcpus;\n-\tuint64_t mask;\n \n \tmemset(global_cpumaps, 0, CHANNEL_CMDS_MAX_CPUS*global_maplen);\n \n@@ -120,26 +119,23 @@ update_pcpus_mask(struct virtual_machine_info *vm_info)\n \t\tvm_info->info.nrVirtCpu = n_vcpus;\n \t}\n \tfor (i = 0; i < vm_info->info.nrVirtCpu; i++) {\n-\t\tmask = 0;\n \t\tfor (j = 0; j < global_n_host_cpus; j++) {\n-\t\t\tif (VIR_CPU_USABLE(global_cpumaps, global_maplen, i, j) > 0) {\n-\t\t\t\tmask |= 1ULL << j;\n-\t\t\t}\n+\t\t\tif (VIR_CPU_USABLE(global_cpumaps,\n+\t\t\t\t\tglobal_maplen, i, j) <= 0)\n+\t\t\t\tcontinue;\n+\t\t\trte_spinlock_lock(&(vm_info->config_spinlock));\n+\t\t\tvm_info->pcpu_map[i] = j;\n+\t\t\trte_spinlock_unlock(&(vm_info->config_spinlock));\n \t\t}\n-\t\trte_atomic64_set(&vm_info->pcpu_mask[i], mask);\n \t}\n \treturn 0;\n }\n \n int\n-set_pcpus_mask(char *vm_name, unsigned int vcpu, char *core_mask)\n+set_pcpu(char *vm_name, unsigned int vcpu, unsigned int pcpu)\n {\n-\tunsigned i = 0;\n \tint flags = VIR_DOMAIN_AFFECT_LIVE|VIR_DOMAIN_AFFECT_CONFIG;\n \tstruct virtual_machine_info *vm_info;\n-\tchar mask[POWER_MGR_MAX_CPUS];\n-\n-\tmemcpy(mask, core_mask, POWER_MGR_MAX_CPUS);\n \n \tif (vcpu >= CHANNEL_CMDS_MAX_CPUS) {\n \t\tRTE_LOG(ERR, CHANNEL_MANAGER, \"vCPU(%u) exceeds max allowable(%d)\\n\",\n@@ -166,17 +162,16 @@ set_pcpus_mask(char *vm_name, unsigned int vcpu, char *core_mask)\n \t\treturn -1;\n \t}\n \tmemset(global_cpumaps, 0 , CHANNEL_CMDS_MAX_CPUS * global_maplen);\n-\tfor (i = 0; i < POWER_MGR_MAX_CPUS; i++) {\n-\t\tif (mask[i] != 1)\n-\t\t\tcontinue;\n-\t\tVIR_USE_CPU(global_cpumaps, i);\n-\t\tif (i >= global_n_host_cpus) {\n-\t\t\tRTE_LOG(ERR, CHANNEL_MANAGER, \"CPU(%u) exceeds the available \"\n-\t\t\t\t\t\"number of CPUs(%u)\\n\",\n-\t\t\t\t\ti, global_n_host_cpus);\n-\t\t\treturn -1;\n-\t\t}\n+\n+\tVIR_USE_CPU(global_cpumaps, pcpu);\n+\n+\tif (pcpu >= global_n_host_cpus) {\n+\t\tRTE_LOG(ERR, CHANNEL_MANAGER, \"CPU(%u) exceeds the available \"\n+\t\t\t\t\"number of CPUs(%u)\\n\",\n+\t\t\t\tpcpu, global_n_host_cpus);\n+\t\treturn -1;\n \t}\n+\n \tif (virDomainPinVcpuFlags(vm_info->domainPtr, vcpu, global_cpumaps,\n \t\t\tglobal_maplen, flags) < 0) {\n \t\tRTE_LOG(ERR, CHANNEL_MANAGER, \"Unable to set vCPU(%u) to pCPU \"\n@@ -185,33 +180,24 @@ set_pcpus_mask(char *vm_name, unsigned int vcpu, char *core_mask)\n \t\treturn -1;\n \t}\n \trte_spinlock_lock(&(vm_info->config_spinlock));\n-\tmemcpy(&vm_info->pcpu_mask[vcpu], mask, POWER_MGR_MAX_CPUS);\n+\tvm_info->pcpu_map[vcpu] = pcpu;\n \trte_spinlock_unlock(&(vm_info->config_spinlock));\n \treturn 0;\n-\n-}\n-\n-int\n-set_pcpu(char *vm_name, unsigned vcpu, unsigned core_num)\n-{\n-\tchar mask[POWER_MGR_MAX_CPUS];\n-\n-\tmemset(mask, 0, POWER_MGR_MAX_CPUS);\n-\n-\tmask[core_num] = 1;\n-\n-\treturn set_pcpus_mask(vm_name, vcpu, mask);\n }\n \n-uint64_t\n-get_pcpus_mask(struct channel_info *chan_info, unsigned vcpu)\n+uint16_t\n+get_pcpu(struct channel_info *chan_info, unsigned int vcpu)\n {\n \tstruct virtual_machine_info *vm_info =\n \t\t\t(struct virtual_machine_info *)chan_info->priv_info;\n \n-\tif (global_hypervisor_available && (vm_info != NULL))\n-\t\treturn rte_atomic64_read(&vm_info->pcpu_mask[vcpu]);\n-\telse\n+\tif (global_hypervisor_available && (vm_info != NULL)) {\n+\t\tuint16_t pcpu;\n+\t\trte_spinlock_lock(&(vm_info->config_spinlock));\n+\t\tpcpu = vm_info->pcpu_map[vcpu];\n+\t\trte_spinlock_unlock(&(vm_info->config_spinlock));\n+\t\treturn pcpu;\n+\t} else\n \t\treturn 0;\n }\n \n@@ -771,9 +757,11 @@ get_info_vm(const char *vm_name, struct vm_info *info)\n \trte_spinlock_unlock(&(vm_info->config_spinlock));\n \n \tmemcpy(info->name, vm_info->name, sizeof(vm_info->name));\n+\trte_spinlock_lock(&(vm_info->config_spinlock));\n \tfor (i = 0; i < info->num_vcpus; i++) {\n-\t\tinfo->pcpu_mask[i] = rte_atomic64_read(&vm_info->pcpu_mask[i]);\n+\t\tinfo->pcpu_map[i] = vm_info->pcpu_map[i];\n \t}\n+\trte_spinlock_unlock(&(vm_info->config_spinlock));\n \treturn 0;\n }\n \n@@ -823,7 +811,7 @@ add_vm(const char *vm_name)\n \t}\n \n \tfor (i = 0; i < CHANNEL_CMDS_MAX_CPUS; i++) {\n-\t\trte_atomic64_init(&new_domain->pcpu_mask[i]);\n+\t\tnew_domain->pcpu_map[i] = 0;\n \t}\n \tif (update_pcpus_mask(new_domain) < 0) {\n \t\tRTE_LOG(ERR, CHANNEL_MANAGER, \"Error getting physical CPU pinning\\n\");\ndiff --git a/examples/vm_power_manager/channel_manager.h b/examples/vm_power_manager/channel_manager.h\nindex c2520ab6f..119b0d5cc 100644\n--- a/examples/vm_power_manager/channel_manager.h\n+++ b/examples/vm_power_manager/channel_manager.h\n@@ -40,7 +40,6 @@ struct sockaddr_un _sockaddr_un;\n #define MAX_CLIENTS 64\n #define MAX_VCPUS 20\n \n-\n struct libvirt_vm_info {\n \tconst char *vm_name;\n \tunsigned int pcpus[MAX_VCPUS];\n@@ -82,7 +81,7 @@ struct channel_info {\n struct vm_info {\n \tchar name[CHANNEL_MGR_MAX_NAME_LEN]; /**< VM name */\n \tenum vm_status status; /**< libvirt status */\n-\tuint64_t pcpu_mask[CHANNEL_CMDS_MAX_CPUS]; /**< pCPU mask for each vCPU */\n+\tuint16_t pcpu_map[CHANNEL_CMDS_MAX_CPUS]; /**< pCPU map to vCPU */\n \tunsigned num_vcpus; /**< number of vCPUS */\n \tstruct channel_info channels[CHANNEL_MGR_MAX_CHANNELS]; /**< Array of channel_info */\n \tunsigned num_channels; /**< Number of channels */\n@@ -115,8 +114,7 @@ int channel_manager_init(const char *path);\n void channel_manager_exit(void);\n \n /**\n- * Get the Physical CPU mask for VM lcore channel(vcpu), result is assigned to\n- * core_mask.\n+ * Get the Physical CPU for VM lcore channel(vcpu).\n * It is not thread-safe.\n *\n * @param chan_info\n@@ -130,26 +128,7 @@ void channel_manager_exit(void);\n * - 0 on error.\n * - >0 on success.\n */\n-uint64_t get_pcpus_mask(struct channel_info *chan_info, unsigned vcpu);\n-\n-/**\n- * Set the Physical CPU mask for the specified vCPU.\n- * It is not thread-safe.\n- *\n- * @param name\n- * Virtual Machine name to lookup\n- *\n- * @param vcpu\n- * The virtual CPU to set.\n- *\n- * @param core_mask\n- * The core mask of the physical CPU(s) to bind the vCPU\n- *\n- * @return\n- * - 0 on success.\n- * - Negative on error.\n- */\n-int set_pcpus_mask(char *vm_name, unsigned int vcpu, char *core_mask);\n+uint16_t get_pcpu(struct channel_info *chan_info, unsigned int vcpu);\n \n /**\n * Set the Physical CPU for the specified vCPU.\n@@ -168,7 +147,8 @@ int set_pcpus_mask(char *vm_name, unsigned int vcpu, char *core_mask);\n * - 0 on success.\n * - Negative on error.\n */\n-int set_pcpu(char *vm_name, unsigned vcpu, unsigned core_num);\n+int set_pcpu(char *vm_name, unsigned int vcpu, unsigned int pcpu);\n+\n /**\n * Add a VM as specified by name to the Channel Manager. The name must\n * correspond to a valid libvirt domain name.\ndiff --git a/examples/vm_power_manager/channel_monitor.c b/examples/vm_power_manager/channel_monitor.c\nindex 4189bbf1b..85622e7cb 100644\n--- a/examples/vm_power_manager/channel_monitor.c\n+++ b/examples/vm_power_manager/channel_monitor.c\n@@ -356,7 +356,6 @@ get_pcpu_to_control(struct policy *pol)\n \t/* Convert vcpu to pcpu. */\n \tstruct vm_info info;\n \tint pcpu, count;\n-\tuint64_t mask_u64b;\n \tstruct core_info *ci;\n \n \tci = get_core_info();\n@@ -377,13 +376,8 @@ get_pcpu_to_control(struct policy *pol)\n \t\t */\n \t\tget_info_vm(pol->pkt.vm_name, &info);\n \t\tfor (count = 0; count < pol->pkt.num_vcpu; count++) {\n-\t\t\tmask_u64b =\n-\t\t\t\tinfo.pcpu_mask[pol->pkt.vcpu_to_control[count]];\n-\t\t\tfor (pcpu = 0; mask_u64b;\n-\t\t\t\t\tmask_u64b &= ~(1ULL << pcpu++)) {\n-\t\t\t\tif ((mask_u64b >> pcpu) & 1)\n-\t\t\t\t\tpcpu_monitor(pol, ci, pcpu, count);\n-\t\t\t}\n+\t\t\tpcpu = info.pcpu_map[pol->pkt.vcpu_to_control[count]];\n+\t\t\tpcpu_monitor(pol, ci, pcpu, count);\n \t\t}\n \t} else {\n \t\t/*\n@@ -636,8 +630,6 @@ apply_policy(struct policy *pol)\n static int\n process_request(struct channel_packet *pkt, struct channel_info *chan_info)\n {\n-\tuint64_t core_mask;\n-\n \tif (chan_info == NULL)\n \t\treturn -1;\n \n@@ -646,41 +638,31 @@ process_request(struct channel_packet *pkt, struct channel_info *chan_info)\n \t\treturn -1;\n \n \tif (pkt->command == CPU_POWER) {\n-\t\tcore_mask = get_pcpus_mask(chan_info, pkt->resource_id);\n-\t\tif (core_mask == 0) {\n-\t\t\t/*\n-\t\t\t * Core mask will be 0 in the case where\n-\t\t\t * hypervisor is not available so we're working in\n-\t\t\t * the host, so use the core as the mask.\n-\t\t\t */\n-\t\t\tcore_mask = 1ULL << pkt->resource_id;\n-\t\t}\n-\t\tif (__builtin_popcountll(core_mask) == 1) {\n+\t\tunsigned int core_num;\n \n-\t\t\tunsigned core_num = __builtin_ffsll(core_mask) - 1;\n+\t\tcore_num = get_pcpu(chan_info, pkt->resource_id);\n \n-\t\t\tswitch (pkt->unit) {\n-\t\t\tcase(CPU_POWER_SCALE_MIN):\n-\t\t\t\t\tpower_manager_scale_core_min(core_num);\n+\t\tswitch (pkt->unit) {\n+\t\tcase(CPU_POWER_SCALE_MIN):\n+\t\t\tpower_manager_scale_core_min(core_num);\n \t\t\tbreak;\n-\t\t\tcase(CPU_POWER_SCALE_MAX):\n-\t\t\t\t\tpower_manager_scale_core_max(core_num);\n+\t\tcase(CPU_POWER_SCALE_MAX):\n+\t\t\tpower_manager_scale_core_max(core_num);\n \t\t\tbreak;\n-\t\t\tcase(CPU_POWER_SCALE_DOWN):\n-\t\t\t\t\tpower_manager_scale_core_down(core_num);\n+\t\tcase(CPU_POWER_SCALE_DOWN):\n+\t\t\tpower_manager_scale_core_down(core_num);\n \t\t\tbreak;\n-\t\t\tcase(CPU_POWER_SCALE_UP):\n-\t\t\t\t\tpower_manager_scale_core_up(core_num);\n+\t\tcase(CPU_POWER_SCALE_UP):\n+\t\t\tpower_manager_scale_core_up(core_num);\n \t\t\tbreak;\n-\t\t\tcase(CPU_POWER_ENABLE_TURBO):\n-\t\t\t\tpower_manager_enable_turbo_core(core_num);\n+\t\tcase(CPU_POWER_ENABLE_TURBO):\n+\t\t\tpower_manager_enable_turbo_core(core_num);\n \t\t\tbreak;\n-\t\t\tcase(CPU_POWER_DISABLE_TURBO):\n-\t\t\t\tpower_manager_disable_turbo_core(core_num);\n+\t\tcase(CPU_POWER_DISABLE_TURBO):\n+\t\t\tpower_manager_disable_turbo_core(core_num);\n+\t\t\tbreak;\n+\t\tdefault:\n \t\t\tbreak;\n-\t\t\tdefault:\n-\t\t\t\tbreak;\n-\t\t\t}\n \t\t}\n \t}\n \ndiff --git a/examples/vm_power_manager/vm_power_cli.c b/examples/vm_power_manager/vm_power_cli.c\nindex 34546809a..41e89ff20 100644\n--- a/examples/vm_power_manager/vm_power_cli.c\n+++ b/examples/vm_power_manager/vm_power_cli.c\n@@ -95,8 +95,8 @@ cmd_show_vm_parsed(void *parsed_result, struct cmdline *cl,\n \t}\n \tcmdline_printf(cl, \"Virtual CPU(s): %u\\n\", info.num_vcpus);\n \tfor (i = 0; i < info.num_vcpus; i++) {\n-\t\tcmdline_printf(cl, \" [%u]: Physical CPU Mask 0x%\"PRIx64\"\\n\", i,\n-\t\t\t\tinfo.pcpu_mask[i]);\n+\t\tcmdline_printf(cl, \" [%u]: Physical CPU %d\\n\", i,\n+\t\t\t\tinfo.pcpu_map[i]);\n \t}\n }\n \n", "prefixes": [ "v2", "3/4" ] }