September 2021 - Linux-stable-mirror

FAILED: patch "[PATCH] tracing: Resize tgid_map to pid_max, not PID_MAX_DEFAULT" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 4030a6e6a6a4a42ff8c18414c9e0c93e24cc70b8 Mon Sep 17 00:00:00 2001 From: Paul Burton <paulburton(a)google.com> Date: Thu, 1 Jul 2021 10:24:07 -0700 Subject: [PATCH] tracing: Resize tgid_map to pid_max, not PID_MAX_DEFAULT Currently tgid_map is sized at PID_MAX_DEFAULT entries, which means that on systems where pid_max is configured higher than PID_MAX_DEFAULT the ftrace record-tgid option doesn't work so well. Any tasks with PIDs higher than PID_MAX_DEFAULT are simply not recorded in tgid_map, and don't show up in the saved_tgids file. In particular since systemd v243 & above configure pid_max to its highest possible 1<<22 value by default on 64 bit systems this renders the record-tgids option of little use. Increase the size of tgid_map to the configured pid_max instead, allowing it to cover the full range of PIDs up to the maximum value of PID_MAX_LIMIT if the system is configured that way. On 64 bit systems with pid_max == PID_MAX_LIMIT this will increase the size of tgid_map from 256KiB to 16MiB. Whilst this 64x increase in memory overhead sounds significant 64 bit systems are presumably best placed to accommodate it, and since tgid_map is only allocated when the record-tgid option is actually used presumably the user would rather it spends sufficient memory to actually record the tgids they expect. The size of tgid_map could also increase for CONFIG_BASE_SMALL=y configurations, but these seem unlikely to be systems upon which people are both configuring a large pid_max and running ftrace with record-tgid anyway. Of note is that we only allocate tgid_map once, the first time that the record-tgid option is enabled. Therefore its size is only set once, to the value of pid_max at the time the record-tgid option is first enabled. If a user increases pid_max after that point, the saved_tgids file will not contain entries for any tasks with pids beyond the earlier value of pid_max. Link: https://lkml.kernel.org/r/20210701172407.889626-2-paulburton@google.com Fixes: d914ba37d714 ("tracing: Add support for recording tgid of tasks") Cc: Ingo Molnar <mingo(a)redhat.com> Cc: Joel Fernandes <joelaf(a)google.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Paul Burton <paulburton(a)google.com> [ Fixed comment coding style ] Signed-off-by: Steven Rostedt (VMware) <rostedt(a)goodmis.org> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 4843076d67d3..14f56e9fa001 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -2191,8 +2191,15 @@ void tracing_reset_all_online_cpus(void) } } +/* + * The tgid_map array maps from pid to tgid; i.e. the value stored at index i + * is the tgid last observed corresponding to pid=i. + */ static int *tgid_map; +/* The maximum valid index into tgid_map. */ +static size_t tgid_map_max; + #define SAVED_CMDLINES_DEFAULT 128 #define NO_CMDLINE_MAP UINT_MAX static arch_spinlock_t trace_cmdline_lock = __ARCH_SPIN_LOCK_UNLOCKED; @@ -2468,24 +2475,41 @@ void trace_find_cmdline(int pid, char comm[]) preempt_enable(); } +static int *trace_find_tgid_ptr(int pid) +{ + /* + * Pairs with the smp_store_release in set_tracer_flag() to ensure that + * if we observe a non-NULL tgid_map then we also observe the correct + * tgid_map_max. + */ + int *map = smp_load_acquire(&tgid_map); + + if (unlikely(!map || pid > tgid_map_max)) + return NULL; + + return &map[pid]; +} + int trace_find_tgid(int pid) { - if (unlikely(!tgid_map || !pid || pid > PID_MAX_DEFAULT)) - return 0; + int *ptr = trace_find_tgid_ptr(pid); - return tgid_map[pid]; + return ptr ? *ptr : 0; } static int trace_save_tgid(struct task_struct *tsk) { + int *ptr; + /* treat recording of idle task as a success */ if (!tsk->pid) return 1; - if (unlikely(!tgid_map || tsk->pid > PID_MAX_DEFAULT)) + ptr = trace_find_tgid_ptr(tsk->pid); + if (!ptr) return 0; - tgid_map[tsk->pid] = tsk->tgid; + *ptr = tsk->tgid; return 1; } @@ -5225,6 +5249,8 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set) int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled) { + int *map; + if ((mask == TRACE_ITER_RECORD_TGID) || (mask == TRACE_ITER_RECORD_CMD)) lockdep_assert_held(&event_mutex); @@ -5247,10 +5273,19 @@ int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled) trace_event_enable_cmd_record(enabled); if (mask == TRACE_ITER_RECORD_TGID) { - if (!tgid_map) - tgid_map = kvcalloc(PID_MAX_DEFAULT + 1, - sizeof(*tgid_map), - GFP_KERNEL); + if (!tgid_map) { + tgid_map_max = pid_max; + map = kvcalloc(tgid_map_max + 1, sizeof(*tgid_map), + GFP_KERNEL); + + /* + * Pairs with smp_load_acquire() in + * trace_find_tgid_ptr() to ensure that if it observes + * the tgid_map we just allocated then it also observes + * the corresponding tgid_map_max value. + */ + smp_store_release(&tgid_map, map); + } if (!tgid_map) { tr->trace_flags &= ~TRACE_ITER_RECORD_TGID; return -ENOMEM; @@ -5664,18 +5699,14 @@ static void *saved_tgids_next(struct seq_file *m, void *v, loff_t *pos) { int pid = ++(*pos); - if (pid > PID_MAX_DEFAULT) - return NULL; - - return &tgid_map[pid]; + return trace_find_tgid_ptr(pid); } static void *saved_tgids_start(struct seq_file *m, loff_t *pos) { - if (!tgid_map || *pos > PID_MAX_DEFAULT) - return NULL; + int pid = *pos; - return &tgid_map[*pos]; + return trace_find_tgid_ptr(pid); } static void saved_tgids_stop(struct seq_file *m, void *v)

2 years, 6 months

3
2
0 0

