From: Sasha Levin Date: Sat, 22 Feb 2020 19:03:09 +0000 (-0500) Subject: Drop padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch X-Git-Tag: v4.19.106~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=490f9e984f334d5b7f5210cf559c4844e9371eff;p=thirdparty%2Fkernel%2Fstable-queue.git Drop padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch b/queue-4.14/padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch deleted file mode 100644 index 7350f8c79f6..00000000000 --- a/queue-4.14/padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 5f61af927b283bca63732b63afa985c9e4985294 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 3 Dec 2019 14:31:11 -0500 -Subject: padata: always acquire cpu_hotplug_lock before pinst->lock - -From: Daniel Jordan - -[ Upstream commit 38228e8848cd7dd86ccb90406af32de0cad24be3 ] - -lockdep complains when padata's paths to update cpumasks via CPU hotplug -and sysfs are both taken: - - # echo 0 > /sys/devices/system/cpu/cpu1/online - # echo ff > /sys/kernel/pcrypt/pencrypt/parallel_cpumask - - ====================================================== - WARNING: possible circular locking dependency detected - 5.4.0-rc8-padata-cpuhp-v3+ #1 Not tainted - ------------------------------------------------------ - bash/205 is trying to acquire lock: - ffffffff8286bcd0 (cpu_hotplug_lock.rw_sem){++++}, at: padata_set_cpumask+0x2b/0x120 - - but task is already holding lock: - ffff8880001abfa0 (&pinst->lock){+.+.}, at: padata_set_cpumask+0x26/0x120 - - which lock already depends on the new lock. - -padata doesn't take cpu_hotplug_lock and pinst->lock in a consistent -order. Which should be first? CPU hotplug calls into padata with -cpu_hotplug_lock already held, so it should have priority. - -Fixes: 6751fb3c0e0c ("padata: Use get_online_cpus/put_online_cpus") -Signed-off-by: Daniel Jordan -Cc: Eric Biggers -Cc: Herbert Xu -Cc: Steffen Klassert -Cc: linux-crypto@vger.kernel.org -Cc: linux-kernel@vger.kernel.org -Signed-off-by: Herbert Xu -Signed-off-by: Sasha Levin ---- - kernel/padata.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/kernel/padata.c b/kernel/padata.c -index 528a251217dfc..a71620d2b8bab 100644 ---- a/kernel/padata.c -+++ b/kernel/padata.c -@@ -605,8 +605,8 @@ int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type, - struct cpumask *serial_mask, *parallel_mask; - int err = -EINVAL; - -- mutex_lock(&pinst->lock); - get_online_cpus(); -+ mutex_lock(&pinst->lock); - - switch (cpumask_type) { - case PADATA_CPU_PARALLEL: -@@ -624,8 +624,8 @@ int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type, - err = __padata_set_cpumasks(pinst, parallel_mask, serial_mask); - - out: -- put_online_cpus(); - mutex_unlock(&pinst->lock); -+ put_online_cpus(); - - return err; - } --- -2.20.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 4cb75d7fd55..7d51dbddd63 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -68,7 +68,6 @@ net-wan-fsl_ucc_hdlc-reject-muram-offsets-above-64k.patch pci-iov-fix-memory-leak-in-pci_iov_add_virtfn.patch nfc-port100-convert-cpu_to_le16-le16_to_cpu-e1-e2-to.patch arm64-dts-qcom-msm8996-disable-usb2-phy-suspend-by-c.patch -padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch arm-dts-imx6-rdu2-disable-wp-for-usdhc2-and-usdhc3.patch media-v4l2-device.h-explicitly-compare-grp-id-mask-t.patch reiserfs-fix-spurious-unlock-in-reiserfs_fill_super-.patch diff --git a/queue-4.19/padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch b/queue-4.19/padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch deleted file mode 100644 index 7d6ee4bb7ad..00000000000 --- a/queue-4.19/padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch +++ /dev/null @@ -1,71 +0,0 @@ -From f4371518408514d18a10a4e9e6986c3e0887cf6e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 3 Dec 2019 14:31:11 -0500 -Subject: padata: always acquire cpu_hotplug_lock before pinst->lock - -From: Daniel Jordan - -[ Upstream commit 38228e8848cd7dd86ccb90406af32de0cad24be3 ] - -lockdep complains when padata's paths to update cpumasks via CPU hotplug -and sysfs are both taken: - - # echo 0 > /sys/devices/system/cpu/cpu1/online - # echo ff > /sys/kernel/pcrypt/pencrypt/parallel_cpumask - - ====================================================== - WARNING: possible circular locking dependency detected - 5.4.0-rc8-padata-cpuhp-v3+ #1 Not tainted - ------------------------------------------------------ - bash/205 is trying to acquire lock: - ffffffff8286bcd0 (cpu_hotplug_lock.rw_sem){++++}, at: padata_set_cpumask+0x2b/0x120 - - but task is already holding lock: - ffff8880001abfa0 (&pinst->lock){+.+.}, at: padata_set_cpumask+0x26/0x120 - - which lock already depends on the new lock. - -padata doesn't take cpu_hotplug_lock and pinst->lock in a consistent -order. Which should be first? CPU hotplug calls into padata with -cpu_hotplug_lock already held, so it should have priority. - -Fixes: 6751fb3c0e0c ("padata: Use get_online_cpus/put_online_cpus") -Signed-off-by: Daniel Jordan -Cc: Eric Biggers -Cc: Herbert Xu -Cc: Steffen Klassert -Cc: linux-crypto@vger.kernel.org -Cc: linux-kernel@vger.kernel.org -Signed-off-by: Herbert Xu -Signed-off-by: Sasha Levin ---- - kernel/padata.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/kernel/padata.c b/kernel/padata.c -index cfab62923c452..c280cb153915f 100644 ---- a/kernel/padata.c -+++ b/kernel/padata.c -@@ -671,8 +671,8 @@ int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type, - struct cpumask *serial_mask, *parallel_mask; - int err = -EINVAL; - -- mutex_lock(&pinst->lock); - get_online_cpus(); -+ mutex_lock(&pinst->lock); - - switch (cpumask_type) { - case PADATA_CPU_PARALLEL: -@@ -690,8 +690,8 @@ int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type, - err = __padata_set_cpumasks(pinst, parallel_mask, serial_mask); - - out: -- put_online_cpus(); - mutex_unlock(&pinst->lock); -+ put_online_cpus(); - - return err; - } --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 4453458a01a..81bd5b391fe 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -56,7 +56,6 @@ arm64-dts-allwinner-h6-add-pmu-mode.patch arm-dts-allwinner-h3-add-pmu-node.patch selinux-ensure-we-cleanup-the-internal-avc-counters-.patch arm64-dts-qcom-msm8996-disable-usb2-phy-suspend-by-c.patch -padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch arm-dts-imx6-rdu2-disable-wp-for-usdhc2-and-usdhc3.patch arm-dts-imx6-rdu2-limit-usbh1-to-full-speed.patch pci-iproc-apply-quirk_paxc_bridge-for-module-as-well.patch diff --git a/queue-4.4/padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch b/queue-4.4/padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch deleted file mode 100644 index 38eb2c848e5..00000000000 --- a/queue-4.4/padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 0fde03153ecc6044b38e96dfefd75f058eb8a3d5 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 3 Dec 2019 14:31:11 -0500 -Subject: padata: always acquire cpu_hotplug_lock before pinst->lock - -From: Daniel Jordan - -[ Upstream commit 38228e8848cd7dd86ccb90406af32de0cad24be3 ] - -lockdep complains when padata's paths to update cpumasks via CPU hotplug -and sysfs are both taken: - - # echo 0 > /sys/devices/system/cpu/cpu1/online - # echo ff > /sys/kernel/pcrypt/pencrypt/parallel_cpumask - - ====================================================== - WARNING: possible circular locking dependency detected - 5.4.0-rc8-padata-cpuhp-v3+ #1 Not tainted - ------------------------------------------------------ - bash/205 is trying to acquire lock: - ffffffff8286bcd0 (cpu_hotplug_lock.rw_sem){++++}, at: padata_set_cpumask+0x2b/0x120 - - but task is already holding lock: - ffff8880001abfa0 (&pinst->lock){+.+.}, at: padata_set_cpumask+0x26/0x120 - - which lock already depends on the new lock. - -padata doesn't take cpu_hotplug_lock and pinst->lock in a consistent -order. Which should be first? CPU hotplug calls into padata with -cpu_hotplug_lock already held, so it should have priority. - -Fixes: 6751fb3c0e0c ("padata: Use get_online_cpus/put_online_cpus") -Signed-off-by: Daniel Jordan -Cc: Eric Biggers -Cc: Herbert Xu -Cc: Steffen Klassert -Cc: linux-crypto@vger.kernel.org -Cc: linux-kernel@vger.kernel.org -Signed-off-by: Herbert Xu -Signed-off-by: Sasha Levin ---- - kernel/padata.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/kernel/padata.c b/kernel/padata.c -index 0d7ec5fd520bc..ae036af3f0129 100644 ---- a/kernel/padata.c -+++ b/kernel/padata.c -@@ -640,8 +640,8 @@ int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type, - struct cpumask *serial_mask, *parallel_mask; - int err = -EINVAL; - -- mutex_lock(&pinst->lock); - get_online_cpus(); -+ mutex_lock(&pinst->lock); - - switch (cpumask_type) { - case PADATA_CPU_PARALLEL: -@@ -659,8 +659,8 @@ int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type, - err = __padata_set_cpumasks(pinst, parallel_mask, serial_mask); - - out: -- put_online_cpus(); - mutex_unlock(&pinst->lock); -+ put_online_cpus(); - - return err; - } --- -2.20.1 - diff --git a/queue-4.4/series b/queue-4.4/series index dda82ea2539..ecae4353e1f 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -30,7 +30,6 @@ clk-qcom-rcg2-don-t-crash-if-our-parent-can-t-be-fou.patch drm-amdgpu-remove-4-set-but-not-used-variable-in-amd.patch regulator-rk808-lower-log-level-on-optional-gpios-be.patch nfc-port100-convert-cpu_to_le16-le16_to_cpu-e1-e2-to.patch -padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch reiserfs-fix-spurious-unlock-in-reiserfs_fill_super-.patch alsa-usx2y-adjust-indentation-in-snd_usx2y_hwdep_dsp.patch b43legacy-fix-wcast-function-type.patch diff --git a/queue-4.9/padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch b/queue-4.9/padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch deleted file mode 100644 index 68cc99e3c92..00000000000 --- a/queue-4.9/padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 1bdef1e2e81dce73c8b58f95555d8dcbff1efc9b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 3 Dec 2019 14:31:11 -0500 -Subject: padata: always acquire cpu_hotplug_lock before pinst->lock - -From: Daniel Jordan - -[ Upstream commit 38228e8848cd7dd86ccb90406af32de0cad24be3 ] - -lockdep complains when padata's paths to update cpumasks via CPU hotplug -and sysfs are both taken: - - # echo 0 > /sys/devices/system/cpu/cpu1/online - # echo ff > /sys/kernel/pcrypt/pencrypt/parallel_cpumask - - ====================================================== - WARNING: possible circular locking dependency detected - 5.4.0-rc8-padata-cpuhp-v3+ #1 Not tainted - ------------------------------------------------------ - bash/205 is trying to acquire lock: - ffffffff8286bcd0 (cpu_hotplug_lock.rw_sem){++++}, at: padata_set_cpumask+0x2b/0x120 - - but task is already holding lock: - ffff8880001abfa0 (&pinst->lock){+.+.}, at: padata_set_cpumask+0x26/0x120 - - which lock already depends on the new lock. - -padata doesn't take cpu_hotplug_lock and pinst->lock in a consistent -order. Which should be first? CPU hotplug calls into padata with -cpu_hotplug_lock already held, so it should have priority. - -Fixes: 6751fb3c0e0c ("padata: Use get_online_cpus/put_online_cpus") -Signed-off-by: Daniel Jordan -Cc: Eric Biggers -Cc: Herbert Xu -Cc: Steffen Klassert -Cc: linux-crypto@vger.kernel.org -Cc: linux-kernel@vger.kernel.org -Signed-off-by: Herbert Xu -Signed-off-by: Sasha Levin ---- - kernel/padata.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/kernel/padata.c b/kernel/padata.c -index 286c5142a0f74..6939111b3cbe0 100644 ---- a/kernel/padata.c -+++ b/kernel/padata.c -@@ -614,8 +614,8 @@ int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type, - struct cpumask *serial_mask, *parallel_mask; - int err = -EINVAL; - -- mutex_lock(&pinst->lock); - get_online_cpus(); -+ mutex_lock(&pinst->lock); - - switch (cpumask_type) { - case PADATA_CPU_PARALLEL: -@@ -633,8 +633,8 @@ int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type, - err = __padata_set_cpumasks(pinst, parallel_mask, serial_mask); - - out: -- put_online_cpus(); - mutex_unlock(&pinst->lock); -+ put_online_cpus(); - - return err; - } --- -2.20.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 34de7782c84..d14caa53449 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -42,7 +42,6 @@ regulator-rk808-lower-log-level-on-optional-gpios-be.patch net-wan-fsl_ucc_hdlc-reject-muram-offsets-above-64k.patch pci-iov-fix-memory-leak-in-pci_iov_add_virtfn.patch nfc-port100-convert-cpu_to_le16-le16_to_cpu-e1-e2-to.patch -padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch media-v4l2-device.h-explicitly-compare-grp-id-mask-t.patch reiserfs-fix-spurious-unlock-in-reiserfs_fill_super-.patch alsa-usx2y-adjust-indentation-in-snd_usx2y_hwdep_dsp.patch diff --git a/queue-5.4/padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch b/queue-5.4/padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch deleted file mode 100644 index bec0fdb0482..00000000000 --- a/queue-5.4/padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch +++ /dev/null @@ -1,71 +0,0 @@ -From f9c250173159f8f15ef4f22efb88a223d6f5c487 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 3 Dec 2019 14:31:11 -0500 -Subject: padata: always acquire cpu_hotplug_lock before pinst->lock - -From: Daniel Jordan - -[ Upstream commit 38228e8848cd7dd86ccb90406af32de0cad24be3 ] - -lockdep complains when padata's paths to update cpumasks via CPU hotplug -and sysfs are both taken: - - # echo 0 > /sys/devices/system/cpu/cpu1/online - # echo ff > /sys/kernel/pcrypt/pencrypt/parallel_cpumask - - ====================================================== - WARNING: possible circular locking dependency detected - 5.4.0-rc8-padata-cpuhp-v3+ #1 Not tainted - ------------------------------------------------------ - bash/205 is trying to acquire lock: - ffffffff8286bcd0 (cpu_hotplug_lock.rw_sem){++++}, at: padata_set_cpumask+0x2b/0x120 - - but task is already holding lock: - ffff8880001abfa0 (&pinst->lock){+.+.}, at: padata_set_cpumask+0x26/0x120 - - which lock already depends on the new lock. - -padata doesn't take cpu_hotplug_lock and pinst->lock in a consistent -order. Which should be first? CPU hotplug calls into padata with -cpu_hotplug_lock already held, so it should have priority. - -Fixes: 6751fb3c0e0c ("padata: Use get_online_cpus/put_online_cpus") -Signed-off-by: Daniel Jordan -Cc: Eric Biggers -Cc: Herbert Xu -Cc: Steffen Klassert -Cc: linux-crypto@vger.kernel.org -Cc: linux-kernel@vger.kernel.org -Signed-off-by: Herbert Xu -Signed-off-by: Sasha Levin ---- - kernel/padata.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/kernel/padata.c b/kernel/padata.c -index fda7a7039422d..fdbbe96547713 100644 ---- a/kernel/padata.c -+++ b/kernel/padata.c -@@ -643,8 +643,8 @@ int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type, - struct cpumask *serial_mask, *parallel_mask; - int err = -EINVAL; - -- mutex_lock(&pinst->lock); - get_online_cpus(); -+ mutex_lock(&pinst->lock); - - switch (cpumask_type) { - case PADATA_CPU_PARALLEL: -@@ -662,8 +662,8 @@ int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type, - err = __padata_set_cpumasks(pinst, parallel_mask, serial_mask); - - out: -- put_online_cpus(); - mutex_unlock(&pinst->lock); -+ put_online_cpus(); - - return err; - } --- -2.20.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 2f07096b66e..bc4dc8828d7 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -108,7 +108,6 @@ opp-free-static-opps-on-errors-while-adding-them.patch selinux-ensure-we-cleanup-the-internal-avc-counters-.patch arm64-dts-qcom-msm8996-disable-usb2-phy-suspend-by-c.patch padata-validate-cpumask-without-removed-cpu-during-o.patch -padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch clk-imx-add-correct-failure-handling-for-clk-based-h.patch arm-exynos_defconfig-bring-back-explicitly-wanted-op.patch arm-dts-imx6-rdu2-disable-wp-for-usdhc2-and-usdhc3.patch diff --git a/queue-5.5/padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch b/queue-5.5/padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch deleted file mode 100644 index 8e634215bdc..00000000000 --- a/queue-5.5/padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 81f5f508827b52d7260718942a2fb7b0da5570c7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 3 Dec 2019 14:31:11 -0500 -Subject: padata: always acquire cpu_hotplug_lock before pinst->lock - -From: Daniel Jordan - -[ Upstream commit 38228e8848cd7dd86ccb90406af32de0cad24be3 ] - -lockdep complains when padata's paths to update cpumasks via CPU hotplug -and sysfs are both taken: - - # echo 0 > /sys/devices/system/cpu/cpu1/online - # echo ff > /sys/kernel/pcrypt/pencrypt/parallel_cpumask - - ====================================================== - WARNING: possible circular locking dependency detected - 5.4.0-rc8-padata-cpuhp-v3+ #1 Not tainted - ------------------------------------------------------ - bash/205 is trying to acquire lock: - ffffffff8286bcd0 (cpu_hotplug_lock.rw_sem){++++}, at: padata_set_cpumask+0x2b/0x120 - - but task is already holding lock: - ffff8880001abfa0 (&pinst->lock){+.+.}, at: padata_set_cpumask+0x26/0x120 - - which lock already depends on the new lock. - -padata doesn't take cpu_hotplug_lock and pinst->lock in a consistent -order. Which should be first? CPU hotplug calls into padata with -cpu_hotplug_lock already held, so it should have priority. - -Fixes: 6751fb3c0e0c ("padata: Use get_online_cpus/put_online_cpus") -Signed-off-by: Daniel Jordan -Cc: Eric Biggers -Cc: Herbert Xu -Cc: Steffen Klassert -Cc: linux-crypto@vger.kernel.org -Cc: linux-kernel@vger.kernel.org -Signed-off-by: Herbert Xu -Signed-off-by: Sasha Levin ---- - kernel/padata.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/kernel/padata.c b/kernel/padata.c -index fda7a7039422d..fdbbe96547713 100644 ---- a/kernel/padata.c -+++ b/kernel/padata.c -@@ -643,8 +643,8 @@ int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type, - struct cpumask *serial_mask, *parallel_mask; - int err = -EINVAL; - -- mutex_lock(&pinst->lock); - get_online_cpus(); -+ mutex_lock(&pinst->lock); - - switch (cpumask_type) { - case PADATA_CPU_PARALLEL: -@@ -662,8 +662,8 @@ int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type, - err = __padata_set_cpumasks(pinst, parallel_mask, serial_mask); - - out: -- put_online_cpus(); - mutex_unlock(&pinst->lock); -+ put_online_cpus(); - - return err; - } --- -2.20.1 - diff --git a/queue-5.5/series b/queue-5.5/series index 40d6828df43..98ba482b6ee 100644 --- a/queue-5.5/series +++ b/queue-5.5/series @@ -122,7 +122,6 @@ selinux-ensure-we-cleanup-the-internal-avc-counters-.patch enetc-remove-variable-tc_max_sized_frame-set-but-not.patch arm64-dts-qcom-msm8996-disable-usb2-phy-suspend-by-c.patch padata-validate-cpumask-without-removed-cpu-during-o.patch -padata-always-acquire-cpu_hotplug_lock-before-pinst-.patch clk-imx-add-correct-failure-handling-for-clk-based-h.patch arm-exynos_defconfig-bring-back-explicitly-wanted-op.patch arm-dts-imx6-rdu2-disable-wp-for-usdhc2-and-usdhc3.patch