diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 17:39:59 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 17:39:59 +0000 |
| commit | 27d3313807296c3943a96ceef8c2b7279cb56962 (patch) | |
| tree | 7d08e78c36ab6437b403fc7cd8c23e41f135c7a3 /debian/patches-rt/net-Avoid-the-IPI-to-free-the.patch | |
| parent | Merging upstream version 6.7.7. (diff) | |
| download | linux-27d3313807296c3943a96ceef8c2b7279cb56962.tar.xz linux-27d3313807296c3943a96ceef8c2b7279cb56962.zip | |
Adding debian version 6.7.7-1.debian/6.7.7-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/net-Avoid-the-IPI-to-free-the.patch')
| -rw-r--r-- | debian/patches-rt/net-Avoid-the-IPI-to-free-the.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches-rt/net-Avoid-the-IPI-to-free-the.patch b/debian/patches-rt/net-Avoid-the-IPI-to-free-the.patch index 6005e7a2e6..70bfac405a 100644 --- a/debian/patches-rt/net-Avoid-the-IPI-to-free-the.patch +++ b/debian/patches-rt/net-Avoid-the-IPI-to-free-the.patch @@ -1,7 +1,7 @@ From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Mon, 15 Aug 2022 17:29:50 +0200 Subject: [PATCH] net: Avoid the IPI to free the -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.6/older/patches-6.6.7-rt18.tar.xz +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.7/older/patches-6.7-rt6.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 @@ -25,7 +25,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -3258,7 +3258,11 @@ struct softnet_data { +@@ -3288,7 +3288,11 @@ struct softnet_data { int defer_count; int defer_ipi_scheduled; struct sk_buff *defer_list; @@ -39,7 +39,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> static inline void input_queue_head_incr(struct softnet_data *sd) --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -4702,15 +4702,6 @@ static void rps_trigger_softirq(void *da +@@ -4679,15 +4679,6 @@ static void rps_trigger_softirq(void *da #endif /* CONFIG_RPS */ @@ -55,7 +55,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> /* * After we queued a packet into sd->input_pkt_queue, * we need to make sure this queue is serviced soon. -@@ -6679,6 +6670,32 @@ static void skb_defer_free_flush(struct +@@ -6658,6 +6649,32 @@ static void skb_defer_free_flush(struct } } @@ -88,7 +88,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> static int napi_threaded_poll(void *data) { struct napi_struct *napi = data; -@@ -11603,7 +11620,11 @@ static int __init net_dev_init(void) +@@ -11621,7 +11638,11 @@ static int __init net_dev_init(void) INIT_CSD(&sd->csd, rps_trigger_softirq, sd); sd->cpu = i; #endif @@ -102,7 +102,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> init_gro_hash(&sd->backlog); --- a/net/core/skbuff.c +++ b/net/core/skbuff.c -@@ -6841,8 +6841,13 @@ nodefer: __kfree_skb(skb); +@@ -6858,8 +6858,13 @@ nodefer: __kfree_skb(skb); /* Make sure to trigger NET_RX_SOFTIRQ on the remote CPU * if we are unlucky enough (this seems very unlikely). */ |