tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

udp: Remove UDPLITE_SEND_CSCOV and UDPLITE_RECV_CSCOV.

UDP-Lite supports variable-length checksum and has two socket
options, UDPLITE_SEND_CSCOV and UDPLITE_RECV_CSCOV, to control
the checksum coverage.

Let's remove the support.

setsockopt(UDPLITE_SEND_CSCOV / UDPLITE_RECV_CSCOV) was only
available for UDP-Lite and returned -ENOPROTOOPT for UDP.

Now, the options are handled in ip_setsockopt() and
ipv6_setsockopt(), which still return the same error.

getsockopt(UDPLITE_SEND_CSCOV / UDPLITE_RECV_CSCOV) was available
for UDP and always returned 0, meaning full checksum, but now
-ENOPROTOOPT is returned.

Given that getsockopt() is meaningless for UDP and even the options
are not defined under include/uapi/, this should not be a problem.

$ man 7 udplite
...
BUGS
Where glibc support is missing, the following definitions
are needed:

#define IPPROTO_UDPLITE 136
#define UDPLITE_SEND_CSCOV 10
#define UDPLITE_RECV_CSCOV 11

Signed-off-by: Kuniyuki Iwashima <kuniyu@google.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Link: https://patch.msgid.link/20260311052020.1213705-10-kuniyu@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Kuniyuki Iwashima and committed by
Jakub Kicinski 74f0cca1 b2a1d719

