Commit 25b5a2a1 authored by Stanislav Fomichev's avatar Stanislav Fomichev Committed by Jakub Kicinski
Browse files

ynl: regenerate all headers 



Also add support to pass topdir to ynl-regen.sh (Jakub) and call
it from the makefile to update the UAPI headers.

Signed-off-by: default avatarStanislav Fomichev <sdf@google.com>
Co-developed-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Link: https://lore.kernel.org/r/20230727163001.3952878-4-sdf@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 37844828

include/uapi/linux/netdev.h

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


/**

 * enum netdev_xdp_act

 * @NETDEV_XDP_ACT_BASIC: XDP feautues set supported by all drivers

 * @NETDEV_XDP_ACT_BASIC: XDP features set supported by all drivers

 *   (XDP_ABORTED, XDP_DROP, XDP_PASS, XDP_TX)

 * @NETDEV_XDP_ACT_REDIRECT: The netdev supports XDP_REDIRECT

 * @NETDEV_XDP_ACT_NDO_XMIT: This feature informs if netdev implements
@@ -34,6 +34,7 @@ enum netdev_xdp_act { 
	NETDEV_XDP_ACT_RX_SG = 32,

	NETDEV_XDP_ACT_NDO_XMIT_SG = 64,



	/* private: */

	NETDEV_XDP_ACT_MASK = 127,

};

tools/include/uapi/linux/netdev.h

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


/**

 * enum netdev_xdp_act

 * @NETDEV_XDP_ACT_BASIC: XDP feautues set supported by all drivers

 * @NETDEV_XDP_ACT_BASIC: XDP features set supported by all drivers

 *   (XDP_ABORTED, XDP_DROP, XDP_PASS, XDP_TX)

 * @NETDEV_XDP_ACT_REDIRECT: The netdev supports XDP_REDIRECT

 * @NETDEV_XDP_ACT_NDO_XMIT: This feature informs if netdev implements
@@ -34,6 +34,7 @@ enum netdev_xdp_act { 
	NETDEV_XDP_ACT_RX_SG = 32,

	NETDEV_XDP_ACT_NDO_XMIT_SG = 64,



	/* private: */

	NETDEV_XDP_ACT_MASK = 127,

};

tools/net/ynl/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
SUBDIRS = lib generated samples



all: $(SUBDIRS)

	./ynl-regen.sh -f -p $(PWD)/../../../



$(SUBDIRS):

	@if [ -f "$@/Makefile" ] ; then \

tools/net/ynl/generated/netdev-user.c

+6 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ struct ynl_policy_attr netdev_dev_policy[NETDEV_A_DEV_MAX + 1] = { 
	[NETDEV_A_DEV_IFINDEX] = { .name = "ifindex", .type = YNL_PT_U32, },

	[NETDEV_A_DEV_PAD] = { .name = "pad", .type = YNL_PT_IGNORE, },

	[NETDEV_A_DEV_XDP_FEATURES] = { .name = "xdp-features", .type = YNL_PT_U64, },

	[NETDEV_A_DEV_XDP_ZC_MAX_SEGS] = { .name = "xdp-zc-max-segs", .type = YNL_PT_U32, },

};



struct ynl_policy_nest netdev_dev_nest = {
@@ -91,6 +92,11 @@ int netdev_dev_get_rsp_parse(const struct nlmsghdr *nlh, void *data) 
				return MNL_CB_ERROR;

			dst->_present.xdp_features = 1;

			dst->xdp_features = mnl_attr_get_u64(attr);

		} else if (type == NETDEV_A_DEV_XDP_ZC_MAX_SEGS) {

			if (ynl_attr_validate(yarg, attr))

				return MNL_CB_ERROR;

			dst->_present.xdp_zc_max_segs = 1;

			dst->xdp_zc_max_segs = mnl_attr_get_u32(attr);

		}

	}

tools/net/ynl/generated/netdev-user.h

+2 −0
Original line number Diff line number Diff line
@@ -47,10 +47,12 @@ struct netdev_dev_get_rsp { 
	struct {

		__u32 ifindex:1;

		__u32 xdp_features:1;

		__u32 xdp_zc_max_segs:1;

	} _present;



	__u32 ifindex;

	__u64 xdp_features;

	__u32 xdp_zc_max_segs;

};



void netdev_dev_get_rsp_free(struct netdev_dev_get_rsp *rsp);