October 2019 - Linux-stable-mirror

[PATCH] MIPS: elf_hwcap: Export userspace ASEs

by Jiaxun Yang

A Golang developer reported MIPS hwcap isn't reflecting instructions that the processor actually supported so programs can't apply optimized code at runtime. Thus we export the ASEs that can be used in userspace programs. Reported-by: Meng Zhou <mengzhuo1203(a)gmail.com> Signed-off-by: Jiaxun Yang <jiaxun.yang(a)flygoat.com> Cc: linux-mips(a)vger.kernel.org Cc: Paul Burton <paul.burton(a)mips.com> Cc: <stable(a)vger.kernel.org> # 4.14+ --- arch/mips/include/uapi/asm/hwcap.h | 11 ++++++++++ arch/mips/kernel/cpu-probe.c | 33 ++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/arch/mips/include/uapi/asm/hwcap.h b/arch/mips/include/uapi/asm/hwcap.h index a2aba4b059e6..1ade1daa4921 100644 --- a/arch/mips/include/uapi/asm/hwcap.h +++ b/arch/mips/include/uapi/asm/hwcap.h @@ -6,5 +6,16 @@ #define HWCAP_MIPS_R6 (1 << 0) #define HWCAP_MIPS_MSA (1 << 1) #define HWCAP_MIPS_CRC32 (1 << 2) +#define HWCAP_MIPS_MIPS16 (1 << 3) +#define HWCAP_MIPS_MDMX (1 << 4) +#define HWCAP_MIPS_MIPS3D (1 << 5) +#define HWCAP_MIPS_SMARTMIPS (1 << 6) +#define HWCAP_MIPS_DSP (1 << 7) +#define HWCAP_MIPS_DSP2 (1 << 8) +#define HWCAP_MIPS_DSP3 (1 << 9) +#define HWCAP_MIPS_MIPS16E2 (1 << 10) +#define HWCAP_LOONGSON_MMI (1 << 11) +#define HWCAP_LOONGSON_EXT (1 << 12) +#define HWCAP_LOONGSON_EXT2 (1 << 13) #endif /* _UAPI_ASM_HWCAP_H */ diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index c2eb392597bf..f521cbf934e7 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c @@ -2180,6 +2180,39 @@ void cpu_probe(void) elf_hwcap |= HWCAP_MIPS_MSA; } + if (cpu_has_mips16) + elf_hwcap |= HWCAP_MIPS_MIPS16; + + if (cpu_has_mdmx) + elf_hwcap |= HWCAP_MIPS_MDMX; + + if (cpu_has_mips3d) + elf_hwcap |= HWCAP_MIPS_MIPS3D; + + if (cpu_has_smartmips) + elf_hwcap |= HWCAP_MIPS_SMARTMIPS; + + if (cpu_has_dsp) + elf_hwcap |= HWCAP_MIPS_DSP; + + if (cpu_has_dsp2) + elf_hwcap |= HWCAP_MIPS_DSP2; + + if (cpu_has_dsp3) + elf_hwcap |= HWCAP_MIPS_DSP3; + + if (cpu_has_mips16e2) + elf_hwcap |= HWCAP_MIPS_MIPS16E2; + + if (cpu_has_loongson_mmi) + elf_hwcap |= HWCAP_LOONGSON_MMI; + + if (cpu_has_loongson_ext) + elf_hwcap |= HWCAP_LOONGSON_EXT; + + if (cpu_has_loongson_ext2) + elf_hwcap |= HWCAP_LOONGSON_EXT2; + if (cpu_has_vz) cpu_probe_vz(c); -- 2.23.0

5 years

3
5
0 0

[PATCH] xtensa: fix change_bit in exclusive access option

by Max Filippov

