udp: avoid false sharing on receive
Subsystems (5)
Paolo Abeni
maintainercover udp: avoid false sharing on receive
Under high UDP load, the BH processing and the user-space receiver can run on different cores.
The UDP implementation does a lot of effort to avoid false sharing in the receive path, but recent changes to the struct sock layout moved the sk_forward_alloc and the sk_rcvbuf fields on the same cacheline:
/* --- cacheline 4 boundary (256 bytes) --- */
struct sk_buff * tail;
} sk_backlog;
int sk_forward_alloc;
unsigned int sk_reserved_mem;
unsigned int sk_ll_usec;
unsigned int sk_napi_id;
int sk_rcvbuf;sk_forward_alloc is updated by the BH, while sk_rcvbuf is accessed by udp_recvmsg(), causing false sharing.
A possible solution would be to re-order the struct sock fields to avoid the false sharing. Such change is subject to being invalidated by future changes and could have negative side effects on other workload.
Instead this series uses a different approach, touching only the UDP socket layout.
The first patch generalizes the custom setsockopt infrastructure, to allow UDP tracking the buffer size, and the second patch addresses the issue, copying the relevant buffer information into an already hot cacheline.
Overall the above gives a 10% peek throughput increase under UDP flood.
Paolo Abeni (2):
net: introduce and use custom sockopt socket flag
udp: track the forward memory release threshold in an hot cacheline
include/linux/net.h | 1 + include/linux/udp.h | 3 +++ net/ipv4/udp.c | 22 +++++++++++++++++++--- net/ipv6/udp.c | 8 ++++++-- net/mptcp/protocol.c | 4 ++++ net/socket.c | 8 +------- 6 files changed, 34 insertions(+), 12 deletions(-)
Signature · 1 line
2.37.3
Paolo Abeni
maintainerPATCH 1/2 net: introduce and use custom sockopt socket flag
We will soon introduce custom setsockopt for UDP sockets, too. Instead of doing even more complex arbitrary checks inside sock_use_custom_sol_socket(), add a new socket flag and set it for the relevant socket types (currently only MPTCP).
--- include/linux/net.h | 1 + net/mptcp/protocol.c | 4 ++++ net/socket.c | 8 +------- 3 files changed, 6 insertions(+), 7 deletions(-)
include/linux/net.h +1 -0
@@ -41,6 +41,7 @@ struct net;#define SOCK_NOSPACE 2#define SOCK_PASSCRED 3#define SOCK_PASSSEC 4 +#define SOCK_CUSTOM_SOCKOPT 5#ifndef ARCH_HAS_SOCKET_TYPES /**
net/mptcp/protocol.c +4 -0
@@ -2708,6 +2708,8 @@ static int mptcp_init_sock(struct sock *sk)if (ret)return ret; +set_bit (SOCK_CUSTOM_SOCKOPT , &sk->sk_socket->flags); +/* fetch the ca name; do it outside __mptcp_init_sock(), so that clone will * propagate the correct value */
@@ -3684,6 +3686,8 @@ static int mptcp_stream_accept(struct socket *sock, struct socket *newsock,struct mptcp_subflow_context *subflow;struct sock *newsk = newsock->sk; +set_bit (SOCK_CUSTOM_SOCKOPT , &newsock->flags); +lock_sock (newsk);/* PM/worker can now acquire the first subflow socket
net/socket.c +1 -7
@@ -2199,13 +2199,7 @@ SYSCALL_DEFINE4(recv, int, fd, void __user *, ubuf, size_t, size,static bool sock_use_custom_sol_socket (const struct socket *sock) { -const struct sock *sk = sock->sk; - -/* Use sock->ops->setsockopt() for MPTCP */ -return IS_ENABLED (CONFIG_MPTCP ) && - sk->sk_protocol ==IPPROTO_MPTCP && - sk->sk_type ==SOCK_STREAM && - (sk->sk_family ==AF_INET || sk->sk_family ==AF_INET6 ); +return test_bit (SOCK_CUSTOM_SOCKOPT , &sock->flags); }/*
Signature · 1 line
2.37.3
Re: [PATCH net-next 1/2] net: introduce and use custom sockopt socket flag
Hi Paolo,
Quoted 4 lines · Paolo Abeni
We will soon introduce custom setsockopt for UDP sockets, too. Instead of doing even more complex arbitrary checks inside
sock_use_custom_sol_socket(), add a new socket flag and set it for the relevant socket types (currently only MPTCP).
Good idea, it is clearer and it looks good to me!
For the modifications in MPTCP:
Cheers,
Matt
Signature · 2 lines
Tessares | Belgium | Hybrid Access Solutions www.tessares.net
Paolo Abeni
maintainerPATCH 2/2 udp: track the forward memory release threshold in an hot cacheline
In reply to Paolo AbeniWhen the receiver process and the BH runs on different cores, udp_rmem_release() experience a cache miss while accessing sk_rcvbuf, as the latter shares the same cacheline with sk_forward_alloc, written by the BH.
With this patch, UDP tracks the rcvbuf value and its update via custom SOL_SOCKET socket options, and copies the forward memory threshold value used by udp_rmem_release() in a different cacheline, already accessed by the above function and uncontended.
Overall the above give a 10% peek throughput increase under UDP flood.
--- include/linux/udp.h | 3 +++ net/ipv4/udp.c | 22 +++++++++++++++++++--- net/ipv6/udp.c | 8 ++++++-- 3 files changed, 28 insertions(+), 5 deletions(-)
include/linux/udp.h +3 -0
@@ -87,6 +87,9 @@ struct udp_sock {/* This field is dirtied by udp_recvmsg() */ int forward_deficit; + +/* This fields follows rcvbuf value, and is touched by udp_recvmsg */ +int forward_threshold; };#define UDP_MAX_SEGMENTS (1 << 6UL)
net/ipv4/udp.c +19 -3
@@ -1448,7 +1448,7 @@ static void udp_rmem_release(struct sock *sk, int size, int partial,if (likely (partial)) { up->forward_deficit += size; size = up->forward_deficit; -if (size < (sk->sk_rcvbuf >>2 ) && +if (size <READ_ONCE (up->forward_threshold) && !skb_queue_empty (&up->reader_queue))return ; }else {
@@ -1622,8 +1622,12 @@ static void udp_destruct_sock(struct sock *sk)int udp_init_sock (struct sock *sk) { -skb_queue_head_init (&udp_sk (sk)->reader_queue); +struct udp_sock *up =udp_sk (sk); + +skb_queue_head_init (&up->reader_queue); + up->forward_threshold = sk->sk_rcvbuf >>2 ; sk->sk_destruct = udp_destruct_sock; +set_bit (SOCK_CUSTOM_SOCKOPT , &sk->sk_socket->flags);return 0 ; }
@@ -2671,6 +2675,18 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname,int err =0 ;int is_udplite =IS_UDPLITE (sk); +if (level ==SOL_SOCKET ) { + err =sk_setsockopt (sk, level, optname, optval, optlen); + +if (optname ==SO_RCVBUF || optname ==SO_RCVBUFFORCE ) { +sockopt_lock_sock (sk); +/* paired with READ_ONCE in udp_rmem_release() */ +WRITE_ONCE (up->forward_threshold, sk->sk_rcvbuf >>2 ); +sockopt_release_sock (sk); + } +return err; + } +if (optlen <sizeof (int ))return -EINVAL ;
@@ -2784,7 +2800,7 @@ EXPORT_SYMBOL(udp_lib_setsockopt);int udp_setsockopt (struct sock *sk,int level,int optname,sockptr_t optval,unsigned int optlen) { -if (level ==SOL_UDP || level ==SOL_UDPLITE ) +if (level ==SOL_UDP || level ==SOL_UDPLITE || level ==SOL_SOCKET )return udp_lib_setsockopt (sk, level, optname, optval, optlen, udp_push_pending_frames);
net/ipv6/udp.c +6 -2
@@ -64,8 +64,12 @@ static void udpv6_destruct_sock(struct sock *sk)int udpv6_init_sock (struct sock *sk) { -skb_queue_head_init (&udp_sk (sk)->reader_queue); +struct udp_sock *up =udp_sk (sk); + +skb_queue_head_init (&up->reader_queue); + up->forward_threshold = sk->sk_rcvbuf >>2 ; sk->sk_destruct = udpv6_destruct_sock; +set_bit (SOCK_CUSTOM_SOCKOPT , &sk->sk_socket->flags);return 0 ; }
@@ -1671,7 +1675,7 @@ void udpv6_destroy_sock(struct sock *sk)int udpv6_setsockopt (struct sock *sk,int level,int optname,sockptr_t optval,unsigned int optlen) { -if (level ==SOL_UDP || level ==SOL_UDPLITE ) +if (level ==SOL_UDP || level ==SOL_UDPLITE || level ==SOL_SOCKET )return udp_lib_setsockopt (sk, level, optname, optval, optlen, udp_v6_push_pending_frames);
Signature · 1 line
2.37.3
Re: udp: track the forward memory release threshold in an hot cacheline: Tests Results
Hi Paolo,
Thank you for your modifications, that's great!
Our CI did some validations and here is its report:
- KVM Validation: normal:
- Unstable: 2 failed test(s): selftest_mptcp_join selftest_simult_flows 🔴:
- Task: https://cirrus-ci.com/task/5122545217699840
- Summary: https://api.cirrus-ci.com/v1/artifact/task/5122545217699840/summary/summary.txt
- {"code":404,"message":
- "Can't find artifacts containing file conclusion.txt"}:
- Task: https://cirrus-ci.com/task/6248445124542464
- Summary: https://api.cirrus-ci.com/v1/artifact/task/6248445124542464/summary/summary.txt
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/bac2aa631e4b
If there are some issues, you can reproduce them using the same environment as the one used by the CI thanks to a docker image, e.g.:
$ cd [kernel source code]
$ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
--pull always mptcp/mptcp-upstream-virtme-docker:latest \
auto-debugFor more details:
https://github.com/multipath-tcp/mptcp-upstream-virtme-docker
Please note that despite all the efforts that have been already done to have a stable tests suite when executed on a public CI like here, it is possible some reported issues are not due to your modifications. Still, do not hesitate to help us improve that ;-)
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (Tessares)
PATCH 2/2 udp: track the forward memory release threshold in an hot cacheline
In reply to Paolo AbeniFrom: Paolo Abeni <[email protected]> Date: Wed, 19 Oct 2022 12:02:01 +0200
Quoted 61 lines
When the receiver process and the BH runs on different cores,
udp_rmem_release()experience a cache miss while accessingsk_rcvbuf, as the latter shares the same cacheline withsk_forward_alloc, written by the BH.With this patch, UDP tracks the rcvbuf value and its update via custom
SOL_SOCKETsocket options, and copies the forward memory threshold value used byudp_rmem_release()in a different cacheline, already accessed by the above function and uncontended.Overall the above give a 10% peek throughput increase under UDP flood.
Signed-off-by Paolo Abeni <[email protected]>--- include/linux/udp.h | 3 +++ net/ipv4/udp.c | 22 +++++++++++++++++++--- net/ipv6/udp.c | 8 ++++++-- 3 files changed, 28 insertions(+), 5 deletions(-)include/linux/udp.h +3
-0@@ -87,6 +87,9 @@ struct udp_sock {/* This field is dirtied by udp_recvmsg() */ int forward_deficit; + +/* This fields follows rcvbuf value, and is touched by udp_recvmsg */ +int forward_threshold; };#define UDP_MAX_SEGMENTS (1 << 6UL)net/ipv4/udp.c +6
-2@@ -1448,7 +1448,7 @@ static void udp_rmem_release(struct sock *sk, int size, int partial,if (likely (partial)) { up->forward_deficit += size; size = up->forward_deficit; -if (size < (sk->sk_rcvbuf >>2 ) && +if (size <READ_ONCE (up->forward_threshold) && !skb_queue_empty (&up->reader_queue))return ; }else {@@ -1622,8 +1622,12 @@ static void udp_destruct_sock(struct sock *sk)int udp_init_sock (struct sock *sk) { -skb_queue_head_init (&udp_sk (sk)->reader_queue); +struct udp_sock *up =udp_sk (sk); + +skb_queue_head_init (&up->reader_queue); + up->forward_threshold = sk->sk_rcvbuf >>2 ; sk->sk_destruct = udp_destruct_sock; +set_bit (SOCK_CUSTOM_SOCKOPT , &sk->sk_socket->flags);return 0 ; }
net/ipv4/udp.c int udp_lib_setsockopt(struct sock *sk, int level, int optname, · line 2682
Quoted 8 lines
net/ipv4/udp.c +5
-0@@ -2671,6 +2675,18 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname,int err =0 ;int is_udplite =IS_UDPLITE (sk); +if (level ==SOL_SOCKET ) { + err =sk_setsockopt (sk, level, optname, optval, optlen); + +if (optname ==SO_RCVBUF || optname ==SO_RCVBUFFORCE ) { +sockopt_lock_sock (sk);
Can we drop this lock by adding READ_ONCE() to sk->sk_rcvbuf below ?
Quoted 26 lines
net/ipv4/udp.c +8
-1+/* paired with READ_ONCE in udp_rmem_release() */ +WRITE_ONCE (up->forward_threshold, sk->sk_rcvbuf >>2 ); +sockopt_release_sock (sk); + } +return err; + } +if (optlen <sizeof (int ))return -EINVAL ;@@ -2784,7 +2800,7 @@ EXPORT_SYMBOL(udp_lib_setsockopt);int udp_setsockopt (struct sock *sk,int level,int optname,sockptr_t optval,unsigned int optlen) { -if (level ==SOL_UDP || level ==SOL_UDPLITE ) +if (level ==SOL_UDP || level ==SOL_UDPLITE || level ==SOL_SOCKET )return udp_lib_setsockopt (sk, level, optname, optval, optlen, udp_push_pending_frames);net/ipv6/udp.c +0
-0@@ -64,8 +64,12 @@ static void udpv6_destruct_sock(struct sock *sk)int udpv6_init_sock (struct sock *sk)
net/ipv6/udp.c static void udpv6_destruct_sock(struct sock *sk) · line 74
Quoted 10 lines
net/ipv6/udp.c +5
-1{ -skb_queue_head_init (&udp_sk (sk)->reader_queue); +struct udp_sock *up =udp_sk (sk); + +skb_queue_head_init (&up->reader_queue); + up->forward_threshold = sk->sk_rcvbuf >>2 ; sk->sk_destruct = udpv6_destruct_sock; +set_bit (SOCK_CUSTOM_SOCKOPT , &sk->sk_socket->flags);return 0 ; }
It's time to factorise this part like udp_destruct_common() ?
Quoted 12 lines
net/ipv6/udp.c +1
-1@@ -1671,7 +1675,7 @@ void udpv6_destroy_sock(struct sock *sk)int udpv6_setsockopt (struct sock *sk,int level,int optname,sockptr_t optval,unsigned int optlen) { -if (level ==SOL_UDP || level ==SOL_UDPLITE ) +if (level ==SOL_UDP || level ==SOL_UDPLITE || level ==SOL_SOCKET )return udp_lib_setsockopt (sk, level, optname, optval, optlen, udp_v6_push_pending_frames);Signature · 1 line
2.37.3
Paolo Abeni
maintainerRe: [PATCH net-next 2/2] udp: track the forward memory release threshold in an hot cacheline
Quoted 66 lines · Kuniyuki Iwashima
From: Paolo Abeni <[email protected]> Date: Wed, 19 Oct 2022 12:02:01 +0200Quoted 64 lines
When the receiver process and the BH runs on different cores,
udp_rmem_release()experience a cache miss while accessingsk_rcvbuf, as the latter shares the same cacheline withsk_forward_alloc, written by the BH.With this patch, UDP tracks the rcvbuf value and its update via custom
SOL_SOCKETsocket options, and copies the forward memory threshold value used byudp_rmem_release()in a different cacheline, already accessed by the above function and uncontended.Overall the above give a 10% peek throughput increase under UDP flood.
Signed-off-by Paolo Abeni <[email protected]>--- include/linux/udp.h | 3 +++ net/ipv4/udp.c | 22 +++++++++++++++++++--- net/ipv6/udp.c | 8 ++++++-- 3 files changed, 28 insertions(+), 5 deletions(-)include/linux/udp.h +3
-0@@ -87,6 +87,9 @@ struct udp_sock {/* This field is dirtied by udp_recvmsg() */ int forward_deficit; + +/* This fields follows rcvbuf value, and is touched by udp_recvmsg */ +int forward_threshold; };#define UDP_MAX_SEGMENTS (1 << 6UL)net/ipv4/udp.c +6
-2@@ -1448,7 +1448,7 @@ static void udp_rmem_release(struct sock *sk, int size, int partial,if (likely (partial)) { up->forward_deficit += size; size = up->forward_deficit; -if (size < (sk->sk_rcvbuf >>2 ) && +if (size <READ_ONCE (up->forward_threshold) && !skb_queue_empty (&up->reader_queue))return ; }else {@@ -1622,8 +1622,12 @@ static void udp_destruct_sock(struct sock *sk)int udp_init_sock (struct sock *sk) { -skb_queue_head_init (&udp_sk (sk)->reader_queue); +struct udp_sock *up =udp_sk (sk); + +skb_queue_head_init (&up->reader_queue); + up->forward_threshold = sk->sk_rcvbuf >>2 ; sk->sk_destruct = udp_destruct_sock; +set_bit (SOCK_CUSTOM_SOCKOPT , &sk->sk_socket->flags);return 0 ; }@@ -2671,6 +2675,18 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname,int err =0 ;int is_udplite =IS_UDPLITE (sk);
Quoted 7 lines
net/ipv4/udp.c int udp_lib_setsockopt(struct sock *sk, int level, int optname, · line 2682
Quoted 5 lines
net/ipv4/udp.c +5
-0+if (level ==SOL_SOCKET ) { + err =sk_setsockopt (sk, level, optname, optval, optlen); + +if (optname ==SO_RCVBUF || optname ==SO_RCVBUFFORCE ) { +sockopt_lock_sock (sk);Can we drop this lock by adding
READ_ONCE()tosk->sk_rcvbufbelow ?
I think we can't. If there are racing thread updating rcvbuf, we could end-up with mismatching value in forward_threshold. Not a likely scenario, but still... This is control path, acquiring the lock once more should not be a problem.
Quoted 25 lines
Quoted 25 lines
net/ipv4/udp.c +8
-1+/* paired with READ_ONCE in udp_rmem_release() */ +WRITE_ONCE (up->forward_threshold, sk->sk_rcvbuf >>2 ); +sockopt_release_sock (sk); + } +return err; + } +if (optlen <sizeof (int ))return -EINVAL ;@@ -2784,7 +2800,7 @@ EXPORT_SYMBOL(udp_lib_setsockopt);int udp_setsockopt (struct sock *sk,int level,int optname,sockptr_t optval,unsigned int optlen) { -if (level ==SOL_UDP || level ==SOL_UDPLITE ) +if (level ==SOL_UDP || level ==SOL_UDPLITE || level ==SOL_SOCKET )return udp_lib_setsockopt (sk, level, optname, optval, optlen, udp_push_pending_frames);net/ipv6/udp.c +0
-0@@ -64,8 +64,12 @@ static void udpv6_destruct_sock(struct sock *sk)
Quoted 13 lines
net/ipv6/udp.c static void udpv6_destruct_sock(struct sock *sk) · line 74
Quoted 11 lines
net/ipv6/udp.c +5
-1int udpv6_init_sock (struct sock *sk) { -skb_queue_head_init (&udp_sk (sk)->reader_queue); +struct udp_sock *up =udp_sk (sk); + +skb_queue_head_init (&up->reader_queue); + up->forward_threshold = sk->sk_rcvbuf >>2 ; sk->sk_destruct = udpv6_destruct_sock; +set_bit (SOCK_CUSTOM_SOCKOPT , &sk->sk_socket->flags);return 0 ; }It's time to factorise this part like
udp_destruct_common()?
I guess it makes sense. Possibly 'udp_lib_destruct()' just to follow others helper style?
Quoted 1 line
Thanks,
Paolo
Re: [PATCH net-next 2/2] udp: track the forward memory release threshold in an hot cacheline
From: Paolo Abeni <[email protected]> Date: Wed, 19 Oct 2022 18:58:33 +0200
Quoted 75 lines · Kuniyuki Iwashima
Quoted 66 lines
From: Paolo Abeni <[email protected]> Date: Wed, 19 Oct 2022 12:02:01 +0200Quoted 64 lines
When the receiver process and the BH runs on different cores,
udp_rmem_release()experience a cache miss while accessingsk_rcvbuf, as the latter shares the same cacheline withsk_forward_alloc, written by the BH.With this patch, UDP tracks the rcvbuf value and its update via custom
SOL_SOCKETsocket options, and copies the forward memory threshold value used byudp_rmem_release()in a different cacheline, already accessed by the above function and uncontended.Overall the above give a 10% peek throughput increase under UDP flood.
Signed-off-by Paolo Abeni <[email protected]>--- include/linux/udp.h | 3 +++ net/ipv4/udp.c | 22 +++++++++++++++++++--- net/ipv6/udp.c | 8 ++++++-- 3 files changed, 28 insertions(+), 5 deletions(-)include/linux/udp.h +3
-0@@ -87,6 +87,9 @@ struct udp_sock {/* This field is dirtied by udp_recvmsg() */ int forward_deficit; + +/* This fields follows rcvbuf value, and is touched by udp_recvmsg */ +int forward_threshold; };#define UDP_MAX_SEGMENTS (1 << 6UL)net/ipv4/udp.c +6
-2@@ -1448,7 +1448,7 @@ static void udp_rmem_release(struct sock *sk, int size, int partial,if (likely (partial)) { up->forward_deficit += size; size = up->forward_deficit; -if (size < (sk->sk_rcvbuf >>2 ) && +if (size <READ_ONCE (up->forward_threshold) && !skb_queue_empty (&up->reader_queue))return ; }else {@@ -1622,8 +1622,12 @@ static void udp_destruct_sock(struct sock *sk)int udp_init_sock (struct sock *sk) { -skb_queue_head_init (&udp_sk (sk)->reader_queue); +struct udp_sock *up =udp_sk (sk); + +skb_queue_head_init (&up->reader_queue); + up->forward_threshold = sk->sk_rcvbuf >>2 ; sk->sk_destruct = udp_destruct_sock; +set_bit (SOCK_CUSTOM_SOCKOPT , &sk->sk_socket->flags);return 0 ; }@@ -2671,6 +2675,18 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname,int err =0 ;int is_udplite =IS_UDPLITE (sk);Quoted 7 lines
net/ipv4/udp.c int udp_lib_setsockopt(struct sock *sk, int level, int optname, · line 2682
Quoted 5 lines
net/ipv4/udp.c +5
-0+if (level ==SOL_SOCKET ) { + err =sk_setsockopt (sk, level, optname, optval, optlen); + +if (optname ==SO_RCVBUF || optname ==SO_RCVBUFFORCE ) { +sockopt_lock_sock (sk);Can we drop this lock by adding
READ_ONCE()tosk->sk_rcvbufbelow ?
Quoted 4 lines
I think we can't. If there are racing thread updating rcvbuf, we could end-up with mismatching value in
forward_threshold. Not a likely scenario, but still... This is control path, acquiring the lock once more should not be a problem.
I see.
Thank you!
Quoted 39 lines
Quoted 25 lines
Quoted 25 lines
net/ipv4/udp.c +8
-1+/* paired with READ_ONCE in udp_rmem_release() */ +WRITE_ONCE (up->forward_threshold, sk->sk_rcvbuf >>2 ); +sockopt_release_sock (sk); + } +return err; + } +if (optlen <sizeof (int ))return -EINVAL ;@@ -2784,7 +2800,7 @@ EXPORT_SYMBOL(udp_lib_setsockopt);int udp_setsockopt (struct sock *sk,int level,int optname,sockptr_t optval,unsigned int optlen) { -if (level ==SOL_UDP || level ==SOL_UDPLITE ) +if (level ==SOL_UDP || level ==SOL_UDPLITE || level ==SOL_SOCKET )return udp_lib_setsockopt (sk, level, optname, optval, optlen, udp_push_pending_frames);net/ipv6/udp.c +0
-0@@ -64,8 +64,12 @@ static void udpv6_destruct_sock(struct sock *sk)Quoted 13 lines
net/ipv6/udp.c static void udpv6_destruct_sock(struct sock *sk) · line 74
Quoted 11 lines
net/ipv6/udp.c +5
-1int udpv6_init_sock (struct sock *sk) { -skb_queue_head_init (&udp_sk (sk)->reader_queue); +struct udp_sock *up =udp_sk (sk); + +skb_queue_head_init (&up->reader_queue); + up->forward_threshold = sk->sk_rcvbuf >>2 ; sk->sk_destruct = udpv6_destruct_sock; +set_bit (SOCK_CUSTOM_SOCKOPT , &sk->sk_socket->flags);return 0 ; }It's time to factorise this part like
udp_destruct_common()?
Quoted 2 lines
I guess it makes sense. Possibly '
udp_lib_destruct()' just to follow others helper style?
Ah, I should have named it so :)
Quoted 5 lines
Quoted 2 lines
Thanks,
Paolo
Re: udp: track the forward memory release threshold in an hot cacheline: Tests Results
In reply to Paolo AbeniHi Paolo,
Thank you for your modifications, that's great!
Our CI did some validations and here is its report:
- KVM Validation: normal:
- Unstable: 2 failed test(s): selftest_mptcp_join selftest_simult_flows 🔴:
- Task: https://cirrus-ci.com/task/6084002971910144
- Summary: https://api.cirrus-ci.com/v1/artifact/task/6084002971910144/summary/summary.txt
- {"code":404,"message":
- "Can't find artifacts containing file conclusion.txt"}:
- Task: https://cirrus-ci.com/task/5521053018488832
- Summary: https://api.cirrus-ci.com/v1/artifact/task/5521053018488832/summary/summary.txt
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/d7a7d2afe372
If there are some issues, you can reproduce them using the same environment as the one used by the CI thanks to a docker image, e.g.:
$ cd [kernel source code]
$ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
--pull always mptcp/mptcp-upstream-virtme-docker:latest \
auto-debugFor more details:
https://github.com/multipath-tcp/mptcp-upstream-virtme-docker
Please note that despite all the efforts that have been already done to have a stable tests suite when executed on a public CI like here, it is possible some reported issues are not due to your modifications. Still, do not hesitate to help us improve that ;-)
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (Tessares)