Merge: Fix kselftests build after changes from bz2162116 (ipv4 backports)

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/2009

Unfortunately the uapi headers changes done through bz2162116 broke kernel builds.

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2166738

Any kernel build using kernel-headers-5.14.0-253.el9 will fail when building kselftests.

The reason is that a new macro used in the headers are not included through other header files, upstream doesn't see the error because the definition is included indirectly there.

I identified the commit which fixes this upstream, and made the kselftests build process try to really use the headers from the source tree. Hopefully this prevents us to hit a problem like this in the future. It was also necessary to anyway include <linux/stddef.h> in ip.h/ipv6.h headers, because at least one bpf selftest required it.

Signed-off-by: Herton R. Krzesinski <herton@redhat.com>

Approved-by: Andrea Claudi <aclaudi@redhat.com>
Approved-by: Guillaume Nault <gnault@redhat.com>
Approved-by: Jan Stancek <jstancek@redhat.com>

Signed-off-by: Herton R. Krzesinski <herton@redhat.com>

Author: Herton R. Krzesinski

include/uapi/linux/byteorder/big_endian.h

@@ -9,6 +9,7 @@
 #define __BIG_ENDIAN_BITFIELD
 #endif
 
+#include <linux/stddef.h>
 #include <linux/types.h>
 #include <linux/swab.h>
 

include/uapi/linux/byteorder/little_endian.h

@@ -9,6 +9,7 @@
 #define __LITTLE_ENDIAN_BITFIELD
 #endif
 
+#include <linux/stddef.h>
 #include <linux/types.h>
 #include <linux/swab.h>
 

include/uapi/linux/ip.h

@@ -18,6 +18,7 @@
 #ifndef _UAPI_LINUX_IP_H
 #define _UAPI_LINUX_IP_H
 #include <linux/types.h>
+#include <linux/stddef.h>
 #include <asm/byteorder.h>
 
 #define IPTOS_TOS_MASK		0x1E

include/uapi/linux/ipv6.h

@@ -4,6 +4,7 @@
 
 #include <linux/libc-compat.h>
 #include <linux/types.h>
+#include <linux/stddef.h>
 #include <linux/in6.h>
 #include <asm/byteorder.h>
 

redhat/kernel.spec.template

@@ -2323,7 +2323,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
 pushd tools/testing/selftests
 # We need to install here because we need to call make with ARCH set which
 # doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding net/mptcp netfilter tc-testing memfd" SKIP_TARGETS="" FORCE_TARGETS=1 INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding net/mptcp netfilter tc-testing memfd" SKIP_TARGETS="" FORCE_TARGETS=1 INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" DEFAULT_INSTALL_HDR_PATH=0 install
 
 # 'make install' for bpf is broken and upstream refuses to fix it.
 # Install the needed files manually.