Skip to content

Commit

Permalink
Merge pull request #15175 from idryzhov/affinity-map-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@choppsv1
choppsv1 authored Jan 19, 2024
2 parents 2844d09 + 01be34f commit e37f18b
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 257 deletions.
30 changes: 0 additions & 30 deletions isisd/isis_affinitymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,6 @@

#ifndef FABRICD

static bool isis_affinity_map_check_use(const char *affmap_name)
{
struct isis *isis = isis_lookup_by_vrfid(VRF_DEFAULT);
struct isis_area *area;
struct listnode *area_node, *fa_node;
struct flex_algo *fa;
struct affinity_map *map;
uint16_t pos;

if (!isis)
return false;

map = affinity_map_get(affmap_name);
pos = map->bit_position;

for (ALL_LIST_ELEMENTS_RO(isis->area_list, area_node, area)) {
for (ALL_LIST_ELEMENTS_RO(area->flex_algos->flex_algos, fa_node,
fa)) {
if (admin_group_get(&fa->admin_group_exclude_any,
pos) ||
admin_group_get(&fa->admin_group_include_any,
pos) ||
admin_group_get(&fa->admin_group_include_all, pos))
return true;
}
}
return false;
}

static void isis_affinity_map_update(const char *affmap_name, uint16_t old_pos,
uint16_t new_pos)
{
Expand Down Expand Up @@ -90,7 +61,6 @@ void isis_affinity_map_init(void)
{
affinity_map_init();

affinity_map_set_check_use_hook(isis_affinity_map_check_use);
affinity_map_set_update_hook(isis_affinity_map_update);
}

Expand Down
44 changes: 1 addition & 43 deletions lib/affinitymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ DEFINE_MTYPE_STATIC(LIB, AFFINITY_MAP_INDEX, "Affinity map index");
DEFINE_QOBJ_TYPE(affinity_maps);
DEFINE_QOBJ_TYPE(affinity_map);

struct affinity_maps affinity_map_master = {NULL, NULL, NULL, NULL};
struct affinity_maps affinity_map_master = {NULL, NULL};

static void affinity_map_free(struct affinity_map *map)
{
Expand Down Expand Up @@ -106,36 +106,6 @@ struct affinity_map *affinity_map_get(const char *name)
return NULL;
}


char *affinity_map_name_get(int pos)
{
struct listnode *node;
struct affinity_map *map;

if (!affinity_map_master.maps)
return NULL;

for (ALL_LIST_ELEMENTS_RO(affinity_map_master.maps, node, map))
if (map->bit_position == pos)
return map->name;
return NULL;
}

bool affinity_map_check_use_hook(const char *affmap_name)
{
if (affinity_map_master.check_use_hook)
return (*affinity_map_master.check_use_hook)(affmap_name);
return false;
}

bool affinity_map_check_update_hook(const char *affmap_name, uint16_t new_pos)
{
if (affinity_map_master.check_update_hook)
return (*affinity_map_master.check_update_hook)(affmap_name,
new_pos);
return true;
}

void affinity_map_update_hook(const char *affmap_name, uint16_t new_pos)
{
struct affinity_map *map;
Expand All @@ -153,18 +123,6 @@ void affinity_map_update_hook(const char *affmap_name, uint16_t new_pos)
new_pos);
}


void affinity_map_set_check_use_hook(bool (*func)(const char *affmap_name))
{
affinity_map_master.check_use_hook = func;
}

void affinity_map_set_check_update_hook(bool (*func)(const char *affmap_name,
uint16_t new_pos))
{
affinity_map_master.check_update_hook = func;
}