FAILED: patch "[PATCH] fuse: truncate pagecache on atomic_o_trunc" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 76224355db7570cbe6b6f75c8929a1558828dd55 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi <mszeredi(a)redhat.com> Date: Tue, 17 Aug 2021 21:05:16 +0200 Subject: [PATCH] fuse: truncate pagecache on atomic_o_trunc fuse_finish_open() will be called with FUSE_NOWRITE in case of atomic O_TRUNC. This can deadlock with fuse_wait_on_page_writeback() in fuse_launder_page() triggered by invalidate_inode_pages2(). Fix by replacing invalidate_inode_pages2() in fuse_finish_open() with a truncate_pagecache() call. This makes sense regardless of FOPEN_KEEP_CACHE or fc->writeback cache, so do it unconditionally. Reported-by: Xie Yongji <xieyongji(a)bytedance.com> Reported-and-tested-by: syzbot+bea44a5189836d956894(a)syzkaller.appspotmail.com Fixes: e4648309b85a ("fuse: truncate pending writes on O_TRUNC") Cc: <stable(a)vger.kernel.org> Signed-off-by: Miklos Szeredi <mszeredi(a)redhat.com> diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 97f860cfc195..5e5efb66c7d7 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -198,12 +198,11 @@ void fuse_finish_open(struct inode *inode, struct file *file) struct fuse_file *ff = file->private_data; struct fuse_conn *fc = get_fuse_conn(inode); - if (!(ff->open_flags & FOPEN_KEEP_CACHE)) - invalidate_inode_pages2(inode->i_mapping); if (ff->open_flags & FOPEN_STREAM) stream_open(inode, file); else if (ff->open_flags & FOPEN_NONSEEKABLE) nonseekable_open(inode, file); + if (fc->atomic_o_trunc && (file->f_flags & O_TRUNC)) { struct fuse_inode *fi = get_fuse_inode(inode); @@ -211,10 +210,14 @@ void fuse_finish_open(struct inode *inode, struct file *file) fi->attr_version = atomic64_inc_return(&fc->attr_version); i_size_write(inode, 0); spin_unlock(&fi->lock); + truncate_pagecache(inode, 0); fuse_invalidate_attr(inode); if (fc->writeback_cache) file_update_time(file); + } else if (!(ff->open_flags & FOPEN_KEEP_CACHE)) { + invalidate_inode_pages2(inode->i_mapping); } + if ((file->f_mode & FMODE_WRITE) && fc->writeback_cache) fuse_link_write_file(file); }

2 years, 6 months

3
2
0 0

