Sched-tools

sched-tools@lists.linaro.org

94 discussions

by Dropbox

안녕하세요, Lim Geunsik(geunsik.lim(a)gmail.xn--com)-om0qi30h Dropbox를 추천했습니다. Dropbox를 사용하면 문서, 사진 및 동영상에 편리하게 액세스하고 동료 및 친구와 무료로 편리하게 공유할 수 있습니다. 동료 및 친구가 Dropbox 계정이 없어도 괜찮습니다. 초대를 수락하세요. 이 이메일을 통해 Dropbox를 시작하면 2GB의 무료 용량에 더해 500MB가 추가로 제공됩니다. Dropbox를 즐기세요! [1]: https://www.dropbox.com/l/AAAUIYXbb3I1Aht4afy07pdKionrn0IE7ac

4 years

[PATCH] rt-app: Add support for SCHED_IDLE policy

by Viresh Kumar

This adds support for SCHED_IDLE scheduling policy. This locally defines SCHED_IDLE macro, which is incorrect but build was failing without it and I am not sure how to fix that. The arch specific sched.h headers (like /usr/include/aarch64-linux-gnu/bits/sched.h) define them only if __USE_GNU is defined. Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- doc/tutorial.txt | 1 + src/rt-app.c | 23 +++++++++++++---------- src/rt-app_parse_config.c | 2 +- src/rt-app_types.h | 4 ++++ src/rt-app_utils.c | 4 ++++ 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/doc/tutorial.txt b/doc/tutorial.txt index d304b19c25c4..cc9229c954a1 100644 --- a/doc/tutorial.txt +++ b/doc/tutorial.txt @@ -193,6 +193,7 @@ otherwise the scheduling paraleters will stay unchanged * policy : String. Define the scheduling policy of the thread. default_policy is used if not defined. Accepted value are: - "SCHED_OTHER" + - "SCHED_IDLE" - "SCHED_RR" - "SCHED_FIFO" - "SCHED_DEADLINE" diff --git a/src/rt-app.c b/src/rt-app.c index ecbb47601a3d..dabdf1f86daa 100644 --- a/src/rt-app.c +++ b/src/rt-app.c @@ -668,11 +668,12 @@ static void set_thread_priority(thread_data_t *data, sched_data_t *sched_data) break; case other: + case idle: log_debug("[%d] setting scheduler %s priority %d", data->ind, policy_to_string(sched_data->policy), sched_data->prio); - if (sched_data->prio > 19 || sched_data->prio < -20) { + if ((sched_data->policy == other) && (sched_data->prio > 19 || sched_data->prio < -20)) { log_critical("[%d] setpriority " "%d nice invalid. " "Valid between -20 and 19", @@ -695,15 +696,17 @@ static void set_thread_priority(thread_data_t *data, sched_data_t *sched_data) } } - /* Set nice priority */ - ret = setpriority(PRIO_PROCESS, 0, - sched_data->prio); - if (ret != 0) { - log_critical("[%d] setpriority " - "returned %d", data->ind, ret); - errno = ret; - perror("setpriority"); - exit(EXIT_FAILURE); + if (sched_data->policy == other) { + /* Set nice priority */ + ret = setpriority(PRIO_PROCESS, 0, + sched_data->prio); + if (ret != 0) { + log_critical("[%d] setpriority " + "returned %d", data->ind, ret); + errno = ret; + perror("setpriority"); + exit(EXIT_FAILURE); + } } data->lock_pages = 0; /* forced off for SCHED_OTHER */ diff --git a/src/rt-app_parse_config.c b/src/rt-app_parse_config.c index 8fef549c8998..dcee590dea1f 100644 --- a/src/rt-app_parse_config.c +++ b/src/rt-app_parse_config.c @@ -713,7 +713,7 @@ static sched_data_t *parse_sched_data(struct json_object *obj, int def_policy) /* Get priority */ if (tmp_data.policy == -1) prior_def = -1; - else if (tmp_data.policy == other) + else if (tmp_data.policy == other || tmp_data.policy == idle) prior_def = DEFAULT_THREAD_NICE; else prior_def = DEFAULT_THREAD_PRIORITY; diff --git a/src/rt-app_types.h b/src/rt-app_types.h index 35fef9dd4f8c..e7741aa23ec8 100644 --- a/src/rt-app_types.h +++ b/src/rt-app_types.h @@ -42,9 +42,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define EXIT_INV_CONFIG 2 #define EXIT_INV_COMMANDLINE 3 +/* It is not available in headers without defining __USE_GNU macro */ +#define SCHED_IDLE 5 + typedef enum policy_t { other = SCHED_OTHER, + idle = SCHED_IDLE, rr = SCHED_RR, fifo = SCHED_FIFO #ifdef DLSCHED diff --git a/src/rt-app_utils.c b/src/rt-app_utils.c index 4076ce0b9636..7f16203f7a1d 100644 --- a/src/rt-app_utils.c +++ b/src/rt-app_utils.c @@ -175,6 +175,8 @@ string_to_policy(const char *policy_name, policy_t *policy) { if (strcmp(policy_name, "SCHED_OTHER") == 0) *policy = other; + else if (strcmp(policy_name, "SCHED_IDLE") == 0) + *policy = idle; else if (strcmp(policy_name, "SCHED_RR") == 0) *policy = rr; else if (strcmp(policy_name, "SCHED_FIFO") == 0) @@ -194,6 +196,8 @@ policy_to_string(policy_t policy) switch (policy) { case other: return "SCHED_OTHER"; + case idle: + return "SCHED_IDLE"; case rr: return "SCHED_RR"; case fifo: -- 2.19.1.568.g152ad8e3369a

5 years, 5 months

[PATCH] Add taskgroup support for SCHED_OTHER tasks

by Dietmar Eggemann

The implementation is based on libcgroup. It can be optionally configured by specifying --with-cgroup. Building instruction and an example are given in doc/tutorial.txt. Tested on x86_64 and arm64. Known issue: The build shows some warnings that some of the functions in libcgroup.a (e.g. cgroup_change_cgroup_flags()) are calling functions (e.g. getgrgid()) which require at run-time the same version of shared libraries from the glibc version used for linking. Signed-off-by: Dietmar Eggemann <dietmar.eggemann(a)arm.com> --- configure.ac | 17 +++ doc/tutorial.txt | 50 +++++++- src/Makefile.am | 2 +- src/rt-app.c | 284 +++++++++++++++++++++++++++++++++++++++++++++- src/rt-app.h | 4 + src/rt-app_parse_config.c | 39 ++++++- src/rt-app_types.h | 23 ++++ 7 files changed, 407 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 27b4311d04df..8b122b37f796 100644 --- a/configure.ac +++ b/configure.ac @@ -18,6 +18,23 @@ AC_CHECK_LIB([rt], [clock_gettime]) AC_CHECK_LIB([json-c], [json_object_from_file], [], [AC_MSG_ERROR([json-c libraries required])]) AC_CHECK_FUNCS(sched_setattr, [], []) +AC_ARG_WITH([cgroup], + [AS_HELP_STRING([--with-cgroup], + [Add support for cpu cgroups])], + [], + [with_cgroup=no]) + +LIBCGROUP= +AS_IF([test "x$with_cgroup" != xno], + AC_CHECK_LIB([cgroup], [cgroup_init], + [AC_SUBST([LIBCGROUP], ["-lcgroup"]) + AC_DEFINE([HAVE_LIBCGROUP], [1], [Define if you have CGroup support]) + ], + [AC_MSG_FAILURE([libcgroup test failed (use --without-cgroup to disable or install cgroup)])], + [-lcgroup] + ) + ) + AC_ARG_WITH([deadline], [AS_HELP_STRING([--with-deadline], [Add support for SCHED_DEADLINE])], diff --git a/doc/tutorial.txt b/doc/tutorial.txt index d65a8435d0c9..6595ea87e0f1 100644 --- a/doc/tutorial.txt +++ b/doc/tutorial.txt @@ -36,11 +36,29 @@ export ac_cv_func_realloc_0_nonnull=yes ./configure --host=aarch64-linux-gnu --disable-shared --enable-static make +For libcgroup: (tested with v0.41) + +./git clone https://github.com/matsumoto-r/libcgroup.git + +export ac_cv_func_malloc_0_nonnull=yes +export ac_cv_func_realloc_0_nonnull=yes +autoreconf -v --install +./configure --host=aarch64-linux-gnu --disable-shared --enable-static --disable-pam --disable-daemon --disable-tools +make + For rt-app: export ac_cv_lib_json_c_json_object_from_file=yes ./autogen.sh -./configure --host=aarch64-linux-gnu LDFLAGS=" --static -L<path to parent of json repo>/json-c/." CFLAGS="-I<path to parent of json repo>" --with-deadline + +w/o cgroup support: + +./configure --host=aarch64-linux-gnu LDFLAGS="--static -L<path to parent of json repo>/json-c/." CFLAGS="-I<path to parent of json repo>" --with-deadline + +w/ cgroup support: + +./configure --host=aarch64-linux-gnu LDFLAGS="--static -L<path to parent of json repo>/json-c/. -L<path to parent of libcgroup repo>/src/.libs" CFLAGS="-I<path to parent of libcgroup repo>/include --I<path to parent of json repo>" --with-deadline --with-cgroup + make e.g, with a directory structure like the following: @@ -304,6 +322,36 @@ affinity to CPU 2, and the third phase with affinity to CPU 4, 5, and 6 (it will } } +* cgroups: String. Can be specified at task level or phase level. Only the cpu +cgroup controller is supported so a cgroup is equal to a task group. The +example below sets up a task 'thread1' with three phases. The task will run in +taskgroup '/tg1/tg11' in the phase1, in '/tg1' in phase2 and in '/' (root +task group) in phase3. Phase 2 does not specify a cgroup so the phase will +inherit from the task. Currently only SCHED_OTHER tasks are supported. + +"task" : { + "thread1" : { + "policy": "SCHED_OTHER", + "cgroup": "/tg1", + "phases" : { + "phase1" : { + "cgroup": "/tg1/tg11", + "run" : 10, + "sleep" : 10 + }, + "phase2" : { + "run" : 10, + "sleep" : 10 + }, + "phase3" : { + "cgroup": "/", + "run" : 10, + "sleep" : 10 + } + } + } +} + *** events *** events are simple action that will be performed by the thread or on the diff --git a/src/Makefile.am b/src/Makefile.am index 1fe362d1ab4e..0afd24a8d2ec 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ AM_CPPFLAGS = -I$(srcdir)/../libdl/ bin_PROGRAMS = rt-app rt_app_SOURCES= rt-app_types.h rt-app_args.h rt-app_utils.h rt-app_utils.c rt-app_args.c rt-app.h rt-app.c rt_app_SOURCES += rt-app_parse_config.h rt-app_parse_config.c -rt_app_LDADD = $(QRESLIB) +rt_app_LDADD = $(QRESLIB) $(LIBCGROUP) if SET_DLSCHED rt_app_LDADD += ../libdl/libdl.a endif diff --git a/src/rt-app.c b/src/rt-app.c index f3d231722a35..43654620da74 100644 --- a/src/rt-app.c +++ b/src/rt-app.c @@ -37,6 +37,50 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "rt-app_utils.h" #include "rt-app_args.h" +#ifdef HAVE_LIBCGROUP +/* + * Save and restore the following rt-app defines from src/config.h. libcgroup + * defines its own set and its public header libcgroup.h includes libcgroup's + * config.h. + */ +#define _VERSION VERSION +#define _PACKAGE PACKAGE +#define _PACKAGE_NAME PACKAGE_NAME +#define _PACKAGE_VERSION PACKAGE_VERSION +#define _PACKAGE_TARNAME PACKAGE_TARNAME +#define _PACKAGE_STRING PACKAGE_STRING +#define _PACKAGE_BUGREPORT PACKAGE_BUGREPORT +#undef VERSION +#undef PACKAGE +#undef PACKAGE_NAME +#undef PACKAGE_VERSION +#undef PACKAGE_TARNAME +#undef PACKAGE_STRING +#undef PACKAGE_BUGREPORT +#include <libcgroup.h> +#undef VERSION +#undef PACKAGE +#undef PACKAGE_NAME +#undef PACKAGE_VERSION +#undef PACKAGE_TARNAME +#undef PACKAGE_STRING +#undef PACKAGE_BUGREPORT +#define VERSION _VERSION +#define PACKAGE _PACKAGE +#define PACKAGE_NAME _PACKAGE_NAME +#define PACKAGE_VERSION _PACKAGE_VERSION +#define PACKAGE_TARNAME _PACKAGE_TARNAME +#define PACKAGE_STRING _PACKAGE_STRING +#define PACKAGE_BUGREPORT _PACKAGE_BUGREPORT +#undef _VERSION +#undef _PACKAGE +#undef _PACKAGE_NAME +#undef _PACKAGE_VERSION +#undef _PACKAGE_TARNAME +#undef _PACKAGE_STRING +#undef _PACKAGE_BUGREPORT +#endif + static int errno; static volatile sig_atomic_t continue_running; static pthread_t *threads; @@ -539,6 +583,226 @@ static void create_cpuset_str(cpuset_data_t *cpu_data) strncat(cpu_data->cpuset_str, " ]", size_needed - idx - 1); } +#ifdef HAVE_LIBCGROUP +static void add_cgroup(rtapp_options_t *opts, const char *name) +{ + cgroup_t *cgroup, *new; + + new = malloc(sizeof *cgroup); + + if (!new) { + log_error("Cannot allocate cgroup"); + exit(EXIT_FAILURE); + } + + strcpy(new->name, name); + + if (TAILQ_EMPTY(&opts->head)) { + TAILQ_INSERT_HEAD(&opts->head, new, cgroups); + } else { + TAILQ_FOREACH(cgroup, &opts->head, cgroups) { + int n = strcmp(new->name, cgroup->name); + + if (n < 0) { + TAILQ_INSERT_BEFORE(cgroup, new, cgroups); + return; + } + + /* Do not add cgroup twice */ + if (!n) + return; + } + TAILQ_INSERT_TAIL(&opts->head, new, cgroups); + } +} + +void split_cgroup_data(rtapp_options_t *opts, char *name) +{ + char *tmp, *p = name; + + if (!strcmp(name, ROOT_CGROUP)) { + log_notice("Cannot split root cgroup, continue ..."); + return; + } + + if (strlen(p) >= PATH_LENGTH) { + log_error("Cgroup path length %lu not supported", strlen(p)); + exit(EXIT_FAILURE); + } + + tmp = malloc(PATH_LENGTH); + + if (!tmp) { + log_error("Cannot allocate tmp buffer"); + exit(EXIT_FAILURE); + } + + strcpy(tmp, p); + + /* remove trailing slash */ + p = &tmp[strlen(tmp)-1]; + + if (*p == '/') { *p = '\0'; } + + for (p = tmp; p;) { + p = strchr(p, '/'); + + if (p) { *p = '\0'; } + + if (strlen(tmp)) + add_cgroup(opts, tmp); + + if (p) { *p++ = '/'; } + } + + free(tmp); +} + +static void create_cgroup(cgroup_t *cgroup) +{ + struct cgroup *group; + struct cgroup_controller *controller; + int res; + + if (!strcmp(cgroup->name, ROOT_CGROUP)) + return; + + log_notice("Create cgroup [%s]", cgroup->name); + + group = cgroup_new_cgroup(cgroup->name); + + if (!group) { + log_critical("Cannot add new cgroup [%s] (libcgroup error: %s)", + cgroup->name, cgroup_strerror(ECGFAIL)); + exit(EXIT_FAILURE); + } + + controller = cgroup_add_controller(group, "cpu"); + + if (!controller) { + log_critical("Cannot add cpu controller to cgroup [%s]", cgroup->name); + exit(EXIT_FAILURE); + } + + res = cgroup_create_cgroup(group, 1); + + if (res) { + log_critical("Cannot create cgroup [%s] (libcgroup error: %s)", + cgroup->name, cgroup_strerror(res)); + exit(EXIT_FAILURE); + } + + cgroup->obj = group; +} + +static void create_cgroups(rtapp_options_t *opts) +{ + cgroup_t *cgroup; + + TAILQ_FOREACH(cgroup, &opts->head, cgroups) { + create_cgroup(cgroup); + } +} + +static void destroy_cgroup(cgroup_t *cgroup) +{ + int res; + + if (!strcmp(cgroup->name, ROOT_CGROUP)) + return; + + log_notice("Destroy cgroup [%s]", cgroup->name); + + res = cgroup_delete_cgroup(cgroup->obj, CGFLAG_DELETE_IGNORE_MIGRATION); + + if (res) { + log_notice("Cannot destroy cgroup (libcgroup error: %s), continue ...", + cgroup_strerror(res)); + return; + } + + cgroup_free(&cgroup->obj); +} + +static void destroy_cgroups(rtapp_options_t *opts) +{ + cgroup_t *cgroup; + + while ((cgroup = TAILQ_LAST(&opts->head, cgrouplist))) { + destroy_cgroup(cgroup); + TAILQ_REMOVE(&opts->head, cgroup, cgroups); + free(cgroup); + } +} + +cgroup_t* find_cgroup(rtapp_options_t *opts, char *name) +{ + cgroup_t *cgroup = NULL, *tmp; + + TAILQ_FOREACH(tmp, &opts->head, cgroups) { + if (!strcmp(tmp->name, name)) { + cgroup = tmp; + break; + } + } + + return cgroup; +} + +static void set_cgroup(cgroup_t *cgroup) +{ + int res; + + log_info("Set cgroup [%s]", cgroup->name); + + res = cgroup_attach_task(cgroup->obj); + + if (res) { + log_critical("Cannot attach task to cgroup [%s] (libcgroup error: %s)", + cgroup->name, cgroup_strerror(res)); + exit(EXIT_FAILURE); + } +} + +static void preinit_cgroup(void) +{ + /* Elements are already added during cmd line parsing */ + TAILQ_INIT(&opts.head); + + add_cgroup(&opts, ROOT_CGROUP); +} + +static void init_cgroup(void) +{ + int res; + char *mount; + + res = cgroup_init(); + + if (res) { + log_error("Cannot initialize cgroup library (libcgroup error: %s)", + cgroup_strerror(res)); + exit(EXIT_FAILURE); + } + + res = cgroup_get_subsys_mount_point("cpu", &mount); + + if (res) { + log_error("Cannot get 'cpu' cgroup controller's moint point (libcgroup error: %s)", + cgroup_strerror(res)); + exit(EXIT_FAILURE); + } + + create_cgroups(&opts); +} + +#else /* HAVE_LIBCGROUP */ +static void preinit_cgroup(void) {} +static void init_cgroup(void) {} +static void set_cgroup(void *cgroup) {} +static void destroy_cgroups(rtapp_options_t *opts) {} +#endif /* HAVE_LIBCGROUP */ + static void set_thread_affinity(thread_data_t *data, cpuset_data_t *cpu_data) { int ret; @@ -807,6 +1071,8 @@ void *thread_body(void *arg) set_thread_affinity(data, &pdata->cpu_data); set_thread_priority(data, pdata->sched_data); + set_cgroup(GET_CGROUP(pdata)); + if (opts.ftrace) log_ftrace(ft_data.marker_fd, "[%d] begins thread_loop %d phase %d phase_loop %d", @@ -917,6 +1183,9 @@ int main(int argc, char* argv[]) rtapp_resource_t *rdata; char tmp[PATH_LENGTH]; static cpu_set_t orig_set; + int status = EXIT_SUCCESS; + + preinit_cgroup(); parse_command_line(argc, argv, &opts); @@ -1109,6 +1378,8 @@ int main(int argc, char* argv[]) /* Sync timer resources with start time */ clock_gettime(CLOCK_MONOTONIC, &t_start); + init_cgroup(); + /* Start the use case */ for (i = 0; i < nthreads; i++) { tdata = &opts.threads_data[i]; @@ -1116,8 +1387,10 @@ int main(int argc, char* argv[]) if (pthread_create(&threads[i], NULL, thread_body, - (void*) tdata)) - goto exit_err; + (void*) tdata)) { + status = EXIT_FAILURE; + goto out; + } } running_threads = nthreads; @@ -1136,9 +1409,8 @@ int main(int argc, char* argv[]) log_ftrace(ft_data.marker_fd, "main ends\n"); close(ft_data.marker_fd); } - exit(EXIT_SUCCESS); - +out: + destroy_cgroups(&opts); -exit_err: - exit(EXIT_FAILURE); + exit(status); } diff --git a/src/rt-app.h b/src/rt-app.h index 85eccb1fb716..72df4be25e50 100644 --- a/src/rt-app.h +++ b/src/rt-app.h @@ -23,6 +23,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define _RT_APP_H_ void *thread_body(void *arg); +#ifdef HAVE_LIBCGROUP +void split_cgroup_data(rtapp_options_t *opts, char *name); +cgroup_t* find_cgroup(rtapp_options_t *opts, char *name); +#endif #endif /* _RT_APP_H_ */ diff --git a/src/rt-app_parse_config.c b/src/rt-app_parse_config.c index 25c3f1bfcc94..497d8ad66fe0 100644 --- a/src/rt-app_parse_config.c +++ b/src/rt-app_parse_config.c @@ -29,6 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "rt-app_utils.h" #include "rt-app_parse_config.h" +#include "rt-app.h" #define PFX "[json] " #define PFL " "PFX @@ -160,6 +161,7 @@ get_string_value_from(struct json_object *where, { struct json_object *value; char *s_value; + value = get_in_object(where, key, have_def); set_default_if_needed_str(key, value, have_def, def_value); if (json_object_is_type(value, json_type_null)) { @@ -751,9 +753,35 @@ static sched_data_t *parse_sched_data(struct json_object *obj, int def_policy) return NULL; } +#ifdef HAVE_LIBCGROUP +static void +parse_cgroup_data(struct json_object *obj, phase_data_t *pdata, thread_data_t *tdata, rtapp_options_t *opts, cgroup_t **cgroup) +{ + char *name = get_string_value_from(obj, "cgroup", TRUE, ""); + sched_data_t *sched_data = pdata ? pdata->sched_data : tdata->sched_data; + + if (sched_data && (sched_data->policy != other)) { + log_critical(PIN2 "No cgroup support for policy %s", policy_to_string(sched_data->policy)); + exit(EXIT_INV_CONFIG); + } + + if (strlen(name)) { + if (strcmp(name, ROOT_CGROUP)) + split_cgroup_data(opts, name); + } else { + name = pdata ? tdata->cgroup->name : ROOT_CGROUP; + } + + *cgroup = find_cgroup(opts, name); +} +#else +static void +parse_cgroup_data(struct json_object *obj, phase_data_t *pdata, thread_data_t *tdata, rtapp_options_t *opts, void **cgroup) {} +#endif + static void -parse_thread_phase_data(struct json_object *obj, - phase_data_t *data, rtapp_options_t *opts, long tag) +parse_thread_phase_data(struct json_object *obj, phase_data_t *data, thread_data_t *tdata, + rtapp_options_t *opts, long tag) { /* used in the foreach macro */ struct lh_entry *entry; char *key; struct json_object *val; int idx; @@ -787,6 +815,7 @@ parse_thread_phase_data(struct json_object *obj, parse_cpuset_data(obj, &data->cpu_data); data->sched_data = parse_sched_data(obj, -1); + parse_cgroup_data(obj, data, tdata, opts, GET_CGROUP(&data)); } static void @@ -816,6 +845,8 @@ parse_thread_data(char *name, struct json_object *obj, int index, /* Scheduling policy */ data->sched_data = parse_sched_data(obj, opts->policy); + parse_cgroup_data(obj, NULL, data, opts, GET_CGROUP(&data)); + /* initial delay */ data->delay = get_int_value_from(obj, "delay", TRUE, 0); @@ -839,7 +870,7 @@ parse_thread_data(char *name, struct json_object *obj, int index, foreach(phases_obj, entry, key, val, idx) { log_info(PIN "Parsing phase %s", key); assure_type_is(val, phases_obj, key, json_type_object); - parse_thread_phase_data(val, &data->phases[idx], opts, (long)data); + parse_thread_phase_data(val, &data->phases[idx], data, opts, (long)data); } /* Get loop number */ @@ -848,7 +879,7 @@ parse_thread_data(char *name, struct json_object *obj, int index, } else { data->nphases = 1; data->phases = malloc(sizeof(phase_data_t) * data->nphases); - parse_thread_phase_data(obj, &data->phases[0], opts, (long)data); + parse_thread_phase_data(obj, &data->phases[0], data, opts, (long)data); /* There is no "phases" object which means that thread and phase will * use same scheduling parameters. But thread object looks for default diff --git a/src/rt-app_types.h b/src/rt-app_types.h index 7e0686b03db7..900ee3bc7cb7 100644 --- a/src/rt-app_types.h +++ b/src/rt-app_types.h @@ -26,6 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "config.h" #include "dl_syscalls.h" +#include <sys/queue.h> #define RTAPP_POLICY_DESCR_LENGTH 16 #define RTAPP_RESOURCE_DESCR_LENGTH 16 @@ -134,6 +135,18 @@ typedef struct _rtapp_resource_t { char *name; } rtapp_resource_t; +#ifdef HAVE_LIBCGROUP +typedef struct _cgroup_t { + char name[PATH_LENGTH]; + struct cgroup *obj; + TAILQ_ENTRY(_cgroup_t) cgroups; +} cgroup_t; +#define ROOT_CGROUP "/" +#define GET_CGROUP(p) (p->cgroup) +#else +#define GET_CGROUP(p) (NULL) +#endif + typedef struct _event_data_t { resource_t type; int res; @@ -163,6 +176,9 @@ typedef struct _phase_data_t { int sched_prio; cpuset_data_t cpu_data; sched_data_t *sched_data; +#ifdef HAVE_LIBCGROUP + cgroup_t *cgroup; +#endif } phase_data_t; typedef struct _thread_data_t { @@ -188,6 +204,9 @@ typedef struct _thread_data_t { FILE *log_handler; unsigned long delay; +#ifdef HAVE_LIBCGROUP + cgroup_t *cgroup; +#endif } thread_data_t; typedef struct _ftrace_data_t { @@ -231,6 +250,10 @@ typedef struct _rtapp_options_t { char *io_device; int cumulative_slack; + +#ifdef HAVE_LIBCGROUP + TAILQ_HEAD(cgrouplist ,_cgroup_t) head; +#endif } rtapp_options_t; typedef struct _timing_point_t { -- 2.11.0

6 years, 7 months

rt-app: add per phase priority

by Vincent Guittot

Hi All, I have sent a pull request for adding per phase priority on github: https://github.com/scheduler-tools/rt-app/pull/29 I have enable this while testing some proposed changes in runnable_load_avg propagation If you are interested by the feature , feel free to review and comment it Regards, Vincent

6 years, 9 months

rt-app: enhancing debug prints

by Juri Lelli

Hi, I've been using Chris' "Enhancing debug prints" PR a lot lately. So, I think it would be good to mainline his changes. Talking with Chris he was fine with me posting his patches again (adding some modifications on top). Discussion is now happening at https://github.com/scheduler-tools/rt-app/pull/32 Comments/feedback more than appreciated. Best, - Juri

6 years, 9 months

[PATCH v4] rtapp: Add broader support for specifying cpusets

by Stephen Boyd

From: Olav Haugan <ohaugan(a)codeaurora.org> Allow setting of cpusets at all levels of the spec. Signed-off-by: Olav Haugan <ohaugan(a)codeaurora.org> Tested-by: Dietmar Eggemann <dietmar.eggemann(a)arm.com> Reviewed-by: Dietmar Eggemann <dietmar.eggemann(a)arm.com> Tested-by: Viresh Kumar <viresh.kumar(a)linaro.org> Acked-by: Juri Lelli <juri.lelli(a)arm.com> Signed-off-by: Stephen Boyd <stephen.boyd(a)linaro.org> --- v4: -Rebased -Renamed example7.json to example8.json -Addressed comment formatting -Added check for # of cpus specified with bailout -Minor changes to example json v3: -Rebased -Removed unused cpuset and locks variable -Removed include unistd.h v2 changes: -Added documentation and example json -Clarified comments -Added check for invalid CPU -Reduced logging level for affinity setting message -Code fixes based on feedback doc/examples/tutorial/example8.json | 40 ++++++++++++ doc/tutorial.txt | 37 +++++++++++ src/rt-app.c | 126 ++++++++++++++++++++++++++++++++---- src/rt-app_parse_config.c | 64 ++++++++++++------ src/rt-app_types.h | 12 +++- 5 files changed, 243 insertions(+), 36 deletions(-) create mode 100644 doc/examples/tutorial/example8.json diff --git a/doc/examples/tutorial/example8.json b/doc/examples/tutorial/example8.json new file mode 100644 index 000000000000..9ffc594b4f47 --- /dev/null +++ b/doc/examples/tutorial/example8.json @@ -0,0 +1,40 @@ +{ + /* + * Simple use case which creates a thread with 3 phases each running for + * 1.5ms. In phase 1 the thread will be affined to CPU 0, in phase 2 it + * will be affined to CPU 1 and in the third phase it will be affined to + * CPUs 2 (inherit from "cpus" at task level). + */ + "tasks" : { + "thread0" : { + "cpus" : [2], + "phases" : { + "phase1" : { + "cpus" : [0], + "loop" : 1, + "run" : 1500 + }, + "phase2" : { + "cpus" : [1], + "loop" : 1, + "run" : 1500 + }, + "phase3" : { + "loop" : 1, + "run" : 1500 + } + } + } + }, + "global" : { + "duration" : 2, + "calibration" : "CPU0", + "default_policy" : "SCHED_OTHER", + "pi_enabled" : false, + "lock_pages" : false, + "logdir" : "./", + "log_basename" : "rt-app1", + "ftrace" : true, + "gnuplot" : true + } +} diff --git a/doc/tutorial.txt b/doc/tutorial.txt index 3af2c57b2844..36d79ffe0d15 100644 --- a/doc/tutorial.txt +++ b/doc/tutorial.txt @@ -232,6 +232,43 @@ below are equals: } } +"cpus" can be specified at task level or phase level. As an example, below +creates two threads. One thread will run with affinity of CPU 2 and 3. The +second task will run first phase with affinity to CPU 0 and 1, second phase with +affinity to CPU 2, and the third phase with affinity to CPU 4, 5, and 6 (it will +inherit the affinity from the task level): + +"task" : { + "thread1" : { + "cpus" : [2,3], + "phases" : { + "phase1" : { + "run" : 10, + "sleep" : 10 + } + } + } + "thread2" : { + "cpus" : [4,5,6], + "phases" : { + "phase1" : { + "cpus" : [0,1], + "run" : 10, + "sleep" : 10 + } + "phase2" : { + "cpus" : [2], + "run" : 10, + "sleep" : 10 + } + "phase3" : { + "run" : 10, + "sleep" : 10 + } + } + } +} + * loop: Integer. Define the number of times the parent object must be run. The parent object can be a phase or a thread. For phase object, the loop defines the number of time the phase will be executed before starting the next diff --git a/src/rt-app.c b/src/rt-app.c index ec9710cfcc3f..981ed6f244c8 100644 --- a/src/rt-app.c +++ b/src/rt-app.c @@ -474,6 +474,116 @@ shutdown(int sig) exit(EXIT_SUCCESS); } +static void create_cpuset_str(cpuset_data_t *cpu_data) +{ + unsigned int cpu_count = CPU_COUNT_S(cpu_data->cpusetsize, + cpu_data->cpuset); + unsigned int i; + unsigned int idx = 0; + + /* + * Assume we can go up to 9999 cpus. Each cpu would take up to 4 + 2 + * bytes (4 for the number and 2 for the comma and space). 2 bytes + * for beginning bracket + space and 2 bytes for end bracket and space + * and finally null-terminator. + */ + unsigned int size_needed = cpu_count * 6 + 2 + 2 + 1; + + if (cpu_count > 9999) { + log_error("Too many cpus specified. Up to 9999 cpus supported"); + exit(EXIT_FAILURE); + } + + cpu_data->cpuset_str = malloc(size_needed); + strcpy(cpu_data->cpuset_str, "[ "); + idx += 2; + + for (i = 0; i < 10000 && cpu_count; ++i) { + unsigned int n; + + if (CPU_ISSET(i, cpu_data->cpuset)) { + --cpu_count; + if (size_needed <= (idx + 1)) { + log_error("Not enough memory for array"); + exit(EXIT_FAILURE); + } + n = snprintf(&cpu_data->cpuset_str[idx], + size_needed - idx - 1, "%d", i); + if (n > 0) { + idx += n; + } else { + log_error("Error creating array"); + exit(EXIT_FAILURE); + } + if (size_needed <= (idx + 1)) { + log_error("Not enough memory for array"); + exit(EXIT_FAILURE); + } + if (cpu_count) { + strncat(cpu_data->cpuset_str, ", ", + size_needed - idx - 1); + idx += 2; + } + } + } + strncat(cpu_data->cpuset_str, " ]", size_needed - idx - 1); +} + +static void set_thread_affinity(thread_data_t *data, cpuset_data_t *cpu_data) +{ + int ret; + cpuset_data_t *actual_cpu_data = &data->cpu_data; + + if (data->def_cpu_data.cpuset == NULL) { + /* Get default affinity */ + cpu_set_t cpuset; + unsigned int cpu_count; + unsigned int cpu = 0; + + ret = pthread_getaffinity_np(pthread_self(), + sizeof(cpu_set_t), &cpuset); + if (ret != 0) { + errno = ret; + perror("pthread_get_affinity"); + exit(EXIT_FAILURE); + } + cpu_count = CPU_COUNT(&cpuset); + data->def_cpu_data.cpusetsize = CPU_ALLOC_SIZE(cpu_count); + data->def_cpu_data.cpuset = CPU_ALLOC(cpu_count); + memcpy(data->def_cpu_data.cpuset, &cpuset, + data->def_cpu_data.cpusetsize); + create_cpuset_str(&data->def_cpu_data); + data->curr_cpu_data = &data->def_cpu_data; + } + + /* + * Order of preference: + * 1. Phase cpuset + * 2. Task level cpuset + * 3. Default cpuset + */ + if (cpu_data->cpuset != NULL) + actual_cpu_data = cpu_data; + + if (actual_cpu_data->cpuset == NULL) + actual_cpu_data = &data->def_cpu_data; + + if (!CPU_EQUAL(actual_cpu_data->cpuset, data->curr_cpu_data->cpuset)) + { + log_debug("[%d] setting cpu affinity to CPU(s) %s", data->ind, + actual_cpu_data->cpuset_str); + ret = pthread_setaffinity_np(pthread_self(), + actual_cpu_data->cpusetsize, + actual_cpu_data->cpuset); + if (ret != 0) { + errno = ret; + perror("pthread_setaffinity_np"); + exit(EXIT_FAILURE); + } + data->curr_cpu_data = actual_cpu_data; + } +} + void *thread_body(void *arg) { thread_data_t *data = (thread_data_t*) arg; @@ -501,20 +611,6 @@ void *thread_body(void *arg) /* Get the 1st phase's data */ pdata = &data->phases[0]; - /* Set thread affinity */ - if (data->cpuset != NULL) - { - log_notice("[%d] setting cpu affinity to CPU(s) %s", data->ind, - data->cpuset_str); - ret = pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), - data->cpuset); - if (ret < 0) { - errno = ret; - perror("pthread_setaffinity_np"); - exit(EXIT_FAILURE); - } - } - /* Set scheduling policy and print pretty info on stdout */ log_notice("[%d] Using %s policy with priority %d", data->ind, data->sched_policy_descr, data->sched_prio); switch (data->sched_policy) @@ -662,6 +758,8 @@ void *thread_body(void *arg) while (continue_running && (i != data->loop)) { struct timespec t_diff, t_rel_start; + set_thread_affinity(data, &pdata->cpu_data); + if (opts.ftrace) log_ftrace(ft_data.marker_fd, "[%d] begins loop %d phase %d step %d", data->ind, i, j, loop); log_debug("[%d] begins loop %d phase %d step %d", data->ind, i, j, loop);; diff --git a/src/rt-app_parse_config.c b/src/rt-app_parse_config.c index bdb11a6a2460..f0706ae6a13f 100644 --- a/src/rt-app_parse_config.c +++ b/src/rt-app_parse_config.c @@ -648,6 +648,41 @@ obj_is_event(char *name) return 0; } +static void parse_cpuset_data(struct json_object *obj, cpuset_data_t *data) +{ + struct json_object *cpuset_obj, *cpu; + unsigned int max_cpu = sysconf(_SC_NPROCESSORS_CONF) - 1; + + /* cpuset */ + cpuset_obj = get_in_object(obj, "cpus", TRUE); + if (cpuset_obj) { + unsigned int i; + unsigned int cpu_idx; + + assure_type_is(cpuset_obj, obj, "cpus", json_type_array); + data->cpuset_str = strdup(json_object_to_json_string(cpuset_obj)); + data->cpusetsize = sizeof(cpu_set_t); + data->cpuset = malloc(data->cpusetsize); + CPU_ZERO(data->cpuset); + for (i = 0; i < json_object_array_length(cpuset_obj); i++) { + cpu = json_object_array_get_idx(cpuset_obj, i); + cpu_idx = json_object_get_int(cpu); + if (cpu_idx > max_cpu) { + log_critical(PIN2 "Invalid cpu %d in cpuset %s", cpu_idx, data->cpuset_str); + free(data->cpuset); + free(data->cpuset_str); + exit(EXIT_INV_CONFIG); + } + CPU_SET(cpu_idx, data->cpuset); + } + } else { + data->cpuset_str = strdup("-"); + data->cpuset = NULL; + data->cpusetsize = 0; + } + log_info(PIN "key: cpus %s", data->cpuset_str); +} + static void parse_thread_phase_data(struct json_object *obj, phase_data_t *data, rtapp_options_t *opts, long tag) @@ -681,6 +716,7 @@ parse_thread_phase_data(struct json_object *obj, i++; } } + parse_cpuset_data(obj, &data->cpu_data); } static void @@ -689,8 +725,8 @@ parse_thread_data(char *name, struct json_object *obj, int index, { char *policy; char def_policy[RTAPP_POLICY_DESCR_LENGTH]; - struct json_object *cpuset_obj, *phases_obj, *cpu, *resources, *locks; - int i, cpu_idx, prior_def; + struct json_object *phases_obj, *resources; + int prior_def; log_info(PFX "Parsing thread %s [%d]", name, index); @@ -699,8 +735,11 @@ parse_thread_data(char *name, struct json_object *obj, int index, data->ind = index; data->name = strdup(name); data->lock_pages = opts->lock_pages; - data->cpuset = NULL; - data->cpuset_str = NULL; + data->cpu_data.cpuset = NULL; + data->cpu_data.cpuset_str = NULL; + data->curr_cpu_data = NULL; + data->def_cpu_data.cpuset = NULL; + data->def_cpu_data.cpuset_str = NULL; /* policy */ policy_to_string(opts->policy, def_policy); @@ -734,22 +773,7 @@ parse_thread_data(char *name, struct json_object *obj, int index, data->deadline = get_int_value_from(obj, "deadline", TRUE, data->period); /* cpuset */ - cpuset_obj = get_in_object(obj, "cpus", TRUE); - if (cpuset_obj) { - assure_type_is(cpuset_obj, obj, "cpus", json_type_array); - data->cpuset_str = strdup(json_object_to_json_string(cpuset_obj)); - data->cpuset = malloc(sizeof(cpu_set_t)); - CPU_ZERO(data->cpuset); - for (i = 0; i < json_object_array_length(cpuset_obj); i++) { - cpu = json_object_array_get_idx(cpuset_obj, i); - cpu_idx = json_object_get_int(cpu); - CPU_SET(cpu_idx, data->cpuset); - } - } else { - data->cpuset_str = strdup("-"); - data->cpuset = NULL; - } - log_info(PIN "key: cpus %s", data->cpuset_str); + parse_cpuset_data(obj, &data->cpu_data); /* initial delay */ data->delay = get_int_value_from(obj, "delay", TRUE, 0); diff --git a/src/rt-app_types.h b/src/rt-app_types.h index 7f3ba58cfce9..06271c2d26c8 100644 --- a/src/rt-app_types.h +++ b/src/rt-app_types.h @@ -141,10 +141,17 @@ typedef struct _event_data_t { int count; } event_data_t; +typedef struct _cpuset_data_t { + cpu_set_t *cpuset; + char *cpuset_str; + size_t cpusetsize; +} cpuset_data_t; + typedef struct _phase_data_t { int loop; event_data_t *events; int nbevents; + cpuset_data_t cpu_data; } phase_data_t; typedef struct _thread_data_t { @@ -153,8 +160,9 @@ typedef struct _thread_data_t { int lock_pages; int duration; rtapp_resource_t **resources; - cpu_set_t *cpuset; - char *cpuset_str; + cpuset_data_t cpu_data; /* cpu set information */ + cpuset_data_t *curr_cpu_data; /* Current cpu set being used */ + cpuset_data_t def_cpu_data; /* Default cpu set for task */ unsigned long runtime, deadline, period; -- 2.10.0.297.gf6727b0

7 years, 1 month

[PATCH v3] rtapp: Add broader support for specifying cpusets

by Stephen Boyd

From: Olav Haugan <ohaugan(a)codeaurora.org> Allow setting of cpusets at all levels of the spec. Signed-off-by: Olav Haugan <ohaugan(a)codeaurora.org> Tested-by: Dietmar Eggemann <dietmar.eggemann(a)arm.com> Reviewed-by: Dietmar Eggemann <dietmar.eggemann(a)arm.com> Tested-by: Viresh Kumar <viresh.kumar(a)linaro.org> Signed-off-by: Stephen Boyd <stephen.boyd(a)linaro.org> --- v3 changes: -Rebased -Removed unused cpuset and locks variable -Removed include unistd.h v2 changes: -Added documentation and example json -Clarified comments -Added check for invalid CPU -Reduced logging level for affinity setting message -Code fixes based on feedback doc/examples/tutorial/example7.json | 40 ++++++++++++ doc/tutorial.txt | 37 +++++++++++ src/rt-app.c | 119 +++++++++++++++++++++++++++++++----- src/rt-app_parse_config.c | 64 +++++++++++++------ src/rt-app_types.h | 12 +++- 5 files changed, 236 insertions(+), 36 deletions(-) create mode 100644 doc/examples/tutorial/example7.json diff --git a/doc/examples/tutorial/example7.json b/doc/examples/tutorial/example7.json new file mode 100644 index 000000000000..093e4ab3a93b --- /dev/null +++ b/doc/examples/tutorial/example7.json @@ -0,0 +1,40 @@ +{ + /* + * Simple use case which creates a thread with 3 phases each running for + * 1.5ms. In phase 1 the thread will be affined to CPU 0, in phase 2 it + * will be affined to CPU 1 and in the third phase it will be affined to + * CPUs 0-3 (inherit from "cpus" at task level). + */ + "tasks" : { + "thread0" : { + "cpus" : [0,1,2,3], + "phases" : { + "start" : { + "cpus" : [0], + "loop" : 1, + "run" : 1500 + }, + "stop" : { + "cpus" : [1], + "loop" : 1, + "run" : 1500 + }, + "next" : { + "loop" : 1, + "run" : 1500 + } + } + } + }, + "global" : { + "duration" : 2, + "calibration" : "CPU0", + "default_policy" : "SCHED_OTHER", + "pi_enabled" : false, + "lock_pages" : false, + "logdir" : "./", + "log_basename" : "rt-app1", + "ftrace" : true, + "gnuplot" : true + } +} diff --git a/doc/tutorial.txt b/doc/tutorial.txt index d2a99c3e1b84..1b8d14a42c15 100644 --- a/doc/tutorial.txt +++ b/doc/tutorial.txt @@ -232,6 +232,43 @@ below are equals: } } +"cpus" can be specified at task level or phase level. As an example, below +creates two threads. One thread will run with affinity of CPU 2 and 3. The +second task will run first phase with affinity to CPU 0 and 1, second phase with +affinity to CPU 2, and the third phase with affinity to CPU 4, 5, and 6 (it will +inherit the affinity from the task level): + +"task" : { + "thread1" : { + "cpus" : [2,3], + "phases" : { + "phase1" : { + "run" : 10, + "sleep" : 10 + } + } + } + "thread2" : { + "cpus" : [4,5,6], + "phases" : { + "phase1" : { + "cpus" : [0,1], + "run" : 10, + "sleep" : 10 + } + "phase2" : { + "cpus" : [2], + "run" : 10, + "sleep" : 10 + } + "phase3" : { + "run" : 10, + "sleep" : 10 + } + } + } +} + * loop: Integer. Define the number of times the parent object must be run. The parent object can be a phase or a thread. For phase object, the loop defines the number of time the phase will be executed before starting the next diff --git a/src/rt-app.c b/src/rt-app.c index 4123d7b67ce8..c018b9bad687 100644 --- a/src/rt-app.c +++ b/src/rt-app.c @@ -457,6 +457,109 @@ shutdown(int sig) exit(EXIT_SUCCESS); } +static void create_cpuset_str(cpuset_data_t *cpu_data) +{ + unsigned int cpu_count = CPU_COUNT_S(cpu_data->cpusetsize, + cpu_data->cpuset); + unsigned int i; + unsigned int idx = 0; + + /* Assume we can go up to 9999 cpus. Each cpu would take up to 4 + 2 + * bytes (4 for the number and 2 for the comma and space). 2 bytes + * for beginning bracket + space and 2 bytes for end bracket and space + * and finally null-terminator. + */ + unsigned int size_needed = cpu_count * 6 + 2 + 2 + 1; + + cpu_data->cpuset_str = malloc(size_needed); + strcpy(cpu_data->cpuset_str, "[ "); + idx += 2; + + for (i = 0; i < 10000 && cpu_count; ++i) { + unsigned int n; + + if (CPU_ISSET(i, cpu_data->cpuset)) { + --cpu_count; + if (size_needed <= (idx + 1)) { + log_error("Not enough memory for array"); + exit(EXIT_FAILURE); + } + n = snprintf(&cpu_data->cpuset_str[idx], + size_needed - idx - 1, "%d", i); + if (n > 0) { + idx += n; + } else { + log_error("Error creating array"); + exit(EXIT_FAILURE); + } + if (size_needed <= (idx + 1)) { + log_error("Not enough memory for array"); + exit(EXIT_FAILURE); + } + if (cpu_count) { + strncat(cpu_data->cpuset_str, ", ", + size_needed - idx - 1); + idx += 2; + } + } + } + strncat(cpu_data->cpuset_str, " ]", size_needed - idx - 1); +} + +static void set_thread_affinity(thread_data_t *data, cpuset_data_t *cpu_data) +{ + int ret; + cpuset_data_t *actual_cpu_data = &data->cpu_data; + + if (data->def_cpu_data.cpuset == NULL) { + /* Get default affinity */ + cpu_set_t cpuset; + unsigned int cpu_count; + unsigned int cpu = 0; + + ret = pthread_getaffinity_np(pthread_self(), + sizeof(cpu_set_t), &cpuset); + if (ret != 0) { + errno = ret; + perror("pthread_get_affinity"); + exit(EXIT_FAILURE); + } + cpu_count = CPU_COUNT(&cpuset); + data->def_cpu_data.cpusetsize = CPU_ALLOC_SIZE(cpu_count); + data->def_cpu_data.cpuset = CPU_ALLOC(cpu_count); + memcpy(data->def_cpu_data.cpuset, &cpuset, + data->def_cpu_data.cpusetsize); + create_cpuset_str(&data->def_cpu_data); + data->curr_cpu_data = &data->def_cpu_data; + } + + /* Order of preference: + * 1. Phase cpuset + * 2. Task level cpuset + * 3. Default cpuset + */ + if (cpu_data->cpuset != NULL) + actual_cpu_data = cpu_data; + + if (actual_cpu_data->cpuset == NULL) + actual_cpu_data = &data->def_cpu_data; + + if (!CPU_EQUAL(actual_cpu_data->cpuset, data->curr_cpu_data->cpuset)) + { + log_debug("[%d] setting cpu affinity to CPU(s) %s", data->ind, + actual_cpu_data->cpuset_str); + ret = pthread_setaffinity_np(pthread_self(), + actual_cpu_data->cpusetsize, + actual_cpu_data->cpuset); + if (ret != 0) { + errno = ret; + perror("pthread_setaffinity_np"); + exit(EXIT_FAILURE); + } + data->curr_cpu_data = actual_cpu_data; + } +} + void *thread_body(void *arg) { thread_data_t *data = (thread_data_t*) arg; @@ -484,20 +587,6 @@ void *thread_body(void *arg) /* Get the 1st phase's data */ pdata = &data->phases[0]; - /* Set thread affinity */ - if (data->cpuset != NULL) - { - log_notice("[%d] setting cpu affinity to CPU(s) %s", data->ind, - data->cpuset_str); - ret = pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), - data->cpuset); - if (ret < 0) { - errno = ret; - perror("pthread_setaffinity_np"); - exit(EXIT_FAILURE); - } - } - /* Set scheduling policy and print pretty info on stdout */ log_notice("[%d] Using %s policy with priority %d", data->ind, data->sched_policy_descr, data->sched_prio); switch (data->sched_policy) @@ -645,6 +734,8 @@ void *thread_body(void *arg) while (continue_running && (i != data->loop)) { struct timespec t_diff, t_rel_start; + set_thread_affinity(data, &pdata->cpu_data); + if (opts.ftrace) log_ftrace(ft_data.marker_fd, "[%d] begins loop %d phase %d step %d", data->ind, i, j, loop); log_debug("[%d] begins loop %d phase %d step %d", data->ind, i, j, loop);; diff --git a/src/rt-app_parse_config.c b/src/rt-app_parse_config.c index c6086f423d2e..d47d3dcc48fd 100644 --- a/src/rt-app_parse_config.c +++ b/src/rt-app_parse_config.c @@ -605,6 +605,41 @@ obj_is_event(char *name) return 0; } +static void parse_cpuset_data(struct json_object *obj, cpuset_data_t *data) +{ + struct json_object *cpuset_obj, *cpu; + unsigned int max_cpu = sysconf(_SC_NPROCESSORS_CONF) - 1; + + /* cpuset */ + cpuset_obj = get_in_object(obj, "cpus", TRUE); + if (cpuset_obj) { + unsigned int i; + unsigned int cpu_idx; + + assure_type_is(cpuset_obj, obj, "cpus", json_type_array); + data->cpuset_str = strdup(json_object_to_json_string(cpuset_obj)); + data->cpusetsize = sizeof(cpu_set_t); + data->cpuset = malloc(data->cpusetsize); + CPU_ZERO(data->cpuset); + for (i = 0; i < json_object_array_length(cpuset_obj); i++) { + cpu = json_object_array_get_idx(cpuset_obj, i); + cpu_idx = json_object_get_int(cpu); + if (cpu_idx > max_cpu) { + log_critical(PIN2 "Invalid cpu %d in cpuset %s", cpu_idx, data->cpuset_str); + free(data->cpuset); + free(data->cpuset_str); + exit(EXIT_INV_CONFIG); + } + CPU_SET(cpu_idx, data->cpuset); + } + } else { + data->cpuset_str = strdup("-"); + data->cpuset = NULL; + data->cpusetsize = 0; + } + log_info(PIN "key: cpus %s", data->cpuset_str); +} + static void parse_thread_phase_data(struct json_object *obj, phase_data_t *data, rtapp_options_t *opts, long tag) @@ -638,6 +673,7 @@ parse_thread_phase_data(struct json_object *obj, i++; } } + parse_cpuset_data(obj, &data->cpu_data); } static void @@ -646,8 +682,8 @@ parse_thread_data(char *name, struct json_object *obj, int index, { char *policy; char def_policy[RTAPP_POLICY_DESCR_LENGTH]; - struct json_object *cpuset_obj, *phases_obj, *cpu, *resources, *locks; - int i, cpu_idx, prior_def; + struct json_object *phases_obj, *resources; + int prior_def; log_info(PFX "Parsing thread %s [%d]", name, index); @@ -656,8 +692,11 @@ parse_thread_data(char *name, struct json_object *obj, int index, data->ind = index; data->name = strdup(name); data->lock_pages = opts->lock_pages; - data->cpuset = NULL; - data->cpuset_str = NULL; + data->cpu_data.cpuset = NULL; + data->cpu_data.cpuset_str = NULL; + data->curr_cpu_data = NULL; + data->def_cpu_data.cpuset = NULL; + data->def_cpu_data.cpuset_str = NULL; /* policy */ policy_to_string(opts->policy, def_policy); @@ -691,22 +730,7 @@ parse_thread_data(char *name, struct json_object *obj, int index, data->deadline = get_int_value_from(obj, "deadline", TRUE, data->period); /* cpuset */ - cpuset_obj = get_in_object(obj, "cpus", TRUE); - if (cpuset_obj) { - assure_type_is(cpuset_obj, obj, "cpus", json_type_array); - data->cpuset_str = strdup(json_object_to_json_string(cpuset_obj)); - data->cpuset = malloc(sizeof(cpu_set_t)); - CPU_ZERO(data->cpuset); - for (i = 0; i < json_object_array_length(cpuset_obj); i++) { - cpu = json_object_array_get_idx(cpuset_obj, i); - cpu_idx = json_object_get_int(cpu); - CPU_SET(cpu_idx, data->cpuset); - } - } else { - data->cpuset_str = strdup("-"); - data->cpuset = NULL; - } - log_info(PIN "key: cpus %s", data->cpuset_str); + parse_cpuset_data(obj, &data->cpu_data); /* initial delay */ data->delay = get_int_value_from(obj, "delay", TRUE, 0); diff --git a/src/rt-app_types.h b/src/rt-app_types.h index 98ec99fbc151..e5f007aa23e3 100644 --- a/src/rt-app_types.h +++ b/src/rt-app_types.h @@ -125,10 +125,17 @@ typedef struct _event_data_t { int count; } event_data_t; +typedef struct _cpuset_data_t { + cpu_set_t *cpuset; + char *cpuset_str; + size_t cpusetsize; +} cpuset_data_t; + typedef struct _phase_data_t { int loop; event_data_t *events; int nbevents; + cpuset_data_t cpu_data; } phase_data_t; typedef struct _thread_data_t { @@ -137,8 +144,9 @@ typedef struct _thread_data_t { int lock_pages; int duration; rtapp_resource_t **resources; - cpu_set_t *cpuset; - char *cpuset_str; + cpuset_data_t cpu_data; /* cpu set information */ + cpuset_data_t *curr_cpu_data; /* Current cpu set being used */ + cpuset_data_t def_cpu_data; /* Default cpu set for task */ unsigned long runtime, deadline, period; -- 2.10.0.297.gf6727b0

7 years, 1 month

[PATCH] Do not use json-c's is_error() any more

by Dietmar Eggemann

In json-c-0.12 is_error() is defined in bits.h which is exported via json.h. However, json-c's master branch contains commit d4e81f9ec827 which declares bits.h deprecated and removes the export via json.h. Replace the use of is_error() with its trivial implementation to be able to get rid of this single dependency towards the deprecated bits.h. This fixes an issue introduced by commit 17dd99c72a12 ("Clean-up header file inferno") which removed #include <json-c/bits.h> from src/rt-app_parse_config.c. Cc: Olav Haugan <ohaugan(a)codeaurora.org> Signed-off-by: Dietmar Eggemann <dietmar.eggemann(a)arm.com> --- Hi Juri and Vincent, Olav had problems to build rt-app against json-c library (master ?). I didn't spot the error since I used json-c-0.12 when testing 17dd99c72a12. Can you please integrate this little snippet so we can build against master json-c as well? I didn't want to include a deprecated header file. Cheers, Dietmar src/rt-app_parse_config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rt-app_parse_config.c b/src/rt-app_parse_config.c index c6086f423d2e..a6e3b591988f 100644 --- a/src/rt-app_parse_config.c +++ b/src/rt-app_parse_config.c @@ -895,7 +895,7 @@ get_opts_from_json_object(struct json_object *root, rtapp_options_t *opts) { struct json_object *global, *tasks, *resources; - if (is_error(root)) { + if (root == NULL) { log_error(PFX "Error while parsing input JSON"); exit(EXIT_INV_CONFIG); } -- 2.11.0

7 years, 1 month

[PATCH v2] rtapp: Add broader support for specifying cpusets

by Stephen Boyd

From: Olav Haugan <ohaugan(a)codeaurora.org> Allow setting of cpusets at all levels of the spec. Signed-off-by: Olav Haugan <ohaugan(a)codeaurora.org> Signed-off-by: Stephen Boyd <stephen.boyd(a)linaro.org> --- * v2 changes: - Added documentation and example json - Clarified comments - Added check for invalid CPU - Reduced logging level for affinity setting message - Code fixes based on feedback doc/examples/tutorial/example7.json | 40 ++++++++++++ doc/tutorial.txt | 37 +++++++++++ src/rt-app.c | 119 +++++++++++++++++++++++++++++++----- src/rt-app_parse_config.c | 66 ++++++++++++++------ src/rt-app_types.h | 12 +++- 5 files changed, 238 insertions(+), 36 deletions(-) create mode 100644 doc/examples/tutorial/example7.json diff --git a/doc/examples/tutorial/example7.json b/doc/examples/tutorial/example7.json new file mode 100644 index 000000000000..093e4ab3a93b --- /dev/null +++ b/doc/examples/tutorial/example7.json @@ -0,0 +1,40 @@ +{ + /* + * Simple use case which creates a thread with 3 phases each running for + * 1.5ms. In phase 1 the thread will be affined to CPU 0, in phase 2 it + * will be affined to CPU 1 and in the third phase it will be affined to + * CPUs 0-3 (inherit from "cpus" at task level). + */ + "tasks" : { + "thread0" : { + "cpus" : [0,1,2,3], + "phases" : { + "start" : { + "cpus" : [0], + "loop" : 1, + "run" : 1500 + }, + "stop" : { + "cpus" : [1], + "loop" : 1, + "run" : 1500 + }, + "next" : { + "loop" : 1, + "run" : 1500 + } + } + } + }, + "global" : { + "duration" : 2, + "calibration" : "CPU0", + "default_policy" : "SCHED_OTHER", + "pi_enabled" : false, + "lock_pages" : false, + "logdir" : "./", + "log_basename" : "rt-app1", + "ftrace" : true, + "gnuplot" : true + } +} diff --git a/doc/tutorial.txt b/doc/tutorial.txt index d2a99c3e1b84..1b8d14a42c15 100644 --- a/doc/tutorial.txt +++ b/doc/tutorial.txt @@ -232,6 +232,43 @@ below are equals: } } +"cpus" can be specified at task level or phase level. As an example, below +creates two threads. One thread will run with affinity of CPU 2 and 3. The +second task will run first phase with affinity to CPU 0 and 1, second phase with +affinity to CPU 2, and the third phase with affinity to CPU 4, 5, and 6 (it will +inherit the affinity from the task level): + +"task" : { + "thread1" : { + "cpus" : [2,3], + "phases" : { + "phase1" : { + "run" : 10, + "sleep" : 10 + } + } + } + "thread2" : { + "cpus" : [4,5,6], + "phases" : { + "phase1" : { + "cpus" : [0,1], + "run" : 10, + "sleep" : 10 + } + "phase2" : { + "cpus" : [2], + "run" : 10, + "sleep" : 10 + } + "phase3" : { + "run" : 10, + "sleep" : 10 + } + } + } +} + * loop: Integer. Define the number of times the parent object must be run. The parent object can be a phase or a thread. For phase object, the loop defines the number of time the phase will be executed before starting the next diff --git a/src/rt-app.c b/src/rt-app.c index 0f992f5748c4..f6c9ab76cd3b 100644 --- a/src/rt-app.c +++ b/src/rt-app.c @@ -448,6 +448,109 @@ shutdown(int sig) exit(EXIT_SUCCESS); } +static void create_cpuset_str(cpuset_data_t *cpu_data) +{ + unsigned int cpu_count = CPU_COUNT_S(cpu_data->cpusetsize, + cpu_data->cpuset); + unsigned int i; + unsigned int idx = 0; + + /* Assume we can go up to 9999 cpus. Each cpu would take up to 4 + 2 + * bytes (4 for the number and 2 for the comma and space). 2 bytes + * for beginning bracket + space and 2 bytes for end bracket and space + * and finally null-terminator. + */ + unsigned int size_needed = cpu_count * 6 + 2 + 2 + 1; + + cpu_data->cpuset_str = malloc(size_needed); + strcpy(cpu_data->cpuset_str, "[ "); + idx += 2; + + for (i = 0; i < 10000 && cpu_count; ++i) { + unsigned int n; + + if (CPU_ISSET(i, cpu_data->cpuset)) { + --cpu_count; + if (size_needed <= (idx + 1)) { + log_error("Not enough memory for array"); + exit(EXIT_FAILURE); + } + n = snprintf(&cpu_data->cpuset_str[idx], + size_needed - idx - 1, "%d", i); + if (n > 0) { + idx += n; + } else { + log_error("Error creating array"); + exit(EXIT_FAILURE); + } + if (size_needed <= (idx + 1)) { + log_error("Not enough memory for array"); + exit(EXIT_FAILURE); + } + if (cpu_count) { + strncat(cpu_data->cpuset_str, ", ", + size_needed - idx - 1); + idx += 2; + } + } + } + strncat(cpu_data->cpuset_str, " ]", size_needed - idx - 1); +} + +static void set_thread_affinity(thread_data_t *data, cpuset_data_t *cpu_data) +{ + int ret; + cpuset_data_t *actual_cpu_data = &data->cpu_data; + + if (data->def_cpu_data.cpuset == NULL) { + /* Get default affinity */ + cpu_set_t cpuset; + unsigned int cpu_count; + unsigned int cpu = 0; + + ret = pthread_getaffinity_np(pthread_self(), + sizeof(cpu_set_t), &cpuset); + if (ret != 0) { + errno = ret; + perror("pthread_get_affinity"); + exit(EXIT_FAILURE); + } + cpu_count = CPU_COUNT(&cpuset); + data->def_cpu_data.cpusetsize = CPU_ALLOC_SIZE(cpu_count); + data->def_cpu_data.cpuset = CPU_ALLOC(cpu_count); + memcpy(data->def_cpu_data.cpuset, &cpuset, + data->def_cpu_data.cpusetsize); + create_cpuset_str(&data->def_cpu_data); + data->curr_cpu_data = &data->def_cpu_data; + } + + /* Order of preference: + * 1. Phase cpuset + * 2. Task level cpuset + * 3. Default cpuset + */ + if (cpu_data->cpuset != NULL) + actual_cpu_data = cpu_data; + + if (actual_cpu_data->cpuset == NULL) + actual_cpu_data = &data->def_cpu_data; + + if (!CPU_EQUAL(actual_cpu_data->cpuset, data->curr_cpu_data->cpuset)) + { + log_debug("[%d] setting cpu affinity to CPU(s) %s", data->ind, + actual_cpu_data->cpuset_str); + ret = pthread_setaffinity_np(pthread_self(), + actual_cpu_data->cpusetsize, + actual_cpu_data->cpuset); + if (ret != 0) { + errno = ret; + perror("pthread_setaffinity_np"); + exit(EXIT_FAILURE); + } + data->curr_cpu_data = actual_cpu_data; + } +} + void *thread_body(void *arg) { thread_data_t *data = (thread_data_t*) arg; @@ -475,20 +578,6 @@ void *thread_body(void *arg) /* Get the 1st phase's data */ pdata = &data->phases[0]; - /* Set thread affinity */ - if (data->cpuset != NULL) - { - log_notice("[%d] setting cpu affinity to CPU(s) %s", data->ind, - data->cpuset_str); - ret = pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), - data->cpuset); - if (ret < 0) { - errno = ret; - perror("pthread_setaffinity_np"); - exit(EXIT_FAILURE); - } - } - /* Set scheduling policy and print pretty info on stdout */ log_notice("[%d] Using %s policy with priority %d", data->ind, data->sched_policy_descr, data->sched_prio); switch (data->sched_policy) @@ -636,6 +725,8 @@ void *thread_body(void *arg) while (continue_running && (i != data->loop)) { struct timespec t_diff, t_rel_start; + set_thread_affinity(data, &pdata->cpu_data); + if (opts.ftrace) log_ftrace(ft_data.marker_fd, "[%d] begins loop %d phase %d step %d", data->ind, i, j, loop); log_debug("[%d] begins loop %d phase %d step %d", data->ind, i, j, loop);; diff --git a/src/rt-app_parse_config.c b/src/rt-app_parse_config.c index e5ef87f6ee3e..06b0cf1232a9 100644 --- a/src/rt-app_parse_config.c +++ b/src/rt-app_parse_config.c @@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <json-c/bits.h> #include "rt-app_parse_config.h" +#include <unistd.h> #define PFX "[json] " #define PFL " "PFX @@ -596,6 +597,42 @@ obj_is_event(char *name) return 0; } +static void parse_cpuset_data(struct json_object *obj, cpuset_data_t *data) +{ + struct json_object *cpuset_obj, *cpu; + unsigned int max_cpu = sysconf(_SC_NPROCESSORS_CONF) - 1; + + /* cpuset */ + cpuset_obj = get_in_object(obj, "cpus", TRUE); + if (cpuset_obj) { + struct array_list *cpuset; + unsigned int i; + unsigned int cpu_idx; + + assure_type_is(cpuset_obj, obj, "cpus", json_type_array); + data->cpuset_str = strdup(json_object_to_json_string(cpuset_obj)); + data->cpusetsize = sizeof(cpu_set_t); + data->cpuset = malloc(data->cpusetsize); + CPU_ZERO(data->cpuset); + for (i = 0; i < json_object_array_length(cpuset_obj); i++) { + cpu = json_object_array_get_idx(cpuset_obj, i); + cpu_idx = json_object_get_int(cpu); + if (cpu_idx > max_cpu) { + log_critical(PIN2 "Invalid cpu %d in cpuset %s", cpu_idx, data->cpuset_str); + free(data->cpuset); + free(data->cpuset_str); + exit(EXIT_INV_CONFIG); + } + CPU_SET(cpu_idx, data->cpuset); + } + } else { + data->cpuset_str = strdup("-"); + data->cpuset = NULL; + data->cpusetsize = 0; + } + log_info(PIN "key: cpus %s", data->cpuset_str); +} + static void parse_thread_phase_data(struct json_object *obj, phase_data_t *data, rtapp_options_t *opts, long tag) @@ -629,6 +666,7 @@ parse_thread_phase_data(struct json_object *obj, i++; } } + parse_cpuset_data(obj, &data->cpu_data); } static void @@ -637,8 +675,8 @@ parse_thread_data(char *name, struct json_object *obj, int index, { char *policy; char def_policy[RTAPP_POLICY_DESCR_LENGTH]; - struct json_object *cpuset_obj, *phases_obj, *cpu, *resources, *locks; - int i, cpu_idx, prior_def; + struct json_object *phases_obj, *resources, *locks; + int prior_def; log_info(PFX "Parsing thread %s [%d]", name, index); @@ -647,8 +685,11 @@ parse_thread_data(char *name, struct json_object *obj, int index, data->ind = index; data->name = strdup(name); data->lock_pages = opts->lock_pages; - data->cpuset = NULL; - data->cpuset_str = NULL; + data->cpu_data.cpuset = NULL; + data->cpu_data.cpuset_str = NULL; + data->curr_cpu_data = NULL; + data->def_cpu_data.cpuset = NULL; + data->def_cpu_data.cpuset_str = NULL; /* policy */ policy_to_string(opts->policy, def_policy); @@ -682,22 +723,7 @@ parse_thread_data(char *name, struct json_object *obj, int index, data->deadline = get_int_value_from(obj, "deadline", TRUE, data->period); /* cpuset */ - cpuset_obj = get_in_object(obj, "cpus", TRUE); - if (cpuset_obj) { - assure_type_is(cpuset_obj, obj, "cpus", json_type_array); - data->cpuset_str = strdup(json_object_to_json_string(cpuset_obj)); - data->cpuset = malloc(sizeof(cpu_set_t)); - CPU_ZERO(data->cpuset); - for (i = 0; i < json_object_array_length(cpuset_obj); i++) { - cpu = json_object_array_get_idx(cpuset_obj, i); - cpu_idx = json_object_get_int(cpu); - CPU_SET(cpu_idx, data->cpuset); - } - } else { - data->cpuset_str = strdup("-"); - data->cpuset = NULL; - } - log_info(PIN "key: cpus %s", data->cpuset_str); + parse_cpuset_data(obj, &data->cpu_data); /* initial delay */ data->delay = get_int_value_from(obj, "delay", TRUE, 0); diff --git a/src/rt-app_types.h b/src/rt-app_types.h index 5b8345fcf6aa..95176d4342f8 100644 --- a/src/rt-app_types.h +++ b/src/rt-app_types.h @@ -123,10 +123,17 @@ typedef struct _event_data_t { int count; } event_data_t; +typedef struct _cpuset_data_t { + cpu_set_t *cpuset; + char *cpuset_str; + size_t cpusetsize; +} cpuset_data_t; + typedef struct _phase_data_t { int loop; event_data_t *events; int nbevents; + cpuset_data_t cpu_data; } phase_data_t; typedef struct _thread_data_t { @@ -135,8 +142,9 @@ typedef struct _thread_data_t { int lock_pages; int duration; rtapp_resource_t **resources; - cpu_set_t *cpuset; - char *cpuset_str; + cpuset_data_t cpu_data; /* cpu set information */ + cpuset_data_t *curr_cpu_data; /* Current cpu set being used */ + cpuset_data_t def_cpu_data; /* Default cpu set for task */ unsigned long runtime, deadline, period; -- 2.10.0.297.gf6727b0

7 years, 1 month

[PATCH 0/3] Miscellaneous Cleanups

by Dietmar Eggemann

Patch 0001, 0002 are easy to digest. Patch 0003 is more invasive. Dietmar Eggemann (3): Move DEFAULT_THREAD_PRIORITY, DEFAULT_THREAD_NICE & PATH_LENGTH to common place Remove BUDGET_OVERP definition Clean-up header file inferno src/rt-app.c | 17 +++++++++++++---- src/rt-app.h | 14 -------------- src/rt-app_args.c | 7 ++++++- src/rt-app_args.h | 19 +------------------ src/rt-app_parse_config.c | 11 ++++++++++- src/rt-app_parse_config.h | 19 ------------------- src/rt-app_types.h | 14 ++++++++------ src/rt-app_utils.c | 7 ++++++- src/rt-app_utils.h | 11 +++-------- 9 files changed, 47 insertions(+), 72 deletions(-) -- 2.11.0

7 years, 2 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Sched-tools