change_bit implementation for XCHAL_HAVE_EXCLUSIVE case changes all bits except the one required due to copy-paste error from clear_bit. Cc: stable(a)vger.kernel.org # v5.2+ Fixes: f7c34874f04a ("xtensa: add exclusive atomics support") Signed-off-by: Max Filippov <jcmvbkbc(a)gmail.com> --- arch/xtensa/include/asm/bitops.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/xtensa/include/asm/bitops.h b/arch/xtensa/include/asm/bitops.h index aeb15f4c755b..be8b2be5a98b 100644 --- a/arch/xtensa/include/asm/bitops.h +++ b/arch/xtensa/include/asm/bitops.h @@ -148,7 +148,7 @@ static inline void change_bit(unsigned int bit, volatile unsigned long *p) " getex %0\n" " beqz %0, 1b\n" : "=&a" (tmp) - : "a" (~mask), "a" (p) + : "a" (mask), "a" (p) : "memory"); } -- 2.20.1

5 years

1
0
0 0

[PATCH 0/2] xen/netback: bug fix and cleanup

by Juergen Gross

One bugfix (patch 1) I stumbled over while doing a cleanup (patch 2) of the xen-netback init/deinit code. Juergen Gross (2): xen/netback: fix error path of xenvif_connect_data() xen/netback: cleanup init and deinit code drivers/net/xen-netback/interface.c | 115 +++++++++++++++++------------------- 1 file changed, 54 insertions(+), 61 deletions(-) -- 2.16.4

5 years

3
3
0 0

❌ FAIL: Stable queue: queue-5.3

by CKI Project

