October 2021 - Linux-stable-mirror

[PATCH] Bluetooth: btusb: Add support for TP-Link UB500 Adapter

by Marek Vasut

Hello everyone, The following new device USB ID has landed in linux-next recently: 4fd6d4907961 ("Bluetooth: btusb: Add support for TP-Link UB500 Adapter") It would be nice if it could be backported to stable. I verified it works on 5.14.y as a simple cherry-pick . Thank you

2 years, 5 months

3
8
0 0

[PATCH v2] mhi: pci_generic: Graceful shutdown on freeze

by Loic Poulain

There is no reason for shutting down MHI ungracefully on freeze, this causes the MHI host stack & device stack to not be aligned anymore since the proper MHI reset sequence is not performed for ungraceful shutdown. Cc: stable(a)vger.kernel.org Fixes: 5f0c2ee1fe8d ("bus: mhi: pci-generic: Fix hibernation") Suggested-by: Bhaumik Bhatt <bbhatt(a)codeaurora.org> Signed-off-by: Loic Poulain <loic.poulain(a)linaro.org> Reviewed-by: Bhaumik Bhatt <bbhatt(a)codeaurora.org> Reviewed-by: Hemant Kumar <hemantk(a)codeaurora.org> --- v2: Forgot to mention this change comes from a Bhaumik suggestion drivers/bus/mhi/pci_generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/mhi/pci_generic.c b/drivers/bus/mhi/pci_generic.c index 6a42425..d4a3ce2 100644 --- a/drivers/bus/mhi/pci_generic.c +++ b/drivers/bus/mhi/pci_generic.c @@ -1018,7 +1018,7 @@ static int __maybe_unused mhi_pci_freeze(struct device *dev) * context. */ if (test_and_clear_bit(MHI_PCI_DEV_STARTED, &mhi_pdev->status)) { - mhi_power_down(mhi_cntrl, false); + mhi_power_down(mhi_cntrl, true); mhi_unprepare_after_power_down(mhi_cntrl); } -- 2.7.4

2 years, 5 months

2
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, 5 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, 5 months

4
156
0 0

[PATCH v2 1/2] ARM: dts: exynos/i9100: Fix BCM4330 Bluetooth reset polarity

by Paul Cercueil

The reset GPIO was marked active-high, which is against what's specified in the documentation. Mark the reset GPIO as active-low. With this change, Bluetooth can now be used on the i9100. Fixes: 8620cc2f99b7 ("ARM: dts: exynos: Add devicetree file for the Galaxy S2") Cc: stable(a)vger.kernel.org Signed-off-by: Paul Cercueil <paul(a)crapouillou.net> --- arch/arm/boot/dts/exynos4210-i9100.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts index 55922176807e..5f5d9b135736 100644 --- a/arch/arm/boot/dts/exynos4210-i9100.dts +++ b/arch/arm/boot/dts/exynos4210-i9100.dts @@ -827,7 +827,7 @@ bluetooth { compatible = "brcm,bcm4330-bt"; shutdown-gpios = <&gpl0 4 GPIO_ACTIVE_HIGH>; - reset-gpios = <&gpl1 0 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpl1 0 GPIO_ACTIVE_LOW>; device-wakeup-gpios = <&gpx3 1 GPIO_ACTIVE_HIGH>; host-wakeup-gpios = <&gpx2 6 GPIO_ACTIVE_HIGH>; }; -- 2.33.0

2 years, 5 months

2
3
0 0

[PATCH] Input: iforce - fix control-message timeout

by Johan Hovold

USB control-message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ. Fixes: 487358627825 ("Input: iforce - use DMA-safe buffer when getting IDs from USB") Cc: stable(a)vger.kernel.org # 5.3 Signed-off-by: Johan Hovold <johan(a)kernel.org> --- drivers/input/joystick/iforce/iforce-usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c index 6c554c11a7ac..ea58805c480f 100644 --- a/drivers/input/joystick/iforce/iforce-usb.c +++ b/drivers/input/joystick/iforce/iforce-usb.c @@ -92,7 +92,7 @@ static int iforce_usb_get_id(struct iforce *iforce, u8 id, id, USB_TYPE_VENDOR | USB_DIR_IN | USB_RECIP_INTERFACE, - 0, 0, buf, IFORCE_MAX_LENGTH, HZ); + 0, 0, buf, IFORCE_MAX_LENGTH, 1000); if (status < 0) { dev_err(&iforce_usb->intf->dev, "usb_submit_urb failed: %d\n", status); -- 2.32.0

2 years, 5 months

2
1
0 0

[PATCH] ARM: drop cc-option fallbacks for architecture selection

