mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-25 15:07:05 +00:00
Code Issues Releases Wiki Activity

ovs-numa: Add new dump types.

Browse Source 
They will be used by a future commit.

This patch introduces some code duplication which will be removed in a
future commit.

Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
Acked-by: Ilya Maximets <i.maximets@samsung.com>
This commit is contained in:
Daniele Di Proietto
2016-11-15 15:40:49 -08:00
parent b2ce05edee
commit dbedeb9dd4
2 changed files with 79 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
lib/ovs-numa.c
View File

@@ -32,6 +32,7 @@
#include "openvswitch/list.h"
#include "ovs-thread.h"
#include "openvswitch/vlog.h"
#include "util.h"
VLOG_DEFINE_THIS_MODULE(ovs_numa);
@@ -512,6 +513,81 @@ ovs_numa_dump_cores_on_numa(int numa_id)
return dump;
}
struct ovs_numa_dump *
ovs_numa_dump_cores_with_cmask(const char *cmask)
{
struct ovs_numa_dump *dump = xmalloc(sizeof *dump);
int core_id = 0;
int end_idx;
hmap_init(&dump->dump);
/* Ignore leading 0x. */
end_idx = 0;
if (!strncmp(cmask, "0x", 2) || !strncmp(cmask, "0X", 2)) {
end_idx = 2;
}
for (int i = strlen(cmask) - 1; i >= end_idx; i--) {
char hex = cmask[i];
int bin;
bin = hexit_value(hex);
if (bin == -1) {
VLOG_WARN("Invalid cpu mask: %c", cmask[i]);
bin = 0;
}
for (int j = 0; j < 4; j++) {
if ((bin >> j) & 0x1) {
struct cpu_core *core = get_core_by_core_id(core_id);
if (core) {
struct ovs_numa_info *info = xmalloc(sizeof *info);
info->numa_id = core->numa->numa_id;
info->core_id = core->core_id;
hmap_insert(&dump->dump, &info->hmap_node,
hash_2words(info->numa_id, info->core_id));
}
}
core_id++;
}
}
return dump;
}
struct ovs_numa_dump *
ovs_numa_dump_n_cores_per_numa(int cores_per_numa)
{
struct ovs_numa_dump *dump = xmalloc(sizeof *dump);
const struct numa_node *n;
hmap_init(&dump->dump);
HMAP_FOR_EACH (n, hmap_node, &all_numa_nodes) {
const struct cpu_core *core;
int i = 0;
LIST_FOR_EACH (core, list_node, &n->cores) {
if (i++ >= cores_per_numa) {
break;
}
struct ovs_numa_info *info = xmalloc(sizeof *info);
info->numa_id = core->numa->numa_id;
info->core_id = core->core_id;
hmap_insert(&dump->dump, &info->hmap_node,
hash_2words(info->numa_id, info->core_id));
}
}
return dump;
}
bool
ovs_numa_dump_contains_core(const struct ovs_numa_dump *dump,
int numa_id, unsigned core_id)

4
lib/ovs-numa.h
View File

@@ -54,12 +54,14 @@ unsigned ovs_numa_get_unpinned_core_any(void);
unsigned ovs_numa_get_unpinned_core_on_numa(int numa_id);
void ovs_numa_unpin_core(unsigned core_id);
struct ovs_numa_dump *ovs_numa_dump_cores_on_numa(int numa_id);
struct ovs_numa_dump *ovs_numa_dump_cores_with_cmask(const char *cmask);
struct ovs_numa_dump *ovs_numa_dump_n_cores_per_numa(int n);
bool ovs_numa_dump_contains_core(const struct ovs_numa_dump *,
int numa_id, unsigned core_id);
void ovs_numa_dump_destroy(struct ovs_numa_dump *);
int ovs_numa_thread_setaffinity_core(unsigned core_id);
#define FOR_EACH_CORE_ON_NUMA(ITER, DUMP) \
#define FOR_EACH_CORE_ON_DUMP(ITER, DUMP) \
HMAP_FOR_EACH((ITER), hmap_node, &(DUMP)->dump)
#endif /* ovs-numa.h */