5.15.108-rc1 review
Subsystems (8)
Greg Kroah-Hartman
maintainerPATCH 1/91 Revert "pinctrl: amd: Disable and mask interrupts on resume"
In reply to Greg Kroah-HartmanFrom: Kornel Dulęba <[email protected]>
commit 534e465845ebfb4a97eb5459d3931a0b35e3b9a5 upstream.
This reverts commit b26cd9325be4c1fcd331b77f10acb627c560d4d7.
This patch introduces a regression on Lenovo Z13, which can't wake from the lid with it applied; and some unspecified AMD based Dell platforms are unable to wake from hitting the power button
--- drivers/pinctrl/pinctrl-amd.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-)
drivers/pinctrl/pinctrl-amd.c +16 -20
@@ -863,34 +863,32 @@ static const struct pinconf_ops amd_pinc .pin_config_group_set = amd_pinconf_group_set, }; -static void amd_gpio_irq_init_pin (struct amd_gpio *gpio_dev,int pin) +static void amd_gpio_irq_init (struct amd_gpio *gpio_dev) { -const struct pin_desc *pd; +struct pinctrl_desc *desc = gpio_dev->pctrl->desc;unsigned long flags;u32 pin_reg, mask; +int i; mask =BIT (WAKE_CNTRL_OFF_S0I3 ) |BIT (WAKE_CNTRL_OFF_S3 ) |BIT (INTERRUPT_MASK_OFF ) |BIT (INTERRUPT_ENABLE_OFF ) |BIT (WAKE_CNTRL_OFF_S4 ); - pd =pin_desc_get (gpio_dev->pctrl, pin); -if (!pd) -return ; +for (i =0 ; i < desc->npins; i++) { +int pin = desc->pins[i].number; +const struct pin_desc *pd =pin_desc_get (gpio_dev->pctrl, pin); -raw_spin_lock_irqsave (&gpio_dev->lock, flags); - pin_reg =readl (gpio_dev->base + pin *4 ); - pin_reg &= ~mask; -writel (pin_reg, gpio_dev->base + pin *4 ); -raw_spin_unlock_irqrestore (&gpio_dev->lock, flags); -} +if (!pd) +continue ; -static void amd_gpio_irq_init (struct amd_gpio *gpio_dev) -{ -struct pinctrl_desc *desc = gpio_dev->pctrl->desc; -int i; +raw_spin_lock_irqsave (&gpio_dev->lock, flags); -for (i =0 ; i < desc->npins; i++) -amd_gpio_irq_init_pin (gpio_dev, i); + pin_reg =readl (gpio_dev->base + i *4 ); + pin_reg &= ~mask; +writel (pin_reg, gpio_dev->base + i *4 ); + +raw_spin_unlock_irqrestore (&gpio_dev->lock, flags); + } }#ifdef CONFIG_PM_SLEEP
@@ -943,10 +941,8 @@ static int amd_gpio_resume(struct devicefor (i =0 ; i < desc->npins; i++) {int pin = desc->pins[i].number; -if (!amd_gpio_should_save (gpio_dev, pin)) { -amd_gpio_irq_init_pin (gpio_dev, pin); +if (!amd_gpio_should_save (gpio_dev, pin))continue ; - }raw_spin_lock_irqsave (&gpio_dev->lock, flags); gpio_dev->saved_regs[i] |=readl (gpio_dev->base + pin *4 ) &PIN_IRQ_PENDING ;
Greg Kroah-Hartman
maintainerPATCH 2/91 ALSA: emu10k1: fix capture interrupt handler unlinking
In reply to Greg Kroah-HartmanFrom: Oswald Buddenhagen <[email protected]>
commit b09c551c77c7e01dc6e4f3c8bf06b5ffa7b06db5 upstream.
Due to two copy/pastos, closing the MIC or EFX capture device would make a running ADC capture hang due to unsetting its interrupt handler. In principle, this would have also allowed dereferencing dangling pointers, but we're actually rather thorough at disabling and flushing the ints.
While it may sound like one, this actually wasn't a hypothetical bug:
PortAudio will open a capture stream at startup (and close it right away) even if not asked to. If the first device is busy, it will just proceed with the next one ... thus killing a concurrent capture.
--- sound/pci/emu10k1/emupcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/pci/emu10k1/emupcm.c +2 -2
@@ -1236,7 +1236,7 @@ static int snd_emu10k1_capture_mic_close {struct snd_emu10k1 *emu =snd_pcm_substream_chip (substream); - emu->capture_interrupt =NULL ; + emu->capture_mic_interrupt =NULL ; emu->pcm_capture_mic_substream =NULL ;return 0 ; }
@@ -1344,7 +1344,7 @@ static int snd_emu10k1_capture_efx_close {struct snd_emu10k1 *emu =snd_pcm_substream_chip (substream); - emu->capture_interrupt =NULL ; + emu->capture_efx_interrupt =NULL ; emu->pcm_capture_efx_substream =NULL ;return 0 ; }
Greg Kroah-Hartman
maintainercover 5.15.108-rc1 review
This is the start of the stable review cycle for the 5.15.108 release. There are 91 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 20 Apr 2023 12:02:44 +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.15.108-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.15.108-rc1
Xi Ruoyao <[email protected]>
nvme-pci: avoid the deepest sleep state on ZHITAI TiPro5000 SSDs
Yanteng Si <[email protected]>
counter: Add the necessary colons and indents to the comments of counter_compi
Randy Dunlap <[email protected]>
counter: fix docum. build problems after filename change
Valentin Schneider <[email protected]>
panic, kexec: make __crash_kexec() NMI safe
Valentin Schneider <[email protected]>
kexec: turn all kexec_mutex acquisitions into trylocks
Waiman Long <[email protected]>
cgroup/cpuset: Add cpuset_can_fork() and cpuset_cancel_fork() methods
Waiman Long <[email protected]>
cgroup/cpuset: Make cpuset_fork() handle CLONE_INTO_CGROUP properly
Waiman Long <[email protected]>
cgroup/cpuset: Skip spread flags update on v2
Duy Truong <[email protected]>
nvme-pci: add NVME_QUIRK_BOGUS_NID for T-FORCE Z330 SSD
Juraj Pecigos <[email protected]>
nvme-pci: mark Lexar NM760 as IGNORE_DEV_SUBNQN
Abhijit <[email protected]>
nvme-pci: add NVME_QUIRK_BOGUS_NID for Lexar NM760
Shyamin Ayesh <[email protected]>
nvme-pci: add NVME_QUIRK_BOGUS_NID for Lexar NM610
Tobias Gruetzmacher <[email protected]>
nvme-pci: Crucial P2 has bogus namespace ids
Ning Wang <[email protected]>
nvme-pci: avoid the deepest sleep state on ZHITAI TiPro7000 SSDs
Stefan Reiter <[email protected]>
nvme-pci: add NVME_QUIRK_BOGUS_NID for ADATA XPG GAMMIX S50
Alyssa Ross <[email protected]>
purgatory: fix disabling debug info
Masahiro Yamada <[email protected]>
kbuild: use more subdir- for visiting subdirectories while cleaning
Masahiro Yamada <[email protected]>
sh: remove meaningless archclean line
Gregor Herburger <[email protected]>
i2c: ocores: generate stop condition after timeout in polling mode
Matija Glavinic Pecotic <[email protected]>
x86/rtc: Remove __init for runtime functions
Vincent Guittot <[email protected]>
sched/fair: Fix imbalance overflow
zgpeng <[email protected]>
sched/fair: Move calculate of avg_load to a better location
Aneesh Kumar K.V <[email protected]>
powerpc/papr_scm: Update the NUMA distance table for the target node
ZhaoLong Wang <[email protected]>
ubi: Fix deadlock caused by recursively holding work_sem
Zhihao Cheng <[email protected]>
ubi: Fix failure attaching when vid_hdr offset equals to (sub)page size
Paolo Abeni <[email protected]>
mptcp: stricter state check in mptcp_worker
Paolo Abeni <[email protected]>
mptcp: use mptcp_schedule_work instead of open-coding it
Waiman Long <[email protected]>
cgroup/cpuset: Wake up cpuset_attach_wq tasks in cpuset_cancel_attach()
Basavaraj Natikar <[email protected]>
x86/PCI: Add quirk for AMD XHCI controller that loses MSI-X state in D3hot
Jiri Kosina <[email protected]>
scsi: ses: Handle enclosure with just a primary component gracefully
Radu Pirea (OSS) <[email protected]>
net: phy: nxp-c45-tja11xx: fix unsigned long multiplication overflow
Radu Pirea (OSS) <[email protected]>
net: phy: nxp-c45-tja11xx: add remove callback
Ivan Bornyakov <[email protected]>
net: sfp: initialize sfp->i2c_block_size at sfp allocation
Mathis Salmen <[email protected]>
riscv: add icache flush for nommu sigreturn trampoline
Alexandre Ghiti <[email protected]>
riscv: Do not set initial_boot_params to the linear address of the dtb
Min Li <[email protected]>
drm/i915: fix race condition UAF in i915_perf_add_config_ioctl
Umesh Nerlige Ramappa <[email protected]>
i915/perf: Replace DRM_DEBUG with driver specific drm_dbg call
Steven Rostedt (Google) <[email protected]>
tracing: Have tracing_snapshot_instance_cond() write errors to the appropriate instance
Steven Rostedt (Google) <[email protected]>
tracing: Add trace_array_puts() to write into instance
William Breathitt Gray <[email protected]>
counter: 104-quad-8: Fix Synapse action reported for Index signals
William Breathitt Gray <[email protected]>
counter: Internalize sysfs interface code
William Breathitt Gray <[email protected]>
counter: stm32-timer-cnt: Provide defines for slave mode selection
William Breathitt Gray <[email protected]>
counter: stm32-lptimer-cnt: Provide defines for clock polarities
Aymeric Wibo <[email protected]>
ACPI: resource: Add Medion S17413 to IRQ override quirk
Johannes Berg <[email protected]>
wifi: iwlwifi: mvm: fix mvmtxq->stopped handling
Robbie Harwood <[email protected]>
asymmetric_keys: log on fatal failures in PE/pkcs7
Robbie Harwood <[email protected]>
verify_pefile: relax wrapper length check
Hans de Goede <[email protected]>
drm: panel-orientation-quirks: Add quirk for Lenovo Yoga Book X90F
Hans de Goede <[email protected]>
efi: sysfb_efi: Add quirk for Lenovo Yoga Book X91F/L
Yicong Yang <[email protected]>
i2c: hisi: Avoid redundant interrupts
Alexander Stein <[email protected]>
i2c: imx-lpi2c: clean rx/tx buffers upon new message
Krzysztof Kozlowski <[email protected]>
wifi: mwifiex: mark OF related data as maybe unused
Grant Grundler <[email protected]>
power: supply: cros_usbpd: reclassify "default case!" as debug
Andrew Jeffery <[email protected]>
ARM: 9290/1: uaccess: Fix KASAN false-positives
Andrii Nakryiko <[email protected]>
libbpf: Fix single-line struct definition output in btf_dump
Liang Chen <[email protected]>
skbuff: Fix a race between coalescing and releasing SKBs
Roman Gushchin <[email protected]>
net: macb: fix a memory corruption in extended buffer descriptor mode
Eric Dumazet <[email protected]>
udp6: fix potential access to stale information
Saravanan Vajravel <[email protected]>
RDMA/core: Fix GID entry ref leak when create_ah fails
Xin Long <[email protected]>
sctp: fix a potential overflow in sctp_ifwdtsn_skip
Ziyang Xuan <[email protected]>
net: qrtr: Fix an uninit variable access bug in qrtr_tx_resume()
Denis Plotnikov <[email protected]>
qlcnic: check pci_reset_function result
Christophe JAILLET <[email protected]>
drm/armada: Fix a potential double free in an error handling path
YueHaibing <[email protected]>
tcp: restrict net.ipv4.tcp_app_win
Harshit Mogalapalli <[email protected]>
niu: Fix missing unwind goto in niu_alloc_channels()
Zheng Wang <[email protected]>
9p/xen : Fix use after free bug in xen_9pfs_front_remove due to race condition
Martin KaFai Lau <[email protected]>
bpf: tcp: Use sock_gen_put instead of sock_put in bpf_iter_tcp
Mark Zhang <[email protected]>
RDMA/cma: Allow UD qp_type to join multicast only
Maher Sanalla <[email protected]>
IB/mlx5: Add support for 400G_8X lane speed
Tatyana Nikolova <[email protected]>
RDMA/irdma: Add ipv4 check to irdma_find_listener()
Mustafa Ismail <[email protected]>
RDMA/irdma: Increase iWARP CM default rexmit count
Mustafa Ismail <[email protected]>
RDMA/irdma: Fix memory leak of PBLE objects
Chunyan Zhang <[email protected]>
clk: sprd: set max_register according to mapping range
Jani Nikula <[email protected]>
drm/i915/dsi: fix DSS CTL register offsets for TGL+
Reiji Watanabe <[email protected]>
KVM: arm64: PMU: Restore the guest's EL0 event counting after migration
Christophe Kerello <[email protected]>
mtd: rawnand: stm32_fmc2: use timings.mode instead of checking tRC_min
Christophe Kerello <[email protected]>
mtd: rawnand: stm32_fmc2: remove unsupported EDO mode
Arseniy Krasnov <[email protected]>
mtd: rawnand: meson: fix bitmask for length in command word
Bang Li <[email protected]>
mtdblock: tolerate corrected bit-flips
Daniel Vetter <[email protected]>
fbmem: Reject FB_ACTIVATE_KD_TEXT from userspace
Christoph Hellwig <[email protected]>
btrfs: fix fast csum implementation detection
David Sterba <[email protected]>
btrfs: print checksum type and implementation at mount time
Min Li <[email protected]>
Bluetooth: Fix race condition in hidp_session_thread
Luiz Augusto von Dentz <[email protected]>
Bluetooth: L2CAP: Fix use-after-free in l2cap_disconnect_{req,rsp}Oswald Buddenhagen <[email protected]>
ALSA: hda/sigmatel: fix S/PDIF out on Intel D*45* motherboards
Oswald Buddenhagen <[email protected]>
ALSA: emu10k1: don't create old pass-through playback device on Audigy
Xu Biang <[email protected]>
ALSA: firewire-tascam: add missing unwind goto in snd_tscm_stream_start_duplex()
Oswald Buddenhagen <[email protected]>
ALSA: i2c/cs8427: fix iec958 mixer control deactivation
Oswald Buddenhagen <[email protected]>
ALSA: hda/sigmatel: add pin overrides for Intel DP45SG motherboard
Oswald Buddenhagen <[email protected]>
ALSA: emu10k1: fix capture interrupt handler unlinking
Kornel Dulęba <[email protected]>
Revert "pinctrl: amd: Disable and mask interrupts on resume"
-------------
Diffstat:
Documentation/driver-api/generic-counter.rst | 2 +- Documentation/kbuild/makefiles.rst | 17 +- Documentation/networking/ip-sysctl.rst | 2 + Documentation/sound/hd-audio/models.rst | 2 +- MAINTAINERS | 1 - Makefile | 4 +- arch/alpha/Kbuild | 3 + arch/alpha/Makefile | 3 - arch/arc/Kbuild | 3 + arch/arc/Makefile | 3 - arch/arm/Kbuild | 3 + arch/arm/Makefile | 4 - arch/arm/lib/uaccess_with_memcpy.c | 4 +- arch/arm64/Kbuild | 3 + arch/arm64/Makefile | 7 - arch/arm64/kernel/Makefile | 3 + arch/arm64/kvm/pmu-emul.c | 1 + arch/arm64/kvm/sys_regs.c | 1 - arch/csky/Kbuild | 3 + arch/csky/Makefile | 3 - arch/h8300/Kbuild | 3 + arch/h8300/Makefile | 3 - arch/ia64/Makefile | 2 - arch/m68k/Makefile | 4 +- arch/microblaze/Kbuild | 3 + arch/microblaze/Makefile | 3 - arch/mips/Kbuild | 3 + arch/mips/Makefile | 8 +- arch/mips/boot/Makefile | 3 + arch/nds32/Kbuild | 3 + arch/nds32/Makefile | 3 - arch/nios2/Kbuild | 3 + arch/nios2/Makefile | 6 +- arch/openrisc/Kbuild | 3 + arch/openrisc/Makefile | 7 +- arch/parisc/Kbuild | 3 + arch/parisc/Makefile | 7 +- arch/powerpc/Kbuild | 3 + arch/powerpc/Makefile | 7 +- arch/powerpc/mm/numa.c | 1 + arch/powerpc/platforms/pseries/papr_scm.c | 7 + arch/riscv/Kbuild | 3 + arch/riscv/Makefile | 7 +- arch/riscv/kernel/setup.c | 5 +- arch/riscv/kernel/signal.c | 9 +- arch/s390/Kbuild | 3 + arch/s390/Makefile | 8 +- arch/sh/Kbuild | 3 + arch/sh/Makefile | 4 - arch/sparc/Kbuild | 3 + arch/sparc/Makefile | 3 - arch/x86/Kbuild | 3 + arch/x86/Makefile | 2 - arch/x86/kernel/x86_init.c | 4 +- arch/x86/pci/fixup.c | 21 + arch/x86/purgatory/Makefile | 3 +- arch/xtensa/Makefile | 4 +- crypto/asymmetric_keys/pkcs7_verify.c | 10 +- crypto/asymmetric_keys/verify_pefile.c | 32 +- drivers/acpi/resource.c | 7 + drivers/clk/sprd/common.c | 9 +- drivers/counter/104-quad-8.c | 451 +++---- drivers/counter/Makefile | 1 + drivers/counter/counter-core.c | 142 ++ drivers/counter/counter-sysfs.c | 849 ++++++++++++ drivers/counter/counter-sysfs.h | 13 + drivers/counter/counter.c | 1496 --------------------- drivers/counter/ftm-quaddec.c | 60 +- drivers/counter/intel-qep.c | 146 +- drivers/counter/interrupt-cnt.c | 62 +- drivers/counter/microchip-tcb-capture.c | 91 +- drivers/counter/stm32-lptimer-cnt.c | 212 ++- drivers/counter/stm32-timer-cnt.c | 195 ++- drivers/counter/ti-eqep.c | 180 +-- drivers/firmware/efi/sysfb_efi.c | 8 + drivers/gpu/drm/armada/armada_drv.c | 1 - drivers/gpu/drm/drm_panel_orientation_quirks.c | 13 +- drivers/gpu/drm/i915/display/icl_dsi.c | 20 +- drivers/gpu/drm/i915/i915_perf.c | 155 ++- drivers/i2c/busses/i2c-hisi.c | 7 + drivers/i2c/busses/i2c-imx-lpi2c.c | 2 + drivers/i2c/busses/i2c-ocores.c | 35 +- drivers/infiniband/core/cma.c | 60 +- drivers/infiniband/core/verbs.c | 2 + drivers/infiniband/hw/irdma/cm.c | 16 +- drivers/infiniband/hw/irdma/cm.h | 2 +- drivers/infiniband/hw/irdma/hw.c | 3 + drivers/infiniband/hw/mlx5/main.c | 4 + drivers/mtd/mtdblock.c | 12 +- drivers/mtd/nand/raw/meson_nand.c | 6 +- drivers/mtd/nand/raw/stm32_fmc2_nand.c | 3 + drivers/mtd/ubi/build.c | 21 +- drivers/mtd/ubi/wl.c | 4 +- drivers/net/ethernet/cadence/macb_main.c | 4 + drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 8 +- drivers/net/ethernet/sun/niu.c | 2 +- drivers/net/phy/nxp-c45-tja11xx.c | 14 +- drivers/net/phy/sfp.c | 13 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 5 +- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 4 +- drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 5 +- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 4 +- drivers/net/wireless/marvell/mwifiex/pcie.c | 2 +- drivers/net/wireless/marvell/mwifiex/sdio.c | 2 +- drivers/nvme/host/pci.c | 15 + drivers/pinctrl/pinctrl-amd.c | 36 +- drivers/power/supply/cros_usbpd-charger.c | 2 +- drivers/scsi/ses.c | 20 +- drivers/video/fbdev/core/fbmem.c | 2 + fs/btrfs/disk-io.c | 17 + fs/btrfs/super.c | 2 - include/linux/counter.h | 658 ++++----- include/linux/counter_enum.h | 45 - include/linux/kexec.h | 2 +- include/linux/mfd/stm32-lptimer.h | 5 + include/linux/mfd/stm32-timers.h | 4 + include/linux/trace.h | 12 + kernel/cgroup/cpuset.c | 166 ++- kernel/kexec.c | 11 +- kernel/kexec_core.c | 28 +- kernel/kexec_file.c | 4 +- kernel/kexec_internal.h | 15 +- kernel/ksysfs.c | 7 +- kernel/sched/fair.c | 15 +- kernel/trace/trace.c | 41 +- net/9p/trans_xen.c | 4 + net/bluetooth/hidp/core.c | 2 +- net/bluetooth/l2cap_core.c | 24 +- net/core/skbuff.c | 16 +- net/ipv4/sysctl_net_ipv4.c | 3 + net/ipv4/tcp_ipv4.c | 4 +- net/ipv6/udp.c | 8 +- net/mptcp/options.c | 5 +- net/mptcp/protocol.c | 2 +- net/mptcp/subflow.c | 18 +- net/qrtr/af_qrtr.c | 8 +- net/sctp/stream_interleave.c | 3 +- sound/firewire/tascam/tascam-stream.c | 2 +- sound/i2c/cs8427.c | 7 +- sound/pci/emu10k1/emupcm.c | 14 +- sound/pci/hda/patch_sigmatel.c | 10 + tools/lib/bpf/btf_dump.c | 7 +- 142 files changed, 2785 insertions(+), 3094 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 4/91 ALSA: i2c/cs8427: fix iec958 mixer control deactivation
From: Oswald Buddenhagen <[email protected]>
commit e98e7a82bca2b6dce3e03719cff800ec913f9af7 upstream.
snd_cs8427_iec958_active() would always delete SNDRV_CTL_ELEM_ACCESS_INACTIVE, even though the function has an argument active.
--- sound/i2c/cs8427.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
sound/i2c/cs8427.c +5 -2
@@ -561,10 +561,13 @@ int snd_cs8427_iec958_active(struct snd_if (snd_BUG_ON (!cs8427))return -ENXIO ; chip = cs8427->private_data; -if (active) +if (active) {memcpy (chip->playback.pcm_status, chip->playback.def_status,24 ); - chip->playback.pcm_ctl->vd[0 ].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE ; + chip->playback.pcm_ctl->vd[0 ].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE ; + }else { + chip->playback.pcm_ctl->vd[0 ].access |=SNDRV_CTL_ELEM_ACCESS_INACTIVE ; + }snd_ctl_notify (cs8427->bus->card,SNDRV_CTL_EVENT_MASK_VALUE |SNDRV_CTL_EVENT_MASK_INFO , &chip->playback.pcm_ctl->id);
Greg Kroah-Hartman
maintainerPATCH 13/91 mtdblock: tolerate corrected bit-flips
In reply to Greg Kroah-HartmanFrom: Bang Li <[email protected]>
commit 0c3089601f064d80b3838eceb711fcac04bceaad upstream.
mtd_read() may return -EUCLEAN in case of corrected bit-flips.This particular condition should not be treated like an error.
--- drivers/mtd/mtdblock.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/mtd/mtdblock.c +8 -4
@@ -153,7 +153,7 @@ static int do_cached_write (struct mtdbl mtdblk->cache_state =STATE_EMPTY ; ret =mtd_read (mtd, sect_start, sect_size, &retlen, mtdblk->cache_data); -if (ret) +if (ret && !mtd_is_bitflip (ret))return ret;if (retlen != sect_size)return -EIO ;
@@ -188,8 +188,12 @@ static int do_cached_read (struct mtdblkpr_debug ("mtdblock: read on \"%s\" at 0x%lx, size 0x%x\n" , mtd->name, pos, len); -if (!sect_size) -return mtd_read (mtd, pos, len, &retlen, buf); +if (!sect_size) { + ret =mtd_read (mtd, pos, len, &retlen, buf); +if (ret && !mtd_is_bitflip (ret)) +return ret; +return 0 ; + }while (len >0 ) {unsigned long sect_start = (pos/sect_size)*sect_size;
@@ -209,7 +213,7 @@ static int do_cached_read (struct mtdblkmemcpy (buf, mtdblk->cache_data + offset, size); }else { ret =mtd_read (mtd, pos, size, &retlen, buf); -if (ret) +if (ret && !mtd_is_bitflip (ret))return ret;if (retlen != size)return -EIO ;
Greg Kroah-Hartman
maintainerPATCH 14/91 mtd: rawnand: meson: fix bitmask for length in command word
In reply to Greg Kroah-HartmanFrom: Arseniy Krasnov <[email protected]>
commit 93942b70461574ca7fc3d91494ca89b16a4c64c7 upstream.
Valid mask is 0x3FFF, without this patch the following problems were found:
1) [ 0.938914] Could not find a valid ONFI parameter page, trying
bit-wise majority to recover it
[ 0.947384] ONFI parameter recovery failed, aborting
2) Read with disabled ECC mode was broken.
--- drivers/mtd/nand/raw/meson_nand.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/meson_nand.c +3 -3
@@ -276,7 +276,7 @@ static void meson_nfc_cmd_access(structif (raw) { len = mtd->writesize + mtd->oobsize; - cmd = (len &GENMASK (5 ,0 )) | scrambler |DMA_DIR (dir); + cmd = (len &GENMASK (13 ,0 )) | scrambler |DMA_DIR (dir);writel (cmd, nfc->reg_base +NFC_REG_CMD );return ; }
@@ -540,7 +540,7 @@ static int meson_nfc_read_buf(struct nanif (ret) goto out; - cmd =NFC_CMD_N2M | (len &GENMASK (5 ,0 )); + cmd =NFC_CMD_N2M | (len &GENMASK (13 ,0 ));writel (cmd, nfc->reg_base +NFC_REG_CMD );meson_nfc_drain_cmd (nfc);
@@ -564,7 +564,7 @@ static int meson_nfc_write_buf(struct naif (ret)return ret; - cmd =NFC_CMD_M2N | (len &GENMASK (5 ,0 )); + cmd =NFC_CMD_M2N | (len &GENMASK (13 ,0 ));writel (cmd, nfc->reg_base +NFC_REG_CMD );meson_nfc_drain_cmd (nfc);
Greg Kroah-Hartman
maintainerPATCH 15/91 mtd: rawnand: stm32_fmc2: remove unsupported EDO mode
In reply to Greg Kroah-HartmanFrom: Christophe Kerello <[email protected]>
commit f71e0e329c152c7f11ddfd97ffc62aba152fad3f upstream.
Remove the EDO mode support from as the FMC2 controller does not support the feature.
--- drivers/mtd/nand/raw/stm32_fmc2_nand.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mtd/nand/raw/stm32_fmc2_nand.c +3 -0
@@ -1527,6 +1527,9 @@ static int stm32_fmc2_nfc_setup_interfacif (IS_ERR (sdrt))return PTR_ERR (sdrt); +if (sdrt->tRC_min <30000 ) +return -EOPNOTSUPP ; +if (chipnr ==NAND_DATA_IFACE_CHECK_ONLY )return 0 ;
Greg Kroah-Hartman
maintainerPATCH 16/91 mtd: rawnand: stm32_fmc2: use timings.mode instead of checking tRC_min
In reply to Greg Kroah-HartmanFrom: Christophe Kerello <[email protected]>
commit ddbb664b6ab8de7dffa388ae0c88cd18616494e5 upstream.
Use timings.mode value instead of checking tRC_min timing for EDO mode support.
--- drivers/mtd/nand/raw/stm32_fmc2_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/raw/stm32_fmc2_nand.c +1 -1
@@ -1527,7 +1527,7 @@ static int stm32_fmc2_nfc_setup_interfacif (IS_ERR (sdrt))return PTR_ERR (sdrt); -if (sdrt->tRC_min <30000 ) +if (conf->timings.mode >3 )return -EOPNOTSUPP ;if (chipnr ==NAND_DATA_IFACE_CHECK_ONLY )
Greg Kroah-Hartman
maintainerPATCH 17/91 KVM: arm64: PMU: Restore the guests EL0 event counting after migration
In reply to Greg Kroah-HartmanFrom: Reiji Watanabe <[email protected]>
commit f9ea835e99bc8d049bf2a3ec8fa5a7cb4fcade23 upstream.
Currently, with VHE, KVM enables the EL0 event counting for the guest on vcpu_load() or KVM enables it as a part of the PMU register emulation process, when needed. However, in the migration case (with VHE), the same handling is lacking, as vPMU register values that were restored by userspace haven't been propagated yet (the PMU events haven't been created) at the vcpu load-time on the first KVM_RUN (kvm_vcpu_pmu_restore_guest() called from vcpu_load() on the first KVM_RUN won't do anything as events_{guest,host} of kvm_pmu_events are still zero).
So, with VHE, enable the guest's EL0 event counting on the first KVM_RUN (after the migration) when needed. More specifically, have kvm_pmu_handle_pmcr() call kvm_vcpu_pmu_restore_guest() so that kvm_pmu_handle_pmcr() on the first KVM_RUN can take care of it.
--- arch/arm64/kvm/pmu-emul.c | 1 + arch/arm64/kvm/sys_regs.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kvm/pmu-emul.c +1 -0
@@ -554,6 +554,7 @@ void kvm_pmu_software_increment(struct k__vcpu_sys_reg (vcpu,PMOVSSET_EL0 ) |=BIT (i); } } +kvm_vcpu_pmu_restore_guest (vcpu); }/**
arch/arm64/kvm/sys_regs.c +0 -1
@@ -702,7 +702,6 @@ static bool access_pmcr(struct kvm_vcpu val |=ARMV8_PMU_PMCR_LC ;__vcpu_sys_reg (vcpu,PMCR_EL0 ) = val;kvm_pmu_handle_pmcr (vcpu, val); -kvm_vcpu_pmu_restore_guest (vcpu); }else {/* PMCR.P & PMCR.C are RAZ */ val =__vcpu_sys_reg (vcpu,PMCR_EL0 )
Greg Kroah-Hartman
maintainerPATCH 18/91 drm/i915/dsi: fix DSS CTL register offsets for TGL+
In reply to Greg Kroah-HartmanFrom: Jani Nikula <[email protected]>
commit 6b8446859c971a5783a2cdc90adf32e64de3bd23 upstream.
On TGL+ the DSS control registers are at different offsets, and there's one per pipe. Fix the offsets to fix dual link DSI for TGL+.
There would be helpers for this in the DSC code, but just do the quick fix now for DSI. Long term, we should probably move all the DSS handling into intel_vdsc.c, so exporting the helpers seems counter-productive.
--- drivers/gpu/drm/i915/display/icl_dsi.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/icl_dsi.c +16 -4
@@ -307,9 +307,21 @@ static void configure_dual_link_mode(str {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder); +i915_reg_t dss_ctl1_reg, dss_ctl2_reg;u32 dss_ctl1; - dss_ctl1 =intel_de_read (dev_priv,DSS_CTL1 ); +/* FIXME: Move all DSS handling to intel_vdsc.c */ +if (DISPLAY_VER (dev_priv) >=12 ) { +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc); + + dss_ctl1_reg =ICL_PIPE_DSS_CTL1 (crtc->pipe); + dss_ctl2_reg =ICL_PIPE_DSS_CTL2 (crtc->pipe); + }else { + dss_ctl1_reg =DSS_CTL1 ; + dss_ctl2_reg =DSS_CTL2 ; + } + + dss_ctl1 =intel_de_read (dev_priv, dss_ctl1_reg); dss_ctl1 |=SPLITTER_ENABLE ; dss_ctl1 &= ~OVERLAP_PIXELS_MASK ; dss_ctl1 |=OVERLAP_PIXELS (intel_dsi->pixel_overlap);
@@ -330,16 +342,16 @@ static void configure_dual_link_mode(str dss_ctl1 &= ~LEFT_DL_BUF_TARGET_DEPTH_MASK ; dss_ctl1 |=LEFT_DL_BUF_TARGET_DEPTH (dl_buffer_depth); - dss_ctl2 =intel_de_read (dev_priv,DSS_CTL2 ); + dss_ctl2 =intel_de_read (dev_priv, dss_ctl2_reg); dss_ctl2 &= ~RIGHT_DL_BUF_TARGET_DEPTH_MASK ; dss_ctl2 |=RIGHT_DL_BUF_TARGET_DEPTH (dl_buffer_depth); -intel_de_write (dev_priv,DSS_CTL2 , dss_ctl2); +intel_de_write (dev_priv, dss_ctl2_reg, dss_ctl2); }else {/* Interleave */ dss_ctl1 |=DUAL_LINK_MODE_INTERLEAVE ; } -intel_de_write (dev_priv,DSS_CTL1 , dss_ctl1); +intel_de_write (dev_priv, dss_ctl1_reg, dss_ctl1); }/* aka DSI 8X clock */
Greg Kroah-Hartman
maintainerPATCH 19/91 clk: sprd: set max_register according to mapping range
In reply to Greg Kroah-HartmanFrom: Chunyan Zhang <[email protected]>
[ Upstream commit 47d43086531f10539470a63e8ad92803e686a3dd ]
In sprd clock driver, regmap_config.max_register was set to a fixed value which is likely larger than the address range configured in device tree, when reading registers through debugfs it would cause access violation.
--- drivers/clk/sprd/common.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/clk/sprd/common.c +6 -3
@@ -17,7 +17,6 @@ static const struct regmap_config sprdclk_regmap_config = { .reg_bits = 32, .reg_stride = 4, .val_bits = 32, - .max_register = 0xffff, .fast_io = true, };
@@ -43,6 +42,8 @@ int sprd_clk_regmap_init(struct platform_device *pdev,struct device *dev = &pdev->dev;struct device_node *node = dev->of_node, *np;struct regmap *regmap; +struct resource *res; +struct regmap_config reg_config = sprdclk_regmap_config;if (of_find_property (node,"sprd,syscon" ,NULL )) { regmap =syscon_regmap_lookup_by_phandle (node,"sprd,syscon" );
@@ -59,12 +60,14 @@ int sprd_clk_regmap_init(struct platform_device *pdev,return PTR_ERR (regmap); } }else { - base =devm_platform_ioremap_resource (pdev,0 ); + base =devm_platform_get_and_ioremap_resource (pdev,0 , &res);if (IS_ERR (base))return PTR_ERR (base); + reg_config.max_register =resource_size (res) - reg_config.reg_stride; + regmap =devm_regmap_init_mmio (&pdev->dev, base, - &sprdclk_regmap_config); + ®_config);if (IS_ERR (regmap)) {pr_err ("failed to init regmap\n" );return PTR_ERR (regmap);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 20/91 RDMA/irdma: Fix memory leak of PBLE objects
In reply to Greg Kroah-HartmanFrom: Mustafa Ismail <[email protected]>
[ Upstream commit b69a6979dbaa2453675fe9c71bdc2497fedb11f9 ]
On rmmod of irdma, the PBLE object memory is not being freed. PBLE object memory are not statically pre-allocated at function initialization time unlike other HMC objects. PBLEs objects and the Segment Descriptors (SD) for it can be dynamically allocated during scale up and SD's remain allocated till function deinitialization.
Fix this leak by adding IRDMA_HMC_IW_PBLE to the iw_hmc_obj_types[] table and skip pbles in irdma_create_hmc_obj but not in irdma_del_hmc_objects().
--- drivers/infiniband/hw/irdma/hw.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/infiniband/hw/irdma/hw.c +3 -0
@@ -41,6 +41,7 @@ static enum irdma_hmc_rsrc_type iw_hmc_obj_types[] = {IRDMA_HMC_IW_XFFL ,IRDMA_HMC_IW_Q1 ,IRDMA_HMC_IW_Q1FL , +IRDMA_HMC_IW_PBLE ,IRDMA_HMC_IW_TIMER ,IRDMA_HMC_IW_FSIMC , IRDMA_HMC_IW_FSIAV,
@@ -829,6 +830,8 @@ irdma_create_hmc_objs(struct irdma_pci_f *rf, bool privileged, enum irdma_vers v info.entry_type = rf->sd_type;for (i =0 ; i <IW_HMC_OBJ_TYPE_NUM ; i++) { +if (iw_hmc_obj_types[i] ==IRDMA_HMC_IW_PBLE ) +continue ;if (dev->hmc_info->hmc_obj[iw_hmc_obj_types[i]].cnt) { info.rsrc_type = iw_hmc_obj_types[i]; info.count = dev->hmc_info->hmc_obj[info.rsrc_type].cnt;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 21/91 RDMA/irdma: Increase iWARP CM default rexmit count
In reply to Greg Kroah-HartmanFrom: Mustafa Ismail <[email protected]>
[ Upstream commit 8385a875c9eecc429b2f72970efcbb0e5cb5b547 ]
When running perftest with large number of connections in iWARP mode, the passive side could be slow to respond. Increase the rexmit counter default to allow scaling connections.
--- drivers/infiniband/hw/irdma/cm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/irdma/cm.h +1 -1
@@ -41,7 +41,7 @@#define TCP_OPTIONS_PADDING 3#define IRDMA_DEFAULT_RETRYS 64 -#define IRDMA_DEFAULT_RETRANS 8 +#define IRDMA_DEFAULT_RETRANS 32#define IRDMA_DEFAULT_TTL 0x40#define IRDMA_DEFAULT_RTT_VAR 6#define IRDMA_DEFAULT_SS_THRESH 0x3fffffff
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 22/91 RDMA/irdma: Add ipv4 check to irdma_find_listener()
In reply to Greg Kroah-HartmanFrom: Tatyana Nikolova <[email protected]>
[ Upstream commit e4522c097ec10f23ea0933e9e69d4fa9d8ae9441 ]
Add ipv4 check to irdma_find_listener(). Otherwise the function incorrectly finds and returns a listener with a different addr family for the zero IP addr, if a listener with a zero IP addr and the same port as the one searched for has already been created.
--- drivers/infiniband/hw/irdma/cm.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/infiniband/hw/irdma/cm.c +10 -6
@@ -1458,13 +1458,15 @@ static int irdma_send_fin(struct irdma_cm_node *cm_node)* irdma_find_listener - find a cm node listening on this addr-port pair * @cm_core: cm's core * @dst_addr: listener ip addr +* @ipv4: flag indicating IPv4 when true * @dst_port: listener tcp port num * @vlan_id: virtual LAN ID * @listener_state: state to match with listen node's */ static struct irdma_cm_listener * -irdma_find_listener (struct irdma_cm_core *cm_core,u32 *dst_addr,u16 dst_port, -u16 vlan_id,enum irdma_cm_listener_state listener_state) +irdma_find_listener (struct irdma_cm_core *cm_core,u32 *dst_addr,bool ipv4, +u16 dst_port,u16 vlan_id, +enum irdma_cm_listener_state listener_state) {struct irdma_cm_listener *listen_node;static const u32 ip_zero[4 ] = {0 ,0 ,0 ,0 };
@@ -1477,7 +1479,7 @@ irdma_find_listener(struct irdma_cm_core *cm_core, u32 *dst_addr, u16 dst_port, list_for_each_entry (listen_node, &cm_core->listen_list, list) {memcpy (listen_addr, listen_node->loc_addr,sizeof (listen_addr)); listen_port = listen_node->loc_port; -if (listen_port != dst_port || +if (listen_node->ipv4 != ipv4 || listen_port != dst_port || !(listener_state & listen_node->listener_state))continue ;/* compare node pair, return node handle if a match */
@@ -2899,9 +2901,10 @@ irdma_make_listen_node(struct irdma_cm_core *cm_core,unsigned long flags;/* cannot have multiple matching listeners */ - listener =irdma_find_listener (cm_core, cm_info->loc_addr, - cm_info->loc_port, cm_info->vlan_id, -IRDMA_CM_LISTENER_EITHER_STATE ); + listener = +irdma_find_listener (cm_core, cm_info->loc_addr, cm_info->ipv4, + cm_info->loc_port, cm_info->vlan_id, +IRDMA_CM_LISTENER_EITHER_STATE );if (listener && listener->listener_state ==IRDMA_CM_LISTENER_ACTIVE_STATE ) {refcount_dec (&listener->refcnt);
@@ -3150,6 +3153,7 @@ void irdma_receive_ilq(struct irdma_sc_vsi *vsi, struct irdma_puda_buf *rbuf) listener =irdma_find_listener (cm_core, cm_info.loc_addr, + cm_info.ipv4, cm_info.loc_port, cm_info.vlan_id,IRDMA_CM_LISTENER_ACTIVE_STATE );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 5/91 ALSA: firewire-tascam: add missing unwind goto in snd_tscm_stream_start_duplex()
In reply to Greg Kroah-HartmanFrom: Xu Biang <[email protected]>
commit fb4a624f88f658c7b7ae124452bd42eaa8ac7168 upstream.
Smatch Warns:sound/firewire/tascam/tascam-stream.c:493 snd_tscm_stream_start_duplex()
warn: missing unwind goto?
The direct return will cause the stream list of "&tscm->domain" unemptied and the session in "tscm" unfinished if amdtp_domain_start() returns with an error.
Fix this by changing the direct return to a goto which will empty the stream list of "&tscm->domain" and finish the session in "tscm".
The snd_tscm_stream_start_duplex() function is called in the prepare callback of PCM. According to "ALSA Kernel API Documentation", the prepare callback of PCM will be called many times at each setup. So, if the "&d->streams" list is not emptied, when the prepare callback is called next time, snd_tscm_stream_start_duplex() will receive -EBUSY from amdtp_domain_add_stream() that tries to add an existing stream to the domain. The error handling code after the "error" label will be executed in this case, and the "&d->streams" list will be emptied. So not emptying the "&d->streams" list will not cause an issue. But it is more efficient and readable to empty it on the first error by changing the direct return to a goto statement.
The session in "tscm" has been begun before amdtp_domain_start(), so it needs to be finished when amdtp_domain_start() fails.
--- sound/firewire/tascam/tascam-stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/firewire/tascam/tascam-stream.c +1 -1
@@ -490,7 +490,7 @@ int snd_tscm_stream_start_duplex(struct// packet is important for media clock recovery. err =amdtp_domain_start (&tscm->domain, tx_init_skip_cycles, true, true);if (err <0 ) -return err; + goto error;if (!amdtp_domain_wait_ready (&tscm->domain,READY_TIMEOUT_MS )) { err = -ETIMEDOUT ;
Greg Kroah-Hartman
maintainerPATCH 23/91 IB/mlx5: Add support for 400G_8X lane speed
In reply to Greg Kroah-HartmanFrom: Maher Sanalla <[email protected]>
[ Upstream commit 88c9483faf15ada14eca82714114656893063458 ]
Currently, when driver queries PTYS to report which link speed is being used on its RoCE ports, it does not check the case of having 400Gbps transmitted over 8 lanes. Thus it fails to report the said speed and instead it defaults to report 10G over 4 lanes.
Add a check for the said speed when querying PTYS and report it back correctly when needed.
--- drivers/infiniband/hw/mlx5/main.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/infiniband/hw/mlx5/main.c +4 -0
@@ -443,6 +443,10 @@ static int translate_eth_ext_proto_oper(u32 eth_proto_oper, u16 *active_speed, *active_width =IB_WIDTH_2X ; *active_speed =IB_SPEED_NDR ;break ; +case MLX5E_PROT_MASK (MLX5E_400GAUI_8 ): + *active_width =IB_WIDTH_8X ; + *active_speed =IB_SPEED_HDR ; +break ;case MLX5E_PROT_MASK (MLX5E_400GAUI_4_400GBASE_CR4_KR4 ): *active_width =IB_WIDTH_4X ; *active_speed =IB_SPEED_NDR ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 24/91 RDMA/cma: Allow UD qp_type to join multicast only
In reply to Greg Kroah-HartmanFrom: Mark Zhang <[email protected]>
[ Upstream commit 58e84f6b3e84e46524b7e5a916b53c1ad798bc8f ]
As for multicast:
- The SIDR is the only mode that makes sense;
- Besides PS_UDP, other port spaces like PS_IB is also allowed, as it is UD compatible. In this case qkey also needs to be set [1].
This patch allows only UD qp_type to join multicast, and set qkey to default if it's not set, to fix an uninit-value error: the ib->rec.qkey field is accessed without being initialized.
=====================================================
BUG: KMSAN: uninit-value in cma_set_qkey drivers/infiniband/core/cma.c:510 [inline] BUG: KMSAN: uninit-value in cma_make_mc_event+0xb73/0xe00 drivers/infiniband/core/cma.c:4570 cma_set_qkey drivers/infiniband/core/cma.c:510 [inline] cma_make_mc_event+0xb73/0xe00 drivers/infiniband/core/cma.c:4570 cma_iboe_join_multicast drivers/infiniband/core/cma.c:4782 [inline] rdma_join_multicast+0x2b83/0x30a0 drivers/infiniband/core/cma.c:4814 ucma_process_join+0xa76/0xf60 drivers/infiniband/core/ucma.c:1479 ucma_join_multicast+0x1e3/0x250 drivers/infiniband/core/ucma.c:1546 ucma_write+0x639/0x6d0 drivers/infiniband/core/ucma.c:1732 vfs_write+0x8ce/0x2030 fs/read_write.c:588 ksys_write+0x28c/0x520 fs/read_write.c:643 __do_sys_write fs/read_write.c:655 [inline] __se_sys_write fs/read_write.c:652 [inline] __ia32_sys_write+0xdb/0x120 fs/read_write.c:652 do_syscall_32_irqs_on arch/x86/entry/common.c:114 [inline] __do_fast_syscall_32+0x96/0xf0 arch/x86/entry/common.c:180 do_fast_syscall_32+0x34/0x70 arch/x86/entry/common.c:205 do_SYSENTER_32+0x1b/0x20 arch/x86/entry/common.c:248 entry_SYSENTER_compat_after_hwframe+0x4d/0x5c
Local variable ib.i created at:
cma_iboe_join_multicast drivers/infiniband/core/cma.c:4737 [inline] rdma_join_multicast+0x586/0x30a0 drivers/infiniband/core/cma.c:4814 ucma_process_join+0xa76/0xf60 drivers/infiniband/core/ucma.c:1479 CPU: 0 PID: 29874 Comm: syz-executor.3 Not tainted 5.16.0-rc3-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 =====================================================
[1] https://lore.kernel.org/linux-rdma/[email protected]/
--- drivers/infiniband/core/cma.c | 60 ++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 26 deletions(-)
drivers/infiniband/core/cma.c +34 -26
@@ -496,22 +496,11 @@ static inline unsigned short cma_family(struct rdma_id_private *id_priv)return id_priv->id.route.addr.src_addr.ss_family; } -static int cma_set_qkey (struct rdma_id_private *id_priv,u32 qkey) +static int cma_set_default_qkey (struct rdma_id_private *id_priv) {struct ib_sa_mcmember_rec rec;int ret =0 ; -if (id_priv->qkey) { -if (qkey && id_priv->qkey != qkey) -return -EINVAL ; -return 0 ; - } - -if (qkey) { - id_priv->qkey = qkey; -return 0 ; - } -switch (id_priv->id.ps) {case RDMA_PS_UDP :case RDMA_PS_IB :
@@ -531,6 +520,16 @@ static int cma_set_qkey(struct rdma_id_private *id_priv, u32 qkey)return ret; } +static int cma_set_qkey (struct rdma_id_private *id_priv,u32 qkey) +{ +if (!qkey || + (id_priv->qkey && (id_priv->qkey != qkey))) +return -EINVAL ; + + id_priv->qkey = qkey; +return 0 ; +} +static void cma_translate_ib (struct sockaddr_ib *sib,struct rdma_dev_addr *dev_addr) { dev_addr->dev_type =ARPHRD_INFINIBAND ;
@@ -1099,7 +1098,7 @@ static int cma_ib_init_qp_attr(struct rdma_id_private *id_priv, *qp_attr_mask =IB_QP_STATE |IB_QP_PKEY_INDEX |IB_QP_PORT ;if (id_priv->id.qp_type ==IB_QPT_UD ) { - ret =cma_set_qkey (id_priv,0 ); + ret =cma_set_default_qkey (id_priv);if (ret)return ret;
@@ -4373,7 +4372,10 @@ static int cma_send_sidr_rep(struct rdma_id_private *id_priv,memset (&rep,0 ,sizeof rep); rep.status = status;if (status ==IB_SIDR_SUCCESS ) { - ret =cma_set_qkey (id_priv, qkey); +if (qkey) + ret =cma_set_qkey (id_priv, qkey); +else + ret =cma_set_default_qkey (id_priv);if (ret)return ret; rep.qp_num = id_priv->qp_num;
@@ -4578,9 +4580,7 @@ static void cma_make_mc_event(int status, struct rdma_id_private *id_priv,enum ib_gid_type gid_type;struct net_device *ndev; -if (!status) - status =cma_set_qkey (id_priv,be32_to_cpu (multicast->rec.qkey)); -else +if (status)pr_debug_ratelimited ("RDMA CM: MULTICAST_ERROR: failed to join multicast. status %d\n" , status);
@@ -4608,7 +4608,7 @@ static void cma_make_mc_event(int status, struct rdma_id_private *id_priv, } event->param.ud.qp_num =0xFFFFFF ; - event->param.ud.qkey =be32_to_cpu (multicast->rec.qkey); + event->param.ud.qkey = id_priv->qkey; out:if (ndev)
@@ -4627,8 +4627,11 @@ static int cma_ib_mc_handler(int status, struct ib_sa_multicast *multicast) READ_ONCE(id_priv->state) == RDMA_CM_DESTROYING) goto out; -cma_make_mc_event (status, id_priv, multicast, &event, mc); - ret =cma_cm_event_handler (id_priv, &event); + ret =cma_set_qkey (id_priv,be32_to_cpu (multicast->rec.qkey)); +if (!ret) { +cma_make_mc_event (status, id_priv, multicast, &event, mc); + ret =cma_cm_event_handler (id_priv, &event); + }rdma_destroy_ah_attr (&event.param.ud.ah_attr);WARN_ON (ret);
@@ -4681,9 +4684,11 @@ static int cma_join_ib_multicast(struct rdma_id_private *id_priv,if (ret)return ret; - ret =cma_set_qkey (id_priv,0 ); -if (ret) -return ret; +if (!id_priv->qkey) { + ret =cma_set_default_qkey (id_priv); +if (ret) +return ret; + }cma_set_mgid (id_priv, (struct sockaddr *) &mc->addr, &rec.mgid); rec.qkey =cpu_to_be32 (id_priv->qkey);
@@ -4760,9 +4765,6 @@ static int cma_iboe_join_multicast(struct rdma_id_private *id_priv,cma_iboe_set_mgid (addr, &ib.rec.mgid, gid_type); ib.rec.pkey =cpu_to_be16 (0xffff ); -if (id_priv->id.ps ==RDMA_PS_UDP ) - ib.rec.qkey =cpu_to_be32 (RDMA_UDP_QKEY ); -if (dev_addr->bound_dev_if) ndev =dev_get_by_index (dev_addr->net, dev_addr->bound_dev_if);if (!ndev)
@@ -4788,6 +4790,9 @@ static int cma_iboe_join_multicast(struct rdma_id_private *id_priv,if (err || !ib.rec.mtu)return err ?: -EINVAL ; +if (!id_priv->qkey) +cma_set_default_qkey (id_priv); +rdma_ip2gid ((struct sockaddr *)&id_priv->id.route.addr.src_addr, &ib.rec.port_gid);INIT_WORK (&mc->iboe_join.work, cma_iboe_join_work_handler);
@@ -4813,6 +4818,9 @@ int rdma_join_multicast(struct rdma_cm_id *id, struct sockaddr *addr, READ_ONCE(id_priv->state) != RDMA_CM_ADDR_RESOLVED))return -EINVAL ; +if (id_priv->id.qp_type !=IB_QPT_UD ) +return -EINVAL ; + mc =kzalloc (sizeof (*mc),GFP_KERNEL );if (!mc)return -ENOMEM ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 25/91 bpf: tcp: Use sock_gen_put instead of sock_put in bpf_iter_tcp
In reply to Greg Kroah-HartmanFrom: Martin KaFai Lau <[email protected]>
[ Upstream commit 580031ff9952b7dbf48dedba6b56a100ae002bef ]
While reviewing the udp-iter batching patches, noticed the bpf_iter_tcp calling sock_put() is incorrect. It should call sock_gen_put instead because bpf_iter_tcp is iterating the ehash table which has the req sk and tw sk. This patch replaces all sock_put with sock_gen_put in the bpf_iter_tcp codepath.
--- net/ipv4/tcp_ipv4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv4/tcp_ipv4.c +2 -2
@@ -2760,7 +2760,7 @@ static int tcp_prog_seq_show(struct bpf_prog *prog, struct bpf_iter_meta *meta,static void bpf_iter_tcp_put_batch (struct bpf_tcp_iter_state *iter) {while (iter->cur_sk < iter->end_sk) -sock_put (iter->batch[iter->cur_sk++]); +sock_gen_put (iter->batch[iter->cur_sk++]); } static int bpf_iter_tcp_realloc_batch(struct bpf_tcp_iter_state *iter,
@@ -2919,7 +2919,7 @@ static void *bpf_iter_tcp_seq_next(struct seq_file *seq, void *v, loff_t *pos)* st->bucket. See tcp_seek_last_pos(). */ st->offset++; -sock_put (iter->batch[iter->cur_sk++]); +sock_gen_put (iter->batch[iter->cur_sk++]); }if (iter->cur_sk < iter->end_sk)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 26/91 9p/xen : Fix use after free bug in xen_9pfs_front_remove due to race condition
In reply to Greg Kroah-HartmanFrom: Zheng Wang <[email protected]>
[ Upstream commit ea4f1009408efb4989a0f139b70fb338e7f687d0 ]
In xen_9pfs_front_probe, it calls xen_9pfs_front_alloc_dataring to init priv->rings and bound &ring->work with p9_xen_response.
When it calls xen_9pfs_front_event_handler to handle IRQ requests, it will finally call schedule_work to start the work.
When we call xen_9pfs_front_remove to remove the driver, there may be a sequence as follows:
Fix it by finishing the work before cleanup in xen_9pfs_front_free.
Note that, this bug is found by static analysis, which might be false positive.
CPU0 CPU1
|p9_xen_response
xen_9pfs_front_remove|
xen_9pfs_front_free|
kfree(priv) |
//free priv |
|p9_tag_lookup
|//use priv->client--- net/9p/trans_xen.c | 4 ++++ 1 file changed, 4 insertions(+)
net/9p/trans_xen.c +4 -0
@@ -300,6 +300,10 @@ static void xen_9pfs_front_free(struct xen_9pfs_front_priv *priv)write_unlock (&xen_9pfs_lock);for (i =0 ; i < priv->num_rings; i++) { +struct xen_9pfs_dataring *ring = &priv->rings[i]; + +cancel_work_sync (&ring->work); +if (!priv->rings[i].intf)break ;if (priv->rings[i].irq >0 )
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 27/91 niu: Fix missing unwind goto in niu_alloc_channels()
In reply to Greg Kroah-HartmanFrom: Harshit Mogalapalli <[email protected]>
[ Upstream commit 8ce07be703456acb00e83d99f3b8036252c33b02 ]
Smatch reports: drivers/net/ethernet/sun/niu.c:4525
niu_alloc_channels() warn: missing unwind goto?
If niu_rbr_fill() fails, then we are directly returning 'err' without freeing the channels.
Fix this by changing direct return to a goto 'out_err'.
--- drivers/net/ethernet/sun/niu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/sun/niu.c +1 -1
@@ -4503,7 +4503,7 @@ static int niu_alloc_channels(struct niu *np) err =niu_rbr_fill (np, rp,GFP_KERNEL );if (err) -return err; + goto out_err; } tx_rings = kcalloc(num_tx_rings, sizeof(struct tx_ring_info),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 28/91 tcp: restrict net.ipv4.tcp_app_win
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit dc5110c2d959c1707e12df5f792f41d90614adaa ]
UBSAN: shift-out-of-bounds in net/ipv4/tcp_input.c:555:23 shift exponent 255 is too large for 32-bit type 'int' CPU: 1 PID: 7907 Comm: ssh Not tainted 6.3.0-rc4-00161-g62bad54b26db-dirty #206 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0x136/0x150 __ubsan_handle_shift_out_of_bounds+0x21f/0x5a0 tcp_init_transfer.cold+0x3a/0xb9 tcp_finish_connect+0x1d0/0x620 tcp_rcv_state_process+0xd78/0x4d60 tcp_v4_do_rcv+0x33d/0x9d0 __release_sock+0x133/0x3b0 release_sock+0x58/0x1b0
'maxwin' is int, shifting int for 32 or more bits is undefined behaviour.
--- Documentation/networking/ip-sysctl.rst | 2 ++ net/ipv4/sysctl_net_ipv4.c | 3 +++ 2 files changed, 5 insertions(+)
Documentation/networking/ip-sysctl.rst +2 -0
@@ -322,6 +322,8 @@ tcp_app_win - INTEGER Reserve max(window/2^tcp_app_win, mss) of window for application buffer. Value 0 is special, it means that nothing is reserved. + Possible values are [0, 31], inclusive. + Default: 31 tcp_autocorking - BOOLEAN
net/ipv4/sysctl_net_ipv4.c +3 -0
@@ -38,6 +38,7 @@ static int ip_local_port_range_min[] = { 1, 1 };static int ip_local_port_range_max[] = {65535 ,65535 };static int tcp_adv_win_scale_min =-31 ;static int tcp_adv_win_scale_max =31 ; +static int tcp_app_win_max =31 ;static int tcp_min_snd_mss_min =TCP_MIN_SND_MSS ;static int tcp_min_snd_mss_max =65535 ;static int ip_privileged_port_min;
@@ -1168,6 +1169,8 @@ static struct ctl_table ipv4_net_table[] = { .maxlen = sizeof(u8), .mode = 0644, .proc_handler = proc_dou8vec_minmax, + .extra1 = SYSCTL_ZERO, + .extra2 = &tcp_app_win_max, }, { .procname = "tcp_adv_win_scale",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 29/91 drm/armada: Fix a potential double free in an error handling path
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit b89ce1177d42d5c124e83f3858818cd4e6a2c46f ]
'priv' is a managed resource, so there is no need to free it explicitly or there will be a double free().
--- drivers/gpu/drm/armada/armada_drv.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/armada/armada_drv.c +0 -1
@@ -99,7 +99,6 @@ static int armada_drm_bind(struct device *dev)if (ret) {dev_err (dev,"[" DRM_NAME ":%s] can't kick out simple-fb: %d\n" , __func__, ret); -kfree (priv);return ret; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 30/91 qlcnic: check pci_reset_function result
In reply to Greg Kroah-HartmanFrom: Denis Plotnikov <[email protected]>
[ Upstream commit 7573099e10ca69c3be33995c1fcd0d241226816d ]
Static code analyzer complains to unchecked return value. The result of pci_reset_function() is unchecked.
Despite, the issue is on the FLR supported code path and in that case reset can be done with pcie_flr(), the patch uses less invasive approach by adding the result check of pci_reset_function().
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c +7 -1
@@ -628,7 +628,13 @@ int qlcnic_fw_create_ctx(struct qlcnic_adapter *dev)int i, err, ring;if (dev->flags &QLCNIC_NEED_FLR ) { -pci_reset_function (dev->pdev); + err =pci_reset_function (dev->pdev); +if (err) { +dev_err (&dev->pdev->dev, +"Adapter reset failed (%d). Please reboot\n" , + err); +return err; + } dev->flags &= ~QLCNIC_NEED_FLR ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 31/91 net: qrtr: Fix an uninit variable access bug in qrtr_tx_resume()
In reply to Greg Kroah-HartmanFrom: Ziyang Xuan <[email protected]>
[ Upstream commit 6417070918de3bcdbe0646e7256dae58fd8083ba ]
Syzbot reported a bug as following:
=====================================================
BUG: KMSAN: uninit-value in qrtr_tx_resume+0x185/0x1f0 net/qrtr/af_qrtr.c:230 qrtr_tx_resume+0x185/0x1f0 net/qrtr/af_qrtr.c:230 qrtr_endpoint_post+0xf85/0x11b0 net/qrtr/af_qrtr.c:519 qrtr_tun_write_iter+0x270/0x400 net/qrtr/tun.c:108 call_write_iter include/linux/fs.h:2189 [inline] aio_write+0x63a/0x950 fs/aio.c:1600 io_submit_one+0x1d1c/0x3bf0 fs/aio.c:2019 __do_sys_io_submit fs/aio.c:2078 [inline] __se_sys_io_submit+0x293/0x770 fs/aio.c:2048 __x64_sys_io_submit+0x92/0xd0 fs/aio.c:2048 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
Uninit was created at:
slab_post_alloc_hook mm/slab.h:766 [inline] slab_alloc_node mm/slub.c:3452 [inline] __kmem_cache_alloc_node+0x71f/0xce0 mm/slub.c:3491 __do_kmalloc_node mm/slab_common.c:967 [inline] __kmalloc_node_track_caller+0x114/0x3b0 mm/slab_common.c:988 kmalloc_reserve net/core/skbuff.c:492 [inline] __alloc_skb+0x3af/0x8f0 net/core/skbuff.c:565 __netdev_alloc_skb+0x120/0x7d0 net/core/skbuff.c:630 qrtr_endpoint_post+0xbd/0x11b0 net/qrtr/af_qrtr.c:446 qrtr_tun_write_iter+0x270/0x400 net/qrtr/tun.c:108 call_write_iter include/linux/fs.h:2189 [inline] aio_write+0x63a/0x950 fs/aio.c:1600 io_submit_one+0x1d1c/0x3bf0 fs/aio.c:2019 __do_sys_io_submit fs/aio.c:2078 [inline] __se_sys_io_submit+0x293/0x770 fs/aio.c:2048 __x64_sys_io_submit+0x92/0xd0 fs/aio.c:2048 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
It is because that skb->len requires at least sizeof(struct qrtr_ctrl_pkt) in qrtr_tx_resume(). And skb->len equals to size in qrtr_endpoint_post(). But size is less than sizeof(struct qrtr_ctrl_pkt) when qrtr_cb->type equals to QRTR_TYPE_RESUME_TX in qrtr_endpoint_post() under the syzbot scenario. This triggers the uninit variable access bug.
Add size check when qrtr_cb->type equals to QRTR_TYPE_RESUME_TX in qrtr_endpoint_post() to fix the bug.
--- net/qrtr/af_qrtr.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/qrtr/af_qrtr.c +5 -3
@@ -498,6 +498,11 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len)if (!size || len !=ALIGN (size,4 ) + hdrlen) goto err; +if ((cb->type ==QRTR_TYPE_NEW_SERVER || + cb->type ==QRTR_TYPE_RESUME_TX ) && + size <sizeof (struct qrtr_ctrl_pkt )) + goto err; +if (cb->dst_port !=QRTR_PORT_CTRL && cb->type !=QRTR_TYPE_DATA && cb->type !=QRTR_TYPE_RESUME_TX ) goto err;
@@ -510,9 +515,6 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len)/* Remote node endpoint can bridge other distant nodes */ const struct qrtr_ctrl_pkt *pkt; -if (size <sizeof (*pkt)) - goto err; - pkt = data + hdrlen;qrtr_node_assign (node,le32_to_cpu (pkt->server.node)); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 32/91 sctp: fix a potential overflow in sctp_ifwdtsn_skip
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
[ Upstream commit 32832a2caf82663870126c5186cf8f86c8b2a649 ]
Currently, when traversing ifwdtsn skips with _sctp_walk_ifwdtsn, it only checks the pos against the end of the chunk. However, the data left for the last pos may be < sizeof(struct sctp_ifwdtsn_skip), and dereference it as struct sctp_ifwdtsn_skip may cause coverflow.
This patch fixes it by checking the pos against "the end of the chunk - sizeof(struct sctp_ifwdtsn_skip)" in sctp_ifwdtsn_skip, similar to sctp_fwdtsn_skip.
--- net/sctp/stream_interleave.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/sctp/stream_interleave.c +2 -1
@@ -1162,7 +1162,8 @@ static void sctp_generate_iftsn(struct sctp_outq *q, __u32 ctsn)#define _sctp_walk_ifwdtsn (pos, chunk, end) \ for (pos = chunk->subh.ifwdtsn_hdr->skip; \ - (void *)pos < (void *)chunk->subh.ifwdtsn_hdr->skip + (end); pos++) + (void *)pos <= (void *)chunk->subh.ifwdtsn_hdr->skip + (end) - \ + sizeof(struct sctp_ifwdtsn_skip); pos++)#define sctp_walk_ifwdtsn (pos, ch) \ _sctp_walk_ifwdtsn((pos), (ch), ntohs((ch)->chunk_hdr->length) - \
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 6/91 ALSA: emu10k1: dont create old pass-through playback device on Audigy
In reply to Greg Kroah-HartmanFrom: Oswald Buddenhagen <[email protected]>
commit 8dd13214a810c695044aa168c0ddba1a9c433e4f upstream.
It could have never worked, as snd_emu10k1_fx8010_playback_prepare() and snd_emu10k1_fx8010_playback_hw_free() assume the emu10k1 offset for the ETRAM, and the default DSP code includes no handler for it. It also wouldn't make a lot of sense to make it work, as Audigy has an own, much simpler, pass-through mechanism. So just skip creation of the device.
--- sound/pci/emu10k1/emupcm.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
sound/pci/emu10k1/emupcm.c +7 -3
@@ -1781,17 +1781,21 @@ int snd_emu10k1_pcm_efx(struct snd_emu10struct snd_kcontrol *kctl;int err; - err =snd_pcm_new (emu->card,"emu10k1 efx" , device,8 ,1 , &pcm); + err =snd_pcm_new (emu->card,"emu10k1 efx" , device, emu->audigy ?0 :8 ,1 , &pcm);if (err <0 )return err; pcm->private_data = emu; -snd_pcm_set_ops (pcm,SNDRV_PCM_STREAM_PLAYBACK , &snd_emu10k1_fx8010_playback_ops); +if (!emu->audigy) +snd_pcm_set_ops (pcm,SNDRV_PCM_STREAM_PLAYBACK , &snd_emu10k1_fx8010_playback_ops);snd_pcm_set_ops (pcm,SNDRV_PCM_STREAM_CAPTURE , &snd_emu10k1_capture_efx_ops); pcm->info_flags =0 ; -strcpy (pcm->name,"Multichannel Capture/PT Playback" ); +if (emu->audigy) +strcpy (pcm->name,"Multichannel Capture" ); +else +strcpy (pcm->name,"Multichannel Capture/PT Playback" ); emu->pcm_efx = pcm;/* EFX capture - record the "FXBUS2" channels, by default we connect the EXTINs
Greg Kroah-Hartman
maintainerPATCH 33/91 RDMA/core: Fix GID entry ref leak when create_ah fails
In reply to Greg Kroah-HartmanFrom: Saravanan Vajravel <[email protected]>
[ Upstream commit aca3b0fa3d04b40c96934d86cc224cccfa7ea8e0 ]
If AH create request fails, release sgid_attr to avoid GID entry referrence leak reported while releasing GID table
--- drivers/infiniband/core/verbs.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/infiniband/core/verbs.c +2 -0
@@ -540,6 +540,8 @@ static struct ib_ah *_rdma_create_ah(struct ib_pd *pd,else ret = device->ops.create_ah (ah, &init_attr,NULL );if (ret) { +if (ah->sgid_attr) +rdma_put_gid_attr (ah->sgid_attr);kfree (ah);return ERR_PTR (ret); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 34/91 udp6: fix potential access to stale information
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 1c5950fc6fe996235f1d18539b9c6b64b597f50f ]
lena wang reported an issue caused by udpv6_sendmsg() mangling msg->msg_name and msg->msg_namelen, which are later read from ____sys_sendmsg() :
/*
* If this is sendmmsg() and sending to current destination address was
* successful, remember it.
*/
if (used_address && err >= 0) {
used_address->name_len = msg_sys->msg_namelen;
if (msg_sys->msg_name)
memcpy(&used_address->name, msg_sys->msg_name,
used_address->name_len);
}udpv6_sendmsg() wants to pretend the remote address family is AF_INET in order to call udp_sendmsg().
A fix would be to modify the address in-place, instead of using a local variable, but this could have other side effects.
Instead, restore initial values before we return from udpv6_sendmsg().
--- net/ipv6/udp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/ipv6/udp.c +5 -3
@@ -1359,9 +1359,11 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) msg->msg_name = &sin; msg->msg_namelen =sizeof (sin); do_udp_sendmsg: -if (__ipv6_only_sock (sk)) -return -ENETUNREACH ; -return udp_sendmsg (sk, msg, len); + err =__ipv6_only_sock (sk) ? + -ENETUNREACH :udp_sendmsg (sk, msg, len); + msg->msg_name = sin6; + msg->msg_namelen = addr_len; +return err; } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 35/91 net: macb: fix a memory corruption in extended buffer descriptor mode
In reply to Greg Kroah-HartmanFrom: Roman Gushchin <[email protected]>
[ Upstream commit e8b74453555872851bdd7ea43a7c0ec39659834f ]
For quite some time we were chasing a bug which looked like a sudden permanent failure of networking and mmc on some of our devices. The bug was very sensitive to any software changes and even more to any kernel debug options.
Finally we got a setup where the problem was reproducible with CONFIG_DMA_API_DEBUG=y and it revealed the issue with the rx dma:
[ 16.992082] ------------[ cut here ]------------ [ 16.996779] DMA-API: macb ff0b0000.ethernet: device driver tries to free DMA memory it has not allocated [device address=0x0000000875e3e244] [size=1536 bytes] [ 17.011049] WARNING: CPU: 0 PID: 85 at kernel/dma/debug.c:1011 check_unmap+0x6a0/0x900 [ 17.018977] Modules linked in: xxxxx [ 17.038823] CPU: 0 PID: 85 Comm: irq/55-8000f000 Not tainted 5.4.0 #28 [ 17.045345] Hardware name: xxxxx [ 17.049528] pstate: 60000005 (nZCv daif -PAN -UAO) [ 17.054322] pc : check_unmap+0x6a0/0x900 [ 17.058243] lr : check_unmap+0x6a0/0x900 [ 17.062163] sp : ffffffc010003c40 [ 17.065470] x29: ffffffc010003c40 x28: 000000004000c03c [ 17.070783] x27: ffffffc010da7048 x26: ffffff8878e38800 [ 17.076095] x25: ffffff8879d22810 x24: ffffffc010003cc8 [ 17.081407] x23: 0000000000000000 x22: ffffffc010a08750 [ 17.086719] x21: ffffff8878e3c7c0 x20: ffffffc010acb000 [ 17.092032] x19: 0000000875e3e244 x18: 0000000000000010 [ 17.097343] x17: 0000000000000000 x16: 0000000000000000 [ 17.102647] x15: ffffff8879e4a988 x14: 0720072007200720 [ 17.107959] x13: 0720072007200720 x12: 0720072007200720 [ 17.113261] x11: 0720072007200720 x10: 0720072007200720 [ 17.118565] x9 : 0720072007200720 x8 : 000000000000022d [ 17.123869] x7 : 0000000000000015 x6 : 0000000000000098 [ 17.129173] x5 : 0000000000000000 x4 : 0000000000000000 [ 17.134475] x3 : 00000000ffffffff x2 : ffffffc010a1d370 [ 17.139778] x1 : b420c9d75d27bb00 x0 : 0000000000000000 [ 17.145082] Call trace: [ 17.147524] check_unmap+0x6a0/0x900 [ 17.151091] debug_dma_unmap_page+0x88/0x90 [ 17.155266] gem_rx+0x114/0x2f0 [ 17.158396] macb_poll+0x58/0x100 [ 17.161705] net_rx_action+0x118/0x400 [ 17.165445] __do_softirq+0x138/0x36c [ 17.169100] irq_exit+0x98/0xc0 [ 17.172234] __handle_domain_irq+0x64/0xc0 [ 17.176320] gic_handle_irq+0x5c/0xc0 [ 17.179974] el1_irq+0xb8/0x140 [ 17.183109] xiic_process+0x5c/0xe30 [ 17.186677] irq_thread_fn+0x28/0x90 [ 17.190244] irq_thread+0x208/0x2a0 [ 17.193724] kthread+0x130/0x140 [ 17.196945] ret_from_fork+0x10/0x20 [ 17.200510] ---[ end trace 7240980785f81d6f ]---
[ 237.021490] ------------[ cut here ]------------ [ 237.026129] DMA-API: exceeded 7 overlapping mappings of cacheline 0x0000000021d79e7b [ 237.033886] WARNING: CPU: 0 PID: 0 at kernel/dma/debug.c:499 add_dma_entry+0x214/0x240 [ 237.041802] Modules linked in: xxxxx [ 237.061637] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G W 5.4.0 #28 [ 237.068941] Hardware name: xxxxx [ 237.073116] pstate: 80000085 (Nzcv daIf -PAN -UAO) [ 237.077900] pc : add_dma_entry+0x214/0x240 [ 237.081986] lr : add_dma_entry+0x214/0x240 [ 237.086072] sp : ffffffc010003c30 [ 237.089379] x29: ffffffc010003c30 x28: ffffff8878a0be00 [ 237.094683] x27: 0000000000000180 x26: ffffff8878e387c0 [ 237.099987] x25: 0000000000000002 x24: 0000000000000000 [ 237.105290] x23: 000000000000003b x22: ffffffc010a0fa00 [ 237.110594] x21: 0000000021d79e7b x20: ffffffc010abe600 [ 237.115897] x19: 00000000ffffffef x18: 0000000000000010 [ 237.121201] x17: 0000000000000000 x16: 0000000000000000 [ 237.126504] x15: ffffffc010a0fdc8 x14: 0720072007200720 [ 237.131807] x13: 0720072007200720 x12: 0720072007200720 [ 237.137111] x11: 0720072007200720 x10: 0720072007200720 [ 237.142415] x9 : 0720072007200720 x8 : 0000000000000259 [ 237.147718] x7 : 0000000000000001 x6 : 0000000000000000 [ 237.153022] x5 : ffffffc010003a20 x4 : 0000000000000001 [ 237.158325] x3 : 0000000000000006 x2 : 0000000000000007 [ 237.163628] x1 : 8ac721b3a7dc1c00 x0 : 0000000000000000 [ 237.168932] Call trace: [ 237.171373] add_dma_entry+0x214/0x240 [ 237.175115] debug_dma_map_page+0xf8/0x120 [ 237.179203] gem_rx_refill+0x190/0x280 [ 237.182942] gem_rx+0x224/0x2f0 [ 237.186075] macb_poll+0x58/0x100 [ 237.189384] net_rx_action+0x118/0x400 [ 237.193125] __do_softirq+0x138/0x36c [ 237.196780] irq_exit+0x98/0xc0 [ 237.199914] __handle_domain_irq+0x64/0xc0 [ 237.204000] gic_handle_irq+0x5c/0xc0 [ 237.207654] el1_irq+0xb8/0x140 [ 237.210789] arch_cpu_idle+0x40/0x200 [ 237.214444] default_idle_call+0x18/0x30 [ 237.218359] do_idle+0x200/0x280 [ 237.221578] cpu_startup_entry+0x20/0x30 [ 237.225493] rest_init+0xe4/0xf0 [ 237.228713] arch_call_rest_init+0xc/0x14 [ 237.232714] start_kernel+0x47c/0x4a8 [ 237.236367] ---[ end trace 7240980785f81d70 ]---
Lars was fast to find an explanation: according to the datasheet bit 2 of the rx buffer descriptor entry has a different meaning in the extended mode:
Address [2] of beginning of buffer, or
in extended buffer descriptor mode (DMA configuration register [28] = 1), indicates a valid timestamp in the buffer descriptor entry.
The macb driver didn't mask this bit while getting an address and it eventually caused a memory corruption and a dma failure.
The problem is resolved by explicitly clearing the problematic bit if hw timestamping is used.
--- drivers/net/ethernet/cadence/macb_main.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/cadence/macb_main.c +4 -0
@@ -1044,6 +1044,10 @@ static dma_addr_t macb_get_addr(struct macb *bp, struct macb_dma_desc *desc) }#endif addr |=MACB_BF (RX_WADDR ,MACB_BFEXT (RX_WADDR , desc->addr)); +#ifdef CONFIG_MACB_USE_HWSTAMP +if (bp->hw_dma_cap &HW_DMA_CAP_PTP ) + addr &= ~GEM_BIT (DMA_RXVALID ); +#endif return addr; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 7/91 ALSA: hda/sigmatel: fix S/PDIF out on Intel D*45* motherboards
In reply to Greg Kroah-HartmanFrom: Oswald Buddenhagen <[email protected]>
commit f342ac00da1064eb4f94b1f4bcacbdfea955797a upstream.
The BIOS botches this one completely - it says the 2nd S/PDIF output is used, while in fact it's the 1st one. This is tested on DP45SG, but I'm assuming it's valid for the other boards in the series as well.
Also add some comments regarding the pins.
FWIW, the codec is apparently still sold by Tempo Semiconductor, Inc., where one can download the documentation.
--- sound/pci/hda/patch_sigmatel.c | 8 ++++++++ 1 file changed, 8 insertions(+)
sound/pci/hda/patch_sigmatel.c +8 -0
@@ -1707,6 +1707,7 @@ static const struct snd_pci_quirk stac92 };static const struct hda_pintbl ref92hd73xx_pin_configs[] = { +// Port A-H {0x0a ,0x02214030 }, {0x0b ,0x02a19040 }, {0x0c ,0x01a19020 },
@@ -1715,9 +1716,12 @@ static const struct hda_pintbl ref92hd73 { 0x0f, 0x01014010 }, { 0x10, 0x01014020 }, { 0x11, 0x01014030 }, +// CD in { 0x12, 0x02319040 }, +// Digial Mic ins { 0x13, 0x90a000f0 }, { 0x14, 0x90a000f0 }, +// Digital outs { 0x22, 0x01452050 }, { 0x23, 0x01452050 }, {}
@@ -1758,6 +1762,7 @@ static const struct hda_pintbl alienware };static const struct hda_pintbl intel_dg45id_pin_configs[] = { +// Analog outputs {0x0a ,0x02214230 }, {0x0b ,0x02A19240 }, {0x0c ,0x01013214 },
@@ -1765,6 +1770,9 @@ static const struct hda_pintbl intel_dg4 { 0x0e, 0x01A19250 }, { 0x0f, 0x01011212 }, { 0x10, 0x01016211 }, +// Digital output + { 0x22, 0x01451380 }, + { 0x23, 0x40f000f0 }, {} };
Greg Kroah-Hartman
maintainerPATCH 8/91 Bluetooth: L2CAP: Fix use-after-free in l2cap_disconnect_{req,rsp}
In reply to Greg Kroah-HartmanFrom: Luiz Augusto von Dentz <[email protected]>
commit a2a9339e1c9deb7e1e079e12e27a0265aea8421a upstream.
Similar to commit d0be8347c623 ("Bluetooth: L2CAP: Fix use-after-free caused by l2cap_chan_put"), just use l2cap_chan_hold_unless_zero to prevent referencing a channel that is about to be destroyed.
--- net/bluetooth/l2cap_core.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-)
net/bluetooth/l2cap_core.c +6 -18
@@ -4652,33 +4652,27 @@ static inline int l2cap_disconnect_req(sBT_DBG ("scid 0x%4.4x dcid 0x%4.4x" , scid, dcid); -mutex_lock (&conn->chan_lock); - - chan =__l2cap_get_chan_by_scid (conn, dcid); + chan =l2cap_get_chan_by_scid (conn, dcid);if (!chan) { -mutex_unlock (&conn->chan_lock);cmd_reject_invalid_cid (conn, cmd->ident, dcid, scid);return 0 ; } -l2cap_chan_hold (chan); -l2cap_chan_lock (chan); - rsp.dcid =cpu_to_le16 (chan->scid); rsp.scid =cpu_to_le16 (chan->dcid);l2cap_send_cmd (conn, cmd->ident,L2CAP_DISCONN_RSP ,sizeof (rsp), &rsp); chan->ops->set_shutdown (chan); +mutex_lock (&conn->chan_lock);l2cap_chan_del (chan,ECONNRESET ); +mutex_unlock (&conn->chan_lock); chan->ops->close (chan);l2cap_chan_unlock (chan);l2cap_chan_put (chan); -mutex_unlock (&conn->chan_lock); -return 0 ; }
@@ -4698,33 +4692,27 @@ static inline int l2cap_disconnect_rsp(sBT_DBG ("dcid 0x%4.4x scid 0x%4.4x" , dcid, scid); -mutex_lock (&conn->chan_lock); - - chan =__l2cap_get_chan_by_scid (conn, scid); + chan =l2cap_get_chan_by_scid (conn, scid);if (!chan) {mutex_unlock (&conn->chan_lock);return 0 ; } -l2cap_chan_hold (chan); -l2cap_chan_lock (chan); -if (chan->state !=BT_DISCONN ) {l2cap_chan_unlock (chan);l2cap_chan_put (chan); -mutex_unlock (&conn->chan_lock);return 0 ; } +mutex_lock (&conn->chan_lock);l2cap_chan_del (chan,0 ); +mutex_unlock (&conn->chan_lock); chan->ops->close (chan);l2cap_chan_unlock (chan);l2cap_chan_put (chan); -mutex_unlock (&conn->chan_lock); -return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 9/91 Bluetooth: Fix race condition in hidp_session_thread
In reply to Greg Kroah-HartmanFrom: Min Li <[email protected]>
commit c95930abd687fcd1aa040dc4fe90dff947916460 upstream.
There is a potential race condition in hidp_session_thread that may lead to use-after-free. For instance, the timer is active while hidp_del_timer is called in hidp_session_thread(). After hidp_session_put, then 'session' will be freed, causing kernel panic when hidp_idle_timeout is running.
The solution is to use del_timer_sync instead of del_timer.
Here is the call trace:
? hidp_session_probe+0x780/0x780 call_timer_fn+0x2d/0x1e0 __run_timers.part.0+0x569/0x940 hidp_session_probe+0x780/0x780 call_timer_fn+0x1e0/0x1e0 ktime_get+0x5c/0xf0 lapic_next_deadline+0x2c/0x40 clockevents_program_event+0x205/0x320 run_timer_softirq+0xa9/0x1b0 __do_softirq+0x1b9/0x641 __irq_exit_rcu+0xdc/0x190 irq_exit_rcu+0xe/0x20 sysvec_apic_timer_interrupt+0xa1/0xc0
--- net/bluetooth/hidp/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/hidp/core.c +1 -1
@@ -433,7 +433,7 @@ static void hidp_set_timer(struct hidp_sstatic void hidp_del_timer (struct hidp_session *session) {if (session->idle_to >0 ) -del_timer (&session->timer); +del_timer_sync (&session->timer); } static void hidp_process_report(struct hidp_session *session, int type,
Greg Kroah-Hartman
maintainerPATCH 10/91 btrfs: print checksum type and implementation at mount time
In reply to Greg Kroah-HartmanFrom: David Sterba <[email protected]>
commit c8a5f8ca9a9c7d5c5bc31d54f47ea9d86f93ed69 upstream.
Per user request, print the checksum type and implementation at mount time among the messages. The checksum is user configurable and the actual crypto implementation is useful to see for performance reasons. The same information is also available after mount in /sys/fs/FSID/checksum file.
Example:
[25.323662] BTRFS info (device vdb): using sha256 (sha256-generic) checksum algorithm
--- fs/btrfs/disk-io.c | 3 +++ 1 file changed, 3 insertions(+)
fs/btrfs/disk-io.c +3 -0
@@ -2318,6 +2318,9 @@ static int btrfs_init_csum_hash(struct b fs_info->csum_shash = csum_shash; +btrfs_info (fs_info,"using %s (%s) checksum algorithm" , +btrfs_super_csum_name (csum_type), +crypto_shash_driver_name (csum_shash));return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 11/91 btrfs: fix fast csum implementation detection
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
commit 68d99ab0e9221ef54506f827576c5a914680eeaf upstream.
The BTRFS_FS_CSUM_IMPL_FAST flag is currently set whenever a non-generic crc32c is detected, which is the incorrect check if the file system uses a different checksumming algorithm. Refactor the code to only check this if crc32c is actually used. Note that in an ideal world the information if an algorithm is hardware accelerated or not should be provided by the crypto API instead, but that's left for another day.
--- fs/btrfs/disk-io.c | 14 ++++++++++++++ fs/btrfs/super.c | 2 -- 2 files changed, 14 insertions(+), 2 deletions(-)
fs/btrfs/disk-io.c +14 -0
@@ -2318,6 +2318,20 @@ static int btrfs_init_csum_hash(struct b fs_info->csum_shash = csum_shash; +/* +* Check if the checksum implementation is a fast accelerated one. +* As-is this is a bit of a hack and should be replaced once the csum +* implementations provide that information themselves. +*/ +switch (csum_type) { +case BTRFS_CSUM_TYPE_CRC32 : +if (!strstr (crypto_shash_driver_name (csum_shash),"generic" )) +set_bit (BTRFS_FS_CSUM_IMPL_FAST , &fs_info->flags); +break ; +default : +break ; + } +btrfs_info (fs_info,"using %s (%s) checksum algorithm" ,btrfs_super_csum_name (csum_type),crypto_shash_driver_name (csum_shash));
fs/btrfs/super.c +0 -2
@@ -1749,8 +1749,6 @@ static struct dentry *btrfs_mount_root(s }else {snprintf (s->s_id,sizeof (s->s_id),"%pg" , bdev);btrfs_sb (s)->bdev_holder = fs_type; -if (!strstr (crc32c_impl (),"generic" )) -set_bit (BTRFS_FS_CSUM_IMPL_FAST , &fs_info->flags); error =btrfs_fill_super (s, fs_devices, data); }if (!error)
Greg Kroah-Hartman
maintainerPATCH 12/91 fbmem: Reject FB_ACTIVATE_KD_TEXT from userspace
In reply to Greg Kroah-HartmanFrom: Daniel Vetter <[email protected]>
commit 6fd33a3333c7916689b8f051a185defe4dd515b0 upstream.
This is an oversight from dc5bdb68b5b3 ("drm/fb-helper: Fix vt restore") - I failed to realize that nasty userspace could set this.
It's not pretty to mix up kernel-internal and userspace uapi flags like this, but since the entire fb_var_screeninfo structure is uapi we'd need to either add a new parameter to the ->fb_set_par callback and fb_set_par() function, which has a _lot_ of users. Or some other fairly ugly side-channel int fb_info. Neither is a pretty prospect.
Instead just correct the issue at hand by filtering out this kernel-internal flag in the ioctl handling code.
--- drivers/video/fbdev/core/fbmem.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/video/fbdev/core/fbmem.c +2 -0
@@ -1119,6 +1119,8 @@ static long do_fb_ioctl(struct fb_info *case FBIOPUT_VSCREENINFO :if (copy_from_user (&var, argp,sizeof (var)))return -EFAULT ; +/* only for kernel-internal use */ + var.activate &= ~FB_ACTIVATE_KD_TEXT ;console_lock ();lock_fb_info (info); ret =fbcon_modechange_possible (info, &var);
Greg Kroah-Hartman
maintainerPATCH 3/91 ALSA: hda/sigmatel: add pin overrides for Intel DP45SG motherboard
In reply to Greg Kroah-HartmanFrom: Oswald Buddenhagen <[email protected]>
commit c17f8fd31700392b1bb9e7b66924333568cb3700 upstream.
Like the other boards from the D*45* series, this one sets up the outputs not quite correctly.
--- Documentation/sound/hd-audio/models.rst | 2 +- sound/pci/hda/patch_sigmatel.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
Documentation/sound/hd-audio/models.rst +1 -1
@@ -704,7 +704,7 @@ ref no-jd BIOS setup but without jack-detection intel - Intel DG45* mobos + Intel D*45* mobos dell-m6-amic Dell desktops/laptops with analog mics dell-m6-dmic
sound/pci/hda/patch_sigmatel.c +2 -0
@@ -1955,6 +1955,8 @@ static const struct snd_pci_quirk stac92 "DFI LanParty", STAC_92HD73XX_REF),SND_PCI_QUIRK (PCI_VENDOR_ID_DFI ,0x3101 ,"DFI LanParty" ,STAC_92HD73XX_REF ), +SND_PCI_QUIRK (PCI_VENDOR_ID_INTEL ,0x5001 , +"Intel DP45SG" ,STAC_92HD73XX_INTEL ),SND_PCI_QUIRK (PCI_VENDOR_ID_INTEL ,0x5002 ,"Intel DG45ID" ,STAC_92HD73XX_INTEL ), SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5003,
Greg Kroah-Hartman
maintainerPATCH 37/91 libbpf: Fix single-line struct definition output in btf_dump
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 872aec4b5f635d94111d48ec3c57fbe078d64e7d ]
btf_dump APIs emit unnecessary tabs when emitting struct/union definition that fits on the single line. Before this patch we'd get:
struct blah {<tab>};
This patch fixes this and makes sure that we get more natural:
struct blah {};
--- tools/lib/bpf/btf_dump.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
tools/lib/bpf/btf_dump.c +5 -2
@@ -1003,9 +1003,12 @@ static void btf_dump_emit_struct_def(struct btf_dump *d,* Keep `struct empty {}` on a single line, * only print newline when there are regular or padding fields. */ -if (vlen || t->size) +if (vlen || t->size) {btf_dump_printf (d,"\n" ); -btf_dump_printf (d,"%s}" ,pfx (lvl)); +btf_dump_printf (d,"%s}" ,pfx (lvl)); + }else { +btf_dump_printf (d,"}" ); + }if (packed)btf_dump_printf (d," __attribute__((packed))" ); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 46/91 asymmetric_keys: log on fatal failures in PE/pkcs7
In reply to Greg Kroah-HartmanFrom: Robbie Harwood <[email protected]>
[ Upstream commit 3584c1dbfffdabf8e3dc1dd25748bb38dd01cd43 ]
These particular errors can be encountered while trying to kexec when secureboot lockdown is in place. Without this change, even with a signed debug build, one still needs to reboot the machine to add the appropriate dyndbg parameters (since lockdown blocks debugfs).
Accordingly, upgrade all pr_debug() before fatal error into pr_warn().
--- crypto/asymmetric_keys/pkcs7_verify.c | 10 +++++----- crypto/asymmetric_keys/verify_pefile.c | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 17 deletions(-)
crypto/asymmetric_keys/pkcs7_verify.c +5 -5
@@ -79,16 +79,16 @@ static int pkcs7_digest(struct pkcs7_message *pkcs7, }if (sinfo->msgdigest_len != sig->digest_size) { -pr_debug ("Sig %u: Invalid digest size (%u)\n" , - sinfo->index, sinfo->msgdigest_len); +pr_warn ("Sig %u: Invalid digest size (%u)\n" , + sinfo->index, sinfo->msgdigest_len); ret = -EBADMSG ; goto error; }if (memcmp (sig->digest, sinfo->msgdigest, sinfo->msgdigest_len) !=0 ) { -pr_debug ("Sig %u: Message digest doesn't match\n" , - sinfo->index); +pr_warn ("Sig %u: Message digest doesn't match\n" , + sinfo->index); ret = -EKEYREJECTED ; goto error; }
@@ -481,7 +481,7 @@ int pkcs7_supply_detached_data(struct pkcs7_message *pkcs7, const void *data, size_t datalen) { if (pkcs7->data) { -pr_debug ("Data already supplied\n" ); +pr_warn ("Data already supplied\n" );return -EINVAL ; } pkcs7->data = data;
crypto/asymmetric_keys/verify_pefile.c +12 -12
@@ -74,7 +74,7 @@ static int pefile_parse_binary(const void *pebuf, unsigned int pelen,break ;default : -pr_debug ("Unknown PEOPT magic = %04hx\n" , pe32->magic); +pr_warn ("Unknown PEOPT magic = %04hx\n" , pe32->magic);return -ELIBBAD ; }
@@ -95,7 +95,7 @@ static int pefile_parse_binary(const void *pebuf, unsigned int pelen, ctx->certs_size = ddir->certs.size;if (!ddir->certs.virtual_address || !ddir->certs.size) { -pr_debug ("Unsigned PE binary\n" ); +pr_warn ("Unsigned PE binary\n" );return -ENODATA ; }
@@ -127,7 +127,7 @@ static int pefile_strip_sig_wrapper(const void *pebuf,unsigned len;if (ctx->sig_len <sizeof (wrapper)) { -pr_debug ("Signature wrapper too short\n" ); +pr_warn ("Signature wrapper too short\n" );return -ELIBBAD ; }
@@ -142,16 +142,16 @@ static int pefile_strip_sig_wrapper(const void *pebuf,* rounded up since 0.110. */ if (wrapper.length > ctx->sig_len) { -pr_debug ("Signature wrapper bigger than sig len (%x > %x)\n" , - ctx->sig_len, wrapper.length); +pr_warn ("Signature wrapper bigger than sig len (%x > %x)\n" , + ctx->sig_len, wrapper.length);return -ELIBBAD ; }if (wrapper.revision !=WIN_CERT_REVISION_2_0 ) { -pr_debug ("Signature is not revision 2.0\n" ); +pr_warn ("Signature is not revision 2.0\n" );return -ENOTSUPP ; }if (wrapper.cert_type !=WIN_CERT_TYPE_PKCS_SIGNED_DATA ) { -pr_debug ("Signature certificate type is not PKCS\n" ); +pr_warn ("Signature certificate type is not PKCS\n" );return -ENOTSUPP ; }
@@ -164,7 +164,7 @@ static int pefile_strip_sig_wrapper(const void *pebuf, ctx->sig_offset +=sizeof (wrapper); ctx->sig_len -=sizeof (wrapper);if (ctx->sig_len <4 ) { -pr_debug ("Signature data missing\n" ); +pr_warn ("Signature data missing\n" );return -EKEYREJECTED ; }
@@ -198,7 +198,7 @@ static int pefile_strip_sig_wrapper(const void *pebuf,return 0 ; } not_pkcs7: -pr_debug ("Signature data not PKCS#7\n" ); +pr_warn ("Signature data not PKCS#7\n" );return -ELIBBAD ; }
@@ -341,8 +341,8 @@ static int pefile_digest_pe(const void *pebuf, unsigned int pelen, digest_size =crypto_shash_digestsize (tfm);if (digest_size != ctx->digest_len) { -pr_debug ("Digest size mismatch (%zx != %x)\n" , - digest_size, ctx->digest_len); +pr_warn ("Digest size mismatch (%zx != %x)\n" , + digest_size, ctx->digest_len); ret = -EBADMSG ; goto error_no_desc; }
@@ -373,7 +373,7 @@ static int pefile_digest_pe(const void *pebuf, unsigned int pelen,* PKCS#7 certificate. */ if (memcmp (digest, ctx->digest, ctx->digest_len) !=0 ) { -pr_debug ("Digest mismatch\n" ); +pr_warn ("Digest mismatch\n" ); ret = -EKEYREJECTED ; }else {pr_debug ("The digests match!\n" );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 47/91 wifi: iwlwifi: mvm: fix mvmtxq->stopped handling
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit b58e3d4311b54b6dd0e37165277965da0c9eb21d ]
This could race if the queue is redirected while full, then the flushing internally would start it while it's not yet usable again. Fix it by using two state bits instead of just one.
--- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 5 ++++- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 4 +++- drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 5 ++++- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +4 -1
@@ -820,7 +820,10 @@ void iwl_mvm_mac_itxq_xmit(struct ieee80211_hw *hw, struct ieee80211_txq *txq)rcu_read_lock (); do { - while (likely(!mvmtxq->stopped && + while (likely(!test_bit(IWL_MVM_TXQ_STATE_STOP_FULL, + &mvmtxq->state) && + !test_bit(IWL_MVM_TXQ_STATE_STOP_REDIRECT, + &mvmtxq->state) && !test_bit(IWL_MVM_STATUS_IN_D3, &mvm->status))) { skb = ieee80211_tx_dequeue(hw, txq);
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +3 -1
@@ -727,7 +727,9 @@ struct iwl_mvm_txq {struct list_head list;u16 txq_id;atomic_t tx_request; -bool stopped; +#define IWL_MVM_TXQ_STATE_STOP_FULL 0 +#define IWL_MVM_TXQ_STATE_STOP_REDIRECT 1 +unsigned long state; }; static inline struct iwl_mvm_txq *
drivers/net/wireless/intel/iwlwifi/mvm/ops.c +4 -1
@@ -1304,7 +1304,10 @@ static void iwl_mvm_queue_state_change(struct iwl_op_mode *op_mode, txq = sta->txq[tid]; mvmtxq =iwl_mvm_txq_from_mac80211 (txq); - mvmtxq->stopped = !start; +if (start) +clear_bit (IWL_MVM_TXQ_STATE_STOP_FULL , &mvmtxq->state); +else +set_bit (IWL_MVM_TXQ_STATE_STOP_FULL , &mvmtxq->state);if (start && mvmsta->sta_state !=IEEE80211_STA_NOTEXIST )iwl_mvm_mac_itxq_xmit (mvm->hw, txq);
drivers/net/wireless/intel/iwlwifi/mvm/sta.c +2 -2
@@ -640,7 +640,7 @@ static int iwl_mvm_redirect_queue(struct iwl_mvm *mvm, int queue, int tid, queue, iwl_mvm_ac_to_tx_fifo[ac]);/* Stop the queue and wait for it to empty */ - txq->stopped = true; +set_bit (IWL_MVM_TXQ_STATE_STOP_REDIRECT , &txq->state); ret =iwl_trans_wait_tx_queues_empty (mvm->trans,BIT (queue));if (ret) {
@@ -683,7 +683,7 @@ static int iwl_mvm_redirect_queue(struct iwl_mvm *mvm, int queue, int tid, out:/* Continue using the queue */ - txq->stopped = false; +clear_bit (IWL_MVM_TXQ_STATE_STOP_REDIRECT , &txq->state);return ret; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 48/91 ACPI: resource: Add Medion S17413 to IRQ override quirk
In reply to Greg Kroah-HartmanFrom: Aymeric Wibo <[email protected]>
[ Upstream commit 2d0ab14634a26e54f8d6d231b47b7ef233e84599 ]
Add DMI info of the Medion S17413 (board M1xA) to the IRQ override quirk table. This fixes the keyboard not working on these laptops.
--- drivers/acpi/resource.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/acpi/resource.c +7 -0
@@ -396,6 +396,13 @@ static const struct dmi_system_id medion_laptop[] = { DMI_MATCH(DMI_BOARD_NAME, "M17T"), }, }, + { + .ident = "MEDION S17413", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "MEDION"), + DMI_MATCH(DMI_BOARD_NAME, "M1xA"), + }, + }, { } };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 49/91 counter: stm32-lptimer-cnt: Provide defines for clock polarities
In reply to Greg Kroah-HartmanFrom: William Breathitt Gray <[email protected]>
[ Upstream commit 05593a3fd1037b5fee85d3c8c28112f19e7baa06 ]
The STM32 low-power timer permits configuration of the clock polarity via the LPTIMX_CFGR register CKPOL bits. This patch provides preprocessor defines for the supported clock polarities.
Stable-dep-of: 00f4bc5184c1 ("counter: 104-quad-8: Fix Synapse action reported for Index signals")
--- drivers/counter/stm32-lptimer-cnt.c | 6 +++--- include/linux/mfd/stm32-lptimer.h | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-)
drivers/counter/stm32-lptimer-cnt.c +3 -3
@@ -140,9 +140,9 @@ static const enum counter_function stm32_lptim_cnt_functions[] = { };enum stm32_lptim_synapse_action { -STM32_LPTIM_SYNAPSE_ACTION_RISING_EDGE , -STM32_LPTIM_SYNAPSE_ACTION_FALLING_EDGE , -STM32_LPTIM_SYNAPSE_ACTION_BOTH_EDGES , +STM32_LPTIM_SYNAPSE_ACTION_RISING_EDGE =STM32_LPTIM_CKPOL_RISING_EDGE , +STM32_LPTIM_SYNAPSE_ACTION_FALLING_EDGE =STM32_LPTIM_CKPOL_FALLING_EDGE , +STM32_LPTIM_SYNAPSE_ACTION_BOTH_EDGES =STM32_LPTIM_CKPOL_BOTH_EDGES ,STM32_LPTIM_SYNAPSE_ACTION_NONE , };
include/linux/mfd/stm32-lptimer.h +5 -0
@@ -45,6 +45,11 @@#define STM32_LPTIM_PRESC GENMASK(11, 9)#define STM32_LPTIM_CKPOL GENMASK(2, 1) +/* STM32_LPTIM_CKPOL */ +#define STM32_LPTIM_CKPOL_RISING_EDGE 0 +#define STM32_LPTIM_CKPOL_FALLING_EDGE 1 +#define STM32_LPTIM_CKPOL_BOTH_EDGES 2 +/* STM32_LPTIM_ARR */ #define STM32_LPTIM_MAX_ARR 0xFFFF
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 50/91 counter: stm32-timer-cnt: Provide defines for slave mode selection
In reply to Greg Kroah-HartmanFrom: William Breathitt Gray <[email protected]>
[ Upstream commit ea434ff82649111de4fcabd76187270f8abdb63a ]
The STM32 timer permits configuration of the counter encoder mode via the slave mode control register (SMCR) slave mode selection (SMS) bits. This patch provides preprocessor defines for the supported encoder modes.
Stable-dep-of: 00f4bc5184c1 ("counter: 104-quad-8: Fix Synapse action reported for Index signals")
--- drivers/counter/stm32-timer-cnt.c | 16 ++++++++-------- include/linux/mfd/stm32-timers.h | 4 ++++ 2 files changed, 12 insertions(+), 8 deletions(-)
drivers/counter/stm32-timer-cnt.c +8 -8
@@ -93,16 +93,16 @@ static int stm32_count_function_get(struct counter_device *counter,regmap_read (priv->regmap,TIM_SMCR , &smcr);switch (smcr &TIM_SMCR_SMS ) { -case 0 : +case TIM_SMCR_SMS_SLAVE_MODE_DISABLED : *function =STM32_COUNT_SLAVE_MODE_DISABLED ;return 0 ; -case 1 : +case TIM_SMCR_SMS_ENCODER_MODE_1 : *function =STM32_COUNT_ENCODER_MODE_1 ;return 0 ; -case 2 : +case TIM_SMCR_SMS_ENCODER_MODE_2 : *function =STM32_COUNT_ENCODER_MODE_2 ;return 0 ; -case 3 : +case TIM_SMCR_SMS_ENCODER_MODE_3 : *function =STM32_COUNT_ENCODER_MODE_3 ;return 0 ;default :
@@ -119,16 +119,16 @@ static int stm32_count_function_set(struct counter_device *counter,switch (function) {case STM32_COUNT_SLAVE_MODE_DISABLED : - sms =0 ; + sms =TIM_SMCR_SMS_SLAVE_MODE_DISABLED ;break ;case STM32_COUNT_ENCODER_MODE_1 : - sms =1 ; + sms =TIM_SMCR_SMS_ENCODER_MODE_1 ;break ;case STM32_COUNT_ENCODER_MODE_2 : - sms =2 ; + sms =TIM_SMCR_SMS_ENCODER_MODE_2 ;break ;case STM32_COUNT_ENCODER_MODE_3 : - sms =3 ; + sms =TIM_SMCR_SMS_ENCODER_MODE_3 ;break ;default :return -EINVAL ;
include/linux/mfd/stm32-timers.h +4 -0
@@ -82,6 +82,10 @@#define MAX_TIM_ICPSC 0x3#define TIM_CR2_MMS_SHIFT 4#define TIM_CR2_MMS2_SHIFT 20 +#define TIM_SMCR_SMS_SLAVE_MODE_DISABLED 0/* counts on internal clock when CEN=1 */ +#define TIM_SMCR_SMS_ENCODER_MODE_1 1/* counts TI1FP1 edges, depending on TI2FP2 level */ +#define TIM_SMCR_SMS_ENCODER_MODE_2 2/* counts TI2FP2 edges, depending on TI1FP1 level */ +#define TIM_SMCR_SMS_ENCODER_MODE_3 3/* counts on both TI1FP1 and TI2FP2 edges */ #define TIM_SMCR_TS_SHIFT 4#define TIM_BDTR_BKF_MASK 0xF#define TIM_BDTR_BKF_SHIFT (x) (16 + (x) * 4)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 51/91 counter: Internalize sysfs interface code
In reply to Greg Kroah-HartmanFrom: William Breathitt Gray <[email protected]>
[ Upstream commit aaec1a0f76ec25f46bbb17b81487c4b0e1c318c5 ]
This is a reimplementation of the Generic Counter driver interface. There are no modifications to the Counter subsystem userspace interface, so existing userspace applications should continue to run seamlessly.
The purpose of this patch is to internalize the sysfs interface code among the various counter drivers into a shared module. Counter drivers pass and take data natively (i.e. u8, u64, etc.) and the shared counter module handles the translation between the sysfs interface and the device drivers. This guarantees a standard userspace interface for all counter drivers, and helps generalize the Generic Counter driver ABI in order to support the Generic Counter chrdev interface (introduced in a subsequent patch) without significant changes to the existing counter drivers.
Note, Counter device registration is the same as before: drivers populate a struct counter_device with components and callbacks, then pass the structure to the devm_counter_register function. However, what's different now is how the Counter subsystem code handles this registration internally.
Whereas before callbacks would interact directly with sysfs data, this interaction is now abstracted and instead callbacks interact with native C data types. The counter_comp structure forms the basis for Counter extensions.
The counter-sysfs.c file contains the code to parse through the counter_device structure and register the requested components and extensions. Attributes are created and populated based on type, with respective translation functions to handle the mapping between sysfs and the counter driver callbacks.
The translation performed for each attribute is straightforward: the attribute type and data is parsed from the counter_attribute structure, the respective counter driver read/write callback is called, and sysfs I/O is handled before or after the driver read/write function is called.
Stable-dep-of: 00f4bc5184c1 ("counter: 104-quad-8: Fix Synapse action reported for Index signals")
--- MAINTAINERS | 1 - drivers/counter/104-quad-8.c | 449 +++---- drivers/counter/Makefile | 1 + drivers/counter/counter-core.c | 142 +++ drivers/counter/counter-sysfs.c | 849 +++++++++++++ drivers/counter/counter-sysfs.h | 13 + drivers/counter/counter.c | 1496 ----------------------- drivers/counter/ftm-quaddec.c | 60 +- drivers/counter/intel-qep.c | 146 +-- drivers/counter/interrupt-cnt.c | 62 +- drivers/counter/microchip-tcb-capture.c | 91 +- drivers/counter/stm32-lptimer-cnt.c | 212 ++-- drivers/counter/stm32-timer-cnt.c | 179 ++- drivers/counter/ti-eqep.c | 180 +-- include/linux/counter.h | 658 +++++----- include/linux/counter_enum.h | 45 - 16 files changed, 1950 insertions(+), 2634 deletions(-) create mode 100644 drivers/counter/counter-core.c create mode 100644 drivers/counter/counter-sysfs.c create mode 100644 drivers/counter/counter-sysfs.h delete mode 100644 drivers/counter/counter.c delete mode 100644 include/linux/counter_enum.h
MAINTAINERS +0 -1
@@ -4813,7 +4813,6 @@ F: Documentation/ABI/testing/sysfs-bus-counter F: Documentation/driver-api/generic-counter.rst F: drivers/counter/ F: include/linux/counter.h -F: include/linux/counter_enum.h CP2615 I2C DRIVER M: Bence Csókás <[email protected]>
drivers/counter/104-quad-8.c +191 -258
796 lines not on this page · raw message
drivers/counter/Makefile +1 -0
@@ -4,6 +4,7 @@ # obj-$(CONFIG_COUNTER) += counter.o +counter-y := counter-core.o counter-sysfs.o obj-$(CONFIG_104_QUAD_8) += 104-quad-8.o obj-$(CONFIG_INTERRUPT_CNT) += interrupt-cnt.o
drivers/counter/counter-core.c new file +142 -0
142 lines not on this page · raw message
drivers/counter/counter-sysfs.c new file +849 -0
849 lines not on this page · raw message
drivers/counter/counter-sysfs.h new file +13 -0
@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Counter sysfs interface +* Copyright (C) 2020 William Breathitt Gray +*/ +#ifndef _COUNTER_SYSFS_H_ +#define _COUNTER_SYSFS_H_ + +#include <linux/counter.h> + +int counter_sysfs_add (struct counter_device *const counter); + +#endif /* _COUNTER_SYSFS_H_ */
drivers/counter/counter.c deleted +0 -1496
1,186 lines not on this page · raw message
drivers/counter/ftm-quaddec.c +23 -37
60 lines not on this page · raw message
drivers/counter/intel-qep.c +62 -84
146 lines not on this page · raw message
drivers/counter/interrupt-cnt.c +26 -36
62 lines not on this page · raw message
drivers/counter/microchip-tcb-capture.c +39 -52
91 lines not on this page · raw message
drivers/counter/stm32-lptimer-cnt.c +100 -112
212 lines not on this page · raw message
drivers/counter/stm32-timer-cnt.c +68 -111
179 lines not on this page · raw message
drivers/counter/ti-eqep.c +98 -82
180 lines not on this page · raw message
include/linux/counter.h +338 -320
658 lines not on this page · raw message
include/linux/counter_enum.h deleted +0 -45
45 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.39.2
Part of the diff is not shown here. View the raw message.
Greg Kroah-Hartman
maintainerPATCH 52/91 counter: 104-quad-8: Fix Synapse action reported for Index signals
In reply to Greg Kroah-HartmanFrom: William Breathitt Gray <[email protected]>
[ Upstream commit 00f4bc5184c19cb33f468f1ea409d70d19f8f502 ]
Signal 16 and higher represent the device's Index lines. The priv->preset_enable array holds the device configuration for these Index lines. The preset_enable configuration is active low on the device, so invert the conditional check in quad8_action_read() to properly handle the logical state of preset_enable.
--- drivers/counter/104-quad-8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/counter/104-quad-8.c +1 -1
@@ -327,7 +327,7 @@ static int quad8_action_read(struct counter_device *counter,/* Handle Index signals */ if (synapse->signal->id >=16 ) { -if (priv->preset_enable[count->id]) +if (!priv->preset_enable[count->id]) *action =COUNTER_SYNAPSE_ACTION_RISING_EDGE ;else *action =COUNTER_SYNAPSE_ACTION_NONE ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 53/91 tracing: Add trace_array_puts() to write into instance
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (Google) <[email protected]>
[ Upstream commit d503b8f7474fe7ac616518f7fc49773cbab49f36 ]
Add a generic trace_array_puts() that can be used to "trace_puts()" into an allocated trace_array instance. This is just another variant of trace_array_printk().
Stable-dep-of: 9d52727f8043 ("tracing: Have tracing_snapshot_instance_cond() write errors to the appropriate instance")
--- include/linux/trace.h | 12 ++++++++++++ kernel/trace/trace.c | 27 +++++++++++++++++---------- 2 files changed, 29 insertions(+), 10 deletions(-)
include/linux/trace.h +12 -0
@@ -33,6 +33,18 @@ struct trace_array;int register_ftrace_export (struct trace_export *export);int unregister_ftrace_export (struct trace_export *export); +/** +* trace_array_puts - write a constant string into the trace buffer. +* @tr: The trace array to write to +* @str: The constant string to write +*/ +#define trace_array_puts (tr, str) \ + ({ \ + str ? __trace_array_puts(tr, _THIS_IP_, str, strlen(str)) : -1; \ + }) +int __trace_array_puts (struct trace_array *tr,unsigned long ip, +const char *str,int size); +void trace_printk_init_buffers (void ); __printf(3, 4) int trace_array_printk(struct trace_array *tr, unsigned long ip,
kernel/trace/trace.c +17 -10
@@ -990,13 +990,8 @@ __buffer_unlock_commit(struct trace_buffer *buffer, struct ring_buffer_event *evring_buffer_unlock_commit (buffer, event); } -/** -* __trace_puts - write a constant string into the trace buffer. -* @ip: The address of the caller -* @str: The constant string to write -* @size: The size of the string. -*/ -int __trace_puts (unsigned long ip,const char *str,int size) +int __trace_array_puts (struct trace_array *tr,unsigned long ip, +const char *str,int size) {struct ring_buffer_event *event;struct trace_buffer *buffer;
@@ -1004,7 +999,7 @@ int __trace_puts(unsigned long ip, const char *str, int size)unsigned int trace_ctx;int alloc; -if (!(global_trace.trace_flags &TRACE_ITER_PRINTK )) +if (!(tr->trace_flags &TRACE_ITER_PRINTK ))return 0 ;if (unlikely (tracing_selftest_running || tracing_disabled))
@@ -1013,7 +1008,7 @@ int __trace_puts(unsigned long ip, const char *str, int size) alloc =sizeof (*entry) + size +2 ;/* possible \n added */ trace_ctx =tracing_gen_ctx (); - buffer = global_trace.array_buffer.buffer; + buffer = tr->array_buffer.buffer;ring_buffer_nest_start (buffer); event =__trace_buffer_lock_reserve (buffer,TRACE_PRINT , alloc, trace_ctx);
@@ -1035,11 +1030,23 @@ int __trace_puts(unsigned long ip, const char *str, int size) entry->buf[size] ='\0' ;__buffer_unlock_commit (buffer, event); -ftrace_trace_stack (&global_trace, buffer, trace_ctx,4 ,NULL ); +ftrace_trace_stack (tr, buffer, trace_ctx,4 ,NULL ); out:ring_buffer_nest_end (buffer);return size; } +EXPORT_SYMBOL_GPL (__trace_array_puts); + +/** +* __trace_puts - write a constant string into the trace buffer. +* @ip: The address of the caller +* @str: The constant string to write +* @size: The size of the string. +*/ +int __trace_puts (unsigned long ip,const char *str,int size) +{ +return __trace_array_puts (&global_trace, ip, str, size); +}EXPORT_SYMBOL_GPL (__trace_puts);/**
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 54/91 tracing: Have tracing_snapshot_instance_cond() write errors to the appropriate instance
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (Google) <[email protected]>
[ Upstream commit 9d52727f8043cfda241ae96896628d92fa9c50bb ]
If a trace instance has a failure with its snapshot code, the error message is to be written to that instance's buffer. But currently, the message is written to the top level buffer. Worse yet, it may also disable the top level buffer and not the instance that had the issue.
--- kernel/trace/trace.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
kernel/trace/trace.c +7 -7
@@ -1100,22 +1100,22 @@ static void tracing_snapshot_instance_cond(struct trace_array *tr,unsigned long flags;if (in_nmi ()) { -internal_trace_puts ("*** SNAPSHOT CALLED FROM NMI CONTEXT ***\n" ); -internal_trace_puts ("*** snapshot is being ignored ***\n" ); +trace_array_puts (tr,"*** SNAPSHOT CALLED FROM NMI CONTEXT ***\n" ); +trace_array_puts (tr,"*** snapshot is being ignored ***\n" );return ; }if (!tr->allocated_snapshot) { -internal_trace_puts ("*** SNAPSHOT NOT ALLOCATED ***\n" ); -internal_trace_puts ("*** stopping trace here! ***\n" ); -tracing_off (); +trace_array_puts (tr,"*** SNAPSHOT NOT ALLOCATED ***\n" ); +trace_array_puts (tr,"*** stopping trace here! ***\n" ); +tracer_tracing_off (tr);return ; }/* Note, snapshot can not be used when the tracer uses it */ if (tracer->use_max_tr) { -internal_trace_puts ("*** LATENCY TRACER ACTIVE ***\n" ); -internal_trace_puts ("*** Can not use snapshot (sorry) ***\n" ); +trace_array_puts (tr,"*** LATENCY TRACER ACTIVE ***\n" ); +trace_array_puts (tr,"*** Can not use snapshot (sorry) ***\n" );return ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 55/91 i915/perf: Replace DRM_DEBUG with driver specific drm_dbg call
In reply to Greg Kroah-HartmanFrom: Umesh Nerlige Ramappa <[email protected]>
[ Upstream commit 2fec539112e89255b6a47f566e21d99937fada7b ]
DRM_DEBUG is not the right debug call to use in i915 OA, replace it with driver specific drm_dbg() call (Matt).
Stable-dep-of: dc30c0114691 ("drm/i915: fix race condition UAF in i915_perf_add_config_ioctl")
--- drivers/gpu/drm/i915/i915_perf.c | 151 ++++++++++++++++++++----------- 1 file changed, 100 insertions(+), 51 deletions(-)
drivers/gpu/drm/i915/i915_perf.c +100 -51
@@ -879,8 +879,9 @@ static int gen8_oa_read(struct i915_perf_stream *stream,if (ret)return ret; -DRM_DEBUG ("OA buffer overflow (exponent = %d): force restart\n" , - stream->period_exponent); +drm_dbg (&stream->perf->i915->drm, +"OA buffer overflow (exponent = %d): force restart\n" , + stream->period_exponent); stream->perf->ops.oa_disable (stream); stream->perf->ops.oa_enable (stream);
@@ -1102,8 +1103,9 @@ static int gen7_oa_read(struct i915_perf_stream *stream,if (ret)return ret; -DRM_DEBUG ("OA buffer overflow (exponent = %d): force restart\n" , - stream->period_exponent); +drm_dbg (&stream->perf->i915->drm, +"OA buffer overflow (exponent = %d): force restart\n" , + stream->period_exponent); stream->perf->ops.oa_disable (stream); stream->perf->ops.oa_enable (stream);
@@ -2857,7 +2859,8 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,int ret;if (!props->engine) { -DRM_DEBUG ("OA engine not specified\n" ); +drm_dbg (&stream->perf->i915->drm, +"OA engine not specified\n" );return -EINVAL ; }
@@ -2867,18 +2870,21 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,* IDs */ if (!perf->metrics_kobj) { -DRM_DEBUG ("OA metrics weren't advertised via sysfs\n" ); +drm_dbg (&stream->perf->i915->drm, +"OA metrics weren't advertised via sysfs\n" );return -EINVAL ; }if (!(props->sample_flags &SAMPLE_OA_REPORT ) && (GRAPHICS_VER (perf->i915) <12 || !stream->ctx)) { -DRM_DEBUG ("Only OA report sampling supported\n" ); +drm_dbg (&stream->perf->i915->drm, +"Only OA report sampling supported\n" );return -EINVAL ; }if (!perf->ops.enable_metric_set) { -DRM_DEBUG ("OA unit not supported\n" ); +drm_dbg (&stream->perf->i915->drm, +"OA unit not supported\n" );return -ENODEV ; }
@@ -2888,12 +2894,14 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,* we currently only allow exclusive access */ if (perf->exclusive_stream) { -DRM_DEBUG ("OA unit already in use\n" ); +drm_dbg (&stream->perf->i915->drm, +"OA unit already in use\n" );return -EBUSY ; }if (!props->oa_format) { -DRM_DEBUG ("OA report format not specified\n" ); +drm_dbg (&stream->perf->i915->drm, +"OA report format not specified\n" );return -EINVAL ; }
@@ -2923,20 +2931,23 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,if (stream->ctx) { ret =oa_get_render_ctx_id (stream);if (ret) { -DRM_DEBUG ("Invalid context id to filter with\n" ); +drm_dbg (&stream->perf->i915->drm, +"Invalid context id to filter with\n" );return ret; } } ret =alloc_noa_wait (stream);if (ret) { -DRM_DEBUG ("Unable to allocate NOA wait batch buffer\n" ); +drm_dbg (&stream->perf->i915->drm, +"Unable to allocate NOA wait batch buffer\n" ); goto err_noa_wait_alloc; } stream->oa_config =i915_perf_get_oa_config (perf, props->metrics_set);if (!stream->oa_config) { -DRM_DEBUG ("Invalid OA config id=%i\n" , props->metrics_set); +drm_dbg (&stream->perf->i915->drm, +"Invalid OA config id=%i\n" , props->metrics_set); ret = -EINVAL ; goto err_config; }
@@ -2967,11 +2978,13 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream, ret =i915_perf_stream_enable_sync (stream);if (ret) { -DRM_DEBUG ("Unable to enable metric set\n" ); +drm_dbg (&stream->perf->i915->drm, +"Unable to enable metric set\n" ); goto err_enable; } -DRM_DEBUG ("opening stream oa config uuid=%s\n" , +drm_dbg (&stream->perf->i915->drm, +"opening stream oa config uuid=%s\n" , stream->oa_config->uuid); hrtimer_init(&stream->poll_check_timer,
@@ -3423,7 +3436,8 @@ i915_perf_open_ioctl_locked(struct i915_perf *perf, specific_ctx =i915_gem_context_lookup (file_priv, ctx_handle);if (IS_ERR (specific_ctx)) { -DRM_DEBUG ("Failed to look up context with ID %u for opening perf stream\n" , +drm_dbg (&perf->i915->drm, +"Failed to look up context with ID %u for opening perf stream\n" , ctx_handle); ret =PTR_ERR (specific_ctx); goto err;
@@ -3457,7 +3471,8 @@ i915_perf_open_ioctl_locked(struct i915_perf *perf,if (props->hold_preemption) {if (!props->single_context) { -DRM_DEBUG ("preemption disable with no context\n" ); +drm_dbg (&perf->i915->drm, +"preemption disable with no context\n" ); ret = -EINVAL ; goto err; }
@@ -3479,7 +3494,8 @@ i915_perf_open_ioctl_locked(struct i915_perf *perf,*/ if (privileged_op && i915_perf_stream_paranoid && !perfmon_capable ()) { -DRM_DEBUG ("Insufficient privileges to open i915 perf stream\n" ); +drm_dbg (&perf->i915->drm, +"Insufficient privileges to open i915 perf stream\n" ); ret = -EACCES ; goto err_ctx; }
@@ -3586,7 +3602,8 @@ static int read_properties_unlocked(struct i915_perf *perf, props->poll_oa_period =DEFAULT_POLL_PERIOD_NS ;if (!n_props) { -DRM_DEBUG ("No i915 perf properties given\n" ); +drm_dbg (&perf->i915->drm, +"No i915 perf properties given\n" );return -EINVAL ; }
@@ -3595,7 +3612,8 @@ static int read_properties_unlocked(struct i915_perf *perf,I915_ENGINE_CLASS_RENDER , 0);if (!props->engine) { -DRM_DEBUG ("No RENDER-capable engines\n" ); +drm_dbg (&perf->i915->drm, +"No RENDER-capable engines\n" );return -EINVAL ; }
@@ -3606,7 +3624,8 @@ static int read_properties_unlocked(struct i915_perf *perf,* from userspace. */ if (n_props >=DRM_I915_PERF_PROP_MAX ) { -DRM_DEBUG ("More i915 perf properties specified than exist\n" ); +drm_dbg (&perf->i915->drm, +"More i915 perf properties specified than exist\n" );return -EINVAL ; }
@@ -3623,7 +3642,8 @@ static int read_properties_unlocked(struct i915_perf *perf,return ret;if (id ==0 || id >=DRM_I915_PERF_PROP_MAX ) { -DRM_DEBUG ("Unknown i915 perf property ID\n" ); +drm_dbg (&perf->i915->drm, +"Unknown i915 perf property ID\n" );return -EINVAL ; }
@@ -3638,19 +3658,22 @@ static int read_properties_unlocked(struct i915_perf *perf,break ;case DRM_I915_PERF_PROP_OA_METRICS_SET :if (value ==0 ) { -DRM_DEBUG ("Unknown OA metric set ID\n" ); +drm_dbg (&perf->i915->drm, +"Unknown OA metric set ID\n" );return -EINVAL ; } props->metrics_set = value;break ;case DRM_I915_PERF_PROP_OA_FORMAT :if (value ==0 || value >=I915_OA_FORMAT_MAX ) { -DRM_DEBUG ("Out-of-range OA report format %llu\n" , +drm_dbg (&perf->i915->drm, +"Out-of-range OA report format %llu\n" , value);return -EINVAL ; }if (!oa_format_valid (perf, value)) { -DRM_DEBUG ("Unsupported OA report format %llu\n" , +drm_dbg (&perf->i915->drm, +"Unsupported OA report format %llu\n" , value);return -EINVAL ; }
@@ -3658,7 +3681,8 @@ static int read_properties_unlocked(struct i915_perf *perf,break ;case DRM_I915_PERF_PROP_OA_EXPONENT :if (value >OA_EXPONENT_MAX ) { -DRM_DEBUG ("OA timer exponent too high (> %u)\n" , +drm_dbg (&perf->i915->drm, +"OA timer exponent too high (> %u)\n" ,OA_EXPONENT_MAX );return -EINVAL ; }
@@ -3686,7 +3710,8 @@ static int read_properties_unlocked(struct i915_perf *perf, oa_freq_hz =0 ;if (oa_freq_hz > i915_oa_max_sample_rate && !perfmon_capable ()) { -DRM_DEBUG ("OA exponent would exceed the max sampling frequency (sysctl dev.i915.oa_max_sample_rate) %uHz without CAP_PERFMON or CAP_SYS_ADMIN privileges\n" , +drm_dbg (&perf->i915->drm, +"OA exponent would exceed the max sampling frequency (sysctl dev.i915.oa_max_sample_rate) %uHz without CAP_PERFMON or CAP_SYS_ADMIN privileges\n" , i915_oa_max_sample_rate);return -EACCES ; }
@@ -3703,13 +3728,15 @@ static int read_properties_unlocked(struct i915_perf *perf,if (copy_from_user (&user_sseu,u64_to_user_ptr (value),sizeof (user_sseu))) { -DRM_DEBUG ("Unable to copy global sseu parameter\n" ); +drm_dbg (&perf->i915->drm, +"Unable to copy global sseu parameter\n" );return -EFAULT ; } ret =get_sseu_config (&props->sseu, props->engine, &user_sseu);if (ret) { -DRM_DEBUG ("Invalid SSEU configuration\n" ); +drm_dbg (&perf->i915->drm, +"Invalid SSEU configuration\n" );return ret; } props->has_sseu = true;
@@ -3717,7 +3744,8 @@ static int read_properties_unlocked(struct i915_perf *perf, }case DRM_I915_PERF_PROP_POLL_OA_PERIOD :if (value <100000 /* 100us */ ) { -DRM_DEBUG ("OA availability timer too small (%lluns < 100us)\n" , +drm_dbg (&perf->i915->drm, +"OA availability timer too small (%lluns < 100us)\n" , value);return -EINVAL ; }
@@ -3768,7 +3796,8 @@ int i915_perf_open_ioctl(struct drm_device *dev, void *data,int ret;if (!perf->i915) { -DRM_DEBUG ("i915 perf interface not available for this system\n" ); +drm_dbg (&perf->i915->drm, +"i915 perf interface not available for this system\n" );return -ENOTSUPP ; }
@@ -3776,7 +3805,8 @@ int i915_perf_open_ioctl(struct drm_device *dev, void *data,I915_PERF_FLAG_FD_NONBLOCK |I915_PERF_FLAG_DISABLED ;if (param->flags & ~known_open_flags) { -DRM_DEBUG ("Unknown drm_i915_perf_open_param flag\n" ); +drm_dbg (&perf->i915->drm, +"Unknown drm_i915_perf_open_param flag\n" );return -EINVAL ; }
@@ -3986,7 +4016,8 @@ static struct i915_oa_reg *alloc_oa_regs(struct i915_perf *perf, goto addr_err;if (!is_valid (perf, addr)) { -DRM_DEBUG ("Invalid oa_reg address: %X\n" , addr); +drm_dbg (&perf->i915->drm, +"Invalid oa_reg address: %X\n" , addr); err = -EINVAL ; goto addr_err; }
@@ -4060,30 +4091,35 @@ int i915_perf_add_config_ioctl(struct drm_device *dev, void *data,int err, id;if (!perf->i915) { -DRM_DEBUG ("i915 perf interface not available for this system\n" ); +drm_dbg (&perf->i915->drm, +"i915 perf interface not available for this system\n" );return -ENOTSUPP ; }if (!perf->metrics_kobj) { -DRM_DEBUG ("OA metrics weren't advertised via sysfs\n" ); +drm_dbg (&perf->i915->drm, +"OA metrics weren't advertised via sysfs\n" );return -EINVAL ; }if (i915_perf_stream_paranoid && !perfmon_capable ()) { -DRM_DEBUG ("Insufficient privileges to add i915 OA config\n" ); +drm_dbg (&perf->i915->drm, +"Insufficient privileges to add i915 OA config\n" );return -EACCES ; }if ((!args->mux_regs_ptr || !args->n_mux_regs) && (!args->boolean_regs_ptr || !args->n_boolean_regs) && (!args->flex_regs_ptr || !args->n_flex_regs)) { -DRM_DEBUG ("No OA registers given\n" ); +drm_dbg (&perf->i915->drm, +"No OA registers given\n" );return -EINVAL ; } oa_config =kzalloc (sizeof (*oa_config),GFP_KERNEL );if (!oa_config) { -DRM_DEBUG ("Failed to allocate memory for the OA config\n" ); +drm_dbg (&perf->i915->drm, +"Failed to allocate memory for the OA config\n" );return -ENOMEM ; }
@@ -4091,7 +4127,8 @@ int i915_perf_add_config_ioctl(struct drm_device *dev, void *data,kref_init (&oa_config->ref);if (!uuid_is_valid (args->uuid)) { -DRM_DEBUG ("Invalid uuid format for OA config\n" ); +drm_dbg (&perf->i915->drm, +"Invalid uuid format for OA config\n" ); err = -EINVAL ; goto reg_err; }
@@ -4108,7 +4145,8 @@ int i915_perf_add_config_ioctl(struct drm_device *dev, void *data, args->n_mux_regs);if (IS_ERR (regs)) { -DRM_DEBUG ("Failed to create OA config for mux_regs\n" ); +drm_dbg (&perf->i915->drm, +"Failed to create OA config for mux_regs\n" ); err =PTR_ERR (regs); goto reg_err; }
@@ -4121,7 +4159,8 @@ int i915_perf_add_config_ioctl(struct drm_device *dev, void *data, args->n_boolean_regs);if (IS_ERR (regs)) { -DRM_DEBUG ("Failed to create OA config for b_counter_regs\n" ); +drm_dbg (&perf->i915->drm, +"Failed to create OA config for b_counter_regs\n" ); err =PTR_ERR (regs); goto reg_err; }
@@ -4140,7 +4179,8 @@ int i915_perf_add_config_ioctl(struct drm_device *dev, void *data, args->n_flex_regs);if (IS_ERR (regs)) { -DRM_DEBUG ("Failed to create OA config for flex_regs\n" ); +drm_dbg (&perf->i915->drm, +"Failed to create OA config for flex_regs\n" ); err =PTR_ERR (regs); goto reg_err; }
@@ -4156,7 +4196,8 @@ int i915_perf_add_config_ioctl(struct drm_device *dev, void *data,*/ idr_for_each_entry (&perf->metrics_idr, tmp, id) {if (!strcmp (tmp->uuid, oa_config->uuid)) { -DRM_DEBUG ("OA config already exists with this uuid\n" ); +drm_dbg (&perf->i915->drm, +"OA config already exists with this uuid\n" ); err = -EADDRINUSE ; goto sysfs_err; }
@@ -4164,7 +4205,8 @@ int i915_perf_add_config_ioctl(struct drm_device *dev, void *data, err =create_dynamic_oa_sysfs_entry (perf, oa_config);if (err) { -DRM_DEBUG ("Failed to create sysfs entry for OA config\n" ); +drm_dbg (&perf->i915->drm, +"Failed to create sysfs entry for OA config\n" ); goto sysfs_err; }
@@ -4173,14 +4215,16 @@ int i915_perf_add_config_ioctl(struct drm_device *dev, void *data, oa_config,2 , 0, GFP_KERNEL);if (oa_config->id <0 ) { -DRM_DEBUG ("Failed to create sysfs entry for OA config\n" ); +drm_dbg (&perf->i915->drm, +"Failed to create sysfs entry for OA config\n" ); err = oa_config->id; goto sysfs_err; }mutex_unlock (&perf->metrics_lock); -DRM_DEBUG ("Added config %s id=%i\n" , oa_config->uuid, oa_config->id); +drm_dbg (&perf->i915->drm, +"Added config %s id=%i\n" , oa_config->uuid, oa_config->id);return oa_config->id;
@@ -4188,7 +4232,8 @@ int i915_perf_add_config_ioctl(struct drm_device *dev, void *data,mutex_unlock (&perf->metrics_lock); reg_err:i915_oa_config_put (oa_config); -DRM_DEBUG ("Failed to add new OA config\n" ); +drm_dbg (&perf->i915->drm, +"Failed to add new OA config\n" );return err; }
@@ -4212,12 +4257,14 @@ int i915_perf_remove_config_ioctl(struct drm_device *dev, void *data,int ret;if (!perf->i915) { -DRM_DEBUG ("i915 perf interface not available for this system\n" ); +drm_dbg (&perf->i915->drm, +"i915 perf interface not available for this system\n" );return -ENOTSUPP ; }if (i915_perf_stream_paranoid && !perfmon_capable ()) { -DRM_DEBUG ("Insufficient privileges to remove i915 OA config\n" ); +drm_dbg (&perf->i915->drm, +"Insufficient privileges to remove i915 OA config\n" );return -EACCES ; }
@@ -4227,7 +4274,8 @@ int i915_perf_remove_config_ioctl(struct drm_device *dev, void *data, oa_config =idr_find (&perf->metrics_idr, *arg);if (!oa_config) { -DRM_DEBUG ("Failed to remove unknown OA config\n" ); +drm_dbg (&perf->i915->drm, +"Failed to remove unknown OA config\n" ); ret = -ENOENT ; goto err_unlock; }
@@ -4240,7 +4288,8 @@ int i915_perf_remove_config_ioctl(struct drm_device *dev, void *data,mutex_unlock (&perf->metrics_lock); -DRM_DEBUG ("Removed config %s id=%i\n" , oa_config->uuid, oa_config->id); +drm_dbg (&perf->i915->drm, +"Removed config %s id=%i\n" , oa_config->uuid, oa_config->id);i915_oa_config_put (oa_config);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 38/91 ARM: 9290/1: uaccess: Fix KASAN false-positives
In reply to Greg Kroah-HartmanFrom: Andrew Jeffery <[email protected]>
[ Upstream commit ceac10c83b330680cc01ceaaab86cd49f4f30d81 ]
__copy_to_user_memcpy() and __clear_user_memset() had been calling memcpy() and memset() respectively, leading to false-positive KASAN reports when starting userspace:
[ 10.707901] Run /init as init process
[ 10.731892] process '/bin/busybox' started with executable stack
[ 10.745234] ==================================================================
[ 10.745796] BUG: KASAN: user-memory-access in __clear_user_memset+0x258/0x3ac
[ 10.747260] Write of size 2687 at addr 000de581 by task init/1Use __memcpy() and __memset() instead to allow userspace access, which is of course the intent of these functions.
--- arch/arm/lib/uaccess_with_memcpy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/lib/uaccess_with_memcpy.c +2 -2
@@ -121,7 +121,7 @@ __copy_to_user_memcpy(void __user *to, const void *from, unsigned long n) tocopy = n; ua_flags =uaccess_save_and_enable (); -memcpy ((void *)to, from, tocopy); +__memcpy ((void *)to, from, tocopy);uaccess_restore (ua_flags); to += tocopy; from += tocopy;
@@ -188,7 +188,7 @@ __clear_user_memset(void __user *addr, unsigned long n) tocopy = n; ua_flags =uaccess_save_and_enable (); -memset ((void *)addr,0 , tocopy); +__memset ((void *)addr,0 , tocopy);uaccess_restore (ua_flags); addr += tocopy; n -= tocopy;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 56/91 drm/i915: fix race condition UAF in i915_perf_add_config_ioctl
In reply to Greg Kroah-HartmanFrom: Min Li <[email protected]>
[ Upstream commit dc30c011469165d57af9adac5baff7d767d20e5c ]
Userspace can guess the id value and try to race oa_config object creation with config remove, resulting in a use-after-free if we dereference the object after unlocking the metrics_lock. For that reason, unlocking the metrics_lock must be done after we are done dereferencing the object.
--- drivers/gpu/drm/i915/i915_perf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_perf.c +3 -3
@@ -4220,13 +4220,13 @@ int i915_perf_add_config_ioctl(struct drm_device *dev, void *data, err = oa_config->id; goto sysfs_err; } - -mutex_unlock (&perf->metrics_lock); + id = oa_config->id;drm_dbg (&perf->i915->drm,"Added config %s id=%i\n" , oa_config->uuid, oa_config->id); +mutex_unlock (&perf->metrics_lock); -return oa_config->id; +return id; sysfs_err:mutex_unlock (&perf->metrics_lock);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 57/91 riscv: Do not set initial_boot_params to the linear address of the dtb
In reply to Greg Kroah-HartmanFrom: Alexandre Ghiti <[email protected]>
commit f1581626071c8e37c58c5e8f0b4126b17172a211 upstream.
early_init_dt_verify() is already called in parse_dtb() and since the dtb address does not change anymore (it is now in the fixmap region), no need to reset initial_boot_params by calling early_init_dt_verify() again.
--- arch/riscv/kernel/setup.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/riscv/kernel/setup.c +1 -4
@@ -286,10 +286,7 @@ void __init setup_arch(char **cmdline_p)#if IS_ENABLED (CONFIG_BUILTIN_DTB )unflatten_and_copy_device_tree ();#else -if (early_init_dt_verify (__va (XIP_FIXUP (dtb_early_pa)))) -unflatten_device_tree (); -else -pr_err ("No DTB found in kernel mappings\n" ); +unflatten_device_tree ();#endif early_init_fdt_scan_reserved_mem ();misc_mem_init ();
Greg Kroah-Hartman
maintainerPATCH 58/91 riscv: add icache flush for nommu sigreturn trampoline
In reply to Greg Kroah-HartmanFrom: Mathis Salmen <[email protected]>
commit 8d736482749f6d350892ef83a7a11d43cd49981e upstream.
In a NOMMU kernel, sigreturn trampolines are generated on the user stack by setup_rt_frame. Currently, these trampolines are not instruction fenced, thus their visibility to ifetch is not guaranteed.
This patch adds a flush_icache_range in setup_rt_frame to fix this problem.
--- arch/riscv/kernel/signal.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
arch/riscv/kernel/signal.c +8 -1
@@ -16,6 +16,7 @@#include <asm/vdso.h> #include <asm/switch_to.h> #include <asm/csr.h> +#include <asm/cacheflush.h> extern u32 __user_rt_sigreturn[2 ];
@@ -178,6 +179,7 @@ static int setup_rt_frame(struct ksignal {struct rt_sigframe __user *frame;long err =0 ; +unsigned long __maybe_unused addr; frame =get_sigframe (ksig, regs,sizeof (*frame));if (!access_ok (frame,sizeof (*frame)))
@@ -206,7 +208,12 @@ static int setup_rt_frame(struct ksignalif (copy_to_user (&frame->sigreturn_code, __user_rt_sigreturn,sizeof (frame->sigreturn_code)))return -EFAULT ; - regs->ra = (unsigned long )&frame->sigreturn_code; + + addr = (unsigned long )&frame->sigreturn_code; +/* Make sure the two instructions are pushed to icache. */ +flush_icache_range (addr, addr +sizeof (frame->sigreturn_code)); + + regs->ra = addr;#endif /* CONFIG_MMU */ /*
Greg Kroah-Hartman
maintainerPATCH 59/91 net: sfp: initialize sfp->i2c_block_size at sfp allocation
In reply to Greg Kroah-HartmanFrom: Ivan Bornyakov <[email protected]>
commit 813c2dd78618f108fdcf9cd726ea90f081ee2881 upstream.
sfp->i2c_block_size is initialized at SFP module insertion in sfp_sm_mod_probe(). Because of that, if SFP module was never inserted since boot, sfp_read() call will lead to zero-length I2C read attempt, and not all I2C controllers are happy with zero-length reads.
One way to issue sfp_read() on empty SFP cage is to execute ethtool -m. If SFP module was never plugged since boot, there will be a zero-length I2C read attempt.
# ethtool -m xge0 i2c i2c-3: adapter quirk: no zero length (addr 0x0050, size 0, read) Cannot get Module EEPROM data: Operation not supported
If SFP module was plugged then removed at least once, sfp->i2c_block_size will be initialized and ethtool -m will fail with different exit code and without I2C error
# ethtool -m xge0 Cannot get Module EEPROM data: Remote I/O error
Fix this by initializing sfp->i2_block_size at struct sfp allocation stage so no wild sfp_read() could issue zero-length I2C read.
--- drivers/net/phy/sfp.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/net/phy/sfp.c +8 -5
@@ -208,6 +208,12 @@ static const enum gpiod_flags gpio_flags*/ #define SFP_PHY_ADDR 22 +/* SFP_EEPROM_BLOCK_SIZE is the size of data chunk to read the EEPROM +* at a time. Some SFP modules and also some Linux I2C drivers do not like +* reads longer than 16 bytes. +*/ +#define SFP_EEPROM_BLOCK_SIZE 16 +struct sff_data {unsigned int gpios;bool (*module_supported)(const struct sfp_eeprom_id *id);
@@ -1806,11 +1812,7 @@ static int sfp_sm_mod_probe(struct sfp *u8 check;int ret; -/* Some SFP modules and also some Linux I2C drivers do not like reads -* longer than 16 bytes, so read the EEPROM in chunks of 16 bytes at -* a time. -*/ - sfp->i2c_block_size =16 ; + sfp->i2c_block_size =SFP_EEPROM_BLOCK_SIZE ; ret =sfp_read (sfp, false,0 , &id.base,sizeof (id.base));if (ret <0 ) {
@@ -2462,6 +2464,7 @@ static struct sfp *sfp_alloc(struct devireturn ERR_PTR (-ENOMEM ); sfp->dev = dev; + sfp->i2c_block_size =SFP_EEPROM_BLOCK_SIZE ;mutex_init (&sfp->sm_mutex);mutex_init (&sfp->st_mutex);
Greg Kroah-Hartman
maintainerPATCH 60/91 net: phy: nxp-c45-tja11xx: add remove callback
In reply to Greg Kroah-HartmanFrom: Radu Pirea (OSS) <[email protected]>
commit a4506722dc39ca840593f14e3faa4c9ba9408211 upstream.
Unregister PTP clock when the driver is removed.
Purge the RX and TX skb queues.
--- drivers/net/phy/nxp-c45-tja11xx.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/net/phy/nxp-c45-tja11xx.c +12 -0
@@ -1117,6 +1117,17 @@ no_ptp_support:return ret; } +static void nxp_c45_remove (struct phy_device *phydev) +{ +struct nxp_c45_phy *priv = phydev->priv; + +if (priv->ptp_clock) +ptp_clock_unregister (priv->ptp_clock); + +skb_queue_purge (&priv->tx_queue); +skb_queue_purge (&priv->rx_queue); +} +static struct phy_driver nxp_c45_driver[] = { {PHY_ID_MATCH_MODEL (PHY_ID_TJA_1103 ),
@@ -1139,6 +1150,7 @@ static struct phy_driver nxp_c45_driver[ .set_loopback = genphy_c45_loopback, .get_sqi = nxp_c45_get_sqi, .get_sqi_max = nxp_c45_get_sqi_max, + .remove = nxp_c45_remove, }, };
Greg Kroah-Hartman
maintainerPATCH 61/91 net: phy: nxp-c45-tja11xx: fix unsigned long multiplication overflow
In reply to Greg Kroah-HartmanFrom: Radu Pirea (OSS) <[email protected]>
commit bdaaecc127d471c422ee9e994978617c8aa79e1e upstream.
Any multiplication between GENMASK(31, 0) and a number bigger than 1 will be truncated because of the overflow, if the size of unsigned long is 32 bits.
Replaced GENMASK with GENMASK_ULL to make sure that multiplication will be between 64 bits values.
--- drivers/net/phy/nxp-c45-tja11xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/phy/nxp-c45-tja11xx.c +1 -1
@@ -168,7 +168,7 @@#define MAX_ID_PS 2260U#define DEFAULT_ID_PS 2000U -#define PPM_TO_SUBNS_INC (ppb) div_u64(GENMASK(31, 0) * (ppb) * \ +#define PPM_TO_SUBNS_INC (ppb) div_u64(GENMASK_ULL(31, 0) * (ppb) * \ PTP_CLK_PERIOD_100BT1, NSEC_PER_SEC)#define NXP_C45_SKB_CB (skb) ((struct nxp_c45_skb_cb *)(skb)->cb)
Greg Kroah-Hartman
maintainerPATCH 62/91 scsi: ses: Handle enclosure with just a primary component gracefully
In reply to Greg Kroah-HartmanFrom: Jiri Kosina <[email protected]>
commit c8e22b7a1694bb8d025ea636816472739d859145 upstream.
This reverts commit 3fe97ff3d949 ("scsi: ses: Don't attach if enclosure has no components") and introduces proper handling of case where there are no detected secondary components, but primary component (enumerated in num_enclosures) does exist. That fix was originally proposed by Ding Hui <[email protected]>.
Completely ignoring devices that have one primary enclosure and no secondary one results in ses_intf_add() bailing completely
scsi 2:0:0:254: enclosure has no enumerated components
scsi 2:0:0:254: Failed to bind enclosure -12ven in valid configurations such
even on valid configurations with 1 primary and 0 secondary enclosures as below:
# sg_ses /dev/sg0 3PARdata SES 3321 Supported diagnostic pages: Supported Diagnostic Pages [sdp] [0x0] Configuration (SES) [cf] [0x1] Short Enclosure Status (SES) [ses] [0x8] # sg_ses -p cf /dev/sg0 3PARdata SES 3321 Configuration diagnostic page: number of secondary subenclosures: 0 generation code: 0x0 enclosure descriptor list Subenclosure identifier: 0 [primary] relative ES process id: 0, number of ES processes: 1 number of type descriptor headers: 1 enclosure logical identifier (hex): 20000002ac02068d enclosure vendor: 3PARdata product: VV rev: 3321 type descriptor header and text list Element type: Unspecified, subenclosure id: 0 number of possible elements: 1
The changelog for the original fix follows
=====
We can get a crash when disconnecting the iSCSI session, the call trace like this:
[ffff00002a00fb70] kfree at ffff00000830e224 [ffff00002a00fba0] ses_intf_remove at ffff000001f200e4 [ffff00002a00fbd0] device_del at ffff0000086b6a98 [ffff00002a00fc50] device_unregister at ffff0000086b6d58 [ffff00002a00fc70] __scsi_remove_device at ffff00000870608c [ffff00002a00fca0] scsi_remove_device at ffff000008706134 [ffff00002a00fcc0] __scsi_remove_target at ffff0000087062e4 [ffff00002a00fd10] scsi_remove_target at ffff0000087064c0 [ffff00002a00fd70] __iscsi_unbind_session at ffff000001c872c4 [ffff00002a00fdb0] process_one_work at ffff00000810f35c [ffff00002a00fe00] worker_thread at ffff00000810f648 [ffff00002a00fe70] kthread at ffff000008116e98
In ses_intf_add, components count could be 0, and kcalloc 0 size scomp, but not saved in edev->component[i].scratch
In this situation, edev->component[0].scratch is an invalid pointer, when kfree it in ses_intf_remove_enclosure, a crash like above would happen The call trace also could be other random cases when kfree cannot catch the invalid pointer
We should not use edev->component[] array when the components count is 0 We also need check index when use edev->component[] array in ses_enclosure_data_process
=====
--- drivers/scsi/ses.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/scsi/ses.c +8 -12
@@ -503,9 +503,6 @@ static int ses_enclosure_find_by_addr(stint i;struct ses_component *scomp; -if (!edev->component[0 ].scratch) -return 0 ; -for (i =0 ; i < edev->components; i++) { scomp = edev->component[i].scratch;if (scomp->addr != efd->addr)
@@ -596,8 +593,10 @@ static void ses_enclosure_data_process(s components++, type_ptr[0 ], name); - else + else if (components < edev->components) ecomp = &edev->component[components++]; + else + ecomp =ERR_PTR (-EINVAL );if (!IS_ERR (ecomp)) {if (addl_desc_ptr) {
@@ -728,11 +727,6 @@ static int ses_intf_add(struct device *c components += type_ptr[1 ]; } -if (components ==0 ) { -sdev_printk (KERN_WARNING , sdev,"enclosure has no enumerated components\n" ); - goto err_free; - } - ses_dev->page1 = buf; ses_dev->page1_len = len; buf =NULL ;
@@ -774,9 +768,11 @@ static int ses_intf_add(struct device *c buf =NULL ; } page2_not_supported: - scomp =kcalloc (components,sizeof (struct ses_component ),GFP_KERNEL ); -if (!scomp) - goto err_free; +if (components >0 ) { + scomp =kcalloc (components,sizeof (struct ses_component ),GFP_KERNEL ); +if (!scomp) + goto err_free; + } edev =enclosure_register (cdev->parent,dev_name (&sdev->sdev_gendev), components, &ses_enclosure_callbacks);
Greg Kroah-Hartman
maintainerPATCH 63/91 x86/PCI: Add quirk for AMD XHCI controller that loses MSI-X state in D3hot
In reply to Greg Kroah-HartmanFrom: Basavaraj Natikar <[email protected]>
commit f195fc1e9715ba826c3b62d58038f760f66a4fe9 upstream.
The AMD [1022:15b8] USB controller loses some internal functional MSI-X context when transitioning from D0 to D3hot. BIOS normally traps D0->D3hot and D3hot->D0 transitions so it can save and restore that internal context, but some firmware in the field can't do this because it fails to clear the AMD_15B8_RCC_DEV2_EPF0_STRAP2 NO_SOFT_RESET bit.
Clear AMD_15B8_RCC_DEV2_EPF0_STRAP2 NO_SOFT_RESET bit before USB controller initialization during boot.
--- arch/x86/pci/fixup.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
arch/x86/pci/fixup.c +21 -0
@@ -7,6 +7,7 @@#include <linux/dmi.h> #include <linux/pci.h> #include <linux/vgaarb.h> +#include <asm/amd_nb.h> #include <asm/hpet.h> #include <asm/pci_x86.h>
@@ -824,3 +825,23 @@ static void rs690_fix_64bit_dma(struct pDECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x7910 , rs690_fix_64bit_dma);#endif + +#ifdef CONFIG_AMD_NB + +#define AMD_15B8_RCC_DEV2_EPF0_STRAP2 0x10136008 +#define AMD_15B8_RCC_DEV2_EPF0_STRAP2_NO_SOFT_RESET_DEV2_F0_MASK 0x00000080L + +static void quirk_clear_strap_no_soft_reset_dev2_f0 (struct pci_dev *dev) +{ +u32 data; + +if (!amd_smn_read (0 ,AMD_15B8_RCC_DEV2_EPF0_STRAP2 , &data)) { + data &= ~AMD_15B8_RCC_DEV2_EPF0_STRAP2_NO_SOFT_RESET_DEV2_F0_MASK ; +if (amd_smn_write (0 ,AMD_15B8_RCC_DEV2_EPF0_STRAP2 , data)) +pci_err (dev,"Failed to write data 0x%x\n" , data); + }else { +pci_err (dev,"Failed to read data\n" ); + } +} +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,0x15b8 , quirk_clear_strap_no_soft_reset_dev2_f0); +#endif
Greg Kroah-Hartman
maintainerPATCH 64/91 cgroup/cpuset: Wake up cpuset_attach_wq tasks in cpuset_cancel_attach()
In reply to Greg Kroah-HartmanFrom: Waiman Long <[email protected]>
commit ba9182a89626d5f83c2ee4594f55cb9c1e60f0e2 upstream.
After a successful cpuset_can_attach() call which increments the attach_in_progress flag, either cpuset_cancel_attach() or cpuset_attach() will be called later. In cpuset_attach(), tasks in cpuset_attach_wq, if present, will be woken up at the end. That is not the case in cpuset_cancel_attach(). So missed wakeup is possible if the attach operation is somehow cancelled. Fix that by doing the wakeup in cpuset_cancel_attach() as well.
--- kernel/cgroup/cpuset.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
kernel/cgroup/cpuset.c +5 -1
@@ -2225,11 +2225,15 @@ out_unlock:static void cpuset_cancel_attach (struct cgroup_taskset *tset) {struct cgroup_subsys_state *css; +struct cpuset *cs;cgroup_taskset_first (tset, &css); + cs =css_cs (css);percpu_down_write (&cpuset_rwsem); -css_cs (css)->attach_in_progress--; + cs->attach_in_progress--; +if (!cs->attach_in_progress) +wake_up (&cpuset_attach_wq);percpu_up_write (&cpuset_rwsem); }
Greg Kroah-Hartman
maintainerPATCH 65/91 mptcp: use mptcp_schedule_work instead of open-coding it
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
commit a5cb752b125766524c921faab1a45cc96065b0a7 upstream.
Beyond reducing code duplication this also avoids scheduling the mptcp_worker on a closed socket on some edge scenarios.
The addressed issue is actually older than the blamed commit below, but this fix needs it as a pre-requisite.
--- net/mptcp/options.c | 5 ++--- net/mptcp/subflow.c | 18 ++++++------------ 2 files changed, 8 insertions(+), 15 deletions(-)
net/mptcp/options.c +2 -3
@@ -1156,9 +1156,8 @@ bool mptcp_incoming_options(struct sock*/ if (TCP_SKB_CB (skb)->seq ==TCP_SKB_CB (skb)->end_seq) {if (mp_opt.data_fin && mp_opt.data_len ==1 && -mptcp_update_rcv_data_fin (msk, mp_opt.data_seq, mp_opt.dsn64) && -schedule_work (&msk->work)) -sock_hold (subflow->conn); +mptcp_update_rcv_data_fin (msk, mp_opt.data_seq, mp_opt.dsn64)) +mptcp_schedule_work ((struct sock *)msk);return true; }
net/mptcp/subflow.c +6 -12
@@ -360,9 +360,8 @@ void mptcp_subflow_reset(struct sock *sstcp_send_active_reset (ssk,GFP_ATOMIC );tcp_done (ssk); -if (!test_and_set_bit (MPTCP_WORK_CLOSE_SUBFLOW , &mptcp_sk (sk)->flags) && -schedule_work (&mptcp_sk (sk)->work)) -return ;/* worker will put sk for us */ +if (!test_and_set_bit (MPTCP_WORK_CLOSE_SUBFLOW , &mptcp_sk (sk)->flags)) +mptcp_schedule_work (sk);sock_put (sk); }
@@ -1010,8 +1009,8 @@ static enum mapping_status get_mapping_sskb_ext_del (skb,SKB_EXT_MPTCP );return MAPPING_OK ; }else { -if (updated &&schedule_work (&msk->work)) -sock_hold ((struct sock *)msk); +if (updated) +mptcp_schedule_work ((struct sock *)msk);return MAPPING_DATA_FIN ; }
@@ -1114,17 +1113,12 @@ static void mptcp_subflow_discard_data(s/* sched mptcp worker to remove the subflow if no more data is pending */ static void subflow_sched_work_if_closed (struct mptcp_sock *msk,struct sock *ssk) { -struct sock *sk = (struct sock *)msk; -if (likely (ssk->sk_state !=TCP_CLOSE ))return ;if (skb_queue_empty (&ssk->sk_receive_queue) && - !test_and_set_bit (MPTCP_WORK_CLOSE_SUBFLOW , &msk->flags)) { -sock_hold (sk); -if (!schedule_work (&msk->work)) -sock_put (sk); - } + !test_and_set_bit (MPTCP_WORK_CLOSE_SUBFLOW , &msk->flags)) +mptcp_schedule_work ((struct sock *)msk); }static bool subflow_can_fallback (struct mptcp_subflow_context *subflow)
Greg Kroah-Hartman
maintainerPATCH 39/91 power: supply: cros_usbpd: reclassify "default case!" as debug
In reply to Greg Kroah-HartmanFrom: Grant Grundler <[email protected]>
[ Upstream commit 14c76b2e75bca4d96e2b85a0c12aa43e84fe3f74 ]
This doesn't need to be printed every second as an error:
...
<3>[17438.628385] cros-usbpd-charger cros-usbpd-charger.3.auto: Port 1: default case! <3>[17439.634176] cros-usbpd-charger cros-usbpd-charger.3.auto: Port 1: default case! <3>[17440.640298] cros-usbpd-charger cros-usbpd-charger.3.auto: Port 1: default case!
...
Reduce priority from ERROR to DEBUG.
--- drivers/power/supply/cros_usbpd-charger.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/supply/cros_usbpd-charger.c +1 -1
@@ -276,7 +276,7 @@ static int cros_usbpd_charger_get_power_info(struct port_data *port) port->psy_current_max =0 ;break ;default : -dev_err (dev,"Port %d: default case!\n" , port->port_number); +dev_dbg (dev,"Port %d: default case!\n" , port->port_number); port->psy_usb_type =POWER_SUPPLY_USB_TYPE_SDP ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 66/91 mptcp: stricter state check in mptcp_worker
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
commit d6a0443733434408f2cbd4c53fea6910599bab9e upstream.
As reported by Christoph, the mptcp protocol can run the worker when the relevant msk socket is in an unexpected state:
connect()
// incoming reset + fastclose
// the mptcp worker is scheduledmptcp_disconnect()
// msk is now CLOSEDlisten()mptcp_worker()
Leading to the following splat:
divide error: 0000 [#1] PREEMPT SMP
CPU: 1 PID: 21 Comm: kworker/1:0 Not tainted 6.3.0-rc1-gde5e8fd0123c #11 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.11.0-2.el7 04/01/2014 Workqueue: events mptcp_worker RIP: 0010:__tcp_select_window+0x22c/0x4b0 net/ipv4/tcp_output.c:3018 RSP: 0018:ffffc900000b3c98 EFLAGS: 00010293 RAX: 000000000000ffd7 RBX: 000000000000ffd7 RCX: 0000000000000000 RDX: 0000000000000000 RSI: ffffffff8214ce97 RDI: 0000000000000004 RBP: 000000000000ffd7 R08: 0000000000000004 R09: 0000000000010000 R10: 000000000000ffd7 R11: ffff888005afa148 R12: 000000000000ffd7 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffff88803ed00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000405270 CR3: 000000003011e006 CR4: 0000000000370ee0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> tcp_select_window net/ipv4/tcp_output.c:262 [inline] __tcp_transmit_skb+0x356/0x1280 net/ipv4/tcp_output.c:1345 tcp_transmit_skb net/ipv4/tcp_output.c:1417 [inline] tcp_send_active_reset+0x13e/0x320 net/ipv4/tcp_output.c:3459 mptcp_check_fastclose net/mptcp/protocol.c:2530 [inline] mptcp_worker+0x6c7/0x800 net/mptcp/protocol.c:2705 process_one_work+0x3bd/0x950 kernel/workqueue.c:2390 worker_thread+0x5b/0x610 kernel/workqueue.c:2537 kthread+0x138/0x170 kernel/kthread.c:376 ret_from_fork+0x2c/0x50 arch/x86/entry/entry_64.S:308 </TASK>
This change addresses the issue explicitly checking for bad states before running the mptcp worker.
--- net/mptcp/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mptcp/protocol.c +1 -1
@@ -2448,7 +2448,7 @@ static void mptcp_worker(struct work_strlock_sock (sk); state = sk->sk_state; -if (unlikely (state ==TCP_CLOSE )) +if (unlikely ((1 << state) & (TCPF_CLOSE |TCPF_LISTEN ))) goto unlock;mptcp_check_data_fin_ack (sk);
Greg Kroah-Hartman
maintainerPATCH 67/91 ubi: Fix failure attaching when vid_hdr offset equals to (sub)page size
In reply to Greg Kroah-HartmanFrom: Zhihao Cheng <[email protected]>
commit 1e020e1b96afdecd20680b5b5be2a6ffc3d27628 upstream.
Following process will make ubi attaching failed since commit 1b42b1a36fc946 ("ubi: ensure that VID header offset ... size"):
ID="0xec,0xa1,0x00,0x15" # 128M 128KB 2KB
modprobe nandsim id_bytes=$IDflash_eraseall /dev/mtd0
modprobe ubi mtd="0,2048" # set vid_hdr offset as 2048 (one page) (dmesg):
ubi0 error: ubi_attach_mtd_dev [ubi]: VID header offset 2048 too large. UBI error: cannot attach mtd0
UBI error: cannot initialize UBI, error -22
Rework original solution, the key point is making sure 'vid_hdr_shift + UBI_VID_HDR_SIZE < ubi->vid_hdr_alsize', so we should check vid_hdr_shift rather not vid_hdr_offset. Then, ubi still support (sub)page aligined VID header offset.
--- drivers/mtd/ubi/build.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
drivers/mtd/ubi/build.c +15 -6
@@ -664,12 +664,6 @@ static int io_init(struct ubi_device *ub ubi->ec_hdr_alsize =ALIGN (UBI_EC_HDR_SIZE , ubi->hdrs_min_io_size); ubi->vid_hdr_alsize =ALIGN (UBI_VID_HDR_SIZE , ubi->hdrs_min_io_size); -if (ubi->vid_hdr_offset && ((ubi->vid_hdr_offset +UBI_VID_HDR_SIZE ) > - ubi->vid_hdr_alsize)) { -ubi_err (ubi,"VID header offset %d too large." , ubi->vid_hdr_offset); -return -EINVAL ; - } -dbg_gen ("min_io_size %d" , ubi->min_io_size);dbg_gen ("max_write_size %d" , ubi->max_write_size);dbg_gen ("hdrs_min_io_size %d" , ubi->hdrs_min_io_size);
@@ -687,6 +681,21 @@ static int io_init(struct ubi_device *ub ubi->vid_hdr_aloffset; } +/* +* Memory allocation for VID header is ubi->vid_hdr_alsize +* which is described in comments in io.c. +* Make sure VID header shift + UBI_VID_HDR_SIZE not exceeds +* ubi->vid_hdr_alsize, so that all vid header operations +* won't access memory out of bounds. +*/ +if ((ubi->vid_hdr_shift +UBI_VID_HDR_SIZE ) > ubi->vid_hdr_alsize) { +ubi_err (ubi,"Invalid VID header offset %d, VID header shift(%d)" +" + VID header size(%zu) > VID header aligned size(%d)." , + ubi->vid_hdr_offset, ubi->vid_hdr_shift, +UBI_VID_HDR_SIZE , ubi->vid_hdr_alsize); +return -EINVAL ; + } +/* Similar for the data offset */ ubi->leb_start = ubi->vid_hdr_offset +UBI_VID_HDR_SIZE ; ubi->leb_start =ALIGN (ubi->leb_start, ubi->min_io_size);
Greg Kroah-Hartman
maintainerPATCH 68/91 ubi: Fix deadlock caused by recursively holding work_sem
In reply to Greg Kroah-HartmanFrom: ZhaoLong Wang <[email protected]>
[ Upstream commit f773f0a331d6c41733b17bebbc1b6cae12e016f5 ]
During the processing of the bgt, if the sync_erase() return -EBUSY or some other error code in __erase_worker(),schedule_erase() called again lead to the down_read(ubi->work_sem) hold twice and may get block by down_write(ubi->work_sem) in ubi_update_fastmap(), which cause deadlock.
ubi bgt other task
do_work
down_read(&ubi->work_sem) ubi_update_fastmap
erase_worker # Blocked by down_read
__erase_worker down_write(&ubi->work_sem)
schedule_erase
schedule_ubi_work
down_read(&ubi->work_sem)Fix this by changing input parameter @nested of the schedule_erase() to 'true' to avoid recursively acquiring the down_read(&ubi->work_sem).
Also, fix the incorrect comment about @nested parameter of the schedule_erase() because when down_write(ubi->work_sem) is held, the @nested is also need be true.
--- drivers/mtd/ubi/wl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/ubi/wl.c +2 -2
@@ -575,7 +575,7 @@ static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk,* @vol_id: the volume ID that last used this PEB * @lnum: the last used logical eraseblock number for the PEB * @torture: if the physical eraseblock has to be tortured -* @nested: denotes whether the work_sem is already held in read mode +* @nested: denotes whether the work_sem is already held * * This function returns zero in case of success and a %-ENOMEM in case of * failure.
@@ -1121,7 +1121,7 @@ static int __erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk)int err1;/* Re-schedule the LEB for erasure */ - err1 =schedule_erase (ubi, e, vol_id, lnum,0 , false); + err1 =schedule_erase (ubi, e, vol_id, lnum,0 , true);if (err1) {spin_lock (&ubi->wl_lock);wl_entry_destroy (ubi, e);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 40/91 wifi: mwifiex: mark OF related data as maybe unused
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 139f6973bf140c65d4d1d4bde5485badb4454d7a ]
The driver can be compile tested with !CONFIG_OF making certain data unused:
drivers/net/wireless/marvell/mwifiex/sdio.c:498:34: error: ‘mwifiex_sdio_of_match_table’ defined but not used [-Werror=unused-const-variable=] drivers/net/wireless/marvell/mwifiex/pcie.c:175:34: error: ‘mwifiex_pcie_of_match_table’ defined but not used [-Werror=unused-const-variable=]
--- drivers/net/wireless/marvell/mwifiex/pcie.c | 2 +- drivers/net/wireless/marvell/mwifiex/sdio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/marvell/mwifiex/pcie.c +1 -1
@@ -184,7 +184,7 @@ static const struct mwifiex_pcie_device mwifiex_pcie8997 = { .can_ext_scan = true, }; -static const struct of_device_id mwifiex_pcie_of_match_table[] = { +static const struct of_device_id mwifiex_pcie_of_match_table[]__maybe_unused = { { .compatible ="pci11ab,2b42" }, { .compatible ="pci1b4b,2b42" }, { }
drivers/net/wireless/marvell/mwifiex/sdio.c +1 -1
@@ -484,7 +484,7 @@ static struct memory_type_mapping mem_type_mapping_tbl[] = { {"EXTLAST", NULL, 0, 0xFE}, }; -static const struct of_device_id mwifiex_sdio_of_match_table[] = { +static const struct of_device_id mwifiex_sdio_of_match_table[]__maybe_unused = { { .compatible ="marvell,sd8787" }, { .compatible ="marvell,sd8897" }, { .compatible = "marvell,sd8997" },
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 41/91 i2c: imx-lpi2c: clean rx/tx buffers upon new message
In reply to Greg Kroah-HartmanFrom: Alexander Stein <[email protected]>
[ Upstream commit 987dd36c0141f6ab9f0fbf14d6b2ec3342dedb2f ]
When start sending a new message clear the Rx & Tx buffer pointers in order to avoid using stale pointers.
--- drivers/i2c/busses/i2c-imx-lpi2c.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/i2c/busses/i2c-imx-lpi2c.c +2 -0
@@ -462,6 +462,8 @@ static int lpi2c_imx_xfer(struct i2c_adapter *adapter,if (num ==1 && msgs[0 ].len ==0 ) goto stop; + lpi2c_imx->rx_buf =NULL ; + lpi2c_imx->tx_buf =NULL ; lpi2c_imx->delivered =0 ; lpi2c_imx->msglen = msgs[i].len;init_completion (&lpi2c_imx->complete);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 42/91 i2c: hisi: Avoid redundant interrupts
In reply to Greg Kroah-HartmanFrom: Yicong Yang <[email protected]>
[ Upstream commit cc9812a3096d1986caca9a23bee99effc45c08df ]
After issuing all the messages we can disable the TX_EMPTY interrupts to avoid handling redundant interrupts. For doing a sinlge bus detection (i2cdetect -y -r 0) we can reduce ~97% interrupts (before ~12000 after ~400).
--- drivers/i2c/busses/i2c-hisi.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/i2c/busses/i2c-hisi.c +7 -0
@@ -315,6 +315,13 @@ static void hisi_i2c_xfer_msg(struct hisi_i2c_controller *ctlr) max_write == 0)break ; } + +/* +* Disable the TX_EMPTY interrupt after finishing all the messages to +* avoid overwhelming the CPU. +*/ +if (ctlr->msg_tx_idx == ctlr->msg_num) +hisi_i2c_disable_int (ctlr,HISI_I2C_INT_TX_EMPTY ); }static irqreturn_t hisi_i2c_irq (int irq,void *context)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 43/91 efi: sysfb_efi: Add quirk for Lenovo Yoga Book X91F/L
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 5ed213dd64681f84a01ceaa82fb336cf7d59ddcf ]
Another Lenovo convertable which reports a landscape resolution of 1920x1200 with a pitch of (1920 * 4) bytes, while the actual framebuffer has a resolution of 1200x1920 with a pitch of (1200 * 4) bytes.
--- drivers/firmware/efi/sysfb_efi.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/firmware/efi/sysfb_efi.c +8 -0
@@ -274,6 +274,14 @@ static const struct dmi_system_id efifb_dmi_swap_width_height[] __initconst = { "IdeaPad Duet 3 10IGL5"), }, }, + { + /* Lenovo Yoga Book X91F / X91L */ + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "LENOVO"), + /* Non exact match to match F + L versions */ + DMI_MATCH(DMI_PRODUCT_NAME, "Lenovo YB1-X91"), + }, + }, {}, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 44/91 drm: panel-orientation-quirks: Add quirk for Lenovo Yoga Book X90F
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 03aecb1acbcd7a660f97d645ca6c09d9de27ff9d ]
Like the Windows Lenovo Yoga Book X91F/L the Android Lenovo Yoga Book X90F/L has a portrait 1200x1920 screen used in landscape mode, add a quirk for this.
When the quirk for the X91F/L was initially added it was written to also apply to the X90F/L but this does not work because the Android version of the Yoga Book uses completely different DMI strings. Also adjust the X91F/L quirk to reflect that it only applies to the X91F/L models.
--- drivers/gpu/drm/drm_panel_orientation_quirks.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_panel_orientation_quirks.c +10 -3
@@ -284,10 +284,17 @@ static const struct dmi_system_id orientation_data[] = { DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "IdeaPad Duet 3 10IGL5"), }, .driver_data = (void *)&lcd1200x1920_rightside_up, - }, { /* Lenovo Yoga Book X90F / X91F / X91L */ + }, { /* Lenovo Yoga Book X90F / X90L */ .matches = { -/* Non exact match to match all versions */ - DMI_MATCH(DMI_PRODUCT_NAME, "Lenovo YB1-X9"), +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"Intel Corporation" ), +DMI_EXACT_MATCH (DMI_PRODUCT_NAME ,"CHERRYVIEW D1 PLATFORM" ), + DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "YETI-11"), + }, + .driver_data = (void *)&lcd1200x1920_rightside_up, + }, { /* Lenovo Yoga Book X91F / X91L */ + .matches = { +/* Non exact match to match F + L versions */ + DMI_MATCH(DMI_PRODUCT_NAME, "Lenovo YB1-X91"), }, .driver_data = (void *)&lcd1200x1920_rightside_up, }, { /* OneGX1 Pro */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 45/91 verify_pefile: relax wrapper length check
In reply to Greg Kroah-HartmanFrom: Robbie Harwood <[email protected]>
[ Upstream commit 4fc5c74dde69a7eda172514aaeb5a7df3600adb3 ]
The PE Format Specification (section "The Attribute Certificate Table (Image Only)") states that dwLength is to be rounded up to 8-byte alignment when used for traversal. Therefore, the field is not required to be an 8-byte multiple in the first place.
Accordingly, pesign has not performed this alignment since version 0.110. This causes kexec failure on pesign'd binaries with "PEFILE:
Signature wrapper len wrong". Update the comment and relax the check.
--- crypto/asymmetric_keys/verify_pefile.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
crypto/asymmetric_keys/verify_pefile.c +8 -4
@@ -135,11 +135,15 @@ static int pefile_strip_sig_wrapper(const void *pebuf,pr_debug ("sig wrapper = { %x, %x, %x }\n" , wrapper.length, wrapper.revision, wrapper.cert_type); -/* Both pesign and sbsign round up the length of certificate table -* (in optional header data directories) to 8 byte alignment. +/* sbsign rounds up the length of certificate table (in optional +* header data directories) to 8 byte alignment. However, the PE +* specification states that while entries are 8-byte aligned, this is +* not included in their length, and as a result, pesign has not +* rounded up since 0.110. */ -if (round_up (wrapper.length,8 ) != ctx->sig_len) { -pr_debug ("Signature wrapper len wrong\n" ); +if (wrapper.length > ctx->sig_len) { +pr_debug ("Signature wrapper bigger than sig len (%x > %x)\n" , + ctx->sig_len, wrapper.length);return -ELIBBAD ; }if (wrapper.revision !=WIN_CERT_REVISION_2_0 ) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 36/91 skbuff: Fix a race between coalescing and releasing SKBs
In reply to Greg Kroah-HartmanFrom: Liang Chen <[email protected]>
[ Upstream commit 0646dc31ca886693274df5749cd0c8c1eaaeb5ca ]
Commit 1effe8ca4e34 ("skbuff: fix coalescing for page_pool fragment recycling") allowed coalescing to proceed with non page pool page and page pool page when @from is cloned, i.e.
to->pp_recycle --> false from->pp_recycle --> true skb_cloned(from) --> true
However, it actually requires skb_cloned(@from) to hold true until coalescing finishes in this situation. If the other cloned SKB is released while the merging is in process, from_shinfo->nr_frags will be set to 0 toward the end of the function, causing the increment of frag page _refcount to be unexpectedly skipped resulting in inconsistent reference counts. Later when SKB(@to) is released, it frees the page directly even though the page pool page is still in use, leading to use-after-free or double-free errors. So it should be prohibited.
The double-free error message below prompted us to investigate:
BUG: Bad page state in process swapper/1 pfn:0e0d1 page:00000000c6548b28 refcount:-1 mapcount:0 mapping:0000000000000000 index:0x2 pfn:0xe0d1 flags: 0xfffffc0000000(node=0|zone=1|lastcpupid=0x1fffff) raw: 000fffffc0000000 0000000000000000 ffffffff00000101 0000000000000000 raw: 0000000000000002 0000000000000000 ffffffffffffffff 0000000000000000 page dumped because: nonzero _refcount CPU: 1 PID: 0 Comm: swapper/1 Tainted: G E 6.2.0+ Call Trace: <IRQ> dump_stack_lvl+0x32/0x50 bad_page+0x69/0xf0 free_pcp_prepare+0x260/0x2f0 free_unref_page+0x20/0x1c0 skb_release_data+0x10b/0x1a0 napi_consume_skb+0x56/0x150 net_rx_action+0xf0/0x350 ? __napi_schedule+0x79/0x90 __do_softirq+0xc8/0x2b1 __irq_exit_rcu+0xb9/0xf0 common_interrupt+0x82/0xa0 </IRQ> <TASK> asm_common_interrupt+0x22/0x40 RIP: 0010:default_idle+0xb/0x20
--- net/core/skbuff.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
net/core/skbuff.c +8 -8
@@ -5397,18 +5397,18 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,if (skb_cloned (to))return false; -/* In general, avoid mixing slab allocated and page_pool allocated -* pages within the same SKB. However when @to is not pp_recycle and -* @from is cloned, we can transition frag pages from page_pool to -* reference counted. -* -* On the other hand, don't allow coalescing two pp_recycle SKBs if -* @from is cloned, in case the SKB is using page_pool fragment +/* In general, avoid mixing page_pool and non-page_pool allocated +* pages within the same SKB. Additionally avoid dealing with clones +* with page_pool pages, in case the SKB is using page_pool fragment * references (PP_FLAG_PAGE_FRAG). Since we only take full page * references for cloned SKBs at the moment that would result in * inconsistent reference counts. +* In theory we could take full references if @from is cloned and +* !@to->pp_recycle but its tricky (due to potential race with +* the clone disappearing) and rare, so not worth dealing with. */ -if (to->pp_recycle != (from->pp_recycle && !skb_cloned (from))) +if (to->pp_recycle != from->pp_recycle || + (from->pp_recycle &&skb_cloned (from)))return false;if (len <=skb_tailroom (to)) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 70/91 sched/fair: Move calculate of avg_load to a better location
In reply to Greg Kroah-HartmanFrom: zgpeng <[email protected]>
[ Upstream commit 06354900787f25bf5be3c07a68e3cdbc5bf0fa69 ]
In calculate_imbalance function, when the value of local->avg_load is greater than or equal to busiest->avg_load, the calculated sds->avg_load is not used. So this calculation can be placed in a more appropriate position.
Stable-dep-of: 91dcf1e8068e ("sched/fair: Fix imbalance overflow")
--- kernel/sched/fair.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/sched/fair.c +3 -2
@@ -9636,8 +9636,6 @@ static inline void calculate_imbalance(struct lb_env *env, struct sd_lb_stats *s local->avg_load = (local->group_load *SCHED_CAPACITY_SCALE ) / local->group_capacity; - sds->avg_load = (sds->total_load *SCHED_CAPACITY_SCALE ) / - sds->total_capacity;/* * If the local group is more loaded than the selected * busiest group don't try to pull any tasks.
@@ -9646,6 +9644,9 @@ static inline void calculate_imbalance(struct lb_env *env, struct sd_lb_stats *s env->imbalance =0 ;return ; } + + sds->avg_load = (sds->total_load *SCHED_CAPACITY_SCALE ) / + sds->total_capacity; }/*
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 79/91 nvme-pci: Crucial P2 has bogus namespace ids
In reply to Greg Kroah-HartmanFrom: Tobias Gruetzmacher <[email protected]>
[ Upstream commit d6c52fa3e955b97f8eb3ac824d2a3e0af147b3ce ]
This adds a quirk for the Crucial P2.
Stable-dep-of: 74391b3e6985 ("nvme-pci: add NVME_QUIRK_BOGUS_NID for T-FORCE Z330 SSD")
--- drivers/nvme/host/pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/nvme/host/pci.c +2 -0
@@ -3392,6 +3392,8 @@ static const struct pci_device_id nvme_id_table[] = { .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1e49, 0x0041), /* ZHITAI TiPro7000 NVMe SSD */ .driver_data = NVME_QUIRK_NO_DEEPEST_PS, }, + { PCI_DEVICE(0xc0a9, 0x540a), /* Crucial P2 */ + .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0061), .driver_data = NVME_QUIRK_DMA_ADDRESS_BITS_48, }, { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0065),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 80/91 nvme-pci: add NVME_QUIRK_BOGUS_NID for Lexar NM610
In reply to Greg Kroah-HartmanFrom: Shyamin Ayesh <[email protected]>
[ Upstream commit 200dccd07df21b504a2168960059f0a971bf415d ]
Lexar NM610 reports bogus eui64 values that appear to be the same across all drives. Quirk them out so they are not marked as "non globally unique" duplicates.
Stable-dep-of: 74391b3e6985 ("nvme-pci: add NVME_QUIRK_BOGUS_NID for T-FORCE Z330 SSD")
--- drivers/nvme/host/pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/nvme/host/pci.c +2 -0
@@ -3394,6 +3394,8 @@ static const struct pci_device_id nvme_id_table[] = { .driver_data = NVME_QUIRK_NO_DEEPEST_PS, }, { PCI_DEVICE(0xc0a9, 0x540a), /* Crucial P2 */ .driver_data = NVME_QUIRK_BOGUS_NID, }, + { PCI_DEVICE(0x1d97, 0x2263), /* Lexar NM610 */ + .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0061), .driver_data = NVME_QUIRK_DMA_ADDRESS_BITS_48, }, { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0065),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 81/91 nvme-pci: add NVME_QUIRK_BOGUS_NID for Lexar NM760
In reply to Greg Kroah-HartmanFrom: Abhijit <[email protected]>
[ Upstream commit 80b2624094c8d369a3c6eab515e8f1564d2e5db2 ]
Add a quirk to fix Lexar NM760 SSD drives reporting duplicate nsids.
Stable-dep-of: 74391b3e6985 ("nvme-pci: add NVME_QUIRK_BOGUS_NID for T-FORCE Z330 SSD")
--- drivers/nvme/host/pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/nvme/host/pci.c +2 -0
@@ -3396,6 +3396,8 @@ static const struct pci_device_id nvme_id_table[] = { .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1d97, 0x2263), /* Lexar NM610 */ .driver_data = NVME_QUIRK_BOGUS_NID, }, + { PCI_DEVICE(0x1d97, 0x2269), /* Lexar NM760 */ + .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0061), .driver_data = NVME_QUIRK_DMA_ADDRESS_BITS_48, }, { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0065),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 82/91 nvme-pci: mark Lexar NM760 as IGNORE_DEV_SUBNQN
In reply to Greg Kroah-HartmanFrom: Juraj Pecigos <[email protected]>
[ Upstream commit 1231363aec86704a6b0467a12e3ca7bdf890e01d ]
A system with more than one of these SSDs will only have one usable. The kernel fails to detect more than one nvme device due to duplicate cntlids.
before:
[ 9.395229] nvme 0000:01:00.0: platform quirk: setting simple suspend [ 9.395262] nvme nvme0: pci function 0000:01:00.0 [ 9.395282] nvme 0000:03:00.0: platform quirk: setting simple suspend [ 9.395305] nvme nvme1: pci function 0000:03:00.0 [ 9.409873] nvme nvme0: Duplicate cntlid 1 with nvme1, subsys nqn.2022-07.com.siliconmotion:nvm-subsystem-sn- , rejecting [ 9.409982] nvme nvme0: Removing after probe failure status: -22 [ 9.427487] nvme nvme1: allocated 64 MiB host memory buffer. [ 9.445088] nvme nvme1: 16/0/0 default/read/poll queues [ 9.449898] nvme nvme1: Ignoring bogus Namespace Identifiers
after:
[ 1.161890] nvme 0000:01:00.0: platform quirk: setting simple suspend [ 1.162660] nvme nvme0: pci function 0000:01:00.0 [ 1.162684] nvme 0000:03:00.0: platform quirk: setting simple suspend [ 1.162707] nvme nvme1: pci function 0000:03:00.0 [ 1.191354] nvme nvme0: allocated 64 MiB host memory buffer. [ 1.193378] nvme nvme1: allocated 64 MiB host memory buffer. [ 1.211044] nvme nvme1: 16/0/0 default/read/poll queues [ 1.211080] nvme nvme0: 16/0/0 default/read/poll queues [ 1.216145] nvme nvme0: Ignoring bogus Namespace Identifiers [ 1.216261] nvme nvme1: Ignoring bogus Namespace Identifiers
Adding the NVME_QUIRK_IGNORE_DEV_SUBNQN quirk to resolves the issue.
Stable-dep-of: 74391b3e6985 ("nvme-pci: add NVME_QUIRK_BOGUS_NID for T-FORCE Z330 SSD")
--- drivers/nvme/host/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/nvme/host/pci.c +2 -1
@@ -3397,7 +3397,8 @@ static const struct pci_device_id nvme_id_table[] = { { PCI_DEVICE(0x1d97, 0x2263), /* Lexar NM610 */ .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1d97, 0x2269), /* Lexar NM760 */ - .driver_data = NVME_QUIRK_BOGUS_NID, }, + .driver_data = NVME_QUIRK_BOGUS_NID | + NVME_QUIRK_IGNORE_DEV_SUBNQN, }, { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0061), .driver_data = NVME_QUIRK_DMA_ADDRESS_BITS_48, }, { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0065),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 83/91 nvme-pci: add NVME_QUIRK_BOGUS_NID for T-FORCE Z330 SSD
In reply to Greg Kroah-HartmanFrom: Duy Truong <[email protected]>
[ Upstream commit 74391b3e69855e7dd65a9cef36baf5fc1345affd ]
Added a quirk to fix the TeamGroup T-Force Cardea Zero Z330 SSDs reporting duplicate NGUIDs.
--- drivers/nvme/host/pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/nvme/host/pci.c +2 -0
@@ -3399,6 +3399,8 @@ static const struct pci_device_id nvme_id_table[] = { { PCI_DEVICE(0x1d97, 0x2269), /* Lexar NM760 */ .driver_data =NVME_QUIRK_BOGUS_NID | NVME_QUIRK_IGNORE_DEV_SUBNQN, }, + { PCI_DEVICE(0x10ec, 0x5763), /* TEAMGROUP T-FORCE CARDEA ZERO Z330 SSD */ + .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0061), .driver_data = NVME_QUIRK_DMA_ADDRESS_BITS_48, }, { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0065),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 84/91 cgroup/cpuset: Skip spread flags update on v2
In reply to Greg Kroah-HartmanFrom: Waiman Long <[email protected]>
[ Upstream commit 18f9a4d47527772515ad6cbdac796422566e6440 ]
Cpuset v2 has no spread flags to set. So we can skip spread flags update if cpuset v2 is being used. Also change the name to cpuset_update_task_spread_flags() to indicate that there are multiple spread flags.
Stable-dep-of: 42a11bf5c543 ("cgroup/cpuset: Make cpuset_fork() handle CLONE_INTO_CGROUP properly")
--- kernel/cgroup/cpuset.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
kernel/cgroup/cpuset.c +8 -4
@@ -450,11 +450,15 @@ static void guarantee_online_mems(struct cpuset *cs, nodemask_t *pmask)/* * update task's spread flag if cpuset's page/slab spread flag is set * -* Call with callback_lock or cpuset_rwsem held. +* Call with callback_lock or cpuset_rwsem held. The check can be skipped +* if on default hierarchy. */ -static void cpuset_update_task_spread_flag (struct cpuset *cs, +static void cpuset_update_task_spread_flags (struct cpuset *cs,struct task_struct *tsk) { +if (cgroup_subsys_on_dfl (cpuset_cgrp_subsys)) +return ; +if (is_spread_page (cs))task_set_spread_page (tsk);else
@@ -1941,7 +1945,7 @@ static void update_tasks_flags(struct cpuset *cs)css_task_iter_start (&cs->css,0 , &it);while ((task =css_task_iter_next (&it))) -cpuset_update_task_spread_flag (cs, task); +cpuset_update_task_spread_flags (cs, task);css_task_iter_end (&it); }
@@ -2274,7 +2278,7 @@ static void cpuset_attach(struct cgroup_taskset *tset)WARN_ON_ONCE (set_cpus_allowed_ptr (task, cpus_attach));cpuset_change_task_nodemask (task, &cpuset_attach_nodemask_to); -cpuset_update_task_spread_flag (cs, task); +cpuset_update_task_spread_flags (cs, task); }/*
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 85/91 cgroup/cpuset: Make cpuset_fork() handle CLONE_INTO_CGROUP properly
In reply to Greg Kroah-HartmanFrom: Waiman Long <[email protected]>
[ Upstream commit 42a11bf5c5436e91b040aeb04063be1710bb9f9c ]
By default, the clone(2) syscall spawn a child process into the same cgroup as its parent. With the use of the CLONE_INTO_CGROUP flag introduced by commit ef2c41cf38a7 ("clone3: allow spawning processes into cgroups"), the child will be spawned into a different cgroup which is somewhat similar to writing the child's tid into "cgroup.threads".
The current cpuset_fork() method does not properly handle the CLONE_INTO_CGROUP case where the cpuset of the child may be different from that of its parent. Update the cpuset_fork() method to treat the CLONE_INTO_CGROUP case similar to cpuset_attach().
Since the newly cloned task has not been running yet, its actual memory usage isn't known. So it is not necessary to make change to mm in cpuset_fork().
--- kernel/cgroup/cpuset.c | 62 ++++++++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 20 deletions(-)
kernel/cgroup/cpuset.c +42 -20
@@ -2242,16 +2242,33 @@ static void cpuset_cancel_attach(struct cgroup_taskset *tset) }/* -* Protected by cpuset_rwsem. cpus_attach is used only by cpuset_attach() +* Protected by cpuset_rwsem. cpus_attach is used only by cpuset_attach_task() * but we can't allocate it dynamically there. Define it global and * allocate from cpuset_init(). */ static cpumask_var_t cpus_attach; +static nodemask_t cpuset_attach_nodemask_to; + +static void cpuset_attach_task (struct cpuset *cs,struct task_struct *task) +{ +percpu_rwsem_assert_held (&cpuset_rwsem); + +if (cs != &top_cpuset) +guarantee_online_cpus (task, cpus_attach); +else +cpumask_copy (cpus_attach,task_cpu_possible_mask (task)); +/* +* can_attach beforehand should guarantee that this doesn't +* fail. TODO: have a better way to handle failure here +*/ +WARN_ON_ONCE (set_cpus_allowed_ptr (task, cpus_attach)); + +cpuset_change_task_nodemask (task, &cpuset_attach_nodemask_to); +cpuset_update_task_spread_flags (cs, task); +}static void cpuset_attach (struct cgroup_taskset *tset) { -/* static buf protected by cpuset_rwsem */ -static nodemask_t cpuset_attach_nodemask_to;struct task_struct *task;struct task_struct *leader;struct cgroup_subsys_state *css;
@@ -2266,20 +2283,8 @@ static void cpuset_attach(struct cgroup_taskset *tset)guarantee_online_mems (cs, &cpuset_attach_nodemask_to); -cgroup_taskset_for_each (task, css, tset) { -if (cs != &top_cpuset) -guarantee_online_cpus (task, cpus_attach); -else -cpumask_copy (cpus_attach,task_cpu_possible_mask (task)); -/* -* can_attach beforehand should guarantee that this doesn't -* fail. TODO: have a better way to handle failure here -*/ -WARN_ON_ONCE (set_cpus_allowed_ptr (task, cpus_attach)); - -cpuset_change_task_nodemask (task, &cpuset_attach_nodemask_to); -cpuset_update_task_spread_flags (cs, task); - } +cgroup_taskset_for_each (task, css, tset) +cpuset_attach_task (cs, task);/* * Change mm for all threadgroup leaders. This is expensive and may
@@ -2952,11 +2957,28 @@ static void cpuset_bind(struct cgroup_subsys_state *root_css)*/ static void cpuset_fork (struct task_struct *task) { -if (task_css_is_root (task, cpuset_cgrp_id)) +struct cpuset *cs; +bool same_cs; + +rcu_read_lock (); + cs =task_cs (task); + same_cs = (cs ==task_cs (current)); +rcu_read_unlock (); + +if (same_cs) { +if (cs == &top_cpuset) +return ; + +set_cpus_allowed_ptr (task, current->cpus_ptr); + task->mems_allowed = current->mems_allowed;return ; + } -set_cpus_allowed_ptr (task, current->cpus_ptr); - task->mems_allowed = current->mems_allowed; +/* CLONE_INTO_CGROUP */ +percpu_down_write (&cpuset_rwsem); +guarantee_online_mems (cs, &cpuset_attach_nodemask_to); +cpuset_attach_task (cs, task); +percpu_up_write (&cpuset_rwsem); }struct cgroup_subsys cpuset_cgrp_subsys = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 86/91 cgroup/cpuset: Add cpuset_can_fork() and cpuset_cancel_fork() methods
In reply to Greg Kroah-HartmanFrom: Waiman Long <[email protected]>
commit eee87853794187f6adbe19533ed79c8b44b36a91 upstream.
In the case of CLONE_INTO_CGROUP, not all cpusets are ready to accept new tasks. It is too late to check that in cpuset_fork(). So we need to add the cpuset_can_fork() and cpuset_cancel_fork() methods to pre-check it before we can allow attachment to a different cpuset.
We also need to set the attach_in_progress flag to alert other code that a new task is going to be added to the cpuset.
--- kernel/cgroup/cpuset.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 83 insertions(+), 5 deletions(-)
kernel/cgroup/cpuset.c +83 -5
@@ -2186,6 +2186,18 @@ static int fmeter_getrate(struct fmeterstatic struct cpuset *cpuset_attach_old_cs; +/* +* Check to see if a cpuset can accept a new task +* For v1, cpus_allowed and mems_allowed can't be empty. +*/ +static int cpuset_can_attach_check (struct cpuset *cs) +{ +if (!is_in_v2_mode () && + (cpumask_empty (cs->cpus_allowed) ||nodes_empty (cs->mems_allowed))) +return -ENOSPC ; +return 0 ; +} +/* Called by cgroups to determine if a cpuset is usable; cpuset_rwsem held */ static int cpuset_can_attach (struct cgroup_taskset *tset) {
@@ -2200,10 +2212,8 @@ static int cpuset_can_attach(struct cgropercpu_down_write (&cpuset_rwsem); -/* allow moving tasks into an empty cpuset if on default hierarchy */ - ret = -ENOSPC ; -if (!is_in_v2_mode () && - (cpumask_empty (cs->cpus_allowed) ||nodes_empty (cs->mems_allowed))) + ret =cpuset_can_attach_check (cs); +if (ret) goto out_unlock;cgroup_taskset_for_each (task, css, tset) {
@@ -2220,7 +2230,6 @@ static int cpuset_can_attach(struct cgro* changes which zero cpus/mems_allowed. */ cs->attach_in_progress++; - ret =0 ; out_unlock:percpu_up_write (&cpuset_rwsem);return ret;
@@ -2951,6 +2960,68 @@ static void cpuset_bind(struct cgroup_su }/* +* In case the child is cloned into a cpuset different from its parent, +* additional checks are done to see if the move is allowed. +*/ +static int cpuset_can_fork (struct task_struct *task,struct css_set *cset) +{ +struct cpuset *cs =css_cs (cset->subsys[cpuset_cgrp_id]); +bool same_cs; +int ret; + +rcu_read_lock (); + same_cs = (cs ==task_cs (current)); +rcu_read_unlock (); + +if (same_cs) +return 0 ; + +lockdep_assert_held (&cgroup_mutex); +percpu_down_write (&cpuset_rwsem); + +/* Check to see if task is allowed in the cpuset */ + ret =cpuset_can_attach_check (cs); +if (ret) + goto out_unlock; + + ret =task_can_attach (task, cs->effective_cpus); +if (ret) + goto out_unlock; + + ret =security_task_setscheduler (task); +if (ret) + goto out_unlock; + +/* +* Mark attach is in progress. This makes validate_change() fail +* changes which zero cpus/mems_allowed. +*/ + cs->attach_in_progress++; +out_unlock: +percpu_up_write (&cpuset_rwsem); +return ret; +} + +static void cpuset_cancel_fork (struct task_struct *task,struct css_set *cset) +{ +struct cpuset *cs =css_cs (cset->subsys[cpuset_cgrp_id]); +bool same_cs; + +rcu_read_lock (); + same_cs = (cs ==task_cs (current)); +rcu_read_unlock (); + +if (same_cs) +return ; + +percpu_down_write (&cpuset_rwsem); + cs->attach_in_progress--; +if (!cs->attach_in_progress) +wake_up (&cpuset_attach_wq); +percpu_up_write (&cpuset_rwsem); +} + +/* * Make sure the new task conform to the current state of its parent, * which could have been changed by cpuset just after it inherits the * state from the parent and before it sits on the cgroup's task list.
@@ -2978,6 +3049,11 @@ static void cpuset_fork(struct task_strupercpu_down_write (&cpuset_rwsem);guarantee_online_mems (cs, &cpuset_attach_nodemask_to);cpuset_attach_task (cs, task); + + cs->attach_in_progress--; +if (!cs->attach_in_progress) +wake_up (&cpuset_attach_wq); +percpu_up_write (&cpuset_rwsem); }
@@ -2991,6 +3067,8 @@ struct cgroup_subsys cpuset_cgrp_subsys .attach = cpuset_attach, .post_attach = cpuset_post_attach, .bind = cpuset_bind, + .can_fork = cpuset_can_fork, + .cancel_fork = cpuset_cancel_fork, .fork = cpuset_fork, .legacy_cftypes = legacy_files, .dfl_cftypes = dfl_files,
Greg Kroah-Hartman
maintainerPATCH 87/91 kexec: turn all kexec_mutex acquisitions into trylocks
In reply to Greg Kroah-HartmanFrom: Valentin Schneider <[email protected]>
commit 7bb5da0d490b2d836c5218f5186ee588d2145310 upstream.
Patch series "kexec, panic: Making crash_kexec() NMI safe", v4.
This patch (of 2):
Most acquistions of kexec_mutex are done via mutex_trylock() - those were a direct "translation" from:
8c5a1cf0ad3a ("kexec: use a mutex for locking rather than xchg()")
there have however been two additions since then that use mutex_lock():crash_get_memory_size() and crash_shrink_memory().
A later commit will replace said mutex with an atomic variable, and locking operations will become atomic_cmpxchg(). Rather than having those mutex_lock() become while (atomic_cmpxchg(&lock, 0, 1)), turn them into trylocks that can return -EBUSY on acquisition failure.
This does halve the printable size of the crash kernel, but that's still neighbouring 2G for 32bit kernels which should be ample enough.
--- include/linux/kexec.h | 2 +- kernel/kexec_core.c | 12 ++++++++---- kernel/ksysfs.c | 7 ++++++- 3 files changed, 15 insertions(+), 6 deletions(-)
include/linux/kexec.h +1 -1
@@ -390,8 +390,8 @@ extern note_buf_t __percpu *crash_notes;extern bool kexec_in_progress;int crash_shrink_memory (unsigned long new_size); -size_t crash_get_memory_size (void );void crash_free_reserved_phys_range (unsigned long begin,unsigned long end); +ssize_t crash_get_memory_size (void );void arch_kexec_protect_crashkres (void );void arch_kexec_unprotect_crashkres (void );
kernel/kexec_core.c +8 -4
@@ -989,13 +989,16 @@ void crash_kexec(struct pt_regs *regs) } } -size_t crash_get_memory_size (void ) +ssize_t crash_get_memory_size (void ) { -size_t size =0 ; +ssize_t size =0 ; + +if (!mutex_trylock (&kexec_mutex)) +return -EBUSY ; -mutex_lock (&kexec_mutex);if (crashk_res.end != crashk_res.start) size =resource_size (&crashk_res); +mutex_unlock (&kexec_mutex);return size; }
@@ -1016,7 +1019,8 @@ int crash_shrink_memory(unsigned long neunsigned long old_size;struct resource *ram_res; -mutex_lock (&kexec_mutex); +if (!mutex_trylock (&kexec_mutex)) +return -EBUSY ;if (kexec_crash_image) { ret = -ENOENT ;
kernel/ksysfs.c +6 -1
@@ -106,7 +106,12 @@ KERNEL_ATTR_RO(kexec_crash_loaded);static ssize_t kexec_crash_size_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf) { -return sprintf (buf,"%zu\n" ,crash_get_memory_size ()); +ssize_t size =crash_get_memory_size (); + +if (size <0 ) +return size; + +return sprintf (buf,"%zd\n" , size); } static ssize_t kexec_crash_size_store(struct kobject *kobj, struct kobj_attribute *attr,
Greg Kroah-Hartman
maintainerPATCH 88/91 panic, kexec: make __crash_kexec() NMI safe
In reply to Greg Kroah-HartmanFrom: Valentin Schneider <[email protected]>
commit 05c6257433b7212f07a7e53479a8ab038fc1666a upstream.
Attempting to get a crash dump out of a debug PREEMPT_RT kernel via an NMI panic() doesn't work. The cause of that lies in the PREEMPT_RT definition of mutex_trylock():
if (IS_ENABLED(CONFIG_DEBUG_RT_MUTEXES) && WARN_ON_ONCE(!in_task())) return 0;
This prevents an nmi_panic() from executing the main body of __crash_kexec() which does the actual kexec into the kdump kernel. The warning and return are explained by:
6ce47fd961fa ("rtmutex: Warn if trylock is called from hard/softirq context") [...]
The reasons for this are:
1) There is a potential deadlock in the slowpath
2) Another cpu which blocks on the rtmutex will boost the task which allegedly locked the rtmutex, but that cannot work because the hard/softirq context borrows the task context.
Furthermore, grabbing the lock isn't NMI safe, so do away with kexec_mutex and replace it with an atomic variable. This is somewhat overzealous as *some* callsites could keep using a mutex (e.g. the sysfs-facing ones like crash_shrink_memory()), but this has the benefit of involving a single unified lock and preventing any future NMI-related surprises.
Tested by triggering NMI panics via:
$ echo 1 > /proc/sys/kernel/panic_on_unrecovered_nmi $ echo 1 > /proc/sys/kernel/unknown_nmi_panic $ echo 1 > /proc/sys/kernel/panic
$ ipmitool power diag
--- kernel/kexec.c | 11 ++++------- kernel/kexec_core.c | 20 ++++++++++---------- kernel/kexec_file.c | 4 ++-- kernel/kexec_internal.h | 15 ++++++++++++++- 4 files changed, 30 insertions(+), 20 deletions(-)
kernel/kexec.c +4 -7
@@ -93,13 +93,10 @@ static int do_kexec_load(unsigned long e/* * Because we write directly to the reserved memory region when loading -* crash kernels we need a mutex here to prevent multiple crash kernels -* from attempting to load simultaneously, and to prevent a crash kernel -* from loading over the top of a in use crash kernel. -* -* KISS: always take the mutex. +* crash kernels we need a serialization here to prevent multiple crash +* kernels from attempting to load simultaneously. */ -if (!mutex_trylock (&kexec_mutex)) +if (!kexec_trylock ())return -EBUSY ;if (flags &KEXEC_ON_CRASH ) {
@@ -165,7 +162,7 @@ out:kimage_free (image); out_unlock: -mutex_unlock (&kexec_mutex); +kexec_unlock ();return ret; }
kernel/kexec_core.c +10 -10
@@ -46,7 +46,7 @@#include <crypto/hash.h> #include "kexec_internal.h" -DEFINE_MUTEX (kexec_mutex); +atomic_t __kexec_lock =ATOMIC_INIT (0 );/* Per cpu memory for storing cpu states in case of system crash. */ note_buf_t __percpu *crash_notes;
@@ -944,7 +944,7 @@ int kexec_load_disabled;*/ void __noclone __crash_kexec (struct pt_regs *regs) { -/* Take the kexec_mutex here to prevent sys_kexec_load +/* Take the kexec_lock here to prevent sys_kexec_load * running on one cpu from replacing the crash kernel * we are using after a panic on a different cpu. *
@@ -952,7 +952,7 @@ void __noclone __crash_kexec(struct pt_r* of memory the xchg(&kexec_crash_image) would be * sufficient. But since I reuse the memory... */ -if (mutex_trylock (&kexec_mutex)) { +if (kexec_trylock ()) {if (kexec_crash_image) {struct pt_regs fixed_regs;
@@ -961,7 +961,7 @@ void __noclone __crash_kexec(struct pt_rmachine_crash_shutdown (&fixed_regs);machine_kexec (kexec_crash_image); } -mutex_unlock (&kexec_mutex); +kexec_unlock (); } }STACK_FRAME_NON_STANDARD (__crash_kexec);
@@ -993,13 +993,13 @@ ssize_t crash_get_memory_size(void) {ssize_t size =0 ; -if (!mutex_trylock (&kexec_mutex)) +if (!kexec_trylock ())return -EBUSY ;if (crashk_res.end != crashk_res.start) size =resource_size (&crashk_res); -mutex_unlock (&kexec_mutex); +kexec_unlock ();return size; }
@@ -1019,7 +1019,7 @@ int crash_shrink_memory(unsigned long neunsigned long old_size;struct resource *ram_res; -if (!mutex_trylock (&kexec_mutex)) +if (!kexec_trylock ())return -EBUSY ;if (kexec_crash_image) {
@@ -1058,7 +1058,7 @@ int crash_shrink_memory(unsigned long neinsert_resource (&iomem_resource, ram_res); unlock: -mutex_unlock (&kexec_mutex); +kexec_unlock ();return ret; }
@@ -1130,7 +1130,7 @@ int kernel_kexec(void) {int error =0 ; -if (!mutex_trylock (&kexec_mutex)) +if (!kexec_trylock ())return -EBUSY ;if (!kexec_image) { error = -EINVAL ;
@@ -1206,7 +1206,7 @@ int kernel_kexec(void)#endif Unlock: -mutex_unlock (&kexec_mutex); +kexec_unlock ();return error; }
kernel/kexec_file.c +2 -2
@@ -343,7 +343,7 @@ SYSCALL_DEFINE5(kexec_file_load, int, ke image =NULL ; -if (!mutex_trylock (&kexec_mutex)) +if (!kexec_trylock ())return -EBUSY ; dest_image = &kexec_image;
@@ -415,7 +415,7 @@ out:if ((flags &KEXEC_FILE_ON_CRASH ) && kexec_crash_image)arch_kexec_protect_crashkres (); -mutex_unlock (&kexec_mutex); +kexec_unlock ();kimage_free (image);return ret; }
kernel/kexec_internal.h +14 -1
@@ -13,7 +13,20 @@ void kimage_terminate(struct kimage *imaint kimage_is_destination_range (struct kimage *image,unsigned long start,unsigned long end); -extern struct mutex kexec_mutex; +/* +* Whatever is used to serialize accesses to the kexec_crash_image needs to be +* NMI safe, as __crash_kexec() can happen during nmi_panic(), so here we use a +* "simple" atomic variable that is acquired with a cmpxchg(). +*/ +extern atomic_t __kexec_lock; +static inline bool kexec_trylock (void ) +{ +return atomic_cmpxchg_acquire (&__kexec_lock,0 ,1 ) ==0 ; +} +static inline void kexec_unlock (void ) +{ +atomic_set_release (&__kexec_lock,0 ); +}#ifdef CONFIG_KEXEC_FILE #include <linux/purgatory.h>
Greg Kroah-Hartman
maintainerPATCH 71/91 sched/fair: Fix imbalance overflow
In reply to Greg Kroah-HartmanFrom: Vincent Guittot <[email protected]>
[ Upstream commit 91dcf1e8068e9a8823e419a7a34ff4341275fb70 ]
When local group is fully busy but its average load is above system load, computing the imbalance will overflow and local group is not the best target for pulling this load.
--- kernel/sched/fair.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
kernel/sched/fair.c +10 -0
@@ -9647,6 +9647,16 @@ static inline void calculate_imbalance(struct lb_env *env, struct sd_lb_stats *s sds->avg_load = (sds->total_load *SCHED_CAPACITY_SCALE ) / sds->total_capacity; + +/* +* If the local group is more loaded than the average system +* load, don't try to pull any tasks. +*/ +if (local->avg_load >= sds->avg_load) { + env->imbalance =0 ; +return ; + } + }/*
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 89/91 counter: fix docum. build problems after filename change
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
commit 7110acbdab462b8f2bc30e216c331cbd68c00af9 upstream.
Fix documentation build warnings due to a source file being renamed.
WARNING: kernel-doc '../scripts/kernel-doc -rst -enable-lineno -sphinx-version 1.8.5 -export ../drivers/counter/counter.c' failed with return code 2
Error: Cannot open file ../drivers/counter/counter.c
--- Documentation/driver-api/generic-counter.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/driver-api/generic-counter.rst +1 -1
@@ -247,7 +247,7 @@ for defining a counter device. .. kernel-doc:: include/linux/counter.h :internal: -.. kernel-doc:: drivers/counter/counter.c +.. kernel-doc:: drivers/counter/counter-core.c :export: Implementation
Greg Kroah-Hartman
maintainerPATCH 90/91 counter: Add the necessary colons and indents to the comments of counter_compi
In reply to Greg Kroah-HartmanFrom: Yanteng Si <[email protected]>
commit 0032ca576a79946492194ae4860b462d32815c66 upstream.
Since commit aaec1a0f76ec ("counter: Internalize sysfs interface code") introduce a warning as:
linux-next/Documentation/driver-api/generic-counter:234: ./include/linux/counter.h:43: WARNING: Unexpected indentation. linux-next/Documentation/driver-api/generic-counter:234: ./include/linux/counter.h:45: WARNING: Block quote ends without a blank line; unexpected unindent.
Add the necessary colons and indents.
--- include/linux/counter.h | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-)
include/linux/counter.h +20 -20
@@ -73,64 +73,64 @@ enum counter_synapse_action {* @type: Counter component data type * @name: device-specific component name * @priv: component-relevant data -* @action_read Synapse action mode read callback. The read value of the +* @action_read: Synapse action mode read callback. The read value of the * respective Synapse action mode should be passed back via * the action parameter. -* @device_u8_read Device u8 component read callback. The read value of the +* @device_u8_read: Device u8 component read callback. The read value of the * respective Device u8 component should be passed back via * the val parameter. -* @count_u8_read Count u8 component read callback. The read value of the +* @count_u8_read: Count u8 component read callback. The read value of the * respective Count u8 component should be passed back via * the val parameter. -* @signal_u8_read Signal u8 component read callback. The read value of the +* @signal_u8_read: Signal u8 component read callback. The read value of the * respective Signal u8 component should be passed back via * the val parameter. -* @device_u32_read Device u32 component read callback. The read value of +* @device_u32_read: Device u32 component read callback. The read value of * the respective Device u32 component should be passed * back via the val parameter. -* @count_u32_read Count u32 component read callback. The read value of the +* @count_u32_read: Count u32 component read callback. The read value of the * respective Count u32 component should be passed back via * the val parameter. -* @signal_u32_read Signal u32 component read callback. The read value of +* @signal_u32_read: Signal u32 component read callback. The read value of * the respective Signal u32 component should be passed * back via the val parameter. -* @device_u64_read Device u64 component read callback. The read value of +* @device_u64_read: Device u64 component read callback. The read value of * the respective Device u64 component should be passed * back via the val parameter. -* @count_u64_read Count u64 component read callback. The read value of the +* @count_u64_read: Count u64 component read callback. The read value of the * respective Count u64 component should be passed back via * the val parameter. -* @signal_u64_read Signal u64 component read callback. The read value of +* @signal_u64_read: Signal u64 component read callback. The read value of * the respective Signal u64 component should be passed * back via the val parameter. -* @action_write Synapse action mode write callback. The write value of +* @action_write: Synapse action mode write callback. The write value of * the respective Synapse action mode is passed via the * action parameter. -* @device_u8_write Device u8 component write callback. The write value of +* @device_u8_write: Device u8 component write callback. The write value of * the respective Device u8 component is passed via the val * parameter. -* @count_u8_write Count u8 component write callback. The write value of +* @count_u8_write: Count u8 component write callback. The write value of * the respective Count u8 component is passed via the val * parameter. -* @signal_u8_write Signal u8 component write callback. The write value of +* @signal_u8_write: Signal u8 component write callback. The write value of * the respective Signal u8 component is passed via the val * parameter. -* @device_u32_write Device u32 component write callback. The write value of +* @device_u32_write: Device u32 component write callback. The write value of * the respective Device u32 component is passed via the * val parameter. -* @count_u32_write Count u32 component write callback. The write value of +* @count_u32_write: Count u32 component write callback. The write value of * the respective Count u32 component is passed via the val * parameter. -* @signal_u32_write Signal u32 component write callback. The write value of +* @signal_u32_write: Signal u32 component write callback. The write value of * the respective Signal u32 component is passed via the * val parameter. -* @device_u64_write Device u64 component write callback. The write value of +* @device_u64_write: Device u64 component write callback. The write value of * the respective Device u64 component is passed via the * val parameter. -* @count_u64_write Count u64 component write callback. The write value of +* @count_u64_write: Count u64 component write callback. The write value of * the respective Count u64 component is passed via the val * parameter. -* @signal_u64_write Signal u64 component write callback. The write value of +* @signal_u64_write: Signal u64 component write callback. The write value of * the respective Signal u64 component is passed via the * val parameter. */
Greg Kroah-Hartman
maintainerPATCH 91/91 nvme-pci: avoid the deepest sleep state on ZHITAI TiPro5000 SSDs
In reply to Greg Kroah-HartmanFrom: Xi Ruoyao <[email protected]>
commit d5d3c100ac40dcb03959a6f1d2f0f13204c4f145 upstream.
ZHITAI TiPro5000 SSDs has the same APST sleep problem as its cousin, TiPro7000. The quirk for TiPro7000 has been added in commit 6b961bce50e4 ("nvme-pci: avoid the deepest sleep state on ZHITAI TiPro7000 SSDs"), use the same quirk for TiPro5000.
The ASPT data from "nvme id-ctrl /dev/nvme1":
vid : 0x1e49
ssvid : 0x1e49
sn : ZTA21T0KA2227304LM
mn : ZHITAI TiPlus5000 1TB
fr : ZTA09139
[...]
ps 0 : mp:6.50W operational enlat:0 exlat:0 rrt:0 rrl:0
rwt:0 rwl:0 idle_power:- active_power:-
ps 1 : mp:5.80W operational enlat:0 exlat:0 rrt:1 rrl:1
rwt:1 rwl:1 idle_power:- active_power:-
ps 2 : mp:3.60W operational enlat:0 exlat:0 rrt:2 rrl:2
rwt:2 rwl:2 idle_power:- active_power:-
ps 3 : mp:0.0500W non-operational enlat:5000 exlat:10000 rrt:3 rrl:3
rwt:3 rwl:3 idle_power:- active_power:-
ps 4 : mp:0.0025W non-operational enlat:8000 exlat:45000 rrt:4 rrl:4
rwt:4 rwl:4 idle_power:- active_power:---- drivers/nvme/host/pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/nvme/host/pci.c +2 -0
@@ -3390,6 +3390,8 @@ static const struct pci_device_id nvme_i .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1cc1, 0x5350), /* ADATA XPG GAMMIX S50 */ .driver_data = NVME_QUIRK_BOGUS_NID, }, + { PCI_DEVICE(0x1e49, 0x0021), /* ZHITAI TiPro5000 NVMe SSD */ + .driver_data = NVME_QUIRK_NO_DEEPEST_PS, }, { PCI_DEVICE(0x1e49, 0x0041), /* ZHITAI TiPro7000 NVMe SSD */ .driver_data = NVME_QUIRK_NO_DEEPEST_PS, }, { PCI_DEVICE(0xc0a9, 0x540a), /* Crucial P2 */
Greg Kroah-Hartman
maintainerPATCH 72/91 x86/rtc: Remove __init for runtime functions
In reply to Greg Kroah-HartmanFrom: Matija Glavinic Pecotic <[email protected]>
[ Upstream commit 775d3c514c5b2763a50ab7839026d7561795924d ]
set_rtc_noop(), get_rtc_noop() are after booting, therefore their __init annotation is wrong.
A crash was observed on an x86 platform where CMOS RTC is unused and disabled via device tree. set_rtc_noop() was invoked from ntp:sync_hw_clock(), although CONFIG_RTC_SYSTOHC=n, however sync_cmos_clock() doesn't honour that.
Workqueue: events_power_efficient sync_hw_clock RIP: 0010:set_rtc_noop Call Trace: update_persistent_clock64 sync_hw_clock
Fix this by dropping the __init annotation from set/get_rtc_noop().
--- arch/x86/kernel/x86_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/x86_init.c +2 -2
@@ -32,8 +32,8 @@ static int __init iommu_init_noop(void) { return 0; }static void iommu_shutdown_noop (void ) { }bool __init bool_x86_init_noop (void ) {return false; }void x86_op_int_noop (int cpu) { } -static __init int set_rtc_noop (const struct timespec64 *now) {return -EINVAL ; } -static __init void get_rtc_noop (struct timespec64 *now) { } +static int set_rtc_noop (const struct timespec64 *now) {return -EINVAL ; } +static void get_rtc_noop (struct timespec64 *now) { }static __initconst const struct of_device_id of_cmos_match[] = { { .compatible ="motorola,mc146818" },
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 73/91 i2c: ocores: generate stop condition after timeout in polling mode
In reply to Greg Kroah-HartmanFrom: Gregor Herburger <[email protected]>
[ Upstream commit f8160d3b35fc94491bb0cb974dbda310ef96c0e2 ]
In polling mode, no stop condition is generated after a timeout. This causes SCL to remain low and thereby block the bus. If this happens during a transfer it can cause slaves to misinterpret the subsequent transfer and return wrong values.
To solve this, pass the ETIMEDOUT error up from ocores_process_polling() instead of setting STATE_ERROR directly. The caller is adjusted to call ocores_process_timeout() on error both in polling and in IRQ mode, which will set STATE_ERROR and generate a stop condition.
--- drivers/i2c/busses/i2c-ocores.c | 35 ++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 16 deletions(-)
drivers/i2c/busses/i2c-ocores.c +19 -16
@@ -342,18 +342,18 @@ static int ocores_poll_wait(struct ocores_i2c *i2c)* ocores_isr(), we just add our polling code around it. * * It can run in atomic context +* +* Return: 0 on success, -ETIMEDOUT on timeout */ -static void ocores_process_polling (struct ocores_i2c *i2c) +static int ocores_process_polling (struct ocores_i2c *i2c) { -while (1 ) { -irqreturn_t ret; -int err; +irqreturn_t ret; +int err =0 ; +while (1 ) { err =ocores_poll_wait (i2c); -if (err) { - i2c->state =STATE_ERROR ; +if (err)break ;/* timeout */ - } ret =ocores_isr (-1 , i2c);if (ret ==IRQ_NONE )
@@ -364,13 +364,15 @@ static void ocores_process_polling(struct ocores_i2c *i2c)break ; } } + +return err; }static int ocores_xfer_core (struct ocores_i2c *i2c,struct i2c_msg *msgs,int num,bool polling) { -int ret; +int ret =0 ;u8 ctrl; ctrl =oc_getreg (i2c,OCI2C_CONTROL );
@@ -388,15 +390,16 @@ static int ocores_xfer_core(struct ocores_i2c *i2c,oc_setreg (i2c,OCI2C_CMD ,OCI2C_CMD_START );if (polling) { -ocores_process_polling (i2c); + ret =ocores_process_polling (i2c); }else { - ret =wait_event_timeout (i2c->wait, - (i2c->state ==STATE_ERROR ) || - (i2c->state ==STATE_DONE ),HZ ); -if (ret ==0 ) { -ocores_process_timeout (i2c); -return -ETIMEDOUT ; - } +if (wait_event_timeout (i2c->wait, + (i2c->state ==STATE_ERROR ) || + (i2c->state ==STATE_DONE ),HZ ) ==0 ) + ret = -ETIMEDOUT ; + } +if (ret) { +ocores_process_timeout (i2c); +return ret; }return (i2c->state ==STATE_DONE ) ? num : -EIO ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 74/91 sh: remove meaningless archclean line
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 10c6ae274fe29f732ca9bbcd7016e9827673c954 ]
The vsyscall directory is cleaned up by the ordinary way via arch/sh/kernel/Makefile:
obj-$(CONFIG_VSYSCALL) += vsyscall/
Stable-dep-of: d83806c4c0cc ("purgatory: fix disabling debug info")
--- arch/sh/Makefile | 1 - 1 file changed, 1 deletion(-)
arch/sh/Makefile +0 -1
@@ -200,7 +200,6 @@ archprepare: archclean: $(Q)$(MAKE) $(clean)=$(boot) - $(Q)$(MAKE) $(clean)=arch/sh/kernel/vsyscall archheaders: $(Q)$(MAKE) $(build)=arch/sh/kernel/syscalls all
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 75/91 kbuild: use more subdir- for visiting subdirectories while cleaning
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 8212f8986d311ccf6a72305e6bdbd814691701d6 ]
Documentation/kbuild/makefiles.rst suggests to use "archclean" for cleaning arch/$(SRCARCH)/boot/, but it is not a hard requirement.
Since commit d92cc4d51643 ("kbuild: require all architectures to have arch/$(SRCARCH)/Kbuild"), we can use the "subdir- += boot" trick for all architectures. This can take advantage of the parallel option (-j) for "make clean".
I also cleaned up the comments in arch/$(SRCARCH)/Makefile. The "archdep" target no longer exists.
Stable-dep-of: d83806c4c0cc ("purgatory: fix disabling debug info")
--- Documentation/kbuild/makefiles.rst | 17 ++--------------- arch/alpha/Kbuild | 3 +++ arch/alpha/Makefile | 3 --- arch/arc/Kbuild | 3 +++ arch/arc/Makefile | 3 --- arch/arm/Kbuild | 3 +++ arch/arm/Makefile | 4 ---- arch/arm64/Kbuild | 3 +++ arch/arm64/Makefile | 7 ------- arch/arm64/kernel/Makefile | 3 +++ arch/csky/Kbuild | 3 +++ arch/csky/Makefile | 3 --- arch/h8300/Kbuild | 3 +++ arch/h8300/Makefile | 3 --- arch/ia64/Makefile | 2 -- arch/m68k/Makefile | 4 +--- arch/microblaze/Kbuild | 3 +++ arch/microblaze/Makefile | 3 --- arch/mips/Kbuild | 3 +++ arch/mips/Makefile | 8 +------- arch/mips/boot/Makefile | 3 +++ arch/nds32/Kbuild | 3 +++ arch/nds32/Makefile | 3 --- arch/nios2/Kbuild | 3 +++ arch/nios2/Makefile | 6 +----- arch/openrisc/Kbuild | 3 +++ arch/openrisc/Makefile | 7 +------ arch/parisc/Kbuild | 3 +++ arch/parisc/Makefile | 7 +------ arch/powerpc/Kbuild | 3 +++ arch/powerpc/Makefile | 7 +------ arch/riscv/Kbuild | 3 +++ arch/riscv/Makefile | 7 +------ arch/s390/Kbuild | 3 +++ arch/s390/Makefile | 8 +------- arch/sh/Kbuild | 3 +++ arch/sh/Makefile | 3 --- arch/sparc/Kbuild | 3 +++ arch/sparc/Makefile | 3 --- arch/x86/Kbuild | 3 +++ arch/x86/Makefile | 2 -- arch/xtensa/Makefile | 4 +--- 42 files changed, 71 insertions(+), 103 deletions(-)
Documentation/kbuild/makefiles.rst +2 -15
@@ -1050,22 +1050,9 @@ is not sufficient this sometimes needs to be explicit. The above assignment instructs kbuild to descend down in the directory compressed/ when "make clean" is executed. -To support the clean infrastructure in the Makefiles that build the -final bootimage there is an optional target named archclean: - - Example:: - - #arch/x86/Makefile - archclean: - $(Q)$(MAKE) $(clean)=arch/x86/boot - -When "make clean" is executed, make will descend down in arch/x86/boot, -and clean as usual. The Makefile located in arch/x86/boot/ may use -the subdir- trick to descend further down. - Note 1: arch/$(SRCARCH)/Makefile cannot use "subdir-", because that file is -included in the top level makefile, and the kbuild infrastructure -is not operational at that point. +included in the top level makefile. Instead, arch/$(SRCARCH)/Kbuild can use +"subdir-". Note 2: All directories listed in core-y, libs-y, drivers-y and net-y will be visited during "make clean".
arch/alpha/Kbuild +3 -0
@@ -1,3 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only obj-y += kernel/ mm/ obj-$(CONFIG_MATHEMU) += math-emu/ + +# for cleaning +subdir- += boot
arch/alpha/Makefile +0 -3
@@ -55,9 +55,6 @@ $(boot)/vmlinux.gz: vmlinux bootimage bootpfile bootpzfile: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ -archclean: - $(Q)$(MAKE) $(clean)=$(boot) - archheaders: $(Q)$(MAKE) $(build)=arch/alpha/kernel/syscalls all
arch/arc/Kbuild +3 -0
@@ -1,3 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-y += kernel/ obj-y += mm/ + +# for cleaning +subdir- += boot
arch/arc/Makefile +0 -3
@@ -112,6 +112,3 @@ uImage: $(uimage-default-y) @$(kecho) ' Image $(boot)/uImage is ready' CLEAN_FILES += $(boot)/uImage - -archclean: - $(Q)$(MAKE) $(clean)=$(boot)
arch/arm/Kbuild +3 -0
@@ -9,3 +9,6 @@ obj-y += kernel/ mm/ common/ obj-y += probes/ obj-y += net/ obj-y += crypto/ + +# for cleaning +subdir- += boot
arch/arm/Makefile +0 -4
@@ -317,10 +317,6 @@ ifeq ($(CONFIG_VDSO),y) $(Q)$(MAKE) $(build)=arch/arm/vdso $@ endif -# We use MRPROPER_FILES and CLEAN_FILES now -archclean: - $(Q)$(MAKE) $(clean)=$(boot) - # My testing targets (bypasses dependencies) bp:; $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/bootpImage
arch/arm64/Kbuild +3 -0
@@ -4,3 +4,6 @@ obj-$(CONFIG_KVM) += kvm/ obj-$(CONFIG_XEN) += xen/ obj-$(subst m,y,$(CONFIG_HYPERV)) += hyperv/ obj-$(CONFIG_CRYPTO) += crypto/ + +# for cleaning +subdir- += boot
arch/arm64/Makefile +0 -7
@@ -182,13 +182,6 @@ ifeq ($(CONFIG_ARM64_USE_LSE_ATOMICS),y) endif endif - -# We use MRPROPER_FILES and CLEAN_FILES now -archclean: - $(Q)$(MAKE) $(clean)=$(boot) - $(Q)$(MAKE) $(clean)=arch/arm64/kernel/vdso - $(Q)$(MAKE) $(clean)=arch/arm64/kernel/vdso32 - ifeq ($(KBUILD_EXTMOD),) # We need to generate vdso-offsets.h before compiling certain files in kernel/. # In order to do that, we should use the archprepare target, but we can't since
arch/arm64/kernel/Makefile +3 -0
@@ -85,3 +85,6 @@ extra-y += $(head-y) vmlinux.lds ifeq ($(CONFIG_DEBUG_EFI),y) AFLAGS_head.o += -DVMLINUX_PATH="\"$(realpath $(objtree)/vmlinux)\"" endif + +# for cleaning +subdir- += vdso vdso32
arch/csky/Kbuild +3 -0
@@ -1 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only + +# for cleaning +subdir- += boot
arch/csky/Makefile +0 -3
@@ -76,9 +76,6 @@ all: zImage zImage Image uImage: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ -archclean: - $(Q)$(MAKE) $(clean)=$(boot) - define archhelp echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/zImage)' echo ' Image - Uncompressed kernel image (arch/$(ARCH)/boot/Image)'
arch/h8300/Kbuild +3 -0
@@ -1,2 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only obj-y += kernel/ mm/ boot/dts/ + +# for cleaning +subdir- += boot
arch/h8300/Makefile +0 -3
@@ -34,9 +34,6 @@ libs-y += arch/$(ARCH)/lib/ boot := arch/h8300/boot -archclean: - $(Q)$(MAKE) $(clean)=$(boot) - vmlinux.srec vmlinux.bin zImage uImage.bin: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
arch/ia64/Makefile +0 -2
@@ -67,8 +67,6 @@ vmlinux.bin: vmlinux FORCE unwcheck: vmlinux -$(Q)READELF=$(READELF) $(PYTHON3) $(srctree)/arch/ia64/scripts/unwcheck.py $< -archclean: - archheaders: $(Q)$(MAKE) $(build)=arch/ia64/kernel/syscalls all
arch/m68k/Makefile +1 -3
@@ -2,9 +2,7 @@ # m68k/Makefile # # This file is included by the global makefile so that you can add your own -# architecture-specific flags and dependencies. Remember to do have actions -# for "archclean" and "archdep" for cleaning up and making dependencies for -# this architecture +# architecture-specific flags and dependencies. # # This file is subject to the terms and conditions of the GNU General Public # License. See the file "COPYING" in the main directory of this archive
arch/microblaze/Kbuild +3 -0
@@ -3,3 +3,6 @@ obj-y += kernel/ obj-y += mm/ obj-$(CONFIG_PCI) += pci/ obj-y += boot/dts/ + +# for cleaning +subdir- += boot
arch/microblaze/Makefile +0 -3
@@ -60,9 +60,6 @@ export DTB all: linux.bin -archclean: - $(Q)$(MAKE) $(clean)=$(boot) - archheaders: $(Q)$(MAKE) $(build)=arch/microblaze/kernel/syscalls all
arch/mips/Kbuild +3 -0
@@ -25,3 +25,6 @@ obj-y += vdso/ ifdef CONFIG_KVM obj-y += kvm/ endif + +# for cleaning +subdir- += boot
arch/mips/Makefile +1 -7
@@ -8,8 +8,7 @@ # Copyright (C) 2002, 2003, 2004 Maciej W. Rozycki # # This file is included by the global makefile so that you can add your own -# architecture-specific flags and dependencies. Remember to do have actions -# for "archclean" cleaning up for this architecture. +# architecture-specific flags and dependencies. # archscripts: scripts_basic
@@ -428,11 +427,6 @@ endif $(Q)install -D -m 644 .config $(INSTALL_PATH)/config-$(KERNELRELEASE) $(Q)install -D -m 644 System.map $(INSTALL_PATH)/System.map-$(KERNELRELEASE) -archclean: - $(Q)$(MAKE) $(clean)=arch/mips/boot - $(Q)$(MAKE) $(clean)=arch/mips/boot/compressed - $(Q)$(MAKE) $(clean)=arch/mips/boot/tools - archheaders: $(Q)$(MAKE) $(build)=arch/mips/kernel/syscalls all
arch/mips/boot/Makefile +3 -0
@@ -171,3 +171,6 @@ $(obj)/vmlinux.itb: $(obj)/vmlinux.its $(obj)/vmlinux.bin FORCE $(obj)/vmlinux.%.itb: $(obj)/vmlinux.%.its $(obj)/vmlinux.bin.% FORCE $(call if_changed,itb-image,$<) + +# for cleaning +subdir- += compressed tools
arch/nds32/Kbuild +3 -0
@@ -1 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only + +# for cleaning +subdir- += boot
arch/nds32/Makefile +0 -3
@@ -62,9 +62,6 @@ prepare: vdso_prepare vdso_prepare: prepare0 $(Q)$(MAKE) $(build)=arch/nds32/kernel/vdso include/generated/vdso-offsets.h -archclean: - $(Q)$(MAKE) $(clean)=$(boot) - define archhelp echo ' Image - kernel image (arch/$(ARCH)/boot/Image)' endef
arch/nios2/Kbuild +3 -0
@@ -1 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only + +# for cleaning +subdir- += boot
arch/nios2/Makefile +1 -5
@@ -8,8 +8,7 @@ # Written by Fredrik Markstrom # # This file is included by the global makefile so that you can add your own -# architecture-specific flags and dependencies. Remember to do have actions -# for "archclean" cleaning up for this architecture. +# architecture-specific flags and dependencies. # # Nios2 port by Wind River Systems Inc trough: # [email protected] and [email protected]
@@ -53,9 +52,6 @@ core-y += $(nios2-boot)/dts/ all: vmImage -archclean: - $(Q)$(MAKE) $(clean)=$(nios2-boot) - $(BOOT_TARGETS): vmlinux $(Q)$(MAKE) $(build)=$(nios2-boot) $(nios2-boot)/$@
arch/openrisc/Kbuild +3 -0
@@ -1,3 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-y += lib/ kernel/ mm/ obj-y += boot/dts/ + +# for cleaning +subdir- += boot
arch/openrisc/Makefile +1 -6
@@ -1,9 +1,7 @@ # BK Id: %F% %I% %G% %U% %#% # # This file is included by the global makefile so that you can add your own -# architecture-specific flags and dependencies. Remember to do have actions -# for "archclean" and "archdep" for cleaning up and making dependencies for -# this architecture +# architecture-specific flags and dependencies. # # This file is subject to the terms and conditions of the GNU General Public # License. See the file "COPYING" in the main directory of this archive
@@ -48,6 +46,3 @@ PHONY += vmlinux.bin vmlinux.bin: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ - -archclean: - $(Q)$(MAKE) $(clean)=$(boot)
arch/parisc/Kbuild +3 -0
@@ -1,2 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only obj-y += mm/ kernel/ math-emu/ + +# for cleaning +subdir- += boot
arch/parisc/Makefile +1 -6
@@ -2,9 +2,7 @@ # parisc/Makefile # # This file is included by the global makefile so that you can add your own -# architecture-specific flags and dependencies. Remember to do have actions -# for "archclean" and "archdep" for cleaning up and making dependencies for -# this architecture +# architecture-specific flags and dependencies. # # This file is subject to the terms and conditions of the GNU General Public # License. See the file "COPYING" in the main directory of this archive
@@ -186,8 +184,5 @@ define archhelp @echo ' zinstall - Install compressed vmlinuz kernel' endef -archclean: - $(Q)$(MAKE) $(clean)=$(boot) - archheaders: $(Q)$(MAKE) $(build)=arch/parisc/kernel/syscalls all
arch/powerpc/Kbuild +3 -0
@@ -16,3 +16,6 @@ obj-$(CONFIG_KVM) += kvm/ obj-$(CONFIG_PERF_EVENTS) += perf/ obj-$(CONFIG_KEXEC_CORE) += kexec/ obj-$(CONFIG_KEXEC_FILE) += purgatory/ + +# for cleaning +subdir- += boot
arch/powerpc/Makefile +1 -6
@@ -1,7 +1,5 @@ # This file is included by the global makefile so that you can add your own -# architecture-specific flags and dependencies. Remember to do have actions -# for "archclean" and "archdep" for cleaning up and making dependencies for -# this architecture. +# architecture-specific flags and dependencies. # # This file is subject to the terms and conditions of the GNU General Public # License. See the file "COPYING" in the main directory of this archive
@@ -387,9 +385,6 @@ install: sh -x $(srctree)/$(boot)/install.sh "$(KERNELRELEASE)" vmlinux \ System.map "$(INSTALL_PATH)" -archclean: - $(Q)$(MAKE) $(clean)=$(boot) - ifeq ($(KBUILD_EXTMOD),) # We need to generate vdso-offsets.h before compiling certain files in kernel/. # In order to do that, we should use the archprepare target, but we can't since
arch/riscv/Kbuild +3 -0
@@ -2,3 +2,6 @@ obj-y += kernel/ mm/ net/ obj-$(CONFIG_BUILTIN_DTB) += boot/dts/ + +# for cleaning +subdir- += boot
arch/riscv/Makefile +1 -6
@@ -1,7 +1,5 @@ # This file is included by the global makefile so that you can add your own -# architecture-specific flags and dependencies. Remember to do have actions -# for "archclean" and "archdep" for cleaning up and making dependencies for -# this architecture +# architecture-specific flags and dependencies. # # This file is subject to the terms and conditions of the GNU General Public # License. See the file "COPYING" in the main directory of this archive
@@ -157,6 +155,3 @@ zinstall: install-image = Image.gz install zinstall: $(CONFIG_SHELL) $(srctree)/$(boot)/install.sh $(KERNELRELEASE) \ $(boot)/$(install-image) System.map "$(INSTALL_PATH)" - -archclean: - $(Q)$(MAKE) $(clean)=$(boot)
arch/s390/Kbuild +3 -0
@@ -8,3 +8,6 @@ obj-$(CONFIG_APPLDATA_BASE) += appldata/ obj-y += net/ obj-$(CONFIG_PCI) += pci/ obj-$(CONFIG_ARCH_HAS_KEXEC_PURGATORY) += purgatory/ + +# for cleaning +subdir- += boot tools
arch/s390/Makefile +1 -7
@@ -3,9 +3,7 @@ # s390/Makefile # # This file is included by the global makefile so that you can add your own -# architecture-specific flags and dependencies. Remember to do have actions -# for "archclean" and "archdep" for cleaning up and making dependencies for -# this architecture +# architecture-specific flags and dependencies. # # Copyright (C) 1994 by Linus Torvalds #
@@ -159,10 +157,6 @@ zfcpdump: vdso_install: $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso64 $@ -archclean: - $(Q)$(MAKE) $(clean)=$(boot) - $(Q)$(MAKE) $(clean)=$(tools) - archheaders: $(Q)$(MAKE) $(build)=$(syscalls) uapi
arch/sh/Kbuild +3 -0
@@ -2,3 +2,6 @@ obj-y += kernel/ mm/ boards/ obj-$(CONFIG_SH_FPU_EMU) += math-emu/ obj-$(CONFIG_USE_BUILTIN_DTB) += boot/dts/ + +# for cleaning +subdir- += boot
arch/sh/Makefile +0 -3
@@ -198,9 +198,6 @@ compressed: zImage archprepare: $(Q)$(MAKE) $(build)=arch/sh/tools include/generated/machtypes.h -archclean: - $(Q)$(MAKE) $(clean)=$(boot) - archheaders: $(Q)$(MAKE) $(build)=arch/sh/kernel/syscalls all
arch/sparc/Kbuild +3 -0
@@ -9,3 +9,6 @@ obj-y += math-emu/ obj-y += net/ obj-y += crypto/ obj-$(CONFIG_SPARC64) += vdso/ + +# for cleaning +subdir- += boot
arch/sparc/Makefile +0 -3
@@ -75,9 +75,6 @@ install: sh $(srctree)/$(boot)/install.sh $(KERNELRELEASE) $(KBUILD_IMAGE) \ System.map "$(INSTALL_PATH)" -archclean: - $(Q)$(MAKE) $(clean)=$(boot) - archheaders: $(Q)$(MAKE) $(build)=arch/sparc/kernel/syscalls all
arch/x86/Kbuild +3 -0
@@ -25,3 +25,6 @@ obj-y += platform/ obj-y += net/ obj-$(CONFIG_KEXEC_FILE) += purgatory/ + +# for cleaning +subdir- += boot tools
arch/x86/Makefile +0 -2
@@ -287,8 +287,6 @@ endif archclean: $(Q)rm -rf $(objtree)/arch/i386 $(Q)rm -rf $(objtree)/arch/x86_64 - $(Q)$(MAKE) $(clean)=$(boot) - $(Q)$(MAKE) $(clean)=arch/x86/tools define archhelp echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)'
arch/xtensa/Makefile +1 -3
@@ -7,9 +7,7 @@ # Copyright (C) 2014 Cadence Design Systems Inc. # # This file is included by the global makefile so that you can add your own -# architecture-specific flags and dependencies. Remember to do have actions -# for "archclean" and "archdep" for cleaning up and making dependencies for -# this architecture +# architecture-specific flags and dependencies. # Core configuration. # (Use VAR=<xtensa_config> to use another default compiler.)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 76/91 purgatory: fix disabling debug info
In reply to Greg Kroah-HartmanFrom: Alyssa Ross <[email protected]>
[ Upstream commit d83806c4c0cccc0d6d3c3581a11983a9c186a138 ]
Since 32ef9e5054ec, -Wa,-gdwarf-2 is no longer used in KBUILD_AFLAGS. Instead, it includes -g, the appropriate -gdwarf-* flag, and also the -Wa versions of both of those if building with Clang and GNU as. As a result, debug info was being generated for the purgatory objects, even though the intention was that it not be.
--- arch/x86/purgatory/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/x86/purgatory/Makefile +1 -2
@@ -64,8 +64,7 @@ CFLAGS_sha256.o += $(PURGATORY_CFLAGS) CFLAGS_REMOVE_string.o += $(PURGATORY_CFLAGS_REMOVE) CFLAGS_string.o += $(PURGATORY_CFLAGS) -AFLAGS_REMOVE_setup-x86_$(BITS).o += -Wa,-gdwarf-2 -AFLAGS_REMOVE_entry64.o += -Wa,-gdwarf-2 +asflags-remove-y += $(foreach x, -g -gdwarf-4 -gdwarf-5, $(x) -Wa,$(x)) $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE $(call if_changed,ld)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 77/91 nvme-pci: add NVME_QUIRK_BOGUS_NID for ADATA XPG GAMMIX S50
In reply to Greg Kroah-HartmanFrom: Stefan Reiter <[email protected]>
[ Upstream commit 3765fad508964f433ac111c127d6bedd19bdfa04 ]
ADATA XPG GAMMIX S50 drives report bogus eui64 values that appear to be the same across drives in one system. Quirk them out so they are not marked as "non globally unique" duplicates.
Stable-dep-of: 74391b3e6985 ("nvme-pci: add NVME_QUIRK_BOGUS_NID for T-FORCE Z330 SSD")
--- drivers/nvme/host/pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/nvme/host/pci.c +2 -0
@@ -3388,6 +3388,8 @@ static const struct pci_device_id nvme_id_table[] = { .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1e4B, 0x1202), /* MAXIO MAP1202 */ .driver_data = NVME_QUIRK_BOGUS_NID, }, + { PCI_DEVICE(0x1cc1, 0x5350), /* ADATA XPG GAMMIX S50 */ + .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0061), .driver_data = NVME_QUIRK_DMA_ADDRESS_BITS_48, }, { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0065),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 78/91 nvme-pci: avoid the deepest sleep state on ZHITAI TiPro7000 SSDs
In reply to Greg Kroah-HartmanFrom: Ning Wang <[email protected]>
[ Upstream commit 6b961bce50e489186232cef51036ddb8d672bc3b ]
When ZHITAI TiPro7000 SSDs entered deepest power state(ps4) it has the same APST sleep problem as Kingston A2000. by chance the system crashes and displays the same dmesg info:
https://bugzilla.kernel.org/show_bug.cgi?id=195039#c65
As the Archlinux wiki suggest (enlat + exlat) < 25000 is fine and my testing shows no system crashes ever since.
Therefore disabling the deepest power state will fix the APST sleep issue.
https://wiki.archlinux.org/title/Solid_state_drive/NVMe
This is the APST data from 'nvme id-ctrl /dev/nvme1'
NVME Identify Controller:
vid : 0x1e49
ssvid : 0x1e49
sn : [...]
mn : ZHITAI TiPro7000 1TB
fr : ZTA32F3Y
[...]
ps 0 : mp:3.50W operational enlat:5 exlat:5 rrt:0 rrl:0
rwt:0 rwl:0 idle_power:- active_power:-
ps 1 : mp:3.30W operational enlat:50 exlat:100 rrt:1 rrl:1
rwt:1 rwl:1 idle_power:- active_power:-
ps 2 : mp:2.80W operational enlat:50 exlat:200 rrt:2 rrl:2
rwt:2 rwl:2 idle_power:- active_power:-
ps 3 : mp:0.1500W non-operational enlat:500 exlat:5000 rrt:3 rrl:3
rwt:3 rwl:3 idle_power:- active_power:-
ps 4 : mp:0.0200W non-operational enlat:2000 exlat:60000 rrt:4 rrl:4
rwt:4 rwl:4 idle_power:- active_power:-Stable-dep-of: 74391b3e6985 ("nvme-pci: add NVME_QUIRK_BOGUS_NID for T-FORCE Z330 SSD")
--- drivers/nvme/host/pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/nvme/host/pci.c +2 -0
@@ -3390,6 +3390,8 @@ static const struct pci_device_id nvme_id_table[] = { .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1cc1, 0x5350), /* ADATA XPG GAMMIX S50 */ .driver_data = NVME_QUIRK_BOGUS_NID, }, + { PCI_DEVICE(0x1e49, 0x0041), /* ZHITAI TiPro7000 NVMe SSD */ + .driver_data = NVME_QUIRK_NO_DEEPEST_PS, }, { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0061), .driver_data = NVME_QUIRK_DMA_ADDRESS_BITS_48, }, { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0065),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 69/91 powerpc/papr_scm: Update the NUMA distance table for the target node
In reply to Greg Kroah-HartmanFrom: Aneesh Kumar K.V <[email protected]>
[ Upstream commit b277fc793daf258877b4c0744b52f69d6e6ba22e ]
Platform device helper routines won't update the NUMA distance table while creating a platform device, even if the device is present on a NUMA node that doesn't have memory or CPU. This is especially true for pmem devices. If the target node of the pmem device is not online, we find the nearest online node to the device and associate the pmem device with that online node. To find the nearest online node, we should have the numa distance table updated correctly. Update the distance information during the device probe.
For a papr scm device on NUMA node 3 distance_lookup_table value for distance_ref_points_depth = 2 before and after fix is below:
Before fix:
node 3 distance depth 0 - 0 node 3 distance depth 1 - 0 node 4 distance depth 0 - 4 node 4 distance depth 1 - 2 node 5 distance depth 0 - 5 node 5 distance depth 1 - 1
After fix
node 3 distance depth 0 - 3 node 3 distance depth 1 - 1 node 4 distance depth 0 - 4 node 4 distance depth 1 - 2 node 5 distance depth 0 - 5 node 5 distance depth 1 - 1
Without the fix, the nearest numa node to the pmem device (NUMA node 3) will be picked as 4. After the fix, we get the correct numa node which is 5.
--- arch/powerpc/mm/numa.c | 1 + arch/powerpc/platforms/pseries/papr_scm.c | 7 +++++++ 2 files changed, 8 insertions(+)
arch/powerpc/mm/numa.c +1 -0
@@ -367,6 +367,7 @@ void update_numa_distance(struct device_node *node)WARN (numa_distance_table[nid][nid] ==-1 ,"NUMA distance details for node %d not provided\n" , nid); } +EXPORT_SYMBOL_GPL (update_numa_distance);/* * ibm,numa-lookup-index-table= {N, domainid1, domainid2, ..... domainidN}
arch/powerpc/platforms/pseries/papr_scm.c +7 -0
@@ -1159,6 +1159,13 @@ static int papr_scm_probe(struct platform_device *pdev)return -ENODEV ; } +/* +* open firmware platform device create won't update the NUMA +* distance table. For PAPR SCM devices we use numa_map_to_online_node() +* to find the nearest online NUMA node and that requires correct +* distance table information. +*/ +update_numa_distance (dn); p =kzalloc (sizeof (*p),GFP_KERNEL );if (!p)
Signature · 1 line
2.39.2
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.108 release. There are 91 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 20 Apr 2023 12:02:44 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.108-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Following patch causing build break on stable-rc 5.15
Quoted 2 lines
Waiman Long <[email protected]>
cgroup/cpuset: Addcpuset_can_fork()andcpuset_cancel_fork()methods
cgroup/cpuset: Add cpuset_can_fork() and cpuset_cancel_fork() methods commit eee87853794187f6adbe19533ed79c8b44b36a91 upstream.
Build error:kernel/cgroup/cpuset.c: In function 'cpuset_can_fork':kernel/cgroup/cpuset.c:2979:30: error: 'cgroup_mutex' undeclared (first use in this function); did you mean 'cgroup_put'?
2979 | lockdep_assert_held(&cgroup_mutex);
| ^~~~~~~~~~~~include/linux/lockdep.h:415:61: note: in definition of macro 'lockdep_assert_held'
415 | #define lockdep_assert_held(l) do {
(void)(l); } while (0)
| ^kernel/cgroup/cpuset.c:2979:30: note: each undeclared identifier is reported only once for each function it appears in
2979 | lockdep_assert_held(&cgroup_mutex);
| ^~~~~~~~~~~~include/linux/lockdep.h:415:61: note: in definition of macro 'lockdep_assert_held'
415 | #define lockdep_assert_held(l) do {
(void)(l); } while (0)
| ^
make[3]: *** [scripts/Makefile.build:289: kernel/cgroup/cpuset.o] Error 1
--
Linaro LKFT
https://lkft.linaro.org
Hi Greg,
Quoted 46 lines · Naresh Kamboju
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.108 release. There are 91 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 20 Apr 2023 12:02:44 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.108-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Following patch causing build break on stable-rc 5.15
Quoted 2 lines
Waiman Long <[email protected]>
cgroup/cpuset: Addcpuset_can_fork()andcpuset_cancel_fork()methodscgroup/cpuset: Add
cpuset_can_fork()andcpuset_cancel_fork()methods commiteee87853794187f6adbe19533ed79c8b44b36a91upstream.Build error:
kernel/cgroup/cpuset.c: In function 'cpuset_can_fork':kernel/cgroup/cpuset.c:2979:30: error: 'cgroup_mutex' undeclared (first use in this function); did you mean 'cgroup_put'?2979 | lockdep_assert_held(&cgroup_mutex); | ^~~~~~~~~~~~
include/linux/lockdep.h:415:61: note: in definition of macro 'lockdep_assert_held'
415 | #definelockdep_assert_held(l)do {
(void)(l); } while (0)
| ^kernel/cgroup/cpuset.c:2979:30: note: each undeclared identifier is reported only once for each function it appears in
Quoted 10 lines
2979 | lockdep_assert_held(&cgroup_mutex); | ^~~~~~~~~~~~
include/linux/lockdep.h:415:61: note: in definition of macro 'lockdep_assert_held'
415 | #definelockdep_assert_held(l)do {
(void)(l); } while (0)
| ^
make[3]: *** [scripts/Makefile.build:289:kernel/cgroup/cpuset.o] Error 1
We observed same build error.(5.15.108-rc1), and investigated about this.
Please see the below findings.
With defconfig --> build breaks.
With allmodconfig --> build succeeds.
From the above we know that this is something related to CONFIG.
In 5.15.y -->cgroup_mutex is defined like this in include/linux/cgroup.h
#ifdef CONFIG_PROVE_RCU extern struct mutex cgroup_mutex;
In 6.2.y --> include/linux/cgroup.h
extern struct mutex cgroup_mutex;
-- We don't have that ifdef in 6.2.y.
Tom Saeger identified that the below commit moves it out of ifdef.
commit 354ed597442952fb680c9cafc7e4eb8a76f9514c
Author: Yu Zhao <[email protected]> Date: Sun Sep 18 02:00:07 2022 -0600
mm: multi-gen LRU: kill switch
Given that we don't have this commit in 5.15.y and 5.10.y we are seeing this build problem.
on allmodconfig:
~/linux$ grep "CONFIG_PROVE_RCU" .configCONFIG_PROVE_RCU=yCONFIG_PROVE_RCU_LIST=y
on defconfig:
~/linux$ grep "CONFIG_PROVE_RCU" .config
-- No match
This explains the failure on defconfig and a build success on allmodconfig.
Thanks,
Harshit
Quoted 98 lines · Harshit Mogalapalli
Hi Greg,
Quoted 46 lines · Naresh Kamboju
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.108 release. There are 91 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 20 Apr 2023 12:02:44 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.108-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Following patch causing build break on stable-rc 5.15
Quoted 2 lines
Waiman Long <[email protected]>
cgroup/cpuset: Addcpuset_can_fork()andcpuset_cancel_fork()methodscgroup/cpuset: Add
cpuset_can_fork()andcpuset_cancel_fork()methods commiteee87853794187f6adbe19533ed79c8b44b36a91upstream.Build error:
kernel/cgroup/cpuset.c: In function 'cpuset_can_fork':kernel/cgroup/cpuset.c:2979:30: error: 'cgroup_mutex' undeclared (first use in this function); did you mean 'cgroup_put'?2979 | lockdep_assert_held(&cgroup_mutex); | ^~~~~~~~~~~~
include/linux/lockdep.h:415:61: note: in definition of macro 'lockdep_assert_held'
415 | #definelockdep_assert_held(l)do {
(void)(l); } while (0)
| ^kernel/cgroup/cpuset.c:2979:30: note: each undeclared identifier is reported only once for each function it appears inQuoted 10 lines
2979 | lockdep_assert_held(&cgroup_mutex); | ^~~~~~~~~~~~
include/linux/lockdep.h:415:61: note: in definition of macro 'lockdep_assert_held'
415 | #definelockdep_assert_held(l)do {
(void)(l); } while (0)
| ^
make[3]: *** [scripts/Makefile.build:289:kernel/cgroup/cpuset.o] Error 1We observed same build error.(5.15.108-rc1), and investigated about this.
Please see the below findings.
With defconfig --> build breaks.
With allmodconfig --> build succeeds.From the above we know that this is something related to CONFIG.
In 5.15.y -->
cgroup_mutexis defined like this ininclude/linux/cgroup.h#ifdef CONFIG_PROVE_RCU extern struct mutex cgroup_mutex;In 6.2.y -->
include/linux/cgroup.hextern struct mutex cgroup_mutex;-- We don't have that ifdef in 6.2.y.
Tom Saeger identified that the below commit moves it out of ifdef.
commit
354ed597442952fb680c9cafc7e4eb8a76f9514cAuthor: Yu Zhao <[email protected]> Date: Sun Sep 18 02:00:07 2022 -0600mm: multi-gen LRU: kill switch
Given that we don't have this commit in 5.15.y and 5.10.y we are seeing this build problem.
on allmodconfig:
~/linux$ grep "
CONFIG_PROVE_RCU" .configCONFIG_PROVE_RCU=yCONFIG_PROVE_RCU_LIST=y
Quoted 9 lines
on defconfig:
~/linux$ grep "CONFIG_PROVE_RCU" .config
-- No matchThis explains the failure on defconfig and a build success on allmodconfig.
Thanks,
Harshit
FWIW - partially backporting (location of cgroup_mutex extern) from:354ed5974429 ("mm: multi-gen LRU: kill switch")
fixes x86_64 build for me.
Regards,
--Tom
include/linux/cgroup.h +2 -1
@@ -433,6 +433,8 @@ static inline void cgroup_put(struct cgroup *cgrp)css_put (&cgrp->self); } +extern struct mutex cgroup_mutex; +/** * task_css_set_check - obtain a task's css_set with extra access conditions * @task: the task to obtain css_set for
@@ -447,7 +449,6 @@ static inline void cgroup_put(struct cgroup *cgrp)* as locks used during the cgroup_subsys::attach() methods. */ #ifdef CONFIG_PROVE_RCU -extern struct mutex cgroup_mutex;extern spinlock_t css_set_lock;#define task_css_set_check (task, __c) \ rcu_dereference_check((task)->cgroups, \
kernel/cgroup/cgroup-internal.h +0 -1
@@ -165,7 +165,6 @@ struct cgroup_mgctx {#define DEFINE_CGROUP_MGCTX (name) \ struct cgroup_mgctx name = CGROUP_MGCTX_INIT(name) -extern struct mutex cgroup_mutex;extern spinlock_t css_set_lock;extern struct cgroup_subsys *cgroup_subsys[];extern struct list_head cgroup_roots;
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.108 release. There are 91 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 20 Apr 2023 12:02:44 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.108-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:
Signature · 1 line
Florian
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.108 release. There are 91 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 20 Apr 2023 12:02:44 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.108-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
Note - I didn't see any build errors.
thanks,
-- Shuah
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.108 release. There are 91 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 20 Apr 2023 12:02:44 +0000. Anything received after that time might be too late.
Build results:
total: 160 pass: 146 fail: 14 Failed builds: alpha:allmodconfig arm:omap2plus_defconfig arm:vexpress_defconfig arm64:defconfig i386:defconfig ia64:defconfig mips:defconfig parisc:allmodconfig parisc64:generic-64bit_defconfig powerpc:defconfig powerpc:ppc64e_defconfig powerpc:cell_defconfig s390:defconfig x86_64:defconfig Qemu test results: total: 499 pass: 452 fail: 47 Failed tests: mipsel64:64r6el_defconfig:notests:nonet:smp:ide:hd mipsel64:64r6el_defconfig:notests:nonet:smp:ide:hd mipsel64:64r6el_defconfig:notests:nonet:smp:ide:cd <all riscv32, riscv64, s390>
Build failures:
kernel/cgroup/cpuset.c: In function 'cpuset_can_fork':kernel/cgroup/cpuset.c:2979:30: error: 'cgroup_mutex' undeclared
riscv32/riscv64 images crash.
[ 0.000000] Linux version 5.15.108-rc1-00092-g0b6a5617247c ([email protected]) (riscv32-linux-gcc (GCC) 11.3.0, GNU ld (GNU Binutils) 2.39) #1 SMP Tue Apr 18 14:19:32 PDT 2023 [ 0.000000] random: crng init done [ 0.000000] OF: fdt: Ignoring memory range 0x80000000 - 0x80400000 [ 0.000000] Machine model: riscv-virtio,qemu [ 0.000000] earlycon: uart8250 at MMIO 0x10000000 (options '115200') [ 0.000000] printk: bootconsole [uart8250] enabled [ 0.000000] efi: UEFI not found. [ 0.000000] Unable to handle kernel paging request at virtual address 00600001 [ 0.000000] Oops [#1] [ 0.000000] Modules linked in: [ 0.000000] CPU: 0 PID: 0 Comm: swapper Not tainted 5.15.108-rc1-00092-g0b6a5617247c #1 [ 0.000000] Hardware name: riscv-virtio,qemu (DT) [ 0.000000] epc : fdt_check_header+0x6/0x1ac [ 0.000000] ra : __unflatten_device_tree+0x32/0x106 [ 0.000000] epc : c04cf1dc ra : c0859f08 sp : c1c01f30 [ 0.000000] gp : c1d6dca8 tp : c1c0a9c0 t0 : 00000000 [ 0.000000] t1 : c100f4fc t2 : 00000000 s0 : c1c01f40 [ 0.000000] s1 : c0c25000 a0 : 00600000 a1 : 00000000 [ 0.000000] a2 : c1d74044 a3 : c0c253ae a4 : 00000000 [ 0.000000] a5 : c173a000 a6 : c1c01f2c a7 : 00000001 [ 0.000000] s2 : 00600000 s3 : c1d74044 s4 : c0c253ae [ 0.000000] s5 : 00000000 s6 : 00000000 s7 : 8001b020 [ 0.000000] s8 : 00002000 s9 : 800312e4 s10: 00000000 [ 0.000000] s11: 00000000 t3 : 00000000 t4 : 00000000 [ 0.000000] t5 : a0000000 t6 : 80400000 [ 0.000000] status: 00000100 badaddr: 00600001 cause: 0000000d [ 0.000000] [<c04cf1dc>] fdt_check_header+0x6/0x1ac [ 0.000000] ---[ end trace 6977e3ccdb629cdf ]--- [ 0.000000] Kernel panic - not syncing: Attempted to kill the idle task!
Bisect points to
08ace525df14 riscv: Do not set initial_boot_params to the linear address of the dtb
This is not surprising, because that commit says:
"early_init_dt_verify() is already called in parse_dtb() and since the dtb
address does not change anymore (it is now in the fixmap region), no need to reset initial_boot_params by calling early_init_dt_verify() again.
"
However, the patch which actually moves the early dtb mapping into the fixmap region was not backported (and looks quite invasive to me). That makes me wonder ... why is this a stable release candidate in the first place ?
Guenter
Quoted 43 lines · Tom Saeger
Quoted 8 lines
Tom Saeger identified that the below commit moves it out of ifdef.
commit
354ed597442952fb680c9cafc7e4eb8a76f9514cAuthor: Yu Zhao <[email protected]> Date: Sun Sep 18 02:00:07 2022 -0600mm: multi-gen LRU: kill switch
FWIW - partially backporting (location of
cgroup_mutexextern) from:354ed5974429("mm: multi-gen LRU: kill switch")fixes
x86_64build for me.Regards,
--Tom
include/linux/cgroup.h +2
-1@@ -433,6 +433,8 @@ static inline void cgroup_put(struct cgroup *cgrp)css_put (&cgrp->self); } +extern struct mutex cgroup_mutex; +/** * task_css_set_check - obtain a task's css_set with extra access conditions * @task: the task to obtain css_set for @@ -447,7 +449,6 @@ static inline void cgroup_put(struct cgroup *cgrp)* as locks used during the cgroup_subsys::attach() methods. */ #ifdef CONFIG_PROVE_RCU -extern struct mutex cgroup_mutex;extern spinlock_t css_set_lock;#define task_css_set_check (task, __c) \ rcu_dereference_check((task)->cgroups, \kernel/cgroup/cgroup-internal.h +0
-0
kernel/cgroup/cgroup-internal.h struct cgroup_mgctx { · line 170
Quoted 7 lines
kernel/cgroup/cgroup-internal.h +0
-1@@ -165,7 +165,6 @@ struct cgroup_mgctx {#define DEFINE_CGROUP_MGCTX (name) \ struct cgroup_mgctx name = CGROUP_MGCTX_INIT(name) -extern struct mutex cgroup_mutex;extern spinlock_t css_set_lock;extern struct cgroup_subsys *cgroup_subsys[];extern struct list_head cgroup_roots;
Yu, would you like to provide formal backport? Or maybe take Tom's diff above and ACK it?
Signature · 1 line
An old man doll... just what I always wanted! - Clara
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.108 release. There are 91 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.
I have also encountered the same build error as Naresh has reported [1] when cross-compiling for arm64 (bcm2711_defconfig, GCC 10.2.0). powerpc (ps3_defconfig, GCC 12.2.0) build isn't affected.
[1]: https://lore.kernel.org/lkml/CA+G9fYs9sHnfhn4hSFP=AmOfgj-zvoK9vmBejRvzKPj4uXx+VA@mail.gmail.com/
Signature · 1 line
An old man doll... just what I always wanted! - Clara
Quoted 20 lines · Bagas Sanjaya
Quoted 18 lines · Tom Saeger
Quoted 8 lines
Tom Saeger identified that the below commit moves it out of ifdef.
commit
354ed597442952fb680c9cafc7e4eb8a76f9514cAuthor: Yu Zhao <[email protected]> Date: Sun Sep 18 02:00:07 2022 -0600mm: multi-gen LRU: kill switch
FWIW - partially backporting (location of
cgroup_mutexextern) from:354ed5974429("mm: multi-gen LRU: kill switch")fixes
x86_64build for me.Regards,
--Tom
include/linux/cgroup.h +0
-0
...
Quoted 1 line
Yu, would you like to provide formal backport?
Are you suggesting backporting the entire MGLRU patchset (>30 patches)?
I do have the backport ready for 5.15 and multiple distros have taken it. But I don't think Greg would welcome it. I'd be happy to be wrong though.
Greg Kroah-Hartman
maintainerQuoted 24 lines · Yu Zhao
Quoted 20 lines · Bagas Sanjaya
Quoted 18 lines · Tom Saeger
Quoted 8 lines
Tom Saeger identified that the below commit moves it out of ifdef.
commit
354ed597442952fb680c9cafc7e4eb8a76f9514cAuthor: Yu Zhao <[email protected]> Date: Sun Sep 18 02:00:07 2022 -0600mm: multi-gen LRU: kill switch
FWIW - partially backporting (location of
cgroup_mutexextern) from:354ed5974429("mm: multi-gen LRU: kill switch")fixes
x86_64build for me.Regards,
--Tom
include/linux/cgroup.h +0
-0...
Quoted 7 lines
Quoted 1 line
Yu, would you like to provide formal backport?
Are you suggesting backporting the entire MGLRU patchset (>30 patches)?
I do have the backport ready for 5.15 and multiple distros have taken it. But I don't think Greg would welcome it. I'd be happy to be wrong though.
I'm just going to drop all of these patches from the queues now, and let the original submitter resend them after they are fixed up properly.
thanks,
greg k-h
Greg Kroah-Hartman
maintainerQuoted 56 lines · Naresh Kamboju
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.108 release. There are 91 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 20 Apr 2023 12:02:44 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.108-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Following patch causing build break on stable-rc 5.15
Quoted 2 lines
Waiman Long <[email protected]>
cgroup/cpuset: Addcpuset_can_fork()andcpuset_cancel_fork()methodscgroup/cpuset: Add
cpuset_can_fork()andcpuset_cancel_fork()methods commiteee87853794187f6adbe19533ed79c8b44b36a91upstream.Build error:
kernel/cgroup/cpuset.c: In function 'cpuset_can_fork':kernel/cgroup/cpuset.c:2979:30: error: 'cgroup_mutex' undeclared (first use in this function); did you mean 'cgroup_put'?2979 | lockdep_assert_held(&cgroup_mutex); | ^~~~~~~~~~~~
include/linux/lockdep.h:415:61: note: in definition of macro 'lockdep_assert_held'
415 | #definelockdep_assert_held(l)do {
(void)(l); } while (0)
| ^kernel/cgroup/cpuset.c:2979:30: note: each undeclared identifier is reported only once for each function it appears in2979 | lockdep_assert_held(&cgroup_mutex); | ^~~~~~~~~~~~
include/linux/lockdep.h:415:61: note: in definition of macro 'lockdep_assert_held'
415 | #definelockdep_assert_held(l)do {
(void)(l); } while (0)
| ^
make[3]: *** [scripts/Makefile.build:289:kernel/cgroup/cpuset.o] Error 1
Quoted 6 lines
--
Linaro LKFT
https://lkft.linaro.org
I've now dropped the offending patches and pushed out -rc2 releases for this, and the 5.10.y tree.
thanks,
greg k-h
Hi!
Quoted 2 lines
I'm just going to drop all of these patches from the queues now, and let the original submitter resend them after they are fixed up properly.
Build errors are gone in 5.10.178-rc2:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/pipelines/841747700
and 5.15108-rc2 is okay too:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/pipelines/841747822
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Quoted 18 lines · Yu Zhao
Quoted 17 lines · Bagas Sanjaya
Quoted 15 lines · Tom Saeger
Quoted 8 lines
Tom Saeger identified that the below commit moves it out of ifdef.
commit
354ed597442952fb680c9cafc7e4eb8a76f9514cAuthor: Yu Zhao <[email protected]> Date: Sun Sep 18 02:00:07 2022 -0600mm: multi-gen LRU: kill switch
FWIW - partially backporting (location of
cgroup_mutexextern) from:354ed5974429("mm: multi-gen LRU: kill switch")fixes
x86_64build for me.Regards,
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
--Tom
include/linux/cgroup.h +0
-0...
Quoted 1 line
Yu, would you like to provide formal backport?
Nah - an easier fix was suggested by Waiman (remove the lockdep_assert_held line) and confirmed here:
https://lore.kernel.org/stable/[email protected]/
Quoted 5 lines
Are you suggesting backporting the entire MGLRU patchset (>30 patches)?
I do have the backport ready for 5.15 and multiple distros have taken it.
However, I am interested in testing 5.15 backport of MGLRU. Where might I find that?
--Tom
Quoted 33 lines · Tom Saeger
Quoted 18 lines · Yu Zhao
Quoted 17 lines · Bagas Sanjaya
Quoted 15 lines · Tom Saeger
Quoted 8 lines
Tom Saeger identified that the below commit moves it out of ifdef.
commit
354ed597442952fb680c9cafc7e4eb8a76f9514cAuthor: Yu Zhao <[email protected]> Date: Sun Sep 18 02:00:07 2022 -0600mm: multi-gen LRU: kill switch
FWIW - partially backporting (location of
cgroup_mutexextern) from:354ed5974429("mm: multi-gen LRU: kill switch")fixes
x86_64build for me.Regards,
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
--Tom
include/linux/cgroup.h +0
-0...
Quoted 1 line
Yu, would you like to provide formal backport?
Nah - an easier fix was suggested by Waiman (remove the
lockdep_assert_heldline) and confirmed here:https://lore.kernel.org/stable/[email protected]/
Quoted 1 line
Quoted 7 lines
Quoted 4 lines
Are you suggesting backporting the entire MGLRU patchset (>30 patches)?
I do have the backport ready for 5.15 and multiple distros have taken it.
However, I am interested in testing 5.15 backport of MGLRU. Where might I find that?
git://github.com/yuzhaogoogle/linux mglru-5.15