Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pw cleanup #17009

Merged
merged 2 commits into from
Oct 8, 2024
Merged

Pw cleanup #17009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f50b1f7
zebra: Move pw status settting until after we get results
donaldsharp Oct 4, 2024
a8af2b2
zebra: Do not retry in 30 seconds on pw reachability failure
donaldsharp Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 29 additions & 6 deletions zebra/zebra_pw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ void zebra_pw_update(struct zebra_pw *pw)
{
if (zebra_pw_check_reachability(pw) < 0) {
zebra_pw_uninstall(pw);
zebra_pw_install_failure(pw, PW_NOT_FORWARDING);
/* wait for NHT and try again later */
} else {
/*
Expand All @@ -167,12 +166,17 @@ static void zebra_pw_install(struct zebra_pw *pw)

hook_call(pw_install, pw);
if (dplane_pw_install(pw) == ZEBRA_DPLANE_REQUEST_FAILURE) {
/*
* Realistically this is never going to fail passing
* the pw data down to the dplane. The failure modes
* look like impossible events but we still return
* on them.... but I don't see a real clean way to remove this
* at all. So let's just leave the retry mechanism for
* the moment.
*/
zebra_pw_install_failure(pw, PW_NOT_FORWARDING);
return;
}

if (pw->status != PW_FORWARDING)
zebra_pw_update_status(pw, PW_FORWARDING);
}

static void zebra_pw_uninstall(struct zebra_pw *pw)
Expand All @@ -188,9 +192,28 @@ static void zebra_pw_uninstall(struct zebra_pw *pw)
/* ignore any possible error */
hook_call(pw_uninstall, pw);
dplane_pw_uninstall(pw);
}

if (zebra_pw_enabled(pw))
zebra_pw_update_status(pw, PW_NOT_FORWARDING);
void zebra_pw_handle_dplane_results(struct zebra_dplane_ctx *ctx)
{
struct zebra_pw *pw;
struct zebra_vrf *vrf;
enum dplane_op_e op;

op = dplane_ctx_get_op(ctx);

vrf = zebra_vrf_lookup_by_id(dplane_ctx_get_vrf(ctx));
pw = zebra_pw_find(vrf, dplane_ctx_get_ifname(ctx));

if (dplane_ctx_get_status(ctx) != ZEBRA_DPLANE_REQUEST_SUCCESS) {
if (pw)
zebra_pw_install_failure(pw, dplane_ctx_get_pw_status(ctx));
} else {
if (op == DPLANE_OP_PW_INSTALL && pw->status != PW_FORWARDING)
ton31337 marked this conversation as resolved.
Show resolved Hide resolved
zebra_pw_update_status(pw, PW_FORWARDING);
else if (op == DPLANE_OP_PW_UNINSTALL && zebra_pw_enabled(pw))
ton31337 marked this conversation as resolved.
Show resolved Hide resolved
zebra_pw_update_status(pw, PW_NOT_FORWARDING);
}
}

/*
Expand Down
1 change: 1 addition & 0 deletions zebra/zebra_pw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ void zebra_pw_init_vrf(struct zebra_vrf *);
void zebra_pw_exit_vrf(struct zebra_vrf *);
void zebra_pw_terminate(void);
void zebra_pw_vty_init(void);
void zebra_pw_handle_dplane_results(struct zebra_dplane_ctx *ctx);

#ifdef __cplusplus
}
Expand Down
25 changes: 1 addition & 24 deletions zebra/zebra_rib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4850,29 +4850,6 @@ void rib_close_table(struct route_table *table)
}
}

/*
* Handler for async dataplane results after a pseudowire installation
*/
static void handle_pw_result(struct zebra_dplane_ctx *ctx)
{
struct zebra_pw *pw;
struct zebra_vrf *vrf;

/* The pseudowire code assumes success - we act on an error
* result for installation attempts here.
*/
if (dplane_ctx_get_op(ctx) != DPLANE_OP_PW_INSTALL)
return;

if (dplane_ctx_get_status(ctx) != ZEBRA_DPLANE_REQUEST_SUCCESS) {
vrf = zebra_vrf_lookup_by_id(dplane_ctx_get_vrf(ctx));
pw = zebra_pw_find(vrf, dplane_ctx_get_ifname(ctx));
if (pw)
zebra_pw_install_failure(pw,
dplane_ctx_get_pw_status(ctx));
}
}

/*
* Handle results from the dataplane system. Dequeue update context
* structs, dispatch to appropriate internal handlers.
Expand Down Expand Up @@ -4979,7 +4956,7 @@ static void rib_process_dplane_results(struct event *thread)

case DPLANE_OP_PW_INSTALL:
case DPLANE_OP_PW_UNINSTALL:
handle_pw_result(ctx);
zebra_pw_handle_dplane_results(ctx);
break;

case DPLANE_OP_SYS_ROUTE_ADD:
Expand Down
Loading