Re: [PATCH net-next 8/9] tools: ynl: enable codegen for all rt- families

[Jakub Kicinski <kuba@kernel.org>]

On Mon, 19 May 2025 16:49:49 +0200 Kory Maincent wrote:
> > -GENS=$(patsubst $(SPECS_DIR)/%.yaml,%,${GENS_PATHS}) rt-addr rt-route
> > +SPECS_PATHS=$(wildcard $(SPECS_DIR)/*.yaml)
> > +GENS_UNSUP=conntrack nftables tc
> > +GENS=$(filter-out ${GENS_UNSUP},$(patsubst
> > $(SPECS_DIR)/%.yaml,%,${SPECS_PATHS})) SRCS=$(patsubst %,%-user.c,${GENS})
> >  HDRS=$(patsubst %,%-user.h,${GENS})
> >  OBJS=$(patsubst %,%-user.o,${GENS})  
> 
> This patch introduces a build error when building the specs.
> 
> Maybe we should add a spec build check in the net CI?

Sorry about that :( We do have build tests, but the problem only
happens if system headers are much older than the spec. Looks like
these defines are there on both Fedora and Ubuntu LTS so builds pass.
Once the initial support is merged we should be out of the woods.

I can't repro on any of my systems, could you see if 
https://lore.kernel.org/all/20250517001318.285800-1-kuba@kernel.org/
will also give you trouble?

For the issue reported here could you see if this is enough?

diff --git a/tools/net/ynl/Makefile.deps b/tools/net/ynl/Makefile.deps
index 4e5c4dff9188..21132e89ceba 100644
--- a/tools/net/ynl/Makefile.deps
+++ b/tools/net/ynl/Makefile.deps
@@ -35,7 +35,8 @@ 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_PKT_SCHED_H,pkt_sched.h) \
diff --git a/include/uapi/linux/neighbour.h b/include/uapi/linux/neighbour.h
index 5e67a7eaf4a7..b851c36ad25d 100644
--- a/include/uapi/linux/neighbour.h
+++ b/include/uapi/linux/neighbour.h
@@ -1,6 +1,6 @@
 /* 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>