From patchwork Fri Apr 6 13:51:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Pattan, Reshma" X-Patchwork-Id: 37406 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5E7411D14A; Fri, 6 Apr 2018 15:51:52 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id ABE691D13C for ; Fri, 6 Apr 2018 15:51:50 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Apr 2018 06:51:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,415,1517904000"; d="scan'208";a="44646112" Received: from sivswdev02.ir.intel.com (HELO localhost.localdomain) ([10.237.217.46]) by fmsmga001.fm.intel.com with ESMTP; 06 Apr 2018 06:51:48 -0700 From: Reshma Pattan To: david.hunt@intel.com, dev@dpdk.org Cc: jananeex.m.parthasarathy@intel.com Date: Fri, 6 Apr 2018 14:51:46 +0100 Message-Id: <1523022706-12231-1-git-send-email-reshma.pattan@intel.com> X-Mailer: git-send-email 1.7.0.7 Subject: [dpdk-dev] [PATCH] app/test: enhance power manager unit tests X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Unit Testcases are added for power_acpi_cpu_freq, power_kvm_vm_test to improve coverage Signed-off-by: Jananee Parthasarathy Acked-by: David Hunt --- test/test/test_power_acpi_cpufreq.c | 2 +- test/test/test_power_kvm_vm.c | 62 +++++++++++++++++++++++++++++++++---- 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/test/test/test_power_acpi_cpufreq.c b/test/test/test_power_acpi_cpufreq.c index 3bfd033..8da2dcc 100644 --- a/test/test/test_power_acpi_cpufreq.c +++ b/test/test/test_power_acpi_cpufreq.c @@ -27,7 +27,7 @@ #define TEST_POWER_FREQS_NUM_MAX ((unsigned)RTE_MAX_LCORE_FREQS) #define TEST_POWER_SYSFILE_CUR_FREQ \ - "/sys/devices/system/cpu/cpu%u/cpufreq/scaling_cur_freq" + "/sys/devices/system/cpu/cpu%u/cpufreq/cpuinfo_cur_freq" static uint32_t total_freq_num; static uint32_t freqs[TEST_POWER_FREQS_NUM_MAX]; diff --git a/test/test/test_power_kvm_vm.c b/test/test/test_power_kvm_vm.c index 91b31c4..012ad82 100644 --- a/test/test/test_power_kvm_vm.c +++ b/test/test/test_power_kvm_vm.c @@ -25,12 +25,19 @@ #define TEST_POWER_VM_LCORE_ID 0U #define TEST_POWER_VM_LCORE_OUT_OF_BOUNDS (RTE_MAX_LCORE+1) #define TEST_POWER_VM_LCORE_INVALID 1U +#define TEMP_POWER_MANAGER_FILE_PATH "/tmp/testpm" + +int guest_channel_host_connect(const char *path, unsigned int lcore_id); +int power_kvm_vm_enable_turbo(unsigned int lcore_id); +int power_kvm_vm_disable_turbo(unsigned int lcore_id); static int test_power_kvm_vm(void) { int ret; enum power_management_env env; + char fPath[PATH_MAX]; + FILE *fPtr = NULL; ret = rte_power_set_env(PM_ENV_KVM_VM); if (ret != 0) { @@ -95,12 +102,31 @@ /* Test initialisation of a valid lcore */ ret = rte_power_init(TEST_POWER_VM_LCORE_ID); if (ret < 0) { - printf("Cannot initialise power management for lcore %u, this " - "may occur if environment is not configured " - "correctly(KVM VM) or operating in another valid " - "Power management environment\n", TEST_POWER_VM_LCORE_ID); - rte_power_unset_env(); - return -1; + printf("rte_power_init failed as expected in host\n"); + /* This test would be successful when run on VM, + * in order to run in Host itself, temporary file path + * is created and same is used for further communication + */ + + snprintf(fPath, PATH_MAX, "%s.%u", + TEMP_POWER_MANAGER_FILE_PATH, TEST_POWER_VM_LCORE_ID); + fPtr = fopen(fPath, "w"); + if (fPtr == NULL) { + printf(" Unable to create file\n"); + rte_power_unset_env(); + return -1; + } + ret = guest_channel_host_connect(TEMP_POWER_MANAGER_FILE_PATH, + TEST_POWER_VM_LCORE_ID); + if (ret == 0) + printf("guest_channel_host_connect successful\n"); + else { + printf("guest_channel_host_connect failed\n"); + rte_power_unset_env(); + fclose(fPtr); + remove(fPath); + return -1; + } } /* Test initialisation of previously initialised lcore */ @@ -175,6 +201,22 @@ goto fail_all; } + /* Test KVM_VM Enable Turbo of valid core */ + ret = power_kvm_vm_enable_turbo(TEST_POWER_VM_LCORE_ID); + if (ret == -1) { + printf("power_kvm_vm_enable_turbo failed on valid lcore" + "%u\n", TEST_POWER_VM_LCORE_ID); + goto fail_all; + } + + /* Test KVM_VM Disable Turbo of valid core */ + ret = power_kvm_vm_disable_turbo(TEST_POWER_VM_LCORE_ID); + if (ret == -1) { + printf("power_kvm_vm_disable_turbo failed on valid lcore" + "%u\n", TEST_POWER_VM_LCORE_ID); + goto fail_all; + } + /* Test frequency up of valid lcore */ ret = rte_power_freq_up(TEST_POWER_VM_LCORE_ID); if (ret != 1) { @@ -274,10 +316,18 @@ return -1; } rte_power_unset_env(); + if (fPtr != NULL) { + fclose(fPtr); + remove(fPath); + } return 0; fail_all: rte_power_exit(TEST_POWER_VM_LCORE_ID); rte_power_unset_env(); + if (fPtr != NULL) { + fclose(fPtr); + remove(fPath); + } return -1; } #endif