aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-09-05 06:47:34 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-09-17 15:58:25 +0200
commit1b0db300cbef371e3975250828f1450aebacec8f (patch)
tree5918cd1f622202680ece5807c014f54006ba503d /target/linux/generic/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch
parentbf65d2dcbab89076994df9c93d43423b8f31a471 (diff)
downloadupstream-1b0db300cbef371e3975250828f1450aebacec8f.tar.gz
upstream-1b0db300cbef371e3975250828f1450aebacec8f.tar.bz2
upstream-1b0db300cbef371e3975250828f1450aebacec8f.zip
kernel: bump 5.10 to 5.10.141
All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit e8a62a1e6040de71bdcb1be1a1c30c064acbc059)
Diffstat (limited to 'target/linux/generic/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch')
-rw-r--r--target/linux/generic/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch b/target/linux/generic/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch
index a66198ac80..02973522bc 100644
--- a/target/linux/generic/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch
+++ b/target/linux/generic/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch
@@ -45,7 +45,7 @@ Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
enum gro_result {
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -4304,6 +4304,8 @@ static inline void ____napi_schedule(str
+@@ -4305,6 +4305,8 @@ static inline void ____napi_schedule(str
*/
thread = READ_ONCE(napi->thread);
if (thread) {
@@ -54,7 +54,7 @@ Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
wake_up_process(thread);
return;
}
-@@ -6564,7 +6566,8 @@ bool napi_complete_done(struct napi_stru
+@@ -6565,7 +6567,8 @@ bool napi_complete_done(struct napi_stru
WARN_ON_ONCE(!(val & NAPIF_STATE_SCHED));
@@ -64,7 +64,7 @@ Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
/* If STATE_MISSED was set, leave STATE_SCHED set,
* because we will call napi->poll() one more time.
-@@ -7000,16 +7003,25 @@ static int napi_poll(struct napi_struct
+@@ -7001,16 +7004,25 @@ static int napi_poll(struct napi_struct
static int napi_thread_wait(struct napi_struct *napi)
{