From: Greg Kroah-Hartman Date: Mon, 5 Apr 2021 08:35:51 +0000 (+0200) Subject: 5.11-stable patches X-Git-Tag: v4.4.265~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d47aab33234d57e636a6e4a4ef52a70b43455ae;p=thirdparty%2Fkernel%2Fstable-queue.git 5.11-stable patches added patches: revert-kernel-freezer-should-treat-pf_io_worker-like-pf_kthread-for-freezing.patch revert-net-bonding-fix-error-return-code-of-bond_neigh_init.patch --- diff --git a/queue-5.11/revert-kernel-freezer-should-treat-pf_io_worker-like-pf_kthread-for-freezing.patch b/queue-5.11/revert-kernel-freezer-should-treat-pf_io_worker-like-pf_kthread-for-freezing.patch new file mode 100644 index 00000000000..4dc785f041b --- /dev/null +++ b/queue-5.11/revert-kernel-freezer-should-treat-pf_io_worker-like-pf_kthread-for-freezing.patch @@ -0,0 +1,33 @@ +From d3dc04cd81e0eaf50b2d09ab051a13300e587439 Mon Sep 17 00:00:00 2001 +From: Jens Axboe +Date: Thu, 25 Mar 2021 18:22:11 -0600 +Subject: Revert "kernel: freezer should treat PF_IO_WORKER like PF_KTHREAD for freezing" + +From: Jens Axboe + +commit d3dc04cd81e0eaf50b2d09ab051a13300e587439 upstream. + +This reverts commit 15b2219facadec583c24523eed40fa45865f859f. + +Before IO threads accepted signals, the freezer using take signals to wake +up an IO thread would cause them to loop without any way to clear the +pending signal. That is no longer the case, so stop special casing +PF_IO_WORKER in the freezer. + +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + kernel/freezer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/kernel/freezer.c ++++ b/kernel/freezer.c +@@ -134,7 +134,7 @@ bool freeze_task(struct task_struct *p) + return false; + } + +- if (!(p->flags & (PF_KTHREAD | PF_IO_WORKER))) ++ if (!(p->flags & PF_KTHREAD)) + fake_signal_wake_up(p); + else + wake_up_state(p, TASK_INTERRUPTIBLE); diff --git a/queue-5.11/revert-net-bonding-fix-error-return-code-of-bond_neigh_init.patch b/queue-5.11/revert-net-bonding-fix-error-return-code-of-bond_neigh_init.patch new file mode 100644 index 00000000000..ced25494bf8 --- /dev/null +++ b/queue-5.11/revert-net-bonding-fix-error-return-code-of-bond_neigh_init.patch @@ -0,0 +1,41 @@ +From 080bfa1e6d928a5d1f185cc44e5f3c251df06df5 Mon Sep 17 00:00:00 2001 +From: "David S. Miller" +Date: Fri, 12 Mar 2021 12:15:03 -0800 +Subject: Revert "net: bonding: fix error return code of bond_neigh_init()" + +From: David S. Miller + +commit 080bfa1e6d928a5d1f185cc44e5f3c251df06df5 upstream. + +This reverts commit 2055a99da8a253a357bdfd359b3338ef3375a26c. + +This change rejects legitimate configurations. + +A slave doesn't need to exist nor implement ndo_slave_setup. + +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/bonding/bond_main.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +--- a/drivers/net/bonding/bond_main.c ++++ b/drivers/net/bonding/bond_main.c +@@ -3917,15 +3917,11 @@ static int bond_neigh_init(struct neighb + + rcu_read_lock(); + slave = bond_first_slave_rcu(bond); +- if (!slave) { +- ret = -EINVAL; ++ if (!slave) + goto out; +- } + slave_ops = slave->dev->netdev_ops; +- if (!slave_ops->ndo_neigh_setup) { +- ret = -EINVAL; ++ if (!slave_ops->ndo_neigh_setup) + goto out; +- } + + /* TODO: find another way [1] to implement this. + * Passing a zeroed structure is fragile, diff --git a/queue-5.11/series b/queue-5.11/series index bebbd62feda..0359584310c 100644 --- a/queue-5.11/series +++ b/queue-5.11/series @@ -148,3 +148,5 @@ driver-core-clear-deferred-probe-reason-on-probe-retry.patch drivers-video-fbcon-fix-null-dereference-in-fbcon_cursor.patch riscv-evaluate-put_user-arg-before-enabling-user-access.patch io_uring-do-ctx-sqd-ejection-in-a-clear-context.patch +revert-kernel-freezer-should-treat-pf_io_worker-like-pf_kthread-for-freezing.patch +revert-net-bonding-fix-error-return-code-of-bond_neigh_init.patch