From d75fdfbc6f260f50cde5d1d566ab010a370df62e Mon Sep 17 00:00:00 2001 From: Jakub Kicinski Date: Mon, 5 Jun 2023 12:01:07 -0700 Subject: tools: ynl: support fou and netdev in C Generate the code for netdev and fou families. They are simple and already supported by the code gen. Reviewed-by: Willem de Bruijn Signed-off-by: Jakub Kicinski --- tools/net/ynl/generated/netdev-user.h | 88 +++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 tools/net/ynl/generated/netdev-user.h (limited to 'tools/net/ynl/generated/netdev-user.h') diff --git a/tools/net/ynl/generated/netdev-user.h b/tools/net/ynl/generated/netdev-user.h new file mode 100644 index 000000000000..d146bc4b2112 --- /dev/null +++ b/tools/net/ynl/generated/netdev-user.h @@ -0,0 +1,88 @@ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ +/* Do not edit directly, auto-generated from: */ +/* Documentation/netlink/specs/netdev.yaml */ +/* YNL-GEN user header */ + +#ifndef _LINUX_NETDEV_GEN_H +#define _LINUX_NETDEV_GEN_H + +#include +#include +#include +#include + +struct ynl_sock; + +extern const struct ynl_family ynl_netdev_family; + +/* Enums */ +const char *netdev_op_str(int op); +const char *netdev_xdp_act_str(enum netdev_xdp_act value); + +/* Common nested types */ +/* ============== NETDEV_CMD_DEV_GET ============== */ +/* NETDEV_CMD_DEV_GET - do */ +struct netdev_dev_get_req { + struct { + __u32 ifindex:1; + } _present; + + __u32 ifindex; +}; + +static inline struct netdev_dev_get_req *netdev_dev_get_req_alloc(void) +{ + return calloc(1, sizeof(struct netdev_dev_get_req)); +} +void netdev_dev_get_req_free(struct netdev_dev_get_req *req); + +static inline void +netdev_dev_get_req_set_ifindex(struct netdev_dev_get_req *req, __u32 ifindex) +{ + req->_present.ifindex = 1; + req->ifindex = ifindex; +} + +struct netdev_dev_get_rsp { + struct { + __u32 ifindex:1; + __u32 xdp_features:1; + } _present; + + __u32 ifindex; + __u64 xdp_features; +}; + +void netdev_dev_get_rsp_free(struct netdev_dev_get_rsp *rsp); + +/* + * Get / dump information about a netdev. + */ +struct netdev_dev_get_rsp * +netdev_dev_get(struct ynl_sock *ys, struct netdev_dev_get_req *req); + +/* NETDEV_CMD_DEV_GET - dump */ +struct netdev_dev_get_list { + struct netdev_dev_get_list *next; + struct netdev_dev_get_rsp obj __attribute__ ((aligned (8))); +}; + +void netdev_dev_get_list_free(struct netdev_dev_get_list *rsp); + +struct netdev_dev_get_list *netdev_dev_get_dump(struct ynl_sock *ys); + +/* NETDEV_CMD_DEV_GET - notify */ +struct netdev_dev_get_ntf { + __u16 family; + __u8 cmd; + struct ynl_ntf_base_type *next; + void (*free)(struct netdev_dev_get_ntf *ntf); + struct netdev_dev_get_rsp obj __attribute__ ((aligned (8))); +}; + +void netdev_dev_get_ntf_free(struct netdev_dev_get_ntf *rsp); + +/* --------------- Common notification parsing --------------- */ +struct ynl_ntf_base_type *netdev_ntf_parse(struct ynl_sock *ys); + +#endif /* _LINUX_NETDEV_GEN_H */ -- cgit v1.2.3 From d0915d64c3a636f73065dbb7e5aab78eb7e75f0d Mon Sep 17 00:00:00 2001 From: Jakub Kicinski Date: Thu, 8 Jun 2023 14:11:56 -0700 Subject: tools: ynl: regen: stop generating common notification handlers Remove unused notification handlers. Signed-off-by: Jakub Kicinski --- tools/net/ynl/generated/handshake-user.c | 45 ------------------------------ tools/net/ynl/generated/handshake-user.h | 3 -- tools/net/ynl/generated/netdev-user.c | 47 -------------------------------- tools/net/ynl/generated/netdev-user.h | 3 -- 4 files changed, 98 deletions(-) (limited to 'tools/net/ynl/generated/netdev-user.h') diff --git a/tools/net/ynl/generated/handshake-user.c b/tools/net/ynl/generated/handshake-user.c index 3a0392b3355e..7c67765daf90 100644 --- a/tools/net/ynl/generated/handshake-user.c +++ b/tools/net/ynl/generated/handshake-user.c @@ -315,51 +315,6 @@ int handshake_done(struct ynl_sock *ys, struct handshake_done_req *req) return 0; } -/* --------------- Common notification parsing --------------- */ -struct ynl_ntf_base_type *handshake_ntf_parse(struct ynl_sock *ys) -{ - struct ynl_parse_arg yarg = { .ys = ys, }; - struct ynl_ntf_base_type *rsp; - struct genlmsghdr *genlh; - struct nlmsghdr *nlh; - mnl_cb_t parse; - int len, err; - - len = mnl_socket_recvfrom(ys->sock, ys->rx_buf, MNL_SOCKET_BUFFER_SIZE); - if (len < (ssize_t)(sizeof(*nlh) + sizeof(*genlh))) - return NULL; - - nlh = (struct nlmsghdr *)ys->rx_buf; - genlh = mnl_nlmsg_get_payload(nlh); - - switch (genlh->cmd) { - case HANDSHAKE_CMD_READY: - rsp = calloc(1, sizeof(struct handshake_accept_ntf)); - parse = handshake_accept_rsp_parse; - yarg.rsp_policy = &handshake_accept_nest; - rsp->free = (void *)handshake_accept_ntf_free; - break; - default: - ynl_error_unknown_notification(ys, genlh->cmd); - return NULL; - } - - yarg.data = rsp->data; - - err = mnl_cb_run2(ys->rx_buf, len, 0, 0, parse, &yarg, - ynl_cb_array, NLMSG_MIN_TYPE); - if (err < 0) - goto err_free; - - rsp->family = nlh->nlmsg_type; - rsp->cmd = genlh->cmd; - return rsp; - -err_free: - free(rsp); - return NULL; -} - static const struct ynl_ntf_info handshake_ntf_info[] = { [HANDSHAKE_CMD_READY] = { .alloc_sz = sizeof(struct handshake_accept_ntf), diff --git a/tools/net/ynl/generated/handshake-user.h b/tools/net/ynl/generated/handshake-user.h index 38e0844f2efd..47646bb91cea 100644 --- a/tools/net/ynl/generated/handshake-user.h +++ b/tools/net/ynl/generated/handshake-user.h @@ -142,7 +142,4 @@ __handshake_done_req_set_remote_auth(struct handshake_done_req *req, */ int handshake_done(struct ynl_sock *ys, struct handshake_done_req *req); -/* --------------- Common notification parsing --------------- */ -struct ynl_ntf_base_type *handshake_ntf_parse(struct ynl_sock *ys); - #endif /* _LINUX_HANDSHAKE_GEN_H */ diff --git a/tools/net/ynl/generated/netdev-user.c b/tools/net/ynl/generated/netdev-user.c index 12069784637e..4eb8aefef0cd 100644 --- a/tools/net/ynl/generated/netdev-user.c +++ b/tools/net/ynl/generated/netdev-user.c @@ -172,53 +172,6 @@ void netdev_dev_get_ntf_free(struct netdev_dev_get_ntf *rsp) free(rsp); } -/* --------------- Common notification parsing --------------- */ -struct ynl_ntf_base_type *netdev_ntf_parse(struct ynl_sock *ys) -{ - struct ynl_parse_arg yarg = { .ys = ys, }; - struct ynl_ntf_base_type *rsp; - struct genlmsghdr *genlh; - struct nlmsghdr *nlh; - mnl_cb_t parse; - int len, err; - - len = mnl_socket_recvfrom(ys->sock, ys->rx_buf, MNL_SOCKET_BUFFER_SIZE); - if (len < (ssize_t)(sizeof(*nlh) + sizeof(*genlh))) - return NULL; - - nlh = (struct nlmsghdr *)ys->rx_buf; - genlh = mnl_nlmsg_get_payload(nlh); - - switch (genlh->cmd) { - case NETDEV_CMD_DEV_ADD_NTF: - case NETDEV_CMD_DEV_DEL_NTF: - case NETDEV_CMD_DEV_CHANGE_NTF: - rsp = calloc(1, sizeof(struct netdev_dev_get_ntf)); - parse = netdev_dev_get_rsp_parse; - yarg.rsp_policy = &netdev_dev_nest; - rsp->free = (void *)netdev_dev_get_ntf_free; - break; - default: - ynl_error_unknown_notification(ys, genlh->cmd); - return NULL; - } - - yarg.data = rsp->data; - - err = mnl_cb_run2(ys->rx_buf, len, 0, 0, parse, &yarg, - ynl_cb_array, NLMSG_MIN_TYPE); - if (err < 0) - goto err_free; - - rsp->family = nlh->nlmsg_type; - rsp->cmd = genlh->cmd; - return rsp; - -err_free: - free(rsp); - return NULL; -} - static const struct ynl_ntf_info netdev_ntf_info[] = { [NETDEV_CMD_DEV_ADD_NTF] = { .alloc_sz = sizeof(struct netdev_dev_get_ntf), diff --git a/tools/net/ynl/generated/netdev-user.h b/tools/net/ynl/generated/netdev-user.h index d146bc4b2112..5554dc69bb9c 100644 --- a/tools/net/ynl/generated/netdev-user.h +++ b/tools/net/ynl/generated/netdev-user.h @@ -82,7 +82,4 @@ struct netdev_dev_get_ntf { void netdev_dev_get_ntf_free(struct netdev_dev_get_ntf *rsp); -/* --------------- Common notification parsing --------------- */ -struct ynl_ntf_base_type *netdev_ntf_parse(struct ynl_sock *ys); - #endif /* _LINUX_NETDEV_GEN_H */ -- cgit v1.2.3