net: Do not clear the sock TX queue in sk_set_socket()
[ Upstream commit5.4-rM2-2.2.x-imx-squashed41b14fb872
] Clearing the sock TX queue in sk_set_socket() might cause unexpected out-of-order transmit when called from sock_orphan(), as outstanding packets can pick a different TX queue and bypass the ones already queued. This is undesired in general. More specifically, it breaks the in-order scheduling property guarantee for device-offloaded TLS sockets. Remove the call to sk_tx_queue_clear() in sk_set_socket(), and add it explicitly only where needed. Fixes:e022f0b4a0
("net: Introduce sk_tx_queue_mapping") Signed-off-by: Tariq Toukan <tariqt@mellanox.com> Reviewed-by: Boris Pismenny <borisp@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
parent
9f217d6dd7
commit
9e693934cd
|
@ -1803,7 +1803,6 @@ static inline int sk_rx_queue_get(const struct sock *sk)
|
|||
|
||||
static inline void sk_set_socket(struct sock *sk, struct socket *sock)
|
||||
{
|
||||
sk_tx_queue_clear(sk);
|
||||
sk->sk_socket = sock;
|
||||
}
|
||||
|
||||
|
|
|
@ -1679,6 +1679,7 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority,
|
|||
cgroup_sk_alloc(&sk->sk_cgrp_data);
|
||||
sock_update_classid(&sk->sk_cgrp_data);
|
||||
sock_update_netprioidx(&sk->sk_cgrp_data);
|
||||
sk_tx_queue_clear(sk);
|
||||
}
|
||||
|
||||
return sk;
|
||||
|
@ -1895,6 +1896,7 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority)
|
|||
*/
|
||||
sk_refcnt_debug_inc(newsk);
|
||||
sk_set_socket(newsk, NULL);
|
||||
sk_tx_queue_clear(newsk);
|
||||
RCU_INIT_POINTER(newsk->sk_wq, NULL);
|
||||
|
||||
if (newsk->sk_prot->sockets_allocated)
|
||||
|
|
Loading…
Reference in New Issue