[PATCH 5.13 000/151] 5.13.12-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.13.12 release. There are 151 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, 18 Aug 2021 12:54:12 +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.13.12-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.13.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.13.12-rc1 Kuan-Ying Lee <Kuan-Ying.Lee(a)mediatek.com> kasan, slub: reset tag when printing address Jeff Layton <jlayton(a)kernel.org> ceph: take snap_empty_lock atomically with snaprealm refcount change Jeff Layton <jlayton(a)kernel.org> ceph: clean up locking annotation for ceph_get_snap_realm and __lookup_snap_realm Jeff Layton <jlayton(a)kernel.org> ceph: add some lockdep assertions around snaprealm handling Sean Christopherson <seanjc(a)google.com> KVM: x86/mmu: Protect marking SPs unsync when using TDP MMU with spinlock Sean Christopherson <seanjc(a)google.com> KVM: x86/mmu: Don't leak non-leaf SPTEs when zapping all SPTEs Sean Christopherson <seanjc(a)google.com> KVM: nVMX: Use vmx_need_pf_intercept() when deciding if L0 wants a #PF Sean Christopherson <seanjc(a)google.com> KVM: VMX: Use current VMCS to query WAITPKG support for MSR emulation Zhen Lei <thunder.leizhen(a)huawei.com> locking/rtmutex: Use the correct rtmutex debugging config option Ard Biesheuvel <ardb(a)kernel.org> efi/libstub: arm64: Double check image alignment at entry Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/32: Fix critical and debug interrupts on BOOKE Cédric Le Goater <clg(a)kaod.org> powerpc/xive: Do not skip CPU-less nodes when creating the IPIs Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/smp: Fix OOPS in topology_init() Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/32s: Fix napping restore in data storage interrupt (DSI) Laurent Dufour <ldufour(a)linux.ibm.com> powerpc/pseries: Fix update of LPAR security flavor after LPM Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/interrupt: Do not call single_step_exception() from other exceptions Thomas Gleixner <tglx(a)linutronix.de> PCI/MSI: Protect msi_desc::masked for multi-MSI Thomas Gleixner <tglx(a)linutronix.de> PCI/MSI: Use msi_mask_irq() in pci_msi_shutdown() Thomas Gleixner <tglx(a)linutronix.de> PCI/MSI: Correct misleading comments Thomas Gleixner <tglx(a)linutronix.de> PCI/MSI: Do not set invalid bits in MSI mask Thomas Gleixner <tglx(a)linutronix.de> PCI/MSI: Enforce MSI[X] entry updates to be visible Thomas Gleixner <tglx(a)linutronix.de> PCI/MSI: Enforce that MSI-X table entry is masked for update Thomas Gleixner <tglx(a)linutronix.de> PCI/MSI: Mask all unused MSI-X entries Thomas Gleixner <tglx(a)linutronix.de> PCI/MSI: Enable and mask MSI-X early Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/interrupt: Fix OOPS by not calling do_IRQ() from timer_interrupt() Ben Dai <ben.dai(a)unisoc.com> genirq/timings: Prevent potential array overflow in __irq_timings_store() Bixuan Cui <cuibixuan(a)huawei.com> genirq/msi: Ensure deactivation on teardown Babu Moger <Babu.Moger(a)amd.com> x86/resctrl: Fix default monitoring groups reporting Thomas Gleixner <tglx(a)linutronix.de> x86/ioapic: Force affinity setup before startup Thomas Gleixner <tglx(a)linutronix.de> x86/msi: Force affinity setup before startup Thomas Gleixner <tglx(a)linutronix.de> genirq: Provide IRQCHIP_AFFINITY_PRE_STARTUP Randy Dunlap <rdunlap(a)infradead.org> x86/tools: Fix objdump version check again Dhananjay Phadke <dphadke(a)linux.microsoft.com> i2c: iproc: fix race between client unreg and tasklet Pu Lehui <pulehui(a)huawei.com> powerpc/kprobes: Fix kprobe Oops happens in booke Ard Biesheuvel <ardb(a)kernel.org> efi/libstub: arm64: Relax 2M alignment again for relocatable kernels Ard Biesheuvel <ardb(a)kernel.org> efi/libstub: arm64: Force Image reallocation if BSS was not reserved David Brazdil <dbrazdil(a)google.com> KVM: arm64: Fix off-by-one in range_is_memory Benjamin Herrenschmidt <benh(a)kernel.crashing.org> arm64: efi: kaslr: Fix occasional random alloc (and boot) failure Xie Yongji <xieyongji(a)bytedance.com> nbd: Aovid double completion of a request Longpeng(Mike) <longpeng2(a)huawei.com> vsock/virtio: avoid potential deadlock when vsock device remove Maximilian Heyne <mheyne(a)amazon.de> xen/events: Fix race in set_evtchn_to_irq Matt Roper <matthew.d.roper(a)intel.com> drm/i915: Only access SFC_DONE when media domain is not fused off Eric Dumazet <edumazet(a)google.com> net: igmp: increase size of mr_ifc_count Neal Cardwell <ncardwell(a)google.com> tcp_bbr: fix u32 wrap bug in round logic if bbr_init() called after 2B packets Willy Tarreau <w(a)1wt.eu> net: linkwatch: fix failure to restore device state across suspend/resume Yang Yingliang <yangyingliang(a)huawei.com> net: bridge: fix memleak in br_add_if() Nikolay Aleksandrov <nikolay(a)nvidia.com> net: bridge: fix flags interpretation for extern learn fdb entries Andre Przywara <andre.przywara(a)arm.com> pinctrl: sunxi: Don't underestimate number of functions Vladimir Oltean <vladimir.oltean(a)nxp.com> net: dsa: sja1105: fix broken backpressure in .port_fdb_dump Vladimir Oltean <vladimir.oltean(a)nxp.com> net: dsa: lantiq: fix broken backpressure in .port_fdb_dump Vladimir Oltean <vladimir.oltean(a)nxp.com> net: dsa: lan9303: fix broken backpressure in .port_fdb_dump Vladimir Oltean <vladimir.oltean(a)nxp.com> net: dsa: hellcreek: fix broken backpressure in .port_fdb_dump Eric Dumazet <edumazet(a)google.com> net: igmp: fix data-race in igmp_ifc_timer_expire() Takeshi Misawa <jeliantsurux(a)gmail.com> net: Fix memory leak in ieee802154_raw_deliver Ben Hutchings <ben.hutchings(a)mind.be> net: dsa: microchip: ksz8795: Don't use phy_port_cnt in VLAN table lookup Ben Hutchings <ben.hutchings(a)mind.be> net: dsa: microchip: ksz8795: Fix VLAN filtering Ben Hutchings <ben.hutchings(a)mind.be> net: dsa: microchip: ksz8795: Use software untagging on CPU port Ben Hutchings <ben.hutchings(a)mind.be> net: dsa: microchip: ksz8795: Fix VLAN untagged flag change on deletion Ben Hutchings <ben.hutchings(a)mind.be> net: dsa: microchip: ksz8795: Reject unsupported VLAN configuration Ben Hutchings <ben.hutchings(a)mind.be> net: dsa: microchip: ksz8795: Fix PVID tag insertion Ben Hutchings <ben.hutchings(a)mind.be> net: dsa: microchip: Fix ksz_read64() Yonghong Song <yhs(a)fb.com> bpf: Fix potentially incorrect results with bpf_get_local_storage() Miklos Szeredi <mszeredi(a)redhat.com> ovl: fix deadlock in splice write Christian Hewitt <christianshewitt(a)gmail.com> drm/meson: fix colour distortion from HDR set during vendor u-boot Aya Levin <ayal(a)nvidia.com> net/mlx5: Fix return value from tracer initialization Shay Drory <shayd(a)nvidia.com> net/mlx5: Synchronize correct IRQ when destroying CQ Chris Mi <cmi(a)nvidia.com> net/mlx5e: TC, Fix error handling memory leak Aya Levin <ayal(a)nvidia.com> net/mlx5: Block switchdev mode while devlink traps are active Maxim Mikityanskiy <maximmi(a)nvidia.com> net/mlx5e: Destroy page pool after XDP SQ to fix use-after-free Roi Dayan <roid(a)nvidia.com> net/mlx5e: Avoid creating tunnel headers for local route Alex Vesker <valex(a)nvidia.com> net/mlx5: DR, Add fail on error check on decap Leon Romanovsky <leon(a)kernel.org> net/mlx5: Don't skip subfunction cleanup in case of error in module init Hao Xu <haoxu(a)linux.alibaba.com> io-wq: fix IO_WORKER_F_FIXED issue in create_io_worker() Hao Xu <haoxu(a)linux.alibaba.com> io-wq: fix bug of creating io-wokers unconditionally Guillaume Nault <gnault(a)redhat.com> bareudp: Fix invalid read beyond skb's linear data Roi Dayan <roid(a)nvidia.com> psample: Add a fwd declaration for skbuff Md Fahad Iqbal Polash <md.fahad.iqbal.polash(a)intel.com> iavf: Set RSS LUT and key in reset handle path Brett Creeley <brett.creeley(a)intel.com> ice: don't remove netdev->dev_addr from uc sync list Anirudh Venkataramanan <anirudh.venkataramanan(a)intel.com> ice: Stop processing VF messages during teardown Anirudh Venkataramanan <anirudh.venkataramanan(a)intel.com> ice: Prevent probing virtual functions Hangbin Liu <liuhangbin(a)gmail.com> net: sched: act_mirred: Reset ct info when mirror/redirect skb Guvenc Gulce <guvenc(a)linux.ibm.com> net/smc: Correct smc link connection counter in case of smc client Karsten Graul <kgraul(a)linux.ibm.com> net/smc: fix wait on already cleared link Nadav Amit <namit(a)vmware.com> io_uring: clear TIF_NOTIFY_SIGNAL when running task work Pali Rohár <pali(a)kernel.org> ppp: Fix generating ifname when empty IFLA_IFNAME is specified Ben Hutchings <ben.hutchings(a)mind.be> net: phy: micrel: Fix link detection on ksz87xx switch" Oleksij Rempel <linux(a)rempel-privat.de> net: dsa: qca: ar9331: make proper initial port defaults Tatsuhiko Yasumatsu <th.yasumatsu(a)gmail.com> bpf: Fix integer overflow involving bucket_size Daniel Xu <dxu(a)dxuuu.xyz> libbpf: Do not close un-owned FD 0 on errors Robin Gögge <r.goegge(a)googlemail.com> libbpf: Fix probe for BPF_PROG_TYPE_CGROUP_SOCKOPT Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> drm/amd/pm: Fix a memory leak in an error handling path in 'vangogh_tables_init()' Kan Liang <kan.liang(a)linux.intel.com> perf/x86/intel: Apply mid ACK for small core Hans de Goede <hdegoede(a)redhat.com> platform/x86: pcengines-apuv2: Add missing terminating entries to gpio-lookup tables John Hubbard <jhubbard(a)nvidia.com> net: mvvp2: fix short frame size on s390 DENG Qingfang <dqfext(a)gmail.com> net: dsa: mt7530: add the missing RxUnicast MIB counter Richard Fitzgerald <rf(a)opensource.cirrus.com> ASoC: cs42l42: Fix mono playback Richard Fitzgerald <rf(a)opensource.cirrus.com> ASoC: cs42l42: Fix LRCLK frame start edge Richard Fitzgerald <rf(a)opensource.cirrus.com> ASoC: cs42l42: PLL must be running when changing MCLK_SRC_SEL Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> pinctrl: tigerlake: Fix GPIO mapping for newer version of software Yajun Deng <yajun.deng(a)linux.dev> netfilter: nf_conntrack_bridge: Fix memory leak when error Richard Fitzgerald <rf(a)opensource.cirrus.com> ASoC: cs42l42: Remove duplicate control for WNF filter frequency Richard Fitzgerald <rf(a)opensource.cirrus.com> ASoC: cs42l42: Fix inversion of ADC Notch Switch control Guennadi Liakhovetski <guennadi.liakhovetski(a)linux.intel.com> ASoC: SOF: Intel: hda-ipc: fix reply size checking Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> ASoC: SOF: Intel: Kconfig: fix SoundWire dependencies Tianjia Zhang <tianjia.zhang(a)linux.alibaba.com> selftests/sgx: Fix Q1 and Q2 calculation in sigstruct.c Mike Tipton <mdtipton(a)codeaurora.org> interconnect: qcom: icc-rpmh: Add BCMs to commit list in pre_aggregate Richard Fitzgerald <rf(a)opensource.cirrus.com> ASoC: cs42l42: Fix bclk calculation for mono Richard Fitzgerald <rf(a)opensource.cirrus.com> ASoC: cs42l42: Don't allow SND_SOC_DAIFMT_LEFT_J Richard Fitzgerald <rf(a)opensource.cirrus.com> ASoC: cs42l42: Correct definition of ADC Volume control Hsin-Yi Wang <hsinyi(a)chromium.org> pinctrl: mediatek: Fix fallback behavior for bias_set_combo jason-jh.lin <jason-jh.lin(a)mediatek.com> drm/mediatek: Fix cursor plane no update Dongliang Mu <mudongliangabcd(a)gmail.com> ieee802154: hwsim: fix GPF in hwsim_new_edge_nl Dongliang Mu <mudongliangabcd(a)gmail.com> ieee802154: hwsim: fix GPF in hwsim_set_edge_lqi Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu: handle VCN instances when harvesting (v2) Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu: don't enable baco on boco platforms in runpm Solomon Chiu <solomon.chiu(a)amd.com> drm/amdgpu: Add preferred mode in modeset when freesync video mode's enabled. Anson Jacob <Anson.Jacob(a)amd.com> drm/amd/display: use GFP_ATOMIC in amdgpu_dm_irq_schedule_work Eric Bernstein <eric.bernstein(a)amd.com> drm/amd/display: Remove invalid assert for ODM + MPC case Ankit Nautiyal <ankit.k.nautiyal(a)intel.com> drm/i915/display: Fix the 12 BPC bits for PIPE_MISC reg Zhenyu Wang <zhenyuw(a)linux.intel.com> drm/i915/gvt: Fix cached atomics setting for Windows VM Nathan Chancellor <nathan(a)kernel.org> vmlinux.lds.h: Handle clang's module.{c,d}tor sections Changbin Du <changbin.du(a)intel.com> riscv: kexec: do not add '-mno-relax' flag if compiler doesn't support it Dan Williams <dan.j.williams(a)intel.com> libnvdimm/region: Fix label activation vs errors Dan Williams <dan.j.williams(a)intel.com> ACPI: NFIT: Fix support for virtual SPA ranges Damien Le Moal <damien.lemoal(a)wdc.com> pinctrl: k210: Fix k210_fpioa_probe() Luis Henriques <lhenriques(a)suse.de> ceph: reduce contention in ceph_check_delayed_caps() Vineet Gupta <vgupta(a)synopsys.com> ARC: fp: set FPU_STATUS.FWE to enable FPU_STATUS update on context switch Grygorii Strashko <grygorii.strashko(a)ti.com> net: ethernet: ti: cpsw: fix min eth packet size for non-switch use-cases Loic Poulain <loic.poulain(a)linaro.org> net: wwan: mhi_wwan_ctrl: Fix possible deadlock Hsuan-Chi Kuo <hsuanchikuo(a)gmail.com> seccomp: Fix setting loaded filter count during TSYNC Tejun Heo <tj(a)kernel.org> cgroup: rstat: fix A-A deadlock on 32bit around u64_stats_sync Ewan D. Milne <emilne(a)redhat.com> scsi: lpfc: Move initialization of phba->poll_list earlier to avoid crash Pavel Begunkov <asml.silence(a)gmail.com> io_uring: fix ctx-exit io_rsrc_put_work() deadlock Jens Axboe <axboe(a)kernel.dk> io_uring: drop ctx->uring_lock before flushing work item Ronnie Sahlberg <lsahlber(a)redhat.com> cifs: use the correct max-length for dentry_path_raw() Rohith Surabattula <rohiths(a)microsoft.com> cifs: Call close synchronously during unlink/rename/lease break. Shyam Prasad N <sprasad(a)microsoft.com> cifs: create sd context must be a multiple of 8 Rohith Surabattula <rohiths(a)microsoft.com> cifs: Handle race conditions during rename Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> i2c: dev: zero out array used for i2c reads from userspace Takashi Iwai <tiwai(a)suse.de> ASoC: intel: atom: Fix reference to PCM buffer address Takashi Iwai <tiwai(a)suse.de> ASoC: kirkwood: Fix reference to PCM buffer address Mark Brown <broonie(a)kernel.org> ASoC: tlv320aic31xx: Fix jack detection after suspend Takashi Iwai <tiwai(a)suse.de> ASoC: uniphier: Fix reference to PCM buffer address Takashi Iwai <tiwai(a)suse.de> ASoC: xilinx: Fix reference to PCM buffer address Takashi Iwai <tiwai(a)suse.de> ASoC: amd: Fix reference to PCM buffer address Colin Ian King <colin.king(a)canonical.com> iio: adc: Fix incorrect exit of for-loop Chris Lesiak <chris.lesiak(a)licor.com> iio: humidity: hdc100x: Add margin to the conversion time Antti Keränen <detegr(a)rbx.email> iio: adis: set GPIO reset pin direction Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> iio: adc: ti-ads7950: Ensure CS is deasserted after reading channels Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Revert "usb: dwc3: gadget: Use list_replace_init() before traversing lists" Liang Wang <wangliang101(a)huawei.com> lib: use PFN_PHYS() in devmem_is_allowed() ------------- Diffstat: Documentation/virt/kvm/locking.rst | 8 +- Makefile | 4 +- arch/arc/kernel/fpu.c | 9 +- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 2 +- arch/powerpc/include/asm/interrupt.h | 3 + arch/powerpc/include/asm/irq.h | 2 +- arch/powerpc/include/asm/ptrace.h | 16 +++ arch/powerpc/kernel/asm-offsets.c | 31 +++-- arch/powerpc/kernel/head_book3s_32.S | 2 +- arch/powerpc/kernel/head_booke.h | 27 +---- arch/powerpc/kernel/irq.c | 7 +- arch/powerpc/kernel/kprobes.c | 3 +- arch/powerpc/kernel/sysfs.c | 2 +- arch/powerpc/kernel/time.c | 2 +- arch/powerpc/kernel/traps.c | 9 +- arch/powerpc/platforms/pseries/setup.c | 5 +- arch/powerpc/sysdev/xive/common.c | 35 ++++-- arch/riscv/kernel/Makefile | 2 +- arch/x86/events/intel/core.c | 23 ++-- arch/x86/events/perf_event.h | 15 +++ arch/x86/include/asm/kvm_host.h | 7 ++ arch/x86/kernel/apic/io_apic.c | 6 +- arch/x86/kernel/apic/msi.c | 11 +- arch/x86/kernel/cpu/resctrl/monitor.c | 27 +++-- arch/x86/kernel/hpet.c | 2 +- arch/x86/kvm/mmu/mmu.c | 28 +++++ arch/x86/kvm/mmu/tdp_mmu.c | 26 +++-- arch/x86/kvm/vmx/nested.c | 3 +- arch/x86/kvm/vmx/vmx.h | 2 +- arch/x86/tools/chkobjdump.awk | 1 + block/blk-cgroup.c | 14 ++- drivers/acpi/nfit/core.c | 3 + drivers/base/core.c | 1 + drivers/block/nbd.c | 14 ++- drivers/firmware/efi/libstub/arm64-stub.c | 69 ++++++++++-- drivers/firmware/efi/libstub/randomalloc.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 2 +- .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 1 - drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 2 +- drivers/gpu/drm/i915/display/intel_display.c | 34 ++++-- drivers/gpu/drm/i915/gvt/handlers.c | 1 + drivers/gpu/drm/i915/gvt/mmio_context.c | 2 + drivers/gpu/drm/i915/i915_gpu_error.c | 19 +++- drivers/gpu/drm/i915/i915_reg.h | 16 ++- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 3 - drivers/gpu/drm/mediatek/mtk_drm_plane.c | 60 +++++----- drivers/gpu/drm/meson/meson_registers.h | 5 + drivers/gpu/drm/meson/meson_viu.c | 7 +- drivers/i2c/busses/i2c-bcm-iproc.c | 4 +- drivers/i2c/i2c-dev.c | 5 +- drivers/iio/adc/palmas_gpadc.c | 4 +- drivers/iio/adc/ti-ads7950.c | 1 - drivers/iio/humidity/hdc100x.c | 6 +- drivers/iio/imu/adis.c | 3 +- drivers/infiniband/hw/mlx5/cq.c | 4 +- drivers/infiniband/hw/mlx5/devx.c | 3 +- drivers/interconnect/qcom/icc-rpmh.c | 10 +- drivers/net/bareudp.c | 16 ++- drivers/net/dsa/hirschmann/hellcreek.c | 7 +- drivers/net/dsa/lan9303-core.c | 34 +++--- drivers/net/dsa/lantiq_gswip.c | 14 ++- drivers/net/dsa/microchip/ksz8795.c | 82 +++++++++++--- drivers/net/dsa/microchip/ksz8795_reg.h | 4 + drivers/net/dsa/microchip/ksz_common.h | 9 +- drivers/net/dsa/mt7530.c | 1 + drivers/net/dsa/qca/ar9331.c | 73 +++++++++++- drivers/net/dsa/sja1105/sja1105_main.c | 4 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 13 ++- drivers/net/ethernet/intel/ice/ice.h | 1 + drivers/net/ethernet/intel/ice/ice_main.c | 28 +++-- drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 7 ++ drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/cq.c | 1 + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 11 +- .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 5 + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 33 ++---- drivers/net/ethernet/mellanox/mlx5/core/eq.c | 20 +++- .../net/ethernet/mellanox/mlx5/core/esw/sample.c | 1 + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 14 ++- .../net/ethernet/mellanox/mlx5/core/fpga/conn.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h | 2 + drivers/net/ethernet/mellanox/mlx5/core/main.c | 12 +- .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 5 + .../ethernet/mellanox/mlx5/core/steering/dr_send.c | 4 +- .../mellanox/mlx5/core/steering/dr_ste_v0.c | 2 + drivers/net/ethernet/ti/cpsw_new.c | 7 +- drivers/net/ethernet/ti/cpsw_priv.h | 4 +- drivers/net/ieee802154/mac802154_hwsim.c | 6 +- drivers/net/phy/micrel.c | 2 - drivers/net/ppp/ppp_generic.c | 2 +- drivers/net/wwan/mhi_wwan_ctrl.c | 12 +- drivers/nvdimm/namespace_devs.c | 17 ++- drivers/pci/msi.c | 125 +++++++++++++-------- drivers/pinctrl/intel/pinctrl-tigerlake.c | 26 ++--- drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 8 +- drivers/pinctrl/pinctrl-k210.c | 26 ++++- drivers/pinctrl/sunxi/pinctrl-sunxi.c | 8 +- drivers/platform/x86/pcengines-apuv2.c | 2 + drivers/scsi/lpfc/lpfc_init.c | 3 +- drivers/usb/dwc3/gadget.c | 18 +-- drivers/vdpa/mlx5/net/mlx5_vnet.c | 3 +- drivers/xen/events/events_base.c | 20 +++- fs/ceph/caps.c | 17 ++- fs/ceph/mds_client.c | 25 +++-- fs/ceph/snap.c | 54 +++++---- fs/ceph/super.h | 2 +- fs/cifs/cifsglob.h | 5 + fs/cifs/dir.c | 2 +- fs/cifs/file.c | 35 +++--- fs/cifs/inode.c | 19 +++- fs/cifs/misc.c | 50 +++++++-- fs/cifs/smb2pdu.c | 2 +- fs/io-wq.c | 26 +++-- fs/io_uring.c | 26 +++-- fs/overlayfs/file.c | 47 +++++++- include/asm-generic/vmlinux.lds.h | 1 + include/linux/bpf-cgroup.h | 4 +- include/linux/device.h | 1 + include/linux/inetdevice.h | 2 +- include/linux/irq.h | 2 + include/linux/mlx5/driver.h | 3 +- include/linux/msi.h | 2 +- include/net/psample.h | 2 + include/uapi/linux/neighbour.h | 7 +- kernel/bpf/hashtab.c | 4 +- kernel/bpf/helpers.c | 4 +- kernel/cgroup/rstat.c | 19 ++-- kernel/irq/chip.c | 5 +- kernel/irq/msi.c | 13 ++- kernel/irq/timings.c | 5 + kernel/locking/rtmutex.c | 2 +- kernel/seccomp.c | 2 +- lib/devmem_is_allowed.c | 2 +- mm/slub.c | 4 +- net/bridge/br.c | 3 +- net/bridge/br_fdb.c | 11 +- net/bridge/br_if.c | 2 + net/bridge/br_private.h | 2 +- net/bridge/netfilter/nf_conntrack_bridge.c | 6 + net/core/link_watch.c | 5 +- net/ieee802154/socket.c | 7 +- net/ipv4/igmp.c | 21 ++-- net/ipv4/tcp_bbr.c | 2 +- net/sched/act_mirred.c | 3 + net/smc/af_smc.c | 2 +- net/smc/smc_core.c | 4 +- net/smc/smc_core.h | 4 + net/smc/smc_llc.c | 10 +- net/smc/smc_tx.c | 18 ++- net/smc/smc_wr.c | 10 ++ net/vmw_vsock/virtio_transport.c | 7 +- sound/soc/amd/acp-pcm-dma.c | 2 +- sound/soc/amd/raven/acp3x-pcm-dma.c | 2 +- sound/soc/amd/renoir/acp3x-pdm-dma.c | 2 +- sound/soc/codecs/cs42l42.c | 83 ++++++++------ sound/soc/codecs/cs42l42.h | 3 + sound/soc/codecs/tlv320aic31xx.c | 10 ++ sound/soc/intel/atom/sst-mfld-platform-pcm.c | 3 +- sound/soc/kirkwood/kirkwood-dma.c | 26 +++-- sound/soc/sof/intel/Kconfig | 4 +- sound/soc/sof/intel/hda-ipc.c | 4 +- sound/soc/uniphier/aio-dma.c | 2 +- sound/soc/xilinx/xlnx_formatter_pcm.c | 4 +- tools/lib/bpf/btf.c | 3 +- tools/lib/bpf/libbpf_probes.c | 4 +- tools/testing/selftests/sgx/sigstruct.c | 41 +++---- 169 files changed, 1382 insertions(+), 656 deletions(-)