Hello, We ran automated tests on a patchset that was proposed for merging into this kernel tree. The patches were applied to: Kernel repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: d980f67059db - Linux 5.3.6 The results of these automated tests are provided below. Overall result: FAILED (see details below) Merge: OK Compile: FAILED All kernel binaries, config files, and logs are available for download here: https://artifacts.cki-project.org/pipelines/227878 We attempted to compile the kernel for multiple architectures, but the compile failed on one or more architectures: aarch64: FAILED (see build-aarch64.log.xz attachment) ppc64le: FAILED (see build-ppc64le.log.xz attachment) s390x: FAILED (see build-s390x.log.xz attachment) x86_64: FAILED (see build-x86_64.log.xz attachment) We hope that these logs can help you find the problem quickly. For the full detail on our testing procedures, please scroll to the bottom of this message. Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Merge testing ------------- We cloned this repository and checked out the following commit: Repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: d980f67059db - Linux 5.3.6 We grabbed the c0708e42c6a2 commit of the stable queue repository. We then merged the patchset with `git am`: panic-ensure-preemption-is-disabled-during-panic.patch usb-rio500-remove-rio-500-kernel-driver.patch usb-yurex-don-t-retry-on-unexpected-errors.patch usb-yurex-fix-null-derefs-on-disconnect.patch usb-usb-skeleton-fix-runtime-pm-after-driver-unbind.patch usb-usb-skeleton-fix-null-deref-on-disconnect.patch xhci-fix-false-warning-message-about-wrong-bounce-buffer-write-length.patch xhci-prevent-device-initiated-u1-u2-link-pm-if-exit-latency-is-too-long.patch xhci-check-all-endpoints-for-lpm-timeout.patch xhci-fix-usb-3.1-capability-detection-on-early-xhci-1.1-spec-based-hosts.patch usb-xhci-wait-for-cnr-controller-not-ready-bit-in-xhci-resume.patch xhci-prevent-deadlock-when-xhci-adapter-breaks-during-init.patch xhci-increase-sts_save-timeout-in-xhci_suspend.patch xhci-fix-null-pointer-dereference-in-xhci_clear_tt_buffer_complete.patch usb-adutux-fix-use-after-free-on-disconnect.patch usb-adutux-fix-null-derefs-on-disconnect.patch usb-adutux-fix-use-after-free-on-release.patch usb-iowarrior-fix-use-after-free-on-disconnect.patch usb-iowarrior-fix-use-after-free-on-release.patch usb-iowarrior-fix-use-after-free-after-driver-unbind.patch usb-usblp-fix-runtime-pm-after-driver-unbind.patch usb-chaoskey-fix-use-after-free-on-release.patch usb-ldusb-fix-null-derefs-on-driver-unbind.patch serial-uartlite-fix-exit-path-null-pointer.patch serial-uartps-fix-uartps_major-handling.patch usb-serial-keyspan-fix-null-derefs-on-open-and-write.patch usb-serial-ftdi_sio-add-device-ids-for-sienna-and-echelon-pl-20.patch usb-serial-option-add-telit-fn980-compositions.patch usb-serial-option-add-support-for-cinterion-cls8-devices.patch usb-serial-fix-runtime-pm-after-driver-unbind.patch usb-usblcd-fix-i-o-after-disconnect.patch usb-microtek-fix-info-leak-at-probe.patch usb-dummy-hcd-fix-power-budget-for-superspeed-mode.patch usb-renesas_usbhs-gadget-do-not-discard-queues-in-usb_ep_set_-halt-wedge.patch usb-renesas_usbhs-gadget-fix-usb_ep_set_-halt-wedge-behavior.patch usb-typec-tcpm-usb-typec-tcpm-fix-a-signedness-bug-in-tcpm_fw_get_caps.patch usb-typec-ucsi-ccg-remove-run_isr-flag.patch usb-typec-ucsi-displayport-fix-for-the-mode-entering-routine.patch usb-legousbtower-fix-slab-info-leak-at-probe.patch usb-legousbtower-fix-deadlock-on-disconnect.patch usb-legousbtower-fix-potential-null-deref-on-disconnect.patch usb-legousbtower-fix-open-after-failed-reset-request.patch usb-legousbtower-fix-use-after-free-on-release.patch mei-me-add-comet-point-lake-lp-device-ids.patch mei-avoid-fw-version-request-on-ibex-peak-and-earlier.patch gpio-eic-sprd-fix-the-incorrect-eic-offset-when-toggling.patch staging-fbtft-depend-on-of.patch staging-bcm2835-audio-fix-draining-behavior-regression.patch staging-fbtft-fix-memory-leak-in-fbtft_framebuffer_alloc.patch staging-rtl8188eu-fix-highestrate-check-in-odm_arfbrefresh_8188e.patch staging-vt6655-fix-memory-leak-in-vt6655_probe.patch iio-adc-hx711-fix-bug-in-sampling-of-data.patch iio-adc-ad799x-fix-probe-error-handling.patch iio-adc-axp288-override-ts-pin-bias-current-for-some-models.patch iio-adc-stm32-adc-move-registers-definitions.patch iio-adc-stm32-adc-fix-a-race-when-using-several-adcs-with-dma-and-irq.patch iio-light-opt3001-fix-mutex-unlock-race.patch iio-light-add-missing-vcnl4040-of_compatible.patch iio-accel-adxl372-fix-remove-limitation-for-fifo-samples.patch iio-accel-adxl372-fix-push-to-buffers-lost-samples.patch iio-accel-adxl372-perform-a-reset-at-start-up.patch efivar-ssdt-don-t-iterate-over-efi-vars-if-no-ssdt-override-was-specified.patch efi-tpm-don-t-access-event-count-when-it-isn-t-mapped.patch efi-tpm-don-t-traverse-an-event-log-with-no-events.patch efi-tpm-only-set-efi_tpm_final_log_size-after-successful-event-log-parsing.patch perf-llvm-don-t-access-out-of-scope-array.patch perf-inject-jit-fix-jit_code_move-filename.patch drm-i915-perform-ggtt-restore-much-earlier-during-resume.patch blk-wbt-fix-performance-regression-in-wbt-scale_up-scale_down.patch selinux-fix-context-string-corruption-in-convert_context.patch io_uring-only-flush-workqueues-on-fileset-removal.patch cifs-gracefully-handle-queryinfo-errors-during-open.patch cifs-force-revalidate-inode-when-dentry-is-stale.patch cifs-force-reval-dentry-if-lookup_reval-flag-is-set.patch cifs-use-cifsinodeinfo-open_file_lock-while-iterating-to-avoid-a-panic.patch kernel-sysctl.c-do-not-override-max_threads-provided-by-userspace.patch mm-z3fold.c-claim-page-in-the-beginning-of-free.patch mm-page_alloc.c-fix-a-crash-in-free_pages_prepare.patch mm-vmpressure.c-fix-a-signedness-bug-in-vmpressure_register_event.patch ib-core-fix-wrong-iterating-on-ports.patch firmware-google-increment-vpd-key_len-properly.patch gpio-fix-getting-nonexclusive-gpiods-from-dt.patch gpiolib-don-t-clear-flag_is_out-when-emulating-open-.patch acpi-pptt-add-support-for-acpi-6.3-thread-flag.patch arm64-topology-use-pptt-to-determine-if-pe-is-a-thre.patch iio-light-fix-vcnl4000-devicetree-hooks.patch Compile testing --------------- We compiled the kernel for 4 architectures: aarch64: make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg ppc64le: make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg s390x: make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg x86_64: make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg

