mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-11 13:57:52 +00:00
Code Issues Releases Wiki Activity

odp-util: Make it possible to combine slow path reasons.

Browse Source 
It will soon be possible for a single flow to be slow pathed for multiple
reasons.  This commit makes it possible to indicate more than one reason
to slow path a flow.

This commit is logically a revert of commit 98f0520fb2 (odp-util: Make
slow_path_reasons mutually exclusive.) but details have changed.

Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Ben Pfaff
2013-09-20 12:54:51 -07:00
parent 4fc6592603
commit 04594cd5a8
4 changed files with 69 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
lib/odp-util.c
View File

@@ -176,37 +176,27 @@ format_odp_sample_action(struct ds *ds, const struct nlattr *attr)
}
static const char *
slow_path_reason_to_string(enum slow_path_reason reason)
slow_path_reason_to_string(uint32_t reason)
{
switch (reason) {
case SLOW_CFM:
return "cfm";
case SLOW_LACP:
return "lacp";
case SLOW_STP:
return "stp";
case SLOW_BFD:
return "bfd";
case SLOW_CONTROLLER:
return "controller";
case __SLOW_MAX:
default:
return NULL;
switch ((enum slow_path_reason) reason) {
#define SPR(ENUM, STRING, EXPLANATION) case ENUM: return STRING;
SLOW_PATH_REASONS
#undef SPR
}
return NULL;
}
static enum slow_path_reason
string_to_slow_path_reason(const char *string)
const char *
slow_path_reason_to_explanation(enum slow_path_reason reason)
{
enum slow_path_reason i;
for (i = 1; i < __SLOW_MAX; i++) {
if (!strcmp(string, slow_path_reason_to_string(i))) {
return i;
}
switch (reason) {
#define SPR(ENUM, STRING, EXPLANATION) case ENUM: return EXPLANATION;
SLOW_PATH_REASONS
#undef SPR
}
return 0;
return "<unknown>";
}
static int
@@ -303,10 +293,10 @@ format_odp_userspace_action(struct ds *ds, const struct nlattr *attr)
cookie.sflow.output);
} else if (userdata_len == sizeof cookie.slow_path
&& cookie.type == USER_ACTION_COOKIE_SLOW_PATH) {
const char *reason;
reason = slow_path_reason_to_string(cookie.slow_path.reason);
reason = reason ? reason : "";
ds_put_format(ds, ",slow_path(%s)", reason);
ds_put_cstr(ds, ",slow_path(");
format_flags(ds, slow_path_reason_to_string,
cookie.slow_path.reason, ',');
ds_put_format(ds, ")");
} else if (userdata_len == sizeof cookie.flow_sample
&& cookie.type == USER_ACTION_COOKIE_FLOW_SAMPLE) {
ds_put_format(ds, ",flow_sample(probability=%"PRIu16
@@ -536,27 +526,25 @@ parse_odp_action(const char *s, const struct simap *port_names,
odp_put_userspace_action(pid, &cookie, sizeof cookie.sflow,
actions);
return n;
} else if (sscanf(s, "userspace(pid=%lli,slow_path(%n", &pid, &n) > 0
} else if (sscanf(s, "userspace(pid=%lli,slow_path%n", &pid, &n) > 0
&& n > 0) {
union user_action_cookie cookie;
char reason[32];
if (s[n] == ')' && s[n + 1] == ')') {
reason[0] = '\0';
n += 2;
} else if (sscanf(s + n, "%31[^)]))", reason) > 0) {
n += strlen(reason) + 2;
} else {
return -EINVAL;
}
int res;
cookie.type = USER_ACTION_COOKIE_SLOW_PATH;
cookie.slow_path.unused = 0;
cookie.slow_path.reason = string_to_slow_path_reason(reason);
cookie.slow_path.reason = 0;
if (reason[0] && !cookie.slow_path.reason) {
res = parse_flags(&s[n], slow_path_reason_to_string,
&cookie.slow_path.reason);
if (res < 0) {
return res;
}
n += res;
if (s[n] != ')') {
return -EINVAL;
}
n++;
odp_put_userspace_action(pid, &cookie, sizeof cookie.slow_path,
actions);