mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-15 16:56:54 +07:00
cfd280c912
Solution:
=========
- Synchronize linux's `include/uapi/linux/in6.h'
with glibc's `inet/netinet/in.h'.
- Synchronize glibc's `inet/netinet/in.h with linux's
`include/uapi/linux/in6.h'.
- Allow including the headers in either other.
- First header included defines the structures and macros.
Details:
========
The kernel promises not to break the UAPI ABI so I don't
see why we can't just have the two userspace headers
coordinate?
If you include the kernel headers first you get those,
and if you include the glibc headers first you get those,
and the following patch arranges a coordination and
synchronization between the two.
Let's handle `include/uapi/linux/in6.h' from linux,
and `inet/netinet/in.h' from glibc and ensure they compile
in any order and preserve the required ABI.
These two patches pass the following compile tests:
cat >> test1.c <<EOF
int main (void) {
return 0;
}
EOF
gcc -c test1.c
cat >> test2.c <<EOF
int main (void) {
return 0;
}
EOF
gcc -c test2.c
One wrinkle is that the kernel has a different name for one of
the members in ipv6_mreq. In the kernel patch we create a macro
to cover the uses of the old name, and while that's not entirely
clean it's one of the best solutions (aside from an anonymous
union which has other issues).
I've reviewed the code and it looks to me like the ABI is
assured and everything matches on both sides.
Notes:
- You want netinet/in.h to include bits/in.h as early as possible,
but it needs in_addr so define in_addr early.
- You want bits/in.h included as early as possible so you can use
the linux specific code to define __USE_KERNEL_DEFS based on
the _UAPI_* macro definition and use those to cull in.h.
- glibc was missing IPPROTO_MH, added here.
Compile tested and inspected.
Reported-by: Thomas Backlund <tmb@mageia.org>
Cc: Thomas Backlund <tmb@mageia.org>
Cc: libc-alpha@sourceware.org
Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Cc: David S. Miller <davem@davemloft.net>
Tested-by: Cong Wang <amwang@redhat.com>
Signed-off-by: Carlos O'Donell <carlos@redhat.com>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
104 lines
3.5 KiB
C
104 lines
3.5 KiB
C
/*
|
|
* Compatibility interface for userspace libc header coordination:
|
|
*
|
|
* Define compatibility macros that are used to control the inclusion or
|
|
* exclusion of UAPI structures and definitions in coordination with another
|
|
* userspace C library.
|
|
*
|
|
* This header is intended to solve the problem of UAPI definitions that
|
|
* conflict with userspace definitions. If a UAPI header has such conflicting
|
|
* definitions then the solution is as follows:
|
|
*
|
|
* * Synchronize the UAPI header and the libc headers so either one can be
|
|
* used and such that the ABI is preserved. If this is not possible then
|
|
* no simple compatibility interface exists (you need to write translating
|
|
* wrappers and rename things) and you can't use this interface.
|
|
*
|
|
* Then follow this process:
|
|
*
|
|
* (a) Include libc-compat.h in the UAPI header.
|
|
* e.g. #include <linux/libc-compat.h>
|
|
* This include must be as early as possible.
|
|
*
|
|
* (b) In libc-compat.h add enough code to detect that the comflicting
|
|
* userspace libc header has been included first.
|
|
*
|
|
* (c) If the userspace libc header has been included first define a set of
|
|
* guard macros of the form __UAPI_DEF_FOO and set their values to 1, else
|
|
* set their values to 0.
|
|
*
|
|
* (d) Back in the UAPI header with the conflicting definitions, guard the
|
|
* definitions with:
|
|
* #if __UAPI_DEF_FOO
|
|
* ...
|
|
* #endif
|
|
*
|
|
* This fixes the situation where the linux headers are included *after* the
|
|
* libc headers. To fix the problem with the inclusion in the other order the
|
|
* userspace libc headers must be fixed like this:
|
|
*
|
|
* * For all definitions that conflict with kernel definitions wrap those
|
|
* defines in the following:
|
|
* #if !__UAPI_DEF_FOO
|
|
* ...
|
|
* #endif
|
|
*
|
|
* This prevents the redefinition of a construct already defined by the kernel.
|
|
*/
|
|
#ifndef _UAPI_LIBC_COMPAT_H
|
|
#define _UAPI_LIBC_COMPAT_H
|
|
|
|
/* We have included glibc headers... */
|
|
#if defined(__GLIBC__)
|
|
|
|
/* Coordinate with glibc netinet/in.h header. */
|
|
#if defined(_NETINET_IN_H)
|
|
|
|
/* GLIBC headers included first so don't define anything
|
|
* that would already be defined. */
|
|
#define __UAPI_DEF_IN6_ADDR 0
|
|
/* The exception is the in6_addr macros which must be defined
|
|
* if the glibc code didn't define them. This guard matches
|
|
* the guard in glibc/inet/netinet/in.h which defines the
|
|
* additional in6_addr macros e.g. s6_addr16, and s6_addr32. */
|
|
#if defined(__USE_MISC) || defined (__USE_GNU)
|
|
#define __UAPI_DEF_IN6_ADDR_ALT 0
|
|
#else
|
|
#define __UAPI_DEF_IN6_ADDR_ALT 1
|
|
#endif
|
|
#define __UAPI_DEF_SOCKADDR_IN6 0
|
|
#define __UAPI_DEF_IPV6_MREQ 0
|
|
#define __UAPI_DEF_IPPROTO_V6 0
|
|
|
|
#else
|
|
|
|
/* Linux headers included first, and we must define everything
|
|
* we need. The expectation is that glibc will check the
|
|
* __UAPI_DEF_* defines and adjust appropriately. */
|
|
#define __UAPI_DEF_IN6_ADDR 1
|
|
/* We unconditionally define the in6_addr macros and glibc must
|
|
* coordinate. */
|
|
#define __UAPI_DEF_IN6_ADDR_ALT 1
|
|
#define __UAPI_DEF_SOCKADDR_IN6 1
|
|
#define __UAPI_DEF_IPV6_MREQ 1
|
|
#define __UAPI_DEF_IPPROTO_V6 1
|
|
|
|
#endif /* _NETINET_IN_H */
|
|
|
|
|
|
/* If we did not see any headers from any supported C libraries,
|
|
* or we are being included in the kernel, then define everything
|
|
* that we need. */
|
|
#else /* !defined(__GLIBC__) */
|
|
|
|
/* Definitions for in6.h */
|
|
#define __UAPI_DEF_IN6_ADDR 1
|
|
#define __UAPI_DEF_IN6_ADDR_ALT 1
|
|
#define __UAPI_DEF_SOCKADDR_IN6 1
|
|
#define __UAPI_DEF_IPV6_MREQ 1
|
|
#define __UAPI_DEF_IPPROTO_V6 1
|
|
|
|
#endif /* __GLIBC__ */
|
|
|
|
#endif /* _UAPI_LIBC_COMPAT_H */
|