March 2022 - Linux-stable-mirror

by Chantal Aalim

Congratulations You have been compensated with the sum of $5.3 million USD by the United Nations, the payment will be made on ATM Visa Card and send to you from Santander Bank of Spain, we need your passport, address and your Whats-app number. Best regards Mrs. Chantal bill

2 years, 10 months

1
0
0 0

[PATCH v2 1/3] Revert "ARM: dts: sun7i: A20-olinuxino-lime2: Fix ethernet phy-mode"

by Petr Štetiar

This reverts commit 55dd7e059098ce4bd0a55c251cb78e74604abb57 as it breaks network on my A20-olinuxino-lime2 hardware revision "K" which has Micrel KSZ9031RNXCC-TR Gigabit PHY. Bastien has probably some previous hardware revisions which were based on RTL8211E-VB-CG1 PHY and thus this fix was working on his board. Cc: stable(a)vger.kernel.org Cc: Bastien Roucariès <rouca(a)debian.org> References: https://github.com/openwrt/openwrt/issues/9153 References: https://github.com/OLIMEX/OLINUXINO/blob/master/HARDWARE/A20-OLinuXino-LIME… Signed-off-by: Petr Štetiar <ynezz(a)true.cz> --- arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts index ecb91fb899ff..8077f1716fbc 100644 --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts @@ -112,7 +112,7 @@ &gmac { pinctrl-names = "default"; pinctrl-0 = <&gmac_rgmii_pins>; phy-handle = <&phy1>; - phy-mode = "rgmii-id"; + phy-mode = "rgmii"; status = "okay"; };

2 years, 10 months

3
2
0 0

[PATCH RESEND 1/2] KVM: Prevent module exit until all VMs are freed

by David Matlack

