September 2020 - Linux-stable-mirror

by Jan Kara

With suitably crafted reiserfs image and mount command reiserfs will crash when trying to verify that XATTR_ROOT directory can be looked up in / as that recurses back to xattr code like: xattr_lookup+0x24/0x280 fs/reiserfs/xattr.c:395 reiserfs_xattr_get+0x89/0x540 fs/reiserfs/xattr.c:677 reiserfs_get_acl+0x63/0x690 fs/reiserfs/xattr_acl.c:209 get_acl+0x152/0x2e0 fs/posix_acl.c:141 check_acl fs/namei.c:277 [inline] acl_permission_check fs/namei.c:309 [inline] generic_permission+0x2ba/0x550 fs/namei.c:353 do_inode_permission fs/namei.c:398 [inline] inode_permission+0x234/0x4a0 fs/namei.c:463 lookup_one_len+0xa6/0x200 fs/namei.c:2557 reiserfs_lookup_privroot+0x85/0x1e0 fs/reiserfs/xattr.c:972 reiserfs_fill_super+0x2b51/0x3240 fs/reiserfs/super.c:2176 mount_bdev+0x24f/0x360 fs/super.c:1417 Fix the problem by bailing from reiserfs_xattr_get() when xattrs are not yet initialized. CC: stable(a)vger.kernel.org Reported-by: syzbot+9b33c9b118d77ff59b6f(a)syzkaller.appspotmail.com Signed-off-by: Jan Kara <jack(a)suse.cz> --- fs/reiserfs/xattr.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index 28b241cd6987..fe63a7c3e0da 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c @@ -674,6 +674,13 @@ reiserfs_xattr_get(struct inode *inode, const char *name, void *buffer, if (get_inode_sd_version(inode) == STAT_DATA_V1) return -EOPNOTSUPP; + /* + * priv_root needn't be initialized during mount so allow initial + * lookups to succeed. + */ + if (!REISERFS_SB(inode->i_sb)->priv_root) + return 0; + dentry = xattr_lookup(inode, name, XATTR_REPLACE); if (IS_ERR(dentry)) { err = PTR_ERR(dentry); -- 2.16.4

4 years, 2 months

1
0
0 0

[PATCH 5.4 000/388] 5.4.69-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.69 release. There are 388 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 Thu, 01 Oct 2020 10:59:03 +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.69-rc1… 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.69-rc1 Jiri Slaby <jslaby(a)suse.cz> ata: sata_mv, avoid trigerrable BUG_ON Jiri Slaby <jslaby(a)suse.cz> ata: make qc_prep return ata_completion_errors Jiri Slaby <jslaby(a)suse.cz> ata: define AC_ERR_OK Muchun Song <songmuchun(a)bytedance.com> kprobes: Fix compiler warning for !CONFIG_KPROBES_ON_FTRACE Mike Snitzer <snitzer(a)redhat.com> dm: fix bio splitting and its bio completion order for regular IO Marc Zyngier <maz(a)kernel.org> KVM: arm64: Assume write fault on S1PTW permission fault on instruction fetch Christian Borntraeger <borntraeger(a)de.ibm.com> s390/zcrypt: Fix ZCRYPT_PERDEV_REQCNT ioctl Vasily Gorbik <gor(a)linux.ibm.com> mm/gup: fix gup_fast with dynamic page table folding Gao Xiang <hsiangkao(a)redhat.com> mm, THP, swap: fix allocating cluster for swapfile by mistake Charan Teja Reddy <charante(a)codeaurora.org> dmabuf: fix NULL pointer dereference in dma_buf_release() Johannes Thumshirn <johannes.thumshirn(a)wdc.com> btrfs: fix overflow when copying corrupt csums for a message Masami Hiramatsu <mhiramat(a)kernel.org> kprobes: tracing/kprobes: Fix to kill kprobes on initmem after boot Masami Hiramatsu <mhiramat(a)kernel.org> kprobes: Fix to check probe enabled before disarm_kprobe_ftrace() Jan Höppner <hoeppner(a)linux.ibm.com> s390/dasd: Fix zero write for FBA devices Tom Rix <trix(a)redhat.com> tracing: fix double free Nick Desaulniers <ndesaulniers(a)google.com> lib/string.c: implement stpcpy Kai-Heng Feng <kai.heng.feng(a)canonical.com> ALSA: hda/realtek: Enable front panel headset LED on Lenovo ThinkStation P520 Hui Wang <hui.wang(a)canonical.com> ALSA: hda/realtek - Couldn't detect Mic if booting with headset plugged Joakim Tjernlund <joakim.tjernlund(a)infinera.com> ALSA: usb-audio: Add delay quirk for H570e USB headsets James Smart <james.smart(a)broadcom.com> scsi: lpfc: Fix initial FLOGI failure due to BBSCN not supported Thomas Gleixner <tglx(a)linutronix.de> x86/ioapic: Unbreak check_timer() Mikulas Patocka <mpatocka(a)redhat.com> arch/x86/lib/usercopy_64.c: fix __copy_user_flushcache() cache writeback Minchan Kim <minchan(a)kernel.org> mm: validate pmd after splitting Tom Lendacky <thomas.lendacky(a)amd.com> KVM: SVM: Add a dedicated INVD intercept routine Sean Christopherson <sean.j.christopherson(a)intel.com> KVM: x86: Reset MMU context if guest toggles CR4.SMAP or CR4.PKE Icenowy Zheng <icenowy(a)aosc.io> regulator: axp20x: fix LDO2/4 description Wei Li <liwei391(a)huawei.com> MIPS: Add the missing 'CPU_1074K' into __get_cpu_type() Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> regmap: fix page selection for noinc writes Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> regmap: fix page selection for noinc reads Tom Rix <trix(a)redhat.com> ALSA: asihpi: fix iounmap in error handler Necip Fazil Yildiran <fazilyildiran(a)gmail.com> lib80211: fix unmet direct dependendices config warning when !CRYPTO Yonghong Song <yhs(a)fb.com> bpf: Fix a rcu warning for bpffs map pretty-print Linus Lüssing <linus.luessing(a)c0d3.blue> batman-adv: mcast: fix duplicate mcast packets from BLA backbone to mesh Linus Lüssing <linus.luessing(a)c0d3.blue> batman-adv: mcast: fix duplicate mcast packets in BLA backbone from mesh Linus Lüssing <linus.luessing(a)c0d3.blue> batman-adv: mcast: fix duplicate mcast packets in BLA backbone from LAN Necip Fazil Yildiran <fazilyildiran(a)gmail.com> nvme-tcp: fix kconfig dependency warning when !CRYPTO Sven Eckelmann <sven(a)narfation.org> batman-adv: Add missing include for in_interrupt() Martin Cerveny <m.cerveny(a)computer.org> drm/sun4i: sun8i-csc: Secondary CSC register correction Dmitry Bogdanov <dbogdanov(a)marvell.com> net: qed: RDMA personality shouldn't fail VF load Dmitry Bogdanov <dbogdanov(a)marvell.com> net: qede: Disable aRFS for NPAR and 100G Dmitry Bogdanov <dbogdanov(a)marvell.com> net: qed: Disable aRFS for NPAR and 100G Marek Szyprowski <m.szyprowski(a)samsung.com> drm/vc4/vc4_hdmi: fill ASoC card owner Daniel Borkmann <daniel(a)iogearbox.net> bpf: Fix clobbering of r2 in bpf_gen_ld_abs Eric Dumazet <edumazet(a)google.com> mac802154: tx: fix use-after-free Eelco Chaudron <echaudro(a)redhat.com> netfilter: conntrack: nf_conncount_init is failing with IPv6 disabled Linus Lüssing <linus.luessing(a)c0d3.blue> batman-adv: mcast/TT: fix wrongly dropped or rerouted packets Jing Xiangfeng <jingxiangfeng(a)huawei.com> atm: eni: fix the missed pci_disable_device() for eni_init_one() Linus Lüssing <ll(a)simonwunderlich.de> batman-adv: bla: fix type misuse for backbone_gw hash indexing Maximilian Luz <luzmaximilian(a)gmail.com> mwifiex: Increase AES key storage size to 256 bits Tianjia Zhang <tianjia.zhang(a)linux.alibaba.com> clocksource/drivers/h8300_timer8: Fix wrong return value in h8300_8timer_init() Tom Rix <trix(a)redhat.com> ieee802154/adf7242: check status of adf7242_read_reg Liu Jian <liujian56(a)huawei.com> ieee802154: fix one possible memleak in ca8210_dev_com_init Josh Poimboeuf <jpoimboe(a)redhat.com> objtool: Fix noreturn detection for ignored functions Hans de Goede <hdegoede(a)redhat.com> i2c: core: Call i2c_acpi_install_space_handler() before i2c_acpi_register_devices() Michel Dänzer <mdaenzer(a)redhat.com> drm/amdgpu/dc: Require primary plane to be enabled whenever the CRTC is Jun Lei <jun.lei(a)amd.com> drm/amd/display: update nv1x stutter latencies Dennis Li <Dennis.Li(a)amd.com> drm/amdkfd: fix a memory leak issue Borislav Petkov <bp(a)suse.de> EDAC/ghes: Check whether the driver is on the safe list correctly Sven Schnelle <svens(a)linux.ibm.com> lockdep: fix order in trace_hardirqs_off_caller() Ilya Leoshkevich <iii(a)linux.ibm.com> s390/init: add missing __init annotations Eddie James <eajames(a)linux.ibm.com> i2c: aspeed: Mask IRQ status to relevant bits Palmer Dabbelt <palmerdabbelt(a)google.com> RISC-V: Take text_mutex in ftrace_init_nop() Hans de Goede <hdegoede(a)redhat.com> ASoC: Intel: bytcr_rt5640: Add quirk for MPMAN Converter9 2-in-1 Sylwester Nawrocki <s.nawrocki(a)samsung.com> ASoC: wm8994: Ensure the device is resumed in wm89xx_mic_detect functions Sylwester Nawrocki <s.nawrocki(a)samsung.com> ASoC: wm8994: Skip setting of the WM8994_MICBIAS register for WM1811 Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> ASoC: pcm3168a: ignore 0 Hz settings Amol Grover <frextrite(a)gmail.com> device_cgroup: Fix RCU list debugging warning Anthony Iliopoulos <ailiop(a)suse.com> nvme: explicitly update mpath disk capacity on revalidation Tonghao Zhang <xiangxia.m.yue(a)gmail.com> net: openvswitch: use div_u64() for 64-by-32 divisions Takashi Iwai <tiwai(a)suse.de> ALSA: hda: Workaround for spurious wakeups on some Intel platforms Takashi Iwai <tiwai(a)suse.de> ALSA: hda: Always use jackpoll helper for jack update after resume Jin Yao <yao.jin(a)linux.intel.com> perf parse-events: Use strcmp() to compare the PMU name Walter Lozano <walter.lozano(a)collabora.com> opp: Increase parsed_static_opps in _of_add_opp_table_v1() Arnd Bergmann <arnd(a)arndb.de> mt76: fix LED link time failure Hou Tao <houtao1(a)huawei.com> ubi: fastmap: Free unused fastmap anchor peb during detach Quinn Tran <qutran(a)marvell.com> scsi: qla2xxx: Retry PLOGI on FC-NVMe PRLI failure Thomas Richter <tmricht(a)linux.ibm.com> perf tests: Fix test 68 zstd compression for s390 Qu Wenruo <wqu(a)suse.com> btrfs: qgroup: fix data leak caused by race between writeback and truncate Zeng Tao <prime.zeng(a)hisilicon.com> vfio/pci: fix racy on error and request eventfd ctx Andy Lutomirski <luto(a)kernel.org> selftests/x86/syscall_nt: Clear weird flags after each test Javed Hasan <jhasan(a)marvell.com> scsi: libfc: Skip additional kref updating work event Javed Hasan <jhasan(a)marvell.com> scsi: libfc: Handling of extra kref Markus Theil <markus.theil(a)tu-ilmenau.de> mac80211: skip mpath lookup also for control port tx Sagi Grimberg <sagi(a)grimberg.me> nvme: fix possible deadlock when I/O is blocked Zhang Xiaoxu <zhangxiaoxu5(a)huawei.com> cifs: Fix double add page to memcg when cifs_readpages Alex Williamson <alex.williamson(a)redhat.com> vfio/pci: Clear error and request eventfd ctx after releasing Chuck Lever <chuck.lever(a)oracle.com> NFS: nfs_xdr_status should record the procedure name Thomas Gleixner <tglx(a)linutronix.de> x86/speculation/mds: Mark mds_user_clear_cpu_buffers() __always_inline Boris Brezillon <boris.brezillon(a)collabora.com> mtd: parser: cmdline: Support MTD names containing one or more colons Madhuparna Bhowmik <madhuparnabhowmik10(a)gmail.com> rapidio: avoid data race between file operation callbacks and mport_cdev_add(). Johannes Weiner <hannes(a)cmpxchg.org> mm: memcontrol: fix stat-corrupting race in charge moving Qian Cai <cai(a)lca.pw> mm/swap_state: fix a data race in swapin_nr_pages Jeff Layton <jlayton(a)kernel.org> ceph: fix potential race in ceph_check_caps Dinghao Liu <dinghao.liu(a)zju.edu.cn> PCI: tegra: Fix runtime PM imbalance on error Dinghao Liu <dinghao.liu(a)zju.edu.cn> mtd: rawnand: omap_elm: Fix runtime PM imbalance on error Dinghao Liu <dinghao.liu(a)zju.edu.cn> mtd: rawnand: gpmi: Fix runtime PM imbalance on error Dinghao Liu <dinghao.liu(a)zju.edu.cn> wlcore: fix runtime pm imbalance in wlcore_regdomain_config Dinghao Liu <dinghao.liu(a)zju.edu.cn> wlcore: fix runtime pm imbalance in wl1271_tx_work Dinghao Liu <dinghao.liu(a)zju.edu.cn> ASoC: img-i2s-out: Fix runtime PM imbalance on error Dinghao Liu <dinghao.liu(a)zju.edu.cn> PCI: tegra194: Fix runtime PM imbalance on error Adrian Hunter <adrian.hunter(a)intel.com> perf kcore_copy: Fix module map when there are no modules loaded Ian Rogers <irogers(a)google.com> perf metricgroup: Free metric_events on error Xie XiuQi <xiexiuqi(a)huawei.com> perf util: Fix memory leak of prefix_if_not_in Jiri Olsa <jolsa(a)kernel.org> perf stat: Fix duration_time value for higher intervals Ian Rogers <irogers(a)google.com> perf trace: Fix the selection for architectures to generate the errno name tables Ian Rogers <irogers(a)google.com> perf evsel: Fix 2 memory leaks Paul Mackerras <paulus(a)ozlabs.org> KVM: PPC: Book3S HV: Close race with page faults around memslot flushes Qian Cai <cai(a)lca.pw> vfio/pci: fix memory leaks of eventfd ctx Dinghao Liu <dinghao.liu(a)zju.edu.cn> gpio: rcar: Fix runtime PM imbalance on error Omar Sandoval <osandov(a)fb.com> btrfs: fix double __endio_write_update_ordered in direct I/O David Sterba <dsterba(a)suse.com> btrfs: don't force read-only after error in drop snapshot Yu Chen <chenyu56(a)huawei.com> usb: dwc3: Increase timeout for CmdAct cleared by device controller Shreyas Joshi <shreyas.joshi(a)biamp.com> printk: handle blank console arguments passed in. Dinghao Liu <dinghao.liu(a)zju.edu.cn> drm/nouveau/dispnv50: fix runtime pm imbalance on error Dinghao Liu <dinghao.liu(a)zju.edu.cn> drm/nouveau: fix runtime pm imbalance on error Dinghao Liu <dinghao.liu(a)zju.edu.cn> drm/nouveau/debugfs: fix runtime pm imbalance on error Alexander Duyck <alexander.h.duyck(a)linux.intel.com> e1000: Do not perform reset in reset_task if we are already down Philip Yang <Philip.Yang(a)amd.com> drm/amdkfd: fix restore worker race condition Anshuman Khandual <anshuman.khandual(a)arm.com> arm64/cpufeature: Drop TraceFilt feature exposure from ID_DFR0 register Wei Yongjun <weiyongjun1(a)huawei.com> scsi: cxlflash: Fix error return code in cxlflash_probe() James Morse <james.morse(a)arm.com> arm64: acpi: Make apei_claim_sea() synchronise with APEI's irq work Suzuki K Poulose <suzuki.poulose(a)arm.com> coresight: etm4x: Fix use-after-free of per-cpu etm drvdata Colin Ian King <colin.king(a)canonical.com> USB: EHCI: ehci-mv: fix less than zero comparison of an unsigned int Miklos Szeredi <mszeredi(a)redhat.com> fuse: update attr_version counter on fuse_notify_inval_inode() Miklos Szeredi <mszeredi(a)redhat.com> fuse: don't check refcount after stealing page Chuck Lever <chuck.lever(a)oracle.com> svcrdma: Fix backchannel return code Nicholas Piggin <npiggin(a)gmail.com> powerpc/traps: Make unrecoverable NMIs die instead of panic Tang Bin <tangbin(a)cmss.chinamobile.com> ipmi:bt-bmc: Fix error handling and status check Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> drm/exynos: dsi: Remove bridge node reference in error handling path in probe function Takashi Iwai <tiwai(a)suse.de> ALSA: hda: Fix potential race in unsol event handler Jonathan Bakker <xc-racer2(a)live.ca> tty: serial: samsung: Correct clock selection logic Tuong Lien <tuong.t.lien(a)dektech.com.au> tipc: fix memory leak in service subscripting Paolo Bonzini <pbonzini(a)redhat.com> KVM: x86: handle wrap around 32-bit address space Tang Bin <tangbin(a)cmss.chinamobile.com> USB: EHCI: ehci-mv: fix error handling in mv_ehci_probe() Sonny Sasaka <sonnysasaka(a)chromium.org> Bluetooth: Handle Inquiry Cancel error after Inquiry Complete Jonathan Bakker <xc-racer2(a)live.ca> phy: samsung: s5pv210-usb2: Add delay after reset Jonathan Bakker <xc-racer2(a)live.ca> power: supply: max17040: Correct voltage reading Thierry Reding <treding(a)nvidia.com> i2c: tegra: Restore pinmux on system resume Waiman Long <longman(a)redhat.com> mm/slub: fix incorrect interpretation of s->offset Ian Rogers <irogers(a)google.com> perf mem2node: Avoid double free related to realloc Stanimir Varbanov <stanimir.varbanov(a)linaro.org> media: venus: vdec: Init registered list unconditionally Cong Wang <xiyou.wangcong(a)gmail.com> atm: fix a memory leak of vcc->user_back Aya Levin <ayal(a)mellanox.com> devlink: Fix reporter's recovery condition Krzysztof Kozlowski <krzk(a)kernel.org> dt-bindings: sound: wm8994: Correct required supplies based on actual implementaion Wei Yongjun <weiyongjun1(a)huawei.com> dpaa2-eth: fix error return code in setup_dpni() Paul Turner <pjt(a)google.com> sched/fair: Eliminate bandwidth race between throttling and distribution Will Deacon <will(a)kernel.org> arm64: cpufeature: Relax checks for AArch32 support at EL[0-2] Wei Yongjun <weiyongjun1(a)huawei.com> sparc64: vcc: Fix error return code in vcc_probe() Ivan Safonov <insafonov(a)gmail.com> staging:r8188eu: avoid skb_clone for amsdu to msdu conversion Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> scsi: aacraid: Fix error handling paths in aac_probe_one() Tonghao Zhang <xiangxia.m.yue(a)gmail.com> net: openvswitch: use u64 for meter bucket Zenghui Yu <yuzenghui(a)huawei.com> KVM: arm64: vgic-its: Fix memory leak on the error path of vgic_add_lpi() Zenghui Yu <yuzenghui(a)huawei.com> KVM: arm64: vgic-v3: Retire all pending LPIs on vcpu destroy Madhuparna Bhowmik <madhuparnabhowmik10(a)gmail.com> drivers: char: tlclk.c: Avoid data race between init and interrupt handler Douglas Anderson <dianders(a)chromium.org> bdev: Reduce time holding bd_mutex in sync in blkdev_close() Stephane Eranian <eranian(a)google.com> perf stat: Force error in fallback on :k events Steve Rutherford <srutherford(a)google.com> KVM: Remove CREATE_IRQCHIP/SET_PIT2 race Josef Bacik <josef(a)toxicpanda.com> btrfs: fix setting last_trans for reloc roots Raviteja Narayanam <raviteja.narayanam(a)xilinx.com> serial: uartps: Wait for tx_empty in console setup Nilesh Javali <njavali(a)marvell.com> scsi: qedi: Fix termination timeouts in session logout Takashi Iwai <tiwai(a)suse.de> ALSA: hda: Skip controller resume if not needed Jaewon Kim <jaewon31.kim(a)samsung.com> mm/mmap.c: initialize align_offset explicitly for vm_unmapped_area Jack Zhang <Jack.Zhang1(a)amd.com> drm/amdgpu/sriov add amdgpu_amdkfd_pre_reset in gpu reset Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> workqueue: Remove the warning in wq_worker_sleeping() Israel Rukshin <israelr(a)mellanox.com> nvmet-rdma: fix double free of rdma queue Trond Myklebust <trond.myklebust(a)hammerspace.com> SUNRPC: Don't start a timer on an already queued rpc task Qian Cai <cai(a)lca.pw> mm/vmscan.c: fix data races using kswapd_classzone_idx Qian Cai <cai(a)lca.pw> mm/swapfile: fix data races in try_to_unuse() Xianting Tian <xianting_tian(a)126.com> mm/filemap.c: clear page error before actual read Nathan Chancellor <natechancellor(a)gmail.com> mm/kmemleak.c: use address-of operator on section symbols Anju T Sudhakar <anju(a)linux.vnet.ibm.com> powerpc/perf: Implement a global lock to avoid races between trace, core and thread imc events. James Zhu <James.Zhu(a)amd.com> drm/amdgpu/vcn2.0: stall DPG when WPTR/RPTR reset Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS: Fix races nfs_page_group_destroy() vs nfs_destroy_unlinked_subrequests() Stuart Hayes <stuart.w.hayes(a)gmail.com> PCI: pciehp: Fix MSI interrupt race Andreas Steinmetz <ast(a)domdv.de> ALSA: usb-audio: Fix case when USB MIDI interface has more than one extra endpoint descriptor Liu Song <liu.song11(a)zte.com.cn> ubifs: Fix out-of-bounds memory access caused by abnormal value of node_len Zhihao Cheng <chengzhihao1(a)huawei.com> ubifs: ubifs_add_orphan: Fix a memory leak bug Zhihao Cheng <chengzhihao1(a)huawei.com> ubifs: ubifs_jnl_write_inode: Fix a memory leak bug Mikel Rychliski <mikel(a)mikelr.com> PCI: Use ioremap(), not phys_to_virt() for platform ROM Qian Cai <cai(a)lca.pw> netfilter: nf_tables: silence a RCU-list warning in nft_table_lookup() Chuck Lever <chuck.lever(a)oracle.com> svcrdma: Fix leak of transport addresses Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> SUNRPC: Fix a potential buffer overflow in 'svc_print_xprts()' Don Brace <don.brace(a)microsemi.com> scsi: hpsa: correct race condition in offload enabled Sergey Gorenko <sergeygo(a)mellanox.com> IB/iser: Always check sig MR before putting it to the free pool Zhu Yanjun <yanjunz(a)mellanox.com> RDMA/rxe: Set sys_image_guid to be aligned with HW IB devices Darrick J. Wong <darrick.wong(a)oracle.com> xfs: prohibit fs freezing when using empty transactions Raveendran Somu <raveendran.somu(a)cypress.com> brcmfmac: Fix double freeing in the fmac usb data path Israel Rukshin <israelr(a)mellanox.com> nvme: Fix controller creation races with teardown flow Israel Rukshin <israelr(a)mellanox.com> nvme: Fix ctrl use-after-free during sysfs deletion John Meneghini <johnm(a)netapp.com> nvme-multipath: do not reset on unknown status Bernd Edlinger <bernd.edlinger(a)hotmail.de> perf: Use new infrastructure to fix deadlocks in execve Bernd Edlinger <bernd.edlinger(a)hotmail.de> proc: io_accounting: Use new infrastructure to fix deadlocks in execve Bernd Edlinger <bernd.edlinger(a)hotmail.de> proc: Use new infrastructure to fix deadlocks in execve Bernd Edlinger <bernd.edlinger(a)hotmail.de> kernel/kcmp.c: Use new infrastructure to fix deadlocks in execve Bernd Edlinger <bernd.edlinger(a)hotmail.de> selftests/ptrace: add test cases for dead-locks Bernd Edlinger <bernd.edlinger(a)hotmail.de> exec: Fix a deadlock in strace Eric W. Biederman <ebiederm(a)xmission.com> exec: Add exec_update_mutex to replace cred_guard_mutex Gabriel Ravier <gabravier(a)gmail.com> tools: gpio-hammer: Avoid potential overflow in main Pratik Rajesh Sampat <psampat(a)linux.ibm.com> cpufreq: powernv: Fix frame-size-overflow in powernv_cpufreq_work_fn Andre Przywara <andre.przywara(a)arm.com> net: axienet: Propagate failure of DMA descriptor setup Andre Przywara <andre.przywara(a)arm.com> net: axienet: Convert DMA error handler to a work queue Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> perf cpumap: Fix snprintf overflow check Vignesh Raghavendra <vigneshr(a)ti.com> serial: 8250: 8250_omap: Terminate DMA before pushing data on RX timeout Peter Ujfalusi <peter.ujfalusi(a)ti.com> serial: 8250_omap: Fix sleeping function called from invalid context during probe Vignesh Raghavendra <vigneshr(a)ti.com> serial: 8250_port: Don't service RX FIFO if throttled Heiner Kallweit <hkallweit1(a)gmail.com> r8169: improve RTL8168b FIFO overflow workaround Josef Bacik <josef(a)toxicpanda.com> btrfs: free the reloc_control in a consistent way Josef Bacik <josef(a)toxicpanda.com> btrfs: do not init a reloc root if we aren't relocating Ian Rogers <irogers(a)google.com> perf parse-events: Fix 3 use after frees found with clang ASAN He Zhe <zhe.he(a)windriver.com> KVM: LAPIC: Mark hrtimer for period or oneshot mode to expire in hard interrupt context Niklas Söderlund <niklas.soderlund+renesas(a)ragnatech.se> thermal: rcar_thermal: Handle probe error gracefully Nathan Chancellor <natechancellor(a)gmail.com> tracing: Use address-of operator on section symbols Jordan Crouse <jcrouse(a)codeaurora.org> drm/msm/a5xx: Always set an OPP supported hardware value Pavel Machek <pavel(a)denx.de> drm/msm: fix leaks if initialization fails Gustavo Romero <gromero(a)linux.ibm.com> KVM: PPC: Book3S HV: Treat TM-related invalid form instructions on P9 like the valid ones Alexander Shishkin <alexander.shishkin(a)linux.intel.com> intel_th: Disallow multi mode on devices where it's broken Jason Gunthorpe <jgg(a)ziepe.ca> RDMA/cm: Remove a race freeing timewait_info Trond Myklebust <trondmy(a)gmail.com> nfsd: Don't add locks to closed or closing open stateids Alexandre Belloni <alexandre.belloni(a)bootlin.com> rtc: ds1374: fix possible race condition Alexandre Belloni <alexandre.belloni(a)bootlin.com> rtc: sa1100: fix possible race condition Stefan Berger <stefanb(a)linux.ibm.com> tpm: ibmvtpm: Wait for buffer to be set before proceeding Dmitry Monakhov <dmonakhov(a)gmail.com> ext4: mark block bitmap corrupted when found instead of BUGON Darrick J. Wong <darrick.wong(a)oracle.com> xfs: mark dir corrupt when lookup-by-hash fails Darrick J. Wong <darrick.wong(a)oracle.com> xfs: don't ever return a stale pointer from __xfs_dir3_free_read Palmer Dabbelt <palmerdabbelt(a)google.com> tty: sifive: Finish transmission before changing the clock Colin Ian King <colin.king(a)canonical.com> media: tda10071: fix unsigned sign extension overflow Howard Chung <howardchung(a)google.com> Bluetooth: L2CAP: handle l2cap config request during open state Sagar Biradar <Sagar.Biradar(a)microchip.com> scsi: aacraid: Disabling TM path and only processing IOP reset Wen Gong <wgong(a)codeaurora.org> ath10k: use kzalloc to read for ath10k_sdio_hif_diag_read Leo Yan <leo.yan(a)linaro.org> perf cs-etm: Correct synthesizing instruction samples Leo Yan <leo.yan(a)linaro.org> perf cs-etm: Swap packets for instruction samples afzal mohammed <afzal.mohd.ma(a)gmail.com> s390/irq: replace setup_irq() by request_irq() Zeng Tao <prime.zeng(a)hisilicon.com> cpu-topology: Fix the potential data corruption Anson Huang <Anson.Huang(a)nxp.com> clk: imx: Fix division by zero warning on pfdv2 Rodrigo Siqueira <Rodrigo.Siqueira(a)amd.com> drm/amd/display: Stop if retimer is not available Tony Lindgren <tony(a)atomide.com> ARM: OMAP2+: Handle errors for cpu_pm John Clements <john.clements(a)amd.com> drm/amdgpu: increase atombios cmd timeout Kirill A. Shutemov <kirill(a)shutemov.name> mm: avoid data corruption on CoW fault into PFN-mapped VMA John Garry <john.garry(a)huawei.com> perf jevents: Fix leak of mapfile memory Qiujun Huang <hqjagain(a)gmail.com> ext4: fix a data race at inode->i_disksize Wenjing Liu <Wenjing.Liu(a)amd.com> drm/amd/display: fix image corruption with ODM 2:1 DSC 2 slice Alexey Kardashevskiy <aik(a)ozlabs.ru> powerpc/book3s64: Fix error handling in mm_iommu_do_alloc() Wen Yang <wenyang(a)linux.alibaba.com> timekeeping: Prevent 32bit truncation in scale64_check_overflow() Alain Michaud <alainm(a)chromium.org> Bluetooth: guard against controllers sending zero'd events Takashi Iwai <tiwai(a)suse.de> media: go7007: Fix URB type for interrupt handling Jaska Uimonen <jaska.uimonen(a)linux.intel.com> ASoC: SOF: ipc: check ipc return value before data copy John Garry <john.garry(a)huawei.com> bus: hisi_lpc: Fixup IO ports addresses to avoid use-after-free in host removal Qian Cai <cai(a)lca.pw> random: fix data races at timer_rand_state James Morse <james.morse(a)arm.com> firmware: arm_sdei: Use cpus_read_lock() to avoid races with cpuhp Jiri Pirko <jiri(a)mellanox.com> iavf: use tc_cls_can_offload_and_chain0() instead of chain check Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> drm/omap: dss: Cleanup DSS ports on initialisation failure Aric Cyr <aric.cyr(a)amd.com> drm/amd/display: dal_ddc_i2c_payloads_create can fail causing panic Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> soundwire: bus: disable pm_runtime in sdw_slave_delete Dmitry Osipenko <digetx(a)gmail.com> dmaengine: tegra-apb: Prevent race conditions on channel's freeing Amelie Delaunay <amelie.delaunay(a)st.com> dmaengine: stm32-dma: use vchan_terminate_vdesc() in .terminate_all Thomas Gleixner <tglx(a)linutronix.de> bpf: Remove recursion prevention from rcu free callback Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys: Add check for pkey "overflow" Dan Carpenter <dan.carpenter(a)oracle.com> media: staging/imx: Missing assignment in imx_media_capture_device_register() Amelie Delaunay <amelie.delaunay(a)st.com> dmaengine: stm32-mdma: use vchan_terminate_vdesc() in .terminate_all wanpeng li <wanpengli(a)tencent.com> KVM: nVMX: Hold KVM's srcu lock when syncing vmcs12->shadow Paolo Bonzini <pbonzini(a)redhat.com> KVM: x86: fix incorrect comparison in trace event Bart Van Assche <bvanassche(a)acm.org> RDMA/rxe: Fix configuration of atomic queue pair attributes Thomas Richter <tmricht(a)linux.ibm.com> perf test: Fix test trace+probe_vfs_getname.sh on s390 Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Don't create a mixer element with bogus volume range Felix Fietkau <nbd(a)nbd.name> mt76: fix handling full tx queues in mt76_dma_tx_queue_skb_raw Felix Fietkau <nbd(a)nbd.name> mt76: clear skb pointers from rx aggregation reorder buffer during cleanup Ayush Sawal <ayush.sawal(a)chelsio.com> crypto: chelsio - This fixes the kernel panic which occurs during a libkcapi test Dinh Nguyen <dinguyen(a)kernel.org> clk: stratix10: use do_div() for 64-bit calculation Waiman Long <longman(a)redhat.com> locking/lockdep: Decrement IRQ context counters when removing lock chain Wen Yang <wen.yang99(a)zte.com.cn> drm/omap: fix possible object reference leak James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Fix coverity errors in fmdi attribute handling James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Fix release of hwq to clear the eq relationship James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Fix RQ buffer leakage when no IOCBs available Vasily Averin <vvs(a)virtuozzo.com> selinux: sel_avc_get_stat_idx should increase position index Steve Grubb <sgrubb(a)redhat.com> audit: CONFIG_CHANGE don't log internal bookkeeping as an event Tony Cheng <tony.cheng(a)amd.com> drm/amd/display: fix workaround for incorrect double buffer register for DLG ADL and TTU Trond Myklebust <trondmy(a)gmail.com> nfsd: Fix a perf warning Qian Cai <cai(a)lca.pw> skbuff: fix a data race in skb_queue_len() Mohan Kumar <mkumard(a)nvidia.com> ALSA: hda: Clear RIRB status before reading WP Zhuang Yanying <ann.zhuangyanying(a)huawei.com> KVM: fix overflow of zero page refcount with ksm running Hillf Danton <hdanton(a)sina.com> Bluetooth: prefetch channel before killing sock Steven Price <steven.price(a)arm.com> mm: pagewalk: fix termination condition in walk_pte_range() Vasily Averin <vvs(a)virtuozzo.com> mm/swapfile.c: swap_next should increase position index Manish Mandlik <mmandlik(a)google.com> Bluetooth: Fix refcount use-after-free issue Doug Smythies <doug.smythies(a)gmail.com> tools/power/x86/intel_pstate_tracer: changes for python 3 compatibility Sven Schnelle <svens(a)linux.ibm.com> selftests/ftrace: fix glob selftest Jeff Layton <jlayton(a)kernel.org> ceph: ensure we have a new cap before continuing in fill_inode Mert Dirik <mertdirik(a)gmail.com> ar5523: Add USB ID of SMCWUSBT-G2 wireless adapter Vincent Whitchurch <vincent.whitchurch(a)axis.com> ARM: 8948/1: Prevent OOB access in stacktrace Josef Bacik <jbacik(a)fb.com> tracing: Set kernel_stack's caller size properly Maxim Mikityanskiy <maxtram95(a)gmail.com> Bluetooth: btrtl: Use kvmalloc for FW allocations Oliver O'Halloran <oohall(a)gmail.com> powerpc/eeh: Only dump stack once if an MMIO loop is detected Trond Myklebust <trondmy(a)gmail.com> nfsd: Fix a soft lockup race in nfsd_file_mark_find_or_create() Thomas Richter <tmricht(a)linux.ibm.com> s390/cpum_sf: Use kzalloc and minor changes Matthias Fend <matthias.fend(a)wolfvision.net> dmaengine: zynqmp_dma: fix burst length configuration Qu Wenruo <wqu(a)suse.com> btrfs: tree-checker: Check leaf chunk item size Dmitry Osipenko <digetx(a)gmail.com> i2c: tegra: Prevent interrupt triggering after transfer timeout David Francis <David.Francis(a)amd.com> drm/amd/display: Initialize DSC PPS variables to 0 Bart Van Assche <bvanassche(a)acm.org> scsi: ufs: Fix a race condition in the tracing code Bart Van Assche <bvanassche(a)acm.org> scsi: ufs: Make ufshcd_add_command_trace() easier to read Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> ACPI: EC: Reference count query handlers under lock Kevin Kou <qdkevin.kou(a)gmail.com> sctp: move trace_sctp_probe_path into sctp_outq_sack James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Fix incomplete NVME discovery when target Quinn Tran <qutran(a)marvell.com> scsi: qla2xxx: Fix stuck session in GNL Viresh Kumar <viresh.kumar(a)linaro.org> opp: Replace list_kref with a local counter Nikhil Devshatwar <nikhil.nd(a)ti.com> media: ti-vpe: cal: Restrict DMA to avoid memory corruption Andrey Grodzovsky <andrey.grodzovsky(a)amd.com> drm/scheduler: Avoid accessing freed bad job. Marco Elver <elver(a)google.com> seqlock: Require WRITE_ONCE surrounding raw_seqcount_barrier Stephan Gerhold <stephan(a)gerhold.net> drm/mcde: Handle pending vblank while disabling display Vasily Averin <vvs(a)virtuozzo.com> ipv6_route_seq_next should increase position index Vasily Averin <vvs(a)virtuozzo.com> rt_cpu_seq_next should increase position index Vasily Averin <vvs(a)virtuozzo.com> neigh_stat_seq_next() should increase position index Vasily Averin <vvs(a)virtuozzo.com> vcc_seq_next should increase position index Tuong Lien <tuong.t.lien(a)dektech.com.au> tipc: fix link overflow issue at socket shutdown Kai Vehmanen <kai.vehmanen(a)linux.intel.com> ALSA: hda: enable regmap internal locking Darrick J. Wong <darrick.wong(a)oracle.com> xfs: fix log reservation overflows when allocating large rt extents Steven Rostedt (VMware) <rostedt(a)goodmis.org> module: Remove accidental change of module_enable_x() Miaohe Lin <linmiaohe(a)huawei.com> KVM: arm/arm64: vgic: Fix potential double free dist->spis in __kvm_vgic_destroy() Joe Perches <joe(a)perches.com> kernel/sys.c: avoid copying possible padding bytes in copy_to_user Xiaoming Ni <nixiaoming(a)huawei.com> kernel/notifier.c: intercept duplicate registrations to avoid infinite loops Stanislav Fomichev <sdf(a)google.com> selftests/bpf: De-flake test_tcpbpf Mark Rutland <mark.rutland(a)arm.com> arm64: insn: consistently handle exit text Monk Liu <Monk.Liu(a)amd.com> drm/amdgpu: fix calltrace during kmd unload(v3) Omar Sandoval <osandov(a)fb.com> xfs: fix realtime file data space leak Vasily Gorbik <gor(a)linux.ibm.com> s390: avoid misusing CALL_ON_STACK for task stack setup Max Filippov <jcmvbkbc(a)gmail.com> xtensa: fix system_call interaction with ptrace Tzung-Bi Shih <tzungbi(a)google.com> ASoC: max98090: remove msleep in PLL unlocked workaround Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: stop GC when the victim becomes fully valid Pavel Shilovsky <pshilov(a)microsoft.com> CIFS: Properly process SMB3 lease breaks Markus Elfring <elfring(a)users.sourceforge.net> CIFS: Use common error handling code in smb2_ioctl_query_info() Chuck Lever <chuck.lever(a)oracle.com> SUNRPC: Capture completion of all RPC tasks Kusanagi Kouichi <slash(a)ac.auone-net.jp> debugfs: Fix !DEBUG_FS debugfs_create_automount Felix Fietkau <nbd(a)nbd.name> mt76: add missing locking around ampdu action Felix Fietkau <nbd(a)nbd.name> mt76: do not use devm API for led classdev peter chang <dpf(a)google.com> scsi: pm80xx: Cleanup command when a reset times out Bob Peterson <rpeterso(a)redhat.com> gfs2: clean up iopen glock mess in gfs2_create_inode Bradley Bolen <bradleybolen(a)gmail.com> mmc: core: Fix size overflow for mmc partitions Sascha Hauer <s.hauer(a)pengutronix.de> ubi: Fix producing anchor PEBs Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> RDMA/iw_cgxb4: Fix an error handling path in 'c4iw_connect()' Brian Foster <bfoster(a)redhat.com> xfs: fix attr leaf header freemap.size underflow Al Viro <viro(a)zeniv.linux.org.uk> fix dget_parent() fastpath race Nicholas Johnson <nicholas.johnson-opensource(a)outlook.com.au> PCI: Avoid double hpmemsize MMIO window assignment Pan Bian <bianpan2016(a)163.com> RDMA/i40iw: Fix potential use after free Pan Bian <bianpan2016(a)163.com> RDMA/qedr: Fix potential use after free Lianbo Jiang <lijiang(a)redhat.com> x86/kdump: Always reserve the low 1M when the crashkernel option is specified Satendra Singh Thakur <sst2005(a)gmail.com> dmaengine: mediatek: hsdma_probe: fixed a memory leak when devm_request_irq fails Guoju Fang <fangguoju(a)gmail.com> bcache: fix a lost wake-up problem caused by mca_cannibalize_lock Divya Indi <divya.indi(a)oracle.com> tracing: Adding NULL checks for trace_array descriptor pointer Divya Indi <divya.indi(a)oracle.com> tracing: Verify if trace array exists before destroying it. Ivan Lazeev <ivan.lazeev(a)gmail.com> tpm_crb: fix fTPM on AMD Zen+ CPUs Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu/powerplay/smu7: fix AVFS handling with custom powerplay table Lee Jones <lee.jones(a)linaro.org> mfd: mfd-core: Protect against NULL call-back function pointer Hou Tao <houtao1(a)huawei.com> mtd: cfi_cmdset_0002: don't free cfi->cfiq in error path of cfi_amdstd_setup() Usha Ketineni <usha.k.ketineni(a)intel.com> ice: Fix to change Rx/Tx ring descriptor size via ethtool with DCBx Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu/powerplay: fix AVFS handling with custom powerplay table Stephen Kitt <steve(a)sk2.org> clk/ti/adpll: allocate room for terminating null Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: avoid kernel panic on corruption test Andreas Gruenbacher <agruenba(a)redhat.com> iomap: Fix overflow in iomap_page_mkwrite Dan Williams <dan.j.williams(a)intel.com> dax: Fix alloc_dax_region() compile warning Eric Dumazet <edumazet(a)google.com> net: silence data-races on sk_backlog.tail Michael Ellerman <mpe(a)ellerman.id.au> powerpc/64s: Always disable branch profiling for prom_init.o James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Fix kernel crash at lpfc_nvme_info_show during remote port bounce Pan Bian <bianpan2016(a)163.com> scsi: fnic: fix use after free Dmitry Osipenko <digetx(a)gmail.com> PM / devfreq: tegra30: Fix integer overflow on CPU's freq max out Mike Snitzer <snitzer(a)redhat.com> dm table: do not allow request-based DM to stack on partitions Oleh Kravchenko <oleg(a)kaa.org.ua> leds: mlxreg: Fix possible buffer overflow Dave Chinner <dchinner(a)redhat.com> xfs: properly serialise fallocate against AIO+DIO Nicholas Kazlauskas <nicholas.kazlauskas(a)amd.com> drm/amd/display: Free gamma after calculating legacy transfer function Sakari Ailus <sakari.ailus(a)linux.intel.com> media: smiapp: Fix error handling at NVM reading Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> soundwire: intel/cadence: fix startup sequence Russell King <rmk+kernel(a)armlinux.org.uk> ASoC: kirkwood: fix IRQ error handling Kangjie Lu <kjlu(a)umn.edu> gma/gma500: fix a memory disclosure bug due to uninitialized bytes Dave Chinner <dchinner(a)redhat.com> xfs: fix inode fork extent count overflow Fuqian Huang <huangfq.daxian(a)gmail.com> m68k: q40: Fix info-leak in rtc_ioctl Balsundar P <balsundar.p(a)microsemi.com> scsi: aacraid: fix illegal IO beyond last LBA Jia He <justin.he(a)arm.com> mm: fix double page fault on arm64 if PTE_AF is cleared Pierre Crégut <pierre.cregut(a)orange.com> PCI/IOV: Serialize sysfs sriov_numvfs reads vs writes Miaoqing Pan <miaoqing(a)codeaurora.org> ath10k: fix memory leak for tpc_stats_final Miaoqing Pan <miaoqing(a)codeaurora.org> ath10k: fix array out-of-bounds access Quinn Tran <qutran(a)marvell.com> scsi: qla2xxx: Add error handling for PLOGI ELS passthrough Chris Wilson <chris(a)chris-wilson.co.uk> dma-fence: Serialise signal enabling (dma_fence_enable_sw_signaling) Jay Cornwall <jay.cornwall(a)amd.com> drm/amdkfd: Fix race in gfx10 context restore handler Wesley Chalmers <Wesley.Chalmers(a)amd.com> drm/amd/display: Do not double-buffer DTO adjustments zhengbin <zhengbin13(a)huawei.com> media: mc-device.c: fix memleak in media_device_register_entity Jonathan Lebon <jlebon(a)redhat.com> selinux: allow labeling before policy is loaded Sreekanth Reddy <sreekanth.reddy(a)broadcom.com> scsi: mpt3sas: Free diag buffer without any status check James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Fix pt2pt discovery on SLI3 HBAs Iurii Zaikin <yzaikin(a)google.com> kernel/sysctl-test: Add null pointer test for sysctl.c:proc_dointvec() ------------- Diffstat: Documentation/devicetree/bindings/sound/wm8994.txt | 18 +- Documentation/driver-api/libata.rst | 2 +- Makefile | 4 +- arch/arm/include/asm/kvm_emulate.h | 11 +- arch/arm/kernel/stacktrace.c | 2 + arch/arm/kernel/traps.c | 6 +- arch/arm/mach-omap2/cpuidle34xx.c | 9 +- arch/arm/mach-omap2/cpuidle44xx.c | 26 +- arch/arm/mach-omap2/pm34xx.c | 8 +- arch/arm64/include/asm/kvm_emulate.h | 12 +- arch/arm64/include/asm/sections.h | 1 + arch/arm64/kernel/acpi.c | 25 ++ arch/arm64/kernel/cpufeature.c | 12 +- arch/arm64/kernel/insn.c | 22 +- arch/arm64/kernel/vmlinux.lds.S | 3 + arch/arm64/kvm/hyp/switch.c | 2 +- arch/arm64/mm/fault.c | 12 +- arch/m68k/q40/config.c | 1 + arch/mips/include/asm/cpu-type.h | 1 + arch/powerpc/include/asm/kvm_asm.h | 3 + arch/powerpc/kernel/Makefile | 2 +- arch/powerpc/kernel/eeh.c | 2 +- arch/powerpc/kernel/traps.c | 6 +- arch/powerpc/kvm/book3s_64_mmu_radix.c | 5 + arch/powerpc/kvm/book3s_hv_tm.c | 28 +- arch/powerpc/kvm/book3s_hv_tm_builtin.c | 16 +- arch/powerpc/mm/book3s64/iommu_api.c | 39 +- arch/powerpc/perf/imc-pmu.c | 173 +++++++-- arch/riscv/include/asm/ftrace.h | 7 + arch/riscv/kernel/ftrace.c | 19 + arch/s390/include/asm/pgtable.h | 44 ++- arch/s390/include/asm/stacktrace.h | 11 + arch/s390/kernel/irq.c | 8 +- arch/s390/kernel/perf_cpum_sf.c | 9 +- arch/s390/kernel/setup.c | 15 +- arch/s390/kernel/smp.c | 2 +- arch/x86/include/asm/crash.h | 6 + arch/x86/include/asm/nospec-branch.h | 4 +- arch/x86/include/asm/pkeys.h | 5 + arch/x86/kernel/apic/io_apic.c | 1 + arch/x86/kernel/crash.c | 15 + arch/x86/kernel/fpu/xstate.c | 9 +- arch/x86/kvm/emulate.c | 2 + arch/x86/kvm/lapic.c | 2 +- arch/x86/kvm/mmutrace.h | 2 +- arch/x86/kvm/svm.c | 11 +- arch/x86/kvm/vmx/vmx.c | 26 +- arch/x86/kvm/x86.c | 13 +- arch/x86/lib/usercopy_64.c | 2 +- arch/x86/realmode/init.c | 2 + arch/xtensa/kernel/entry.S | 4 +- arch/xtensa/kernel/ptrace.c | 18 +- drivers/acpi/ec.c | 16 +- drivers/ata/acard-ahci.c | 6 +- drivers/ata/libahci.c | 6 +- drivers/ata/libata-core.c | 9 +- drivers/ata/libata-sff.c | 12 +- drivers/ata/pata_macio.c | 6 +- drivers/ata/pata_pxa.c | 8 +- drivers/ata/pdc_adma.c | 7 +- drivers/ata/sata_fsl.c | 4 +- drivers/ata/sata_inic162x.c | 4 +- drivers/ata/sata_mv.c | 34 +- drivers/ata/sata_nv.c | 18 +- drivers/ata/sata_promise.c | 6 +- drivers/ata/sata_qstor.c | 8 +- drivers/ata/sata_rcar.c | 6 +- drivers/ata/sata_sil.c | 8 +- drivers/ata/sata_sil24.c | 6 +- drivers/ata/sata_sx4.c | 6 +- drivers/atm/eni.c | 2 +- drivers/base/arch_topology.c | 4 +- drivers/base/regmap/internal.h | 2 +- drivers/base/regmap/regcache.c | 2 +- drivers/base/regmap/regmap.c | 33 +- drivers/bluetooth/btrtl.c | 20 +- drivers/bus/hisi_lpc.c | 27 +- drivers/char/ipmi/bt-bmc.c | 12 +- drivers/char/random.c | 12 +- drivers/char/tlclk.c | 17 +- drivers/char/tpm/tpm_crb.c | 123 +++++-- drivers/char/tpm/tpm_ibmvtpm.c | 9 + drivers/char/tpm/tpm_ibmvtpm.h | 1 + drivers/clk/imx/clk-pfdv2.c | 6 + drivers/clk/socfpga/clk-pll-s10.c | 4 +- drivers/clk/ti/adpll.c | 11 +- drivers/clocksource/h8300_timer8.c | 2 +- drivers/cpufreq/powernv-cpufreq.c | 13 +- drivers/crypto/chelsio/chcr_algo.c | 5 +- drivers/crypto/chelsio/chtls/chtls_io.c | 10 +- drivers/dax/bus.c | 2 +- drivers/dax/bus.h | 2 +- drivers/dax/dax-private.h | 2 +- drivers/devfreq/tegra30-devfreq.c | 4 +- drivers/dma-buf/dma-buf.c | 2 + drivers/dma-buf/dma-fence.c | 78 ++-- drivers/dma/mediatek/mtk-hsdma.c | 4 +- drivers/dma/stm32-dma.c | 9 +- drivers/dma/stm32-mdma.c | 9 +- drivers/dma/tegra20-apb-dma.c | 3 +- drivers/dma/xilinx/zynqmp_dma.c | 24 +- drivers/edac/ghes_edac.c | 4 + drivers/firmware/arm_sdei.c | 26 +- drivers/gpio/gpio-rcar.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 31 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c | 10 +- drivers/gpu/drm/amd/amdgpu/atom.c | 4 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 58 +-- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 2 + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 40 +-- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 40 +-- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 16 + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 139 ++++---- .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 1 + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 32 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 2 + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 67 ++-- drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 52 ++- drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 5 + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 26 -- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 5 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 5 +- drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 35 +- drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 1 + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 7 + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 7 + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 20 +- drivers/gpu/drm/gma500/cdv_intel_display.c | 2 + drivers/gpu/drm/mcde/mcde_display.c | 10 + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 27 +- drivers/gpu/drm/msm/msm_drv.c | 6 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +- drivers/gpu/drm/nouveau/nouveau_debugfs.c | 5 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 4 +- .../gpu/drm/nouveau/nvkm/subdev/bios/shadowpci.c | 17 +- drivers/gpu/drm/omapdrm/dss/dss.c | 43 ++- drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c | 4 +- drivers/gpu/drm/radeon/radeon_bios.c | 30 +- drivers/gpu/drm/scheduler/sched_main.c | 27 ++ drivers/gpu/drm/sun4i/sun8i_csc.h | 2 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 1 + drivers/hwtracing/coresight/coresight-etm4x.c | 1 + drivers/hwtracing/intel_th/intel_th.h | 2 + drivers/hwtracing/intel_th/msu.c | 11 +- drivers/hwtracing/intel_th/pci.c | 8 +- drivers/i2c/busses/i2c-aspeed.c | 2 + drivers/i2c/busses/i2c-tegra.c | 93 +++-- drivers/i2c/i2c-core-base.c | 2 +- drivers/infiniband/core/cm.c | 25 +- drivers/infiniband/hw/cxgb4/cm.c | 4 +- drivers/infiniband/hw/i40iw/i40iw_cm.c | 2 +- drivers/infiniband/hw/qedr/qedr_iw_cm.c | 2 +- drivers/infiniband/sw/rxe/rxe.c | 2 + drivers/infiniband/sw/rxe/rxe_qp.c | 7 +- drivers/infiniband/ulp/iser/iser_memory.c | 21 +- drivers/leds/leds-mlxreg.c | 4 +- drivers/md/bcache/bcache.h | 1 + drivers/md/bcache/btree.c | 12 +- drivers/md/bcache/super.c | 1 + drivers/md/dm-table.c | 27 +- drivers/md/dm.c | 23 +- drivers/media/dvb-frontends/tda10071.c | 9 +- drivers/media/i2c/smiapp/smiapp-core.c | 3 +- drivers/media/mc/mc-device.c | 65 ++-- drivers/media/platform/qcom/venus/vdec.c | 5 +- drivers/media/platform/ti-vpe/cal.c | 6 +- drivers/media/usb/go7007/go7007-usb.c | 4 +- drivers/mfd/mfd-core.c | 10 + drivers/mmc/core/mmc.c | 9 +- drivers/mtd/chips/cfi_cmdset_0002.c | 1 - drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 4 +- drivers/mtd/nand/raw/omap_elm.c | 1 + drivers/mtd/parsers/cmdlinepart.c | 23 +- drivers/mtd/ubi/fastmap-wl.c | 46 ++- drivers/mtd/ubi/fastmap.c | 14 +- drivers/mtd/ubi/ubi.h | 6 +- drivers/mtd/ubi/wl.c | 32 +- drivers/mtd/ubi/wl.h | 1 - drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 4 +- drivers/net/ethernet/intel/e1000/e1000_main.c | 18 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 8 +- drivers/net/ethernet/intel/ice/ice_ethtool.c | 14 +- drivers/net/ethernet/qlogic/qed/qed_dev.c | 11 +- drivers/net/ethernet/qlogic/qed/qed_l2.c | 3 + drivers/net/ethernet/qlogic/qed/qed_main.c | 2 + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 1 + drivers/net/ethernet/qlogic/qede/qede_filter.c | 3 + drivers/net/ethernet/qlogic/qede/qede_main.c | 11 +- drivers/net/ethernet/realtek/r8169_main.c | 3 +- drivers/net/ethernet/xilinx/xilinx_axienet.h | 2 +- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 50 ++- drivers/net/ieee802154/adf7242.c | 4 +- drivers/net/ieee802154/ca8210.c | 1 + drivers/net/wireless/ath/ar5523/ar5523.c | 2 + drivers/net/wireless/ath/ath10k/debug.c | 3 +- drivers/net/wireless/ath/ath10k/sdio.c | 18 +- drivers/net/wireless/ath/ath10k/wmi.c | 49 ++- .../broadcom/brcm80211/brcmfmac/fwsignal.c | 3 +- drivers/net/wireless/marvell/mwifiex/fw.h | 2 +- drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 4 +- drivers/net/wireless/mediatek/mt76/agg-rx.c | 1 + drivers/net/wireless/mediatek/mt76/dma.c | 9 +- drivers/net/wireless/mediatek/mt76/mac80211.c | 12 +- drivers/net/wireless/mediatek/mt76/mt7603/main.c | 2 + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 2 + drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 2 + drivers/net/wireless/ti/wlcore/main.c | 4 +- drivers/net/wireless/ti/wlcore/tx.c | 1 + drivers/nvme/host/Kconfig | 1 + drivers/nvme/host/core.c | 14 +- drivers/nvme/host/fc.c | 4 +- drivers/nvme/host/multipath.c | 21 +- drivers/nvme/host/nvme.h | 19 +- drivers/nvme/host/pci.c | 1 - drivers/nvme/host/rdma.c | 3 +- drivers/nvme/host/tcp.c | 3 +- drivers/nvme/target/loop.c | 3 +- drivers/nvme/target/rdma.c | 30 +- drivers/opp/core.c | 48 +-- drivers/opp/of.c | 30 +- drivers/opp/opp.h | 6 +- drivers/pci/controller/dwc/pcie-tegra194.c | 5 +- drivers/pci/controller/pci-tegra.c | 3 +- drivers/pci/hotplug/pciehp_hpc.c | 26 +- drivers/pci/iov.c | 8 +- drivers/pci/rom.c | 17 - drivers/pci/setup-bus.c | 38 +- drivers/phy/samsung/phy-s5pv210-usb2.c | 4 + drivers/power/supply/max17040_battery.c | 2 +- drivers/rapidio/devices/rio_mport_cdev.c | 14 +- drivers/regulator/axp20x-regulator.c | 7 +- drivers/rtc/rtc-ds1374.c | 15 +- drivers/rtc/rtc-sa1100.c | 18 +- drivers/s390/block/dasd_fba.c | 9 +- drivers/s390/cio/airq.c | 8 +- drivers/s390/cio/cio.c | 8 +- drivers/s390/crypto/zcrypt_api.c | 3 +- drivers/scsi/aacraid/aachba.c | 8 +- drivers/scsi/aacraid/commsup.c | 2 +- drivers/scsi/aacraid/linit.c | 46 ++- drivers/scsi/cxlflash/main.c | 1 + drivers/scsi/fnic/fnic_scsi.c | 3 +- drivers/scsi/hpsa.c | 80 +++-- drivers/scsi/libfc/fc_rport.c | 13 +- drivers/scsi/lpfc/lpfc_attr.c | 40 +-- drivers/scsi/lpfc/lpfc_ct.c | 137 +++---- drivers/scsi/lpfc/lpfc_hbadisc.c | 76 ++-- drivers/scsi/lpfc/lpfc_hw.h | 36 +- drivers/scsi/lpfc/lpfc_init.c | 1 + drivers/scsi/lpfc/lpfc_nportdisc.c | 233 ++++++++++-- drivers/scsi/lpfc/lpfc_sli.c | 4 + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 6 - drivers/scsi/pm8001/pm8001_sas.c | 50 ++- drivers/scsi/qedi/qedi_iscsi.c | 3 + drivers/scsi/qla2xxx/qla_init.c | 43 +-- drivers/scsi/qla2xxx/qla_iocb.c | 101 +++++- drivers/scsi/qla2xxx/qla_target.c | 21 +- drivers/scsi/ufs/ufshcd.c | 14 +- drivers/soundwire/bus.c | 2 + drivers/soundwire/cadence_master.c | 80 +++-- drivers/soundwire/cadence_master.h | 1 + drivers/soundwire/intel.c | 14 +- drivers/staging/media/imx/imx-media-capture.c | 2 +- drivers/staging/rtl8188eu/core/rtw_recv.c | 19 +- drivers/thermal/rcar_thermal.c | 6 +- drivers/tty/serial/8250/8250_omap.c | 8 +- drivers/tty/serial/8250/8250_port.c | 16 +- drivers/tty/serial/samsung.c | 8 +- drivers/tty/serial/sifive.c | 28 +- drivers/tty/serial/xilinx_uartps.c | 8 + drivers/tty/vcc.c | 1 + drivers/usb/dwc3/gadget.c | 2 +- drivers/usb/host/ehci-mv.c | 8 +- drivers/vfio/pci/vfio_pci.c | 13 + fs/block_dev.c | 10 + fs/btrfs/disk-io.c | 11 +- fs/btrfs/extent-tree.c | 2 - fs/btrfs/inode.c | 201 +++++------ fs/btrfs/relocation.c | 45 ++- fs/btrfs/tree-checker.c | 40 ++- fs/ceph/caps.c | 14 +- fs/ceph/inode.c | 5 +- fs/cifs/cifsglob.h | 9 +- fs/cifs/file.c | 21 +- fs/cifs/misc.c | 17 +- fs/cifs/smb1ops.c | 8 +- fs/cifs/smb2misc.c | 32 +- fs/cifs/smb2ops.c | 89 +++-- fs/cifs/smb2pdu.h | 2 +- fs/dcache.c | 4 +- fs/exec.c | 22 +- fs/ext4/inode.c | 2 +- fs/ext4/mballoc.c | 11 +- fs/f2fs/gc.c | 10 +- fs/f2fs/node.c | 1 - fs/fuse/dev.c | 1 - fs/fuse/inode.c | 7 + fs/gfs2/inode.c | 13 +- fs/iomap/buffered-io.c | 7 +- fs/nfs/nfstrace.h | 15 +- fs/nfs/pagelist.c | 67 ++-- fs/nfs/write.c | 10 +- fs/nfsd/filecache.c | 8 +- fs/nfsd/nfs4state.c | 73 ++-- fs/nfsd/trace.h | 12 +- fs/proc/base.c | 10 +- fs/ubifs/io.c | 16 +- fs/ubifs/journal.c | 1 + fs/ubifs/orphan.c | 9 +- fs/xfs/libxfs/xfs_attr_leaf.c | 22 +- fs/xfs/libxfs/xfs_bmap.c | 25 +- fs/xfs/libxfs/xfs_dir2_node.c | 1 + fs/xfs/libxfs/xfs_dir2_sf.c | 2 +- fs/xfs/libxfs/xfs_iext_tree.c | 2 +- fs/xfs/libxfs/xfs_inode_fork.c | 8 +- fs/xfs/libxfs/xfs_inode_fork.h | 14 +- fs/xfs/libxfs/xfs_trans_resv.c | 96 ++++- fs/xfs/scrub/dir.c | 3 + fs/xfs/scrub/scrub.c | 9 + fs/xfs/xfs_bmap_util.c | 8 +- fs/xfs/xfs_file.c | 30 ++ fs/xfs/xfs_fsmap.c | 9 + fs/xfs/xfs_ioctl.c | 1 + fs/xfs/xfs_trans.c | 5 + include/asm-generic/pgtable.h | 10 + include/linux/binfmts.h | 8 +- include/linux/debugfs.h | 5 +- include/linux/kprobes.h | 5 + include/linux/libata.h | 13 +- include/linux/mmc/card.h | 2 +- include/linux/nfs_page.h | 2 + include/linux/pci.h | 1 - include/linux/qed/qed_if.h | 1 + include/linux/sched/signal.h | 9 +- include/linux/seqlock.h | 11 +- include/linux/skbuff.h | 14 +- include/linux/sunrpc/svc_rdma.h | 5 +- include/net/sock.h | 4 +- include/sound/hda_codec.h | 5 + include/trace/events/sctp.h | 9 - include/trace/events/sunrpc.h | 1 + init/init_task.c | 1 + init/main.c | 2 + kernel/Makefile | 2 + kernel/audit_watch.c | 2 - kernel/bpf/hashtab.c | 8 - kernel/bpf/inode.c | 4 +- kernel/events/core.c | 12 +- kernel/fork.c | 5 +- kernel/kcmp.c | 8 +- kernel/kprobes.c | 44 ++- kernel/locking/lockdep.c | 40 ++- kernel/locking/lockdep_internals.h | 6 + kernel/notifier.c | 5 +- kernel/printk/printk.c | 3 + kernel/sched/core.c | 3 +- kernel/sched/fair.c | 79 +++-- kernel/sys.c | 4 +- kernel/sysctl-test.c | 392 +++++++++++++++++++++ kernel/time/timekeeping.c | 3 +- kernel/trace/trace.c | 20 +- kernel/trace/trace_entries.h | 2 +- kernel/trace/trace_events.c | 2 + kernel/trace/trace_events_hist.c | 1 - kernel/trace/trace_preemptirq.c | 4 +- kernel/workqueue.c | 6 +- lib/Kconfig.debug | 11 + lib/string.c | 24 ++ mm/filemap.c | 8 + mm/gup.c | 18 +- mm/kmemleak.c | 2 +- mm/madvise.c | 2 +- mm/memcontrol.c | 26 +- mm/memory.c | 121 ++++++- mm/mmap.c | 2 + mm/pagewalk.c | 4 +- mm/slub.c | 45 ++- mm/swap_state.c | 5 +- mm/swapfile.c | 12 +- mm/vmscan.c | 45 ++- net/atm/lec.c | 6 + net/atm/proc.c | 3 +- net/batman-adv/bridge_loop_avoidance.c | 145 ++++++-- net/batman-adv/bridge_loop_avoidance.h | 4 +- net/batman-adv/multicast.c | 46 ++- net/batman-adv/multicast.h | 15 + net/batman-adv/routing.c | 4 + net/batman-adv/soft-interface.c | 11 +- net/bluetooth/hci_event.c | 25 +- net/bluetooth/l2cap_core.c | 29 +- net/bluetooth/l2cap_sock.c | 18 +- net/core/devlink.c | 7 +- net/core/filter.c | 4 +- net/core/neighbour.c | 1 + net/ipv4/route.c | 1 + net/ipv4/tcp.c | 2 +- net/ipv6/ip6_fib.c | 7 +- net/llc/af_llc.c | 2 +- net/mac80211/tx.c | 6 +- net/mac802154/tx.c | 8 +- net/netfilter/nf_conntrack_proto.c | 2 + net/netfilter/nf_tables_api.c | 3 +- net/openvswitch/meter.c | 4 +- net/openvswitch/meter.h | 2 +- net/sctp/outqueue.c | 6 + net/sunrpc/sched.c | 20 +- net/sunrpc/svc_xprt.c | 19 +- net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 39 +- net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 11 +- net/tipc/socket.c | 53 +-- net/tipc/topsrv.c | 4 +- net/unix/af_unix.c | 11 +- net/wireless/Kconfig | 1 + security/device_cgroup.c | 3 +- security/selinux/hooks.c | 12 + security/selinux/selinuxfs.c | 1 + sound/hda/hdac_bus.c | 4 + sound/hda/hdac_regmap.c | 1 - sound/pci/asihpi/hpioctl.c | 4 +- sound/pci/hda/hda_codec.c | 28 +- sound/pci/hda/hda_controller.c | 11 +- sound/pci/hda/hda_controller.h | 2 +- sound/pci/hda/hda_intel.c | 40 ++- sound/pci/hda/patch_realtek.c | 13 +- sound/soc/codecs/max98090.c | 8 +- sound/soc/codecs/pcm3168a.c | 7 + sound/soc/codecs/wm8994.c | 10 + sound/soc/codecs/wm_hubs.c | 3 + sound/soc/codecs/wm_hubs.h | 1 + sound/soc/img/img-i2s-out.c | 8 +- sound/soc/intel/boards/bytcr_rt5640.c | 10 + sound/soc/kirkwood/kirkwood-dma.c | 2 +- sound/soc/sof/ipc.c | 12 +- sound/usb/midi.c | 29 +- sound/usb/mixer.c | 10 + sound/usb/quirks.c | 7 +- tools/gpio/gpio-hammer.c | 17 +- tools/objtool/check.c | 2 +- tools/perf/builtin-stat.c | 2 +- tools/perf/pmu-events/jevents.c | 15 +- tools/perf/tests/shell/lib/probe_vfs_getname.sh | 2 +- tools/perf/tests/shell/record+zstd_comp_decomp.sh | 3 +- tools/perf/trace/beauty/arch_errno_names.sh | 2 +- tools/perf/util/cpumap.c | 10 +- tools/perf/util/cs-etm.c | 126 +++++-- tools/perf/util/evsel.c | 7 + tools/perf/util/mem2node.c | 3 +- tools/perf/util/metricgroup.c | 3 + tools/perf/util/parse-events.c | 9 +- tools/perf/util/sort.c | 2 +- tools/perf/util/symbol-elf.c | 7 + .../x86/intel_pstate_tracer/intel_pstate_tracer.py | 22 +- .../testing/selftests/bpf/progs/test_tcpbpf_kern.c | 1 + tools/testing/selftests/bpf/test_tcpbpf.h | 1 + tools/testing/selftests/bpf/test_tcpbpf_user.c | 25 +- .../ftrace/test.d/ftrace/func-filter-glob.tc | 2 +- tools/testing/selftests/ptrace/Makefile | 4 +- tools/testing/selftests/ptrace/vmaccess.c | 86 +++++ tools/testing/selftests/x86/syscall_nt.c | 1 + virt/kvm/arm/mmio.c | 2 +- virt/kvm/arm/mmu.c | 2 +- virt/kvm/arm/vgic/vgic-init.c | 11 +- virt/kvm/arm/vgic/vgic-its.c | 11 +- virt/kvm/kvm_main.c | 1 + 469 files changed, 5174 insertions(+), 2467 deletions(-)

4 years, 2 months

5
392
0 0

[PATCH v2] x86/xen: disable Firmware First mode for correctable memory errors

by Juergen Gross

When running as Xen dom0 the kernel isn't responsible for selecting the error handling mode, this should be handled by the hypervisor. So disable setting FF mode when running as Xen pv guest. Not doing so might result in boot splats like: [ 7.509696] HEST: Enabling Firmware First mode for corrected errors. [ 7.510382] mce: [Firmware Bug]: Ignoring request to disable invalid MCA bank 2. [ 7.510383] mce: [Firmware Bug]: Ignoring request to disable invalid MCA bank 3. [ 7.510384] mce: [Firmware Bug]: Ignoring request to disable invalid MCA bank 4. [ 7.510384] mce: [Firmware Bug]: Ignoring request to disable invalid MCA bank 5. [ 7.510385] mce: [Firmware Bug]: Ignoring request to disable invalid MCA bank 6. [ 7.510386] mce: [Firmware Bug]: Ignoring request to disable invalid MCA bank 7. [ 7.510386] mce: [Firmware Bug]: Ignoring request to disable invalid MCA bank 8. Reason is that the HEST ACPI table contains the real number of MCA banks, while the hypervisor is emulating only 2 banks for guests. Cc: stable(a)vger.kernel.org Signed-off-by: Juergen Gross <jgross(a)suse.com> Reviewed-by: Boris Ostrovsky <boris.ostrovsky(a)oracle.com> --- arch/x86/xen/enlighten_pv.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index 22e741e0b10c..351ac1a9a119 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -1376,6 +1376,15 @@ asmlinkage __visible void __init xen_start_kernel(void) x86_init.mpparse.get_smp_config = x86_init_uint_noop; xen_boot_params_init_edd(); + +#ifdef CONFIG_ACPI + /* + * Disable selecting "Firmware First mode" for correctable + * memory errors, as this is the duty of the hypervisor to + * decide. + */ + acpi_disable_cmcff = 1; +#endif } if (!boot_params.screen_info.orig_video_isVGA) -- 2.26.2

4 years, 2 months

2
1
0 0

[PATCH] xen/events: don't use chip_data for legacy IRQs

by Juergen Gross

Since commit c330fb1ddc0a ("XEN uses irqdesc::irq_data_common::handler_data to store a per interrupt XEN data pointer which contains XEN specific information.") Xen is using the chip_data pointer for storing IRQ specific data. When running as a HVM domain this can result in problems for legacy IRQs, as those might use chip_data for their own purposes. Use a local array for this purpose in case of legacy IRQs, avoiding the double use. Cc: stable(a)vger.kernel.org Fixes: c330fb1ddc0a ("XEN uses irqdesc::irq_data_common::handler_data to store a per interrupt XEN data pointer which contains XEN specific information.") Signed-off-by: Juergen Gross <jgross(a)suse.com> --- drivers/xen/events/events_base.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c index 90b8f56fbadb..6f02c18fa65c 100644 --- a/drivers/xen/events/events_base.c +++ b/drivers/xen/events/events_base.c @@ -92,6 +92,8 @@ static bool (*pirq_needs_eoi)(unsigned irq); /* Xen will never allocate port zero for any purpose. */ #define VALID_EVTCHN(chn) ((chn) != 0) +static struct irq_info *legacy_info_ptrs[NR_IRQS_LEGACY]; + static struct irq_chip xen_dynamic_chip; static struct irq_chip xen_percpu_chip; static struct irq_chip xen_pirq_chip; @@ -156,7 +158,18 @@ int get_evtchn_to_irq(evtchn_port_t evtchn) /* Get info for IRQ */ struct irq_info *info_for_irq(unsigned irq) { - return irq_get_chip_data(irq); + if (irq < nr_legacy_irqs()) + return legacy_info_ptrs[irq]; + else + return irq_get_chip_data(irq); +} + +static void set_info_for_irq(unsigned int irq, struct irq_info *info) +{ + if (irq < nr_legacy_irqs()) + legacy_info_ptrs[irq] = info; + else + irq_set_chip_data(irq, info); } /* Constructors for packed IRQ information. */ @@ -377,7 +390,7 @@ static void xen_irq_init(unsigned irq) info->type = IRQT_UNBOUND; info->refcnt = -1; - irq_set_chip_data(irq, info); + set_info_for_irq(irq, info); list_add_tail(&info->list, &xen_irq_list_head); } @@ -426,14 +439,14 @@ static int __must_check xen_allocate_irq_gsi(unsigned gsi) static void xen_free_irq(unsigned irq) { - struct irq_info *info = irq_get_chip_data(irq); + struct irq_info *info = info_for_irq(irq); if (WARN_ON(!info)) return; list_del(&info->list); - irq_set_chip_data(irq, NULL); + set_info_for_irq(irq, NULL); WARN_ON(info->refcnt > 0); @@ -603,7 +616,7 @@ EXPORT_SYMBOL_GPL(xen_irq_from_gsi); static void __unbind_from_irq(unsigned int irq) { evtchn_port_t evtchn = evtchn_from_irq(irq); - struct irq_info *info = irq_get_chip_data(irq); + struct irq_info *info = info_for_irq(irq); if (info->refcnt > 0) { info->refcnt--; @@ -1108,7 +1121,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi, void unbind_from_irqhandler(unsigned int irq, void *dev_id) { - struct irq_info *info = irq_get_chip_data(irq); + struct irq_info *info = info_for_irq(irq); if (WARN_ON(!info)) return; @@ -1142,7 +1155,7 @@ int evtchn_make_refcounted(evtchn_port_t evtchn) if (irq == -1) return -ENOENT; - info = irq_get_chip_data(irq); + info = info_for_irq(irq); if (!info) return -ENOENT; @@ -1170,7 +1183,7 @@ int evtchn_get(evtchn_port_t evtchn) if (irq == -1) goto done; - info = irq_get_chip_data(irq); + info = info_for_irq(irq); if (!info) goto done; -- 2.26.2

4 years, 2 months

3
2
0 0

[for-linus][PATCH 2/2] ftrace: Move RCU is watching check after recursion check

by Steven Rostedt

From: "Steven Rostedt (VMware)" <rostedt(a)goodmis.org> The first thing that the ftrace function callback helper functions should do is to check for recursion. Peter Zijlstra found that when "rcu_is_watching()" had its notrace removed, it caused perf function tracing to crash. This is because the call of rcu_is_watching() is tested before function recursion is checked and and if it is traced, it will cause an infinite recursion loop. rcu_is_watching() should still stay notrace, but to prevent this should never had crashed in the first place. The recursion prevention must be the first thing done in callback functions. Link: https://lore.kernel.org/r/20200929112541.GM2628@hirez.programming.kicks-ass… Cc: stable(a)vger.kernel.org Cc: Paul McKenney <paulmck(a)kernel.org> Fixes: c68c0fa293417 ("ftrace: Have ftrace_ops_get_func() handle RCU and PER_CPU flags too") Acked-by: Peter Zijlstra (Intel) <peterz(a)infradead.org> Reported-by: Peter Zijlstra (Intel) <peterz(a)infradead.org> Signed-off-by: Steven Rostedt (VMware) <rostedt(a)goodmis.org> --- kernel/trace/ftrace.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 603255f5f085..541453927c82 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -6993,16 +6993,14 @@ static void ftrace_ops_assist_func(unsigned long ip, unsigned long parent_ip, { int bit; - if ((op->flags & FTRACE_OPS_FL_RCU) && !rcu_is_watching()) - return; - bit = trace_test_and_set_recursion(TRACE_LIST_START, TRACE_LIST_MAX); if (bit < 0) return; preempt_disable_notrace(); - op->func(ip, parent_ip, op, regs); + if (!(op->flags & FTRACE_OPS_FL_RCU) || rcu_is_watching()) + op->func(ip, parent_ip, op, regs); preempt_enable_notrace(); trace_clear_recursion(bit); -- 2.28.0

4 years, 2 months

1
0
0 0

[for-linus][PATCH 1/2] tracing: Fix trace_find_next_entry() accounting of temp buffer size

by Steven Rostedt

From: "Steven Rostedt (VMware)" <rostedt(a)goodmis.org> The temp buffer size variable for trace_find_next_entry() was incorrectly being updated when the size did not change. The temp buffer size should only be updated when it is reallocated. This is mostly an issue when used with ftrace_dump(). That's because ftrace_dump() can not allocate a new buffer, and instead uses a temporary buffer with a fix size. But the variable that keeps track of that size is incorrectly updated with each call, and it could fall into the path that would try to reallocate the buffer and produce a warning. ------------[ cut here ]------------ WARNING: CPU: 1 PID: 1601 at kernel/trace/trace.c:3548 trace_find_next_entry+0xd0/0xe0 Modules linked in [..] CPU: 1 PID: 1601 Comm: bash Not tainted 5.9.0-rc5-test+ #521 Hardware name: Hewlett-Packard HP Compaq Pro 6300 SFF/339A, BIOS K01 v03.03 07/14/2016 RIP: 0010:trace_find_next_entry+0xd0/0xe0 Code: 40 21 00 00 4c 89 e1 31 d2 4c 89 ee 48 89 df e8 c6 9e ff ff 89 ab 54 21 00 00 5b 5d 41 5c 41 5d c3 48 63 d5 eb bf 31 c0 eb f0 <0f> 0b 48 63 d5 eb b4 66 0f 1f 84 00 00 00 00 00 53 48 8d 8f 60 21 RSP: 0018:ffff95a4f2e8bd70 EFLAGS: 00010046 RAX: ffffffff96679fc0 RBX: ffffffff97910de0 RCX: ffffffff96679fc0 RDX: ffff95a4f2e8bd98 RSI: ffff95a4ee321098 RDI: ffffffff97913000 RBP: 0000000000000018 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000001 R11: 0000000000000046 R12: ffff95a4f2e8bd98 R13: 0000000000000000 R14: ffff95a4ee321098 R15: 00000000009aa301 FS: 00007f8565484740(0000) GS:ffff95a55aa40000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000055876bd43d90 CR3: 00000000b76e6003 CR4: 00000000001706e0 Call Trace: trace_print_lat_context+0x58/0x2d0 ? cpumask_next+0x16/0x20 print_trace_line+0x1a4/0x4f0 ftrace_dump.cold+0xad/0x12c __handle_sysrq.cold+0x51/0x126 write_sysrq_trigger+0x3f/0x4a proc_reg_write+0x53/0x80 vfs_write+0xca/0x210 ksys_write+0x70/0xf0 do_syscall_64+0x33/0x40 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7f8565579487 Code: 64 89 02 48 c7 c0 ff ff ff ff eb bb 0f 1f 80 00 00 00 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 48 89 54 24 18 48 89 74 24 RSP: 002b:00007ffd40707948 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 RAX: ffffffffffffffda RBX: 0000000000000002 RCX: 00007f8565579487 RDX: 0000000000000002 RSI: 000055876bd74de0 RDI: 0000000000000001 RBP: 000055876bd74de0 R08: 000000000000000a R09: 0000000000000001 R10: 000055876bdec280 R11: 0000000000000246 R12: 0000000000000002 R13: 00007f856564a500 R14: 0000000000000002 R15: 00007f856564a700 irq event stamp: 109958 ---[ end trace 7aab5b7e51484b00 ]--- Not only fix the updating of the temp buffer, but also do not free the temp buffer before a new buffer is allocated (there's no reason to not continue to use the current temp buffer if an allocation fails). Cc: stable(a)vger.kernel.org Fixes: 8e99cf91b99bb ("tracing: Do not allocate buffer in trace_find_next_entry() in atomic") Reported-by: Anna-Maria Behnsen <anna-maria(a)linutronix.de> Signed-off-by: Steven Rostedt (VMware) <rostedt(a)goodmis.org> --- kernel/trace/trace.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 2a7c26345e83..d3e5de717df2 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -3546,13 +3546,15 @@ struct trace_entry *trace_find_next_entry(struct trace_iterator *iter, if (iter->ent && iter->ent != iter->temp) { if ((!iter->temp || iter->temp_size < iter->ent_size) && !WARN_ON_ONCE(iter->temp == static_temp_buf)) { - kfree(iter->temp); - iter->temp = kmalloc(iter->ent_size, GFP_KERNEL); - if (!iter->temp) + void *temp; + temp = kmalloc(iter->ent_size, GFP_KERNEL); + if (!temp) return NULL; + kfree(iter->temp); + iter->temp = temp; + iter->temp_size = iter->ent_size; } memcpy(iter->temp, iter->ent, iter->ent_size); - iter->temp_size = iter->ent_size; iter->ent = iter->temp; } entry = __find_next_entry(iter, ent_cpu, NULL, ent_ts); -- 2.28.0

4 years, 2 months

1
0
0 0

patch "serial: pl011: Fix lockdep splat when handling magic-sysrq interrupt" added to tty-testing

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled serial: pl011: Fix lockdep splat when handling magic-sysrq interrupt to my tty git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git in the tty-testing branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will be merged to the tty-next branch sometime soon, after it passes testing, and the merge window is open. If you have any questions about this process, please let me know. >From 534cf755d9df99e214ddbe26b91cd4d81d2603e2 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra <peterz(a)infradead.org> Date: Wed, 30 Sep 2020 13:04:32 +0100 Subject: serial: pl011: Fix lockdep splat when handling magic-sysrq interrupt Issuing a magic-sysrq via the PL011 causes the following lockdep splat, which is easily reproducible under QEMU: | sysrq: Changing Loglevel | sysrq: Loglevel set to 9 | | ====================================================== | WARNING: possible circular locking dependency detected | 5.9.0-rc7 #1 Not tainted | ------------------------------------------------------ | systemd-journal/138 is trying to acquire lock: | ffffab133ad950c0 (console_owner){-.-.}-{0:0}, at: console_lock_spinning_enable+0x34/0x70 | | but task is already holding lock: | ffff0001fd47b098 (&port_lock_key){-.-.}-{2:2}, at: pl011_int+0x40/0x488 | | which lock already depends on the new lock. [...] | Possible unsafe locking scenario: | | CPU0 CPU1 | ---- ---- | lock(&port_lock_key); | lock(console_owner); | lock(&port_lock_key); | lock(console_owner); | | *** DEADLOCK *** The issue being that CPU0 takes 'port_lock' on the irq path in pl011_int() before taking 'console_owner' on the printk() path, whereas CPU1 takes the two locks in the opposite order on the printk() path due to setting the "console_owner" prior to calling into into the actual console driver. Fix this in the same way as the msm-serial driver by dropping 'port_lock' before handling the sysrq. Cc: <stable(a)vger.kernel.org> # 4.19+ Cc: Russell King <linux(a)armlinux.org.uk> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Jiri Slaby <jirislaby(a)kernel.org> Link: https://lore.kernel.org/r/20200811101313.GA6970@willie-the-truck Signed-off-by: Peter Zijlstra <peterz(a)infradead.org> Tested-by: Will Deacon <will(a)kernel.org> Signed-off-by: Will Deacon <will(a)kernel.org> Link: https://lore.kernel.org/r/20200930120432.16551-1-will@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/tty/serial/amba-pl011.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 67498594d7d7..87dc3fc15694 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -308,8 +308,9 @@ static void pl011_write(unsigned int val, const struct uart_amba_port *uap, */ static int pl011_fifo_to_tty(struct uart_amba_port *uap) { - u16 status; unsigned int ch, flag, fifotaken; + int sysrq; + u16 status; for (fifotaken = 0; fifotaken != 256; fifotaken++) { status = pl011_read(uap, REG_FR); @@ -344,10 +345,12 @@ static int pl011_fifo_to_tty(struct uart_amba_port *uap) flag = TTY_FRAME; } - if (uart_handle_sysrq_char(&uap->port, ch & 255)) - continue; + spin_unlock(&uap->port.lock); + sysrq = uart_handle_sysrq_char(&uap->port, ch & 255); + spin_lock(&uap->port.lock); - uart_insert_char(&uap->port, ch, UART011_DR_OE, ch, flag); + if (!sysrq) + uart_insert_char(&uap->port, ch, UART011_DR_OE, ch, flag); } return fifotaken; -- 2.28.0

4 years, 2 months

1
0
0 0

patch "tty: serial: fsl_lpuart: fix lpuart32_poll_get_char" added to tty-testing

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled tty: serial: fsl_lpuart: fix lpuart32_poll_get_char to my tty git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git in the tty-testing branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will be merged to the tty-next branch sometime soon, after it passes testing, and the merge window is open. If you have any questions about this process, please let me know. >From 29788ab1d2bf26c130de8f44f9553ee78a27e8d5 Mon Sep 17 00:00:00 2001 From: Peng Fan <peng.fan(a)nxp.com> Date: Tue, 29 Sep 2020 17:55:09 +0800 Subject: tty: serial: fsl_lpuart: fix lpuart32_poll_get_char The watermark is set to 1, so we need to input two chars to trigger RDRF using the original logic. With the new logic, we could always get the char when there is data in FIFO. Suggested-by: Fugang Duan <fugang.duan(a)nxp.com> Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Link: https://lore.kernel.org/r/20200929095509.21680-1-peng.fan@nxp.com Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/tty/serial/fsl_lpuart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index 645bbb24b433..590c901a1fc5 100644 --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c @@ -680,7 +680,7 @@ static void lpuart32_poll_put_char(struct uart_port *port, unsigned char c) static int lpuart32_poll_get_char(struct uart_port *port) { - if (!(lpuart32_read(port, UARTSTAT) & UARTSTAT_RDRF)) + if (!(lpuart32_read(port, UARTWATER) >> UARTWATER_RXCNT_OFF)) return NO_POLL_CHAR; return lpuart32_read(port, UARTDATA); -- 2.28.0

4 years, 2 months

1
0
0 0

patch "tty: serial: lpuart: fix lpuart32_write usage" added to tty-testing

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled tty: serial: lpuart: fix lpuart32_write usage to my tty git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git in the tty-testing branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will be merged to the tty-next branch sometime soon, after it passes testing, and the merge window is open. If you have any questions about this process, please let me know. >From 9ea40db477c024dcb87321b7f32bd6ea12130ac2 Mon Sep 17 00:00:00 2001 From: Peng Fan <peng.fan(a)nxp.com> Date: Tue, 29 Sep 2020 17:19:20 +0800 Subject: tty: serial: lpuart: fix lpuart32_write usage The 2nd and 3rd parameter were wrongly used, and cause kernel abort when doing kgdb debug. Fixes: 1da17d7cf8e2 ("tty: serial: fsl_lpuart: Use appropriate lpuart32_* I/O funcs") Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Link: https://lore.kernel.org/r/20200929091920.22612-1-peng.fan@nxp.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/tty/serial/fsl_lpuart.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index 5a5a22d77841..645bbb24b433 100644 --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c @@ -649,26 +649,24 @@ static int lpuart32_poll_init(struct uart_port *port) spin_lock_irqsave(&sport->port.lock, flags); /* Disable Rx & Tx */ - lpuart32_write(&sport->port, UARTCTRL, 0); + lpuart32_write(&sport->port, 0, UARTCTRL); temp = lpuart32_read(&sport->port, UARTFIFO); /* Enable Rx and Tx FIFO */ - lpuart32_write(&sport->port, UARTFIFO, - temp | UARTFIFO_RXFE | UARTFIFO_TXFE); + lpuart32_write(&sport->port, temp | UARTFIFO_RXFE | UARTFIFO_TXFE, UARTFIFO); /* flush Tx and Rx FIFO */ - lpuart32_write(&sport->port, UARTFIFO, - UARTFIFO_TXFLUSH | UARTFIFO_RXFLUSH); + lpuart32_write(&sport->port, UARTFIFO_TXFLUSH | UARTFIFO_RXFLUSH, UARTFIFO); /* explicitly clear RDRF */ if (lpuart32_read(&sport->port, UARTSTAT) & UARTSTAT_RDRF) { lpuart32_read(&sport->port, UARTDATA); - lpuart32_write(&sport->port, UARTFIFO, UARTFIFO_RXUF); + lpuart32_write(&sport->port, UARTFIFO_RXUF, UARTFIFO); } /* Enable Rx and Tx */ - lpuart32_write(&sport->port, UARTCTRL, UARTCTRL_RE | UARTCTRL_TE); + lpuart32_write(&sport->port, UARTCTRL_RE | UARTCTRL_TE, UARTCTRL); spin_unlock_irqrestore(&sport->port.lock, flags); return 0; @@ -677,7 +675,7 @@ static int lpuart32_poll_init(struct uart_port *port) static void lpuart32_poll_put_char(struct uart_port *port, unsigned char c) { lpuart32_wait_bit_set(port, UARTSTAT, UARTSTAT_TDRE); - lpuart32_write(port, UARTDATA, c); + lpuart32_write(port, c, UARTDATA); } static int lpuart32_poll_get_char(struct uart_port *port) -- 2.28.0

4 years, 2 months

1
0
0 0

[PATCH] serial: pl011: Fix lockdep splat when handling magic-sysrq interrupt

by Will Deacon

From: Peter Zijlstra <peterz(a)infradead.org> Issuing a magic-sysrq via the PL011 causes the following lockdep splat, which is easily reproducible under QEMU: | sysrq: Changing Loglevel | sysrq: Loglevel set to 9 | | ====================================================== | WARNING: possible circular locking dependency detected | 5.9.0-rc7 #1 Not tainted | ------------------------------------------------------ | systemd-journal/138 is trying to acquire lock: | ffffab133ad950c0 (console_owner){-.-.}-{0:0}, at: console_lock_spinning_enable+0x34/0x70 | | but task is already holding lock: | ffff0001fd47b098 (&port_lock_key){-.-.}-{2:2}, at: pl011_int+0x40/0x488 | | which lock already depends on the new lock. [...] | Possible unsafe locking scenario: | | CPU0 CPU1 | ---- ---- | lock(&port_lock_key); | lock(console_owner); | lock(&port_lock_key); | lock(console_owner); | | *** DEADLOCK *** The issue being that CPU0 takes 'port_lock' on the irq path in pl011_int() before taking 'console_owner' on the printk() path, whereas CPU1 takes the two locks in the opposite order on the printk() path due to setting the "console_owner" prior to calling into into the actual console driver. Fix this in the same way as the msm-serial driver by dropping 'port_lock' before handling the sysrq. Cc: <stable(a)vger.kernel.org> # 4.19+ Cc: Russell King <linux(a)armlinux.org.uk> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Jiri Slaby <jirislaby(a)kernel.org> Link: https://lore.kernel.org/r/20200811101313.GA6970@willie-the-truck Signed-off-by: Peter Zijlstra <peterz(a)infradead.org> Tested-by: Will Deacon <will(a)kernel.org> Signed-off-by: Will Deacon <will(a)kernel.org> --- drivers/tty/serial/amba-pl011.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 67498594d7d7..87dc3fc15694 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -308,8 +308,9 @@ static void pl011_write(unsigned int val, const struct uart_amba_port *uap, */ static int pl011_fifo_to_tty(struct uart_amba_port *uap) { - u16 status; unsigned int ch, flag, fifotaken; + int sysrq; + u16 status; for (fifotaken = 0; fifotaken != 256; fifotaken++) { status = pl011_read(uap, REG_FR); @@ -344,10 +345,12 @@ static int pl011_fifo_to_tty(struct uart_amba_port *uap) flag = TTY_FRAME; } - if (uart_handle_sysrq_char(&uap->port, ch & 255)) - continue; + spin_unlock(&uap->port.lock); + sysrq = uart_handle_sysrq_char(&uap->port, ch & 255); + spin_lock(&uap->port.lock); - uart_insert_char(&uap->port, ch, UART011_DR_OE, ch, flag); + if (!sysrq) + uart_insert_char(&uap->port, ch, UART011_DR_OE, ch, flag); } return fifotaken; -- 2.28.0.709.gb0816b6eb0-goog

4 years, 2 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror September 2020