From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B19B3A0524; Tue, 1 Jun 2021 14:01:17 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BE586410FE; Tue, 1 Jun 2021 14:00:52 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 2849641102 for ; Tue, 1 Jun 2021 14:00:50 +0200 (CEST) IronPort-SDR: S9GurumMFW3rjL8ILRhc2WHpSM45DUbDeMESZaCmRQdAUsRRqkpL8bXkqUgwyxpPJwEi0YipVd gWbvyVN5bhnw== X-IronPort-AV: E=McAfee;i="6200,9189,10001"; a="203528488" X-IronPort-AV: E=Sophos;i="5.83,239,1616482800"; d="scan'208";a="203528488" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2021 05:00:50 -0700 IronPort-SDR: mMxOuFj2LfE0sE4ZGKDCvWBbf3YcWDsASQ016H9k8YcnVN0BgWrla6OOTYypFaVnky15Q3lYTJ c+uaf8mPb86A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,239,1616482800"; d="scan'208";a="549707016" Received: from silpixa00399498.ir.intel.com (HELO silpixa00399498.ger.corp.intel.com) ([10.237.222.54]) by fmsmga001.fm.intel.com with ESMTP; 01 Jun 2021 05:00:47 -0700 From: Anatoly Burakov To: dev@dpdk.org, David Hunt , Ray Kinsella , Neil Horman Cc: ciara.loftus@intel.com Date: Tue, 1 Jun 2021 12:00:34 +0000 Message-Id: <601f09ad562f97ca1e0077cb36ba46e448df382d.1622548381.git.anatoly.burakov@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v1 5/7] power: support callbacks for multiple Rx queues 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 Sender: "dev" Currently, there is a hard limitation on the PMD power management support that only allows it to support a single queue per lcore. This is not ideal as most DPDK use cases will poll multiple queues per core. The PMD power management mechanism relies on ethdev Rx callbacks, so it is very difficult to implement such support because callbacks are effectively stateless and have no visibility into what the other ethdev devices are doing. This places limitations on what we can do within the framework of Rx callbacks, but the basics of this implementation are as follows: - Replace per-queue structures with per-lcore ones, so that any device polled from the same lcore can share data - Any queue that is going to be polled from a specific lcore has to be added to the list of cores to poll, so that the callback is aware of other queues being polled by the same lcore - Both the empty poll counter and the actual power saving mechanism is shared between all queues polled on a particular lcore, and is only activated when a special designated "power saving" queue is polled. To put it another way, we have no idea which queue the user will poll in what order, so we rely on them telling us that queue X is the last one in the polling loop, so any power management should happen there. - A new API is added to mark a specific Rx queue as "power saving". Failing to call this API will result in no power management, however when having only one queue per core it is obvious which queue is the "power saving" one, so things will still work without this new API for use cases that were previously working without it. - The limitation on UMWAIT-based polling is not removed because UMWAIT is incapable of monitoring more than one address. Signed-off-by: Anatoly Burakov --- lib/power/rte_power_pmd_mgmt.c | 335 ++++++++++++++++++++++++++------- lib/power/rte_power_pmd_mgmt.h | 34 ++++ lib/power/version.map | 3 + 3 files changed, 306 insertions(+), 66 deletions(-) diff --git a/lib/power/rte_power_pmd_mgmt.c b/lib/power/rte_power_pmd_mgmt.c index 0707c60a4f..60dd21a19c 100644 --- a/lib/power/rte_power_pmd_mgmt.c +++ b/lib/power/rte_power_pmd_mgmt.c @@ -33,7 +33,19 @@ enum pmd_mgmt_state { PMD_MGMT_ENABLED }; -struct pmd_queue_cfg { +struct queue { + uint16_t portid; + uint16_t qid; +}; +struct pmd_core_cfg { + struct queue queues[RTE_MAX_ETHPORTS]; + /**< Which port-queue pairs are associated with this lcore? */ + struct queue power_save_queue; + /**< When polling multiple queues, all but this one will be ignored */ + bool power_save_queue_set; + /**< When polling multiple queues, power save queue must be set */ + size_t n_queues; + /**< How many queues are in the list? */ volatile enum pmd_mgmt_state pwr_mgmt_state; /**< State of power management for this queue */ enum rte_power_pmd_mgmt_type cb_mode; @@ -43,8 +55,97 @@ struct pmd_queue_cfg { uint64_t empty_poll_stats; /**< Number of empty polls */ } __rte_cache_aligned; +static struct pmd_core_cfg lcore_cfg[RTE_MAX_LCORE]; -static struct pmd_queue_cfg port_cfg[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT]; +static inline bool +queue_equal(const struct queue *l, const struct queue *r) +{ + return l->portid == r->portid && l->qid == r->qid; +} + +static inline void +queue_copy(struct queue *dst, const struct queue *src) +{ + dst->portid = src->portid; + dst->qid = src->qid; +} + +static inline bool +queue_is_power_save(const struct pmd_core_cfg *cfg, const struct queue *q) { + const struct queue *pwrsave = &cfg->power_save_queue; + + /* if there's only single queue, no need to check anything */ + if (cfg->n_queues == 1) + return true; + return cfg->power_save_queue_set && queue_equal(q, pwrsave); +} + +static int +queue_list_find(const struct pmd_core_cfg *cfg, const struct queue *q, + size_t *idx) { + size_t i; + for (i = 0; i < cfg->n_queues; i++) { + const struct queue *cur = &cfg->queues[i]; + if (queue_equal(cur, q)) { + if (idx != NULL) + *idx = i; + return 0; + } + } + return -1; +} + +static int +queue_set_power_save(struct pmd_core_cfg *cfg, const struct queue *q) { + if (queue_list_find(cfg, q, NULL) < 0) + return -ENOENT; + queue_copy(&cfg->power_save_queue, q); + cfg->power_save_queue_set = true; + return 0; +} + +static int +queue_list_add(struct pmd_core_cfg *cfg, const struct queue *q) +{ + size_t idx = cfg->n_queues; + if (idx >= RTE_DIM(cfg->queues)) + return -ENOSPC; + /* is it already in the list? */ + if (queue_list_find(cfg, q, NULL) == 0) + return -EEXIST; + queue_copy(&cfg->queues[idx], q); + cfg->n_queues++; + + return 0; +} + +static int +queue_list_remove(struct pmd_core_cfg *cfg, const struct queue *q) +{ + struct queue *found, *pwrsave; + size_t idx, last_idx = cfg->n_queues - 1; + + if (queue_list_find(cfg, q, &idx) != 0) + return -ENOENT; + + /* erase the queue pair being deleted */ + found = &cfg->queues[idx]; + memset(found, 0, sizeof(*found)); + + /* move the rest of the list */ + for (; idx < last_idx; idx++) + queue_copy(&cfg->queues[idx], &cfg->queues[idx + 1]); + cfg->n_queues--; + + /* if this was a power save queue, unset it */ + pwrsave = &cfg->power_save_queue; + if (cfg->power_save_queue_set && queue_is_power_save(cfg, q)) { + cfg->power_save_queue_set = false; + memset(pwrsave, 0, sizeof(*pwrsave)); + } + + return 0; +} static void calc_tsc(void) @@ -79,10 +180,10 @@ clb_umwait(uint16_t port_id, uint16_t qidx, struct rte_mbuf **pkts __rte_unused, uint16_t nb_rx, uint16_t max_pkts __rte_unused, void *addr __rte_unused) { + const unsigned int lcore = rte_lcore_id(); + struct pmd_core_cfg *q_conf; - struct pmd_queue_cfg *q_conf; - - q_conf = &port_cfg[port_id][qidx]; + q_conf = &lcore_cfg[lcore]; if (unlikely(nb_rx == 0)) { q_conf->empty_poll_stats++; @@ -107,11 +208,26 @@ clb_pause(uint16_t port_id, uint16_t qidx, struct rte_mbuf **pkts __rte_unused, uint16_t nb_rx, uint16_t max_pkts __rte_unused, void *addr __rte_unused) { - struct pmd_queue_cfg *q_conf; + const unsigned int lcore = rte_lcore_id(); + const struct queue q = {port_id, qidx}; + const bool empty = nb_rx == 0; + struct pmd_core_cfg *q_conf; - q_conf = &port_cfg[port_id][qidx]; + q_conf = &lcore_cfg[lcore]; - if (unlikely(nb_rx == 0)) { + /* early exit */ + if (likely(!empty)) { + q_conf->empty_poll_stats = 0; + } else { + /* do we care about this particular queue? */ + if (!queue_is_power_save(q_conf, &q)) + return nb_rx; + + /* + * we can increment unconditionally here because if there were + * non-empty polls in other queues assigned to this core, we + * dropped the counter to zero anyway. + */ q_conf->empty_poll_stats++; /* sleep for 1 microsecond */ if (unlikely(q_conf->empty_poll_stats > EMPTYPOLL_MAX)) { @@ -127,8 +243,7 @@ clb_pause(uint16_t port_id, uint16_t qidx, struct rte_mbuf **pkts __rte_unused, rte_pause(); } } - } else - q_conf->empty_poll_stats = 0; + } return nb_rx; } @@ -138,29 +253,97 @@ clb_scale_freq(uint16_t port_id, uint16_t qidx, struct rte_mbuf **pkts __rte_unused, uint16_t nb_rx, uint16_t max_pkts __rte_unused, void *_ __rte_unused) { - struct pmd_queue_cfg *q_conf; + const unsigned int lcore = rte_lcore_id(); + const struct queue q = {port_id, qidx}; + const bool empty = nb_rx == 0; + struct pmd_core_cfg *q_conf; - q_conf = &port_cfg[port_id][qidx]; + q_conf = &lcore_cfg[lcore]; - if (unlikely(nb_rx == 0)) { + /* early exit */ + if (likely(!empty)) { + q_conf->empty_poll_stats = 0; + + /* scale up freq immediately */ + rte_power_freq_max(rte_lcore_id()); + } else { + /* do we care about this particular queue? */ + if (!queue_is_power_save(q_conf, &q)) + return nb_rx; + + /* + * we can increment unconditionally here because if there were + * non-empty polls in other queues assigned to this core, we + * dropped the counter to zero anyway. + */ q_conf->empty_poll_stats++; if (unlikely(q_conf->empty_poll_stats > EMPTYPOLL_MAX)) /* scale down freq */ rte_power_freq_min(rte_lcore_id()); - } else { - q_conf->empty_poll_stats = 0; - /* scale up freq */ - rte_power_freq_max(rte_lcore_id()); } return nb_rx; } +static int +check_scale(unsigned int lcore) +{ + enum power_management_env env; + + /* only PSTATE and ACPI modes are supported */ + if (!rte_power_check_env_supported(PM_ENV_ACPI_CPUFREQ) && + !rte_power_check_env_supported(PM_ENV_PSTATE_CPUFREQ)) { + RTE_LOG(DEBUG, POWER, "Neither ACPI nor PSTATE modes are supported\n"); + return -ENOTSUP; + } + /* ensure we could initialize the power library */ + if (rte_power_init(lcore)) + return -EINVAL; + + /* ensure we initialized the correct env */ + env = rte_power_get_env(); + if (env != PM_ENV_ACPI_CPUFREQ && env != PM_ENV_PSTATE_CPUFREQ) { + RTE_LOG(DEBUG, POWER, "Neither ACPI nor PSTATE modes were initialized\n"); + return -ENOTSUP; + } + + /* we're done */ + return 0; +} + +static int +check_monitor(struct pmd_core_cfg *cfg, const struct queue *qdata) +{ + struct rte_power_monitor_cond dummy; + + /* check if rte_power_monitor is supported */ + if (!global_data.intrinsics_support.power_monitor) { + RTE_LOG(DEBUG, POWER, "Monitoring intrinsics are not supported\n"); + return -ENOTSUP; + } + + if (cfg->n_queues > 0) { + RTE_LOG(DEBUG, POWER, "Monitoring multiple queues is not supported\n"); + return -ENOTSUP; + } + + /* check if the device supports the necessary PMD API */ + if (rte_eth_get_monitor_addr(qdata->portid, qdata->qid, + &dummy) == -ENOTSUP) { + RTE_LOG(DEBUG, POWER, "The device does not support rte_eth_get_monitor_addr\n"); + return -ENOTSUP; + } + + /* we're done */ + return 0; +} + int rte_power_ethdev_pmgmt_queue_enable(unsigned int lcore_id, uint16_t port_id, uint16_t queue_id, enum rte_power_pmd_mgmt_type mode) { - struct pmd_queue_cfg *queue_cfg; + const struct queue qdata = {port_id, queue_id}; + struct pmd_core_cfg *queue_cfg; struct rte_eth_dev_info info; rte_rx_callback_fn clb; int ret; @@ -183,9 +366,11 @@ rte_power_ethdev_pmgmt_queue_enable(unsigned int lcore_id, uint16_t port_id, goto end; } - queue_cfg = &port_cfg[port_id][queue_id]; + queue_cfg = &lcore_cfg[lcore_id]; - if (queue_cfg->pwr_mgmt_state != PMD_MGMT_DISABLED) { + /* if callback was already enabled, check current callback type */ + if (queue_cfg->pwr_mgmt_state != PMD_MGMT_DISABLED && + queue_cfg->cb_mode != mode) { ret = -EINVAL; goto end; } @@ -195,53 +380,20 @@ rte_power_ethdev_pmgmt_queue_enable(unsigned int lcore_id, uint16_t port_id, switch (mode) { case RTE_POWER_MGMT_TYPE_MONITOR: - { - struct rte_power_monitor_cond dummy; - - /* check if rte_power_monitor is supported */ - if (!global_data.intrinsics_support.power_monitor) { - RTE_LOG(DEBUG, POWER, "Monitoring intrinsics are not supported\n"); - ret = -ENOTSUP; + /* check if we can add a new queue */ + ret = check_monitor(queue_cfg, &qdata); + if (ret < 0) goto end; - } - /* check if the device supports the necessary PMD API */ - if (rte_eth_get_monitor_addr(port_id, queue_id, - &dummy) == -ENOTSUP) { - RTE_LOG(DEBUG, POWER, "The device does not support rte_eth_get_monitor_addr\n"); - ret = -ENOTSUP; - goto end; - } clb = clb_umwait; break; - } case RTE_POWER_MGMT_TYPE_SCALE: - { - enum power_management_env env; - /* only PSTATE and ACPI modes are supported */ - if (!rte_power_check_env_supported(PM_ENV_ACPI_CPUFREQ) && - !rte_power_check_env_supported( - PM_ENV_PSTATE_CPUFREQ)) { - RTE_LOG(DEBUG, POWER, "Neither ACPI nor PSTATE modes are supported\n"); - ret = -ENOTSUP; + /* check if we can add a new queue */ + ret = check_scale(lcore_id); + if (ret < 0) goto end; - } - /* ensure we could initialize the power library */ - if (rte_power_init(lcore_id)) { - ret = -EINVAL; - goto end; - } - /* ensure we initialized the correct env */ - env = rte_power_get_env(); - if (env != PM_ENV_ACPI_CPUFREQ && - env != PM_ENV_PSTATE_CPUFREQ) { - RTE_LOG(DEBUG, POWER, "Neither ACPI nor PSTATE modes were initialized\n"); - ret = -ENOTSUP; - goto end; - } clb = clb_scale_freq; break; - } case RTE_POWER_MGMT_TYPE_PAUSE: /* figure out various time-to-tsc conversions */ if (global_data.tsc_per_us == 0) @@ -254,11 +406,20 @@ rte_power_ethdev_pmgmt_queue_enable(unsigned int lcore_id, uint16_t port_id, ret = -EINVAL; goto end; } + /* add this queue to the list */ + ret = queue_list_add(queue_cfg, &qdata); + if (ret < 0) { + RTE_LOG(DEBUG, POWER, "Failed to add queue to list: %s\n", + strerror(-ret)); + goto end; + } /* initialize data before enabling the callback */ - queue_cfg->empty_poll_stats = 0; - queue_cfg->cb_mode = mode; - queue_cfg->pwr_mgmt_state = PMD_MGMT_ENABLED; + if (queue_cfg->n_queues == 1) { + queue_cfg->empty_poll_stats = 0; + queue_cfg->cb_mode = mode; + queue_cfg->pwr_mgmt_state = PMD_MGMT_ENABLED; + } queue_cfg->cur_cb = rte_eth_add_rx_callback(port_id, queue_id, clb, NULL); @@ -271,7 +432,9 @@ int rte_power_ethdev_pmgmt_queue_disable(unsigned int lcore_id, uint16_t port_id, uint16_t queue_id) { - struct pmd_queue_cfg *queue_cfg; + const struct queue qdata = {port_id, queue_id}; + struct pmd_core_cfg *queue_cfg; + int ret; RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL); @@ -279,13 +442,24 @@ rte_power_ethdev_pmgmt_queue_disable(unsigned int lcore_id, return -EINVAL; /* no need to check queue id as wrong queue id would not be enabled */ - queue_cfg = &port_cfg[port_id][queue_id]; + queue_cfg = &lcore_cfg[lcore_id]; if (queue_cfg->pwr_mgmt_state != PMD_MGMT_ENABLED) return -EINVAL; - /* stop any callbacks from progressing */ - queue_cfg->pwr_mgmt_state = PMD_MGMT_DISABLED; + /* + * There is no good/easy way to do this without race conditions, so we + * are just going to throw our hands in the air and hope that the user + * has read the documentation and has ensured that ports are stopped at + * the time we enter the API functions. + */ + ret = queue_list_remove(queue_cfg, &qdata); + if (ret < 0) + return -ret; + + /* if we've removed all queues from the lists, set state to disabled */ + if (queue_cfg->n_queues == 0) + queue_cfg->pwr_mgmt_state = PMD_MGMT_DISABLED; switch (queue_cfg->cb_mode) { case RTE_POWER_MGMT_TYPE_MONITOR: /* fall-through */ @@ -309,3 +483,32 @@ rte_power_ethdev_pmgmt_queue_disable(unsigned int lcore_id, return 0; } + +int +rte_power_ethdev_pmgmt_queue_set_power_save(unsigned int lcore_id, + uint16_t port_id, uint16_t queue_id) +{ + const struct queue qdata = {port_id, queue_id}; + struct pmd_core_cfg *queue_cfg; + int ret; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL); + + if (lcore_id >= RTE_MAX_LCORE || queue_id >= RTE_MAX_QUEUES_PER_PORT) + return -EINVAL; + + /* no need to check queue id as wrong queue id would not be enabled */ + queue_cfg = &lcore_cfg[lcore_id]; + + if (queue_cfg->pwr_mgmt_state != PMD_MGMT_ENABLED) + return -EINVAL; + + ret = queue_set_power_save(queue_cfg, &qdata); + if (ret < 0) { + RTE_LOG(DEBUG, POWER, "Failed to set power save queue: %s\n", + strerror(-ret)); + return -ret; + } + + return 0; +} diff --git a/lib/power/rte_power_pmd_mgmt.h b/lib/power/rte_power_pmd_mgmt.h index 7557f5d7e1..edf8d8714f 100644 --- a/lib/power/rte_power_pmd_mgmt.h +++ b/lib/power/rte_power_pmd_mgmt.h @@ -90,6 +90,40 @@ int rte_power_ethdev_pmgmt_queue_disable(unsigned int lcore_id, uint16_t port_id, uint16_t queue_id); +/** + * @warning + * @b EXPERIMENTAL: this API may change, or be removed, without prior notice. + * + * Set a specific Ethernet device Rx queue to be the "power save" queue for a + * particular lcore. When multiple queues are assigned to a single lcore using + * the `rte_power_ethdev_pmgmt_queue_enable` API, only one of them will trigger + * the power management. In a typical scenario, the last queue to be polled on + * a particular lcore should be designated as power save queue. + * + * @note This function is not thread-safe. + * + * @note When using multiple queues per lcore, calling this function is + * mandatory. If not called, no power management routines would be triggered + * when the traffic starts. + * + * @warning This function must be called when all affected Ethernet ports are + * stopped and no Rx/Tx is in progress! + * + * @param lcore_id + * The lcore the Rx queue is polled from. + * @param port_id + * The port identifier of the Ethernet device. + * @param queue_id + * The queue identifier of the Ethernet device. + * @return + * 0 on success + * <0 on error + */ +__rte_experimental +int +rte_power_ethdev_pmgmt_queue_set_power_save(unsigned int lcore_id, + uint16_t port_id, uint16_t queue_id); + #ifdef __cplusplus } #endif diff --git a/lib/power/version.map b/lib/power/version.map index b004e3e4a9..105d1d94c2 100644 --- a/lib/power/version.map +++ b/lib/power/version.map @@ -38,4 +38,7 @@ EXPERIMENTAL { # added in 21.02 rte_power_ethdev_pmgmt_queue_disable; rte_power_ethdev_pmgmt_queue_enable; + + # added in 21.08 + rte_power_ethdev_pmgmt_queue_set_power_save; }; -- 2.25.1