+8 -72
+1 -9
include/linux/udp.h
··· 40 40 UDP_FLAGS_ACCEPT_FRAGLIST, 41 41 UDP_FLAGS_ACCEPT_L4, 42 42 UDP_FLAGS_ENCAP_ENABLED, /* This socket enabled encap */ 43 - UDP_FLAGS_UDPLITE_SEND_CC, /* set via udplite setsockopt */ 44 - UDP_FLAGS_UDPLITE_RECV_CC, /* set via udplite setsockopt */ 45 43 }; 46 44 47 45 /* per NUMA structure for lockless producer usage. */ ··· 72 74 */ 73 75 __u16 len; /* total length of pending frames */ 74 76 __u16 gso_size; 75 - /* 76 - * Fields specific to UDP-Lite. 77 - */ 78 - __u16 pcslen; 79 - __u16 pcrlen; 77 + 80 78 /* 81 79 * For encapsulation sockets. 82 80 */ ··· 229 235 #define udp_lrpa_for_each_entry_rcu(__up, node, list) \ 230 236 hlist_nulls_for_each_entry_rcu(__up, node, list, udp_lrpa_node) 231 237 #endif 232 - 233 - #define IS_UDPLITE(__sk) (unlikely(__sk->sk_protocol == IPPROTO_UDPLITE)) 234 238 235 239 static inline struct sock *udp_tunnel_sk(const struct net *net, bool is_ipv6) 236 240 {
-15
include/net/udplite.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0 */ 2 - /* 3 - * Definitions for the UDP-Lite (RFC 3828) code. 4 - */ 5 - #ifndef _UDPLITE_H 6 - #define _UDPLITE_H 7 - 8 - #include <net/ip6_checksum.h> 9 - #include <net/udp.h> 10 - 11 - /* UDP-Lite socket options */ 12 - #define UDPLITE_SEND_CSCOV 10 /* sender partial coverage (as sent) */ 13 - #define UDPLITE_RECV_CSCOV 11 /* receiver partial coverage (threshold ) */ 14 - 15 - #endif /* _UDPLITE_H */
+2
include/uapi/linux/udp.h
··· 29 29 30 30 /* UDP socket options */ 31 31 #define UDP_CORK 1 /* Never send partially complete segments */ 32 + /* Deprecated, reserved for UDPLITE_SEND_CSCOV 10 */ 33 + /* Deprecated, reserved for UDPLITE_RECV_CSCOV 11 */ 32 34 #define UDP_ENCAP 100 /* Set the socket to accept encapsulated packets */ 33 35 #define UDP_NO_CHECK6_TX 101 /* Disable sending checksum for UDP6X */ 34 36 #define UDP_NO_CHECK6_RX 102 /* Disable accepting checksum for UDP6 */
+2 -44
net/ipv4/udp.c
··· 117 117 #include <net/sock_reuseport.h> 118 118 #include <net/addrconf.h> 119 119 #include <net/udp_tunnel.h> 120 - #include <net/udplite.h> 121 120 #include <net/gro.h> 122 121 #if IS_ENABLED(CONFIG_IPV6) 123 122 #include <net/ipv6_stubs.h> ··· 2923 2924 struct udp_sock *up = udp_sk(sk); 2924 2925 int val, valbool; 2925 2926 int err = 0; 2926 - int is_udplite = IS_UDPLITE(sk); 2927 2927 2928 2928 if (level == SOL_SOCKET) { 2929 2929 err = sk_setsockopt(sk, level, optname, optval, optlen); ··· 3009 3011 sockopt_release_sock(sk); 3010 3012 break; 3011 3013 3012 - /* 3013 - * UDP-Lite's partial checksum coverage (RFC 3828). 3014 - */ 3015 - /* The sender sets actual checksum coverage length via this option. 3016 - * The case coverage > packet length is handled by send module. */ 3017 - case UDPLITE_SEND_CSCOV: 3018 - if (!is_udplite) /* Disable the option on UDP sockets */ 3019 - return -ENOPROTOOPT; 3020 - if (val != 0 && val < 8) /* Illegal coverage: use default (8) */ 3021 - val = 8; 3022 - else if (val > USHRT_MAX) 3023 - val = USHRT_MAX; 3024 - WRITE_ONCE(up->pcslen, val); 3025 - udp_set_bit(UDPLITE_SEND_CC, sk); 3026 - break; 3027 - 3028 - /* The receiver specifies a minimum checksum coverage value. To make 3029 - * sense, this should be set to at least 8 (as done below). If zero is 3030 - * used, this again means full checksum coverage. */ 3031 - case UDPLITE_RECV_CSCOV: 3032 - if (!is_udplite) /* Disable the option on UDP sockets */ 3033 - return -ENOPROTOOPT; 3034 - if (val != 0 && val < 8) /* Avoid silly minimal values. */ 3035 - val = 8; 3036 - else if (val > USHRT_MAX) 3037 - val = USHRT_MAX; 3038 - WRITE_ONCE(up->pcrlen, val); 3039 - udp_set_bit(UDPLITE_RECV_CC, sk); 3040 - break; 3041 - 3042 3014 default: 3043 3015 err = -ENOPROTOOPT; 3044 3016 break; ··· 3021 3053 static int udp_setsockopt(struct sock *sk, int level, int optname, sockptr_t optval, 3022 3054 unsigned int optlen) 3023 3055 { 3024 - if (level == SOL_UDP || level == SOL_UDPLITE || level == SOL_SOCKET) 3056 + if (level == SOL_UDP || level == SOL_SOCKET) 3025 3057 return udp_lib_setsockopt(sk, level, optname, 3026 3058 optval, optlen, 3027 3059 udp_push_pending_frames); ··· 3067 3099 val = udp_test_bit(GRO_ENABLED, sk); 3068 3100 break; 3069 3101 3070 - /* The following two cannot be changed on UDP sockets, the return is 3071 - * always 0 (which corresponds to the full checksum coverage of UDP). */ 3072 - case UDPLITE_SEND_CSCOV: 3073 - val = READ_ONCE(up->pcslen); 3074 - break; 3075 - 3076 - case UDPLITE_RECV_CSCOV: 3077 - val = READ_ONCE(up->pcrlen); 3078 - break; 3079 - 3080 3102 default: 3081 3103 return -ENOPROTOOPT; 3082 3104 } ··· 3082 3124 static int udp_getsockopt(struct sock *sk, int level, int optname, 3083 3125 char __user *optval, int __user *optlen) 3084 3126 { 3085 - if (level == SOL_UDP || level == SOL_UDPLITE) 3127 + if (level == SOL_UDP) 3086 3128 return udp_lib_getsockopt(sk, level, optname, optval, optlen); 3087 3129 return ip_getsockopt(sk, level, optname, optval, optlen); 3088 3130 }
+1 -1
net/ipv6/ip6_checksum.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 #include <net/ip.h> 3 + #include <net/ip6_checksum.h> 3 4 #include <net/udp.h> 4 - #include <net/udplite.h> 5 5 #include <asm/checksum.h> 6 6 7 7 #ifndef _HAVE_ARCH_IPV6_CSUM
+2 -3
net/ipv6/udp.c
··· 58 58 #include <linux/proc_fs.h> 59 59 #include <linux/seq_file.h> 60 60 #include <trace/events/skb.h> 61 - #include <net/udplite.h> 62 61 63 62 static void udpv6_destruct_sock(struct sock *sk) 64 63 { ··· 1830 1831 static int udpv6_setsockopt(struct sock *sk, int level, int optname, 1831 1832 sockptr_t optval, unsigned int optlen) 1832 1833 { 1833 - if (level == SOL_UDP || level == SOL_UDPLITE || level == SOL_SOCKET) 1834 + if (level == SOL_UDP || level == SOL_SOCKET) 1834 1835 return udp_lib_setsockopt(sk, level, optname, 1835 1836 optval, optlen, 1836 1837 udp_v6_push_pending_frames); ··· 1840 1841 static int udpv6_getsockopt(struct sock *sk, int level, int optname, 1841 1842 char __user *optval, int __user *optlen) 1842 1843 { 1843 - if (level == SOL_UDP || level == SOL_UDPLITE) 1844 + if (level == SOL_UDP) 1844 1845 return udp_lib_getsockopt(sk, level, optname, optval, optlen); 1845 1846 return ipv6_getsockopt(sk, level, optname, optval, optlen); 1846 1847 }