void affinity_map_set_update_hook(void (*func)(const char *affmap_name,
uint16_t old_pos,
uint16_t new_pos))
Expand Down
8 changes: 0 additions & 8 deletions lib/affinitymap.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ DECLARE_QOBJ_TYPE(affinity_map);
struct affinity_maps {
struct list *maps;

bool (*check_use_hook)(const char *affmap_name);
bool (*check_update_hook)(const char *affmap_name, uint16_t new_pos);
void (*update_hook)(const char *affmap_name, uint16_t old_pos,
uint16_t new_pos);

Expand All @@ -64,15 +62,9 @@ extern const struct frr_yang_module_info frr_affinity_map_info;
void affinity_map_set(const char *name, int pos);
void affinity_map_unset(const char *name);
struct affinity_map *affinity_map_get(const char *name);
char *affinity_map_name_get(const int pos);

bool affinity_map_check_use_hook(const char *affmap_name);
bool affinity_map_check_update_hook(const char *affmap_name, uint16_t new_pos);
void affinity_map_update_hook(const char *affmap_name, uint16_t new_pos);

void affinity_map_set_check_use_hook(bool (*func)(const char *affmap_name));
void affinity_map_set_check_update_hook(bool (*func)(const char *affmap_name,
uint16_t new_pos));
void affinity_map_set_update_hook(void (*func)(const char *affmap_name,
uint16_t old_pos,
uint16_t new_pos));
Expand Down
26 changes: 0 additions & 26 deletions lib/affinitymap_northbound.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@ static int lib_affinity_map_destroy(struct nb_cb_destroy_args *args)

switch (args->event) {
case NB_EV_VALIDATE:
if (!affinity_map_check_use_hook(name))
break;
snprintf(args->errmsg, args->errmsg_len,
"affinity-map %s is used", name);
return NB_ERR_VALIDATION;
case NB_EV_PREPARE:
case NB_EV_ABORT:
break;
Expand All @@ -68,7 +63,6 @@ static int lib_affinity_map_destroy(struct nb_cb_destroy_args *args)
static int lib_affinity_map_value_modify(struct nb_cb_modify_args *args)
{
const char *name;
char *map_name;
uint16_t pos;

name = yang_dnode_get_string(
Expand All @@ -79,20 +73,6 @@ static int lib_affinity_map_value_modify(struct nb_cb_modify_args *args)

switch (args->event) {
case NB_EV_VALIDATE:
map_name = affinity_map_name_get(pos);
if (map_name &&
strncmp(map_name, name, AFFINITY_NAME_SIZE) != 0) {
snprintf(args->errmsg, args->errmsg_len,
"bit-position is used by %s.", map_name);
return NB_ERR_VALIDATION;
}
if (!affinity_map_check_update_hook(name, pos)) {
snprintf(
args->errmsg, args->errmsg_len,
"affinity-map new bit-position > 31 but is used with standard admin-groups");
return NB_ERR_VALIDATION;
}
break;
case NB_EV_PREPARE:
case NB_EV_ABORT:
break;
Expand All @@ -105,11 +85,6 @@ static int lib_affinity_map_value_modify(struct nb_cb_modify_args *args)
return NB_OK;
}

static int lib_affinity_map_value_destroy(struct nb_cb_destroy_args *args)
{
return NB_OK;
}

/* clang-format off */
const struct frr_yang_module_info frr_affinity_map_info = {
.name = "frr-affinity-map",
Expand All @@ -126,7 +101,6 @@ const struct frr_yang_module_info frr_affinity_map_info = {
.xpath = "/frr-affinity-map:lib/affinity-maps/affinity-map/value",
.cbs = {
.modify = lib_affinity_map_value_modify,
.destroy = lib_affinity_map_value_destroy,
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion lib/if.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1135,7 +1135,7 @@ struct if_link_params *if_link_params_enable(struct interface *ifp)
iflp->unrsv_bw[i] = iflp->default_bw;

/* Update Link parameters status */
iflp->lp_status = LP_MAX_BW | LP_MAX_RSV_BW | LP_UNRSV_BW;
iflp->lp_status = LP_MAX_BW | LP_MAX_RSV_BW | LP_UNRSV_BW | LP_EXTEND_ADM_GRP;

/* Set TE metric equal to standard metric only if it is set */
if (ifp->metric != 0) {
Expand Down
11 changes: 11 additions & 0 deletions yang/frr-affinity-map.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,22 @@ module frr-affinity-map {
"Initial revision";
}

typedef affinity-map-ref {
type leafref {
path "/frr-affinity-map:lib/frr-affinity-map:affinity-maps/frr-affinity-map:affinity-map/frr-affinity-map:name";
require-instance true;
}
description
"Reference to an affinity map";
}

container lib {
container affinity-maps {
description
"Affinity Mapping Table";
list affinity-map {
key "name";
unique "value";
description
"Affinity Mapping configuration";
leaf name {
Expand All @@ -69,6 +79,7 @@ module frr-affinity-map {
"Affinity Name";
}
leaf value {
mandatory true;
type uint16 {
range "0..1023";
}
Expand Down
5 changes: 4 additions & 1 deletion yang/frr-zebra.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2011,8 +2011,11 @@ module frr-zebra {
case affinity {
container affinities {
leaf-list affinity {
type string;
type frr-affinity-map:affinity-map-ref;
max-elements "256";
must '../../affinity-mode != "standard" or /frr-affinity-map:lib/frr-affinity-map:affinity-maps/frr-affinity-map:affinity-map[frr-affinity-map:name=current()]/frr-affinity-map:value < 32' {
error-message "Affinity bit-position must be less than 32 when used with standard affinity mode";
}
description
"Array of Attribute Names";
}
Expand Down
45 changes: 9 additions & 36 deletions zebra/interface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4256,23 +4256,10 @@ DEFPY_YANG(link_params_admin_grp, link_params_admin_grp_cmd,
"Administrative group membership\n"
"32-bit Hexadecimal value (e.g. 0xa1)\n")
{
char xpath[XPATH_MAXLEN];
int idx_bitpattern = 1;
unsigned long value;
char value_str[11];

VTY_DECLVAR_CONTEXT(interface, ifp);

snprintf(
xpath, sizeof(xpath),
"/frr-interface:lib/interface[name='%s']/frr-zebra:zebra/link-params/affinities",
ifp->name);
if (yang_dnode_exists(running_config->dnode, xpath)) {
vty_out(vty,
"cannot use the admin-grp command when affinity is set\n");
return CMD_WARNING_CONFIG_FAILED;
}

if (sscanf(argv[idx_bitpattern]->arg, "0x%lx", &value) != 1) {
vty_out(vty, "link_params_admin_grp: fscanf: %s\n",
safe_strerror(errno));
Expand Down Expand Up @@ -4738,19 +4725,6 @@ DEFPY_YANG(link_params_affinity, link_params_affinity_cmd,
"Interface affinities\n"
"Affinity names\n")
{
VTY_DECLVAR_CONTEXT(interface, ifp);
char xpath[XPATH_MAXLEN];

snprintf(
xpath, sizeof(xpath),
"/frr-interface:lib/interface[name='%s']/frr-zebra:zebra/link-params/legacy-admin-group",
ifp->name);
if (yang_dnode_exists(running_config->dnode, xpath)) {
vty_out(vty,
"cannot use the affinity command when admin-grp is set\n");
return CMD_WARNING_CONFIG_FAILED;
}

return ag_change(vty, argc, argv,
"./frr-zebra:zebra/link-params/affinities/affinity",
no, no ? 2 : 1);
Expand All @@ -4764,8 +4738,8 @@ DEFPY_YANG(link_params_affinity, link_params_affinity_cmd,
DEFPY_YANG(link_params_affinity_mode, link_params_affinity_mode_cmd,
"affinity-mode <standard|extended|both>$affmode",
"Interface affinity mode\n"
"Standard Admin-Group only RFC3630,5305,5329 (default)\n"
"Extended Admin-Group only RFC7308\n"
"Standard Admin-Group only RFC3630,5305,5329\n"
"Extended Admin-Group only RFC7308 (default)\n"
"Standard and extended Admin-Group format\n")
{
const char *xpath = "./frr-zebra:zebra/link-params/affinity-mode";
Expand All @@ -4779,13 +4753,13 @@ DEFPY_YANG(no_link_params_affinity_mode, no_link_params_affinity_mode_cmd,
"no affinity-mode [<standard|extended|both>]",
NO_STR
"Interface affinity mode\n"
"Standard Admin-Group only RFC3630,5305,5329 (default)\n"
"Extended Admin-Group only RFC7308\n"
"Standard Admin-Group only RFC3630,5305,5329\n"
"Extended Admin-Group only RFC7308 (default)\n"
"Standard and extended Admin-Group format\n")
{
const char *xpath = "./frr-zebra:zebra/link-params/affinity-mode";

nb_cli_enqueue_change(vty, xpath, NB_OP_MODIFY, "standard");
nb_cli_enqueue_change(vty, xpath, NB_OP_MODIFY, "extended");

return nb_cli_apply_changes(vty, NULL);
}
Expand All @@ -4801,11 +4775,8 @@ static int ag_iter_cb(const struct lyd_node *dnode, void *arg)
void cli_show_legacy_admin_group(struct vty *vty, const struct lyd_node *dnode,
bool show_defaults)
{
if (!yang_dnode_exists(dnode, "legacy-admin-group"))
return;

vty_out(vty, " admin-group 0x%x\n",
yang_dnode_get_uint32(dnode, "legacy-admin-group"));
vty_out(vty, " admin-grp 0x%x\n",
yang_dnode_get_uint32(dnode, NULL));
}

void cli_show_affinity_mode(struct vty *vty, const struct lyd_node *dnode,
Expand All @@ -4817,6 +4788,8 @@ void cli_show_affinity_mode(struct vty *vty, const struct lyd_node *dnode,
vty_out(vty, " affinity-mode standard\n");
else if (affinity_mode == AFFINITY_MODE_BOTH)
vty_out(vty, " affinity-mode both\n");
else if (affinity_mode == AFFINITY_MODE_EXTENDED && show_defaults)
vty_out(vty, " affinity-mode extended\n");
}

void cli_show_affinity(struct vty *vty, const struct lyd_node *dnode,
Expand Down
Loading

0 comments on commit e37f18b

Please sign in to comment.