by Arnd Bergmann

From: Arnd Bergmann <arnd(a)arndb.de> Naresh and Antonio ran into a build failure with latest Debian armhf compilers, with lots of output like tmp/ccY3nOAs.s:2215: Error: selected processor does not support `cpsid i' in ARM mode As it turns out, $(cc-option) fails early here when the FPU is not selected before CPU architecture is selected, as the compiler option check runs before enabling -msoft-float, which causes a problem when testing a target architecture level without an FPU: cc1: error: '-mfloat-abi=hard': selected architecture lacks an FPU Passing e.g. -march=armv6k+fp in place of -march=armv6k would avoid this issue, but the fallback logic is already broken because all supported compilers (gcc-5 and higher) are much more recent than these options, and building with -march=armv5t as a fallback no longer works. The best way forward that I see is to just remove all the checks, which also has the nice side-effect of slightly improving the startup time for 'make'. The -mtune=marvell-f option was apparently never supported by any mainline compiler, and the custom Codesourcery gcc build that did support is now too old to build kernels, so just use -mtune=xscale unconditionally for those. This should be safe to apply on all stable kernels, and will be required in order to keep building them with gcc-11 and higher. Reported-by: Antonio Terceiro <antonio.terceiro(a)linaro.org> Reported-by: Naresh Kamboju <naresh.kamboju(a)linaro.org> Reported-by: Sebastian Andrzej Siewior <sebastian(a)breakpoint.cc> Link: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=996419 Cc: Matthias Klose <doko(a)debian.org> Cc: stable(a)vger.kernel.org Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- arch/arm/Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 847c31e7c368..fa45837b8065 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -60,15 +60,15 @@ KBUILD_CFLAGS += $(call cc-option,-fno-ipa-sra) # Note that GCC does not numerically define an architecture version # macro, but instead defines a whole series of macros which makes # testing for a specific architecture or later rather impossible. -arch-$(CONFIG_CPU_32v7M) =-D__LINUX_ARM_ARCH__=7 -march=armv7-m -Wa,-march=armv7-m -arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a) -arch-$(CONFIG_CPU_32v6) =-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6) +arch-$(CONFIG_CPU_32v7M) =-D__LINUX_ARM_ARCH__=7 -march=armv7-m +arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 -march=armv7-a +arch-$(CONFIG_CPU_32v6) =-D__LINUX_ARM_ARCH__=6 -march=armv6 # Only override the compiler option if ARMv6. The ARMv6K extensions are # always available in ARMv7 ifeq ($(CONFIG_CPU_32v6),y) -arch-$(CONFIG_CPU_32v6K) =-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6k,-march=armv5t -Wa$(comma)-march=armv6k) +arch-$(CONFIG_CPU_32v6K) =-D__LINUX_ARM_ARCH__=6 -march=armv6k endif -arch-$(CONFIG_CPU_32v5) =-D__LINUX_ARM_ARCH__=5 $(call cc-option,-march=armv5te,-march=armv4t) +arch-$(CONFIG_CPU_32v5) =-D__LINUX_ARM_ARCH__=5 -march=armv5te arch-$(CONFIG_CPU_32v4T) =-D__LINUX_ARM_ARCH__=4 -march=armv4t arch-$(CONFIG_CPU_32v4) =-D__LINUX_ARM_ARCH__=4 -march=armv4 arch-$(CONFIG_CPU_32v3) =-D__LINUX_ARM_ARCH__=3 -march=armv3m @@ -82,7 +82,7 @@ tune-$(CONFIG_CPU_ARM720T) =-mtune=arm7tdmi tune-$(CONFIG_CPU_ARM740T) =-mtune=arm7tdmi tune-$(CONFIG_CPU_ARM9TDMI) =-mtune=arm9tdmi tune-$(CONFIG_CPU_ARM940T) =-mtune=arm9tdmi -tune-$(CONFIG_CPU_ARM946E) =$(call cc-option,-mtune=arm9e,-mtune=arm9tdmi) +tune-$(CONFIG_CPU_ARM946E) =-mtune=arm9e tune-$(CONFIG_CPU_ARM920T) =-mtune=arm9tdmi tune-$(CONFIG_CPU_ARM922T) =-mtune=arm9tdmi tune-$(CONFIG_CPU_ARM925T) =-mtune=arm9tdmi @@ -90,11 +90,11 @@ tune-$(CONFIG_CPU_ARM926T) =-mtune=arm9tdmi tune-$(CONFIG_CPU_FA526) =-mtune=arm9tdmi tune-$(CONFIG_CPU_SA110) =-mtune=strongarm110 tune-$(CONFIG_CPU_SA1100) =-mtune=strongarm1100 -tune-$(CONFIG_CPU_XSCALE) =$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale -tune-$(CONFIG_CPU_XSC3) =$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale -tune-$(CONFIG_CPU_FEROCEON) =$(call cc-option,-mtune=marvell-f,-mtune=xscale) -tune-$(CONFIG_CPU_V6) =$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) -tune-$(CONFIG_CPU_V6K) =$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) +tune-$(CONFIG_CPU_XSCALE) =-mtune=xscale +tune-$(CONFIG_CPU_XSC3) =-mtune=xscale +tune-$(CONFIG_CPU_FEROCEON) =-mtune=xscale +tune-$(CONFIG_CPU_V6) =-mtune=arm1136j-s +tune-$(CONFIG_CPU_V6K) =-mtune=arm1136j-s # Evaluate tune cc-option calls now tune-y := $(tune-y) -- 2.29.2

2 years, 5 months

5
6
0 0

[PATCH v2] pinctrl: ralink: include 'ralink_regs.h' in 'pinctrl-mt7620.c'

by Sergio Paracuellos

mt7620.h, included by pinctrl-mt7620.c, mentions MT762X_SOC_MT7628AN declared in ralink_regs.h. Fixes: 745ec436de72 ("pinctrl: ralink: move MT7620 SoC pinmux config into a new 'pinctrl-mt7620.c' file") Cc: stable(a)vger.kernel.org Cc: linus.walleij(a)linaro.org Signed-off-by: Luiz Angelo Daros de Luca <luizluca(a)gmail.com> Signed-off-by: Sergio Paracuellos <sergio.paracuellos(a)gmail.com> --- Changes in v2: - Original patch from Luiz. - I have added Fixes tag and CC Linus Walleij and stable and sent v2. drivers/pinctrl/ralink/pinctrl-mt7620.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/pinctrl/ralink/pinctrl-mt7620.c b/drivers/pinctrl/ralink/pinctrl-mt7620.c index 425d55a2ee19..6853b5b8b0fe 100644 --- a/drivers/pinctrl/ralink/pinctrl-mt7620.c +++ b/drivers/pinctrl/ralink/pinctrl-mt7620.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only +#include <asm/mach-ralink/ralink_regs.h> #include <asm/mach-ralink/mt7620.h> #include <linux/module.h> #include <linux/platform_device.h> -- 2.33.0

2 years, 5 months

3
4
0 0

[PATCH net-next 1/2] bnx2x: Utilize firmware 7.13.20.0

by Manish Chopra

Commit 0050dcf3e848 ("bnx2x: Add FW 7.13.20.0") added a new .bin firmware file to linux-firmware.git tree. This new firmware addresses few important issues and enhancements as mentioned below - - Support direct invalidation of FP HSI Ver per function ID, required for invalidating FP HSI Ver prior to each VF start, as there is no VF start - BRB hardware block parity error detection support for the driver - Fix the FCOE underrun flow - Fix PSOD during FCoE BFS over the NIC ports after preboot driver This patch incorporates this new firmware 7.13.20.0 in bnx2x driver. Signed-off-by: Manish Chopra <manishc(a)marvell.com> Signed-off-by: Shai Malin <smalin(a)marvell.com> Signed-off-by: Omkar Kulkarni <okulkarni(a)marvell.com> Signed-off-by: Ariel Elior <aelior(a)marvell.com> --- .../ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | 148 ++++++++++-------- .../net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 13 +- 2 files changed, 91 insertions(+), 70 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h index 3f8435208bf4..5ee46c4234fb 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h @@ -32,31 +32,34 @@ * IRO[142].m2) + ((sbId) * IRO[142].m3)) #define CSTORM_IGU_MODE_OFFSET (IRO[161].base) #define CSTORM_ISCSI_CQ_SIZE_OFFSET(pfId) \ - (IRO[324].base + ((pfId) * IRO[324].m1)) -#define CSTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \ (IRO[325].base + ((pfId) * IRO[325].m1)) +#define CSTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \ + (IRO[326].base + ((pfId) * IRO[326].m1)) #define CSTORM_ISCSI_EQ_CONS_OFFSET(pfId, iscsiEqId) \ - (IRO[317].base + ((pfId) * IRO[317].m1) + ((iscsiEqId) * IRO[317].m2)) + (IRO[318].base + ((pfId) * IRO[318].m1) + ((iscsiEqId) * IRO[318].m2)) #define CSTORM_ISCSI_EQ_NEXT_EQE_ADDR_OFFSET(pfId, iscsiEqId) \ - (IRO[319].base + ((pfId) * IRO[319].m1) + ((iscsiEqId) * IRO[319].m2)) + (IRO[320].base + ((pfId) * IRO[320].m1) + ((iscsiEqId) * IRO[320].m2)) #define CSTORM_ISCSI_EQ_NEXT_PAGE_ADDR_OFFSET(pfId, iscsiEqId) \ - (IRO[318].base + ((pfId) * IRO[318].m1) + ((iscsiEqId) * IRO[318].m2)) + (IRO[319].base + ((pfId) * IRO[319].m1) + ((iscsiEqId) * IRO[319].m2)) + #define CSTORM_ISCSI_EQ_NEXT_PAGE_ADDR_VALID_OFFSET(pfId, iscsiEqId) \ - (IRO[320].base + ((pfId) * IRO[320].m1) + ((iscsiEqId) * IRO[320].m2)) + (IRO[321].base + ((pfId) * IRO[321].m1) + ((iscsiEqId) * IRO[321].m2)) #define CSTORM_ISCSI_EQ_PROD_OFFSET(pfId, iscsiEqId) \ - (IRO[316].base + ((pfId) * IRO[316].m1) + ((iscsiEqId) * IRO[316].m2)) + (IRO[317].base + ((pfId) * IRO[317].m1) + ((iscsiEqId) * IRO[317].m2)) #define CSTORM_ISCSI_EQ_SB_INDEX_OFFSET(pfId, iscsiEqId) \ - (IRO[322].base + ((pfId) * IRO[322].m1) + ((iscsiEqId) * IRO[322].m2)) + (IRO[323].base + ((pfId) * IRO[323].m1) + ((iscsiEqId) * IRO[323].m2)) #define CSTORM_ISCSI_EQ_SB_NUM_OFFSET(pfId, iscsiEqId) \ - (IRO[321].base + ((pfId) * IRO[321].m1) + ((iscsiEqId) * IRO[321].m2)) + (IRO[322].base + ((pfId) * IRO[322].m1) + ((iscsiEqId) * IRO[322].m2)) + #define CSTORM_ISCSI_HQ_SIZE_OFFSET(pfId) \ - (IRO[323].base + ((pfId) * IRO[323].m1)) + (IRO[324].base + ((pfId) * IRO[324].m1)) #define CSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \ - (IRO[315].base + ((pfId) * IRO[315].m1)) + (IRO[316].base + ((pfId) * IRO[316].m1)) #define CSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \ - (IRO[314].base + ((pfId) * IRO[314].m1)) + (IRO[315].base + ((pfId) * IRO[315].m1)) #define CSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \ - (IRO[313].base + ((pfId) * IRO[313].m1)) + (IRO[314].base + ((pfId) * IRO[314].m1)) + #define CSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \ (IRO[155].base + ((funcId) * IRO[155].m1)) #define CSTORM_SP_STATUS_BLOCK_DATA_OFFSET(pfId) \ @@ -90,90 +93,92 @@ #define CSTORM_VF_TO_PF_OFFSET(funcId) \ (IRO[154].base + ((funcId) * IRO[154].m1)) #define TSTORM_APPROXIMATE_MATCH_MULTICAST_FILTERING_OFFSET(pfId) \ - (IRO[207].base + ((pfId) * IRO[207].m1)) + (IRO[208].base + ((pfId) * IRO[208].m1)) #define TSTORM_ASSERT_LIST_INDEX_OFFSET (IRO[102].base) #define TSTORM_ASSERT_LIST_OFFSET(assertListEntry) \ (IRO[101].base + ((assertListEntry) * IRO[101].m1)) #define TSTORM_FUNCTION_COMMON_CONFIG_OFFSET(pfId) \ - (IRO[205].base + ((pfId) * IRO[205].m1)) + (IRO[206].base + ((pfId) * IRO[206].m1)) #define TSTORM_FUNC_EN_OFFSET(funcId) \ (IRO[107].base + ((funcId) * IRO[107].m1)) #define TSTORM_ISCSI_ERROR_BITMAP_OFFSET(pfId) \ - (IRO[279].base + ((pfId) * IRO[279].m1)) -#define TSTORM_ISCSI_L2_ISCSI_OOO_CID_TABLE_OFFSET(pfId) \ (IRO[280].base + ((pfId) * IRO[280].m1)) -#define TSTORM_ISCSI_L2_ISCSI_OOO_CLIENT_ID_TABLE_OFFSET(pfId) \ +#define TSTORM_ISCSI_L2_ISCSI_OOO_CID_TABLE_OFFSET(pfId) \ (IRO[281].base + ((pfId) * IRO[281].m1)) -#define TSTORM_ISCSI_L2_ISCSI_OOO_PROD_OFFSET(pfId) \ +#define TSTORM_ISCSI_L2_ISCSI_OOO_CLIENT_ID_TABLE_OFFSET(pfId) \ (IRO[282].base + ((pfId) * IRO[282].m1)) +#define TSTORM_ISCSI_L2_ISCSI_OOO_PROD_OFFSET(pfId) \ + (IRO[283].base + ((pfId) * IRO[283].m1)) #define TSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \ - (IRO[278].base + ((pfId) * IRO[278].m1)) + (IRO[279].base + ((pfId) * IRO[279].m1)) #define TSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \ - (IRO[277].base + ((pfId) * IRO[277].m1)) + (IRO[278].base + ((pfId) * IRO[278].m1)) #define TSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \ - (IRO[276].base + ((pfId) * IRO[276].m1)) + (IRO[277].base + ((pfId) * IRO[277].m1)) #define TSTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \ - (IRO[275].base + ((pfId) * IRO[275].m1)) + (IRO[276].base + ((pfId) * IRO[276].m1)) + #define TSTORM_ISCSI_TCP_LOCAL_ADV_WND_OFFSET(pfId) \ - (IRO[285].base + ((pfId) * IRO[285].m1)) + (IRO[286].base + ((pfId) * IRO[286].m1)) #define TSTORM_ISCSI_TCP_VARS_FLAGS_OFFSET(pfId) \ - (IRO[271].base + ((pfId) * IRO[271].m1)) -#define TSTORM_ISCSI_TCP_VARS_LSB_LOCAL_MAC_ADDR_OFFSET(pfId) \ (IRO[272].base + ((pfId) * IRO[272].m1)) -#define TSTORM_ISCSI_TCP_VARS_MID_LOCAL_MAC_ADDR_OFFSET(pfId) \ +#define TSTORM_ISCSI_TCP_VARS_LSB_LOCAL_MAC_ADDR_OFFSET(pfId) \ (IRO[273].base + ((pfId) * IRO[273].m1)) -#define TSTORM_ISCSI_TCP_VARS_MSB_LOCAL_MAC_ADDR_OFFSET(pfId) \ +#define TSTORM_ISCSI_TCP_VARS_MID_LOCAL_MAC_ADDR_OFFSET(pfId) \ (IRO[274].base + ((pfId) * IRO[274].m1)) +#define TSTORM_ISCSI_TCP_VARS_MSB_LOCAL_MAC_ADDR_OFFSET(pfId) \ + (IRO[275].base + ((pfId) * IRO[275].m1)) #define TSTORM_MAC_FILTER_CONFIG_OFFSET(pfId) \ - (IRO[206].base + ((pfId) * IRO[206].m1)) + (IRO[207].base + ((pfId) * IRO[207].m1)) #define TSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \ (IRO[109].base + ((funcId) * IRO[109].m1)) #define TSTORM_TCP_MAX_CWND_OFFSET(pfId) \ - (IRO[224].base + ((pfId) * IRO[224].m1)) + (IRO[225].base + ((pfId) * IRO[225].m1)) #define TSTORM_VF_TO_PF_OFFSET(funcId) \ (IRO[108].base + ((funcId) * IRO[108].m1)) -#define USTORM_AGG_DATA_OFFSET (IRO[213].base) -#define USTORM_AGG_DATA_SIZE (IRO[213].size) +#define USTORM_AGG_DATA_OFFSET (IRO[214].base) +#define USTORM_AGG_DATA_SIZE (IRO[214].size) #define USTORM_ASSERT_LIST_INDEX_OFFSET (IRO[181].base) #define USTORM_ASSERT_LIST_OFFSET(assertListEntry) \ (IRO[180].base + ((assertListEntry) * IRO[180].m1)) #define USTORM_ETH_PAUSE_ENABLED_OFFSET(portId) \ (IRO[187].base + ((portId) * IRO[187].m1)) #define USTORM_FCOE_EQ_PROD_OFFSET(pfId) \ - (IRO[326].base + ((pfId) * IRO[326].m1)) + (IRO[327].base + ((pfId) * IRO[327].m1)) #define USTORM_FUNC_EN_OFFSET(funcId) \ (IRO[182].base + ((funcId) * IRO[182].m1)) #define USTORM_ISCSI_CQ_SIZE_OFFSET(pfId) \ - (IRO[290].base + ((pfId) * IRO[290].m1)) -#define USTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \ (IRO[291].base + ((pfId) * IRO[291].m1)) +#define USTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \ + (IRO[292].base + ((pfId) * IRO[292].m1)) #define USTORM_ISCSI_ERROR_BITMAP_OFFSET(pfId) \ - (IRO[295].base + ((pfId) * IRO[295].m1)) + (IRO[296].base + ((pfId) * IRO[296].m1)) #define USTORM_ISCSI_GLOBAL_BUF_PHYS_ADDR_OFFSET(pfId) \ - (IRO[292].base + ((pfId) * IRO[292].m1)) + (IRO[293].base + ((pfId) * IRO[293].m1)) #define USTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \ - (IRO[288].base + ((pfId) * IRO[288].m1)) + (IRO[289].base + ((pfId) * IRO[289].m1)) #define USTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \ - (IRO[287].base + ((pfId) * IRO[287].m1)) + (IRO[288].base + ((pfId) * IRO[288].m1)) #define USTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \ - (IRO[286].base + ((pfId) * IRO[286].m1)) + (IRO[287].base + ((pfId) * IRO[287].m1)) + #define USTORM_ISCSI_R2TQ_SIZE_OFFSET(pfId) \ - (IRO[289].base + ((pfId) * IRO[289].m1)) + (IRO[290].base + ((pfId) * IRO[290].m1)) #define USTORM_ISCSI_RQ_BUFFER_SIZE_OFFSET(pfId) \ - (IRO[293].base + ((pfId) * IRO[293].m1)) -#define USTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \ (IRO[294].base + ((pfId) * IRO[294].m1)) +#define USTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \ + (IRO[295].base + ((pfId) * IRO[295].m1)) #define USTORM_MEM_WORKAROUND_ADDRESS_OFFSET(pfId) \ (IRO[186].base + ((pfId) * IRO[186].m1)) #define USTORM_RECORD_SLOW_PATH_OFFSET(funcId) \ (IRO[184].base + ((funcId) * IRO[184].m1)) #define USTORM_RX_PRODS_E1X_OFFSET(portId, clientId) \ - (IRO[216].base + ((portId) * IRO[216].m1) + ((clientId) * \ - IRO[216].m2)) + (IRO[217].base + ((portId) * IRO[217].m1) + ((clientId) * \ + IRO[217].m2)) #define USTORM_RX_PRODS_E2_OFFSET(qzoneId) \ - (IRO[217].base + ((qzoneId) * IRO[217].m1)) -#define USTORM_TPA_BTR_OFFSET (IRO[214].base) -#define USTORM_TPA_BTR_SIZE (IRO[214].size) + (IRO[218].base + ((qzoneId) * IRO[218].m1)) +#define USTORM_TPA_BTR_OFFSET (IRO[215].base) +#define USTORM_TPA_BTR_SIZE (IRO[215].size) #define USTORM_VF_TO_PF_OFFSET(funcId) \ (IRO[183].base + ((funcId) * IRO[183].m1)) #define XSTORM_AGG_INT_FINAL_CLEANUP_COMP_TYPE (IRO[67].base) @@ -183,44 +188,49 @@ (IRO[50].base + ((assertListEntry) * IRO[50].m1)) #define XSTORM_CMNG_PER_PORT_VARS_OFFSET(portId) \ (IRO[43].base + ((portId) * IRO[43].m1)) +#define XSTORM_ETH_FUNCTION_INFO_FP_HSI_VALID_E2_OFFSET(functionId) \ + (IRO[205].base + ((functionId) * IRO[205].m1)) #define XSTORM_FAIRNESS_PER_VN_VARS_OFFSET(pfId) \ (IRO[45].base + ((pfId) * IRO[45].m1)) #define XSTORM_FUNC_EN_OFFSET(funcId) \ (IRO[47].base + ((funcId) * IRO[47].m1)) #define XSTORM_ISCSI_HQ_SIZE_OFFSET(pfId) \ - (IRO[303].base + ((pfId) * IRO[303].m1)) + (IRO[304].base + ((pfId) * IRO[304].m1)) #define XSTORM_ISCSI_LOCAL_MAC_ADDR0_OFFSET(pfId) \ - (IRO[306].base + ((pfId) * IRO[306].m1)) -#define XSTORM_ISCSI_LOCAL_MAC_ADDR1_OFFSET(pfId) \ (IRO[307].base + ((pfId) * IRO[307].m1)) -#define XSTORM_ISCSI_LOCAL_MAC_ADDR2_OFFSET(pfId) \ +#define XSTORM_ISCSI_LOCAL_MAC_ADDR1_OFFSET(pfId) \ (IRO[308].base + ((pfId) * IRO[308].m1)) -#define XSTORM_ISCSI_LOCAL_MAC_ADDR3_OFFSET(pfId) \ +#define XSTORM_ISCSI_LOCAL_MAC_ADDR2_OFFSET(pfId) \ (IRO[309].base + ((pfId) * IRO[309].m1)) -#define XSTORM_ISCSI_LOCAL_MAC_ADDR4_OFFSET(pfId) \ +#define XSTORM_ISCSI_LOCAL_MAC_ADDR3_OFFSET(pfId) \ (IRO[310].base + ((pfId) * IRO[310].m1)) -#define XSTORM_ISCSI_LOCAL_MAC_ADDR5_OFFSET(pfId) \ +#define XSTORM_ISCSI_LOCAL_MAC_ADDR4_OFFSET(pfId) \ (IRO[311].base + ((pfId) * IRO[311].m1)) -#define XSTORM_ISCSI_LOCAL_VLAN_OFFSET(pfId) \ +#define XSTORM_ISCSI_LOCAL_MAC_ADDR5_OFFSET(pfId) \ (IRO[312].base + ((pfId) * IRO[312].m1)) +#define XSTORM_ISCSI_LOCAL_VLAN_OFFSET(pfId) \ + (IRO[313].base + ((pfId) * IRO[313].m1)) #define XSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \ - (IRO[302].base + ((pfId) * IRO[302].m1)) + (IRO[303].base + ((pfId) * IRO[303].m1)) #define XSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \ - (IRO[301].base + ((pfId) * IRO[301].m1)) + (IRO[302].base + ((pfId) * IRO[302].m1)) #define XSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \ - (IRO[300].base + ((pfId) * IRO[300].m1)) + (IRO[301].base + ((pfId) * IRO[301].m1)) + #define XSTORM_ISCSI_R2TQ_SIZE_OFFSET(pfId) \ - (IRO[305].base + ((pfId) * IRO[305].m1)) + (IRO[306].base + ((pfId) * IRO[306].m1)) #define XSTORM_ISCSI_SQ_SIZE_OFFSET(pfId) \ - (IRO[304].base + ((pfId) * IRO[304].m1)) + (IRO[305].base + ((pfId) * IRO[305].m1)) + #define XSTORM_ISCSI_TCP_VARS_ADV_WND_SCL_OFFSET(pfId) \ - (IRO[299].base + ((pfId) * IRO[299].m1)) + (IRO[300].base + ((pfId) * IRO[300].m1)) #define XSTORM_ISCSI_TCP_VARS_FLAGS_OFFSET(pfId) \ - (IRO[298].base + ((pfId) * IRO[298].m1)) + (IRO[299].base + ((pfId) * IRO[299].m1)) #define XSTORM_ISCSI_TCP_VARS_TOS_OFFSET(pfId) \ - (IRO[297].base + ((pfId) * IRO[297].m1)) + (IRO[298].base + ((pfId) * IRO[298].m1)) #define XSTORM_ISCSI_TCP_VARS_TTL_OFFSET(pfId) \ - (IRO[296].base + ((pfId) * IRO[296].m1)) + (IRO[297].base + ((pfId) * IRO[297].m1)) + #define XSTORM_RATE_SHAPING_PER_VN_VARS_OFFSET(pfId) \ (IRO[44].base + ((pfId) * IRO[44].m1)) #define XSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \ @@ -233,12 +243,12 @@ #define XSTORM_SPQ_PROD_OFFSET(funcId) \ (IRO[31].base + ((funcId) * IRO[31].m1)) #define XSTORM_TCP_GLOBAL_DEL_ACK_COUNTER_ENABLED_OFFSET(portId) \ - (IRO[218].base + ((portId) * IRO[218].m1)) -#define XSTORM_TCP_GLOBAL_DEL_ACK_COUNTER_MAX_COUNT_OFFSET(portId) \ (IRO[219].base + ((portId) * IRO[219].m1)) +#define XSTORM_TCP_GLOBAL_DEL_ACK_COUNTER_MAX_COUNT_OFFSET(portId) \ + (IRO[220].base + ((portId) * IRO[220].m1)) #define XSTORM_TCP_TX_SWS_TIMER_VAL_OFFSET(pfId) \ - (IRO[221].base + (((pfId)>>1) * IRO[221].m1) + (((pfId)&1) * \ - IRO[221].m2)) + (IRO[222].base + (((pfId) >> 1) * IRO[222].m1) + (((pfId) & 1) * \ + IRO[222].m2)) #define XSTORM_VF_TO_PF_OFFSET(funcId) \ (IRO[48].base + ((funcId) * IRO[48].m1)) #define COMMON_ASM_INVALID_ASSERT_OPCODE 0x0 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h index 622fadc50316..bcc3fefca7ab 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h @@ -2393,6 +2393,17 @@ struct shmem2_region { /* mini dump driver info */ struct mdump_driver_info drv_info; /* 0x218 */ + + /* written by mfw, read by driver, eg. feature capability support */ + u32 mfw_flags; /* 0x22c */ + #define DISABLE_EMBEDDED_LLDP_SUPPORT 0x00000001 + /* DEBUG DATA (EDDC) is enabled */ + #define DEBUG_DATA_SUPPORT 0x00000002 + + /* Internal mask similar to the drv_status in the drv_mb + * which used by MFW to sync message + */ + u32 drv_status_do_not_ack[E2_FUNC_MAX]; /* 0x230 */ }; @@ -3024,7 +3035,7 @@ struct afex_stats { #define BCM_5710_FW_MAJOR_VERSION 7 #define BCM_5710_FW_MINOR_VERSION 13 -#define BCM_5710_FW_REVISION_VERSION 15 +#define BCM_5710_FW_REVISION_VERSION 20 #define BCM_5710_FW_ENGINEERING_VERSION 0 #define BCM_5710_FW_COMPILE_FLAGS 1 -- 2.27.0

2 years, 5 months

5
15
0 0

[PATCH 0/2] shm: shm_rmid_forced feature fixes

by Alexander Mikhalitsyn

A long story behind all of that... Some time ago I met kernel crash after CRIU restore procedure, fortunately, it was CRIU restore, so, I had dump files and could do restore many times and crash reproduced easily. After some investigation I've constructed the minimal reproducer. It was found that it's use-after-free and it happens only if sysctl kernel.shm_rmid_forced = 1. The key of the problem is that the exit_shm() function not handles shp's object destroy when task->sysvshm.shm_clist contains items from different IPC namespaces. In most cases this list will contain only items from one IPC namespace. Why this list may contain object from different namespaces? Function exit_shm() designed to clean up this list always when process leaves IPC namespace. But we made a mistake a long time ago and not add exit_shm() call into setns() syscall procedures. 1st second idea was just to add this call to setns() syscall but it's obviously changes semantics of setns() syscall and that's userspace-visible change. So, I gave up this idea. First real attempt to address the issue was just to omit forced destroy if we meet shp object not from current task IPC namespace [1]. But that was not the best idea because task->sysvshm.shm_clist was protected by rwsem which belongs to current task IPC namespace. It means that list corruption may occur. Second approach is just extend exit_shm() to properly handle shp's from different IPC namespaces [2]. This is really non-trivial thing, I've put a lot of effort into that but not believed that it's possible to make it fully safe, clean and clear. Thanks to the efforts of Manfred Spraul working and elegant solution was designed. Thanks a lot, Manfred! Eric also suggested the way to address the issue in ("[RFC][PATCH] shm: In shm_exit destroy all created and never attached segments") Eric's idea was to maintain a list of shm_clists one per IPC namespace, use lock-less lists. But there is some extra memory consumption-related concerns. Alternative solution which was suggested by me was implemented in ("shm: reset shm_clist on setns but omit forced shm destroy") Idea is pretty simple, we add exit_shm() syscall to setns() but DO NOT destroy shm segments even if sysctl kernel.shm_rmid_forced = 1, we just clean up the task->sysvshm.shm_clist list. This chages semantics of setns() syscall a little bit but in comparision to "naive" solution when we just add exit_shm() without any special exclusions this looks like a safer option. [1] https://lkml.org/lkml/2021/7/6/1108 [2] https://lkml.org/lkml/2021/7/14/736 Cc: "Eric W. Biederman" <ebiederm(a)xmission.com> Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: Davidlohr Bueso <dave(a)stgolabs.net> Cc: Greg KH <gregkh(a)linuxfoundation.org> Cc: Andrei Vagin <avagin(a)gmail.com> Cc: Pavel Tikhomirov <ptikhomirov(a)virtuozzo.com> Cc: Vasily Averin <vvs(a)virtuozzo.com> Cc: Manfred Spraul <manfred(a)colorfullife.com> Cc: Alexander Mikhalitsyn <alexander(a)mihalicyn.com> Cc: stable(a)vger.kernel.org Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn(a)virtuozzo.com> Alexander Mikhalitsyn (2): ipc: WARN if trying to remove ipc object which is absent shm: extend forced shm destroy to support objects from several IPC nses include/linux/ipc_namespace.h | 15 +++ include/linux/sched/task.h | 2 +- include/linux/shm.h | 2 +- ipc/shm.c | 170 +++++++++++++++++++++++++--------- ipc/util.c | 6 +- 5 files changed, 145 insertions(+), 50 deletions(-) -- 2.31.1

2 years, 5 months

3
11
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror October 2021