matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

devlink: Use generic socket helpers from library 

User generic socket helpers from library for netlink generic socket
access.

Signed-off-by: Parav Pandit <parav@nvidia.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: David Ahern <dsahern@kernel.org>
This commit is contained in:
Parav Pandit 2021-03-01 12:56:53 +02:00 committed by David Ahern
parent e3a4067e52
commit 62ff25e51b
3 changed files with 161 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

314
devlink/devlink.c
View File

File diff suppressed because it is too large Load Diff

121
devlink/mnlg.c
View File

@ -30,38 +30,11 @@ struct mnlg_socket {
unsigned int seq; unsigned int seq;
}; };
static struct nlmsghdr *__mnlg_msg_prepare(struct mnlg_socket *nlg, uint8_t cmd, int mnlg_socket_send(struct mnlu_gen_socket *nlg, const struct nlmsghdr *nlh)
uint16_t flags, uint32_t id,
uint8_t version)
{
struct genlmsghdr genl = {
.cmd = cmd,
.version = version,
};
struct nlmsghdr *nlh;
nlh = mnlu_msg_prepare(nlg->buf, id, flags, &genl, sizeof(genl));
nlg->seq = nlh->nlmsg_seq;
return nlh;
}
struct nlmsghdr *mnlg_msg_prepare(struct mnlg_socket *nlg, uint8_t cmd,
uint16_t flags)
{
return __mnlg_msg_prepare(nlg, cmd, flags, nlg->id, nlg->version);
}
int mnlg_socket_send(struct mnlg_socket *nlg, const struct nlmsghdr *nlh)
{ {
return mnl_socket_sendto(nlg->nl, nlh, nlh->nlmsg_len); return mnl_socket_sendto(nlg->nl, nlh, nlh->nlmsg_len);
} }
int mnlg_socket_recv_run(struct mnlg_socket *nlg, mnl_cb_t data_cb, void *data)
{
return mnlu_socket_recv_run(nlg->nl, nlg->seq, nlg->buf, MNL_SOCKET_BUFFER_SIZE,
data_cb, data);
}
struct group_info { struct group_info {
bool found; bool found;
uint32_t id; uint32_t id;
@ -141,15 +114,17 @@ static int get_group_id_cb(const struct nlmsghdr *nlh, void *data)
return MNL_CB_OK; return MNL_CB_OK;
} }
int mnlg_socket_group_add(struct mnlg_socket *nlg, const char *group_name) int mnlg_socket_group_add(struct mnlu_gen_socket *nlg, const char *group_name)
{ {
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
struct group_info group_info; struct group_info group_info;
int err; int err;
nlh = __mnlg_msg_prepare(nlg, CTRL_CMD_GETFAMILY, nlh = _mnlu_gen_socket_cmd_prepare(nlg, CTRL_CMD_GETFAMILY,
NLM_F_REQUEST | NLM_F_ACK, GENL_ID_CTRL, 1); NLM_F_REQUEST | NLM_F_ACK,
mnl_attr_put_u16(nlh, CTRL_ATTR_FAMILY_ID, nlg->id); GENL_ID_CTRL, 1);
mnl_attr_put_u16(nlh, CTRL_ATTR_FAMILY_ID, nlg->family);
err = mnlg_socket_send(nlg, nlh); err = mnlg_socket_send(nlg, nlh);
if (err < 0) if (err < 0)
@ -157,7 +132,7 @@ int mnlg_socket_group_add(struct mnlg_socket *nlg, const char *group_name)
group_info.found = false; group_info.found = false;
group_info.name = group_name; group_info.name = group_name;
err = mnlg_socket_recv_run(nlg, get_group_id_cb, &group_info); err = mnlu_gen_socket_recv_run(nlg, get_group_id_cb, &group_info);
if (err < 0) if (err < 0)
return err; return err;
@ -174,85 +149,7 @@ int mnlg_socket_group_add(struct mnlg_socket *nlg, const char *group_name)
return 0; return 0;
} }
static int get_family_id_attr_cb(const struct nlattr *attr, void *data) int mnlg_socket_get_fd(struct mnlu_gen_socket *nlg)
{
const struct nlattr **tb = data;
int type = mnl_attr_get_type(attr);
if (mnl_attr_type_valid(attr, CTRL_ATTR_MAX) < 0)
return MNL_CB_ERROR;
if (type == CTRL_ATTR_FAMILY_ID &&
mnl_attr_validate(attr, MNL_TYPE_U16) < 0)
return MNL_CB_ERROR;
tb[type] = attr;
return MNL_CB_OK;
}
static int get_family_id_cb(const struct nlmsghdr *nlh, void *data)
{
uint32_t *p_id = data;
struct nlattr *tb[CTRL_ATTR_MAX + 1] = {};
struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
mnl_attr_parse(nlh, sizeof(*genl), get_family_id_attr_cb, tb);
if (!tb[CTRL_ATTR_FAMILY_ID])
return MNL_CB_ERROR;
*p_id = mnl_attr_get_u16(tb[CTRL_ATTR_FAMILY_ID]);
return MNL_CB_OK;
}
struct mnlg_socket *mnlg_socket_open(const char *family_name, uint8_t version)
{
struct mnlg_socket *nlg;
struct nlmsghdr *nlh;
int err;
nlg = malloc(sizeof(*nlg));
if (!nlg)
return NULL;
nlg->buf = malloc(MNL_SOCKET_BUFFER_SIZE);
if (!nlg->buf)
goto err_buf_alloc;
nlg->nl = mnlu_socket_open(NETLINK_GENERIC);
if (!nlg->nl)
goto err_socket_open;
nlh = __mnlg_msg_prepare(nlg, CTRL_CMD_GETFAMILY,
NLM_F_REQUEST | NLM_F_ACK, GENL_ID_CTRL, 1);
mnl_attr_put_strz(nlh, CTRL_ATTR_FAMILY_NAME, family_name);
err = mnlg_socket_send(nlg, nlh);
if (err < 0)
goto err_mnlg_socket_send;
err = mnlg_socket_recv_run(nlg, get_family_id_cb, &nlg->id);
if (err < 0)
goto err_mnlg_socket_recv_run;
nlg->version = version;
return nlg;
err_mnlg_socket_recv_run:
err_mnlg_socket_send:
mnl_socket_close(nlg->nl);
err_socket_open:
free(nlg->buf);
err_buf_alloc:
free(nlg);
return NULL;
}
void mnlg_socket_close(struct mnlg_socket *nlg)
{
mnl_socket_close(nlg->nl);
free(nlg->buf);
free(nlg);
}
int mnlg_socket_get_fd(struct mnlg_socket *nlg)
{ {
return mnl_socket_get_fd(nlg->nl); return mnl_socket_get_fd(nlg->nl);
} }

13
devlink/mnlg.h
View File

@ -14,15 +14,10 @@
#include <libmnl/libmnl.h> #include <libmnl/libmnl.h>
struct mnlg_socket; struct mnlu_gen_socket;
struct nlmsghdr *mnlg_msg_prepare(struct mnlg_socket *nlg, uint8_t cmd, int mnlg_socket_send(struct mnlu_gen_socket *nlg, const struct nlmsghdr *nlh);
uint16_t flags); int mnlg_socket_group_add(struct mnlu_gen_socket *nlg, const char *group_name);
int mnlg_socket_send(struct mnlg_socket *nlg, const struct nlmsghdr *nlh); int mnlg_socket_get_fd(struct mnlu_gen_socket *nlg);
int mnlg_socket_recv_run(struct mnlg_socket *nlg, mnl_cb_t data_cb, void *data);
int mnlg_socket_group_add(struct mnlg_socket *nlg, const char *group_name);
struct mnlg_socket *mnlg_socket_open(const char *family_name, uint8_t version);
void mnlg_socket_close(struct mnlg_socket *nlg);
int mnlg_socket_get_fd(struct mnlg_socket *nlg);
#endif /* _MNLG_H_ */ #endif /* _MNLG_H_ */