5 years

1
0
0 0

[PATCH for-stable-5.3 0/3] ACPI, arm64: Backport for ACPI PPTT 6.3 thread flag

by John Garry

This series is a backport of the ACPI PPTT 6.3 thread flag feature for supporting arm64 systems. The background is that some arm64 implementations are broken, in that they incorrectly advertise that a CPU is mutli-threaded, when it is not - the HiSilicon Taishanv110 rev 2, aka tsv110, being an example. This leads to the system topology being incorrect. The reason being that arm64 topology code uses a combination of ACPI PPTT (Processor Properties Topology Table) and the system MPIDR (Multiprocessor Affinity Register) MT bit to determine the topology. Until ACPI 6.3, the PPTT did not have any method to determine whether a CPU was multi-threaded, so only the MT bit is used - hence the broken topology for some systems. In ACPI 6.3, a PPTT thread flag was introduced, which - when supported - would be used by the kernel to determine really if a CPU is multi-threaded or not, so that we don't get incorrect topology. RFC originally sent for 4.19: https://lkml.org/lkml/2019/10/10/724 Jeremy Linton (2): ACPI/PPTT: Add support for ACPI 6.3 thread flag arm64: topology: Use PPTT to determine if PE is a thread arch/arm64/kernel/topology.c | 19 ++++++++++--- drivers/acpi/pptt.c | 52 ++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 5 ++++ 3 files changed, 72 insertions(+), 4 deletions(-) -- 2.17.1

5 years

2
5
0 0

[PATCH] libata/ahci: Fix PCS quirk application

by Dan Williams

