This is a note to let you know that I've just added the patch titled
tipc: increase timeout in tipc_sk_enqueue()
to the 5.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
tipc-increase-timeout-in-tipc_sk_enqueue.patch
and it can be found in the queue-5.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit bd31e7549c0eba4e6b67846bfc2764cf5d0f9721
Author: Hoang Le <hoang.h.le@xxxxxxxxxxxxxx>
Date: Mon Sep 13 16:28:52 2021 +0700
tipc: increase timeout in tipc_sk_enqueue()
[ Upstream commit f4bb62e64c88c93060c051195d3bbba804e56945 ]
In tipc_sk_enqueue() we use hardcoded 2 jiffies to extract
socket buffer from generic queue to particular socket.
The 2 jiffies is too short in case there are other high priority
tasks get CPU cycles for multiple jiffies update. As result, no
buffer could be enqueued to particular socket.
To solve this, we switch to use constant timeout 20msecs.
Then, the function will be expired between 2 jiffies (CONFIG_100HZ)
and 20 jiffies (CONFIG_1000HZ).
Fixes: c637c1035534 ("tipc: resolve race problem at unicast message reception")
Acked-by: Jon Maloy <jmaloy@xxxxxxxxxx>
Signed-off-by: Hoang Le <hoang.h.le@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index a155cfaf01f2..5c8ed8fd395c 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -2421,7 +2421,7 @@ static int tipc_sk_backlog_rcv(struct sock *sk, struct sk_buff *skb)
static void tipc_sk_enqueue(struct sk_buff_head *inputq, struct sock *sk,
u32 dport, struct sk_buff_head *xmitq)
{
- unsigned long time_limit = jiffies + 2;
+ unsigned long time_limit = jiffies + usecs_to_jiffies(20000);
struct sk_buff *skb;
unsigned int lim;
atomic_t *dcnt;
