net: Do not clear the sock TX queue in sk_set_socket()
authorTariq Toukan <tariqt@mellanox.com>
Mon, 22 Jun 2020 20:26:04 +0000 (23:26 +0300)
committerSasha Levin <sashal@kernel.org>
Tue, 30 Jun 2020 19:38:00 +0000 (15:38 -0400)
commit1eb41db96e1c17d3d1d9b54bb8284fce273949d9
tree9aebbfdbf90e749079a59f00010c397968c17ab6
parent897646bcf4e3d9d21a16bea7d609914a7ba24d95
net: Do not clear the sock TX queue in sk_set_socket()

[ Upstream commit 41b14fb8724d5a4b382a63cb4a1a61880347ccb8 ]

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: e022f0b4a03f ("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>
include/net/sock.h
net/core/sock.c