2 years, 6 months

4
156
0 0

[PATCH 2/4] drm/dp_mst: Only create connector for connected end device

by Wayne Lin

[Why] Currently, we will create connectors for all output ports no matter it's connected or not. However, in MST, we can only determine whether an output port really stands for a "connector" till it is connected and check its peer device type as an end device. In current code, we have chance to create connectors for output ports connected with branch device and these are redundant connectors. e.g. StarTech 1-to-4 DP hub is constructed by internal 2 layer 1-to-2 branch devices. Creating connectors for such internal output ports are redundant. [How] Put constraint on creating connector for connected end device only. Fixes: 6f85f73821f6 ("drm/dp_mst: Add basic topology reprobing when resuming") Cc: Juston Li <juston.li(a)intel.com> Cc: Imre Deak <imre.deak(a)intel.com> Cc: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Cc: Harry Wentland <hwentlan(a)amd.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: Sean Paul <sean(a)poorly.run> Cc: Lyude Paul <lyude(a)redhat.com> Cc: Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com> Cc: Maxime Ripard <mripard(a)kernel.org> Cc: Thomas Zimmermann <tzimmermann(a)suse.de> Cc: David Airlie <airlied(a)linux.ie> Cc: Daniel Vetter <daniel(a)ffwll.ch> Cc: Alex Deucher <alexander.deucher(a)amd.com> Cc: Nicholas Kazlauskas <nicholas.kazlauskas(a)amd.com> Cc: Rodrigo Siqueira <Rodrigo.Siqueira(a)amd.com> Cc: Aurabindo Pillai <aurabindo.pillai(a)amd.com> Cc: Eryk Brol <eryk.brol(a)amd.com> Cc: Bas Nieuwenhuizen <bas(a)basnieuwenhuizen.nl> Cc: Nikola Cornij <nikola.cornij(a)amd.com> Cc: Wayne Lin <Wayne.Lin(a)amd.com> Cc: "Ville Syrjälä" <ville.syrjala(a)linux.intel.com> Cc: Jani Nikula <jani.nikula(a)intel.com> Cc: Manasi Navare <manasi.d.navare(a)intel.com> Cc: Ankit Nautiyal <ankit.k.nautiyal(a)intel.com> Cc: "José Roberto de Souza" <jose.souza(a)intel.com> Cc: Sean Paul <seanpaul(a)chromium.org> Cc: Ben Skeggs <bskeggs(a)redhat.com> Cc: dri-devel(a)lists.freedesktop.org Cc: <stable(a)vger.kernel.org> # v5.5+ Signed-off-by: Wayne Lin <Wayne.Lin(a)amd.com> --- drivers/gpu/drm/drm_dp_mst_topology.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 51cd7f74f026..f13c7187b07f 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -2474,7 +2474,8 @@ drm_dp_mst_handle_link_address_port(struct drm_dp_mst_branch *mstb, if (port->connector) drm_modeset_unlock(&mgr->base.lock); - else if (!port->input) + else if (!port->input && port->pdt != DP_PEER_DEVICE_NONE && + drm_dp_mst_is_end_device(port->pdt, port->mcs)) drm_dp_mst_port_add_connector(mstb, port); if (send_link_addr && port->mstb) { @@ -2557,6 +2558,10 @@ drm_dp_mst_handle_conn_stat(struct drm_dp_mst_branch *mstb, dowork = false; } + if (!port->input && !port->connector && new_pdt != DP_PEER_DEVICE_NONE && + drm_dp_mst_is_end_device(new_pdt, new_mcs)) + create_connector = true; + if (port->connector) drm_modeset_unlock(&mgr->base.lock); else if (create_connector) -- 2.17.1

