PeterCxy/irqbalance
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: PeterCxy:69d0a87e2f477a64e52ee0d701c3590cac7dd5ac
Branches Tags
PeterCxy:packing-test
PeterCxy:master
..
compare: PeterCxy:5fbe9a94ebcc7463bbe9a77fea3577a844c55ec5
Branches Tags
PeterCxy:packing-test
PeterCxy:master

No commits in common. "69d0a87e2f477a64e52ee0d701c3590cac7dd5ac" and "5fbe9a94ebcc7463bbe9a77fea3577a844c55ec5" have entirely different histories.
69d0a87e2f ... 5fbe9a94eb

4 changed files with 11 additions and 21 deletions
Show stats Expand all files Collapse all files

18
cputree.c
View file

@ -224,13 +224,11 @@ static struct topo_obj* add_cache_domain_to_package(struct topo_obj *cache,
package->obj_type = OBJ_TYPE_PACKAGE;
package->obj_type_list = &packages;
package->number = packageid;
package->max_load = 0;
packages = g_list_append(packages, package);
}
entry = g_list_find(package->children, cache);
if (!entry) {
package->max_load += cache->max_load;
package->children = g_list_append(package->children, cache);
cache->parent = package;
}
@ -266,14 +264,12 @@ static struct topo_obj* add_cpu_to_cache_domain(struct topo_obj *cpu,
cache->mask = cache_mask;
cache->number = cache_domain_count;
cache->obj_type_list = &cache_domains;
cache->max_load = 0;
cache_domains = g_list_append(cache_domains, cache);
cache_domain_count++;
}
entry = g_list_find(cache->children, cpu);
if (!entry) {
cache->max_load += cpu->max_load;
cache->children = g_list_append(cache->children, cpu);
cpu->parent = (struct topo_obj *)cache;
}
@ -321,8 +317,6 @@ static void do_one_cpu(char *path)
cpu->number = strtoul(&path[27], NULL, 10);
cpu->max_load = SLEEP_INTERVAL * 1000 * 1000; // SLEEP_INTERVAL in nanoseconds, should be a good enough approximation
cpu_set(cpu->number, cpu_online_map);
cpu_set(cpu->number, cpu->mask);
@ -404,8 +398,6 @@ static void do_one_cpu(char *path)
* we override package_mask with node mask.
*/
node = get_numa_node(nodeid);
if (node)
node->max_load += cpu->max_load;
if (node && (cpus_weight(package_mask) > cpus_weight(node->mask)))
cpus_and(package_mask, package_mask, node->mask);
}
@ -453,7 +445,7 @@ static void dump_balance_obj(struct topo_obj *d, void *data __attribute__((unuse
log(TO_CONSOLE, LOG_INFO, "%s%s%s%sCPU number %i numa_node is ",
log_indent, log_indent, log_indent, log_indent, c->number);
for_each_object(cpu_numa_node(c), dump_numa_node_num, NULL);
log(TO_CONSOLE, LOG_INFO, "(load %lu, max %lu)\n", (unsigned long)c->load, (unsigned long)c->max_load);
log(TO_CONSOLE, LOG_INFO, "(load %lu)\n", (unsigned long)c->load);
if (c->interrupts)
for_each_irq(c->interrupts, dump_irq, (void *)18);
}
@ -465,8 +457,8 @@ static void dump_cache_domain(struct topo_obj *d, void *data)
log(TO_CONSOLE, LOG_INFO, "%s%sCache domain %i: numa_node is ",
log_indent, log_indent, d->number);
for_each_object(d->numa_nodes, dump_numa_node_num, NULL);
log(TO_CONSOLE, LOG_INFO, "cpu mask is %s (load %lu, max %lu) \n", buffer,
(unsigned long)d->load, (unsigned long)d->max_load);
log(TO_CONSOLE, LOG_INFO, "cpu mask is %s (load %lu) \n", buffer,
(unsigned long)d->load);
if (d->children)
for_each_object(d->children, dump_balance_obj, NULL);
if (g_list_length(d->interrupts) > 0)
@ -479,8 +471,8 @@ static void dump_package(struct topo_obj *d, void *data)
cpumask_scnprintf(buffer, 4096, d->mask);
log(TO_CONSOLE, LOG_INFO, "Package %i: numa_node ", d->number);
for_each_object(d->numa_nodes, dump_numa_node_num, NULL);
log(TO_CONSOLE, LOG_INFO, "cpu mask is %s (load %lu, max %lu)\n",
buffer, (unsigned long)d->load, (unsigned long)d->max_load);
log(TO_CONSOLE, LOG_INFO, "cpu mask is %s (load %lu)\n",
buffer, (unsigned long)d->load);
if (d->children)
for_each_object(d->children, dump_cache_domain, buffer);
if (g_list_length(d->interrupts) > 0)

3
numa.c
View file

@ -58,10 +58,9 @@ static void add_one_node(int nodeid)
process_one_line(path, get_mask_from_bitmap, &new->mask);
}
new->obj_type = OBJ_TYPE_NODE;
new->obj_type = OBJ_TYPE_NODE;
new->number = nodeid;
new->obj_type_list = &numa_nodes;
new->max_load = 0;
numa_nodes = g_list_append(numa_nodes, new);
}

10
placement.c
View file

@ -76,7 +76,7 @@ static void find_best_object_packing(GList *objs, struct irq_info *info, struct
entry = g_list_first(objs);
while (entry) {
struct topo_obj *d = entry->data;
if (d->load + info->load < d->max_load) {
if (d->load + info->load < 0.9e9) {
place->best = d;
place->best_cost = d->load + info->load;
return;
@ -120,11 +120,11 @@ static void find_best_object_for_irq(struct irq_info *info, void *data)
place.best = NULL;
place.best_cost = ULLONG_MAX;
if (info->level != BALANCE_CORE) {
for_each_object(d->children, find_best_object, &place);
} else {
//if (info->level != BALANCE_CORE) {
// for_each_object(d->children, find_best_object, &place);
//} else {
find_best_object_packing(d->children, info, &place);
}
//}
asign = place.best;

1
types.h
View file

@ -46,7 +46,6 @@ enum obj_type_e {
struct topo_obj {
uint64_t load;
uint64_t last_load;
uint64_t max_load;
uint64_t irq_count;
enum obj_type_e obj_type;
int number;