diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 16:58:15 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 16:58:15 +0000 |
| commit | 2d139def3645feb04fd5a703be97b7f3eae8b556 (patch) | |
| tree | 11c56a757cab0bdb6226826737d30a48ee9c13d3 /debian/patches-rt/0009-net-Avoid-the-IPI-to-free-the.patch | |
| parent | Merging upstream version 6.1.82. (diff) | |
| download | linux-debian.tar.xz linux-debian.zip | |
Adding debian version 6.1.82-1.debian/6.1.82-1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | debian/patches-rt/0009-net-Avoid-the-IPI-to-free-the.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/debian/patches-rt/0009-net-Avoid-the-IPI-to-free-the.patch b/debian/patches-rt/0009-net-Avoid-the-IPI-to-free-the.patch index 1f6687796..fea8be5fc 100644 --- a/debian/patches-rt/0009-net-Avoid-the-IPI-to-free-the.patch +++ b/debian/patches-rt/0009-net-Avoid-the-IPI-to-free-the.patch @@ -1,8 +1,8 @@ -From c910f301d71266e18f63407ec6c65d19ae90e779 Mon Sep 17 00:00:00 2001 +From cf980049b46f0e4ff30b373f992fdfd2671ee76c Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Mon, 15 Aug 2022 17:29:50 +0200 -Subject: [PATCH 09/62] net: Avoid the IPI to free the -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.1/older/patches-6.1.69-rt21.tar.xz +Subject: [PATCH 09/64] net: Avoid the IPI to free the +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.1/older/patches-6.1.82-rt27.tar.xz skb_attempt_defer_free() collects a skbs, which was allocated on a remote CPU, on a per-CPU list. These skbs are either freed on that @@ -41,10 +41,10 @@ index 0373e0935990..55d698367883 100644 static inline void input_queue_head_incr(struct softnet_data *sd) diff --git a/net/core/dev.c b/net/core/dev.c -index 070039f9296c..a3caa23be3cf 100644 +index 41226d92755b..d01dbab0d338 100644 --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -4618,15 +4618,6 @@ static void rps_trigger_softirq(void *data) +@@ -4621,15 +4621,6 @@ static void rps_trigger_softirq(void *data) #endif /* CONFIG_RPS */ @@ -60,7 +60,7 @@ index 070039f9296c..a3caa23be3cf 100644 /* * Check if this softnet_data structure is another cpu one * If yes, queue it to our IPI list and return 1 -@@ -6684,6 +6675,30 @@ static void skb_defer_free_flush(struct softnet_data *sd) +@@ -6687,6 +6678,30 @@ static void skb_defer_free_flush(struct softnet_data *sd) } } @@ -91,7 +91,7 @@ index 070039f9296c..a3caa23be3cf 100644 static __latent_entropy void net_rx_action(struct softirq_action *h) { struct softnet_data *sd = this_cpu_ptr(&softnet_data); -@@ -11435,7 +11450,11 @@ static int __init net_dev_init(void) +@@ -11447,7 +11462,11 @@ static int __init net_dev_init(void) INIT_CSD(&sd->csd, rps_trigger_softirq, sd); sd->cpu = i; #endif @@ -104,10 +104,10 @@ index 070039f9296c..a3caa23be3cf 100644 init_gro_hash(&sd->backlog); diff --git a/net/core/skbuff.c b/net/core/skbuff.c -index 73b1e0e53534..a457a3445469 100644 +index d4bd10f8723d..02445cd294ab 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c -@@ -6680,6 +6680,11 @@ nodefer: __kfree_skb(skb); +@@ -6683,6 +6683,11 @@ nodefer: __kfree_skb(skb); /* Make sure to trigger NET_RX_SOFTIRQ on the remote CPU * if we are unlucky enough (this seems very unlikely). */ @@ -121,5 +121,5 @@ index 73b1e0e53534..a457a3445469 100644 + } } -- -2.43.0 +2.44.0 |