February 2022 - Linux-stable-mirror

[PATCH] f2fs: quota: fix loop condition at f2fs_quota_sync()

by Juhyung Park

cnt should be passed to sb_has_quota_active() instead of type to check active quota properly. Moreover, when the type is -1, the compiler with enough inline knowledge can discard sb_has_quota_active() check altogether, causing a NULL pointer dereference at the following inode_lock(dqopt->files[cnt]): [ 2.796010] Unable to handle kernel NULL pointer dereference at virtual address 00000000000000a0 [ 2.796024] Mem abort info: [ 2.796025] ESR = 0x96000005 [ 2.796028] EC = 0x25: DABT (current EL), IL = 32 bits [ 2.796029] SET = 0, FnV = 0 [ 2.796031] EA = 0, S1PTW = 0 [ 2.796032] Data abort info: [ 2.796034] ISV = 0, ISS = 0x00000005 [ 2.796035] CM = 0, WnR = 0 [ 2.796046] user pgtable: 4k pages, 39-bit VAs, pgdp=00000003370d1000 [ 2.796048] [00000000000000a0] pgd=0000000000000000, pud=0000000000000000 [ 2.796051] Internal error: Oops: 96000005 [#1] PREEMPT SMP [ 2.796056] CPU: 7 PID: 640 Comm: f2fs_ckpt-259:7 Tainted: G S 5.4.179-arter97-r8-64666-g2f16e087f9d8 #1 [ 2.796057] Hardware name: Qualcomm Technologies, Inc. Lahaina MTP lemonadep (DT) [ 2.796059] pstate: 80c00005 (Nzcv daif +PAN +UAO) [ 2.796065] pc : down_write+0x28/0x70 [ 2.796070] lr : f2fs_quota_sync+0x100/0x294 [ 2.796071] sp : ffffffa3f48ffc30 [ 2.796073] x29: ffffffa3f48ffc30 x28: 0000000000000000 [ 2.796075] x27: ffffffa3f6d718b8 x26: ffffffa415fe9d80 [ 2.796077] x25: ffffffa3f7290048 x24: 0000000000000001 [ 2.796078] x23: 0000000000000000 x22: ffffffa3f7290000 [ 2.796080] x21: ffffffa3f72904a0 x20: ffffffa3f7290110 [ 2.796081] x19: ffffffa3f77a9800 x18: ffffffc020aae038 [ 2.796083] x17: ffffffa40e38e040 x16: ffffffa40e38e6d0 [ 2.796085] x15: ffffffa40e38e6cc x14: ffffffa40e38e6d0 [ 2.796086] x13: 00000000000004f6 x12: 00162c44ff493000 [ 2.796088] x11: 0000000000000400 x10: ffffffa40e38c948 [ 2.796090] x9 : 0000000000000000 x8 : 00000000000000a0 [ 2.796091] x7 : 0000000000000000 x6 : 0000d1060f00002a [ 2.796093] x5 : ffffffa3f48ff718 x4 : 000000000000000d [ 2.796094] x3 : 00000000060c0000 x2 : 0000000000000001 [ 2.796096] x1 : 0000000000000000 x0 : 00000000000000a0 [ 2.796098] Call trace: [ 2.796100] down_write+0x28/0x70 [ 2.796102] f2fs_quota_sync+0x100/0x294 [ 2.796104] block_operations+0x120/0x204 [ 2.796106] f2fs_write_checkpoint+0x11c/0x520 [ 2.796107] __checkpoint_and_complete_reqs+0x7c/0xd34 [ 2.796109] issue_checkpoint_thread+0x6c/0xb8 [ 2.796112] kthread+0x138/0x414 [ 2.796114] ret_from_fork+0x10/0x18 [ 2.796117] Code: aa0803e0 aa1f03e1 52800022 aa0103e9 (c8e97d02) [ 2.796120] ---[ end trace 96e942e8eb6a0b53 ]--- [ 2.800116] Kernel panic - not syncing: Fatal exception [ 2.800120] SMP: stopping secondary CPUs Fixes: 9de71ede81e6 ("f2fs: quota: fix potential deadlock") Cc: <stable(a)vger.kernel.org> # v5.15+ Signed-off-by: Juhyung Park <qkrwngud825(a)gmail.com> --- fs/f2fs/super.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 22fb4d3b1170..8e3840973077 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2689,7 +2689,7 @@ int f2fs_quota_sync(struct super_block *sb, int type) struct f2fs_sb_info *sbi = F2FS_SB(sb); struct quota_info *dqopt = sb_dqopt(sb); int cnt; - int ret; + int ret = 0; /* * Now when everything is written we can discard the pagecache so @@ -2700,8 +2700,8 @@ int f2fs_quota_sync(struct super_block *sb, int type) if (type != -1 && cnt != type) continue; - if (!sb_has_quota_active(sb, type)) - return 0; + if (!sb_has_quota_active(sb, cnt)) + continue; inode_lock(dqopt->files[cnt]); -- 2.35.1

2 years, 6 months

2
1
0 0

[PATCH 5.4 00/80] 5.4.181-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.181 release. There are 80 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 23 Feb 2022 08:48:58 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.181-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.4.181-rc1 Jing Leng <jleng(a)ambarella.com> kconfig: fix failing to generate auto.conf Marc St-Amand <mstamand(a)ciena.com> net: macb: Align the dma and coherent dma masks Slark Xiao <slark_xiao(a)163.com> net: usb: qmi_wwan: Add support for Dell DW5829e JaeSang Yoo <js.yoo.5b(a)gmail.com> tracing: Fix tp_printk option related with tp_printk_stop_on_boot Sascha Hauer <s.hauer(a)pengutronix.de> drm/rockchip: dw_hdmi: Do not leave clock enabled in error case Zoltán Böszörményi <zboszor(a)gmail.com> ata: libata-core: Disable TRIM on M88V29 Brenda Streiff <brenda.streiff(a)ni.com> kconfig: let 'shell' return enough output for deep path names Christian Hewitt <christianshewitt(a)gmail.com> arm64: dts: meson-g12: drop BL32 region from SEI510/SEI610 Christian Hewitt <christianshewitt(a)gmail.com> arm64: dts: meson-g12: add ATF BL32 reserved-memory region Christian Hewitt <christianshewitt(a)gmail.com> arm64: dts: meson-gx: add ATF BL32 reserved-memory region Florian Westphal <fw(a)strlen.de> netfilter: conntrack: don't refresh sctp entries in closed state Guo Ren <guoren(a)linux.alibaba.com> irqchip/sifive-plic: Add missing thead,c900-plic match string Ye Guojin <ye.guojin(a)zte.com.cn> ARM: OMAP2+: adjust the location of put_device() call in omapdss_init_of Wan Jiabing <wanjiabing(a)vivo.com> ARM: OMAP2+: hwmod: Add of_node_put() before break Jim Mattson <jmattson(a)google.com> KVM: x86/pmu: Use AMD64_RAW_EVENT_MASK for PERF_TYPE_RAW Miaoqian Lin <linmq006(a)gmail.com> Drivers: hv: vmbus: Fix memory leak in vmbus_add_channel_kobj Rafał Miłecki <rafal(a)milecki.pl> i2c: brcmstb: fix support for DSL and CM variants Waiman Long <longman(a)redhat.com> copy_process(): Move fd_install() out of sighand->siglock critical section Jiasheng Jiang <jiasheng(a)iscas.ac.cn> dmaengine: sh: rcar-dmac: Check for error num after setting mask Eric Dumazet <edumazet(a)google.com> net: sched: limit TC_ACT_REPEAT loops Eliav Farber <farbere(a)amazon.com> EDAC: Fix calculation of returned address and next offset in edac_align_ptr() James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Fix pt2pt NVMe PRLI reject LOGO loop david regan <dregan(a)mail.com> mtd: rawnand: brcmnand: Fixed incorrect sub-page ECC status Bryan O'Donoghue <bryan.odonoghue(a)linaro.org> mtd: rawnand: qcom: Fix clock sequencing in qcom_nandc_probe() Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS: Do not report writeback errors in nfs_getattr() Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS: LOOKUP_DIRECTORY is also ok with symlinks Laibin Qiu <qiulaibin(a)huawei.com> block/wbt: fix negative inflight counter when remove scsi device Jens Wiklander <jens.wiklander(a)linaro.org> optee: use driver internal tee_context for some rpc Jens Wiklander <jens.wiklander(a)linaro.org> tee: export teedev_open() and teedev_close_context() Christian Eggers <ceggers(a)arri.de> mtd: rawnand: gpmi: don't leak PM reference in error path Anders Roxell <anders.roxell(a)linaro.org> powerpc/lib/sstep: fix 'ptesync' build error Mark Brown <broonie(a)kernel.org> ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw_range() Mark Brown <broonie(a)kernel.org> ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw() Takashi Iwai <tiwai(a)suse.de> ALSA: hda: Fix missing codec probe on Shenker Dock 15 Takashi Iwai <tiwai(a)suse.de> ALSA: hda: Fix regression on forced probe mask option Kees Cook <keescook(a)chromium.org> libsubcmd: Fix use-after-free for realloc(..., 0) Eric Dumazet <edumazet(a)google.com> bonding: fix data-races around agg_select_timer Eric Dumazet <edumazet(a)google.com> drop_monitor: fix data-race in dropmon_net_event / trace_napi_poll_hit Zhang Changzhong <zhangchangzhong(a)huawei.com> bonding: force carrier update when releasing slave Xin Long <lucien.xin(a)gmail.com> ping: fix the dif and sdif check in ping_lookup Miquel Raynal <miquel.raynal(a)bootlin.com> net: ieee802154: ca8210: Fix lifs/sifs periods Mans Rullgard <mans(a)mansr.com> net: dsa: lan9303: fix reset on probe Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_synproxy: unregister hooks on init error path Johannes Berg <johannes.berg(a)intel.com> iwlwifi: pcie: gen2: fix locking when "HW not ready" Johannes Berg <johannes.berg(a)intel.com> iwlwifi: pcie: fix locking when "HW not ready" Christian Löhle <CLoehle(a)hyperstone.com> mmc: block: fix read single on recovery logic Seth Forshee <sforshee(a)digitalocean.com> vsock: remove vsock from connected table when connect is interrupted by a signal Tudor Ambarus <tudor.ambarus(a)microchip.com> dmaengine: at_xdmac: Start transfer for cyclic channels in issue_pending Eric W. Biederman <ebiederm(a)xmission.com> taskstats: Cleanup the use of task->exit_code Zhang Yi <yi.zhang(a)huawei.com> ext4: prevent partial update of the extent blocks Zhang Yi <yi.zhang(a)huawei.com> ext4: check for inconsistent extents between index and leaf block Zhang Yi <yi.zhang(a)huawei.com> ext4: check for out-of-order index extents in ext4_valid_extent_entries() Nicholas Bishop <nicholasbishop(a)google.com> drm/radeon: Fix backlight control on iMac 12,1 Johannes Berg <johannes.berg(a)intel.com> iwlwifi: fix use-after-free Mark Rutland <mark.rutland(a)arm.com> arm64: module/ftrace: intialize PLT at load time Mark Rutland <mark.rutland(a)arm.com> arm64: module: rework special section handling Mark Rutland <mark.rutland(a)arm.com> module/ftrace: handle patchable-function-entry Mark Rutland <mark.rutland(a)arm.com> ftrace: add ftrace_init_nop() Igor Pylypiv <ipylypiv(a)google.com> Revert "module, async: async_synchronize_full() on module init iff async is used" Christian König <christian.koenig(a)amd.com> drm/amdgpu: fix logic inversion in check Sagi Grimberg <sagi(a)grimberg.me> nvme-rdma: fix possible use-after-free in transport error_recovery work Sagi Grimberg <sagi(a)grimberg.me> nvme-tcp: fix possible use-after-free in transport error_recovery work Sagi Grimberg <sagi(a)grimberg.me> nvme: fix a possible use-after-free in controller reset during load Darrick J. Wong <djwong(a)kernel.org> quota: make dquot_quota_sync return errors from ->sync_fs Darrick J. Wong <djwong(a)kernel.org> vfs: make freeze_super abort when sync_filesystem returns error Duoming Zhou <duoming(a)zju.edu.cn> ax25: improve the incomplete fix to avoid UAF and NPD bugs Yang Xu <xuyang2018.jy(a)fujitsu.com> selftests/zram: Adapt the situation that /dev/zram0 is being used Yang Xu <xuyang2018.jy(a)fujitsu.com> selftests/zram01.sh: Fix compression ratio calculation Yang Xu <xuyang2018.jy(a)fujitsu.com> selftests/zram: Skip max_comp_streams interface on newer kernel Miquel Raynal <miquel.raynal(a)bootlin.com> net: ieee802154: at86rf230: Stop leaking skb's Nícolas F. R. A. Prado <nfraprado(a)collabora.com> selftests: rtc: Increase test timeout so that all tests run Srinivas Pandruvada <srinivas.pandruvada(a)linux.intel.com> platform/x86: ISST: Fix possible circular locking dependency detected Dāvis Mosāns <davispuh(a)gmail.com> btrfs: send: in case of IO error log it John David Anglin <dave.anglin(a)bell.net> parisc: Fix sglist access in ccio-dma.c John David Anglin <dave.anglin(a)bell.net> parisc: Fix data TLB miss in sba_unmap_sg John David Anglin <dave.anglin(a)bell.net> parisc: Drop __init from map_pages declaration Randy Dunlap <rdunlap(a)infradead.org> serial: parisc: GSC: fix build when IOSAPIC is not set Sean Christopherson <seanjc(a)google.com> Revert "svm: Add warning message for AVIC IPI invalid target" Sergio Costas <rastersoft(a)gmail.com> HID:Add support for UGTABLET WP5540 Nathan Chancellor <nathan(a)kernel.org> Makefile.extrawarn: Move -Wunaligned-access to W=1 ------------- Diffstat: Makefile | 4 +- arch/arm/mach-omap2/display.c | 2 +- arch/arm/mach-omap2/omap_hwmod.c | 4 +- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 8 -- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 8 -- arch/arm64/kernel/ftrace.c | 55 +++------ arch/arm64/kernel/module.c | 47 ++++++-- arch/parisc/Makefile | 1 - arch/parisc/kernel/module.c | 10 +- arch/parisc/kernel/module.lds | 7 -- arch/parisc/mm/init.c | 9 +- arch/powerpc/lib/sstep.c | 2 + arch/x86/kvm/pmu.c | 2 +- arch/x86/kvm/svm.c | 2 - block/bfq-iosched.c | 2 + block/elevator.c | 2 - drivers/ata/libata-core.c | 1 + drivers/dma/at_xdmac.c | 6 +- drivers/dma/sh/rcar-dmac.c | 4 +- drivers/edac/edac_mc.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- drivers/gpu/drm/radeon/atombios_encoders.c | 3 +- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 14 +-- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-quirks.c | 1 + drivers/hv/vmbus_drv.c | 5 +- drivers/i2c/busses/i2c-brcmstb.c | 2 +- drivers/irqchip/irq-sifive-plic.c | 1 + drivers/mmc/core/block.c | 28 ++--- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 2 +- drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 3 +- drivers/mtd/nand/raw/qcom_nandc.c | 14 +-- drivers/net/bonding/bond_3ad.c | 30 ++++- drivers/net/bonding/bond_main.c | 5 +- drivers/net/dsa/lan9303-core.c | 2 +- drivers/net/ethernet/cadence/macb_main.c | 2 +- drivers/net/ieee802154/at86rf230.c | 13 +- drivers/net/ieee802154/ca8210.c | 4 +- drivers/net/usb/qmi_wwan.c | 2 + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 3 +- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 3 +- drivers/nvme/host/core.c | 9 +- drivers/nvme/host/rdma.c | 1 + drivers/nvme/host/tcp.c | 1 + drivers/parisc/ccio-dma.c | 3 +- drivers/parisc/sba_iommu.c | 3 +- .../x86/intel_speed_select_if/isst_if_common.c | 97 +++++++++------ drivers/scsi/lpfc/lpfc.h | 1 + drivers/scsi/lpfc/lpfc_attr.c | 3 + drivers/scsi/lpfc/lpfc_els.c | 20 ++- drivers/scsi/lpfc/lpfc_nportdisc.c | 5 +- drivers/tee/optee/core.c | 8 ++ drivers/tee/optee/optee_private.h | 2 + drivers/tee/optee/rpc.c | 8 +- drivers/tee/tee_core.c | 6 +- drivers/tty/serial/8250/8250_gsc.c | 2 +- fs/btrfs/send.c | 4 + fs/ext4/extents.c | 92 +++++++++----- fs/nfs/dir.c | 4 +- fs/nfs/inode.c | 9 +- fs/quota/dquot.c | 11 +- fs/super.c | 19 +-- include/asm-generic/vmlinux.lds.h | 14 +-- include/linux/ftrace.h | 40 +++++- include/linux/sched.h | 1 - include/linux/tee_drv.h | 14 +++ include/net/bond_3ad.h | 2 +- kernel/async.c | 3 - kernel/fork.c | 7 +- kernel/module.c | 27 +---- kernel/trace/ftrace.c | 6 +- kernel/trace/trace.c | 4 + kernel/tsacct.c | 7 +- net/ax25/af_ax25.c | 9 +- net/core/drop_monitor.c | 11 +- net/ipv4/ping.c | 11 +- net/netfilter/nf_conntrack_proto_sctp.c | 9 ++ net/netfilter/nft_synproxy.c | 4 +- net/sched/act_api.c | 13 +- net/vmw_vsock/af_vsock.c | 1 + scripts/Makefile.extrawarn | 1 + scripts/kconfig/confdata.c | 13 +- scripts/kconfig/preprocess.c | 2 +- sound/pci/hda/hda_intel.c | 5 +- sound/soc/soc-ops.c | 29 +++-- tools/lib/subcmd/subcmd-util.h | 11 +- tools/testing/selftests/rtc/settings | 2 +- tools/testing/selftests/zram/zram.sh | 15 +-- tools/testing/selftests/zram/zram01.sh | 33 ++--- tools/testing/selftests/zram/zram02.sh | 1 - tools/testing/selftests/zram/zram_lib.sh | 134 ++++++++++++++------- 94 files changed, 659 insertions(+), 410 deletions(-)

2 years, 6 months

11
92
0 0

[PATCH] ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM

by Ammar Faizi

From: Ammar Faizi <ammarfaizi2(a)gnuweeb.org> Do not call snd_dma_free_pages() when snd_dma_alloc_pages() returns -ENOMEM because it leads to a NULL pointer dereference bug. The dmesg says: <6>[109482.497835][T138537] usb 1-2: Manufacturer: SIGMACHIP <6>[109482.502506][T138537] input: SIGMACHIP USB Keyboard as /devices/pci0000:00/0000:00:14.0/usb1/1-2/1-2:1.0/0003:1C4F:0002.000D/input/input34 <6>[109482.558976][T138537] hid-generic 0003:1C4F:0002.000D: input,hidraw1: USB HID v1.10 Keyboard [SIGMACHIP USB Keyboard] on usb-0000:00:14.0-2/input0 <6>[109482.561653][T138537] input: SIGMACHIP USB Keyboard Consumer Control as /devices/pci0000:00/0000:00:14.0/usb1/1-2/1-2:1.1/0003:1C4F:0002.000E/input/input35 <6>[109482.615490][T138537] input: SIGMACHIP USB Keyboard System Control as /devices/pci0000:00/0000:00:14.0/usb1/1-2/1-2:1.1/0003:1C4F:0002.000E/input/input36 <6>[109482.615643][T138537] hid-generic 0003:1C4F:0002.000E: input,hidraw2: USB HID v1.10 Device [SIGMACHIP USB Keyboard] on usb-0000:00:14.0-2/input1 <4>[110102.335460][T140985] rtw_8822ce 0000:01:00.0: timed out to flush queue 1 <3>[118575.730928][ T1387] sof-audio-pci-intel-tgl 0000:00:1f.3: error: memory alloc failed: -12 <1>[118575.730948][ T1387] BUG: kernel NULL pointer dereference, address: 0000000000000000 <1>[118575.730951][ T1387] #PF: supervisor read access in kernel mode <1>[118575.730953][ T1387] #PF: error_code(0x0000) - not-present page <6>[118575.730956][ T1387] PGD 0 P4D 0 <4>[118575.730960][ T1387] Oops: 0000 [#1] PREEMPT SMP NOPTI <4>[118575.730965][ T1387] CPU: 6 PID: 1387 Comm: alsa-sink-HDA A Tainted: G W 5.17.0-rc4-superb-owl-00055-g80d47f5de5e3 #3 56590caeed02394520e20ca5a2059907eb2d5079 <4>[118575.730969][ T1387] Hardware name: HP HP Laptop 14s-dq2xxx/87FD, BIOS F.15 09/15/2021 <4>[118575.730972][ T1387] RIP: 0010:dma_free_noncontiguous+0x37/0x80 <4>[118575.730979][ T1387] Code: 8b 87 80 03 00 00 48 85 c0 75 07 48 8b 05 f9 39 2b 02 48 85 c0 74 13 4c 8b 48 28 4d 85 c9 74 0a 48 89 da 44 89 c1 5b 41 ff e1 <48> 8b 0b 48 8b 11 48 8b 49 10 48 83 e2 fc 48 81 c6 ff 0f 00 00 48 <4>[118575.730982][ T1387] RSP: 0000:ffffc90002b87770 EFLAGS: 00010246 <4>[118575.730986][ T1387] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 <4>[118575.730987][ T1387] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff888101db30d0 <4>[118575.730989][ T1387] RBP: 00000000fffffff4 R08: 0000000000000000 R09: 0000000000000000 <4>[118575.730991][ T1387] R10: 0000000000000000 R11: ffffc90002b874d0 R12: 0000000000000001 <4>[118575.730993][ T1387] R13: 0000000000058000 R14: ffff888105260c68 R15: ffff888105260828 <4>[118575.730995][ T1387] FS: 00007f42e2ffd640(0000) GS:ffff888466b80000(0000) knlGS:0000000000000000 <4>[118575.730998][ T1387] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 <4>[118575.731000][ T1387] CR2: 0000000000000000 CR3: 000000014acf0003 CR4: 0000000000770ee0 <4>[118575.731003][ T1387] PKRU: 55555554 <4>[118575.731005][ T1387] Call Trace: <4>[118575.731009][ T1387] <TASK> <4>[118575.731016][ T1387] cl_stream_prepare+0x10a/0x120 [snd_sof_intel_hda_common 146addf995b9279ae7f509621078cccbe4f875e1] <4>[118575.731027][ T1387] hda_dsp_cl_boot_firmware_iccmax+0x50/0xf0 [snd_sof_intel_hda_common 146addf995b9279ae7f509621078cccbe4f875e1] <4>[118575.731034][ T1387] snd_sof_run_firmware+0xb5/0x300 [snd_sof b83a5eaf64712c6f474ef3641062bb71902deae4] <4>[118575.731045][ T1387] sof_resume+0xb1/0x2c0 [snd_sof b83a5eaf64712c6f474ef3641062bb71902deae4] <4>[118575.731054][ T1387] ? pci_pme_active+0x1b4/0x220 <4>[118575.731060][ T1387] pci_pm_runtime_resume+0xaa/0xe0 <4>[118575.731064][ T1387] ? pci_pm_runtime_suspend+0x190/0x190 <4>[118575.731067][ T1387] __rpm_callback+0x9c/0x320 <4>[118575.731072][ T1387] ? pci_pm_runtime_suspend+0x190/0x190 <4>[118575.731075][ T1387] ? pci_pm_runtime_suspend+0x190/0x190 <4>[118575.731077][ T1387] rpm_resume+0x50d/0x690 <4>[118575.731082][ T1387] __pm_runtime_resume+0x69/0x80 <4>[118575.731085][ T1387] snd_soc_pcm_component_pm_runtime_get+0x60/0xe0 [snd_soc_core 6817f963f4c978c6ec831f778545ab4db1a1023f] <4>[118575.731102][ T1387] __soc_pcm_open+0x82/0x530 [snd_soc_core 6817f963f4c978c6ec831f778545ab4db1a1023f] <4>[118575.731114][ T1387] dpcm_be_dai_startup+0x14b/0x260 [snd_soc_core 6817f963f4c978c6ec831f778545ab4db1a1023f] <4>[118575.731128][ T1387] dpcm_fe_dai_startup+0x73/0x930 [snd_soc_core 6817f963f4c978c6ec831f778545ab4db1a1023f] <4>[118575.731139][ T1387] ? dpcm_add_paths+0x109/0x1b0 [snd_soc_core 6817f963f4c978c6ec831f778545ab4db1a1023f] <4>[118575.731152][ T1387] dpcm_fe_dai_open+0x74/0x160 [snd_soc_core 6817f963f4c978c6ec831f778545ab4db1a1023f] <4>[118575.731166][ T1387] snd_pcm_open_substream+0x56f/0x840 [snd_pcm 2213f8e36532d8bc92ec1ec574108b0385b1b13a] <4>[118575.731177][ T1387] snd_pcm_open+0xb3/0x1d0 [snd_pcm 2213f8e36532d8bc92ec1ec574108b0385b1b13a] <4>[118575.731185][ T1387] ? sched_dynamic_update+0x1a0/0x1a0 <4>[118575.731189][ T1387] ? cd_forget+0x80/0x80 <4>[118575.731194][ T1387] snd_pcm_playback_open+0x3c/0x60 [snd_pcm 2213f8e36532d8bc92ec1ec574108b0385b1b13a] <4>[118575.731201][ T1387] chrdev_open+0x1d3/0x200 <4>[118575.731205][ T1387] ? cd_forget+0x80/0x80 <4>[118575.731208][ T1387] do_dentry_open+0x254/0x370 <4>[118575.731213][ T1387] path_openat+0x9e6/0xbc0 <4>[118575.731218][ T1387] ? lock_release+0x230/0x300 <4>[118575.731223][ T1387] ? snd_ctl_ioctl+0x759/0x900 [snd 1eb0a4959d3d3710c16836cd2838d885bf8f75a9] <4>[118575.731232][ T1387] do_filp_open+0x93/0x120 <4>[118575.731237][ T1387] ? alloc_fd+0x147/0x180 <4>[118575.731242][ T1387] ? _raw_spin_unlock+0x29/0x40 <4>[118575.731246][ T1387] ? alloc_fd+0x147/0x180 <4>[118575.731251][ T1387] do_sys_openat2+0x68/0x130 <4>[118575.731255][ T1387] __x64_sys_openat+0x6f/0x80 <4>[118575.731259][ T1387] do_syscall_64+0x3d/0xb0 <4>[118575.731264][ T1387] ? exit_to_user_mode_prepare+0x2c/0x50 <4>[118575.731267][ T1387] entry_SYSCALL_64_after_hwframe+0x44/0xae <4>[118575.731271][ T1387] RIP: 0033:0x7f42ee19a6e4 <4>[118575.731274][ T1387] Code: 24 20 eb 8f 66 90 44 89 54 24 0c e8 16 d2 f7 ff 44 8b 54 24 0c 44 89 e2 48 89 ee 41 89 c0 bf 9c ff ff ff b8 01 01 00 00 0f 05 <48> 3d 00 f0 ff ff 77 34 44 89 c7 89 44 24 0c e8 58 d2 f7 ff 8b 44 <4>[118575.731277][ T1387] RSP: 002b:00007f42e2ffc620 EFLAGS: 00000293 ORIG_RAX: 0000000000000101 <4>[118575.731281][ T1387] RAX: ffffffffffffffda RBX: 0000000000080802 RCX: 00007f42ee19a6e4 <4>[118575.731283][ T1387] RDX: 0000000000080802 RSI: 00007f42e2ffc6c0 RDI: 00000000ffffff9c <4>[118575.731284][ T1387] RBP: 00007f42e2ffc6c0 R08: 0000000000000000 R09: 00007f42e2ffc437 <4>[118575.731286][ T1387] R10: 0000000000000000 R11: 0000000000000293 R12: 0000000000080802 <4>[118575.731289][ T1387] R13: 00007f42e8c3faa0 R14: 00007f42e2ffc6c0 R15: 0000000081204101 <4>[118575.731293][ T1387] </TASK> <4>[118575.731294][ T1387] Modules linked in: ccm xt_CHECKSUM xt_MASQUERADE xt_conntrack ipt_REJECT nf_reject_ipv4 xt_tcpudp nft_compat rfcomm nft_chain_nat nf_nat nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 nf_tables nfnetlink bridge stp llc snd_soc_skl_hda_dsp snd_soc_hdac_hdmi snd_soc_intel_hda_dsp_common snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic cmac algif_hash algif_skcipher af_alg bnep zram snd_soc_dmic snd_sof_pci_intel_tgl snd_sof_intel_hda_common i915 nls_iso8859_1 snd_soc_hdac_hda snd_sof_intel_hda soundwire_intel soundwire_generic_allocation soundwire_cadence snd_sof_pci snd_sof_xtensa_dsp rtw88_8822ce snd_sof rtw88_8822c rtw88_pci snd_hda_ext_core rtw88_core snd_soc_acpi_intel_match intel_tcc_cooling snd_soc_acpi x86_pkg_temp_thermal soundwire_bus intel_powerclamp coretemp ledtrig_audio snd_soc_core mac80211 snd_compress ac97_bus snd_pcm_dmaengine snd_hda_intel snd_intel_dspcfg snd_intel_sdw_acpi snd_hda_codec ttm snd_hda_core kvm_intel snd_hwdep btusb <4>[118575.731347][ T1387] drm_kms_helper snd_pcm uvcvideo btrtl btmtk btintel snd_seq_midi btbcm snd_seq_midi_event videobuf2_v4l2 snd_rawmidi mei_hdcp intel_rapl_msr videobuf2_vmalloc bluetooth cfg80211 kvm snd_seq cec videobuf2_memops crct10dif_pclmul videobuf2_common rc_core ghash_clmulni_intel aesni_intel snd_seq_device processor_thermal_device_pci_legacy videodev i2c_algo_bit snd_timer processor_thermal_device fb_sys_fops processor_thermal_rfim crypto_simd cryptd processor_thermal_mbox snd sysimgblt mei_me processor_thermal_rapl hp_wmi ecdh_generic syscopyarea mc intel_rapl_common platform_profile input_leds serio_raw sparse_keymap mei ecc sysfillrect wmi_bmof joydev hid_multitouch libarc4 soundcore efi_pstore ee1004 intel_soc_dts_iosf int3400_thermal int3403_thermal mac_hid acpi_thermal_rel int340x_thermal_zone acpi_pad dptf_pch_fivr sch_fq_codel msr drm parport_pc ppdev lp parport ip_tables x_tables autofs4 btrfs xor raid6_pq libcrc32c usbhid nvme nvme_core hid_generic <4>[118575.731410][ T1387] i2c_i801 intel_lpss_pci crc32_pclmul xhci_pci intel_lpss i2c_smbus xhci_pci_renesas idma64 i2c_hid_acpi vmd i2c_hid wmi hid video pinctrl_tigerlake <4>[118575.731425][ T1387] CR2: 0000000000000000 <4>[118575.731428][ T1387] ---[ end trace 0000000000000000 ]--- <4>[118575.867259][ T1387] RIP: 0010:dma_free_noncontiguous+0x37/0x80 <4>[118575.867273][ T1387] Code: 8b 87 80 03 00 00 48 85 c0 75 07 48 8b 05 f9 39 2b 02 48 85 c0 74 13 4c 8b 48 28 4d 85 c9 74 0a 48 89 da 44 89 c1 5b 41 ff e1 <48> 8b 0b 48 8b 11 48 8b 49 10 48 83 e2 fc 48 81 c6 ff 0f 00 00 48 <4>[118575.867277][ T1387] RSP: 0000:ffffc90002b87770 EFLAGS: 00010246 <4>[118575.867282][ T1387] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 <4>[118575.867284][ T1387] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff888101db30d0 <4>[118575.867286][ T1387] RBP: 00000000fffffff4 R08: 0000000000000000 R09: 0000000000000000 <4>[118575.867288][ T1387] R10: 0000000000000000 R11: ffffc90002b874d0 R12: 0000000000000001 <4>[118575.867290][ T1387] R13: 0000000000058000 R14: ffff888105260c68 R15: ffff888105260828 <4>[118575.867292][ T1387] FS: 00007f42e2ffd640(0000) GS:ffff888466b80000(0000) knlGS:0000000000000000 <4>[118575.867295][ T1387] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 <4>[118575.867297][ T1387] CR2: 0000000000000000 CR3: 000000014acf0003 CR4: 0000000000770ee0 <4>[118575.867300][ T1387] PKRU: 55555554 Cc: Daniel Baluta <daniel.baluta(a)nxp.com> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Cc: Keyon Jie <yang.jie(a)linux.intel.com> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Cc: Rander Wang <rander.wang(a)intel.com> Cc: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Cc: Takashi Iwai <tiwai(a)suse.com> Fixes: d16046ffa6de040bf580a64d5f4d0aa18258a854 ("ASoC: SOF: Intel: Add Intel specific HDA firmware loader") Cc: stable(a)vger.kernel.org # v5.2+ Cc: sound-open-firmware(a)alsa-project.org Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org Signed-off-by: Ammar Faizi <ammarfaizi2(a)gnuweeb.org> --- sound/soc/sof/intel/hda-loader.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sound/soc/sof/intel/hda-loader.c b/sound/soc/sof/intel/hda-loader.c index 33306d2023a7..9bbfdab8009d 100644 --- a/sound/soc/sof/intel/hda-loader.c +++ b/sound/soc/sof/intel/hda-loader.c @@ -47,7 +47,7 @@ static struct hdac_ext_stream *cl_stream_prepare(struct snd_sof_dev *sdev, unsig ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV_SG, &pci->dev, size, dmab); if (ret < 0) { dev_err(sdev->dev, "error: memory alloc failed: %d\n", ret); - goto error; + goto out_put; } hstream->period_bytes = 0;/* initialize period_bytes */ @@ -58,22 +58,23 @@ static struct hdac_ext_stream *cl_stream_prepare(struct snd_sof_dev *sdev, unsig ret = hda_dsp_iccmax_stream_hw_params(sdev, dsp_stream, dmab, NULL); if (ret < 0) { dev_err(sdev->dev, "error: iccmax stream prepare failed: %d\n", ret); - goto error; + goto out_free; } } else { ret = hda_dsp_stream_hw_params(sdev, dsp_stream, dmab, NULL); if (ret < 0) { dev_err(sdev->dev, "error: hdac prepare failed: %d\n", ret); - goto error; + goto out_free; } hda_dsp_stream_spib_config(sdev, dsp_stream, HDA_DSP_SPIB_ENABLE, size); } return dsp_stream; -error: - hda_dsp_stream_put(sdev, direction, hstream->stream_tag); +out_free: snd_dma_free_pages(dmab); +out_put: + hda_dsp_stream_put(sdev, direction, hstream->stream_tag); return ERR_PTR(ret); } base-commit: 23d04328444a8fa0ca060c5e532220dac8e8bc26 -- 2.32.0

2 years, 6 months

4
12
0 0

[PATCH AUTOSEL 4.9 1/9] mac80211_hwsim: report NOACK frames in tx_status

by Sasha Levin

From: Benjamin Beichler <benjamin.beichler(a)uni-rostock.de> [ Upstream commit 42a79960ffa50bfe9e0bf5d6280be89bf563a5dd ] Add IEEE80211_TX_STAT_NOACK_TRANSMITTED to tx_status flags to have proper statistics for non-acked frames. Signed-off-by: Benjamin Beichler <benjamin.beichler(a)uni-rostock.de> Link: https://lore.kernel.org/r/20220111221327.1499881-1-benjamin.beichler@uni-ro… Signed-off-by: Johannes Berg <johannes.berg(a)intel.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/net/wireless/mac80211_hwsim.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index dd6924d21b8a1..a965ce9261d3a 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -2919,6 +2919,10 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2, } txi->flags |= IEEE80211_TX_STAT_ACK; } + + if (hwsim_flags & HWSIM_TX_CTL_NO_ACK) + txi->flags |= IEEE80211_TX_STAT_NOACK_TRANSMITTED; + ieee80211_tx_status_irqsafe(data2->hw, skb); return 0; out: -- 2.34.1

2 years, 6 months

2
9
0 0

[PATCH] USB: serial: simple: add Nokia phone driver

by Johan Hovold

Add a new "simple" driver for certain Nokia phones, including Nokia 130 (RM-1035) which exposes two serial ports in "charging only" mode. Reported-by: Felix Becker <linux.felixbecker2(a)gmx.de> Link: https://lore.kernel.org/r/20220208201506.6c65834d@gmx.de Cc: stable(a)vger.kernel.org Signed-off-by: Johan Hovold <johan(a)kernel.org> --- drivers/usb/serial/Kconfig | 1 + drivers/usb/serial/usb-serial-simple.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig index de5c01257060..ef8d1c73c754 100644 --- a/drivers/usb/serial/Kconfig +++ b/drivers/usb/serial/Kconfig @@ -66,6 +66,7 @@ config USB_SERIAL_SIMPLE - Libtransistor USB console - a number of Motorola phones - Motorola Tetra devices + - Nokia mobile phones - Novatel Wireless GPS receivers - Siemens USB/MPI adapter. - ViVOtech ViVOpay USB device. diff --git a/drivers/usb/serial/usb-serial-simple.c b/drivers/usb/serial/usb-serial-simple.c index bd23a7cb1be2..c95dfe4a6f0f 100644 --- a/drivers/usb/serial/usb-serial-simple.c +++ b/drivers/usb/serial/usb-serial-simple.c @@ -91,6 +91,11 @@ DEVICE(moto_modem, MOTO_IDS); { USB_DEVICE(0x0cad, 0x9016) } /* TPG2200 */ DEVICE(motorola_tetra, MOTOROLA_TETRA_IDS); +/* Nokia mobile phone driver */ +#define NOKIA_IDS() \ + { USB_DEVICE(0x0421, 0x069a) } /* Nokia 130 (RM-1035) */ +DEVICE_N(nokia, NOKIA_IDS, 2); + /* Novatel Wireless GPS driver */ #define NOVATEL_IDS() \ { USB_DEVICE(0x09d7, 0x0100) } /* NovAtel FlexPack GPS */ @@ -123,6 +128,7 @@ static struct usb_serial_driver * const serial_drivers[] = { &vivopay_device, &moto_modem_device, &motorola_tetra_device, + &nokia_device, &novatel_gps_device, &hp4x_device, &suunto_device, @@ -140,6 +146,7 @@ static const struct usb_device_id id_table[] = { VIVOPAY_IDS(), MOTO_IDS(), MOTOROLA_TETRA_IDS(), + NOKIA_IDS(), NOVATEL_IDS(), HP4X_IDS(), SUUNTO_IDS(), -- 2.34.1

2 years, 6 months

2
1
0 0

[PATCH v2 1/2] Revert "xen-netback: remove 'hotplug-status' once it has served its purpose"

by Marek Marczykowski-Górecki

This reverts commit 1f2565780e9b7218cf92c7630130e82dcc0fe9c2. The 'hotplug-status' node should not be removed as long as the vif device remains configured. Otherwise the xen-netback would wait for re-running the network script even if it was already called (in case of the frontent re-connecting). But also, it _should_ be removed when the vif device is destroyed (for example when unbinding the driver) - otherwise hotplug script would not configure the device whenever it re-appear. Moving removal of the 'hotplug-status' node was a workaround for nothing calling network script after xen-netback module is reloaded. But when vif interface is re-created (on xen-netback unbind/bind for example), the script should be called, regardless of who does that - currently this case is not handled by the toolstack, and requires manual script call. Keeping hotplug-status=connected to skip the call is wrong and leads to not configured interface. More discussion at https://lore.kernel.org/xen-devel/afedd7cb-a291-e773-8b0d-4db9b291fa98@ipxe… Cc: stable(a)vger.kernel.org Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- Cc: Michael Brown <mcb30(a)ipxe.org> Changes in v2: - build fix, reported by kernel test robot <lkp(a)intel.com> --- drivers/net/xen-netback/xenbus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c index d24b7a7993aa..3fad58d22155 100644 --- a/drivers/net/xen-netback/xenbus.c +++ b/drivers/net/xen-netback/xenbus.c @@ -256,6 +256,7 @@ static void backend_disconnect(struct backend_info *be) unsigned int queue_index; xen_unregister_watchers(vif); + xenbus_rm(XBT_NIL, be->dev->nodename, "hotplug-status"); #ifdef CONFIG_DEBUG_FS xenvif_debugfs_delif(vif); #endif /* CONFIG_DEBUG_FS */ @@ -675,7 +676,6 @@ static void hotplug_status_changed(struct xenbus_watch *watch, /* Not interested in this watch anymore. */ unregister_hotplug_status_watch(be); - xenbus_rm(XBT_NIL, be->dev->nodename, "hotplug-status"); } kfree(str); } -- 2.31.1

2 years, 6 months

6
8
0 0

[PATCH v2] ARM: dts: at91: sama5d2: Fix PMERRLOC resource size

by Tudor Ambarus

PMERRLOC resource size was set to 0x100, which resulted in HSMC_ERRLOCx register being truncated to offset x = 21, causing error correction to fail if more than 22 bit errors and if 24 or 32 bit error correction was supported. Fixes: d9c41bf30cf8 ("ARM: dts: at91: Declare EBI/NAND controllers") Signed-off-by: Tudor Ambarus <tudor.ambarus(a)microchip.com> Cc: <stable(a)vger.kernel.org> # 4.13.x --- v2: - update commit description - Cc stable(a)vger.kernel.org arch/arm/boot/dts/sama5d2.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi index 09c741e8ecb8..c700c3b19e4c 100644 --- a/arch/arm/boot/dts/sama5d2.dtsi +++ b/arch/arm/boot/dts/sama5d2.dtsi @@ -415,7 +415,7 @@ hsmc: hsmc@f8014000 { pmecc: ecc-engine@f8014070 { compatible = "atmel,sama5d2-pmecc"; reg = <0xf8014070 0x490>, - <0xf8014500 0x100>; + <0xf8014500 0x200>; }; }; -- 2.25.1

2 years, 6 months

3
2
0 0

[PATCH] KVM: x86: nSVM: disallow userspace setting of MSR_AMD64_TSC_RATIO to non default value when tsc scaling disabled

by Maxim Levitsky

If nested tsc scaling is disabled, MSR_AMD64_TSC_RATIO should never have non default value. Due to way nested tsc scaling support was implmented in qemu, it would set this msr to 0 when nested tsc scaling was disabled. Ignore that value for now, as it causes no harm. Fixes: 5228eb96a487 ("KVM: x86: nSVM: implement nested TSC scaling") Cc: stable(a)vger.kernel.org Signed-off-by: Maxim Levitsky <mlevitsk(a)redhat.com> --- arch/x86/kvm/svm/svm.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 7038c76fa841..b80ad471776f 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -2705,8 +2705,23 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr) u64 data = msr->data; switch (ecx) { case MSR_AMD64_TSC_RATIO: - if (!msr->host_initiated && !svm->tsc_scaling_enabled) - return 1; + + if (!svm->tsc_scaling_enabled) { + + if (!msr->host_initiated) + return 1; + /* + * In case TSC scaling is not enabled, always + * leave this MSR at the default value. + * + * Due to bug in qemu 6.2.0, it would try to set + * this msr to 0 if tsc scaling is not enabled. + * Ignore this value as well. + */ + if (data != 0 && data != svm->tsc_ratio_msr) + return 1; + break; + } if (data & TSC_RATIO_RSVD) return 1; -- 2.26.3

2 years, 6 months

2
1
0 0

[PATCH v3] platform/x86: amd-pmc: Set QOS during suspend on CZN w/ timer wakeup

by Mario Limonciello

commit 59348401ebed ("platform/x86: amd-pmc: Add special handling for timer based S0i3 wakeup") adds support for using another platform timer in lieu of the RTC which doesn't work properly on some systems. This path was validated and worked well before submission. During the 5.16-rc1 merge window other patches were merged that caused this to stop working properly. When this feature was used with 5.16-rc1 or later some OEM laptops with the matching firmware requirements from that commit would shutdown instead of program a timer based wakeup. This was bisected to commit 8d89835b0467 ("PM: suspend: Do not pause cpuidle in the suspend-to-idle path"). This wasn't supposed to cause any negative impacts and also tested well on both Intel and ARM platforms. However this changed the semantics of when CPUs are allowed to be in the deepest state. For the AMD systems in question it appears this causes a firmware crash for timer based wakeup. It's hypothesized to be caused by the `amd-pmc` driver sending `OS_HINT` and all the CPUs going into a deep state while the timer is still being programmed. It's likely a firmware bug, but to avoid it don't allow setting CPUs into the deepest state while using CZN timer wakeup path. If later it's discovered that this also occurs from "regular" suspends without a timer as well or on other silicon, this may be later expanded to run in the suspend path for more scenarios. Cc: stable(a)vger.kernel.org # 5.16+ Suggested-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> Link: https://lore.kernel.org/linux-acpi/BL1PR12MB51570F5BD05980A0DCA1F3F4E23A9@B… Fixes: 8d89835b0467 ("PM: suspend: Do not pause cpuidle in the suspend-to-idle path") Fixes: 23f62d7ab25b ("PM: sleep: Pause cpuidle later and resume it earlier during system transitions") Fixes: 59348401ebed ("platform/x86: amd-pmc: Add special handling for timer based S0i3 wakeup" Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> Signed-off-by: Mario Limonciello <mario.limonciello(a)amd.com> --- changes from v2->v3: * Create a define for the latency value, and document it * Minor comment rewording * Add Rafael's tag drivers/platform/x86/amd-pmc.c | 42 ++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c index 4c72ba68b315..18b0f6ee65ce 100644 --- a/drivers/platform/x86/amd-pmc.c +++ b/drivers/platform/x86/amd-pmc.c @@ -21,6 +21,7 @@ #include <linux/module.h> #include <linux/pci.h> #include <linux/platform_device.h> +#include <linux/pm_qos.h> #include <linux/rtc.h> #include <linux/suspend.h> #include <linux/seq_file.h> @@ -85,6 +86,9 @@ #define PMC_MSG_DELAY_MIN_US 50 #define RESPONSE_REGISTER_LOOP_MAX 20000 +/* QoS request for letting CPUs in idle states, but not the deepest */ +#define AMD_PMC_MAX_IDLE_STATE_LATENCY 3 + #define SOC_SUBSYSTEM_IP_MAX 12 #define DELAY_MIN_US 2000 #define DELAY_MAX_US 3000 @@ -131,6 +135,7 @@ struct amd_pmc_dev { struct device *dev; struct pci_dev *rdev; struct mutex lock; /* generic mutex lock */ + struct pm_qos_request amd_pmc_pm_qos_req; #if IS_ENABLED(CONFIG_DEBUG_FS) struct dentry *dbgfs_dir; #endif /* CONFIG_DEBUG_FS */ @@ -521,6 +526,14 @@ static int amd_pmc_verify_czn_rtc(struct amd_pmc_dev *pdev, u32 *arg) rc = rtc_alarm_irq_enable(rtc_device, 0); dev_dbg(pdev->dev, "wakeup timer programmed for %lld seconds\n", duration); + /* + * Prevent CPUs from getting into deep idle states while sending OS_HINT + * which is otherwise generally safe to send when at least one of the CPUs + * is not in deep idle states. + */ + cpu_latency_qos_update_request(&pdev->amd_pmc_pm_qos_req, AMD_PMC_MAX_IDLE_STATE_LATENCY); + wake_up_all_idle_cpus(); + return rc; } @@ -538,24 +551,31 @@ static int __maybe_unused amd_pmc_suspend(struct device *dev) /* Activate CZN specific RTC functionality */ if (pdev->cpu_id == AMD_CPU_ID_CZN) { rc = amd_pmc_verify_czn_rtc(pdev, &arg); - if (rc < 0) - return rc; + if (rc) + goto fail; } /* Dump the IdleMask before we send hint to SMU */ amd_pmc_idlemask_read(pdev, dev, NULL); msg = amd_pmc_get_os_hint(pdev); rc = amd_pmc_send_cmd(pdev, arg, NULL, msg, 0); - if (rc) + if (rc) { dev_err(pdev->dev, "suspend failed\n"); + goto fail; + } if (enable_stb) rc = amd_pmc_write_stb(pdev, AMD_PMC_STB_PREDEF); - if (rc) { + if (rc) { dev_err(pdev->dev, "error writing to STB\n"); - return rc; + goto fail; } + return 0; +fail: + if (pdev->cpu_id == AMD_CPU_ID_CZN) + cpu_latency_qos_update_request(&pdev->amd_pmc_pm_qos_req, + PM_QOS_DEFAULT_VALUE); return rc; } @@ -579,12 +599,15 @@ static int __maybe_unused amd_pmc_resume(struct device *dev) /* Write data incremented by 1 to distinguish in stb_read */ if (enable_stb) rc = amd_pmc_write_stb(pdev, AMD_PMC_STB_PREDEF + 1); - if (rc) { + if (rc) dev_err(pdev->dev, "error writing to STB\n"); - return rc; - } - return 0; + /* Restore the QoS request back to defaults if it was set */ + if (pdev->cpu_id == AMD_CPU_ID_CZN) + cpu_latency_qos_update_request(&pdev->amd_pmc_pm_qos_req, + PM_QOS_DEFAULT_VALUE); + + return rc; } static const struct dev_pm_ops amd_pmc_pm_ops = { @@ -722,6 +745,7 @@ static int amd_pmc_probe(struct platform_device *pdev) amd_pmc_get_smu_version(dev); platform_set_drvdata(pdev, dev); amd_pmc_dbgfs_register(dev); + cpu_latency_qos_add_request(&dev->amd_pmc_pm_qos_req, PM_QOS_DEFAULT_VALUE); return 0; err_pci_dev_put: -- 2.34.1

2 years, 6 months

2
1
0 0

[PATCH v2] vhost/vsock: don't check owner in vhost_vsock_stop() while releasing

by Stefano Garzarella

vhost_vsock_stop() calls vhost_dev_check_owner() to check the device ownership. It expects current->mm to be valid. vhost_vsock_stop() is also called by vhost_vsock_dev_release() when the user has not done close(), so when we are in do_exit(). In this case current->mm is invalid and we're releasing the device, so we should clean it anyway. Let's check the owner only when vhost_vsock_stop() is called by an ioctl. When invoked from release we can not fail so we don't check return code of vhost_vsock_stop(). We need to stop vsock even if it's not the owner. Fixes: 433fc58e6bf2 ("VSOCK: Introduce vhost_vsock.ko") Cc: stable(a)vger.kernel.org Reported-by: syzbot+1e3ea63db39f2b4440e0(a)syzkaller.appspotmail.com Reported-and-tested-by: syzbot+3140b17cb44a7b174008(a)syzkaller.appspotmail.com Signed-off-by: Stefano Garzarella <sgarzare(a)redhat.com> --- v2: - initialized `ret` in vhost_vsock_stop [Dan] - added comment about vhost_vsock_stop() calling in the code and an explanation in the commit message [MST] v1: https://lore.kernel.org/virtualization/20220221114916.107045-1-sgarzare@red… --- drivers/vhost/vsock.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index d6ca1c7ad513..37f0b4274113 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -629,16 +629,18 @@ static int vhost_vsock_start(struct vhost_vsock *vsock) return ret; } -static int vhost_vsock_stop(struct vhost_vsock *vsock) +static int vhost_vsock_stop(struct vhost_vsock *vsock, bool check_owner) { size_t i; - int ret; + int ret = 0; mutex_lock(&vsock->dev.mutex); - ret = vhost_dev_check_owner(&vsock->dev); - if (ret) - goto err; + if (check_owner) { + ret = vhost_dev_check_owner(&vsock->dev); + if (ret) + goto err; + } for (i = 0; i < ARRAY_SIZE(vsock->vqs); i++) { struct vhost_virtqueue *vq = &vsock->vqs[i]; @@ -753,7 +755,12 @@ static int vhost_vsock_dev_release(struct inode *inode, struct file *file) * inefficient. Room for improvement here. */ vsock_for_each_connected_socket(vhost_vsock_reset_orphans); - vhost_vsock_stop(vsock); + /* Don't check the owner, because we are in the release path, so we + * need to stop the vsock device in any case. + * vhost_vsock_stop() can not fail in this case, so we don't need to + * check the return code. + */ + vhost_vsock_stop(vsock, false); vhost_vsock_flush(vsock); vhost_dev_stop(&vsock->dev); @@ -868,7 +875,7 @@ static long vhost_vsock_dev_ioctl(struct file *f, unsigned int ioctl, if (start) return vhost_vsock_start(vsock); else - return vhost_vsock_stop(vsock); + return vhost_vsock_stop(vsock, true); case VHOST_GET_FEATURES: features = VHOST_VSOCK_FEATURES; if (copy_to_user(argp, &features, sizeof(features))) -- 2.35.1

2 years, 6 months

4
3
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror February 2022