2 years, 7 months

3
21
0 0

[PATCH v2 01/12] kexec: Allow architecture code to opt-out at runtime

by Joerg Roedel

From: Joerg Roedel <jroedel(a)suse.de> Allow a runtime opt-out of kexec support for architecture code in case the kernel is running in an environment where kexec is not properly supported yet. This will be used on x86 when the kernel is running as an SEV-ES guest. SEV-ES guests need special handling for kexec to hand over all CPUs to the new kernel. This requires special hypervisor support and handling code in the guest which is not yet implemented. Cc: stable(a)vger.kernel.org # v5.10+ Signed-off-by: Joerg Roedel <jroedel(a)suse.de> --- include/linux/kexec.h | 1 + kernel/kexec.c | 14 ++++++++++++++ kernel/kexec_file.c | 9 +++++++++ 3 files changed, 24 insertions(+) diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 0c994ae37729..85c30dcd0bdc 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -201,6 +201,7 @@ int arch_kexec_kernel_verify_sig(struct kimage *image, void *buf, unsigned long buf_len); #endif int arch_kexec_locate_mem_hole(struct kexec_buf *kbuf); +bool arch_kexec_supported(void); extern int kexec_add_buffer(struct kexec_buf *kbuf); int kexec_locate_mem_hole(struct kexec_buf *kbuf); diff --git a/kernel/kexec.c b/kernel/kexec.c index b5e40f069768..275cda429380 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -190,11 +190,25 @@ static int do_kexec_load(unsigned long entry, unsigned long nr_segments, * that to happen you need to do that yourself. */ +bool __weak arch_kexec_supported(void) +{ + return true; +} + static inline int kexec_load_check(unsigned long nr_segments, unsigned long flags) { int result; + /* + * The architecture may support kexec in general, but the kernel could + * run in an environment where it is not (yet) possible to execute a new + * kernel. Allow the architecture code to opt-out of kexec support when + * it is running in such an environment. + */ + if (!arch_kexec_supported()) + return -ENOSYS; + /* We only trust the superuser with rebooting the system. */ if (!capable(CAP_SYS_BOOT) || kexec_load_disabled) return -EPERM; diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 33400ff051a8..96d08a512e9c 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -358,6 +358,15 @@ SYSCALL_DEFINE5(kexec_file_load, int, kernel_fd, int, initrd_fd, int ret = 0, i; struct kimage **dest_image, *image; + /* + * The architecture may support kexec in general, but the kernel could + * run in an environment where it is not (yet) possible to execute a new + * kernel. Allow the architecture code to opt-out of kexec support when + * it is running in such an environment. + */ + if (!arch_kexec_supported()) + return -ENOSYS; + /* We only trust the superuser with rebooting the system. */ if (!capable(CAP_SYS_BOOT) || kexec_load_disabled) return -EPERM; -- 2.33.0

