Skip to content

Commit

Permalink
routing: refactor private KPI
Browse files Browse the repository at this point in the history 
* Make nhgrp_get_nhops() return const struct weightened_nhop to
 indicate that the list is immutable
* Make nhgrp_get_group() return the actual group, instead of
 group+weight.

MFC after:	2 weeks
  • Loading branch information
@AlexanderChernikov
AlexanderChernikov committed Aug 1, 2022
1 parent f28532a commit ae6bfd1
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 20 deletions.
13 changes: 6 additions & 7 deletions sys/net/route/nhgrp_ctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -598,16 +598,15 @@ append_nhops(struct nh_control *ctl, const struct nhgrp_object *gr_orig,
*/
int
nhgrp_get_group(struct rib_head *rh, struct weightened_nhop *wn, int num_nhops,
struct route_nhop_data *rnd)
struct nhgrp_object **pnhg)
{
struct nh_control *ctl = rh->nh_control;
struct nhgrp_priv *nhg_priv;
int error;

nhg_priv = get_nhgrp(ctl, wn, num_nhops, &error);
if (nhg_priv != NULL)
rnd->rnd_nhgrp = nhg_priv->nhg;
rnd->rnd_weight = 0;
*pnhg = nhg_priv->nhg;

return (error);
}
Expand Down Expand Up @@ -718,14 +717,14 @@ nhgrp_get_addition_group(struct rib_head *rh, struct route_nhop_data *rnd_orig,
* Returns pointer to array of nexthops with weights for
* given @nhg. Stores number of items in the array into @pnum_nhops.
*/
struct weightened_nhop *
nhgrp_get_nhops(struct nhgrp_object *nhg, uint32_t *pnum_nhops)
const struct weightened_nhop *
nhgrp_get_nhops(const struct nhgrp_object *nhg, uint32_t *pnum_nhops)
{
struct nhgrp_priv *nhg_priv;
const struct nhgrp_priv *nhg_priv;

KASSERT(((nhg->nhg_flags & MPF_MULTIPATH) != 0), ("nhop is not mpath"));

nhg_priv = NHGRP_PRIV(nhg);
nhg_priv = NHGRP_PRIV_CONST(nhg);
*pnum_nhops = nhg_priv->nhg_nh_count;

return (nhg_priv->nhg_nh_weights);
Expand Down
11 changes: 6 additions & 5 deletions sys/net/route/route_ctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ destroy_rtentry(struct rtentry *rt)
*/
#ifdef ROUTE_MPATH
if (NH_IS_NHGRP(nh)) {
struct weightened_nhop *wn;
const struct weightened_nhop *wn;
uint32_t num_nhops;
wn = nhgrp_get_nhops((struct nhgrp_object *)nh, &num_nhops);
nh = wn[0].nh;
Expand Down Expand Up @@ -1010,8 +1010,9 @@ change_mpath_route(struct rib_head *rnh, struct rt_addrinfo *info,
{
int error = 0, found_idx = 0;
struct nhop_object *nh_orig = NULL, *nh_new;
struct route_nhop_data rnd_new;
struct weightened_nhop *wn = NULL, *wn_new;
struct route_nhop_data rnd_new = {};
const struct weightened_nhop *wn = NULL;
struct weightened_nhop *wn_new;
uint32_t num_nhops;

wn = nhgrp_get_nhops(rnd_orig->rnd_nhgrp, &num_nhops);
Expand Down Expand Up @@ -1041,7 +1042,7 @@ change_mpath_route(struct rib_head *rnh, struct rt_addrinfo *info,
wn_new[found_idx].nh = nh_new;
wn_new[found_idx].weight = get_info_weight(info, wn[found_idx].weight);

error = nhgrp_get_group(rnh, wn_new, num_nhops, &rnd_new);
error = nhgrp_get_group(rnh, wn_new, num_nhops, &rnd_new.rnd_nhgrp);
nhop_free(nh_new);
free(wn_new, M_TEMP);

Expand Down Expand Up @@ -1375,7 +1376,7 @@ rib_walk_del(u_int fibnum, int family, rib_filter_f_t *filter_f, void *arg, bool
if (report) {
#ifdef ROUTE_MPATH
struct nhgrp_object *nhg;
struct weightened_nhop *wn;
const struct weightened_nhop *wn;
uint32_t num_nhops;
if (NH_IS_NHGRP(nh)) {
nhg = (struct nhgrp_object *)nh;
Expand Down
2 changes: 1 addition & 1 deletion sys/net/route/route_ctl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ uint32_t nhops_get_count(struct rib_head *rh);
/* Multipath */
struct weightened_nhop;

struct weightened_nhop *nhgrp_get_nhops(struct nhgrp_object *nhg,
const struct weightened_nhop *nhgrp_get_nhops(const struct nhgrp_object *nhg,
uint32_t *pnum_nhops);
uint32_t nhgrp_get_count(struct rib_head *rh);

Expand Down
4 changes: 2 additions & 2 deletions sys/net/route/route_helpers.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ decompose_change_notification(struct rib_cmd_info *rc, route_notification_t *cb,
void *cbdata)
{
uint32_t num_old, num_new;
struct weightened_nhop *wn_old, *wn_new;
const struct weightened_nhop *wn_old, *wn_new;
struct weightened_nhop tmp = { NULL, 0 };
uint32_t idx_old = 0, idx_new = 0;

Expand Down Expand Up @@ -378,7 +378,7 @@ void
rib_decompose_notification(struct rib_cmd_info *rc, route_notification_t *cb,
void *cbdata)
{
struct weightened_nhop *wn;
const struct weightened_nhop *wn;
uint32_t num_nhops;
struct rib_cmd_info rc_new;

Expand Down
2 changes: 1 addition & 1 deletion sys/net/route/route_var.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ void nhgrp_ctl_unlink_all(struct nh_control *ctl);
int nhgrp_dump_sysctl(struct rib_head *rh, struct sysctl_req *w);

int nhgrp_get_group(struct rib_head *rh, struct weightened_nhop *wn,
int num_nhops, struct route_nhop_data *rnd);
int num_nhops, struct nhgrp_object **pnhg);
typedef bool nhgrp_filter_cb_t(const struct nhop_object *nh, void *data);
int nhgrp_get_filtered_group(struct rib_head *rh, const struct nhgrp_object *src,
nhgrp_filter_cb_t flt_func, void *flt_data, struct route_nhop_data *rnd);
Expand Down
4 changes: 2 additions & 2 deletions sys/net/rtsock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@ select_nhop(struct nhop_object *nh, const struct sockaddr *gw)
if (!NH_IS_NHGRP(nh))
return (nh);
#ifdef ROUTE_MPATH
struct weightened_nhop *wn;
const struct weightened_nhop *wn;
uint32_t num_nhops;
wn = nhgrp_get_nhops((struct nhgrp_object *)nh, &num_nhops);
if (gw == NULL)
Expand Down Expand Up @@ -2243,7 +2243,7 @@ sysctl_dumpentry(struct rtentry *rt, void *vw)
nh = rt_get_raw_nhop(rt);
#ifdef ROUTE_MPATH
if (NH_IS_NHGRP(nh)) {
struct weightened_nhop *wn;
const struct weightened_nhop *wn;
uint32_t num_nhops;
int error;
wn = nhgrp_get_nhops((struct nhgrp_object *)nh, &num_nhops);
Expand Down
2 changes: 1 addition & 1 deletion sys/netinet/in_fib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ check_urpf(struct nhop_object *nh, uint32_t flags,
{
#ifdef ROUTE_MPATH
if (NH_IS_NHGRP(nh)) {
struct weightened_nhop *wn;
const struct weightened_nhop *wn;
uint32_t num_nhops;
wn = nhgrp_get_nhops((struct nhgrp_object *)nh, &num_nhops);
for (int i = 0; i < num_nhops; i++) {
Expand Down
2 changes: 1 addition & 1 deletion sys/netinet6/in6_fib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ check_urpf(struct nhop_object *nh, uint32_t flags,
{
#ifdef ROUTE_MPATH
if (NH_IS_NHGRP(nh)) {
struct weightened_nhop *wn;
const struct weightened_nhop *wn;
uint32_t num_nhops;
wn = nhgrp_get_nhops((struct nhgrp_object *)nh, &num_nhops);
for (int i = 0; i < num_nhops; i++) {
Expand Down

0 comments on commit ae6bfd1

Please sign in to comment.