| Message ID | 20240425105138.1361098-1-pablo@netfilter.org (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
On Thu, 25 Apr 2024 12:51:26 +0200 Pablo Neira Ayuso wrote:
> This v2 includes a sparse fix for patch #5 reported by Jakub.
Sorry one more semi-automated compiler warning, clang has this to
say about patch 12:
../drivers/net/gtp.c:606:14: warning: variable 'pctx' is uninitialized when used here [-Wuninitialized]
606 | netdev_dbg(pctx->dev, "GTP packet does not encapsulate an IP packet\n");
| ^~~~
../include/net/net_debug.h:57:21: note: expanded from macro 'netdev_dbg'
57 | dynamic_netdev_dbg(__dev, format, ##args); \
| ^~~~~
../include/linux/dynamic_debug.h:278:7: note: expanded from macro 'dynamic_netdev_dbg'
278 | dev, fmt, ##__VA_ARGS__)
| ^~~
../include/linux/dynamic_debug.h:250:59: note: expanded from macro '_dynamic_func_call'
250 | _dynamic_func_call_cls(_DPRINTK_CLASS_DFLT, fmt, func, ##__VA_ARGS__)
| ^~~~~~~~~~~
../include/linux/dynamic_debug.h:248:65: note: expanded from macro '_dynamic_func_call_cls'
248 | __dynamic_func_call_cls(__UNIQUE_ID(ddebug), cls, fmt, func, ##__VA_ARGS__)
| ^~~~~~~~~~~
../include/linux/dynamic_debug.h:224:15: note: expanded from macro '__dynamic_func_call_cls'
224 | func(&id, ##__VA_ARGS__); \
| ^~~~~~~~~~~
../drivers/net/gtp.c:581:22: note: initialize the variable 'pctx' to silence this warning
581 | struct pdp_ctx *pctx;
| ^
| = NULL
../drivers/net/gtp.c:825:14: warning: variable 'pctx' is uninitialized when used here [-Wuninitialized]
825 | netdev_dbg(pctx->dev, "GTP packet does not encapsulate an IP packet\n");
| ^~~~
../include/net/net_debug.h:57:21: note: expanded from macro 'netdev_dbg'
57 | dynamic_netdev_dbg(__dev, format, ##args); \
| ^~~~~
../include/linux/dynamic_debug.h:278:7: note: expanded from macro 'dynamic_netdev_dbg'
278 | dev, fmt, ##__VA_ARGS__)
| ^~~
../include/linux/dynamic_debug.h:250:59: note: expanded from macro '_dynamic_func_call'
250 | _dynamic_func_call_cls(_DPRINTK_CLASS_DFLT, fmt, func, ##__VA_ARGS__)
| ^~~~~~~~~~~
../include/linux/dynamic_debug.h:248:65: note: expanded from macro '_dynamic_func_call_cls'
248 | __dynamic_func_call_cls(__UNIQUE_ID(ddebug), cls, fmt, func, ##__VA_ARGS__)
| ^~~~~~~~~~~
../include/linux/dynamic_debug.h:224:15: note: expanded from macro '__dynamic_func_call_cls'
224 | func(&id, ##__VA_ARGS__); \
| ^~~~~~~~~~~
../drivers/net/gtp.c:787:22: note: initialize the variable 'pctx' to silence this warning
787 | struct pdp_ctx *pctx;
| ^
| = NULL
Hi, -o- This v2 includes a sparse fix for patch #5 reported by Jakub. -o- The following patchset contains IPv6 GTP driver support for net-next, this also includes IPv6 over IPv4 and vice-versa: Patch #1 removes a unnecessary stack variable initialization in the socket routine. Patch #2 deals with GTP extension headers. This variable length extension header to decapsulate packets accordingly. Otherwise, packets are dropped when these extension headers are present which breaks interoperation with other non-Linux based GTP implementations. Patch #3 prepares for IPv6 support by moving IPv4 specific fields in PDP context objects to a union. Patch #4 adds IPv6 support while retaining backward compatibility. Three new attributes allows to declare an IPv6 GTP tunnel GTPA_FAMILY, GTPA_PEER_ADDR6 and GTPA_MS_ADDR6 as well as IFLA_GTP_LOCAL6 to declare the IPv6 GTP UDP socket. Up to this patch, only IPv6 outer in IPv6 inner is supported. Patch #5 uses IPv6 address /64 prefix for UE/MS in the inner headers. Unlike IPv4, which provides a 1:1 mapping between UE/MS, IPv6 tunnel encapsulates traffic for /64 address as specified by 3GPP TS. Patch has been split from Patch #4 to highlight this behaviour. Patch #6 passes up IPv6 link-local traffic, such as IPv6 SLAAC, for handling to userspace so they are handled as control packets. Patch #7 prepares to allow for GTP IPv4 over IPv6 and vice-versa by moving IP specific debugging out of the function to build IPv4 and IPv6 GTP packets. Patch #8 generalizes TOS/DSCP handling following similar approach as in the existing iptunnel infrastructure. Patch #9 adds a helper function to build an IPv4 GTP packet in the outer header. Patch #10 adds a helper function to build an IPv6 GTP packet in the outer header. Patch #11 adds support for GTP IPv4-over-IPv6 and vice-versa. Patch #12 allows to use the same TID/TEID (tunnel identifier) for inner IPv4 and IPv6 packets for better UE/MS dual stack integration. This series integrates with the osmocom.org project CI and TTCN-3 test infrastructure (Oliver Smith) as well as the userspace libgtpnl library. Thanks to Harald Welte, Oliver Smith and Pau Espin for reviewing and providing feedback through the osmocom.org redmine platform to make this happen. Please, pull these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/gtp.git tags/gtp-24-04-25 Thanks. ---------------------------------------------------------------- The following changes since commit f42800e9b8bad1f9d1a88c61c10ea060c557fc20: gtp: remove useless initialization (2024-04-23 23:44:24 +0200) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/gtp.git tags/gtp-24-04-25 for you to fetch changes up to 1dd87a4c0c5c43fa41312345874e3e5b27746103: gtp: identify tunnel via GTP device + GTP version + TEID + family (2024-04-24 17:58:49 +0200) ---------------------------------------------------------------- gtp pull request 24-04-25 ---------------------------------------------------------------- Pablo Neira Ayuso (11): gtp: properly parse extension headers gtp: prepare for IPv6 support gtp: add IPv6 support gtp: use IPv6 address /64 prefix for UE/MS gtp: pass up link local traffic to userspace socket gtp: move debugging to skbuff build helper function gtp: remove IPv4 and IPv6 header from context object gtp: add helper function to build GTP packets from an IPv4 packet gtp: add helper function to build GTP packets from an IPv6 packet gtp: support for IPv4-in-IPv6-GTP and IPv6-in-IPv4-GTP gtp: identify tunnel via GTP device + GTP version + TEID + family drivers/net/gtp.c | 852 ++++++++++++++++++++++++++++++++++++------- include/net/gtp.h | 5 + include/uapi/linux/gtp.h | 3 + include/uapi/linux/if_link.h | 2 + 4 files changed, 734 insertions(+), 128 deletions(-)