2 years, 7 months

4
6
0 0

[PATCH v2] thermal: Fix a NULL pointer dereference

by Subbaraman Narayanamurthy

of_parse_thermal_zones() parses the thermal-zones node and registers a thermal_zone device for each subnode. However, if a thermal zone is consuming a thermal sensor and that thermal sensor device hasn't probed yet, an attempt to set trip_point_*_temp for that thermal zone device can cause a NULL pointer dereference. Fix it. console:/sys/class/thermal/thermal_zone87 # echo 120000 > trip_point_0_temp ... Unable to handle kernel NULL pointer dereference at virtual address 0000000000000020 ... Call trace: of_thermal_set_trip_temp+0x40/0xc4 trip_point_temp_store+0xc0/0x1dc dev_attr_store+0x38/0x88 sysfs_kf_write+0x64/0xc0 kernfs_fop_write_iter+0x108/0x1d0 vfs_write+0x2f4/0x368 ksys_write+0x7c/0xec __arm64_sys_write+0x20/0x30 el0_svc_common.llvm.7279915941325364641+0xbc/0x1bc do_el0_svc+0x28/0xa0 el0_svc+0x14/0x24 el0_sync_handler+0x88/0xec el0_sync+0x1c0/0x200 While at it, fix the possible NULL pointer dereference in other functions as well: of_thermal_get_temp(), of_thermal_set_emul_temp(), of_thermal_get_trend(). Cc: stable(a)vger.kernel.org Suggested-by: David Collins <quic_collinsd(a)quicinc.com> Signed-off-by: Subbaraman Narayanamurthy <quic_subbaram(a)quicinc.com> --- Changes for v2: - Added checks in of_thermal_get_temp(), of_thermal_set_emul_temp(), of_thermal_get_trend(). drivers/thermal/thermal_of.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c index 6379f26..9233f7e 100644 --- a/drivers/thermal/thermal_of.c +++ b/drivers/thermal/thermal_of.c @@ -89,7 +89,7 @@ static int of_thermal_get_temp(struct thermal_zone_device *tz, { struct __thermal_zone *data = tz->devdata; - if (!data->ops->get_temp) + if (!data->ops || !data->ops->get_temp) return -EINVAL; return data->ops->get_temp(data->sensor_data, temp); @@ -186,6 +186,9 @@ static int of_thermal_set_emul_temp(struct thermal_zone_device *tz, { struct __thermal_zone *data = tz->devdata; + if (!data->ops || !data->ops->set_emul_temp) + return -EINVAL; + return data->ops->set_emul_temp(data->sensor_data, temp); } @@ -194,7 +197,7 @@ static int of_thermal_get_trend(struct thermal_zone_device *tz, int trip, { struct __thermal_zone *data = tz->devdata; - if (!data->ops->get_trend) + if (!data->ops || !data->ops->get_trend) return -EINVAL; return data->ops->get_trend(data->sensor_data, trip, trend); @@ -301,7 +304,7 @@ static int of_thermal_set_trip_temp(struct thermal_zone_device *tz, int trip, if (trip >= data->ntrips || trip < 0) return -EDOM; - if (data->ops->set_trip_temp) { + if (data->ops && data->ops->set_trip_temp) { int ret; ret = data->ops->set_trip_temp(data->sensor_data, trip, temp); -- 2.7.4

