Commit 51ebe6b1 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'tools-ynl-gen-add-support-for-inherited-selector-and-therefore-tc' 

Jakub Kicinski says:

====================
tools: ynl-gen: add support for "inherited" selector and therefore TC

Add C codegen support for constructs needed by TC, namely passing
sub-message selector from a lower nest, and sub-messages with
fixed headers.
====================

Link: https://patch.msgid.link/20250520161916.413298-1-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e6b3527c 4e4dc6db

Documentation/netlink/specs/tc.yaml

+270 −244

File changed.

Preview size limit exceeded, changes collapsed.

include/uapi/linux/neighbour.h

+2 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef __LINUX_NEIGHBOUR_H

#define __LINUX_NEIGHBOUR_H

#ifndef _UAPI__LINUX_NEIGHBOUR_H

#define _UAPI__LINUX_NEIGHBOUR_H



#include <linux/types.h>

#include <linux/netlink.h>

tools/net/ynl/Makefile.deps

+9 −1
Original line number Diff line number Diff line
@@ -35,7 +35,15 @@ CFLAGS_rt-addr:=$(call get_hdr_inc,__LINUX_RTNETLINK_H,rtnetlink.h) \ 
	$(call get_hdr_inc,__LINUX_IF_ADDR_H,if_addr.h)

CFLAGS_rt-link:=$(call get_hdr_inc,__LINUX_RTNETLINK_H,rtnetlink.h) \

	$(call get_hdr_inc,_LINUX_IF_LINK_H,if_link.h)

CFLAGS_rt-neigh:=$(call get_hdr_inc,__LINUX_RTNETLINK_H,rtnetlink.h)

CFLAGS_rt-neigh:=$(call get_hdr_inc,__LINUX_RTNETLINK_H,rtnetlink.h) \

	$(call get_hdr_inc,__LINUX_NEIGHBOUR_H,neighbour.h)

CFLAGS_rt-route:=$(call get_hdr_inc,__LINUX_RTNETLINK_H,rtnetlink.h)

CFLAGS_rt-rule:=$(call get_hdr_inc,__LINUX_FIB_RULES_H,fib_rules.h)

CFLAGS_tc:= $(call get_hdr_inc,__LINUX_RTNETLINK_H,rtnetlink.h) \

	$(call get_hdr_inc,__LINUX_PKT_SCHED_H,pkt_sched.h) \

	$(call get_hdr_inc,__LINUX_PKT_CLS_H,pkt_cls.h) \

	$(call get_hdr_inc,_TC_CT_H,tc_act/tc_ct.h) \

	$(call get_hdr_inc,_TC_MIRRED_H,tc_act/tc_mirred.h) \

	$(call get_hdr_inc,_TC_SKBEDIT_H,tc_act/tc_skbedit.h) \

	$(call get_hdr_inc,_TC_TUNNEL_KEY_H,tc_act/tc_tunnel_key.h)

CFLAGS_tcp_metrics:=$(call get_hdr_inc,_LINUX_TCP_METRICS_H,tcp_metrics.h)

tools/net/ynl/generated/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ TOOL_RST:=../pyynl/ynl_gen_rst.py 


SPECS_DIR:=../../../../Documentation/netlink/specs

SPECS_PATHS=$(wildcard $(SPECS_DIR)/*.yaml)

GENS_UNSUP=conntrack nftables tc

GENS_UNSUP=conntrack nftables

GENS=$(filter-out ${GENS_UNSUP},$(patsubst $(SPECS_DIR)/%.yaml,%,${SPECS_PATHS}))

SRCS=$(patsubst %,%-user.c,${GENS})

HDRS=$(patsubst %,%-user.h,${GENS})

tools/net/ynl/lib/ynl-priv.h

+6 −2
Original line number Diff line number Diff line
@@ -213,11 +213,15 @@ static inline void *ynl_attr_data_end(const struct nlattr *attr) 
				     NLMSG_HDRLEN + fixed_hdr_sz); attr; \

	     (attr) = ynl_attr_next(ynl_nlmsg_end_addr(nlh), attr))



#define ynl_attr_for_each_nested(attr, outer)				\

#define ynl_attr_for_each_nested_off(attr, outer, offset)		\

	for ((attr) = ynl_attr_first(outer, outer->nla_len,		\

				     sizeof(struct nlattr)); attr;	\

				     sizeof(struct nlattr) + offset);	\

	     attr;							\

	     (attr) = ynl_attr_next(ynl_attr_data_end(outer), attr))



#define ynl_attr_for_each_nested(attr, outer)				\

	ynl_attr_for_each_nested_off(attr, outer, 0)



#define ynl_attr_for_each_payload(start, len, attr)			\

	for ((attr) = ynl_attr_first(start, len, 0); attr;		\

	     (attr) = ynl_attr_next(start + len, attr))