Commit c312ef176399 "libata/ahci: Drop PCS quirk for Denverton and beyond" got the polarity wrong on the check for which board-ids should have the quirk applied. The board type board_ahci_pcs7 is defined at the end of the list such that "pcs7" boards can be special cased in the future if they need the quirk. All prior Intel board ids "< board_ahci_pcs7" should proceed with applying the quirk. Reported-by: Andreas Friedrich <afrie(a)gmx.net> Reported-by: Stephen Douthit <stephend(a)silicom-usa.com> Fixes: c312ef176399 ("libata/ahci: Drop PCS quirk for Denverton and beyond") Cc: <stable(a)vger.kernel.org> Signed-off-by: Dan Williams <dan.j.williams(a)intel.com> --- drivers/ata/ahci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index dd92faf197d5..05c2b32dcc4d 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1600,7 +1600,9 @@ static void ahci_intel_pcs_quirk(struct pci_dev *pdev, struct ahci_host_priv *hp */ if (!id || id->vendor != PCI_VENDOR_ID_INTEL) return; - if (((enum board_ids) id->driver_data) < board_ahci_pcs7) + + /* Skip applying the quirk on Denverton and beyond */ + if (((enum board_ids) id->driver_data) >= board_ahci_pcs7) return; /*

5 years

3
3
0 0

+ zram-fix-race-between-backing_dev_show-and-backing_dev_store.patch added to -mm tree

by akpm＠linux-foundation.org

The patch titled Subject: zram: fix race between backing_dev_show and backing_dev_store has been added to the -mm tree. Its filename is zram-fix-race-between-backing_dev_show-and-backing_dev_store.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/zram-fix-race-between-backing_dev_… and later at http://ozlabs.org/~akpm/mmotm/broken-out/zram-fix-race-between-backing_dev_… Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Chenwandun <chenwandun(a)huawei.com> Subject: zram: fix race between backing_dev_show and backing_dev_store CPU0: CPU1: backing_dev_show backing_dev_store ...... ...... file = zram->backing_dev; down_read(&zram->init_lock); down_read(&zram->init_init_lock) file_path(file, ...); zram->backing_dev = backing_dev; up_read(&zram->init_lock); up_read(&zram->init_lock); gets the value of zram->backing_dev too early in backing_dev_show, which resultin the value being NULL at the beginning, and not NULL later. backtrace: [<ffffff8570e0f3ec>] d_path+0xcc/0x174 [<ffffff8570decd90>] file_path+0x10/0x18 [<ffffff85712f7630>] backing_dev_show+0x40/0xb4 [<ffffff85712c776c>] dev_attr_show+0x20/0x54 [<ffffff8570e835e4>] sysfs_kf_seq_show+0x9c/0x10c [<ffffff8570e82b98>] kernfs_seq_show+0x28/0x30 [<ffffff8570e1c580>] seq_read+0x184/0x488 [<ffffff8570e81ec4>] kernfs_fop_read+0x5c/0x1a4 [<ffffff8570dee0fc>] __vfs_read+0x44/0x128 [<ffffff8570dee310>] vfs_read+0xa0/0x138 [<ffffff8570dee860>] SyS_read+0x54/0xb4 Link: http://lkml.kernel.org/r/1571046839-16814-1-git-send-email-chenwandun@huawe… Signed-off-by: Chenwandun <chenwandun(a)huawei.com> Acked-by: Minchan Kim <minchan(a)kernel.org> Cc: Sergey Senozhatsky <sergey.senozhatsky.work(a)gmail.com> Cc: Jens Axboe <axboe(a)kernel.dk> Cc: <stable(a)vger.kernel.org> [4.14+] Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- drivers/block/zram/zram_drv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/block/zram/zram_drv.c~zram-fix-race-between-backing_dev_show-and-backing_dev_store +++ a/drivers/block/zram/zram_drv.c @@ -413,13 +413,14 @@ static void reset_bdev(struct zram *zram static ssize_t backing_dev_show(struct device *dev, struct device_attribute *attr, char *buf) { + struct file *file; struct zram *zram = dev_to_zram(dev); - struct file *file = zram->backing_dev; char *p; ssize_t ret; down_read(&zram->init_lock); - if (!zram->backing_dev) { + file = zram->backing_dev; + if (!file) { memcpy(buf, "none\n", 5); up_read(&zram->init_lock); return 5; _ Patches currently in -mm which might be from chenwandun(a)huawei.com are zram-fix-race-between-backing_dev_show-and-backing_dev_store.patch

5 years

1
0
0 0

Re: [PATCH] zram: fix race between backing_dev_show and backing_dev_store

by Minchan Kim

On Mon, Oct 14, 2019 at 05:53:59PM +0800, Chen Wandun wrote: > From: Chenwandun <chenwandun(a)huawei.com> > > CPU0: CPU1: > backing_dev_show backing_dev_store > ...... ...... > file = zram->backing_dev; > down_read(&zram->init_lock); down_read(&zram->init_init_lock) > file_path(file, ...); zram->backing_dev = backing_dev; > up_read(&zram->init_lock); up_read(&zram->init_lock); > > get the value of zram->backing_dev too early in backing_dev_show, > that will result the value may be NULL at the begining, and not > NULL later. > > backtrace: > [<ffffff8570e0f3ec>] d_path+0xcc/0x174 > [<ffffff8570decd90>] file_path+0x10/0x18 > [<ffffff85712f7630>] backing_dev_show+0x40/0xb4 > [<ffffff85712c776c>] dev_attr_show+0x20/0x54 > [<ffffff8570e835e4>] sysfs_kf_seq_show+0x9c/0x10c > [<ffffff8570e82b98>] kernfs_seq_show+0x28/0x30 > [<ffffff8570e1c580>] seq_read+0x184/0x488 > [<ffffff8570e81ec4>] kernfs_fop_read+0x5c/0x1a4 > [<ffffff8570dee0fc>] __vfs_read+0x44/0x128 > [<ffffff8570dee310>] vfs_read+0xa0/0x138 > [<ffffff8570dee860>] SyS_read+0x54/0xb4 > > Signed-off-by: Chenwandun <chenwandun(a)huawei.com> It should be stable material. Cc: <stable(a)vger.kernel.org> [4.14+] Acked-by: Minchan Kim <minchan(a)kernel.org> Thanks!

5 years

1
0
0 0

Re: [git:media_tree/master] media: usbvision: Fix races among open, close, and disconnect

by Alan Stern

On Mon, 14 Oct 2019, Sasha Levin wrote: > Hi, > > [This is an automated email] > > This commit has been processed because it contains a -stable tag. > The stable tag indicates that it's relevant for the following trees: all > > The bot has tested the following trees: v5.3.5, v5.2.20, v4.19.78, v4.14.148, v4.9.196, v4.4.196. > > v5.3.5: Build OK! > v5.2.20: Build OK! > v4.19.78: Build OK! > v4.14.148: Build OK! > v4.9.196: Build OK! > v4.4.196: Failed to apply! Possible dependencies: > Unable to calculate > > > NOTE: The patch will not be queued to stable trees until it is upstream. > > How should we proceed with this patch? As far as I'm concerned, it's probably not worth the effort of backporting this to 4.4.y. Alan Stern

5 years

1
0
0 0

+ ocfs2-fix-panic-due-to-ocfs2_wq-is-null.patch added to -mm tree

by akpm＠linux-foundation.org

The patch titled Subject: ocfs2: fix panic due to ocfs2_wq is null has been added to the -mm tree. Its filename is ocfs2-fix-panic-due-to-ocfs2_wq-is-null.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/ocfs2-fix-panic-due-to-ocfs2_wq-is… and later at http://ozlabs.org/~akpm/mmotm/broken-out/ocfs2-fix-panic-due-to-ocfs2_wq-is… Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Yi Li <yilikernel(a)gmail.com> Subject: ocfs2: fix panic due to ocfs2_wq is null mount.ocfs2 failed when reading ocfs2 filesystem superblock encounters an error. ocfs2_initialize_super() returns before allocating ocfs2_wq. ocfs2_dismount_volume() triggers the following panic. Oct 15 16:09:27 cnwarekv-205120 kernel: On-disk corruption discovered.Please run fsck.ocfs2 once the filesystem is unmounted. Oct 15 16:09:27 cnwarekv-205120 kernel: (mount.ocfs2,22804,44): ocfs2_read_locked_inode:537 ERROR: status = -30 Oct 15 16:09:27 cnwarekv-205120 kernel: (mount.ocfs2,22804,44): ocfs2_init_global_system_inodes:458 ERROR: status = -30 Oct 15 16:09:27 cnwarekv-205120 kernel: (mount.ocfs2,22804,44): ocfs2_init_global_system_inodes:491 ERROR: status = -30 Oct 15 16:09:27 cnwarekv-205120 kernel: (mount.ocfs2,22804,44): ocfs2_initialize_super:2313 ERROR: status = -30 Oct 15 16:09:27 cnwarekv-205120 kernel: (mount.ocfs2,22804,44): ocfs2_fill_super:1033 ERROR: status = -30 ------------[ cut here ]------------ Oops: 0002 [#1] SMP NOPTI Modules linked in: ocfs2 rpcsec_gss_krb5 auth_rpcgss nfsv4 nfs fscache lockd grace ocfs2_dlmfs ocfs2_stack_o2cb ocfs2_dlm ocfs2_nodemanager ocfs2_stackglue configfs sunrpc ipt_REJECT nf_reject_ipv4 nf_conntrack_ipv4 nf_defrag_ipv4 iptable_filter ip_tables ip6t_REJECT nf_reject_ipv6 nf_conntrack_ipv6 nf_defrag_ipv6 xt_state nf_conntrack ip6table_filter ip6_tables ib_ipoib rdma_ucm ib_ucm ib_uverbs ib_umad rdma_cm ib_cm iw_cm ib_sa ib_mad ib_core ib_addr ipv6 ovmapi ppdev parport_pc parport fb_sys_fops sysimgblt sysfillrect syscopyarea acpi_cpufreq pcspkr i2c_piix4 i2c_core sg ext4 jbd2 mbcache2 sr_mod cdrom CPU: 1 PID: 11753 Comm: mount.ocfs2 Tainted: G E 4.14.148-200.ckv.x86_64 #1 Hardware name: Sugon H320-G30/35N16-US, BIOS 0SSDX017 12/21/2018 task: ffff967af0520000 task.stack: ffffa5f05484000 RIP: 0010:mutex_lock+0x19/0x20 Call Trace: flush_workqueue+0x81/0x460 ocfs2_shutdown_local_alloc+0x47/0x440 [ocfs2] ocfs2_dismount_volume+0x84/0x400 [ocfs2] ocfs2_fill_super+0xa4/0x1270 [ocfs2] ? ocfs2_initialize_super.isa.211+0xf20/0xf20 [ocfs2] mount_bdev+0x17f/0x1c0 mount_fs+0x3a/0x160 Link: http://lkml.kernel.org/r/1571139611-24107-1-git-send-email-yili@winhong.com Signed-off-by: Yi Li <yilikernel(a)gmail.com> Reviewed-by: Joseph Qi <joseph.qi(a)linux.alibaba.com> Cc: Mark Fasheh <mark(a)fasheh.com> Cc: Joel Becker <jlbec(a)evilplan.org> Cc: Junxiao Bi <junxiao.bi(a)oracle.com> Cc: Changwei Ge <gechangwei(a)live.cn> Cc: Gang He <ghe(a)suse.com> Cc: Jun Piao <piaojun(a)huawei.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- fs/ocfs2/journal.c | 3 ++- fs/ocfs2/localalloc.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) --- a/fs/ocfs2/journal.c~ocfs2-fix-panic-due-to-ocfs2_wq-is-null +++ a/fs/ocfs2/journal.c @@ -217,7 +217,8 @@ void ocfs2_recovery_exit(struct ocfs2_su /* At this point, we know that no more recovery threads can be * launched, so wait for any recovery completion work to * complete. */ - flush_workqueue(osb->ocfs2_wq); + if (osb->ocfs2_wq) + flush_workqueue(osb->ocfs2_wq); /* * Now that recovery is shut down, and the osb is about to be --- a/fs/ocfs2/localalloc.c~ocfs2-fix-panic-due-to-ocfs2_wq-is-null +++ a/fs/ocfs2/localalloc.c @@ -377,7 +377,8 @@ void ocfs2_shutdown_local_alloc(struct o struct ocfs2_dinode *alloc = NULL; cancel_delayed_work(&osb->la_enable_wq); - flush_workqueue(osb->ocfs2_wq); + if (osb->ocfs2_wq) + flush_workqueue(osb->ocfs2_wq); if (osb->local_alloc_state == OCFS2_LA_UNUSED) goto out; _ Patches currently in -mm which might be from yilikernel(a)gmail.com are ocfs2-fix-panic-due-to-ocfs2_wq-is-null.patch

5 years

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror October 2019