2 years, 7 months

2
9
0 0

[PATCH v2 1/2] thermal: int340x: do not set a wrong tcc offset on resume

by Antoine Tenart

After upgrading to Linux 5.13.3 I noticed my laptop would shutdown due to overheat (when it should not). It turned out this was due to commit fe6a6de6692e ("thermal/drivers/int340x/processor_thermal: Fix tcc setting"). What happens is this drivers uses a global variable to keep track of the tcc offset (tcc_offset_save) and uses it on resume. The issue is this variable is initialized to 0, but is only set in tcc_offset_degree_celsius_store, i.e. when the tcc offset is explicitly set by userspace. If that does not happen, the resume path will set the offset to 0 (in my case the h/w default being 3, the offset would become too low after a suspend/resume cycle). The issue did not arise before commit fe6a6de6692e, as the function setting the offset would return if the offset was 0. This is no longer the case (rightfully). Fix this by not applying the offset if it wasn't saved before, reverting back to the old logic. A better approach will come later, but this will be easier to apply to stable kernels. The logic to restore the offset after a resume was there long before commit fe6a6de6692e, but as a value of 0 was considered invalid I'm referencing the commit that made the issue possible in the Fixes tag instead. Fixes: fe6a6de6692e ("thermal/drivers/int340x/processor_thermal: Fix tcc setting") Cc: stable(a)vger.kernel.org Cc: Srinivas Pandruvada <srinivas.pandruvada(a)linux.intel.com> Signed-off-by: Antoine Tenart <atenart(a)kernel.org> --- .../thermal/intel/int340x_thermal/processor_thermal_device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c index 0f0038af2ad4..fb64acfd5e07 100644 --- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c +++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c @@ -107,7 +107,7 @@ static int tcc_offset_update(unsigned int tcc) return 0; } -static unsigned int tcc_offset_save; +static int tcc_offset_save = -1; static ssize_t tcc_offset_degree_celsius_store(struct device *dev, struct device_attribute *attr, const char *buf, @@ -352,7 +352,8 @@ int proc_thermal_resume(struct device *dev) proc_dev = dev_get_drvdata(dev); proc_thermal_read_ppcc(proc_dev); - tcc_offset_update(tcc_offset_save); + if (tcc_offset_save >= 0) + tcc_offset_update(tcc_offset_save); return 0; } -- 2.31.1

2 years, 7 months

3
6
0 0

[PATCH v3 2/4] drm/rockchip: dsi: Reconfigure hardware on resume()

by Brian Norris

