korg/iproute2
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/iproute2/iproute2.git synced 2024-11-15 14:05:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

devlink: load port-ifname map on demand

Browse Source 
So far, the port-ifname map was loaded during devlink init
no matter if actually needed or not. Port dump cmd which is utilized
for this in kernel takes lock for every devlink instance.
That may lead to unnecessary blockage of command.

Load the map only in time it is needed to lookup ifname.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: David Ahern <dsahern@kernel.org>
This commit is contained in:
Jiri Pirko 2022-08-25 10:04:19 +02:00 committed by David Ahern
parent fc6be06cab
commit 5cddbb274e
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
devlink/devlink.c
View File

@ -374,6 +374,7 @@ struct dl {
bool verbose; bool verbose;
bool stats; bool stats;
bool hex; bool hex;
bool map_loaded;
struct { struct {
bool present; bool present;
char *bus_name; char *bus_name;
@ -817,14 +818,16 @@ static void ifname_map_fini(struct dl *dl)
} }
} }
static int ifname_map_init(struct dl *dl) static void ifname_map_init(struct dl *dl)
{
INIT_LIST_HEAD(&dl->ifname_map_list);
}
static int ifname_map_load(struct dl *dl)
{ {
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
int err; int err;
INIT_LIST_HEAD(&dl->ifname_map_list);
nlh = mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_PORT_GET, nlh = mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_PORT_GET,
NLM_F_REQUEST | NLM_F_ACK | NLM_F_DUMP); NLM_F_REQUEST | NLM_F_ACK | NLM_F_DUMP);
@ -841,7 +844,16 @@ static int ifname_map_lookup(struct dl *dl, const char *ifname,
uint32_t *p_port_index) uint32_t *p_port_index)
{ {
struct ifname_map *ifname_map; struct ifname_map *ifname_map;
int err;
if (!dl->map_loaded) {
err = ifname_map_load(dl);
if (err) {
pr_err("Failed to create index map\n");
return err;
}
dl->map_loaded = true;
}
list_for_each_entry(ifname_map, &dl->ifname_map_list, list) { list_for_each_entry(ifname_map, &dl->ifname_map_list, list) {
if (strcmp(ifname, ifname_map->ifname) == 0) { if (strcmp(ifname, ifname_map->ifname) == 0) {
*p_bus_name = ifname_map->bus_name; *p_bus_name = ifname_map->bus_name;
@ -9622,17 +9634,10 @@ static int dl_init(struct dl *dl)
return -errno; return -errno;
} }
err = ifname_map_init(dl); ifname_map_init(dl);
if (err) {
pr_err("Failed to create index map\n");
goto err_ifname_map_create;
}
new_json_obj_plain(dl->json_output); new_json_obj_plain(dl->json_output);
return 0; return 0;
err_ifname_map_create:
mnlu_gen_socket_close(&dl->nlg);
return err;
} }
static void dl_fini(struct dl *dl) static void dl_fini(struct dl *dl)