Tie the lifetime the KVM module to the lifetime of each VM via kvm.users_count. This way anything that grabs a reference to the VM via kvm_get_kvm() cannot accidentally outlive the KVM module. Prior to this commit, the lifetime of the KVM module was tied to the lifetime of /dev/kvm file descriptors, VM file descriptors, and vCPU file descriptors by their respective file_operations "owner" field. This approach is insufficient because references grabbed via kvm_get_kvm() do not prevent closing any of the aforementioned file descriptors. This fixes a long standing theoretical bug in KVM that at least affects async page faults. kvm_setup_async_pf() grabs a reference via kvm_get_kvm(), and drops it in an asynchronous work callback. Nothing prevents the VM file descriptor from being closed and the KVM module from being unloaded before this callback runs. Fixes: af585b921e5d ("KVM: Halt vcpu if page it tries to access is swapped out") Cc: stable(a)vger.kernel.org Suggested-by: Ben Gardon <bgardon(a)google.com> [ Based on a patch from Ben implemented for Google's kernel. ] Signed-off-by: David Matlack <dmatlack(a)google.com> --- virt/kvm/kvm_main.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 35ae6d32dae5..b59f0a29dbd5 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -117,6 +117,8 @@ EXPORT_SYMBOL_GPL(kvm_debugfs_dir); static const struct file_operations stat_fops_per_vm; +static struct file_operations kvm_chardev_ops; + static long kvm_vcpu_ioctl(struct file *file, unsigned int ioctl, unsigned long arg); #ifdef CONFIG_KVM_COMPAT @@ -1131,6 +1133,11 @@ static struct kvm *kvm_create_vm(unsigned long type) preempt_notifier_inc(); kvm_init_pm_notifier(kvm); + if (!try_module_get(kvm_chardev_ops.owner)) { + r = -ENODEV; + goto out_err; + } + return kvm; out_err: @@ -1220,6 +1227,7 @@ static void kvm_destroy_vm(struct kvm *kvm) preempt_notifier_dec(); hardware_disable_all(); mmdrop(mm); + module_put(kvm_chardev_ops.owner); } void kvm_get_kvm(struct kvm *kvm) base-commit: b13a3befc815eae574d87e6249f973dfbb6ad6cd prerequisite-patch-id: 38f66d60319bf0bc9bf49f91f0f9119e5441629b prerequisite-patch-id: 51aa921d68ea649d436ea68e1b8f4aabc3805156 -- 2.35.1.616.g0bdcbb4464-goog

2 years, 10 months

4
7
0 0

stable-rc/queue/5.10 baseline: 100 runs, 1 regressions (v5.10.105-71-gc7516cfcad00)

by kernelci.org bot

stable-rc/queue/5.10 baseline: 100 runs, 1 regressions (v5.10.105-71-gc7516cfcad00) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressions -----------------+-------+---------------+----------+----------------------------+------------ rk3399-gru-kevin | arm64 | lab-collabora | gcc-10 | defconfig+arm64-chromebook | 1 Details: https://kernelci.org/test/job/stable-rc/branch/queue%2F5.10/kernel/v5.10.10… Test: baseline Tree: stable-rc Branch: queue/5.10 Describe: v5.10.105-71-gc7516cfcad00 URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: c7516cfcad009215a2372e61271b68dcb7c87801 Test Regressions ---------------- platform | arch | lab | compiler | defconfig | regressions -----------------+-------+---------------+----------+----------------------------+------------ rk3399-gru-kevin | arm64 | lab-collabora | gcc-10 | defconfig+arm64-chromebook | 1 Details: https://kernelci.org/test/plan/id/6230c97db2c8e0e25dc62976 Results: 90 PASS, 2 FAIL, 0 SKIP Full config: defconfig+arm64-chromebook Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.105-71-gc7516cfcad… HTML log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.105-71-gc7516cfcad… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.bootrr.rockchip-i2s1-probed: https://kernelci.org/test/case/id/6230c97db2c8e0e25dc6299c failing since 7 days (last pass: v5.10.103-56-ge5a40f18f4ce, first fail: v5.10.103-105-gf074cce6ae0d) 2022-03-15T17:14:23.479246 <8>[ 60.191419] <LAVA_SIGNAL_TESTCASE TEST_CASE_ID=rockchip-i2s0-probed RESULT=pass> 2022-03-15T17:14:24.501287 /lava-5884294/1/../bin/lava-test-case 2022-03-15T17:14:24.511888 <8>[ 61.225342] <LAVA_SIGNAL_TESTCASE TEST_CASE_ID=rockchip-i2s1-probed RESULT=fail>

2 years, 10 months

1
0
0 0

stable-rc/queue/5.15 baseline: 77 runs, 1 regressions (v5.15.28-111-g20b27e498e39)

by kernelci.org bot

stable-rc/queue/5.15 baseline: 77 runs, 1 regressions (v5.15.28-111-g20b27e498e39) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressions -----------------+-------+---------------+----------+----------------------------+------------ rk3399-gru-kevin | arm64 | lab-collabora | gcc-10 | defconfig+arm64-chromebook | 1 Details: https://kernelci.org/test/job/stable-rc/branch/queue%2F5.15/kernel/v5.15.28… Test: baseline Tree: stable-rc Branch: queue/5.15 Describe: v5.15.28-111-g20b27e498e39 URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: 20b27e498e39be92a5dc03d0b7b80fc797110cf9 Test Regressions ---------------- platform | arch | lab | compiler | defconfig | regressions -----------------+-------+---------------+----------+----------------------------+------------ rk3399-gru-kevin | arm64 | lab-collabora | gcc-10 | defconfig+arm64-chromebook | 1 Details: https://kernelci.org/test/plan/id/6230c4958a67e3c0e3c62991 Results: 88 PASS, 4 FAIL, 0 SKIP Full config: defconfig+arm64-chromebook Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.15/v5.15.28-111-g20b27e498e… HTML log: https://storage.kernelci.org//stable-rc/queue-5.15/v5.15.28-111-g20b27e498e… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.bootrr.rockchip-i2s1-probed: https://kernelci.org/test/case/id/6230c4958a67e3c0e3c629b7 failing since 7 days (last pass: v5.15.26-42-gc89c0807b943, first fail: v5.15.26-257-g2b9a22cd5eb8) 2022-03-15T16:53:14.281959 /lava-5884213/1/../bin/lava-test-case

2 years, 10 months

1
0
0 0

stable-rc/queue/4.14 baseline: 66 runs, 1 regressions (v4.14.271-22-g242724a52a3e)

by kernelci.org bot

stable-rc/queue/4.14 baseline: 66 runs, 1 regressions (v4.14.271-22-g242724a52a3e) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressions -----------------+------+--------------+----------+--------------------+------------ meson8b-odroidc1 | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 Details: https://kernelci.org/test/job/stable-rc/branch/queue%2F4.14/kernel/v4.14.27… Test: baseline Tree: stable-rc Branch: queue/4.14 Describe: v4.14.271-22-g242724a52a3e URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: 242724a52a3e2f5a0b871c01b813308ceae302ef Test Regressions ---------------- platform | arch | lab | compiler | defconfig | regressions -----------------+------+--------------+----------+--------------------+------------ meson8b-odroidc1 | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 Details: https://kernelci.org/test/plan/id/6230b9c26518566e49c6297f Results: 0 PASS, 1 FAIL, 0 SKIP Full config: multi_v7_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.14/v4.14.271-22-g242724a52a… HTML log: https://storage.kernelci.org//stable-rc/queue-4.14/v4.14.271-22-g242724a52a… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/6230b9c26518566e49c62980 failing since 30 days (last pass: v4.14.266-18-g18b83990eba9, first fail: v4.14.266-28-g7d44cfe0255d)

2 years, 10 months

1
0
0 0

stable-rc/queue/5.4 baseline: 88 runs, 3 regressions (v5.4.184-43-g447c71776999)

by kernelci.org bot

stable-rc/queue/5.4 baseline: 88 runs, 3 regressions (v5.4.184-43-g447c71776999) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressions -------------------------+-------+---------------+----------+----------------------------+------------ qemu_arm-virt-gicv2-uefi | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 qemu_arm-virt-gicv3-uefi | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 rk3399-gru-kevin | arm64 | lab-collabora | gcc-10 | defconfig+arm64-chromebook | 1 Details: https://kernelci.org/test/job/stable-rc/branch/queue%2F5.4/kernel/v5.4.184-… Test: baseline Tree: stable-rc Branch: queue/5.4 Describe: v5.4.184-43-g447c71776999 URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: 447c7177699945fe06bd9f32f19c43adf8c25c11 Test Regressions ---------------- platform | arch | lab | compiler | defconfig | regressions -------------------------+-------+---------------+----------+----------------------------+------------ qemu_arm-virt-gicv2-uefi | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 Details: https://kernelci.org/test/plan/id/6230b1b4ee8512140ac62994 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: multi_v7_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.4/v5.4.184-43-g447c71776999… HTML log: https://storage.kernelci.org//stable-rc/queue-5.4/v5.4.184-43-g447c71776999… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/6230b1b4ee8512140ac62995 failing since 89 days (last pass: v5.4.165-9-g27d736c7bdee, first fail: v5.4.165-18-ge938927511cb) platform | arch | lab | compiler | defconfig | regressions -------------------------+-------+---------------+----------+----------------------------+------------ qemu_arm-virt-gicv3-uefi | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 Details: https://kernelci.org/test/plan/id/6230b1b5ee8512140ac62998 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: multi_v7_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.4/v5.4.184-43-g447c71776999… HTML log: https://storage.kernelci.org//stable-rc/queue-5.4/v5.4.184-43-g447c71776999… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/6230b1b5ee8512140ac62999 failing since 89 days (last pass: v5.4.165-9-g27d736c7bdee, first fail: v5.4.165-18-ge938927511cb) platform | arch | lab | compiler | defconfig | regressions -------------------------+-------+---------------+----------+----------------------------+------------ rk3399-gru-kevin | arm64 | lab-collabora | gcc-10 | defconfig+arm64-chromebook | 1 Details: https://kernelci.org/test/plan/id/6230b5d82c84d3a9b0c62970 Results: 88 PASS, 2 FAIL, 0 SKIP Full config: defconfig+arm64-chromebook Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.4/v5.4.184-43-g447c71776999… HTML log: https://storage.kernelci.org//stable-rc/queue-5.4/v5.4.184-43-g447c71776999… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.bootrr.rockchip-i2s1-probed: https://kernelci.org/test/case/id/6230b5d82c84d3a9b0c62996 failing since 9 days (last pass: v5.4.182-30-g45ccd59cc16f, first fail: v5.4.182-53-ge31c0b084082) 2022-03-15T15:50:30.686870 /lava-5883774/1/../bin/lava-test-case 2022-03-15T15:50:30.695573 <8>[ 31.380361] <LAVA_SIGNAL_TESTCASE TEST_CASE_ID=rockchip-i2s1-probed RESULT=fail>

2 years, 10 months

1
0
0 0

stable-rc/queue/4.19 baseline: 65 runs, 1 regressions (v4.19.234-29-g655878b7b44c)

by kernelci.org bot

stable-rc/queue/4.19 baseline: 65 runs, 1 regressions (v4.19.234-29-g655878b7b44c) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressions -----------------+-------+---------------+----------+----------------------------+------------ rk3399-gru-kevin | arm64 | lab-collabora | gcc-10 | defconfig+arm64-chromebook | 1 Details: https://kernelci.org/test/job/stable-rc/branch/queue%2F4.19/kernel/v4.19.23… Test: baseline Tree: stable-rc Branch: queue/4.19 Describe: v4.19.234-29-g655878b7b44c URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: 655878b7b44c020a7017001d47fea4214a5600da Test Regressions ---------------- platform | arch | lab | compiler | defconfig | regressions -----------------+-------+---------------+----------+----------------------------+------------ rk3399-gru-kevin | arm64 | lab-collabora | gcc-10 | defconfig+arm64-chromebook | 1 Details: https://kernelci.org/test/plan/id/6230ae24627c3b338ac62976 Results: 83 PASS, 7 FAIL, 0 SKIP Full config: defconfig+arm64-chromebook Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.19/v4.19.234-29-g655878b7b4… HTML log: https://storage.kernelci.org//stable-rc/queue-4.19/v4.19.234-29-g655878b7b4… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.bootrr.rockchip-i2s1-probed: https://kernelci.org/test/case/id/6230ae24627c3b338ac6299c failing since 9 days (last pass: v4.19.232-31-g5cf846953aa2, first fail: v4.19.232-44-gfd65e02206f4) 2022-03-15T15:17:42.805073 /lava-5883702/1/../bin/lava-test-case

2 years, 10 months

1
0
0 0

stable-rc/queue/5.16 baseline: 74 runs, 2 regressions (v5.16.14-122-g74c6b0438c08)

by kernelci.org bot

stable-rc/queue/5.16 baseline: 74 runs, 2 regressions (v5.16.14-122-g74c6b0438c08) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressions --------------------+-------+---------------+----------+----------------------------+------------ r8a77950-salvator-x | arm64 | lab-baylibre | gcc-10 | defconfig | 1 rk3399-gru-kevin | arm64 | lab-collabora | gcc-10 | defconfig+arm64-chromebook | 1 Details: https://kernelci.org/test/job/stable-rc/branch/queue%2F5.16/kernel/v5.16.14… Test: baseline Tree: stable-rc Branch: queue/5.16 Describe: v5.16.14-122-g74c6b0438c08 URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: 74c6b0438c087c61c3d5e1260611c532c91c8dba Test Regressions ---------------- platform | arch | lab | compiler | defconfig | regressions --------------------+-------+---------------+----------+----------------------------+------------ r8a77950-salvator-x | arm64 | lab-baylibre | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/plan/id/6230aa60a960b4cd5ac62981 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.16/v5.16.14-122-g74c6b0438c… HTML log: https://storage.kernelci.org//stable-rc/queue-5.16/v5.16.14-122-g74c6b0438c… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/6230aa60a960b4cd5ac62982 new failure (last pass: v5.16.14-112-gba4f1fffbebe) platform | arch | lab | compiler | defconfig | regressions --------------------+-------+---------------+----------+----------------------------+------------ rk3399-gru-kevin | arm64 | lab-collabora | gcc-10 | defconfig+arm64-chromebook | 1 Details: https://kernelci.org/test/plan/id/6230a88eaf7ae55dcbc62991 Results: 88 PASS, 4 FAIL, 0 SKIP Full config: defconfig+arm64-chromebook Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.16/v5.16.14-122-g74c6b0438c… HTML log: https://storage.kernelci.org//stable-rc/queue-5.16/v5.16.14-122-g74c6b0438c… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.bootrr.rockchip-i2s1-probed: https://kernelci.org/test/case/id/6230a88eaf7ae55dcbc629b5 failing since 7 days (last pass: v5.16.12-85-g060a81f57a12, first fail: v5.16.12-184-g8f38ca5a2a07) 2022-03-15T14:53:41.628034 /lava-5883583/1/../bin/lava-test-case

2 years, 10 months

1
0
0 0

[PATCH v3] pstore: Don't use semaphores in always-atomic-context code

by Jann Horn

pstore_dump() is *always* invoked in atomic context (nowadays in an RCU read-side critical section, before that under a spinlock). It doesn't make sense to try to use semaphores here. This is mostly a revert of commit ea84b580b955 ("pstore: Convert buf_lock to semaphore"), except that two parts aren't restored back exactly as they were: - keep the lock initialization in pstore_register - in efi_pstore_write(), always set the "block" flag to false - omit "is_locked", that was unnecessary since commit 959217c84c27 ("pstore: Actually give up during locking failure") - fix the bailout message The actual problem that the buggy commit was trying to address may have been that the use of preemptible() in efi_pstore_write() was wrong - it only looks at preempt_count() and the state of IRQs, but __rcu_read_lock() doesn't touch either of those under CONFIG_PREEMPT_RCU. (Sidenote: CONFIG_PREEMPT_RCU means that the scheduler can preempt tasks in RCU read-side critical sections, but you're not allowed to actively block/reschedule.) Lockdep probably never caught the problem because it's very rare that you actually hit the contended case, so lockdep always just sees the down_trylock(), not the down_interruptible(), and so it can't tell that there's a problem. Fixes: ea84b580b955 ("pstore: Convert buf_lock to semaphore") Cc: stable(a)vger.kernel.org Acked-by: Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> Signed-off-by: Jann Horn <jannh(a)google.com> --- drivers/firmware/efi/efi-pstore.c | 2 +- fs/pstore/platform.c | 38 +++++++++++++++---------------- include/linux/pstore.h | 6 ++--- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/drivers/firmware/efi/efi-pstore.c b/drivers/firmware/efi/efi-pstore.c index 0ef086e43090..7e771c56c13c 100644 --- a/drivers/firmware/efi/efi-pstore.c +++ b/drivers/firmware/efi/efi-pstore.c @@ -266,7 +266,7 @@ static int efi_pstore_write(struct pstore_record *record) efi_name[i] = name[i]; ret = efivar_entry_set_safe(efi_name, vendor, PSTORE_EFI_ATTRIBUTES, - preemptible(), record->size, record->psi->buf); + false, record->size, record->psi->buf); if (record->reason == KMSG_DUMP_OOPS && try_module_get(THIS_MODULE)) if (!schedule_work(&efivar_work)) diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index f243cb5e6a4f..e26162f102ff 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@ -143,21 +143,22 @@ static void pstore_timer_kick(void) mod_timer(&pstore_timer, jiffies + msecs_to_jiffies(pstore_update_ms)); } -/* - * Should pstore_dump() wait for a concurrent pstore_dump()? If - * not, the current pstore_dump() will report a failure to dump - * and return. - */ -static bool pstore_cannot_wait(enum kmsg_dump_reason reason) +static bool pstore_cannot_block_path(enum kmsg_dump_reason reason) { - /* In NMI path, pstore shouldn't block regardless of reason. */ + /* + * In case of NMI path, pstore shouldn't be blocked + * regardless of reason. + */ if (in_nmi()) return true; switch (reason) { /* In panic case, other cpus are stopped by smp_send_stop(). */ case KMSG_DUMP_PANIC: - /* Emergency restart shouldn't be blocked. */ + /* + * Emergency restart shouldn't be blocked by spinning on + * pstore_info::buf_lock. + */ case KMSG_DUMP_EMERG: return true; default: @@ -389,21 +390,19 @@ static void pstore_dump(struct kmsg_dumper *dumper, unsigned long total = 0; const char *why; unsigned int part = 1; + unsigned long flags = 0; int ret; why = kmsg_dump_reason_str(reason); - if (down_trylock(&psinfo->buf_lock)) { - /* Failed to acquire lock: give up if we cannot wait. */ - if (pstore_cannot_wait(reason)) { - pr_err("dump skipped in %s path: may corrupt error record\n", - in_nmi() ? "NMI" : why); - return; - } - if (down_interruptible(&psinfo->buf_lock)) { - pr_err("could not grab semaphore?!\n"); + if (pstore_cannot_block_path(reason)) { + if (!spin_trylock_irqsave(&psinfo->buf_lock, flags)) { + pr_err("dump skipped in %s path because of concurrent dump\n", + in_nmi() ? "NMI" : why); return; } + } else { + spin_lock_irqsave(&psinfo->buf_lock, flags); } kmsg_dump_rewind(&iter); @@ -467,8 +466,7 @@ static void pstore_dump(struct kmsg_dumper *dumper, total += record.size; part++; } - - up(&psinfo->buf_lock); + spin_unlock_irqrestore(&psinfo->buf_lock, flags); } static struct kmsg_dumper pstore_dumper = { @@ -594,7 +592,7 @@ int pstore_register(struct pstore_info *psi) psi->write_user = pstore_write_user_compat; psinfo = psi; mutex_init(&psinfo->read_mutex); - sema_init(&psinfo->buf_lock, 1); + spin_lock_init(&psinfo->buf_lock); if (psi->flags & PSTORE_FLAGS_DMESG) allocate_buf_for_compression(); diff --git a/include/linux/pstore.h b/include/linux/pstore.h index eb93a54cff31..e97a8188f0fd 100644 --- a/include/linux/pstore.h +++ b/include/linux/pstore.h @@ -14,7 +14,7 @@ #include <linux/errno.h> #include <linux/kmsg_dump.h> #include <linux/mutex.h> -#include <linux/semaphore.h> +#include <linux/spinlock.h> #include <linux/time.h> #include <linux/types.h> @@ -87,7 +87,7 @@ struct pstore_record { * @owner: module which is responsible for this backend driver * @name: name of the backend driver * - * @buf_lock: semaphore to serialize access to @buf + * @buf_lock: spinlock to serialize access to @buf * @buf: preallocated crash dump buffer * @bufsize: size of @buf available for crash dump bytes (must match * smallest number of bytes available for writing to a @@ -178,7 +178,7 @@ struct pstore_info { struct module *owner; const char *name; - struct semaphore buf_lock; + spinlock_t buf_lock; char *buf; size_t bufsize; base-commit: 83e396641110663d3c7bb25b9bc0c6a750359ecf -- 2.35.1.723.g4982287a31-goog

2 years, 10 months

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror March 2022