From patchwork Wed Sep 28 09:06:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tadhg Kearney X-Patchwork-Id: 117043 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 49D18A00C2; Wed, 28 Sep 2022 11:06:55 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B19DF427F5; Wed, 28 Sep 2022 11:06:46 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id 5F6FF40F16 for ; Wed, 28 Sep 2022 11:06:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664356004; x=1695892004; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=j6CSIwHIEfJEABryqaTLAWxXy4Cx4ttsB5svRsJFa1c=; b=Js7GFwS04jedWaywQwtdGxIaXID4f9RrbJLBFQKM9/cBFOjSFgS9D5qE YlfgYjEnuI455BTBa31Tm/QkPRq0IRJYRIRuxohElrv69pXxJAJOZD7+0 p8lsB8mSKX+jNxnH19iW5HSD5njV/+FaWKmxz07tTck8b6ivkkIlto7D5 Tkoo+Z0UL/z1gR2jXsovhW6ZCmzggwhIQQghGt812SVpOfbja5b3USAGH Rr9xU+WGU/waPSp+RtOh0/b+RgbI5IoRBC9IFhVg/RYqUquKUpDAPNz2C I+W1yPI2Xaj/ZOzDfrDcI2NZJqbJvcmyM+ZL9KC5JJ1v0M3+sTVZp/ybV w==; X-IronPort-AV: E=McAfee;i="6500,9779,10483"; a="301525915" X-IronPort-AV: E=Sophos;i="5.93,351,1654585200"; d="scan'208";a="301525915" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Sep 2022 02:06:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10483"; a="690323069" X-IronPort-AV: E=Sophos;i="5.93,351,1654585200"; d="scan'208";a="690323069" Received: from silpixa00401183.ir.intel.com ([10.55.129.143]) by fmsmga004.fm.intel.com with ESMTP; 28 Sep 2022 02:06:42 -0700 From: Tadhg Kearney To: dev@dpdk.org Cc: david.hunt@intel.com, anatoly.burakov@intel.com, reshma.pattan@intel.com, Tadhg Kearney Subject: [PATCH v6 2/3] l3fwd-power: add option to call uncore API Date: Wed, 28 Sep 2022 09:06:35 +0000 Message-Id: <20220928090636.1580647-3-tadhg.kearney@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220928090636.1580647-1-tadhg.kearney@intel.com> References: <20220927100905.1505722-1-tadhg.kearney@intel.com> <20220928090636.1580647-1-tadhg.kearney@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add option for setting uncore frequency min/max/index, through uncore API. This will be set for each package and die on the SKU. On exit, uncore min and max frequency will be reverted back to previous frequencies. Signed-off-by: Tadhg Kearney Reviewed-by: David Hunt --- .../sample_app_ug/l3_forward_power_man.rst | 29 ++++ examples/l3fwd-power/main.c | 126 +++++++++++++++++- 2 files changed, 153 insertions(+), 2 deletions(-) diff --git a/doc/guides/sample_app_ug/l3_forward_power_man.rst b/doc/guides/sample_app_ug/l3_forward_power_man.rst index 8f6d906200..08ac8ef369 100644 --- a/doc/guides/sample_app_ug/l3_forward_power_man.rst +++ b/doc/guides/sample_app_ug/l3_forward_power_man.rst @@ -97,6 +97,12 @@ where, * -P: Sets all ports to promiscuous mode so that packets are accepted regardless of the packet's Ethernet MAC destination address. Without this option, only packets with the Ethernet MAC destination address set to the Ethernet address of the port are accepted. +* -u: optional, sets uncore min/max frequency to minimum value. + +* -U: optional, sets uncore min/max frequency to maximum value. + +* -i (frequency index): optional, sets uncore frequency to frequency index value, by setting min and max values to be the same. + * --config (port,queue,lcore)[,(port,queue,lcore)]: determines which queues from which ports are mapped to which cores. * --max-pkt-len: optional, maximum packet length in decimal (64-9600) @@ -364,3 +370,26 @@ in the DPDK Programmer's Guide for more details on PMD power management. .. code-block:: console .//examples/dpdk-l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" --pmd-mgmt=scale + +Setting Uncore Values +--------------------- + +Uncore frequency can be adjusted through manipulating related sysfs entries to adjust the minimum and maximum uncore values. +This will be set for each package and die on the SKU. The driver for enabling this is available from kernel version 5.6 and above. +Three options are available for setting uncore frequency: + +``-u`` + This will set uncore minimum and maximum frequencies to minimum possible value. + +``-U`` + This will set uncore minimum and maximum frequencies to maximum possible value. + +``-i`` + This will allow you to set the specific uncore frequency index that you want, by setting + the uncore frequency to a frequency pointed by index. Frequency index's are set 100MHz apart from + maximum to minimum. + Frequency index values are in descending order, ie, index 0 is maximum frequency index. + +.. code-block:: console + + .//examples/dpdk-l3fwd-power -l 1-3 -- -p 0x0f --config="(0,0,2),(0,1,3)" -i 1 diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index 887c6eae3f..0b6acc8e58 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -47,6 +47,7 @@ #include #include #include +#include #include "perf_core.h" #include "main.h" @@ -161,6 +162,9 @@ static struct rte_timer telemetry_timer; /* stats index returned by metrics lib */ int telstats_index; +/* flag to check if uncore option enabled */ +int enabled_uncore = -1; + struct telstats_name { char name[RTE_ETH_XSTATS_NAME_SIZE]; }; @@ -179,6 +183,12 @@ enum busy_rate { FULL = 100 }; +enum uncore_choice { + UNCORE_MIN = 0, + UNCORE_MAX = 1, + UNCORE_IDX = 2 +}; + /* reference poll count to measure core busyness */ #define DEFAULT_COUNT 10000 /* @@ -1616,6 +1626,9 @@ print_usage(const char *prgname) " [--max-pkt-len PKTLEN]\n" " -p PORTMASK: hexadecimal bitmask of ports to configure\n" " -P: enable promiscuous mode\n" + " -u: set min/max frequency for uncore to minimum value\n" + " -U: set min/max frequency for uncore to maximum value\n" + " -i (frequency index): set min/max frequency for uncore to specified frequency index\n" " --config (port,queue,lcore): rx queues configuration\n" " --high-perf-cores CORELIST: list of high performance cores\n" " --perf-config: similar as config, cores specified as indices" @@ -1672,6 +1685,74 @@ static int parse_max_pkt_len(const char *pktlen) return len; } +static int +parse_uncore_options(enum uncore_choice choice, const char *argument) +{ + unsigned int die, pkg, max_pkg, max_die; + int ret = 0; + max_pkg = rte_power_uncore_get_num_pkgs(); + if (max_pkg == 0) + return -1; + + for (pkg = 0; pkg < max_pkg; pkg++) { + max_die = rte_power_uncore_get_num_dies(pkg); + if (max_die == 0) + return -1; + for (die = 0; die < max_die; die++) { + ret = rte_power_uncore_init(pkg, die); + if (ret == -1) { + RTE_LOG(INFO, L3FWD_POWER, "Unable to initialize uncore for pkg %02u die %02u\n" + , pkg, die); + return ret; + } + if (choice == UNCORE_MIN) { + ret = rte_power_uncore_freq_min(pkg, die); + if (ret == -1) { + RTE_LOG(INFO, L3FWD_POWER, + "Unable to set the uncore min/max to minimum uncore frequency value for pkg %02u die %02u\n" + , pkg, die); + return ret; + } + } else if (choice == UNCORE_MAX) { + ret = rte_power_uncore_freq_max(pkg, die); + if (ret == -1) { + RTE_LOG(INFO, L3FWD_POWER, + "Unable to set uncore min/max to maximum uncore frequency value for pkg %02u die %02u\n" + , pkg, die); + return ret; + } + } else if (choice == UNCORE_IDX) { + char *ptr = NULL; + int frequency_index = strtol(argument, &ptr, 10); + if (argument == ptr) { + RTE_LOG(INFO, L3FWD_POWER, "Index given is not a valid number."); + return -1; + } + int freq_array_len = rte_power_uncore_get_num_freqs(pkg, die); + if (frequency_index > freq_array_len - 1) { + RTE_LOG(INFO, L3FWD_POWER, + "Frequency index given out of range, please choose a value from 0 to %d.\n", + freq_array_len); + return -1; + } + ret = rte_power_set_uncore_freq(pkg, die, frequency_index); + if (ret == -1) { + RTE_LOG(INFO, L3FWD_POWER, + "Unable to set min/max uncore index value for pkg %02u die %02u\n", + pkg, die); + return ret; + } + } else { + RTE_LOG(INFO, L3FWD_POWER, "Uncore choice provided invalid\n"); + return -1; + } + } + } + + RTE_LOG(INFO, L3FWD_POWER, "Successfully set max/min/index uncore frequency.\n"); + return ret; +} + static int parse_portmask(const char *portmask) { @@ -1864,7 +1945,7 @@ parse_args(int argc, char **argv) argvopt = argv; - while ((opt = getopt_long(argc, argvopt, "p:l:m:h:P", + while ((opt = getopt_long(argc, argvopt, "p:l:m:h:P:uUi:", lgopts, &option_index)) != EOF) { switch (opt) { @@ -1893,6 +1974,27 @@ parse_args(int argc, char **argv) limit = parse_max_pkt_len(optarg); freq_tlb[HGH] = limit; break; + case 'u': + enabled_uncore = parse_uncore_options(UNCORE_MIN, NULL); + if (enabled_uncore < 0) { + print_usage(prgname); + return -1; + } + break; + case 'U': + enabled_uncore = parse_uncore_options(UNCORE_MAX, NULL); + if (enabled_uncore < 0) { + print_usage(prgname); + return -1; + } + break; + case 'i': + enabled_uncore = parse_uncore_options(UNCORE_IDX, optarg); + if (enabled_uncore < 0) { + print_usage(prgname); + return -1; + } + break; /* long options */ case 0: if (!strncmp(lgopts[option_index].name, "config", 6)) { @@ -2364,7 +2466,7 @@ init_power_library(void) static int deinit_power_library(void) { - unsigned int lcore_id; + unsigned int lcore_id, max_pkg, max_die, die, pkg; int ret = 0; RTE_LCORE_FOREACH(lcore_id) { @@ -2377,6 +2479,26 @@ deinit_power_library(void) return ret; } } + + /* if uncore option was set */ + if (enabled_uncore == 0) { + max_pkg = rte_power_uncore_get_num_pkgs(); + if (max_pkg == 0) + return -1; + for (pkg = 0; pkg < max_pkg; pkg++) { + max_die = rte_power_uncore_get_num_dies(pkg); + if (max_die == 0) + return -1; + for (die = 0; die < max_die; die++) { + ret = rte_power_uncore_exit(pkg, die); + if (ret < 0) { + RTE_LOG(ERR, L3FWD_POWER, "Failed to exit uncore deinit successfully for pkg %02u die %02u\n" + , pkg, die); + return -1; + } + } + } + } return ret; }