Commit 7bf66ff5 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki
Browse files

lib/event: remove fields from spdk_governor_capabilities 



The spdk_governor_capabilities added lots of capabilities
which went unused, suposedly to mark which callbacks
a governor had implemented.

This made little sense, since capabilities are per core and
not implmenting this APIs made little sense.
With this patch spdk_governor_capabilities is brought in
line with rte_power_core_capabilities.

Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I85296fce2999cb41957162b63ee13d86a0be919f
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8787


Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent ae74e70e

include/spdk_internal/event.h

+0 −7
Original line number Diff line number Diff line
@@ -164,13 +164,6 @@ int spdk_reactor_set_interrupt_mode(uint32_t lcore, bool new_in_interrupt, 
struct spdk_thread *_spdk_get_app_thread(void);



struct spdk_governor_capabilities {

	bool freq_change;

	bool freq_getset;

	bool freq_up;

	bool freq_down;

	bool freq_max;

	bool freq_min;

	bool turbo_set;

	bool turbo_available;

	bool priority;

};

lib/event/app_rpc.c

+4 −8
Original line number Diff line number Diff line
@@ -388,7 +388,6 @@ _rpc_framework_get_reactors(void *arg1, void *arg2) 
	struct spdk_thread *thread;

	struct spdk_cpuset tmp_mask = {};

	struct spdk_governor *governor;

	struct spdk_governor_capabilities capabilities;



	current_core = spdk_env_get_current_core();

	reactor = spdk_reactor_get(current_core);
@@ -401,14 +400,11 @@ _rpc_framework_get_reactors(void *arg1, void *arg2) 
	spdk_json_write_named_uint64(ctx->w, "idle", reactor->idle_tsc);

	governor = _spdk_governor_get();

	/* We need to check whether governor can return current core frequency. */

	if (governor->get_core_capabilities && governor->get_core_freqs) {

		governor->get_core_capabilities(current_core, &capabilities);

		if (capabilities.freq_getset) {

	if (governor->get_core_curr_freq != NULL) {

		/* Governor returns core freqs in kHz, we want MHz. */

		curr_core_freq = governor->get_core_curr_freq(current_core) / 1000;

		spdk_json_write_named_uint32(ctx->w, "core_freq", curr_core_freq);

	}

	}



	spdk_json_write_named_array_begin(ctx->w, "lw_threads");

	TAILQ_FOREACH(lw_thread, &reactor->threads, link) {

lib/event/dpdk_governor.c

+0 −7
Original line number Diff line number Diff line
@@ -131,13 +131,6 @@ _get_core_capabilities(uint32_t lcore_id, struct spdk_governor_capabilities *cap 


	capabilities->turbo_available = caps.turbo == 0 ? false : true;

	capabilities->priority = caps.priority == 0 ? false : true;

	capabilities->freq_change = true;

	capabilities->freq_getset = true;

	capabilities->freq_up = true;

	capabilities->freq_down = true;

	capabilities->freq_max = true;

	capabilities->freq_min = true;

	capabilities->turbo_set = true;



	return 0;

}

lib/event/gscheduler.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ balance(struct spdk_scheduler_core_info *cores, int core_count, struct spdk_gove 
			return;

		}



		turbo_available = (capabilities.turbo_available && capabilities.turbo_set) ? true : false;

		turbo_available = (capabilities.turbo_available) ? true : false;



		if (core->total_busy_tsc < (core->total_idle_tsc / 1000)) {

			rc = governor->set_core_freq_min(core->lcore);

lib/event/reactor.c

+0 −7
Original line number Diff line number Diff line
@@ -1475,13 +1475,6 @@ reactor_interrupt_fini(struct spdk_reactor *reactor) 
static int

_governor_get_capabilities(uint32_t lcore_id, struct spdk_governor_capabilities *capabilities)

{

	capabilities->freq_change = false;

	capabilities->freq_getset = false;

	capabilities->freq_up = false;

	capabilities->freq_down = false;

	capabilities->freq_max = false;

	capabilities->freq_min = false;

	capabilities->turbo_set = false;

	capabilities->priority = false;

	capabilities->turbo_available = false;