Since commit 43c2de1002d2, we perform most HW configuration in the bind() function. This configuration may be lost on suspend/resume, so we need to call it again. That may lead to errors like this after system suspend/resume: dw-mipi-dsi-rockchip ff968000.mipi: failed to write command FIFO panel-kingdisplay-kd097d04 ff960000.mipi.0: failed write init cmds: -110 Tested on Acer Chromebook Tab 10 (RK3399 Gru-Scarlet). Note that early mailing list versions of this driver borrowed Rockchip's downstream/BSP solution, to do HW configuration in mode_set() (which *is* called at the appropriate pre-enable() times), but that was discarded along the way. I've avoided that still, because mode_set() documentation doesn't suggest this kind of purpose as far as I can tell. Fixes: 43c2de1002d2 ("drm/rockchip: dsi: move all lane config except LCDC mux to bind()") Cc: <stable(a)vger.kernel.org> Signed-off-by: Brian Norris <briannorris(a)chromium.org> --- Changes in v3: - New patch, to fix related PM issue discovered after patch 1 .../gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c index 45676b23c019..21c67343cc6c 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c @@ -268,6 +268,8 @@ struct dw_mipi_dsi_rockchip { struct dw_mipi_dsi *dmd; const struct rockchip_dw_dsi_chip_data *cdata; struct dw_mipi_dsi_plat_data pdata; + + bool dsi_bound; }; struct dphy_pll_parameter_map { @@ -964,6 +966,8 @@ static int dw_mipi_dsi_rockchip_bind(struct device *dev, goto out_pm_runtime; } + dsi->dsi_bound = true; + return 0; out_pm_runtime: @@ -983,6 +987,8 @@ static void dw_mipi_dsi_rockchip_unbind(struct device *dev, if (dsi->is_slave) return; + dsi->dsi_bound = false; + dw_mipi_dsi_unbind(dsi->dmd); clk_disable_unprepare(dsi->pllref_clk); @@ -1277,6 +1283,36 @@ static const struct phy_ops dw_mipi_dsi_dphy_ops = { .exit = dw_mipi_dsi_dphy_exit, }; +static int __maybe_unused dw_mipi_dsi_rockchip_resume(struct device *dev) +{ + struct dw_mipi_dsi_rockchip *dsi = dev_get_drvdata(dev); + int ret; + + /* + * Re-configure DSI state, if we were previously initialized. We need + * to do this before rockchip_drm_drv tries to re-enable() any panels. + */ + if (dsi->dsi_bound) { + ret = clk_prepare_enable(dsi->grf_clk); + if (ret) { + DRM_DEV_ERROR(dsi->dev, "Failed to enable grf_clk: %d\n", ret); + return ret; + } + + dw_mipi_dsi_rockchip_config(dsi); + if (dsi->slave) + dw_mipi_dsi_rockchip_config(dsi->slave); + + clk_disable_unprepare(dsi->grf_clk); + } + + return 0; +} + +static const struct dev_pm_ops dw_mipi_dsi_rockchip_pm_ops = { + SET_LATE_SYSTEM_SLEEP_PM_OPS(NULL, dw_mipi_dsi_rockchip_resume) +}; + static int dw_mipi_dsi_rockchip_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -1594,6 +1630,7 @@ struct platform_driver dw_mipi_dsi_rockchip_driver = { .remove = dw_mipi_dsi_rockchip_remove, .driver = { .of_match_table = dw_mipi_dsi_rockchip_dt_ids, + .pm = &dw_mipi_dsi_rockchip_pm_ops, .name = "dw-mipi-dsi-rockchip", }, }; -- 2.33.0.685.g46640cef36-goog

2 years, 7 months

4
3
0 0

[PATCH 4/8] arm64: dts: imx8mm-kontron: Fix reg_rst_eth2 and reg_vdd_5v regulators

by Frieder Schrempf

From: Frieder Schrempf <frieder.schrempf(a)kontron.de> The regulator reg_vdd_5v represents the fixed 5V supply on the board which can't be switched off. Mark it as always-on. The regulator reg_rst_eth2 should keep the reset signal of the USB ethernet adapter deassertet anytime. Fix the polarity and mark it as always-on. Fixes: 21c4f45b335f ("arm64: dts: Add the Kontron i.MX8M Mini SoMs and baseboards") Cc: stable(a)vger.kernel.org Signed-off-by: Frieder Schrempf <frieder.schrempf(a)kontron.de> --- arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-s.dts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-s.dts b/arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-s.dts index 62ba3bd08a0c..f2c8ccefd1bf 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-s.dts +++ b/arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-s.dts @@ -70,7 +70,9 @@ reg_rst_eth2: regulator-rst-eth2 { regulator-name = "rst-usb-eth2"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb_eth2>; - gpio = <&gpio3 2 GPIO_ACTIVE_LOW>; + gpio = <&gpio3 2 GPIO_ACTIVE_HIGH>; + enable-active-high; + regulator-always-on; }; reg_vdd_5v: regulator-5v { @@ -78,6 +80,7 @@ reg_vdd_5v: regulator-5v { regulator-name = "vdd-5v"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; + regulator-always-on; }; }; -- 2.33.0

2 years, 7 months

3
4
0 0

[PATCH 1/8] mtd: rawnand: fsmc: Fix use of SM ORDER

by Miquel Raynal

The introduction of the generic ECC engine API lead to a number of changes in various drivers which broke some of them. Here is a typical example: I expected the SM_ORDER option to be handled by the Hamming ECC engine internals. Problem: the fsmc driver does not instantiate (yet) a real ECC engine object so we had to use a 'bare' ECC helper instead of the shiny rawnand functions. However, when not intializing this engine properly and using the bare helpers, we do not get the SM ORDER feature handled automatically. It looks like this was lost in the process so let's ensure we use the right SM ORDER now. Fixes: ad9ffdce4539 ("mtd: rawnand: fsmc: Fix external use of SW Hamming ECC helper") Cc: stable(a)vger.kernel.org Signed-off-by: Miquel Raynal <miquel.raynal(a)bootlin.com> --- drivers/mtd/nand/raw/fsmc_nand.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c index a3e66155ae40..658f0cbe7ce8 100644 --- a/drivers/mtd/nand/raw/fsmc_nand.c +++ b/drivers/mtd/nand/raw/fsmc_nand.c @@ -438,8 +438,10 @@ static int fsmc_correct_ecc1(struct nand_chip *chip, unsigned char *read_ecc, unsigned char *calc_ecc) { + bool sm_order = chip->ecc.options & NAND_ECC_SOFT_HAMMING_SM_ORDER; + return ecc_sw_hamming_correct(buf, read_ecc, calc_ecc, - chip->ecc.size, false); + chip->ecc.size, sm_order); } /* Count the number of 0's in buff upto a max of max_bits */ -- 2.27.0

2 years, 7 months

1
1
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror September 2021