5.15.142-rc1 review
Subsystems (4)
Greg Kroah-Hartman
maintainercover 5.15.142-rc1 review
This is the start of the stable review cycle for the 5.15.142 release. There are 67 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, 07 Dec 2023 03:14:57 +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.142-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.142-rc1
Heiner Kallweit <[email protected]>
r8169: fix deadlock on RTL8125 in jumbo mtu mode
Heiner Kallweit <[email protected]>
r8169: disable ASPM in case of tx timeout
Wenchao Chen <[email protected]>
mmc: sdhci-sprd: Fix vqmmc not shutting down after the card was pulled
Heiner Kallweit <[email protected]>
mmc: core: add helpers mmc_regulator_enable/disable_vqmmc
Lu Baolu <[email protected]>
iommu/vt-d: Make context clearing consistent with context mapping
Lu Baolu <[email protected]>
iommu/vt-d: Omit devTLB invalidation requests when TES=0
Christoph Niedermaier <[email protected]>
cpufreq: imx6q: Don't disable 792 Mhz OPP unnecessarily
Christoph Niedermaier <[email protected]>
cpufreq: imx6q: don't warn for disabling a non-existing frequency
Steve French <[email protected]>
smb3: fix caching of ctime on setxattr
Jeff Layton <[email protected]>
fs: add ctime accessors infrastructure
Helge Deller <[email protected]>
fbdev: stifb: Make the STI next font pointer a 32-bit signed offset
Mark Hasemeyer <[email protected]>
ASoC: SOF: sof-pci-dev: Fix community key quirk detection
Pierre-Louis Bossart <[email protected]>
ASoC: SOF: sof-pci-dev: don't use the community key on APL Chromebooks
Pierre-Louis Bossart <[email protected]>
ASoC: SOF: sof-pci-dev: add parameter to override topology filename
Pierre-Louis Bossart <[email protected]>
ASoC: SOF: sof-pci-dev: use community key on all Up boards
Hans de Goede <[email protected]>
ASoC: Intel: Move soc_intel_is_foo() helpers to a generic header
Steve French <[email protected]>
smb3: fix touch -h of symlink
Gaurav Batra <[email protected]>
powerpc/pseries/iommu: enable_ddw incorrectly returns direct mapping for SR-IOV device
Ilpo Järvinen <[email protected]>
selftests/resctrl: Move _GNU_SOURCE define into Makefile
Shaopeng Tan <[email protected]>
selftests/resctrl: Add missing SPDX license to Makefile
Adrian Hunter <[email protected]>
perf intel-pt: Fix async branch flags
Claudiu Beznea <[email protected]>
net: ravb: Stop DMA in case of failures on ravb_open()
Phil Edworthy <[email protected]>
ravb: Support separate Line0 (Desc), Line1 (Err) and Line2 (Mgmt) irqs
Phil Edworthy <[email protected]>
ravb: Separate handling of irq enable/disable regs into feature
Claudiu Beznea <[email protected]>
net: ravb: Start TX queues after HW initialization succeeded
Claudiu Beznea <[email protected]>
net: ravb: Use pm_runtime_resume_and_get()
Claudiu Beznea <[email protected]>
net: ravb: Check return value of reset_control_deassert()
Yoshihiro Shimoda <[email protected]>
ravb: Fix races between ravb_tx_timeout_work() and net related ops
Heiner Kallweit <[email protected]>
r8169: prevent potential deadlock in rtl8169_close
Andrey Grodzovsky <[email protected]>
Revert "workqueue: remove unused cancel_work()"
Geetha sowjanya <[email protected]>
octeontx2-pf: Fix adding mbox work queue entry when num_vfs > 64
Furong Xu <[email protected]>
net: stmmac: xgmac: Disable FPE MMC interrupts
Elena Salomatkina <[email protected]>
octeontx2-af: Fix possible buffer overflow
Willem de Bruijn <[email protected]>
selftests/net: ipsec: fix constant out of range
Dmitry Antipov <[email protected]>
uapi: propagate __struct_group() attributes to the container union
Ioana Ciornei <[email protected]>
dpaa2-eth: increase the needed headroom to account for alignment
Zhengchao Shao <[email protected]>
ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet
Niklas Neronin <[email protected]>
usb: config: fix iteration issue in 'usb_get_bos_descriptor()'
Alan Stern <[email protected]>
USB: core: Change configuration warnings to notices
Haiyang Zhang <[email protected]>
hv_netvsc: fix race of netvsc and VF register_netdevice
Patrick Wang <[email protected]>
rcu: Avoid tracing a few functions executed in stop machine
Xin Long <[email protected]>
vlan: move dev_put into vlan_dev_uninit
Xin Long <[email protected]>
vlan: introduce vlan_dev_free_egress_priority
Max Nguyen <[email protected]>
Input: xpad - add HyperX Clutch Gladiate Support
Filipe Manana <[email protected]>
btrfs: make error messages more clear when getting a chunk map
Jann Horn <[email protected]>
btrfs: send: ensure send_fd is writable
Filipe Manana <[email protected]>
btrfs: fix off-by-one when checking chunk map includes logical address
Bragatheswaran Manickavel <[email protected]>
btrfs: ref-verify: fix memory leaks in btrfs_ref_tree_mod()
Qu Wenruo <[email protected]>
btrfs: add dmesg output for first mount and last unmount of a filesystem
Helge Deller <[email protected]>
parisc: Drop the HP-UX ENOSYM and EREMOTERELEASE error codes
Timothy Pearson <[email protected]>
powerpc: Don't clobber f0/vs0 during fp|altivec register save
Abdul Halim, Mohd Syazwan <[email protected]>
iommu/vt-d: Add MTL to quirk list to skip TE disabling
Markus Weippert <[email protected]>
bcache: revert replacing IS_ERR_OR_NULL with IS_ERR
Wu Bo <[email protected]>
dm verity: don't perform FEC for failed readahead IO
Mikulas Patocka <[email protected]>
dm-verity: align struct dm_verity_fec_io properly
Kailang Yang <[email protected]>
ALSA: hda/realtek: Add supported ALC257 for ChromeOS
Kailang Yang <[email protected]>
ALSA: hda/realtek: Headset Mic VREF to 100%
Takashi Iwai <[email protected]>
ALSA: hda: Disable power-save on KONTRON SinglePC
Adrian Hunter <[email protected]>
mmc: block: Be sure to wait while busy in CQE error recovery
Adrian Hunter <[email protected]>
mmc: block: Do not lose cache flush during CQE error recovery
Adrian Hunter <[email protected]>
mmc: block: Retry commands in CQE error recovery
Adrian Hunter <[email protected]>
mmc: cqhci: Fix task clearing in CQE error recovery
Adrian Hunter <[email protected]>
mmc: cqhci: Warn of halt or task clear failure
Adrian Hunter <[email protected]>
mmc: cqhci: Increase recovery halt timeout
Yang Yingliang <[email protected]>
firewire: core: fix possible memory leak in create_units()
Maria Yu <[email protected]>
pinctrl: avoid reload of p state in list iteration
Adrian Hunter <[email protected]>
perf inject: Fix GEN_ELF_TEXT_OFFSET for jit
-------------
Diffstat:
Makefile | 4 +- arch/parisc/include/uapi/asm/errno.h | 2 - arch/powerpc/kernel/fpu.S | 13 ++++ arch/powerpc/kernel/vector.S | 2 + arch/powerpc/platforms/pseries/iommu.c | 8 +- drivers/cpufreq/imx6q-cpufreq.c | 32 ++++---- drivers/firewire/core-device.c | 11 +-- drivers/input/joystick/xpad.c | 2 + drivers/iommu/intel/dmar.c | 18 +++++ drivers/iommu/intel/iommu.c | 6 +- drivers/md/bcache/btree.c | 2 +- drivers/md/dm-verity-fec.c | 3 +- drivers/md/dm-verity-target.c | 4 +- drivers/md/dm-verity.h | 6 -- drivers/mmc/core/block.c | 2 + drivers/mmc/core/core.c | 9 ++- drivers/mmc/core/regulator.c | 41 ++++++++++ drivers/mmc/host/cqhci-core.c | 44 +++++------ drivers/mmc/host/sdhci-sprd.c | 25 ++++++ drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 8 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 2 +- .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 4 +- .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 7 +- drivers/net/ethernet/realtek/r8169_main.c | 23 +++++- drivers/net/ethernet/renesas/ravb.h | 4 + drivers/net/ethernet/renesas/ravb_main.c | 91 ++++++++++++++++++---- drivers/net/ethernet/renesas/ravb_ptp.c | 6 +- drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 4 + drivers/net/hyperv/netvsc_drv.c | 25 +++--- drivers/pinctrl/core.c | 6 +- drivers/usb/core/config.c | 85 ++++++++++---------- drivers/video/fbdev/sticore.h | 2 +- fs/btrfs/disk-io.c | 1 + fs/btrfs/ref-verify.c | 2 + fs/btrfs/send.c | 2 +- fs/btrfs/super.c | 5 +- fs/btrfs/volumes.c | 9 ++- fs/cifs/cifsfs.c | 1 + fs/cifs/xattr.c | 5 +- fs/inode.c | 16 ++++ include/linux/fs.h | 45 ++++++++++- include/linux/mmc/host.h | 3 + include/linux/platform_data/x86/soc.h | 65 ++++++++++++++++ include/linux/workqueue.h | 1 + include/uapi/linux/stddef.h | 2 +- kernel/rcu/tree_plugin.h | 8 +- kernel/workqueue.c | 9 +++ lib/errname.c | 6 -- net/8021q/vlan.h | 2 +- net/8021q/vlan_dev.c | 15 +++- net/8021q/vlan_netlink.c | 7 +- net/ipv4/igmp.c | 6 +- sound/pci/hda/hda_intel.c | 2 + sound/pci/hda/patch_realtek.c | 12 +++ sound/soc/intel/common/soc-intel-quirks.h | 51 +----------- sound/soc/sof/sof-pci-dev.c | 62 +++++++++++---- tools/arch/parisc/include/uapi/asm/errno.h | 2 - tools/perf/util/genelf.h | 4 +- tools/perf/util/intel-pt.c | 2 + tools/testing/selftests/net/ipsec.c | 4 +- tools/testing/selftests/resctrl/Makefile | 4 +- tools/testing/selftests/resctrl/resctrl.h | 1 - 62 files changed, 606 insertions(+), 249 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/67 perf inject: Fix GEN_ELF_TEXT_OFFSET for jit
5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
commit 89b15d00527b7825ff19130ed83478e80e3fae99 upstream.
When a program header was added, it moved the text section but GEN_ELF_TEXT_OFFSET was not updated.
Fix by adding the program header size and aligning.
--- tools/perf/util/genelf.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/util/genelf.h +3 -1
@@ -2,6 +2,8 @@#ifndef __GENELF_H__#define __GENELF_H__ +#include <linux/math.h> +/* genelf.c */ int jit_write_elf(int fd, uint64_t code_addr, const char *sym, const void *code, int csize, void *debug, int nr_debug_entries,
@@ -73,6 +75,6 @@ int jit_add_debug_info(Elf *e, uint64_t#endif /* The .text section is directly after the ELF header */ -#define GEN_ELF_TEXT_OFFSET sizeof(Elf_Ehdr) +#define GEN_ELF_TEXT_OFFSET round_up(sizeof(Elf_Ehdr) + sizeof(Elf_Phdr), 16)#endif
Greg Kroah-Hartman
maintainerPATCH 2/67 pinctrl: avoid reload of p state in list iteration
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maria Yu <[email protected]>
commit 4198a9b571065978632276264e01d71d68000ac5 upstream.
When in the list_for_each_entry iteration, reload of p->state->settings with a local setting from old_state will turn the list iteration into an infinite loop.
The typical symptom when the issue happens, will be a printk message like:
"not freeing pin xx (xxx) as part of deactivating group xxx - it is
already used for some other setting".
This is a compiler-dependent problem, one instance occurred using Clang version 10.0 on the arm64 architecture with linux version 4.19.
--- drivers/pinctrl/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/pinctrl/core.c +3 -3
@@ -1239,17 +1239,17 @@ static void pinctrl_link_add(struct pincstatic int pinctrl_commit_state (struct pinctrl *p,struct pinctrl_state *state) {struct pinctrl_setting *setting, *setting2; -struct pinctrl_state *old_state = p->state; +struct pinctrl_state *old_state =READ_ONCE (p->state);int ret; -if (p->state) { +if (old_state) {/* * For each pinmux setting in the old state, forget SW's record * of mux owner for that pingroup. Any pingroups which are * still owned by the new state will be re-acquired by the call * to pinmux_enable_setting() in the loop below. */ -list_for_each_entry (setting, &p->state->settings, node) { +list_for_each_entry (setting, &old_state->settings, node) {if (setting->type !=PIN_MAP_TYPE_MUX_GROUP )continue ;pinmux_disable_setting (setting);
Greg Kroah-Hartman
maintainerPATCH 3/67 firewire: core: fix possible memory leak in create_units()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yang Yingliang <[email protected]>
commit 891e0eab32a57fca4d36c5162628eb0bcb1f0edf upstream.
If device_register() fails, the refcount of device is not 0, the name allocated in dev_set_name() is leaked. To fix this by calling put_device(), so that it will be freed in callback function kobject_cleanup().
unreferenced object 0xffff9d99035c7a90 (size 8):
comm "systemd-udevd", pid 168, jiffies 4294672386 (age 152.089s) hex dump (first 8 bytes):
66 77 30 2e 30 00 ff ff fw0.0...
backtrace:
[<00000000e1d62bac>] __kmem_cache_alloc_node+0x1e9/0x360
[<00000000bbeaff31>] __kmalloc_node_track_caller+0x44/0x1a0
[<00000000491f2fb4>] kvasprintf+0x67/0xd0
[<000000005b960ddc>] kobject_set_name_vargs+0x1e/0x90
[<00000000427ac591>] dev_set_name+0x4e/0x70
[<000000003b4e447d>] create_units+0xc5/0x110fw_unit_release() will be called in the error path, move fw_device_get() before calling device_register() to keep balanced with fw_device_put() in fw_unit_release().
--- drivers/firewire/core-device.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/firewire/core-device.c +4 -7
@@ -719,14 +719,11 @@ static void create_units(struct fw_devic fw_unit_attributes, &unit->attribute_group); -if (device_register (&unit->device) <0 ) - goto skip_unit; -fw_device_get (device); -continue ; - - skip_unit: -kfree (unit); +if (device_register (&unit->device) <0 ) { +put_device (&unit->device); +continue ; + } } }
Greg Kroah-Hartman
maintainerPATCH 4/67 mmc: cqhci: Increase recovery halt timeout
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
commit b578d5d18e929aa7c007a98cce32657145dde219 upstream.
Failing to halt complicates the recovery. Additionally, unless the card or controller are stuck, which is expected to be very rare, then the halt should succeed, so it is better to wait. Set a large timeout.
--- drivers/mmc/host/cqhci-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/mmc/host/cqhci-core.c +3 -3
@@ -977,10 +977,10 @@ static bool cqhci_halt(struct mmc_host */* * After halting we expect to be able to use the command line. We interpret the * failure to halt to mean the data lines might still be in use (and the upper -* layers will need to send a STOP command), so we set the timeout based on a -* generous command timeout. +* layers will need to send a STOP command), however failing to halt complicates +* the recovery, so set a timeout that would reasonably allow I/O to complete. */ -#define CQHCI_START_HALT_TIMEOUT 5 +#define CQHCI_START_HALT_TIMEOUT 500static void cqhci_recovery_start (struct mmc_host *mmc) {
Greg Kroah-Hartman
maintainerPATCH 5/67 mmc: cqhci: Warn of halt or task clear failure
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
commit 35597bdb04ec27ef3b1cea007dc69f8ff5df75a5 upstream.
A correctly operating controller should successfully halt and clear tasks. Failure may result in errors elsewhere, so promote messages from debug to warnings.
--- drivers/mmc/host/cqhci-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/mmc/host/cqhci-core.c +3 -3
@@ -935,8 +935,8 @@ static bool cqhci_clear_all_tasks(struct ret =cqhci_tasks_cleared (cq_host);if (!ret) -pr_debug ("%s: cqhci: Failed to clear tasks\n" , -mmc_hostname (mmc)); +pr_warn ("%s: cqhci: Failed to clear tasks\n" , +mmc_hostname (mmc));return ret; }
@@ -969,7 +969,7 @@ static bool cqhci_halt(struct mmc_host * ret =cqhci_halted (cq_host);if (!ret) -pr_debug ("%s: cqhci: Failed to halt\n" ,mmc_hostname (mmc)); +pr_warn ("%s: cqhci: Failed to halt\n" ,mmc_hostname (mmc));return ret; }
Greg Kroah-Hartman
maintainerPATCH 6/67 mmc: cqhci: Fix task clearing in CQE error recovery
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
commit 1de1b77982e1a1df9707cb11f9b1789e6b8919d4 upstream.
If a task completion notification (TCN) is received when there is no outstanding task, the cqhci driver issues a "spurious TCN" warning. This was observed to happen right after CQE error recovery.
When an error interrupt is received the driver runs recovery logic. It halts the controller, clears all pending tasks, and then re-enables it. On some platforms, like Intel Jasper Lake, a stale task completion event was observed, regardless of the CQHCI_CLEAR_ALL_TASKS bit being set.
This results in either:
a) Spurious TC completion event for an empty slot.
b) Corrupted data being passed up the stack, as a result of premature completion for a newly added task.
Rather than add a quirk for affected controllers, ensure tasks are cleared by toggling CQHCI_ENABLE, which would happen anyway if cqhci_clear_all_tasks() timed out. This is simpler and should be safe and effective for all controllers.
--- drivers/mmc/host/cqhci-core.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/mmc/host/cqhci-core.c +16 -16
@@ -1068,28 +1068,28 @@ static void cqhci_recovery_finish(struct ok =cqhci_halt (mmc,CQHCI_FINISH_HALT_TIMEOUT ); -if (!cqhci_clear_all_tasks (mmc,CQHCI_CLEAR_TIMEOUT )) - ok = false; -/* * The specification contradicts itself, by saying that tasks cannot be * cleared if CQHCI does not halt, but if CQHCI does not halt, it should * be disabled/re-enabled, but not to disable before clearing tasks. * Have a go anyway. */ -if (!ok) { -pr_debug ("%s: cqhci: disable / re-enable\n" ,mmc_hostname (mmc)); - cqcfg =cqhci_readl (cq_host,CQHCI_CFG ); - cqcfg &= ~CQHCI_ENABLE ; -cqhci_writel (cq_host, cqcfg,CQHCI_CFG ); - cqcfg |=CQHCI_ENABLE ; -cqhci_writel (cq_host, cqcfg,CQHCI_CFG ); -/* Be sure that there are no tasks */ - ok =cqhci_halt (mmc,CQHCI_FINISH_HALT_TIMEOUT ); -if (!cqhci_clear_all_tasks (mmc,CQHCI_CLEAR_TIMEOUT )) - ok = false; -WARN_ON (!ok); - } +if (!cqhci_clear_all_tasks (mmc,CQHCI_CLEAR_TIMEOUT )) + ok = false; + +/* Disable to make sure tasks really are cleared */ + cqcfg =cqhci_readl (cq_host,CQHCI_CFG ); + cqcfg &= ~CQHCI_ENABLE ; +cqhci_writel (cq_host, cqcfg,CQHCI_CFG ); + + cqcfg =cqhci_readl (cq_host,CQHCI_CFG ); + cqcfg |=CQHCI_ENABLE ; +cqhci_writel (cq_host, cqcfg,CQHCI_CFG ); + +cqhci_halt (mmc,CQHCI_FINISH_HALT_TIMEOUT ); + +if (!ok) +cqhci_clear_all_tasks (mmc,CQHCI_CLEAR_TIMEOUT );cqhci_recover_mrqs (cq_host);
Greg Kroah-Hartman
maintainerPATCH 7/67 mmc: block: Retry commands in CQE error recovery
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
commit 8155d1fa3a747baad5caff5f8303321d68ddd48c upstream.
It is important that MMC_CMDQ_TASK_MGMT command to discard the queue is successful because otherwise a subsequent reset might fail to flush the cache first. Retry it and the previous STOP command.
--- drivers/mmc/core/core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/mmc/core/core.c +5 -2
@@ -552,7 +552,7 @@ int mmc_cqe_recovery(struct mmc_host *ho cmd.flags =MMC_RSP_R1B |MMC_CMD_AC ; cmd.flags &= ~MMC_RSP_CRC ;/* Ignore CRC */ cmd.busy_timeout =MMC_CQE_RECOVERY_TIMEOUT ; -mmc_wait_for_cmd (host, &cmd,0 ); +mmc_wait_for_cmd (host, &cmd,MMC_CMD_RETRIES );memset (&cmd,0 ,sizeof (cmd)); cmd.opcode =MMC_CMDQ_TASK_MGMT ;
@@ -560,10 +560,13 @@ int mmc_cqe_recovery(struct mmc_host *ho cmd.flags =MMC_RSP_R1B |MMC_CMD_AC ; cmd.flags &= ~MMC_RSP_CRC ;/* Ignore CRC */ cmd.busy_timeout =MMC_CQE_RECOVERY_TIMEOUT ; - err =mmc_wait_for_cmd (host, &cmd,0 ); + err =mmc_wait_for_cmd (host, &cmd,MMC_CMD_RETRIES ); host->cqe_ops->cqe_recovery_finish (host); +if (err) + err =mmc_wait_for_cmd (host, &cmd,MMC_CMD_RETRIES ); +mmc_retune_release (host);return err;
Greg Kroah-Hartman
maintainerPATCH 8/67 mmc: block: Do not lose cache flush during CQE error recovery
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
commit 174925d340aac55296318e43fd96c0e1d196e105 upstream.
During CQE error recovery, error-free data commands get requeued if there is any data left to transfer, but non-data commands are completed even though they have not been processed. Requeue them instead.
Note the only non-data command is cache flush, which would have resulted in a cache flush being lost if it was queued at the time of CQE recovery.
--- drivers/mmc/core/block.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/mmc/core/block.c +2 -0
@@ -1465,6 +1465,8 @@ static void mmc_blk_cqe_complete_rq(strublk_mq_requeue_request (req, true); else__blk_mq_end_request (req ,BLK_STS_OK ); + }else if (mq->in_recovery) { +blk_mq_requeue_request (req, true); }else {blk_mq_end_request (req,BLK_STS_OK ); }
Greg Kroah-Hartman
maintainerPATCH 9/67 mmc: block: Be sure to wait while busy in CQE error recovery
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
commit c616696a902987352426fdaeec1b0b3240949e6b upstream.
STOP command does not guarantee to wait while busy, but subsequent command MMC_CMDQ_TASK_MGMT to discard the queue will fail if the card is busy, so be sure to wait by employing mmc_poll_for_busy().
--- drivers/mmc/core/core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/mmc/core/core.c +2 -0
@@ -554,6 +554,8 @@ int mmc_cqe_recovery(struct mmc_host *ho cmd.busy_timeout =MMC_CQE_RECOVERY_TIMEOUT ;mmc_wait_for_cmd (host, &cmd,MMC_CMD_RETRIES ); +mmc_poll_for_busy (host->card,MMC_CQE_RECOVERY_TIMEOUT , true,MMC_BUSY_IO ); +memset (&cmd,0 ,sizeof (cmd)); cmd.opcode =MMC_CMDQ_TASK_MGMT ; cmd.arg =1 ;/* Discard entire queue */
Greg Kroah-Hartman
maintainerPATCH 10/67 ALSA: hda: Disable power-save on KONTRON SinglePC
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit a337c355719c42a6c5b67e985ad753590ed844fb upstream.
It's been reported that the runtime PM on KONTRON SinglePC (PCI SSID 1734:1232) caused a stall of playback after a bunch of invocations. (FWIW, this looks like an timing issue, and the stall happens rather on the controller side.)
As a workaround, disable the default power-save on this platform.
--- sound/pci/hda/hda_intel.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/hda_intel.c +2 -0
@@ -2210,6 +2210,8 @@ static const struct snd_pci_quirk power_SND_PCI_QUIRK (0x17aa ,0x36a7 ,"Lenovo C50 All in one" ,0 ),/* https://bugs.launchpad.net/bugs/1821663 */ SND_PCI_QUIRK (0x1631 ,0xe017 ,"Packard Bell NEC IMEDIA 5204" ,0 ), +/* KONTRON SinglePC may cause a stall at runtime resume */ + SND_PCI_QUIRK(0x1734, 0x1232, "KONTRON SinglePC", 0), {} };#endif /* CONFIG_PM */
Greg Kroah-Hartman
maintainerPATCH 11/67 ALSA: hda/realtek: Headset Mic VREF to 100%
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kailang Yang <[email protected]>
commit baaacbff64d9f34b64f294431966d035aeadb81c upstream.
This platform need to set Mic VREF to 100%.
--- sound/pci/hda/patch_realtek.c | 9 +++++++++ 1 file changed, 9 insertions(+)
sound/pci/hda/patch_realtek.c +9 -0
@@ -1980,6 +1980,7 @@ enum {ALC887_FIXUP_ASUS_AUDIO ,ALC887_FIXUP_ASUS_HMIC ,ALCS1200A_FIXUP_MIC_VREF , + ALC888VD_FIXUP_MIC_100VREF, }; static void alc889_fixup_coef(struct hda_codec *codec,
@@ -2533,6 +2534,13 @@ static const struct hda_fixup alc882_fix {} } }, + [ALC888VD_FIXUP_MIC_100VREF ] = { + .type =HDA_FIXUP_PINCTLS , + .v.pins = (const struct hda_pintbl []) { + {0x18 ,PIN_VREF100 },/* headset mic */ + {} + } + }, };static const struct snd_pci_quirk alc882_fixup_tbl[] = {
@@ -2602,6 +2610,7 @@ static const struct snd_pci_quirk alc882SND_PCI_QUIRK (0x106b ,0x4a00 ,"Macbook 5,2" ,ALC889_FIXUP_MBA11_VREF ),SND_PCI_QUIRK (0x1071 ,0x8258 ,"Evesham Voyaeger" ,ALC882_FIXUP_EAPD ), +SND_PCI_QUIRK (0x10ec ,0x12d8 ,"iBase Elo Touch" ,ALC888VD_FIXUP_MIC_100VREF ),SND_PCI_QUIRK (0x13fe ,0x1009 ,"Advantech MIT-W101" ,ALC886_FIXUP_EAPD ),SND_PCI_QUIRK (0x1458 ,0xa002 ,"Gigabyte EP45-DS3/Z87X-UD3H" ,ALC889_FIXUP_FRONT_HP_NO_PRESENCE ), SND_PCI_QUIRK(0x1458, 0xa0b8, "Gigabyte AZ370-Gaming", ALC1220_FIXUP_GB_DUAL_CODECS),
Greg Kroah-Hartman
maintainerPATCH 12/67 ALSA: hda/realtek: Add supported ALC257 for ChromeOS
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kailang Yang <[email protected]>
commit cae2bdb579ecc9d4219c58a7d3fde1958118dc1d upstream.
ChromeOS want to support ALC257.
Add codec ID to some relation function.
--- sound/pci/hda/patch_realtek.c | 3 +++ 1 file changed, 3 insertions(+)
sound/pci/hda/patch_realtek.c +3 -0
@@ -3258,6 +3258,7 @@ static void alc_disable_headset_jack_keycase 0x10ec0230 :case 0x10ec0236 :case 0x10ec0256 : +case 0x10ec0257 :case 0x19e58326 :alc_write_coef_idx (codec,0x48 ,0x0 );alc_update_coef_idx (codec,0x49 ,0x0045 ,0x0 );
@@ -3287,6 +3288,7 @@ static void alc_enable_headset_jack_key(case 0x10ec0230 :case 0x10ec0236 :case 0x10ec0256 : +case 0x10ec0257 :case 0x19e58326 :alc_write_coef_idx (codec,0x48 ,0xd011 );alc_update_coef_idx (codec,0x49 ,0x007f ,0x0045 );
@@ -6481,6 +6483,7 @@ static void alc_combo_jack_hp_jd_restartcase 0x10ec0236 :case 0x10ec0255 :case 0x10ec0256 : +case 0x10ec0257 :case 0x19e58326 :alc_update_coef_idx (codec,0x1b ,0x8000 ,1 <<15 );/* Reset HP JD */ alc_update_coef_idx (codec,0x1b ,0x8000 ,0 <<15 );
Greg Kroah-Hartman
maintainerPATCH 13/67 dm-verity: align struct dm_verity_fec_io properly
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
commit 38bc1ab135db87577695816b190e7d6d8ec75879 upstream.
dm_verity_fec_io is placed after the end of two hash digests. If the hash digest has unaligned length, struct dm_verity_fec_io could be unaligned.
This commit fixes the placement of struct dm_verity_fec_io, so that it's aligned.
--- drivers/md/dm-verity-fec.c | 3 ++- drivers/md/dm-verity.h | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-)
drivers/md/dm-verity-fec.c +2 -1
@@ -24,7 +24,8 @@ bool verity_fec_is_enabled(struct dm_ver*/ static inline struct dm_verity_fec_io *fec_io (struct dm_verity_io *io) { -return (struct dm_verity_fec_io *)verity_io_digest_end (io->v, io); +return (struct dm_verity_fec_io *) + ((char *)io + io->v->ti->per_io_data_size -sizeof (struct dm_verity_fec_io )); }/*
drivers/md/dm-verity.h +0 -6
@@ -111,12 +111,6 @@ static inline u8 *verity_io_want_digest(return (u8 *)(io +1 ) + v->ahash_reqsize + v->digest_size; } -static inline u8 *verity_io_digest_end (struct dm_verity *v, -struct dm_verity_io *io) -{ -return verity_io_want_digest (v, io) + v->digest_size; -} - extern int verity_for_bv_block(struct dm_verity *v, struct dm_verity_io *io, struct bvec_iter *iter, int (*process)(struct dm_verity *v,
Greg Kroah-Hartman
maintainerPATCH 14/67 dm verity: dont perform FEC for failed readahead IO
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wu Bo <[email protected]>
commit 0193e3966ceeeef69e235975918b287ab093082b upstream.
We found an issue under Android OTA scenario that many BIOs have to do FEC where the data under dm-verity is 100% complete and no corruption.
Android OTA has many dm-block layers, from upper to lower:
dm-verity
dm-snapshot
dm-origin & dm-cow
dm-linear
ufs
DM tables have to change 2 times during Android OTA merging process. When doing table change, the dm-snapshot will be suspended for a while. During this interval, many readahead IOs are submitted to dm_verity from filesystem. Then the kverity works are busy doing FEC process which cost too much time to finish dm-verity IO. This causes needless delay which feels like system is hung.
After adding debugging it was found that each readahead IO needed around 10s to finish when this situation occurred. This is due to IO amplification:
dm-snapshot suspenderofs_readahead // 300+ io is submitted
dm_submit_bio (dm_verity) dm_submit_bio (dm_snapshot) bio return EIO bio got nothing, it's empty verity_end_io verity_verify_io forloop range(0, io->n_blocks) // each io->nblocks ~= 20 verity_fec_decode fec_decode_rsb fec_read_bufs forloop range(0, v->fec->rsn) // v->fec->rsn = 253 new_read submit_bio (dm_snapshot) end loop end loop
dm-snapshot resume
Readahead BIOs get nothing while dm-snapshot is suspended, so all of them will cause verity's FEC.
Each readahead BIO needs to verify ~20 (io->nblocks) blocks. Each block needs to do FEC, and every block needs to do 253 (v->fec->rsn) reads.
So during the suspend interval(~200ms), 300 readahead BIOs trigger ~1518000 (300*20*253) IOs to dm-snapshot.
As readahead IO is not required by userspace, and to fix this issue, it is best to pass readahead errors to upper layer to handle it.
--- drivers/md/dm-verity-target.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/md/dm-verity-target.c +3 -1
@@ -583,7 +583,9 @@ static void verity_end_io(struct bio *bistruct dm_verity_io *io = bio->bi_private;if (bio->bi_status && - (!verity_fec_is_enabled (io->v) ||verity_is_system_shutting_down ())) { + (!verity_fec_is_enabled (io->v) || +verity_is_system_shutting_down () || + (bio->bi_opf &REQ_RAHEAD ))) {verity_finish_io (io, bio->bi_status);return ; }
Greg Kroah-Hartman
maintainerPATCH 15/67 bcache: revert replacing IS_ERR_OR_NULL with IS_ERR
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Markus Weippert <[email protected]>
commit bb6cc253861bd5a7cf8439e2118659696df9619f upstream.
Commit 028ddcac477b ("bcache: Remove unnecessary NULL point check in node allocations") replaced IS_ERR_OR_NULL by IS_ERR. This leads to a NULL pointer dereference.
BUG: kernel NULL pointer dereference, address: 0000000000000080 Call Trace: ? __die_body.cold+0x1a/0x1f ? page_fault_oops+0xd2/0x2b0 ? exc_page_fault+0x70/0x170 ? asm_exc_page_fault+0x22/0x30 ? btree_node_free+0xf/0x160 [bcache] ? up_write+0x32/0x60 btree_gc_coalesce+0x2aa/0x890 [bcache] ? bch_extent_bad+0x70/0x170 [bcache] btree_gc_recurse+0x130/0x390 [bcache] ? btree_gc_mark_node+0x72/0x230 [bcache] bch_btree_gc+0x5da/0x600 [bcache] ? cpuusage_read+0x10/0x10 ? bch_btree_gc+0x600/0x600 [bcache] bch_gc_thread+0x135/0x180 [bcache]
The relevant code starts with:
new_nodes[0] = NULL;
for (i = 0; i < nodes; i++) {
if (__bch_keylist_realloc(&keylist, bkey_u64s(&r[i].b->key)))
goto out_nocoalesce;
// ...
out_nocoalesce:
// ...
for (i = 0; i < nodes; i++)
if (!IS_ERR(new_nodes[i])) { // IS_ERR_OR_NULL before
028ddcac477b
btree_node_free(new_nodes[i]); // new_nodes[0] is NULL
rw_unlock(true, new_nodes[i]);
}This patch replaces IS_ERR() by IS_ERR_OR_NULL() to fix this.
--- drivers/md/bcache/btree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/bcache/btree.c +1 -1
@@ -1489,7 +1489,7 @@ out_nocoalesce:bch_keylist_free (&keylist);for (i =0 ; i < nodes; i++) -if (!IS_ERR (new_nodes[i])) { +if (!IS_ERR_OR_NULL (new_nodes[i])) {btree_node_free (new_nodes[i]);rw_unlock (true, new_nodes[i]); }
Greg Kroah-Hartman
maintainerPATCH 16/67 iommu/vt-d: Add MTL to quirk list to skip TE disabling
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Abdul Halim, Mohd Syazwan <[email protected]>
commit 85b80fdffa867d75dfb9084a839e7949e29064e8 upstream.
The VT-d spec requires (10.4.4 Global Command Register, TE field) that:
Hardware implementations supporting DMA draining must drain any in-flight DMA read/write requests queued within the Root-Complex before switching address translation on or off and reflecting the status of the command through the TES field in the Global Status register.
Unfortunately, some integrated graphic devices fail to do so after some kind of power state transition. As the result, the system might stuck in iommu_disable_translation(), waiting for the completion of TE transition.
Add MTL to the quirk list for those devices and skips TE disabling if the qurik hits.
--- drivers/iommu/intel/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/intel/iommu.c +1 -1
@@ -5749,7 +5749,7 @@ static void quirk_igfx_skip_te_disable(s ver = (dev->device >>8 ) &0xff ;if (ver !=0x45 && ver !=0x46 && ver !=0x4c && ver !=0x4e && ver !=0x8a && ver !=0x98 && - ver !=0x9a && ver !=0xa7 ) + ver !=0x9a && ver !=0xa7 && ver !=0x7d )return ;if (risky_device (dev))
Greg Kroah-Hartman
maintainerPATCH 17/67 powerpc: Dont clobber f0/vs0 during fp|altivec register save
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Timothy Pearson <[email protected]>
commit 5e1d824f9a283cbf90f25241b66d1f69adb3835b upstream.
During floating point and vector save to thread data f0/vs0 are clobbered by the FPSCR/VSCR store routine. This has been obvserved to lead to userspace register corruption and application data corruption with io-uring.
Fix it by restoring f0/vs0 after FPSCR/VSCR store has completed for all the FP, altivec, VMX register save paths.
Tested under QEMU in kvm mode, running on a Talos II workstation with dual POWER9 DD2.2 CPUs.
Additional detail (mpe):
Typically save_fpu() is called from __giveup_fpu() which saves the FP regs and also *turns off FP* in the tasks MSR, meaning the kernel will reload the FP regs from the thread struct before letting the task use FP again. So in that case save_fpu() is free to clobber f0 because the FP regs no longer hold live values for the task.
There is another case though, which is the path via:
sys_clone()
...
copy_process()
dup_task_struct()
arch_dup_task_struct()
flush_all_to_thread()
save_all()That path saves the FP regs but leaves them live. That's meant as an optimisation for a process that's using FP/VSX and then calls fork(), leaving the regs live means the parent process doesn't have to take a fault after the fork to get its FP regs back. The optimisation was added in commit 8792468da5e1 ("powerpc: Add the ability to save FPU without giving it up").
That path does clobber f0, but f0 is volatile across function calls, and typically programs reach copy_process() from userspace via a syscall wrapper function. So in normal usage f0 being clobbered across a syscall doesn't cause visible data corruption.
But there is now a new path, because io-uring can call copy_process() via create_io_thread() from the signal handling path. That's OK if the signal is handled as part of syscall return, but it's not OK if the signal is handled due to some other interrupt.
That path is:
interrupt_return_srr_user()
interrupt_exit_user_prepare()
interrupt_exit_user_prepare_main()
do_notify_resume()
get_signal()
task_work_run()
create_worker_cb()
create_io_worker()
copy_process()
dup_task_struct()
arch_dup_task_struct()
flush_all_to_thread()
save_all()
if (tsk->thread.regs->msr & MSR_FP)
save_fpu()
# f0 is clobbered and potentially live in userspaceNote the above discussion applies equally to save_altivec().
--- arch/powerpc/kernel/fpu.S | 13 +++++++++++++ arch/powerpc/kernel/vector.S | 2 ++ 2 files changed, 15 insertions(+)
arch/powerpc/kernel/fpu.S +13 -0
@@ -23,6 +23,15 @@ #include <asm/feature-fixups.h> #ifdef CONFIG_VSX +#define __REST_1FPVSR(n,c,base) \ +BEGIN_FTR_SECTION \ + b 2f; \ +END_FTR_SECTION_IFSET(CPU_FTR_VSX); \ + REST_FPR(n,base); \ + b 3f; \ +2: REST_VSR(n,c,base); \ +3: + #define __REST_32FPVSRS(n,c,base) \ BEGIN_FTR_SECTION \ b 2f; \
@@ -41,9 +50,11 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX); 2: SAVE_32VSRS(n,c,base); \ 3: #else +#define __REST_1FPVSR(n,b,base) REST_FPR(n, base) #define __REST_32FPVSRS(n,b,base) REST_32FPRS(n, base) #define __SAVE_32FPVSRS(n,b,base) SAVE_32FPRS(n, base) #endif +#define REST_1FPVSR(n,c,base) __REST_1FPVSR(n,__REG_##c,__REG_##base) #define REST_32FPVSRS(n,c,base) __REST_32FPVSRS(n,__REG_##c,__REG_##base) #define SAVE_32FPVSRS(n,c,base) __SAVE_32FPVSRS(n,__REG_##c,__REG_##base)
@@ -67,6 +78,7 @@ _GLOBAL(store_fp_state) SAVE_32FPVSRS(0, R4, R3) mffs fr0 stfd fr0,FPSTATE_FPSCR(r3) + REST_1FPVSR(0, R4, R3) blr EXPORT_SYMBOL(store_fp_state)
@@ -133,4 +145,5 @@ _GLOBAL(save_fpu) 2: SAVE_32FPVSRS(0, R4, R6) mffs fr0 stfd fr0,FPSTATE_FPSCR(r6) + REST_1FPVSR(0, R4, R6) blr
arch/powerpc/kernel/vector.S +2 -0
@@ -32,6 +32,7 @@ _GLOBAL(store_vr_state) mfvscr v0 li r4, VRSTATE_VSCR stvx v0, r4, r3 + lvx v0, 0, r3 blr EXPORT_SYMBOL(store_vr_state)
@@ -104,6 +105,7 @@ _GLOBAL(save_altivec) mfvscr v0 li r4,VRSTATE_VSCR stvx v0,r4,r7 + lvx v0,0,r7 blr #ifdef CONFIG_VSX
Greg Kroah-Hartman
maintainerPATCH 18/67 parisc: Drop the HP-UX ENOSYM and EREMOTERELEASE error codes
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
commit e5f3e299a2b1e9c3ece24a38adfc089aef307e8a upstream.
Those return codes are only defined for the parisc architecture and are leftovers from when we wanted to be HP-UX compatible.
They are not returned by any Linux kernel syscall but do trigger problems with the glibc strerrorname_np() and strerror() functions as reported in glibc issue #31080.
There is no need to keep them, so simply remove them.
--- arch/parisc/include/uapi/asm/errno.h | 2 -- lib/errname.c | 6 ------ tools/arch/parisc/include/uapi/asm/errno.h | 2 -- 3 files changed, 10 deletions(-)
arch/parisc/include/uapi/asm/errno.h +0 -2
@@ -75,7 +75,6 @@/* We now return you to your regularly scheduled HPUX. */ -#define ENOSYM 215/* symbol does not exist in executable */ #define ENOTSOCK 216/* Socket operation on non-socket */ #define EDESTADDRREQ 217/* Destination address required */ #define EMSGSIZE 218/* Message too long */
@@ -101,7 +100,6 @@#define ETIMEDOUT 238/* Connection timed out */ #define ECONNREFUSED 239/* Connection refused */ #define EREFUSED ECONNREFUSED/* for HP's NFS apparently */ -#define EREMOTERELEASE 240/* Remote peer released connection */ #define EHOSTDOWN 241/* Host is down */ #define EHOSTUNREACH 242/* No route to host */
lib/errname.c +0 -6
@@ -111,9 +111,6 @@ static const char *names_0[] = {E (ENOSPC ),E (ENOSR ),E (ENOSTR ), -#ifdef ENOSYM -E (ENOSYM ), -#endifE (ENOSYS ),E (ENOTBLK ), E(ENOTCONN),
@@ -144,9 +141,6 @@ static const char *names_0[] = {#endif E (EREMOTE ),E (EREMOTEIO ), -#ifdef EREMOTERELEASE -E (EREMOTERELEASE ), -#endifE (ERESTART ),E (ERFKILL ), E(EROFS),
tools/arch/parisc/include/uapi/asm/errno.h +0 -2
@@ -75,7 +75,6 @@/* We now return you to your regularly scheduled HPUX. */ -#define ENOSYM 215/* symbol does not exist in executable */ #define ENOTSOCK 216/* Socket operation on non-socket */ #define EDESTADDRREQ 217/* Destination address required */ #define EMSGSIZE 218/* Message too long */
@@ -101,7 +100,6 @@#define ETIMEDOUT 238/* Connection timed out */ #define ECONNREFUSED 239/* Connection refused */ #define EREFUSED ECONNREFUSED/* for HP's NFS apparently */ -#define EREMOTERELEASE 240/* Remote peer released connection */ #define EHOSTDOWN 241/* Host is down */ #define EHOSTUNREACH 242/* No route to host */
Greg Kroah-Hartman
maintainerPATCH 19/67 btrfs: add dmesg output for first mount and last unmount of a filesystem
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qu Wenruo <[email protected]>
commit 2db313205f8b96eea467691917138d646bb50aef upstream.
There is a feature request to add dmesg output when unmounting a btrfs. There are several alternative methods to do the same thing, but with their own problems:
- Use eBPF to watch btrfs_put_super()/open_ctree()
Not end user friendly, they have to dip their head into the source code.
- Watch for directory /sys/fs/<uuid>/
This is way more simple, but still requires some simple device -> uuid lookups. And a script needs to use inotify to watch /sys/fs/.
Compared to all these, directly outputting the information into dmesg would be the most simple one, with both device and UUID included.
And since we're here, also add the output when mounting a filesystem for the first time for parity. A more fine grained monitoring of subvolume mounts should be done by another layer, like audit.
Now mounting a btrfs with all default mkfs options would look like this:
[81.906566] BTRFS info (device dm-8): first mount of filesystem 633b5c16-afe3-4b79-b195-138fe145e4f2 [81.907494] BTRFS info (device dm-8): using crc32c (crc32c-intel) checksum algorithm [81.908258] BTRFS info (device dm-8): using free space tree [81.912644] BTRFS info (device dm-8): auto enabling async discard [81.913277] BTRFS info (device dm-8): checking UUID tree [91.668256] BTRFS info (device dm-8): last unmount of filesystem 633b5c16-afe3-4b79-b195-138fe145e4f2
--- fs/btrfs/disk-io.c | 1 + fs/btrfs/super.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-)
fs/btrfs/disk-io.c +1 -0
@@ -3204,6 +3204,7 @@ int __cold open_ctree(struct super_block goto fail_alloc; } +btrfs_info (fs_info,"first mount of filesystem %pU" , disk_super->fsid);/* * Verify the type first, if that or the checksum value are * corrupted, we'll find out
fs/btrfs/super.c +4 -1
@@ -337,7 +337,10 @@ void __btrfs_panic(struct btrfs_fs_infostatic void btrfs_put_super (struct super_block *sb) { -close_ctree (btrfs_sb (sb)); +struct btrfs_fs_info *fs_info =btrfs_sb (sb); + +btrfs_info (fs_info,"last unmount of filesystem %pU" , fs_info->fs_devices->fsid); +close_ctree (fs_info); }enum {
Greg Kroah-Hartman
maintainerPATCH 20/67 btrfs: ref-verify: fix memory leaks in btrfs_ref_tree_mod()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bragatheswaran Manickavel <[email protected]>
commit f91192cd68591c6b037da345bc9fcd5e50540358 upstream.
In btrfs_ref_tree_mod(), when !parent 're' was allocated through kmalloc(). In the following code, if an error occurs, the execution will be redirected to 'out' or 'out_unlock' and the function will be exited. However, on some of the paths, 're' are not deallocated and may lead to memory leaks.
For example: lookup_block_entry() for 'be' returns NULL, the out label will be invoked. During that flow ref and 'ra' are freed but not 're', which can potentially lead to a memory leak.
--- fs/btrfs/ref-verify.c | 2 ++ 1 file changed, 2 insertions(+)
fs/btrfs/ref-verify.c +2 -0
@@ -788,6 +788,7 @@ int btrfs_ref_tree_mod(struct btrfs_fs_idump_ref_action (fs_info, ra);kfree (ref);kfree (ra); +kfree (re); goto out_unlock; }else if (be->num_refs ==0 ) { btrfs_err(fs_info,
@@ -797,6 +798,7 @@ int btrfs_ref_tree_mod(struct btrfs_fs_idump_ref_action (fs_info, ra);kfree (ref);kfree (ra); +kfree (re); goto out_unlock; }
Greg Kroah-Hartman
maintainerPATCH 21/67 btrfs: fix off-by-one when checking chunk map includes logical address
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
commit 5fba5a571858ce2d787fdaf55814e42725bfa895 upstream.
At btrfs_get_chunk_map() we get the extent map for the chunk that contains the given logical address stored in the 'logical' argument. Then we do sanity checks to verify the extent map contains the logical address. One of these checks verifies if the extent map covers a range with an end offset behind the target logical address - however this check has an off-by-one error since it will consider an extent map whose start offset plus its length matches the target logical address as inclusive, while the fact is that the last byte it covers is behind the target logical address (by 1).
So fix this condition by using '<=' rather than '<' when comparing the extent map's "start + length" against the target logical address.
--- fs/btrfs/volumes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/volumes.c +1 -1
@@ -3069,7 +3069,7 @@ struct extent_map *btrfs_get_chunk_map(sreturn ERR_PTR (-EINVAL ); } -if (em->start > logical || em->start + em->len < logical) { +if (em->start > logical || em->start + em->len <= logical) {btrfs_crit (fs_info,"found a bad mapping, wanted %llu-%llu, found %llu-%llu" , logical, length, em->start, em->start + em->len);
Greg Kroah-Hartman
maintainerPATCH 22/67 btrfs: send: ensure send_fd is writable
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jann Horn <[email protected]>
commit 0ac1d13a55eb37d398b63e6ff6db4a09a2c9128c upstream.
kernel_write() requires the caller to ensure that the file is writable. Let's do that directly after looking up the ->send_fd.
We don't need a separate bailout path because the "out" path already does fput() if ->send_filp is non-NULL.
This has no security impact for two reasons:
- the ioctl requires CAP_SYS_ADMIN
- __kernel_write() bails out on read-only files - but only since 5.8, see commit a01ac27be472 ("fs: check FMODE_WRITE in __kernel_write")
--- fs/btrfs/send.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/send.c +1 -1
@@ -7576,7 +7576,7 @@ long btrfs_ioctl_send(struct file *mnt_f sctx->flags = arg->flags; sctx->send_filp =fget (arg->send_fd); -if (!sctx->send_filp) { +if (!sctx->send_filp || !(sctx->send_filp->f_mode &FMODE_WRITE )) { ret = -EBADF ; goto out; }
Greg Kroah-Hartman
maintainerPATCH 23/67 btrfs: make error messages more clear when getting a chunk map
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
commit 7d410d5efe04e42a6cd959bfe6d59d559fdf8b25 upstream.
When getting a chunk map, at btrfs_get_chunk_map(), we do some sanity checks to verify we found a chunk map and that map found covers the logical address the caller passed in. However the messages aren't very clear in the sense that don't mention the issue is with a chunk map and one of them prints the 'length' argument as if it were the end offset of the requested range (while the in the string format we use %llu-%llu which suggests a range, and the second %llu-%llu is actually a range for the chunk map). So improve these two details in the error messages.
--- fs/btrfs/volumes.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/btrfs/volumes.c +4 -3
@@ -3064,15 +3064,16 @@ struct extent_map *btrfs_get_chunk_map(sread_unlock (&em_tree->lock);if (!em) { -btrfs_crit (fs_info,"unable to find logical %llu length %llu" , +btrfs_crit (fs_info, +"unable to find chunk map for logical %llu length %llu" , logical, length);return ERR_PTR (-EINVAL ); }if (em->start > logical || em->start + em->len <= logical) {btrfs_crit (fs_info, -"found a bad mapping, wanted %llu-%llu, found %llu-%llu" , - logical, length, em->start, em->start + em->len); +"found a bad chunk map, wanted %llu-%llu, found %llu-%llu" , + logical, logical + length, em->start, em->start + em->len);free_extent_map (em);return ERR_PTR (-EINVAL ); }
Greg Kroah-Hartman
maintainerPATCH 24/67 Input: xpad - add HyperX Clutch Gladiate Support
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Max Nguyen <[email protected]>
commit e28a0974d749e5105d77233c0a84d35c37da047e upstream.
Add HyperX controller support to xpad_device and xpad_table.
--- drivers/input/joystick/xpad.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/input/joystick/xpad.c +2 -0
@@ -120,6 +120,7 @@ static const struct xpad_device { { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX }, { 0x044f, 0x0f10, "Thrustmaster Modena GT Wheel", 0, XTYPE_XBOX }, { 0x044f, 0xb326, "Thrustmaster Gamepad GP XID", 0, XTYPE_XBOX360 }, + { 0x03f0, 0x0495, "HyperX Clutch Gladiate", 0, XTYPE_XBOXONE }, { 0x045e, 0x0202, "Microsoft X-Box pad v1 (US)", 0, XTYPE_XBOX }, { 0x045e, 0x0285, "Microsoft X-Box pad (Japan)", 0, XTYPE_XBOX }, { 0x045e, 0x0287, "Microsoft Xbox Controller S", 0, XTYPE_XBOX },
@@ -434,6 +435,7 @@ static const struct usb_device_id xpad_tXPAD_XBOX360_VENDOR (0x0079 ),/* GPD Win 2 Controller */ XPAD_XBOX360_VENDOR (0x03eb ),/* Wooting Keyboards (Legacy) */ XPAD_XBOX360_VENDOR (0x044f ),/* Thrustmaster X-Box 360 controllers */ +XPAD_XBOXONE_VENDOR (0x03f0 ),/* HP HyperX Xbox One Controllers */ XPAD_XBOX360_VENDOR (0x045e ),/* Microsoft X-Box 360 controllers */ XPAD_XBOXONE_VENDOR (0x045e ),/* Microsoft X-Box One controllers */ XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */
Greg Kroah-Hartman
maintainerPATCH 25/67 vlan: introduce vlan_dev_free_egress_priority
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xin Long <[email protected]>
commit 37aa50c539bcbcc01767e515bd170787fcfc0f33 upstream.
This patch is to introduce vlan_dev_free_egress_priority() to free egress priority for vlan dev, and keep vlan_dev_uninit() static as .ndo_uninit. It makes the code more clear and safer when adding new code in vlan_dev_uninit() in the future.
--- net/8021q/vlan.h | 2 +- net/8021q/vlan_dev.c | 7 ++++++- net/8021q/vlan_netlink.c | 7 ++++--- 3 files changed, 11 insertions(+), 5 deletions(-)
net/8021q/vlan.h +1 -1
@@ -129,6 +129,7 @@ void vlan_dev_set_ingress_priority(const u32 skb_prio, u16 vlan_prio);int vlan_dev_set_egress_priority (const struct net_device *dev,u32 skb_prio,u16 vlan_prio); +void vlan_dev_free_egress_priority (const struct net_device *dev);int vlan_dev_change_flags (const struct net_device *dev,u32 flag,u32 mask);void vlan_dev_get_realdev_name (const struct net_device *dev,char *result,size_t size);
@@ -139,7 +140,6 @@ int vlan_check_real_dev(struct net_devicvoid vlan_setup (struct net_device *dev);int register_vlan_dev (struct net_device *dev,struct netlink_ext_ack *extack);void unregister_vlan_dev (struct net_device *dev,struct list_head *head); -void vlan_dev_uninit (struct net_device *dev);bool vlan_dev_inherit_address (struct net_device *dev,struct net_device *real_dev);
net/8021q/vlan_dev.c +6 -1
@@ -622,7 +622,7 @@ static int vlan_dev_init(struct net_devi }/* Note: this function might be called multiple times for the same device. */ -void vlan_dev_uninit (struct net_device *dev) +void vlan_dev_free_egress_priority (const struct net_device *dev) {struct vlan_priority_tci_mapping *pm;struct vlan_dev_priv *vlan =vlan_dev_priv (dev);
@@ -636,6 +636,11 @@ void vlan_dev_uninit(struct net_device * } } +static void vlan_dev_uninit (struct net_device *dev) +{ +vlan_dev_free_egress_priority (dev); +} +static netdev_features_t vlan_dev_fix_features (struct net_device *dev,netdev_features_t features) {
net/8021q/vlan_netlink.c +4 -3
@@ -183,10 +183,11 @@ static int vlan_newlink(struct net *src_return -EINVAL ; err =vlan_changelink (dev, tb, data, extack); -if (!err) - err =register_vlan_dev (dev, extack);if (err) -vlan_dev_uninit (dev); +return err; + err =register_vlan_dev (dev, extack); +if (err) +vlan_dev_free_egress_priority (dev);return err; }
Greg Kroah-Hartman
maintainerPATCH 26/67 vlan: move dev_put into vlan_dev_uninit
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xin Long <[email protected]>
commit d6ff94afd90b0ce8d1715f8ef77d4347d7a7f2c0 upstream.
Shuang Li reported an QinQ issue by simply doing:
# ip link add dummy0 type dummy # ip link add link dummy0 name dummy0.1 type vlan id 1 # ip link add link dummy0.1 name dummy0.1.2 type vlan id 2 # rmmod 8021q
unregister_netdevice: waiting for dummy0.1 to become free. Usage count = 1
When rmmods 8021q, all vlan devs are deleted from their real_dev's vlan grp and added into list_kill by unregister_vlan_dev(). dummy0.1 is unregistered before dummy0.1.2, as it's using for_each_netdev() in __rtnl_kill_links().
When unregisters dummy0.1, dummy0.1.2 is not unregistered in the event of NETDEV_UNREGISTER, as it's been deleted from dummy0.1's vlan grp. However, due to dummy0.1.2 still holding dummy0.1, dummy0.1 will keep waiting in netdev_wait_allrefs(), while dummy0.1.2 will never get unregistered and release dummy0.1, as it delays dev_put until calling dev->priv_destructor, vlan_dev_free().
This issue was introduced by Commit 563bcbae3ba2 ("net: vlan: fix a UAF in vlan_dev_real_dev()"), and this patch is to fix it by moving dev_put() into vlan_dev_uninit(), which is called after NETDEV_UNREGISTER event but before netdev_wait_allrefs().
--- net/8021q/vlan_dev.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/8021q/vlan_dev.c +5 -3
@@ -638,7 +638,12 @@ void vlan_dev_free_egress_priority(conststatic void vlan_dev_uninit (struct net_device *dev) { +struct vlan_dev_priv *vlan =vlan_dev_priv (dev); +vlan_dev_free_egress_priority (dev); + +/* Get rid of the vlan's reference to real_dev */ +dev_put (vlan->real_dev); } static netdev_features_t vlan_dev_fix_features(struct net_device *dev,
@@ -851,9 +856,6 @@ static void vlan_dev_free(struct net_devfree_percpu (vlan->vlan_pcpu_stats); vlan->vlan_pcpu_stats =NULL ; - -/* Get rid of the vlan's reference to real_dev */ -dev_put (vlan->real_dev); }void vlan_setup (struct net_device *dev)
Greg Kroah-Hartman
maintainerPATCH 27/67 rcu: Avoid tracing a few functions executed in stop machine
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrick Wang <[email protected]>
commit 48f8070f5dd8e13148ae4647780a452d53c457a2 upstream.
Stop-machine recently started calling additional functions while waiting:
----------------------------------------------------------------
Former stop machine wait loop:
do {
cpu_relax(); => macro
...
} while (curstate != STOPMACHINE_EXIT);
-----------------------------------------------------------------
Current stop machine wait loop:
do {
stop_machine_yield(cpumask); => function (notraced)
...
touch_nmi_watchdog(); => function (notraced, inside calls also notraced)
...
rcu_momentary_dyntick_idle(); => function (notraced, inside calls traced)
} while (curstate != MULTI_STOP_EXIT);------------------------------------------------------------------
These functions (and the functions that they call) must be marked notrace to prevent them from being updated while they are executing. The consequences of failing to mark these functions can be severe:
rcu: INFO: rcu_preempt detected stalls on CPUs/tasks:
rcu: 1-...!: (0 ticks this GP) idle=14f/1/0x4000000000000000 softirq=3397/3397 fqs=0
rcu: 3-...!: (0 ticks this GP) idle=ee9/1/0x4000000000000000 softirq=5168/5168 fqs=0
(detected by 0, t=8137 jiffies, g=5889, q=2 ncpus=4)
Task dump for CPU 1:
task:migration/1 state:R running task stack: 0 pid: 19 ppid: 2 flags:0x00000000
Stopper: multi_cpu_stop+0x0/0x18c <- stop_machine_cpuslocked+0x128/0x174
Call Trace:
Task dump for CPU 3:
task:migration/3 state:R running task stack: 0 pid: 29 ppid: 2 flags:0x00000000
Stopper: multi_cpu_stop+0x0/0x18c <- stop_machine_cpuslocked+0x128/0x174
Call Trace:
rcu: rcu_preempt kthread timer wakeup didn't happen for 8136 jiffies! g5889 f0x0 RCU_GP_WAIT_FQS(5) ->state=0x402
rcu: Possible timer handling issue on cpu=2 timer-softirq=594
rcu: rcu_preempt kthread starved for 8137 jiffies! g5889 f0x0 RCU_GP_WAIT_FQS(5) ->state=0x402 ->cpu=2
rcu: Unless rcu_preempt kthread gets sufficient CPU time, OOM is now expected behavior.
rcu: RCU grace-period kthread stack dump:
task:rcu_preempt state:I stack: 0 pid: 14 ppid: 2 flags:0x00000000
Call Trace:
schedule+0x56/0xc2
schedule_timeout+0x82/0x184
rcu_gp_fqs_loop+0x19a/0x318
rcu_gp_kthread+0x11a/0x140
kthread+0xee/0x118
ret_from_exception+0x0/0x14
rcu: Stack dump where RCU GP kthread last ran:
Task dump for CPU 2:
task:migration/2 state:R running task stack: 0 pid: 24 ppid: 2 flags:0x00000000
Stopper: multi_cpu_stop+0x0/0x18c <- stop_machine_cpuslocked+0x128/0x174
Call Trace:This commit therefore marks these functions notrace:
rcu_preempt_deferred_qs() rcu_preempt_need_deferred_qs() rcu_preempt_deferred_qs_irqrestore()
[ paulmck: Apply feedback from Neeraj Upadhyay. ]
--- kernel/rcu/tree_plugin.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/rcu/tree_plugin.h +4 -4
@@ -458,7 +458,7 @@ static bool rcu_preempt_has_tasks(struct* be quite short, for example, in the case of the call from * rcu_read_unlock_special(). */ -static void +static notrace voidrcu_preempt_deferred_qs_irqrestore (struct task_struct *t,unsigned long flags) {bool empty_exp;
@@ -578,7 +578,7 @@ rcu_preempt_deferred_qs_irqrestore(struc* is disabled. This function cannot be expected to understand these * nuances, so the caller must handle them. */ -static bool rcu_preempt_need_deferred_qs (struct task_struct *t) +static notrace bool rcu_preempt_need_deferred_qs(struct task_struct *t) {return (__this_cpu_read (rcu_data.exp_deferred_qs) || READ_ONCE(t->rcu_read_unlock_special.s)) &&
@@ -592,7 +592,7 @@ static bool rcu_preempt_need_deferred_qs* evaluate safety in terms of interrupt, softirq, and preemption * disabling. */ -static void rcu_preempt_deferred_qs (struct task_struct *t) +static notrace void rcu_preempt_deferred_qs(struct task_struct *t) {unsigned long flags;
@@ -923,7 +923,7 @@ static bool rcu_preempt_has_tasks(struct* Because there is no preemptible RCU, there can be no deferred quiescent * states. */ -static bool rcu_preempt_need_deferred_qs (struct task_struct *t) +static notrace bool rcu_preempt_need_deferred_qs(struct task_struct *t) {return false; }
Greg Kroah-Hartman
maintainerPATCH 28/67 hv_netvsc: fix race of netvsc and VF register_netdevice
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haiyang Zhang <[email protected]>
[ Upstream commit d30fb712e52964f2cf9a9c14cf67078394044837 ]
The rtnl lock also needs to be held before rndis_filter_device_add() which advertises nvsp_2_vsc_capability / sriov bit, and triggers VF NIC offering and registering. If VF NIC finished register_netdev() earlier it may cause name based config failure.
To fix this issue, move the call to rtnl_lock() before rndis_filter_device_add(), so VF will be registered later than netvsc / synthetic NIC, and gets a name numbered (ethX) after netvsc.
--- drivers/net/hyperv/netvsc_drv.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)
drivers/net/hyperv/netvsc_drv.c +15 -10
@@ -2563,15 +2563,6 @@ static int netvsc_probe(struct hv_device *dev, goto devinfo_failed; } - nvdev =rndis_filter_device_add (dev, device_info); -if (IS_ERR (nvdev)) { - ret =PTR_ERR (nvdev); -netdev_err (net,"unable to add netvsc device (ret %d)\n" , ret); - goto rndis_failed; - } - -memcpy (net->dev_addr, device_info->mac_adr,ETH_ALEN ); -/* We must get rtnl lock before scheduling nvdev->subchan_work, * otherwise netvsc_subchan_work() can get rtnl lock first and wait * all subchannels to show up, but that may not happen because
@@ -2579,9 +2570,23 @@ static int netvsc_probe(struct hv_device *dev,* -> ... -> device_add() -> ... -> __device_attach() can't get * the device lock, so all the subchannels can't be processed -- * finally netvsc_subchan_work() hangs forever. +* +* The rtnl lock also needs to be held before rndis_filter_device_add() +* which advertises nvsp_2_vsc_capability / sriov bit, and triggers +* VF NIC offering and registering. If VF NIC finished register_netdev() +* earlier it may cause name based config failure. */ rtnl_lock (); + nvdev =rndis_filter_device_add (dev, device_info); +if (IS_ERR (nvdev)) { + ret =PTR_ERR (nvdev); +netdev_err (net,"unable to add netvsc device (ret %d)\n" , ret); + goto rndis_failed; + } + +memcpy (net->dev_addr, device_info->mac_adr,ETH_ALEN ); +if (nvdev->num_chn >1 )schedule_work (&nvdev->subchan_work);
@@ -2615,9 +2620,9 @@ static int netvsc_probe(struct hv_device *dev,return 0 ; register_failed: -rtnl_unlock ();rndis_filter_device_remove (dev, nvdev); rndis_failed: +rtnl_unlock ();netvsc_devinfo_put (device_info); devinfo_failed:free_percpu (net_device_ctx->vf_stats);
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 29/67 USB: core: Change configuration warnings to notices
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
[ Upstream commit 7a09c1269702db8eccb6f718da2b00173e1e0034 ]
It has been pointed out that the kernel log messages warning about problems in USB configuration and related descriptors are vexing for users. The warning log level has a fairly high priority, but the user can do nothing to fix the underlying errors in the device's firmware.
To reduce the amount of useless information produced by tools that filter high-priority log messages, we can change these warnings to notices, i.e., change dev_warn() to dev_notice(). The same holds for a few messages that currently use dev_err(): Unless they indicate a failure that might make a device unusable (such as inability to transfer a config descriptor), change them to dev_notice() also.
Stable-dep-of: 974bba5c118f ("usb: config: fix iteration issue in 'usb_get_bos_descriptor()'")
--- drivers/usb/core/config.c | 82 +++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 41 deletions(-)
drivers/usb/core/config.c +41 -41
@@ -61,7 +61,7 @@ static void usb_parse_ssp_isoc_endpoint_companion(struct device *ddev, desc = (struct usb_ssp_isoc_ep_comp_descriptor *) buffer;if (desc->bDescriptorType !=USB_DT_SSP_ISOC_ENDPOINT_COMP || size <USB_DT_SSP_ISOC_EP_COMP_SIZE ) { -dev_warn (ddev,"Invalid SuperSpeedPlus isoc endpoint companion" +dev_notice (ddev,"Invalid SuperSpeedPlus isoc endpoint companion" "for config %d interface %d altsetting %d ep %d.\n" , cfgno, inum, asnum, ep->desc.bEndpointAddress);return ;
@@ -83,7 +83,7 @@ static void usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno,if (desc->bDescriptorType !=USB_DT_SS_ENDPOINT_COMP || size <USB_DT_SS_EP_COMP_SIZE ) { -dev_warn (ddev,"No SuperSpeed endpoint companion for config %d " +dev_notice (ddev,"No SuperSpeed endpoint companion for config %d " " interface %d altsetting %d ep %d: " "using minimum values\n" , cfgno, inum, asnum, ep->desc.bEndpointAddress);
@@ -109,13 +109,13 @@ static void usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno,/* Check the various values */ if (usb_endpoint_xfer_control (&ep->desc) && desc->bMaxBurst !=0 ) { -dev_warn (ddev,"Control endpoint with bMaxBurst = %d in " +dev_notice (ddev,"Control endpoint with bMaxBurst = %d in " "config %d interface %d altsetting %d ep %d: " "setting to zero\n" , desc->bMaxBurst, cfgno, inum, asnum, ep->desc.bEndpointAddress); ep->ss_ep_comp.bMaxBurst =0 ; }else if (desc->bMaxBurst >15 ) { -dev_warn (ddev,"Endpoint with bMaxBurst = %d in " +dev_notice (ddev,"Endpoint with bMaxBurst = %d in " "config %d interface %d altsetting %d ep %d: " "setting to 15\n" , desc->bMaxBurst, cfgno, inum, asnum, ep->desc.bEndpointAddress);
@@ -125,7 +125,7 @@ static void usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno,if ((usb_endpoint_xfer_control (&ep->desc) ||usb_endpoint_xfer_int (&ep->desc)) && desc->bmAttributes !=0 ) { - dev_warn(ddev, "%s endpoint with bmAttributes = %d in " + dev_notice(ddev, "%s endpoint with bmAttributes = %d in " "config %d interface %d altsetting %d ep %d: " "setting to zero\n", usb_endpoint_xfer_control(&ep->desc) ? "Control" : "Bulk",
@@ -134,7 +134,7 @@ static void usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno, ep->ss_ep_comp.bmAttributes =0 ; }else if (usb_endpoint_xfer_bulk (&ep->desc) && desc->bmAttributes >16 ) { -dev_warn (ddev,"Bulk endpoint with more than 65536 streams in " +dev_notice (ddev,"Bulk endpoint with more than 65536 streams in " "config %d interface %d altsetting %d ep %d: " "setting to max\n" , cfgno, inum, asnum, ep->desc.bEndpointAddress);
@@ -142,7 +142,7 @@ static void usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno, }else if (usb_endpoint_xfer_isoc (&ep->desc) && !USB_SS_SSP_ISOC_COMP (desc->bmAttributes) &&USB_SS_MULT (desc->bmAttributes) >3 ) { - dev_warn(ddev, "Isoc endpoint has Mult of %d in " + dev_notice(ddev, "Isoc endpoint has Mult of %d in " "config %d interface %d altsetting %d ep %d: " "setting to 3\n", USB_SS_MULT(desc->bmAttributes),
@@ -160,7 +160,7 @@ static void usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno,else max_tx =999999 ;if (le16_to_cpu (desc->wBytesPerInterval) > max_tx) { - dev_warn(ddev, "%s endpoint with wBytesPerInterval of %d in " + dev_notice(ddev, "%s endpoint with wBytesPerInterval of %d in " "config %d interface %d altsetting %d ep %d: " "setting to %d\n", usb_endpoint_xfer_isoc(&ep->desc) ? "Isoc" : "Int",
@@ -273,7 +273,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno,else if (d->bLength >=USB_DT_ENDPOINT_SIZE ) n =USB_DT_ENDPOINT_SIZE ;else { -dev_warn (ddev,"config %d interface %d altsetting %d has an " +dev_notice (ddev,"config %d interface %d altsetting %d has an " "invalid endpoint descriptor of length %d, skipping\n" , cfgno, inum, asnum, d->bLength); goto skip_to_next_endpoint_or_interface_descriptor;
@@ -281,7 +281,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, i = d->bEndpointAddress & ~USB_ENDPOINT_DIR_MASK ;if (i >=16 || i ==0 ) { -dev_warn (ddev,"config %d interface %d altsetting %d has an " +dev_notice (ddev,"config %d interface %d altsetting %d has an " "invalid endpoint with address 0x%X, skipping\n" , cfgno, inum, asnum, d->bEndpointAddress); goto skip_to_next_endpoint_or_interface_descriptor;
@@ -293,7 +293,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno,/* Check for duplicate endpoint addresses */ if (config_endpoint_is_duplicate (config, inum, asnum, d)) { -dev_warn (ddev,"config %d interface %d altsetting %d has a duplicate endpoint with address 0x%X, skipping\n" , +dev_notice (ddev,"config %d interface %d altsetting %d has a duplicate endpoint with address 0x%X, skipping\n" , cfgno, inum, asnum, d->bEndpointAddress); goto skip_to_next_endpoint_or_interface_descriptor; }
@@ -301,7 +301,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno,/* Ignore some endpoints */ if (udev->quirks &USB_QUIRK_ENDPOINT_IGNORE ) {if (usb_endpoint_is_ignored (udev, ifp, d)) { -dev_warn (ddev,"config %d interface %d altsetting %d has an ignored endpoint with address 0x%X, skipping\n" , +dev_notice (ddev,"config %d interface %d altsetting %d has an ignored endpoint with address 0x%X, skipping\n" , cfgno, inum, asnum, d->bEndpointAddress); goto skip_to_next_endpoint_or_interface_descriptor;
@@ -378,7 +378,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, } }if (d->bInterval < i || d->bInterval > j) { - dev_warn(ddev, "config %d interface %d altsetting %d " + dev_notice(ddev, "config %d interface %d altsetting %d " "endpoint 0x%X has an invalid bInterval %d, " "changing to %d\n", cfgno, inum, asnum,
@@ -391,7 +391,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno,* them usable, we will try treating them as Interrupt endpoints. */ if (udev->speed ==USB_SPEED_LOW &&usb_endpoint_xfer_bulk (d)) { -dev_warn (ddev,"config %d interface %d altsetting %d " +dev_notice (ddev,"config %d interface %d altsetting %d " "endpoint 0x%X is Bulk; changing to Interrupt\n" , cfgno, inum, asnum, d->bEndpointAddress); endpoint->desc.bmAttributes =USB_ENDPOINT_XFER_INT ;
@@ -408,7 +408,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno,*/ maxp =le16_to_cpu (endpoint->desc.wMaxPacketSize);if (maxp ==0 && !(usb_endpoint_xfer_isoc (d) && asnum ==0 )) { -dev_warn (ddev,"config %d interface %d altsetting %d endpoint 0x%X has invalid wMaxPacketSize 0\n" , +dev_notice (ddev,"config %d interface %d altsetting %d endpoint 0x%X has invalid wMaxPacketSize 0\n" , cfgno, inum, asnum, d->bEndpointAddress); }
@@ -439,7 +439,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, j = maxpacket_maxes[usb_endpoint_type (&endpoint->desc)];if (maxp > j) { -dev_warn (ddev,"config %d interface %d altsetting %d endpoint 0x%X has invalid maxpacket %d, setting to %d\n" , +dev_notice (ddev,"config %d interface %d altsetting %d endpoint 0x%X has invalid maxpacket %d, setting to %d\n" , cfgno, inum, asnum, d->bEndpointAddress, maxp, j); maxp = j; endpoint->desc.wMaxPacketSize =cpu_to_le16 (i | maxp);
@@ -452,7 +452,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno,*/ if (udev->speed ==USB_SPEED_HIGH &&usb_endpoint_xfer_bulk (d)) {if (maxp !=512 ) -dev_warn (ddev,"config %d interface %d altsetting %d " +dev_notice (ddev,"config %d interface %d altsetting %d " "bulk endpoint 0x%X has invalid maxpacket %d\n" , cfgno, inum, asnum, d->bEndpointAddress, maxp);
@@ -533,7 +533,7 @@ static int usb_parse_interface(struct device *ddev, int cfgno, i < intfc->num_altsetting; (++i, ++alt)) {if (alt->desc.bAlternateSetting == asnum) { -dev_warn (ddev,"Duplicate descriptor for config %d " +dev_notice (ddev,"Duplicate descriptor for config %d " "interface %d altsetting %d, skipping\n" , cfgno, inum, asnum); goto skip_to_next_interface_descriptor;
@@ -559,7 +559,7 @@ static int usb_parse_interface(struct device *ddev, int cfgno, num_ep = num_ep_orig = alt->desc.bNumEndpoints; alt->desc.bNumEndpoints =0 ;/* Use as a counter */ if (num_ep >USB_MAXENDPOINTS ) { -dev_warn (ddev,"too many endpoints for config %d interface %d " +dev_notice (ddev,"too many endpoints for config %d interface %d " "altsetting %d: %d, using maximum allowed: %d\n" , cfgno, inum, asnum, num_ep,USB_MAXENDPOINTS ); num_ep =USB_MAXENDPOINTS ;
@@ -590,7 +590,7 @@ static int usb_parse_interface(struct device *ddev, int cfgno, }if (n != num_ep_orig) -dev_warn (ddev,"config %d interface %d altsetting %d has %d " +dev_notice (ddev,"config %d interface %d altsetting %d has %d " "endpoint descriptor%s, different from the interface " "descriptor's value: %d\n" , cfgno, inum, asnum, n,plural (n), num_ep_orig);
@@ -625,7 +625,7 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx,if (config->desc.bDescriptorType !=USB_DT_CONFIG || config->desc.bLength <USB_DT_CONFIG_SIZE || config->desc.bLength > size) { -dev_err (ddev,"invalid descriptor for config index %d: " +dev_notice (ddev,"invalid descriptor for config index %d: " "type = 0x%X, length = %d\n" , cfgidx, config->desc.bDescriptorType, config->desc.bLength);return -EINVAL ;
@@ -636,7 +636,7 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx, size -= config->desc.bLength;if (nintf >USB_MAXINTERFACES ) { -dev_warn (ddev,"config %d has too many interfaces: %d, " +dev_notice (ddev,"config %d has too many interfaces: %d, " "using maximum allowed: %d\n" , cfgno, nintf,USB_MAXINTERFACES ); nintf =USB_MAXINTERFACES ;
@@ -650,7 +650,7 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx, (buffer2 += header->bLength, size2 -= header->bLength)) {if (size2 <sizeof (struct usb_descriptor_header )) { -dev_warn (ddev,"config %d descriptor has %d excess " +dev_notice (ddev,"config %d descriptor has %d excess " "byte%s, ignoring\n" , cfgno, size2,plural (size2));break ;
@@ -658,7 +658,7 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx, header = (struct usb_descriptor_header *) buffer2;if ((header->bLength > size2) || (header->bLength <2 )) { -dev_warn (ddev,"config %d has an invalid descriptor " +dev_notice (ddev,"config %d has an invalid descriptor " "of length %d, skipping remainder of the config\n" , cfgno, header->bLength);break ;
@@ -670,7 +670,7 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx, d = (struct usb_interface_descriptor *) header;if (d->bLength <USB_DT_INTERFACE_SIZE ) { -dev_warn (ddev,"config %d has an invalid " +dev_notice (ddev,"config %d has an invalid " "interface descriptor of length %d, " "skipping\n" , cfgno, d->bLength);continue ;
@@ -680,7 +680,7 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx,if ((dev->quirks &USB_QUIRK_HONOR_BNUMINTERFACES ) && n >= nintf_orig) { -dev_warn (ddev,"config %d has more interface " +dev_notice (ddev,"config %d has more interface " "descriptors, than it declares in " "bNumInterfaces, ignoring interface " "number: %d\n" , cfgno, inum);
@@ -688,7 +688,7 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx, }if (inum >= nintf_orig) -dev_warn (ddev,"config %d has an invalid " +dev_notice (ddev,"config %d has an invalid " "interface number: %d but max is %d\n" , cfgno, inum, nintf_orig -1 );
@@ -713,14 +713,14 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx, d = (struct usb_interface_assoc_descriptor *)header;if (d->bLength <USB_DT_INTERFACE_ASSOCIATION_SIZE ) { -dev_warn (ddev, +dev_notice (ddev,"config %d has an invalid interface association descriptor of length %d, skipping\n" , cfgno, d->bLength);continue ; }if (iad_num ==USB_MAXIADS ) { -dev_warn (ddev,"found more Interface " +dev_notice (ddev,"found more Interface " "Association Descriptors " "than allocated for in " "configuration %d\n" , cfgno);
@@ -731,7 +731,7 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx, }else if (header->bDescriptorType ==USB_DT_DEVICE || header->bDescriptorType ==USB_DT_CONFIG ) -dev_warn (ddev,"config %d contains an unexpected " +dev_notice (ddev,"config %d contains an unexpected " "descriptor of type 0x%X, skipping\n" , cfgno, header->bDescriptorType);
@@ -740,11 +740,11 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx, config->desc.wTotalLength =cpu_to_le16 (buffer2 - buffer0);if (n != nintf) -dev_warn (ddev,"config %d has %d interface%s, different from " +dev_notice (ddev,"config %d has %d interface%s, different from " "the descriptor's value: %d\n" , cfgno, n,plural (n), nintf_orig);else if (n ==0 ) -dev_warn (ddev,"config %d has no interfaces?\n" , cfgno); +dev_notice (ddev,"config %d has no interfaces?\n" , cfgno); config->desc.bNumInterfaces = nintf = n;/* Check for missing interface numbers */
@@ -754,7 +754,7 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx,break ; }if (j >= nintf) -dev_warn (ddev,"config %d has no interface number " +dev_notice (ddev,"config %d has no interface number " "%d\n" , cfgno, i); }
@@ -762,7 +762,7 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx,for (i =0 ; i < nintf; ++i) { j = nalts[i];if (j >USB_MAXALTSETTING ) { -dev_warn (ddev,"too many alternate settings for " +dev_notice (ddev,"too many alternate settings for " "config %d interface %d: %d, " "using maximum allowed: %d\n" , cfgno, inums[i], j,USB_MAXALTSETTING );
@@ -811,7 +811,7 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx,break ; }if (n >= intfc->num_altsetting) -dev_warn (ddev,"config %d interface %d has no " +dev_notice (ddev,"config %d interface %d has no " "altsetting %d\n" , cfgno, inums[i], j); } }
@@ -868,7 +868,7 @@ int usb_get_configuration(struct usb_device *dev)int result;if (ncfg >USB_MAXCONFIG ) { -dev_warn (ddev,"too many configurations: %d, " +dev_notice (ddev,"too many configurations: %d, " "using maximum allowed: %d\n" , ncfg,USB_MAXCONFIG ); dev->descriptor.bNumConfigurations = ncfg =USB_MAXCONFIG ; }
@@ -902,7 +902,7 @@ int usb_get_configuration(struct usb_device *dev) "descriptor/%s: %d\n", cfgno, "start", result);if (result != -EPIPE ) goto err; -dev_err (ddev,"chopping to %d config(s)\n" , cfgno); +dev_notice (ddev,"chopping to %d config(s)\n" , cfgno); dev->descriptor.bNumConfigurations = cfgno;break ; }else if (result <4 ) {
@@ -934,7 +934,7 @@ int usb_get_configuration(struct usb_device *dev) goto err; }if (result < length) { -dev_warn (ddev,"config index %d descriptor too short " +dev_notice (ddev,"config index %d descriptor too short " "(expected %i, got %i)\n" , cfgno, length, result); length = result; }
@@ -993,7 +993,7 @@ int usb_get_bos_descriptor(struct usb_device *dev)/* Get BOS descriptor */ ret =usb_get_descriptor (dev,USB_DT_BOS ,0 , bos,USB_DT_BOS_SIZE );if (ret <USB_DT_BOS_SIZE || bos->bLength <USB_DT_BOS_SIZE ) { -dev_err (ddev,"unable to get BOS descriptor or descriptor too short\n" ); +dev_notice (ddev,"unable to get BOS descriptor or descriptor too short\n" );if (ret >=0 ) ret = -ENOMSG ;kfree (bos);
@@ -1021,7 +1021,7 @@ int usb_get_bos_descriptor(struct usb_device *dev) ret =usb_get_descriptor (dev,USB_DT_BOS ,0 , buffer, total_len);if (ret < total_len) { -dev_err (ddev,"unable to get BOS descriptor set\n" ); +dev_notice (ddev,"unable to get BOS descriptor set\n" );if (ret >=0 ) ret = -ENOMSG ; goto err;
@@ -1046,7 +1046,7 @@ int usb_get_bos_descriptor(struct usb_device *dev) }if (cap->bDescriptorType !=USB_DT_DEVICE_CAPABILITY ) { -dev_warn (ddev,"descriptor type invalid, skip\n" ); +dev_notice (ddev,"descriptor type invalid, skip\n" );continue ; }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 30/67 usb: config: fix iteration issue in usb_get_bos_descriptor()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Neronin <[email protected]>
[ Upstream commit 974bba5c118f4c2baf00de0356e3e4f7928b4cbc ]
The BOS descriptor defines a root descriptor and is the base descriptor for accessing a family of related descriptors.
Function 'usb_get_bos_descriptor()' encounters an iteration issue when skipping the 'USB_DT_DEVICE_CAPABILITY' descriptor type. This results in the same descriptor being read repeatedly.
To address this issue, a 'goto' statement is introduced to ensure that the pointer and the amount read is updated correctly. This ensures that the function iterates to the next descriptor instead of reading the same descriptor repeatedly.
--- drivers/usb/core/config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/core/config.c +2 -1
@@ -1047,7 +1047,7 @@ int usb_get_bos_descriptor(struct usb_device *dev)if (cap->bDescriptorType !=USB_DT_DEVICE_CAPABILITY ) {dev_notice (ddev,"descriptor type invalid, skip\n" ); -continue ; + goto skip_to_next_descriptor; }switch (cap_type) {
@@ -1081,6 +1081,7 @@ int usb_get_bos_descriptor(struct usb_device *dev)break ; } +skip_to_next_descriptor: total_len -= length; buffer += length; }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 31/67 ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhengchao Shao <[email protected]>
[ Upstream commit e2b706c691905fe78468c361aaabc719d0a496f1 ]
When I perform the following test operations:
1.ip link add br0 type bridge
2.brctl addif br0 eth0
3.ip addr add 239.0.0.1/32 dev eth0
4.ip addr add 239.0.0.1/32 dev br0
5.ip addr add 224.0.0.1/32 dev br0
6.while ((1))
do
ifconfig br0 up
ifconfig br0 down
done
7.send IGMPv2 query packets to port eth0 continuously. For example, ./mausezahn ethX -c 0 "01 00 5e 00 00 01 00 72 19 88 aa 02 08 00 45 00 00 1c 00 01 00 00 01 02 0e 7f c0 a8 0a b7 e0 00 00 01 11 64 ee 9b 00 00 00 00"
The preceding tests may trigger the refcnt uaf issue of the mc list. The stack is as follows:
refcount_t: addition on 0; use-after-free. WARNING: CPU: 21 PID: 144 at lib/refcount.c:25 refcount_warn_saturate (lib/refcount.c:25) CPU: 21 PID: 144 Comm: ksoftirqd/21 Kdump: loaded Not tainted 6.7.0-rc1-next-20231117-dirty #80 Hardware name: Red Hat KVM, BIOS 0.5.1 01/01/2011 RIP: 0010:refcount_warn_saturate (lib/refcount.c:25) RSP: 0018:ffffb68f00657910 EFLAGS: 00010286 RAX: 0000000000000000 RBX: ffff8a00c3bf96c0 RCX: ffff8a07b6160908 RDX: 00000000ffffffd8 RSI: 0000000000000027 RDI: ffff8a07b6160900 RBP: ffff8a00cba36862 R08: 0000000000000000 R09: 00000000ffff7fff R10: ffffb68f006577c0 R11: ffffffffb0fdcdc8 R12: ffff8a00c3bf9680 R13: ffff8a00c3bf96f0 R14: 0000000000000000 R15: ffff8a00d8766e00 FS: 0000000000000000(0000) GS:ffff8a07b6140000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000055f10b520b28 CR3: 000000039741a000 CR4: 00000000000006f0 Call Trace: <TASK> igmp_heard_query (net/ipv4/igmp.c:1068) igmp_rcv (net/ipv4/igmp.c:1132) ip_protocol_deliver_rcu (net/ipv4/ip_input.c:205) ip_local_deliver_finish (net/ipv4/ip_input.c:234) __netif_receive_skb_one_core (net/core/dev.c:5529) netif_receive_skb_internal (net/core/dev.c:5729) netif_receive_skb (net/core/dev.c:5788) br_handle_frame_finish (net/bridge/br_input.c:216) nf_hook_bridge_pre (net/bridge/br_input.c:294) __netif_receive_skb_core (net/core/dev.c:5423) __netif_receive_skb_list_core (net/core/dev.c:5606) __netif_receive_skb_list (net/core/dev.c:5674) netif_receive_skb_list_internal (net/core/dev.c:5764) napi_gro_receive (net/core/gro.c:609) e1000_clean_rx_irq (drivers/net/ethernet/intel/e1000/e1000_main.c:4467) e1000_clean (drivers/net/ethernet/intel/e1000/e1000_main.c:3805) __napi_poll (net/core/dev.c:6533) net_rx_action (net/core/dev.c:6735) __do_softirq (kernel/softirq.c:554) run_ksoftirqd (kernel/softirq.c:913) smpboot_thread_fn (kernel/smpboot.c:164) kthread (kernel/kthread.c:388) ret_from_fork (arch/x86/kernel/process.c:153) ret_from_fork_asm (arch/x86/entry/entry_64.S:250) </TASK>
The root causes are as follows:
Thread A Thread B
... netif_receive_skbbr_dev_stop ...
br_multicast_leave_snoopers ...
__ip_mc_dec_group ...
__igmp_group_dropped igmp_rcv
igmp_stop_timer igmp_heard_query //ref = 1
ip_ma_put igmp_mod_timer
refcount_dec_and_test igmp_start_timer //ref = 0
... refcount_inc //ref increases from 0
When the device receives an IGMPv2 Query message, it starts the timer immediately, regardless of whether the device is running. If the device is down and has left the multicast group, it will cause the mc list refcount uaf issue.
--- net/ipv4/igmp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/ipv4/igmp.c +4 -2
@@ -216,8 +216,10 @@ static void igmp_start_timer(struct ip_mc_list *im, int max_delay)int tv =prandom_u32 () % max_delay; im->tm_running =1 ; -if (!mod_timer (&im->timer, jiffies+tv+2 )) -refcount_inc (&im->refcnt); +if (refcount_inc_not_zero (&im->refcnt)) { +if (mod_timer (&im->timer, jiffies + tv +2 )) +ip_ma_put (im); + } }static void igmp_gq_start_timer (struct in_device *in_dev)
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 32/67 dpaa2-eth: increase the needed headroom to account for alignment
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ioana Ciornei <[email protected]>
[ Upstream commit f422abe3f23d483cf01f386819f26fb3fe0dbb2b ]
Increase the needed headroom to account for a 64 byte alignment restriction which, with this patch, we make mandatory on the Tx path. The case in which the amount of headroom needed is not available is already handled by the driver which instead sends a S/G frame with the first buffer only holding the SW and HW annotation areas.
Without this patch, we can empirically see data corruption happening between Tx and Tx confirmation which sometimes leads to the SW annotation area being overwritten.
Since this is an old IP where the hardware team cannot help to understand the underlying behavior, we make the Tx alignment mandatory for all frames to avoid the crash on Tx conf. Also, remove the comment that suggested that this is just an optimization.
This patch also sets the needed_headroom net device field to the usual value that the driver would need on the Tx path:
- 64 bytes for the software annotation area
- 64 bytes to account for a 64 byte aligned buffer address
--- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 8 ++++---- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +4 -4
@@ -952,14 +952,12 @@ static int dpaa2_eth_build_single_fd(struct dpaa2_eth_priv *priv,dma_addr_t addr; buffer_start = skb->data -dpaa2_eth_needed_headroom (skb); - -/* If there's enough room to align the FD address, do it. -* It will help hardware optimize accesses. -*/ aligned_start =PTR_ALIGN (buffer_start -DPAA2_ETH_TX_BUF_ALIGN ,DPAA2_ETH_TX_BUF_ALIGN );if (aligned_start >= skb->head) buffer_start = aligned_start; +else +return -ENOMEM ;/* Store a backpointer to the skb at the beginning of the buffer * (in the private data area) such that we can release it
@@ -4446,6 +4444,8 @@ static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev)if (err) goto err_dl_port_add; + net_dev->needed_headroom =DPAA2_ETH_SWA_SIZE +DPAA2_ETH_TX_BUF_ALIGN ; + err =register_netdev (net_dev);if (err <0 ) {dev_err (dev,"register_netdev() failed\n" );
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h +1 -1
@@ -670,7 +670,7 @@ static inline bool dpaa2_eth_rx_pause_enabled(u64 link_options)static inline unsigned int dpaa2_eth_needed_headroom (struct sk_buff *skb) { -unsigned int headroom =DPAA2_ETH_SWA_SIZE ; +unsigned int headroom =DPAA2_ETH_SWA_SIZE +DPAA2_ETH_TX_BUF_ALIGN ;/* If we don't have an skb (e.g. XDP buffer), we only need space for * the software annotation area
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 33/67 uapi: propagate __struct_group() attributes to the container union
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Antipov <[email protected]>
[ Upstream commit 4e86f32a13af1970d21be94f659cae56bbe487ee ]
Recently the kernel test robot has reported an ARM-specific BUILD_BUG_ON() in an old and unmaintained wil6210 wireless driver. The problem comes from the structure packing rules of old ARM ABI ('-mabi=apcs-gnu'). For example, the following structure is packed to 18 bytes instead of 16:
struct poorly_packed {
unsigned int a;
unsigned int b;
unsigned short c;
union {
struct {
unsigned short d;
unsigned int e;
} __attribute__((packed));
struct {
unsigned short d;
unsigned int e;
} __attribute__((packed)) inner;
};
} __attribute__((packed));To fit it into 16 bytes, it's required to add packed attribute to the container union as well:
struct poorly_packed {
unsigned int a;
unsigned int b;
unsigned short c;
union {
struct {
unsigned short d;
unsigned int e;
} __attribute__((packed));
struct {
unsigned short d;
unsigned int e;
} __attribute__((packed)) inner;
} __attribute__((packed));
} __attribute__((packed));Thanks to Andrew Pinski of GCC team for sorting the things out at
https://gcc.gnu.org/pipermail/gcc/2023-November/242888.html.
--- include/uapi/linux/stddef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/stddef.h +1 -1
@@ -27,7 +27,7 @@ union { \ struct { MEMBERS } ATTRS; \ struct TAG { MEMBERS } ATTRS NAME; \ - } + } ATTRS /** * __DECLARE_FLEX_ARRAY() - Declare a flexible array usable in a union
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 34/67 selftests/net: ipsec: fix constant out of range
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Willem de Bruijn <[email protected]>
[ Upstream commit 088559815477c6f623a5db5993491ddd7facbec7 ]
Fix a small compiler warning.
nr_process must be a signed long: it is assigned a signed long by strtol() and is compared against LONG_MIN and LONG_MAX.
ipsec.c:2280:65:
error: result of comparison of constant -9223372036854775808 with expression of type 'unsigned int' is always false [-Werror,-Wtautological-constant-out-of-range-compare]
if ((errno == ERANGE && (nr_process == LONG_MAX || nr_process == LONG_MIN))
--- tools/testing/selftests/net/ipsec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/net/ipsec.c +2 -2
@@ -2278,7 +2278,7 @@ static int check_results(void)int main (int argc,char **argv) { -unsigned int nr_process =1 ; +long nr_process =1 ;int route_sock =-1 , ret =KSFT_SKIP ;int test_desc_fd[2 ];uint32_t route_seq;
@@ -2299,7 +2299,7 @@ int main(int argc, char **argv)exit_usage (argv); } -if (nr_process >MAX_PROCESSES || !nr_process) { +if (nr_process >MAX_PROCESSES || nr_process <1 ) {printk ("nr_process should be between [1; %u]" ,MAX_PROCESSES );exit_usage (argv);
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 35/67 octeontx2-af: Fix possible buffer overflow
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Elena Salomatkina <[email protected]>
[ Upstream commit ad31c629ca3c87f6d557488c1f9faaebfbcd203c ]
A loop in rvu_mbox_handler_nix_bandprof_free() contains
a break if (idx == MAX_BANDPROF_PER_PFFUNC),
but if idx may reach MAX_BANDPROF_PER_PFFUNC
buffer '(*req->prof_idx)[layer]' overflow happens before that check.
The patch moves the break to the
beginning of the loop.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +2 -2
@@ -5045,6 +5045,8 @@ int rvu_mbox_handler_nix_bandprof_free(struct rvu *rvu, ipolicer = &nix_hw->ipolicer[layer];for (idx =0 ; idx < req->prof_count[layer]; idx++) { +if (idx ==MAX_BANDPROF_PER_PFFUNC ) +break ; prof_idx = req->prof_idx[layer][idx];if (prof_idx >= ipolicer->band_prof.max || ipolicer->pfvf_map[prof_idx] != pcifunc)
@@ -5058,8 +5060,6 @@ int rvu_mbox_handler_nix_bandprof_free(struct rvu *rvu, ipolicer->pfvf_map[prof_idx] =0x00 ; ipolicer->match_id[prof_idx] =0 ;rvu_free_rsrc (&ipolicer->band_prof, prof_idx); -if (idx ==MAX_BANDPROF_PER_PFFUNC ) -break ; } }mutex_unlock (&rvu->rsrc_lock);
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 36/67 net: stmmac: xgmac: Disable FPE MMC interrupts
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Furong Xu <[email protected]>
[ Upstream commit e54d628a2721bfbb002c19f6e8ca6746cec7640f ]
Commit aeb18dd07692 ("net: stmmac: xgmac: Disable MMC interrupts by default") tries to disable MMC interrupts to avoid a storm of unhandled interrupts, but leaves the FPE(Frame Preemption) MMC interrupts enabled, FPE MMC interrupts can cause the same problem. Now we mask FPE TX and RX interrupts to disable all MMC interrupts.
--- drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/stmicro/stmmac/mmc_core.c +4 -0
@@ -177,8 +177,10 @@#define MMC_XGMAC_RX_DISCARD_OCT_GB 0x1b4#define MMC_XGMAC_RX_ALIGN_ERR_PKT 0x1bc +#define MMC_XGMAC_TX_FPE_INTR_MASK 0x204#define MMC_XGMAC_TX_FPE_FRAG 0x208#define MMC_XGMAC_TX_HOLD_REQ 0x20c +#define MMC_XGMAC_RX_FPE_INTR_MASK 0x224#define MMC_XGMAC_RX_PKT_ASSEMBLY_ERR 0x228#define MMC_XGMAC_RX_PKT_SMD_ERR 0x22c#define MMC_XGMAC_RX_PKT_ASSEMBLY_OK 0x230
@@ -352,6 +354,8 @@ static void dwxgmac_mmc_intr_all_mask(void __iomem *mmcaddr) {writel (0x0 , mmcaddr +MMC_RX_INTR_MASK );writel (0x0 , mmcaddr +MMC_TX_INTR_MASK ); +writel (MMC_DEFAULT_MASK , mmcaddr +MMC_XGMAC_TX_FPE_INTR_MASK ); +writel (MMC_DEFAULT_MASK , mmcaddr +MMC_XGMAC_RX_FPE_INTR_MASK );writel (MMC_DEFAULT_MASK , mmcaddr +MMC_XGMAC_RX_IPC_INTR_MASK ); }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 37/67 octeontx2-pf: Fix adding mbox work queue entry when num_vfs > 64
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geetha sowjanya <[email protected]>
[ Upstream commit 51597219e0cd5157401d4d0ccb5daa4d9961676f ]
When more than 64 VFs are enabled for a PF then mbox communication between VF and PF is not working as mbox work queueing for few VFs are skipped due to wrong calculation of VF numbers.
--- drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +5 -2
@@ -557,7 +557,9 @@ static irqreturn_t otx2_pfvf_mbox_intr_handler(int irq, void *pf_irq)otx2_write64 (pf,RVU_PF_VFPF_MBOX_INTX (1 ), intr);otx2_queue_work (mbox, pf->mbox_pfvf_wq,64 , vfs, intr,TYPE_PFVF ); - vfs -=64 ; +if (intr) +trace_otx2_msg_interrupt (mbox->mbox.pdev,"VF(s) to PF" , intr); + vfs =64 ; } intr =otx2_read64 (pf,RVU_PF_VFPF_MBOX_INTX (0 ));
@@ -565,7 +567,8 @@ static irqreturn_t otx2_pfvf_mbox_intr_handler(int irq, void *pf_irq)otx2_queue_work (mbox, pf->mbox_pfvf_wq,0 , vfs, intr,TYPE_PFVF ); -trace_otx2_msg_interrupt (mbox->mbox.pdev,"VF(s) to PF" , intr); +if (intr) +trace_otx2_msg_interrupt (mbox->mbox.pdev,"VF(s) to PF" , intr);return IRQ_HANDLED ; }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 38/67 Revert "workqueue: remove unused cancel_work()"
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrey Grodzovsky <[email protected]>
[ Upstream commit 73b4b53276a1d6290cd4f47dbbc885b6e6e59ac6 ]
This reverts commit 6417250d3f894e66a68ba1cd93676143f2376a6f.
amdpgu need this function in order to prematurly stop pending reset works when another reset work already in progress.
Stable-dep-of: 91d3d149978b ("r8169: prevent potential deadlock in rtl8169_close")
--- include/linux/workqueue.h | 1 + kernel/workqueue.c | 9 +++++++++ 2 files changed, 10 insertions(+)
include/linux/workqueue.h +1 -0
@@ -462,6 +462,7 @@ extern int schedule_on_each_cpu(work_func_t func);int execute_in_process_context (work_func_t fn,struct execute_work *);extern bool flush_work (struct work_struct *work); +extern bool cancel_work (struct work_struct *work);extern bool cancel_work_sync (struct work_struct *work);extern bool flush_delayed_work (struct delayed_work *dwork);
kernel/workqueue.c +9 -0
@@ -3277,6 +3277,15 @@ static bool __cancel_work(struct work_struct *work, bool is_dwork)return ret; } +/* +* See cancel_delayed_work() +*/ +bool cancel_work (struct work_struct *work) +{ +return __cancel_work (work, false); +} +EXPORT_SYMBOL (cancel_work); +/** * cancel_delayed_work - cancel a delayed work * @dwork: delayed_work to cancel
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 39/67 r8169: prevent potential deadlock in rtl8169_close
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiner Kallweit <[email protected]>
[ Upstream commit 91d3d149978ba7b238198dd80e4b823756aa7cfa ]
ndo_stop() is RTNL-protected by net core, and the worker function takes RTNL as well. Therefore we will deadlock when trying to execute a pending work synchronously. To fix this execute any pending work asynchronously. This will do no harm because netif_running() is false in ndo_stop(), and therefore the work function is effectively a no-op. However we have to ensure that no task is running or pending after rtl_remove_one(), therefore add a call to cancel_work_sync().
--- drivers/net/ethernet/realtek/r8169_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/realtek/r8169_main.c +3 -1
@@ -4744,7 +4744,7 @@ static int rtl8169_close(struct net_device *dev)rtl8169_down (tp);rtl8169_rx_clear (tp); -cancel_work_sync (&tp->wk.work); +cancel_work (&tp->wk.work);free_irq (pci_irq_vector (pdev,0 ), tp);
@@ -5000,6 +5000,8 @@ static void rtl_remove_one(struct pci_dev *pdev)if (pci_dev_run_wake (pdev))pm_runtime_get_noresume (&pdev->dev); +cancel_work_sync (&tp->wk.work); +unregister_netdev (tp->dev);if (tp->dash_type !=RTL_DASH_NONE )
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 40/67 ravb: Fix races between ravb_tx_timeout_work() and net related ops
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yoshihiro Shimoda <[email protected]>
[ Upstream commit 9870257a0a338cd8d6c1cddab74e703f490f6779 ]
Fix races between ravb_tx_timeout_work() and functions of net_device_ops and ethtool_ops by using rtnl_trylock() and rtnl_unlock(). Note that since ravb_close() is under the rtnl lock and calls cancel_work_sync(), ravb_tx_timeout_work() should calls rtnl_trylock(). Otherwise, a deadlock may happen in ravb_tx_timeout_work() like below:
CPU0 CPU1
ravb_tx_timeout()
schedule_work()
...__dev_close_many()
// Under rtnl lockravb_close()cancel_work_sync()
// Waiting
ravb_tx_timeout_work() rtnl_lock() // This is possible to cause a deadlock
If rtnl_trylock() fails, rescheduling the work with sleep for 1 msec.
--- drivers/net/ethernet/renesas/ravb_main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/net/ethernet/renesas/ravb_main.c +10 -1
@@ -1504,6 +1504,12 @@ static void ravb_tx_timeout_work(struct work_struct *work)struct net_device *ndev = priv->ndev;int error; +if (!rtnl_trylock ()) { +usleep_range (1000 ,2000 ); +schedule_work (&priv->work); +return ; + } +netif_tx_stop_all_queues (ndev);/* Stop PTP Clock driver */
@@ -1536,7 +1542,7 @@ static void ravb_tx_timeout_work(struct work_struct *work)*/ netdev_err (ndev,"%s: ravb_dmac_init() failed, error %d\n" , __func__, error); -return ; + goto out_unlock; }ravb_emac_init (ndev);
@@ -1546,6 +1552,9 @@ static void ravb_tx_timeout_work(struct work_struct *work)ravb_ptp_init (ndev, priv->pdev);netif_tx_start_all_queues (ndev); + +out_unlock: +rtnl_unlock (); }/* Packet transmit function for Ethernet AVB */
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 41/67 net: ravb: Check return value of reset_control_deassert()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit d8eb6ea4b302e7ff78535c205510e359ac10a0bd ]
reset_control_deassert() could return an error. Some devices cannot work if reset signal de-assert operation fails. To avoid this check the return code of reset_control_deassert() in ravb_probe() and take proper action.
Along with it, the free_netdev() call from the error path was moved after reset_control_assert() on its own label (out_free_netdev) to free netdev in case reset_control_deassert() fails.
--- drivers/net/ethernet/renesas/ravb_main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/ethernet/renesas/ravb_main.c +6 -3
@@ -2188,7 +2188,10 @@ static int ravb_probe(struct platform_device *pdev) ndev->features = info->net_features; ndev->hw_features = info->net_hw_features; -reset_control_deassert (rstc); + error =reset_control_deassert (rstc); +if (error) + goto out_free_netdev; +pm_runtime_enable (&pdev->dev);pm_runtime_get_sync (&pdev->dev);
@@ -2373,11 +2376,11 @@ static int ravb_probe(struct platform_device *pdev) out_disable_refclk:clk_disable_unprepare (priv->refclk); out_release: -free_netdev (ndev); -pm_runtime_put (&pdev->dev);pm_runtime_disable (&pdev->dev);reset_control_assert (rstc); +out_free_netdev: +free_netdev (ndev);return error; }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 42/67 net: ravb: Use pm_runtime_resume_and_get()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit 88b74831faaee455c2af380382d979fc38e79270 ]
pm_runtime_get_sync() may return an error. In case it returns with an error dev->power.usage_count needs to be decremented. pm_runtime_resume_and_get() takes care of this. Thus use it.
--- drivers/net/ethernet/renesas/ravb_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/renesas/ravb_main.c +4 -1
@@ -2193,7 +2193,9 @@ static int ravb_probe(struct platform_device *pdev) goto out_free_netdev;pm_runtime_enable (&pdev->dev); -pm_runtime_get_sync (&pdev->dev); + error =pm_runtime_resume_and_get (&pdev->dev); +if (error <0 ) + goto out_rpm_disable;if (info->multi_irqs) irq =platform_get_irq_byname (pdev,"ch22" );
@@ -2377,6 +2379,7 @@ static int ravb_probe(struct platform_device *pdev)clk_disable_unprepare (priv->refclk); out_release:pm_runtime_put (&pdev->dev); +out_rpm_disable:pm_runtime_disable (&pdev->dev);reset_control_assert (rstc); out_free_netdev:
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 43/67 net: ravb: Start TX queues after HW initialization succeeded
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit 6f32c086602050fc11157adeafaa1c1eb393f0af ]
ravb_phy_start() may fail. If that happens, the TX queues will remain started. Thus, move the netif_tx_start_all_queues() after PHY is successfully initialized.
--- drivers/net/ethernet/renesas/ravb_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/renesas/ravb_main.c +2 -2
@@ -1448,13 +1448,13 @@ static int ravb_open(struct net_device *ndev)if (info->gptp)ravb_ptp_init (ndev, priv->pdev); -netif_tx_start_all_queues (ndev); -/* PHY control start */ error =ravb_phy_start (ndev);if (error) goto out_ptp_stop; +netif_tx_start_all_queues (ndev); +return 0 ; out_ptp_stop:
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 44/67 ravb: Separate handling of irq enable/disable regs into feature
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Phil Edworthy <[email protected]>
[ Upstream commit cb99badde146c327f150773921ffe080abe1eb44 ]
Currently, when the HW has a single interrupt, the driver uses the GIC, TIC, RIC0 registers to enable and disable interrupts. When the HW has multiple interrupts, it uses the GIE, GID, TIE, TID, RIE0, RID0 registers.
However, other devices, e.g. RZ/V2M, have multiple irqs and only have the GIC, TIC, RIC0 registers.
Therefore, split this into a separate feature.
Stable-dep-of: eac16a733427 ("net: ravb: Stop DMA in case of failures on ravb_open()")
--- drivers/net/ethernet/renesas/ravb.h | 1 + drivers/net/ethernet/renesas/ravb_main.c | 5 +++-- drivers/net/ethernet/renesas/ravb_ptp.c | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-)
drivers/net/ethernet/renesas/ravb.h +1 -0
@@ -1000,6 +1000,7 @@ struct ravb_hw_info { unsigned internal_delay:1; /* AVB-DMAC has internal delays */ unsigned tx_counters:1; /* E-MAC has TX counters */ unsigned multi_irqs:1; /* AVB-DMAC and E-MAC has multiple irqs */ + unsigned irq_en_dis:1; /* Has separate irq enable and disable regs */ unsigned gptp:1; /* AVB-DMAC has gPTP support */ unsigned ccc_gac:1; /* AVB-DMAC has gPTP support active in config mode */ };
drivers/net/ethernet/renesas/ravb_main.c +3 -2
@@ -821,7 +821,7 @@ static bool ravb_queue_interrupt(struct net_device *ndev, int q)if (((ris0 & ric0) &BIT (q)) || ((tis & tic) &BIT (q))) {if (napi_schedule_prep (&priv->napi[q])) {/* Mask RX and TX interrupts */ -if (!info->multi_irqs) { +if (!info->irq_en_dis) {ravb_write (ndev, ric0 & ~BIT (q),RIC0 );ravb_write (ndev, tic & ~BIT (q),TIC ); }else {
@@ -988,7 +988,7 @@ static int ravb_poll(struct napi_struct *napi, int budget)/* Re-enable RX/TX interrupts */ spin_lock_irqsave (&priv->lock, flags); -if (!info->multi_irqs) { +if (!info->irq_en_dis) {ravb_modify (ndev,RIC0 , mask, mask);ravb_modify (ndev,TIC , mask, mask); }else {
@@ -2038,6 +2038,7 @@ static const struct ravb_hw_info ravb_gen3_hw_info = { .internal_delay = 1, .tx_counters = 1, .multi_irqs = 1, + .irq_en_dis = 1, .ccc_gac = 1, };
drivers/net/ethernet/renesas/ravb_ptp.c +3 -3
@@ -198,7 +198,7 @@ static int ravb_ptp_extts(struct ptp_clock_info *ptp, priv->ptp.extts[req->index] = on;spin_lock_irqsave (&priv->lock, flags); -if (!info->multi_irqs) +if (!info->irq_en_dis)ravb_modify (ndev,GIC ,GIC_PTCE , on ?GIC_PTCE :0 );else if (on)ravb_write (ndev,GIE_PTCS ,GIE );
@@ -254,7 +254,7 @@ static int ravb_ptp_perout(struct ptp_clock_info *ptp, error =ravb_ptp_update_compare (priv, (u32 )start_ns);if (!error) {/* Unmask interrupt */ -if (!info->multi_irqs) +if (!info->irq_en_dis)ravb_modify (ndev,GIC ,GIC_PTME ,GIC_PTME );else ravb_write (ndev,GIE_PTMS0 ,GIE );
@@ -266,7 +266,7 @@ static int ravb_ptp_perout(struct ptp_clock_info *ptp, perout->period =0 ;/* Mask interrupt */ -if (!info->multi_irqs) +if (!info->irq_en_dis)ravb_modify (ndev,GIC ,GIC_PTME ,0 );else ravb_write (ndev,GID_PTMD0 ,GID );
Signature · 1 line
2.42.0
Re: [PATCH 5.15 44/67] ravb: Separate handling of irq enable/disable regs into feature
Quoted 17 lines · Greg Kroah-Hartman
5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Phil Edworthy <[email protected]>
[ Upstream commit
cb99badde146c327f150773921ffe080abe1eb44]Currently, when the HW has a single interrupt, the driver uses the GIC, TIC, RIC0 registers to enable and disable interrupts. When the HW has multiple interrupts, it uses the GIE, GID, TIE, TID, RIE0, RID0 registers.
However, other devices, e.g. RZ/V2M, have multiple irqs and only have the GIC, TIC, RIC0 registers.
Therefore, split this into a separate feature.
Quoted 6 lines
Signed-off-by Phil Edworthy <[email protected]>Reviewed-by Biju Das <[email protected]>Reviewed-by Sergey Shtylyov <[email protected]>Signed-off-by David S. Miller <[email protected]>Stable-dep-of:
eac16a733427("net: ravb: Stop DMA in case of failures onravb_open()")Signed-off-by Sasha Levin <[email protected]>
[...]
This and the following patch shouldn't be necessary If you have troubles
backporting the actual fix to 5.15, please ask me to look at it instead...
MBR, Sergey
Greg Kroah-Hartman
maintainerRe: [PATCH 5.15 44/67] ravb: Separate handling of irq enable/disable regs into feature
Quoted 25 lines · Sergey Shtylyov
Quoted 17 lines · Greg Kroah-Hartman
5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Phil Edworthy <[email protected]>
[ Upstream commit
cb99badde146c327f150773921ffe080abe1eb44]Currently, when the HW has a single interrupt, the driver uses the GIC, TIC, RIC0 registers to enable and disable interrupts. When the HW has multiple interrupts, it uses the GIE, GID, TIE, TID, RIE0, RID0 registers.
However, other devices, e.g. RZ/V2M, have multiple irqs and only have the GIC, TIC, RIC0 registers.
Therefore, split this into a separate feature.Quoted 6 lines
Signed-off-by Phil Edworthy <[email protected]>Reviewed-by Biju Das <[email protected]>Reviewed-by Sergey Shtylyov <[email protected]>Signed-off-by David S. Miller <[email protected]>Stable-dep-of:
eac16a733427("net: ravb: Stop DMA in case of failures onravb_open()")Signed-off-by Sasha Levin <[email protected]>
Quoted 4 lines
[...]
This and the following patch shouldn't be necessary If you have troubles
backporting the actual fix to 5.15, please ask me to look at it instead...
I've dropped these and did the backport myself, thanks for letting us know.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 45/67 ravb: Support separate Line0 (Desc), Line1 (Err) and Line2 (Mgmt) irqs
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Phil Edworthy <[email protected]>
[ Upstream commit b0265dcba3d6c1689e6ce315bed09192fb587403 ]
R-Car has a combined interrupt line, ch22 = Line0_DiA | Line1_A | Line2_A. RZ/V2M has separate interrupt lines for each of these, so add a feature that allows the driver to get these interrupts and call the common handler.
Stable-dep-of: eac16a733427 ("net: ravb: Stop DMA in case of failures on ravb_open()")
--- drivers/net/ethernet/renesas/ravb.h | 3 ++ drivers/net/ethernet/renesas/ravb_main.c | 56 +++++++++++++++++++++--- 2 files changed, 53 insertions(+), 6 deletions(-)
drivers/net/ethernet/renesas/ravb.h +3 -0
@@ -1001,6 +1001,7 @@ struct ravb_hw_info { unsigned tx_counters:1; /* E-MAC has TX counters */ unsigned multi_irqs:1; /* AVB-DMAC and E-MAC has multiple irqs */ unsigned irq_en_dis:1; /* Has separate irq enable and disable regs */ + unsigned err_mgmt_irqs:1; /* Line1 (Err) and Line2 (Mgmt) irqs are separate */ unsigned gptp:1; /* AVB-DMAC has gPTP support */ unsigned ccc_gac:1; /* AVB-DMAC has gPTP support active in config mode */ };
@@ -1046,6 +1047,8 @@ struct ravb_private {int msg_enable;int speed;int emac_irq; +int erra_irq; +int mgmta_irq;int rx_irqs[NUM_RX_QUEUE ];int tx_irqs[NUM_TX_QUEUE ];
drivers/net/ethernet/renesas/ravb_main.c +50 -6
100 lines not on this page · raw message
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 46/67 net: ravb: Stop DMA in case of failures on ravb_open()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit eac16a733427ba0de2449ffc7bd3da32ddb65cb7 ]
In case ravb_phy_start() returns with error the settings applied in ravb_dmac_init() are not reverted (e.g. config mode). For this call ravb_stop_dma() on failure path of ravb_open().
--- drivers/net/ethernet/renesas/ravb_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/renesas/ravb_main.c +1 -0
@@ -1472,6 +1472,7 @@ static int ravb_open(struct net_device *ndev)/* Stop PTP Clock driver */ if (info->gptp)ravb_ptp_stop (ndev); +ravb_stop_dma (ndev); out_free_irq_mgmta:if (!info->multi_irqs) goto out_free_irq;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 47/67 perf intel-pt: Fix async branch flags
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
[ Upstream commit f2d87895cbc4af80649850dcf5da36de6b2ed3dd ]
Ensure PERF_IP_FLAG_ASYNC is set always for asynchronous branches (i.e. interrupts etc).
--- tools/perf/util/intel-pt.c | 2 ++ 1 file changed, 2 insertions(+)
tools/perf/util/intel-pt.c +2 -0
@@ -1346,9 +1346,11 @@ static void intel_pt_sample_flags(struct intel_pt_queue *ptq) }else if (ptq->state->flags &INTEL_PT_ASYNC ) {if (!ptq->state->to_ip) ptq->flags =PERF_IP_FLAG_BRANCH | +PERF_IP_FLAG_ASYNC |PERF_IP_FLAG_TRACE_END ;else if (ptq->state->from_nr && !ptq->state->to_nr) ptq->flags =PERF_IP_FLAG_BRANCH |PERF_IP_FLAG_CALL | +PERF_IP_FLAG_ASYNC |PERF_IP_FLAG_VMEXIT ;else ptq->flags = PERF_IP_FLAG_BRANCH | PERF_IP_FLAG_CALL |
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 48/67 selftests/resctrl: Add missing SPDX license to Makefile
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shaopeng Tan <[email protected]>
[ Upstream commit 68c4844985d1f8c1b1a71dfcdbfacb5a30babc95 ]
Add the missing SPDX(SPDX-License-Identifier) license header to tools/testing/selftests/resctrl/Makefile.
Stable-dep-of: 3a1e4a91aa45 ("selftests/resctrl: Move _GNU_SOURCE define into Makefile")
--- tools/testing/selftests/resctrl/Makefile | 2 ++ 1 file changed, 2 insertions(+)
tools/testing/selftests/resctrl/Makefile +2 -0
@@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 + CFLAGS = -g -Wall -O2 -D_FORTIFY_SOURCE=2 CFLAGS += $(KHDR_INCLUDES)
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 49/67 selftests/resctrl: Move _GNU_SOURCE define into Makefile
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 3a1e4a91aa454a1c589a9824d54179fdbfccde45 ]
_GNU_SOURCE is defined in resctrl.h. Defining _GNU_SOURCE has a large impact on what gets defined when including headers either before or after it. This can result in compile failures if .c file decides to include a standard header file before resctrl.h.
It is safer to define _GNU_SOURCE in Makefile so it is always defined regardless of in which order includes are done.
--- tools/testing/selftests/resctrl/Makefile | 2 +- tools/testing/selftests/resctrl/resctrl.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
tools/testing/selftests/resctrl/Makefile +1 -1
@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -CFLAGS = -g -Wall -O2 -D_FORTIFY_SOURCE=2 +CFLAGS = -g -Wall -O2 -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE CFLAGS += $(KHDR_INCLUDES) TEST_GEN_PROGS := resctrl_tests
tools/testing/selftests/resctrl/resctrl.h +0 -1
@@ -1,5 +1,4 @@/* SPDX-License-Identifier: GPL-2.0 */ -#define _GNU_SOURCE#ifndef RESCTRL_H #define RESCTRL_H #include <stdio.h>
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 50/67 powerpc/pseries/iommu: enable_ddw incorrectly returns direct mapping for SR-IOV device
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gaurav Batra <[email protected]>
[ Upstream commit 3bf983e4e93ce8e6d69e9d63f52a66ec0856672e ]
When a device is initialized, the driver invokes dma_supported() twice - first for streaming mappings followed by coherent mappings. For an SR-IOV device, default window is deleted and DDW created. With vPMEM enabled, TCE mappings are dynamically created for both vPMEM and SR-IOV device. There are no direct mappings.
First time when dma_supported() is called with 64 bit mask, DDW is created and marked as dynamic window. The second time dma_supported() is called, enable_ddw() finds existing window for the device and incorrectly returns it as "direct mapping".
This only happens when size of DDW is big enough to map max LPAR memory.
This results in streaming TCEs to not get dynamically mapped, since code incorrently assumes these are already pre-mapped. The adapter initially comes up but goes down due to EEH.
--- arch/powerpc/platforms/pseries/iommu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/platforms/pseries/iommu.c +4 -4
@@ -891,7 +891,8 @@ static int remove_ddw(struct device_node *np, bool remove_prop, const char *win_return 0 ; } -static bool find_existing_ddw (struct device_node *pdn,u64 *dma_addr,int *window_shift) +static bool find_existing_ddw (struct device_node *pdn,u64 *dma_addr,int *window_shift, +bool *direct_mapping) {struct dma_win *window;const struct dynamic_dma_window_prop *dma64;
@@ -904,6 +905,7 @@ static bool find_existing_ddw(struct device_node *pdn, u64 *dma_addr, int *windo dma64 = window->prop; *dma_addr =be64_to_cpu (dma64->dma_base); *window_shift =be32_to_cpu (dma64->window_shift); + *direct_mapping = window->direct; found = true;break ; }
@@ -1253,10 +1255,8 @@ static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn)mutex_lock (&dma_win_init_mutex); -if (find_existing_ddw (pdn, &dev->dev.archdata.dma_offset, &len)) { - direct_mapping = (len >= max_ram_len); +if (find_existing_ddw (pdn, &dev->dev.archdata.dma_offset, &len, &direct_mapping)) goto out_unlock; - }/* * If we already went through this for a previous function of
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 51/67 smb3: fix touch -h of symlink
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steve French <[email protected]>
[ Upstream commit 475efd9808a3094944a56240b2711349e433fb66 ]
For example:
touch -h -t 02011200 testfile
where testfile is a symlink would not change the timestamp, but
touch -t 02011200 testfiledoes work to change the timestamp of the target
--- fs/cifs/cifsfs.c | 1 + 1 file changed, 1 insertion(+)
fs/cifs/cifsfs.c +1 -0
@@ -1127,6 +1127,7 @@ const struct inode_operations cifs_file_inode_ops = {const struct inode_operations cifs_symlink_inode_ops = { .get_link = cifs_get_link, + .setattr = cifs_setattr, .permission = cifs_permission, .listxattr = cifs_listxattr, };
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 52/67 ASoC: Intel: Move soc_intel_is_foo() helpers to a generic header
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit cd45c9bf8b43cd387e167cf166ae5c517f56d658 ]
The soc_intel_is_foo() helpers from sound/soc/intel/common/soc-intel-quirks.h are useful outside of the sound subsystem too.
Move these to include/linux/platform_data/x86/soc.h, so that other code can use them too.
Stable-dep-of: 7dd692217b86 ("ASoC: SOF: sof-pci-dev: Fix community key quirk detection")
--- include/linux/platform_data/x86/soc.h | 65 +++++++++++++++++++++++ sound/soc/intel/common/soc-intel-quirks.h | 51 ++---------------- 2 files changed, 68 insertions(+), 48 deletions(-) create mode 100644 include/linux/platform_data/x86/soc.h
include/linux/platform_data/x86/soc.h new file +65 -0
@@ -0,0 +1,65 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Helpers for Intel SoC model detection +* +* Copyright (c) 2019, Intel Corporation. +*/ + +#ifndef __PLATFORM_DATA_X86_SOC_H +#define __PLATFORM_DATA_X86_SOC_H + +#if IS_ENABLED (CONFIG_X86 ) + +#include <asm/cpu_device_id.h> +#include <asm/intel-family.h> + +#define SOC_INTEL_IS_CPU (soc, type) \ +static inline bool soc_intel_is_##soc(void) \ +{ \ + static const struct x86_cpu_id soc##_cpu_ids[] = { \ + X86_MATCH_INTEL_FAM6_MODEL(type, NULL), \ + {} \ + }; \ + const struct x86_cpu_id *id; \ + \ + id = x86_match_cpu(soc##_cpu_ids); \ + if (id) \ + return true; \ + return false; \ +} + +SOC_INTEL_IS_CPU (byt,ATOM_SILVERMONT ); +SOC_INTEL_IS_CPU (cht,ATOM_AIRMONT ); +SOC_INTEL_IS_CPU (apl,ATOM_GOLDMONT ); +SOC_INTEL_IS_CPU (glk,ATOM_GOLDMONT_PLUS ); +SOC_INTEL_IS_CPU (cml,KABYLAKE_L ); + +#else /* IS_ENABLED(CONFIG_X86) */ + +static inline bool soc_intel_is_byt (void ) +{ +return false; +} + +static inline bool soc_intel_is_cht (void ) +{ +return false; +} + +static inline bool soc_intel_is_apl (void ) +{ +return false; +} + +static inline bool soc_intel_is_glk (void ) +{ +return false; +} + +static inline bool soc_intel_is_cml (void ) +{ +return false; +} +#endif /* IS_ENABLED(CONFIG_X86) */ + +#endif /* __PLATFORM_DATA_X86_SOC_H */
sound/soc/intel/common/soc-intel-quirks.h +3 -48
67 lines not on this page · raw message
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 53/67 ASoC: SOF: sof-pci-dev: use community key on all Up boards
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 405e52f412b85b581899f5e1b82d25a7c8959d89 ]
There are already 3 versions of the Up boards with support for the SOF community key (ApolloLake, WhiskyLake, TigerLake). Rather than continue to add quirks for each version, let's add a wildcard.
For WHL and TGL, the authentication supports both the SOF community key and the firmware signed with the Intel production key. Given two choices, the community key is the preferred option to allow developers to sign their own firmware. The firmware signed with production key can still be selected if needed with a kernel module
option (snd-sof-pci.fw_path="intel/sof")
Stable-dep-of: 7dd692217b86 ("ASoC: SOF: sof-pci-dev: Fix community key quirk detection")
--- sound/soc/sof/sof-pci-dev.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
sound/soc/sof/sof-pci-dev.c +1 -9
@@ -64,17 +64,9 @@ static const struct dmi_system_id sof_tplg_table[] = {static const struct dmi_system_id community_key_platforms[] = { { - .ident ="Up Squared" , + .ident ="Up boards" , .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"AAEON" ), -DMI_MATCH (DMI_BOARD_NAME ,"UP-APL01" ), - } - }, - { - .ident ="Up Extreme" , - .matches = { -DMI_MATCH (DMI_SYS_VENDOR ,"AAEON" ), -DMI_MATCH (DMI_BOARD_NAME ,"UP-WHL01" ), } }, {
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 54/67 ASoC: SOF: sof-pci-dev: add parameter to override topology filename
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 772627acfeb0e670ede534b7d5502dae9668d3ee ]
The existing 'tplg_path' module parameter can be used to load alternate firmware files, be it for development or to handle OEM-specific or board-specific releases. However the topology filename is either hard-coded in machine descriptors or modified by specific DMI-quirks.
For additional flexibility, this patch adds the 'tplg_filename' module parameter to override topology names.
To avoid any confusion between DMI- and parameter-override, a variable rename is added.
Stable-dep-of: 7dd692217b86 ("ASoC: SOF: sof-pci-dev: Fix community key quirk detection")
--- sound/soc/sof/sof-pci-dev.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-)
sound/soc/sof/sof-pci-dev.c +20 -5
@@ -27,17 +27,21 @@ static char *tplg_path;module_param (tplg_path, charp,0444 );MODULE_PARM_DESC (tplg_path,"alternate path for SOF topology." ); +static char *tplg_filename; +module_param (tplg_filename, charp,0444 ); +MODULE_PARM_DESC (tplg_filename,"alternate filename for SOF topology." ); +static int sof_pci_debug;module_param_named (sof_pci_debug, sof_pci_debug, int,0444 );MODULE_PARM_DESC (sof_pci_debug,"SOF PCI debug options (0x0 all off)" ); -static const char *sof_override_tplg_name; +static const char *sof_dmi_override_tplg_name;#define SOF_PCI_DISABLE_PM_RUNTIME BIT(0)static int sof_tplg_cb (const struct dmi_system_id *id) { - sof_override_tplg_name = id->driver_data; + sof_dmi_override_tplg_name = id->driver_data;return 1 ; }
@@ -183,9 +187,20 @@ int sof_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) sof_pdata->tplg_filename_prefix = sof_pdata->desc->default_tplg_path; -dmi_check_system (sof_tplg_table); -if (sof_override_tplg_name) - sof_pdata->tplg_filename = sof_override_tplg_name; +/* +* the topology filename will be provided in the machine descriptor, unless +* it is overridden by a module parameter or DMI quirk. +*/ +if (tplg_filename) { + sof_pdata->tplg_filename = tplg_filename; + +dev_dbg (dev,"Module parameter used, changed tplg filename to %s\n" , + sof_pdata->tplg_filename); + }else { +dmi_check_system (sof_tplg_table); +if (sof_dmi_override_tplg_name) + sof_pdata->tplg_filename = sof_dmi_override_tplg_name; + }/* set callback to be called on successful device probe to enable runtime_pm */ sof_pdata->sof_probe_complete = sof_pci_probe_complete;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 55/67 ASoC: SOF: sof-pci-dev: dont use the community key on APL Chromebooks
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pierre-Louis Bossart <[email protected]>
[ Upstream commit d81e4ba5ef1c1033b6c720b22fc99feeb71e71a0 ]
As suggested by MrChromebox, the SOF driver can be used with the SOF firmware binary signed with the production key. This patch adds an additional check for the ApolloLake SoC before modifying the default firmware path.
Note that ApolloLake Chromebooks officially ship with the Skylake driver, so to use SOF the users have to explicitly opt-in with 'options intel-dspcfg dsp_driver=3'. There is no plan to change the default selection.
Stable-dep-of: 7dd692217b86 ("ASoC: SOF: sof-pci-dev: Fix community key quirk detection")
--- sound/soc/sof/sof-pci-dev.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)
sound/soc/sof/sof-pci-dev.c +23 -1
@@ -12,6 +12,7 @@#include <linux/dmi.h> #include <linux/module.h> #include <linux/pci.h> +#include <linux/platform_data/x86/soc.h> #include <linux/pm_runtime.h> #include <sound/soc-acpi.h> #include <sound/soc-acpi-intel-match.h>
@@ -36,6 +37,7 @@ module_param_named(sof_pci_debug, sof_pci_debug, int, 0444);MODULE_PARM_DESC (sof_pci_debug,"SOF PCI debug options (0x0 all off)" );static const char *sof_dmi_override_tplg_name; +static bool sof_dmi_use_community_key;#define SOF_PCI_DISABLE_PM_RUNTIME BIT(0)
@@ -66,15 +68,35 @@ static const struct dmi_system_id sof_tplg_table[] = { {} }; +/* all Up boards use the community key */ +static int up_use_community_key (const struct dmi_system_id *id) +{ + sof_dmi_use_community_key = true; +return 1 ; +} + +/* +* For ApolloLake Chromebooks we want to force the use of the Intel production key. +* All newer platforms use the community key +*/ +static int chromebook_use_community_key (const struct dmi_system_id *id) +{ +if (!soc_intel_is_apl ()) + sof_dmi_use_community_key = true; +return 1 ; +} +static const struct dmi_system_id community_key_platforms[] = { { .ident ="Up boards" , + .callback = up_use_community_key, .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"AAEON" ), } }, { .ident ="Google Chromebooks" , + .callback = chromebook_use_community_key, .matches = {DMI_MATCH (DMI_PRODUCT_FAMILY ,"Google" ), }
@@ -167,7 +189,7 @@ int sof_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)"Module parameter used, changed fw path to %s\n" , sof_pdata->fw_filename_prefix); - }else if (dmi_check_system (community_key_platforms)) { + }else if (dmi_check_system (community_key_platforms) && sof_dmi_use_community_key) { sof_pdata->fw_filename_prefix = devm_kasprintf(dev, GFP_KERNEL, "%s/%s", sof_pdata->desc->default_fw_path,
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 56/67 ASoC: SOF: sof-pci-dev: Fix community key quirk detection
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Hasemeyer <[email protected]>
[ Upstream commit 7dd692217b861a8292ff8ac2c9d4458538fd6b96 ]
Some Chromebooks do not populate the product family DMI value resulting in firmware load failures.
Add another quirk detection entry that looks for "Google" in the BIOS version. Theoretically, PRODUCT_FAMILY could be replaced with BIOS_VERSION, but it is left as a quirk to be conservative.
--- sound/soc/sof/sof-pci-dev.c | 7 +++++++ 1 file changed, 7 insertions(+)
sound/soc/sof/sof-pci-dev.c +7 -0
@@ -101,6 +101,13 @@ static const struct dmi_system_id community_key_platforms[] = { DMI_MATCH(DMI_PRODUCT_FAMILY, "Google"), } }, + { + .ident = "Google firmware", + .callback = chromebook_use_community_key, + .matches = { + DMI_MATCH(DMI_BIOS_VERSION, "Google"), + } + }, {}, };
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 57/67 fbdev: stifb: Make the STI next font pointer a 32-bit signed offset
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
[ Upstream commit 8a32aa17c1cd48df1ddaa78e45abcb8c7a2220d6 ]
The pointer to the next STI font is actually a signed 32-bit offset. With this change the 64-bit kernel will correctly subract the (signed 32-bit) offset instead of adding a (unsigned 32-bit) offset. It has no effect on 32-bit kernels.
This fixes the stifb driver with a 64-bit kernel on qemu.
--- drivers/video/fbdev/sticore.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/sticore.h +1 -1
@@ -231,7 +231,7 @@ struct sti_rom_font {u8 height;u8 font_type;/* language type */ u8 bytes_per_char; -u32 next_font; +s32 next_font;/* note: signed int */ u8 underline_height;u8 underline_pos;u8 res008[2 ];
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 58/67 fs: add ctime accessors infrastructure
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Layton <[email protected]>
[ Upstream commit 9b6304c1d53745c300b86f202d0dcff395e2d2db ]
struct timespec64 has unused bits in the tv_nsec field that can be used for other purposes. In future patches, we're going to change how the inode->i_ctime is accessed in certain inodes in order to make use of them. In order to do that safely though, we'll need to eradicate raw accesses of the inode->i_ctime field from the kernel.
Add new accessor functions for the ctime that we use to replace them.
Message-Id: <[email protected]>
Stable-dep-of: 5923d6686a10 ("smb3: fix caching of ctime on setxattr")
--- fs/inode.c | 16 ++++++++++++++++ include/linux/fs.h | 45 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 1 deletion(-)
fs/inode.c +16 -0
@@ -2335,6 +2335,22 @@ struct timespec64 current_time(struct inode *inode) }EXPORT_SYMBOL (current_time); +/** +* inode_set_ctime_current - set the ctime to current_time +* @inode: inode +* +* Set the inode->i_ctime to the current value for the inode. Returns +* the current value that was assigned to i_ctime. +*/ +struct timespec64 inode_set_ctime_current (struct inode *inode) +{ +struct timespec64 now =current_time (inode); + +inode_set_ctime (inode, now.tv_sec, now.tv_nsec); +return now; +} +EXPORT_SYMBOL (inode_set_ctime_current); +/** * in_group_or_capable - check whether caller is CAP_FSETID privileged * @mnt_userns: user namespace of the mount @inode was found from
include/linux/fs.h +44 -1
51 lines not on this page · raw message
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 59/67 smb3: fix caching of ctime on setxattr
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steve French <[email protected]>
[ Upstream commit 5923d6686a100c2b4cabd4c2ca9d5a12579c7614 ]
Fixes xfstest generic/728 which had been failing due to incorrect ctime after setxattr and removexattr
Update ctime on successful set of xattr
--- fs/cifs/xattr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/cifs/xattr.c +4 -1
@@ -150,10 +150,13 @@ static int cifs_xattr_set(const struct xattr_handler *handler,if (cifs_sb->mnt_cifs_flags &CIFS_MOUNT_NO_XATTR ) goto out; -if (pTcon->ses->server->ops->set_EA) +if (pTcon->ses->server->ops->set_EA) { rc = pTcon->ses->server->ops->set_EA (xid, pTcon, full_path, name, value, (__u16 )size, cifs_sb->local_nls, cifs_sb); +if (rc ==0 ) +inode_set_ctime_current (inode); + }break ;case XATTR_CIFS_ACL :
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 60/67 cpufreq: imx6q: dont warn for disabling a non-existing frequency
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Niedermaier <[email protected]>
[ Upstream commit 11a3b0ac33d95aa84be426e801f800997262a225 ]
It is confusing if a warning is given for disabling a non-existent frequency of the operating performance points (OPP). In this case the function dev_pm_opp_disable() returns -ENODEV. Check the return value and avoid the output of a warning in this case. Avoid code duplication by using a separate function.
Stable-dep-of: 2e4e0984c7d6 ("cpufreq: imx6q: Don't disable 792 Mhz OPP unnecessarily")
--- drivers/cpufreq/imx6q-cpufreq.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)
drivers/cpufreq/imx6q-cpufreq.c +16 -14
@@ -209,6 +209,14 @@ static struct cpufreq_driver imx6q_cpufreq_driver = { .suspend = cpufreq_generic_suspend, }; +static void imx6x_disable_freq_in_opp (struct device *dev,unsigned long freq) +{ +int ret =dev_pm_opp_disable (dev, freq); + +if (ret <0 && ret != -ENODEV ) +dev_warn (dev,"failed to disable %ldMHz OPP\n" , freq /1000000 ); +} +#define OCOTP_CFG3 0x440#define OCOTP_CFG3_SPEED_SHIFT 16#define OCOTP_CFG3_SPEED_1P2GHZ 0x3
@@ -254,17 +262,15 @@ static int imx6q_opp_check_speed_grading(struct device *dev) val &=0x3 ;if (val <OCOTP_CFG3_SPEED_996MHZ ) -if (dev_pm_opp_disable (dev,996000000 )) -dev_warn (dev,"failed to disable 996MHz OPP\n" ); +imx6x_disable_freq_in_opp (dev,996000000 );if (of_machine_is_compatible ("fsl,imx6q" ) ||of_machine_is_compatible ("fsl,imx6qp" )) {if (val !=OCOTP_CFG3_SPEED_852MHZ ) -if (dev_pm_opp_disable (dev,852000000 )) -dev_warn (dev,"failed to disable 852MHz OPP\n" ); +imx6x_disable_freq_in_opp (dev,852000000 ); +if (val !=OCOTP_CFG3_SPEED_1P2GHZ ) -if (dev_pm_opp_disable (dev,1200000000 )) -dev_warn (dev,"failed to disable 1.2GHz OPP\n" ); +imx6x_disable_freq_in_opp (dev,1200000000 ); }return 0 ;
@@ -316,20 +322,16 @@ static int imx6ul_opp_check_speed_grading(struct device *dev) val >>=OCOTP_CFG3_SPEED_SHIFT ; val &=0x3 ; -if (of_machine_is_compatible ("fsl,imx6ul" )) { +if (of_machine_is_compatible ("fsl,imx6ul" ))if (val !=OCOTP_CFG3_6UL_SPEED_696MHZ ) -if (dev_pm_opp_disable (dev,696000000 )) -dev_warn (dev,"failed to disable 696MHz OPP\n" ); - } +imx6x_disable_freq_in_opp (dev,696000000 );if (of_machine_is_compatible ("fsl,imx6ull" )) {if (val !=OCOTP_CFG3_6ULL_SPEED_792MHZ ) -if (dev_pm_opp_disable (dev,792000000 )) -dev_warn (dev,"failed to disable 792MHz OPP\n" ); +imx6x_disable_freq_in_opp (dev,792000000 );if (val !=OCOTP_CFG3_6ULL_SPEED_900MHZ ) -if (dev_pm_opp_disable (dev,900000000 )) -dev_warn (dev,"failed to disable 900MHz OPP\n" ); +imx6x_disable_freq_in_opp (dev,900000000 ); }return ret;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 61/67 cpufreq: imx6q: Dont disable 792 Mhz OPP unnecessarily
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Niedermaier <[email protected]>
[ Upstream commit 2e4e0984c7d696cc74cf2fd7e7f62997f0e9ebe6 ]
For a 900MHz i.MX6ULL CPU the 792MHz OPP is disabled. There is no convincing reason to disable this OPP. If a CPU can run at 900MHz, it should also be able to cope with 792MHz. Looking at the voltage level of 792MHz in [1] (page 24, table 10. "Operating Ranges") the current defined OPP is above the minimum. So the voltage level shouldn't be a problem. However in [2] (page 24, table 10. "Operating Ranges"), it is not mentioned that 792MHz OPP isn't allowed. Change it to only disable 792MHz OPP for i.MX6ULL types below 792 MHz.
[1] https://www.nxp.com/docs/en/data-sheet/IMX6ULLIEC.pdf
[2] https://www.nxp.com/docs/en/data-sheet/IMX6ULLCEC.pdf
--- drivers/cpufreq/imx6q-cpufreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/imx6q-cpufreq.c +1 -1
@@ -327,7 +327,7 @@ static int imx6ul_opp_check_speed_grading(struct device *dev)imx6x_disable_freq_in_opp (dev,696000000 );if (of_machine_is_compatible ("fsl,imx6ull" )) { -if (val !=OCOTP_CFG3_6ULL_SPEED_792MHZ ) +if (val <OCOTP_CFG3_6ULL_SPEED_792MHZ )imx6x_disable_freq_in_opp (dev,792000000 );if (val !=OCOTP_CFG3_6ULL_SPEED_900MHZ )
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 62/67 iommu/vt-d: Omit devTLB invalidation requests when TES=0
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lu Baolu <[email protected]>
[ Upstream commit 0f5432a9b839847dcfe9fa369d72e3d646102ddf ]
The latest VT-d spec indicates that when remapping hardware is disabled (TES=0 in Global Status Register), upstream ATS Invalidation Completion requests are treated as UR (Unsupported Request).
Consequently, the spec recommends in section 4.3 Handling of Device-TLB Invalidations that software refrain from submitting any Device-TLB invalidation requests when address remapping hardware is disabled.
Verify address remapping hardware is enabled prior to submitting Device- TLB invalidation requests.
--- drivers/iommu/intel/dmar.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/iommu/intel/dmar.c +18 -0
@@ -1518,6 +1518,15 @@ void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 pfsid, {struct qi_desc desc; +/* +* VT-d spec, section 4.3: +* +* Software is recommended to not submit any Device-TLB invalidation +* requests while address remapping hardware is disabled. +*/ +if (!(iommu->gcmd &DMA_GCMD_TE )) +return ; +if (mask) { addr |= (1ULL << (VTD_PAGE_SHIFT + mask -1 )) -1 ; desc.qw1 =QI_DEV_IOTLB_ADDR (addr) |QI_DEV_IOTLB_SIZE ;
@@ -1583,6 +1592,15 @@ void qi_flush_dev_iotlb_pasid(struct intel_iommu *iommu, u16 sid, u16 pfsid,unsigned long mask =1UL << (VTD_PAGE_SHIFT + size_order -1 );struct qi_desc desc = {.qw1 =0 , .qw2 =0 , .qw3 =0 }; +/* +* VT-d spec, section 4.3: +* +* Software is recommended to not submit any Device-TLB invalidation +* requests while address remapping hardware is disabled. +*/ +if (!(iommu->gcmd &DMA_GCMD_TE )) +return ; + desc.qw0 =QI_DEV_EIOTLB_PASID (pasid) |QI_DEV_EIOTLB_SID (sid) |QI_DEV_EIOTLB_QDEP (qdep) |QI_DEIOTLB_TYPE |QI_DEV_IOTLB_PFSID (pfsid);
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 63/67 iommu/vt-d: Make context clearing consistent with context mapping
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lu Baolu <[email protected]>
[ Upstream commit 9a16ab9d640274b20813d2d17475e18d3e99d834 ]
In the iommu probe_device path, domain_context_mapping() allows setting up the context entry for a non-PCI device. However, in the iommu release_device path, domain_context_clear() only clears context entries for PCI devices.
Make domain_context_clear() behave consistently with domain_context_mapping() by clearing context entries for both PCI and non-PCI devices.
--- drivers/iommu/intel/iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/intel/iommu.c +2 -2
@@ -4465,8 +4465,8 @@ static int domain_context_clear_one_cb(struct pci_dev *pdev, u16 alias, void *op*/ static void domain_context_clear (struct device_domain_info *info) { -if (!info->iommu || !info->dev || !dev_is_pci (info->dev)) -return ; +if (!dev_is_pci (info->dev)) +domain_context_clear_one (info, info->bus, info->devfn);pci_for_each_dma_alias (to_pci_dev (info->dev), &domain_context_clear_one_cb, info);
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 64/67 mmc: core: add helpers mmc_regulator_enable/disable_vqmmc
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiner Kallweit <[email protected]>
[ Upstream commit 8d91f3f8ae57e6292142ca89f322e90fa0d6ac02 ]
There's a number of drivers (e.g. dw_mmc, meson-gx, mmci, sunxi) using the same mechanism and a private flag vqmmc_enabled to deal with enabling/disabling the vqmmc regulator.
Move this to the core and create new helpers mmc_regulator_enable_vqmmc and mmc_regulator_disable_vqmmc.
Stable-dep-of: 477865af60b2 ("mmc: sdhci-sprd: Fix vqmmc not shutting down after the card was pulled")
--- drivers/mmc/core/regulator.c | 41 ++++++++++++++++++++++++++++++++++++ include/linux/mmc/host.h | 3 +++ 2 files changed, 44 insertions(+)
drivers/mmc/core/regulator.c +41 -0
@@ -271,3 +271,44 @@ int mmc_regulator_get_supply(struct mmc_host *mmc)return 0 ; }EXPORT_SYMBOL_GPL (mmc_regulator_get_supply); + +/** +* mmc_regulator_enable_vqmmc - enable VQMMC regulator for a host +* @mmc: the host to regulate +* +* Returns 0 or errno. Enables the regulator for vqmmc. +* Keeps track of the enable status for ensuring that calls to +* regulator_enable/disable are balanced. +*/ +int mmc_regulator_enable_vqmmc (struct mmc_host *mmc) +{ +int ret =0 ; + +if (!IS_ERR (mmc->supply.vqmmc) && !mmc->vqmmc_enabled) { + ret =regulator_enable (mmc->supply.vqmmc); +if (ret <0 ) +dev_err (mmc_dev (mmc),"enabling vqmmc regulator failed\n" ); +else + mmc->vqmmc_enabled = true; + } + +return ret; +} +EXPORT_SYMBOL_GPL (mmc_regulator_enable_vqmmc); + +/** +* mmc_regulator_disable_vqmmc - disable VQMMC regulator for a host +* @mmc: the host to regulate +* +* Returns 0 or errno. Disables the regulator for vqmmc. +* Keeps track of the enable status for ensuring that calls to +* regulator_enable/disable are balanced. +*/ +void mmc_regulator_disable_vqmmc (struct mmc_host *mmc) +{ +if (!IS_ERR (mmc->supply.vqmmc) && mmc->vqmmc_enabled) { +regulator_disable (mmc->supply.vqmmc); + mmc->vqmmc_enabled = false; + } +} +EXPORT_SYMBOL_GPL (mmc_regulator_disable_vqmmc);
include/linux/mmc/host.h +3 -0
@@ -428,6 +428,7 @@ struct mmc_host { unsigned int retune_paused:1; /* re-tuning is temporarily disabled */ unsigned int retune_crc_disable:1; /* don't trigger retune upon crc */ unsigned int can_dma_map_merge:1; /* merging can be used */ + unsigned int vqmmc_enabled:1; /* vqmmc regulator is enabled */int rescan_disable;/* disable card detection */ int rescan_entered;/* used with nonremovable devices */
@@ -574,6 +575,8 @@ static inline int mmc_regulator_set_vqmmc(struct mmc_host *mmc,#endif int mmc_regulator_get_supply (struct mmc_host *mmc); +int mmc_regulator_enable_vqmmc (struct mmc_host *mmc); +void mmc_regulator_disable_vqmmc (struct mmc_host *mmc);static inline int mmc_card_is_removable (struct mmc_host *host) {
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 65/67 mmc: sdhci-sprd: Fix vqmmc not shutting down after the card was pulled
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wenchao Chen <[email protected]>
[ Upstream commit 477865af60b2117ceaa1d558e03559108c15c78c ]
With cat regulator_summary, we found that vqmmc was not shutting down after the card was pulled.
cat /sys/kernel/debug/regulator/regulator_summary
1.before fix
1)Insert SD card
vddsdio 1 1 0 unknown 3500mV 0mA 1200mV 3750mV
71100000.mmc-vqmmc 1 0mA 3500mV 3600mV
2)Pull out the SD card
vddsdio 1 1 0 unknown 3500mV 0mA 1200mV 3750mV
71100000.mmc-vqmmc 1 0mA 3500mV 3600mV2.after fix
1)Insert SD cardt
vddsdio 1 1 0 unknown 3500mV 0mA 1200mV 3750mV
71100000.mmc-vqmmc 1 0mA 3500mV 3600mV2)Pull out the SD card
vddsdio 0 1 0 unknown 3500mV 0mA 1200mV 3750mV
71100000.mmc-vqmmc 0 0mA 3500mV 3600mV
--- drivers/mmc/host/sdhci-sprd.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
drivers/mmc/host/sdhci-sprd.c +25 -0
@@ -392,12 +392,33 @@ static void sdhci_sprd_request_done(struct sdhci_host *host,mmc_request_done (host->mmc, mrq); } +static void sdhci_sprd_set_power (struct sdhci_host *host,unsigned char mode, +unsigned short vdd) +{ +struct mmc_host *mmc = host->mmc; + +switch (mode) { +case MMC_POWER_OFF : +mmc_regulator_set_ocr (host->mmc, mmc->supply.vmmc,0 ); + +mmc_regulator_disable_vqmmc (mmc); +break ; +case MMC_POWER_ON : +mmc_regulator_enable_vqmmc (mmc); +break ; +case MMC_POWER_UP : +mmc_regulator_set_ocr (host->mmc, mmc->supply.vmmc, vdd); +break ; + } +} +static struct sdhci_ops sdhci_sprd_ops = { .read_l = sdhci_sprd_readl, .write_l = sdhci_sprd_writel, .write_w = sdhci_sprd_writew, .write_b = sdhci_sprd_writeb, .set_clock = sdhci_sprd_set_clock, + .set_power = sdhci_sprd_set_power, .get_max_clock = sdhci_sprd_get_max_clock, .get_min_clock = sdhci_sprd_get_min_clock, .set_bus_width = sdhci_set_bus_width,
@@ -663,6 +684,10 @@ static int sdhci_sprd_probe(struct platform_device *pdev) host->caps1 &= ~(SDHCI_SUPPORT_SDR50 |SDHCI_SUPPORT_SDR104 |SDHCI_SUPPORT_DDR50 ); + ret =mmc_regulator_get_supply (host->mmc); +if (ret) + goto pm_runtime_disable; + ret =sdhci_setup_host (host);if (ret) goto pm_runtime_disable;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 66/67 r8169: disable ASPM in case of tx timeout
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiner Kallweit <[email protected]>
[ Upstream commit 80c0576ef179311f624bc450fede30a89afe9792 ]
There are still single reports of systems where ASPM incompatibilities cause tx timeouts. It's not clear whom to blame, so let's disable ASPM in case of a tx timeout.
v2:
- add one-time warning for informing the user
Stable-dep-of: 59d395ed606d ("r8169: fix deadlock on RTL8125 in jumbo mtu mode")
--- drivers/net/ethernet/realtek/r8169_main.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/net/ethernet/realtek/r8169_main.c +13 -1
@@ -588,6 +588,7 @@ struct rtl8169_tc_offsets {enum rtl_flag {RTL_FLAG_TASK_ENABLED =0 ,RTL_FLAG_TASK_RESET_PENDING , +RTL_FLAG_TASK_TX_TIMEOUT ,RTL_FLAG_MAX };
@@ -4029,7 +4030,7 @@ static void rtl8169_tx_timeout(struct net_device *dev, unsigned int txqueue) {struct rtl8169_private *tp =netdev_priv (dev); -rtl_schedule_task (tp,RTL_FLAG_TASK_RESET_PENDING ); +rtl_schedule_task (tp,RTL_FLAG_TASK_TX_TIMEOUT ); } static int rtl8169_tx_map(struct rtl8169_private *tp, const u32 *opts, u32 len,
@@ -4624,6 +4625,7 @@ static void rtl_task(struct work_struct *work) {struct rtl8169_private *tp = container_of(work, struct rtl8169_private, wk.work); +int ret;rtnl_lock ();
@@ -4631,7 +4633,17 @@ static void rtl_task(struct work_struct *work) !test_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags)) goto out_unlock; +if (test_and_clear_bit (RTL_FLAG_TASK_TX_TIMEOUT , tp->wk.flags)) { +/* ASPM compatibility issues are a typical reason for tx timeouts */ + ret =pci_disable_link_state (tp->pci_dev,PCIE_LINK_STATE_L1 | +PCIE_LINK_STATE_L0S ); +if (!ret) +netdev_warn_once (tp->dev,"ASPM disabled on Tx timeout\n" ); + goto reset; + } +if (test_and_clear_bit (RTL_FLAG_TASK_RESET_PENDING , tp->wk.flags)) { +reset:rtl_reset_work (tp);netif_wake_queue (tp->dev); }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 67/67 r8169: fix deadlock on RTL8125 in jumbo mtu mode
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiner Kallweit <[email protected]>
[ Upstream commit 59d395ed606d8df14615712b0cdcdadb2d962175 ]
The original change results in a deadlock if jumbo mtu mode is used. Reason is that the phydev lock is held when rtl_reset_work() is called here, and rtl_jumbo_config() calls phy_start_aneg() which also tries to acquire the phydev lock. Fix this by calling rtl_reset_work() asynchronously.
--- drivers/net/ethernet/realtek/r8169_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/realtek/r8169_main.c +4 -1
@@ -588,6 +588,7 @@ struct rtl8169_tc_offsets {enum rtl_flag {RTL_FLAG_TASK_ENABLED =0 ,RTL_FLAG_TASK_RESET_PENDING , +RTL_FLAG_TASK_RESET_NO_QUEUE_WAKE ,RTL_FLAG_TASK_TX_TIMEOUT ,RTL_FLAG_MAX };
@@ -4646,6 +4647,8 @@ static void rtl_task(struct work_struct *work) reset:rtl_reset_work (tp);netif_wake_queue (tp->dev); + }else if (test_and_clear_bit (RTL_FLAG_TASK_RESET_NO_QUEUE_WAKE , tp->wk.flags)) { +rtl_reset_work (tp); } out_unlock:rtnl_unlock ();
@@ -4679,7 +4682,7 @@ static void r8169_phylink_handler(struct net_device *ndev) }else {/* In few cases rx is broken after link-down otherwise */ if (rtl_is_8125 (tp)) -rtl_reset_work (tp); +rtl_schedule_task (tp,RTL_FLAG_TASK_RESET_NO_QUEUE_WAKE );pm_runtime_idle (d); }
Signature · 1 line
2.42.0
Hi Greg,
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.142 release. There are 67 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, 07 Dec 2023 03:14:57 +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.142-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.
Quoted 7 lines
thanks,
greg k-h
Adrian Hunter <[email protected]>
perf inject: FixGEN_ELF_TEXT_OFFSETfor jit
^^ This commit is causing the perf/ build failure:
In file included from util/jitdump.c:29:util/genelf.h:5:10: fatal error: linux/math.h: No such file or directory
5 | #include <linux/math.h>
| ^~~~~~~~~~~~~~compilation terminated.
This was previously reported on 5.15.136-rc:
Vegard shared his analysis on ways to fix here:
https://lore.kernel.org/stable/[email protected]/
Thanks,
Harshit
Greg Kroah-Hartman
maintainerQuoted 31 lines · Harshit Mogalapalli
Hi Greg,
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.142 release. There are 67 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, 07 Dec 2023 03:14:57 +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.142-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.Quoted 7 lines
thanks,
greg k-h
Adrian Hunter <[email protected]>
perf inject: FixGEN_ELF_TEXT_OFFSETfor jit^^ This commit is causing the perf/ build failure:
In file included from
util/jitdump.c:29:util/genelf.h:5:10: fatal error:linux/math.h: No such file or directory5 | #include <linux/math.h> | ^~~~~~~~~~~~~~
Quoted 7 lines
compilation terminated.
This was previously reported on 5.15.136-rc:
Vegard shared his analysis on ways to fix here:
Now dropped from here and 4.19.y
thanks,
greg k-h
Namhyung Kim
maintainerHello,
Quoted 35 lines · Greg Kroah-Hartman
Quoted 33 lines · Harshit Mogalapalli
Hi Greg,
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.142 release. There are 67 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, 07 Dec 2023 03:14:57 +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.142-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.Quoted 7 lines
thanks,
greg k-h
Adrian Hunter <[email protected]>
perf inject: FixGEN_ELF_TEXT_OFFSETfor jit^^ This commit is causing the perf/ build failure:
In file included from
util/jitdump.c:29:util/genelf.h:5:10: fatal error:linux/math.h: No such file or directory5 | #include <linux/math.h> | ^~~~~~~~~~~~~~compilation terminated.
Quoted 7 lines
Quoted 5 lines
This was previously reported on 5.15.136-rc:
Vegard shared his analysis on ways to fix here:
Now dropped from here and 4.19.y
Sorry for the super late reply and happy new year!
As Vegard noted we can change the header to <linux/kernel.h> to avoid the build issue. I don't expect more changes in this code so it's unlikely we have conflicts here. Let me know if it happens later.
Anyway this code is needed to handle JIT-dump binaries generated by perf inject. I'll send a patch if it's ok to you.
Thanks,
Namhyung
Greg Kroah-Hartman
maintainerQuoted 49 lines · Namhyung Kim
Hello,
Quoted 35 lines · Greg Kroah-Hartman
Quoted 33 lines · Harshit Mogalapalli
Hi Greg,
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.142 release. There are 67 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, 07 Dec 2023 03:14:57 +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.142-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.Quoted 7 lines
thanks,
greg k-h
Adrian Hunter <[email protected]>
perf inject: FixGEN_ELF_TEXT_OFFSETfor jit^^ This commit is causing the perf/ build failure:
In file included from
util/jitdump.c:29:util/genelf.h:5:10: fatal error:linux/math.h: No such file or directory5 | #include <linux/math.h> | ^~~~~~~~~~~~~~compilation terminated.
Quoted 7 lines
Quoted 5 lines
This was previously reported on 5.15.136-rc:
Vegard shared his analysis on ways to fix here:
Now dropped from here and 4.19.y
Sorry for the super late reply and happy new year!
Quoted 7 lines
As Vegard noted we can change the header to <
linux/kernel.h> to avoid the build issue. I don't expect more changes in this code so it's unlikely we have conflicts here. Let me know if it happens later.Anyway this code is needed to handle JIT-dump binaries generated by perf inject. I'll send a patch if it's ok to you.
Just send an updated patch please.
Namhyung Kim
maintainerPATCH 1/1 perf inject: Fix GEN_ELF_TEXT_OFFSET for jit
From: Adrian Hunter <[email protected]>
When a program header was added, it moved the text section but GEN_ELF_TEXT_OFFSET was not updated.
Fix by adding the program header size and aligning.
--- tools/perf/util/genelf.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/util/genelf.h +3 -1
@@ -2,6 +2,8 @@#ifndef __GENELF_H__#define __GENELF_H__ +#include <linux/kernel.h> +/* genelf.c */ int jit_write_elf(int fd, uint64_t code_addr, const char *sym, const void *code, int csize, void *debug, int nr_debug_entries,
@@ -76,6 +78,6 @@ int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_ent#endif /* The .text section is directly after the ELF header */ -#define GEN_ELF_TEXT_OFFSET sizeof(Elf_Ehdr) +#define GEN_ELF_TEXT_OFFSET round_up(sizeof(Elf_Ehdr) + sizeof(Elf_Phdr), 16)#endif
Signature · 1 line
2.43.0.472.g3155946c3a-goog
kernel test robot
build botRe: [PATCH for-5.15] perf inject: Fix GEN_ELF_TEXT_OFFSET for jit
FYI: kernel test robot notices the stable kernel rule is not satisfied.
Hi,
Thanks for your patch.
FYI: kernel test robot notices the stable kernel rule is not satisfied.
The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html#option-3
Rule: The upstream commit ID must be specified with a separate line above the commit text.
Subject: [PATCH for-5.15] perf inject: Fix GEN_ELF_TEXT_OFFSET for jit
Please ignore this mail if the patch is not relevant for upstream.
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Greg Kroah-Hartman
maintainerRe: [PATCH for-5.15] perf inject: Fix GEN_ELF_TEXT_OFFSET for jit
In reply to Namhyung KimQuoted 17 lines · Namhyung Kim
From: Adrian Hunter <[email protected]>
When a program header was added, it moved the text section but
GEN_ELF_TEXT_OFFSETwas not updated.Fix by adding the program header size and aligning.
Fixes babd04386b1df8c3 ("perf jit: Include program header in ELF files")Signed-off-by Adrian Hunter <[email protected]>Cc Ian Rogers <[email protected]>Cc Jiri Olsa <[email protected]>Cc Lieven Hey <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>[namhyung: use "linux/kernel.h" instead to avoid build failure]Signed-off-by Namhyung Kim <[email protected]>
Quoted 3 lines
--- tools/perf/util/genelf.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
What is the git commit id of this change in Linus's tree?
thanks,
greg k-h
Namhyung Kim
maintainerRe: [PATCH for-5.15] perf inject: Fix GEN_ELF_TEXT_OFFSET for jit
Hello,
Quoted 23 lines · Greg Kroah-Hartman
Quoted 17 lines · Namhyung Kim
From: Adrian Hunter <[email protected]>
When a program header was added, it moved the text section but
GEN_ELF_TEXT_OFFSETwas not updated.Fix by adding the program header size and aligning.
Fixes babd04386b1df8c3 ("perf jit: Include program header in ELF files")Signed-off-by Adrian Hunter <[email protected]>Cc Ian Rogers <[email protected]>Cc Jiri Olsa <[email protected]>Cc Lieven Hey <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>[namhyung: use "linux/kernel.h" instead to avoid build failure]Signed-off-by Namhyung Kim <[email protected]>Quoted 3 lines
--- tools/perf/util/genelf.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Quoted 1 line
What is the git commit id of this change in Linus's tree?
Sorry I forgot to add that. It's 89b15d00527b7825ff19130ed83478e80e3fae99
Thanks,
Namhyung
Greg Kroah-Hartman
maintainerRe: [PATCH for-5.15] perf inject: Fix GEN_ELF_TEXT_OFFSET for jit
Quoted 27 lines · Namhyung Kim
Hello,
Quoted 23 lines · Greg Kroah-Hartman
Quoted 20 lines · Namhyung Kim
From: Adrian Hunter <[email protected]>
When a program header was added, it moved the text section but
GEN_ELF_TEXT_OFFSETwas not updated.Fix by adding the program header size and aligning.
Fixes babd04386b1df8c3 ("perf jit: Include program header in ELF files")Signed-off-by Adrian Hunter <[email protected]>Cc Ian Rogers <[email protected]>Cc Jiri Olsa <[email protected]>Cc Lieven Hey <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>[namhyung: use "linux/kernel.h" instead to avoid build failure]Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/util/genelf.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Quoted 3 lines
Quoted 1 line
What is the git commit id of this change in Linus's tree?
Sorry I forgot to add that. It's
89b15d00527b7825ff19130ed83478e80e3fae99
Thanks, now queued up.
greg k-h
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.142 release. There are 67 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, 07 Dec 2023 03:14:57 +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.142-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
All tests passing for Tegra ...
Test results for stable-v5.15:
10 builds: 10 pass, 0 fail
26 boots: 26 pass, 0 fail
102 tests: 102 pass, 0 failLinux version: 5.15.142-rc1-gbff845be423f
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
tegra20-ventana, tegra210-p2371-2180,
tegra210-p3450-0000, tegra30-cardhu-a04Jon
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.142 release. There are 67 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, 07 Dec 2023 03:14:57 +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.142-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 powerpc build failures noticed.
* powerpc, build
- clang-17-defconfig - FAILED
- gcc-12-defconfig - FAILED
- gcc-8-defconfig - FAILED
build error:
---arch/powerpc/platforms/pseries/iommu.c: In function 'find_existing_ddw':arch/powerpc/platforms/pseries/iommu.c:908:49: error: 'struct dma_win' has no member named 'direct'
908 | *direct_mapping = window->direct;
| ^~
suspected commit:
powerpc/pseries/iommu: enable_ddw incorrectly returns direct mapping for SR-IOV device
[ Upstream commit 3bf983e4e93ce8e6d69e9d63f52a66ec0856672e ]
Links:
- https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.15.y/build/v5.15.141-68-gbff845be423f/testrun/21492943/suite/build/test/gcc-12-defconfig/details/
- https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.15.y/build/v5.15.141-68-gbff845be423f/testrun/21492943/suite/build/test/gcc-12-defconfig/history/
--
Linaro LKFT
https://lkft.linaro.org
Greg Kroah-Hartman
maintainerQuoted 37 lines · Naresh Kamboju
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.142 release. There are 67 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, 07 Dec 2023 03:14:57 +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.142-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 powerpc build failures noticed.
* powerpc, build
- clang-17-defconfig - FAILED
- gcc-12-defconfig - FAILED
- gcc-8-defconfig - FAILEDbuild error:
---arch/powerpc/platforms/pseries/iommu.c: In function 'find_existing_ddw':arch/powerpc/platforms/pseries/iommu.c:908:49: error: 'structdma_win' has no member named 'direct'
908 |*direct_mapping=window->direct;
| ^~
Quoted 6 lines
suspected commit:
powerpc/pseries/iommu:enable_ddwincorrectly returns direct mapping for SR-IOV device
[ Upstream commit3bf983e4e93ce8e6d69e9d63f52a66ec0856672e]
Thanks, now dropped from 5.15.y and 6.1.y
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.142 release. There are 67 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, 07 Dec 2023 03:14:57 +0000. Anything received after that time might be too late.
Build results:
total: 154 pass: 152 fail: 2
Failed builds:
powerpc:defconfig
powerpc:allmodconfig
Qemu test results:
total: 517 pass: 495 fail: 22 Failed tests: ppc64:mac99:ppc64_book3s_defconfig:smp:net=ne2k_pci:initrd ppc64:mac99:ppc64_book3s_defconfig:smp:net=pcnet:ide:rootfs ppc64:mac99:ppc64_book3s_defconfig:smp:net=e1000:sdhci-mmc:rootfs ppc64:mac99:ppc64_book3s_defconfig:smp:net=e1000e:nvme:rootfs ppc64:mac99:ppc64_book3s_defconfig:smp:net=virtio-net:scsi[DC395]:rootfs ppc64:pseries:pseries_defconfig:big:smp2:net=pcnet:initrd ppc64:pseries:pseries_defconfig:big:tpm-spapr:net=rtl8139:scsi:rootfs ppc64:pseries:pseries_defconfig:big:net=e1000e:usb:rootfs ppc64:pseries:pseries_defconfig:big:net=i82559a:sdhci-mmc:rootfs ppc64:pseries:pseries_defconfig:big:net=virtio-net-old:nvme:rootfs ppc64:pseries:pseries_defconfig:big:net=tulip:sata-sii3112:rootfs ppc64:pseries:pseries_defconfig:big:net=e1000:virtio-pci:rootfs ppc64:pseries:pseries_defconfig:big:net=e1000:virtio-pci-old:rootfs ppc64:pseries:pseries_defconfig:little:net=rtl8139:initrd ppc64:pseries:pseries_defconfig:little:tpm-spapr:net=e1000:scsi:rootfs ppc64:pseries:pseries_defconfig:little:net=pcnet:usb:rootfs ppc64:pseries:pseries_defconfig:little:net=e1000e:sata-sii3112:rootfs ppc64:pseries:pseries_defconfig:little:net=virtio-net:scsi[MEGASAS]:rootfs ppc64:pseries:pseries_defconfig:little:net=virtio-net-old:scsi[MEGASAS]:rootfs ppc64:pseries:pseries_defconfig:little:net=i82562:scsi[FUSION]:rootfs ppc64:pseries:pseries_defconfig:little:net=ne2k_pci:sdhci-mmc:rootfs ppc64:pseries:pseries_defconfig:little:net=usb-ohci:nvme:rootfs
As reported by others:
arch/powerpc/platforms/pseries/iommu.c: In function 'find_existing_ddw':arch/powerpc/platforms/pseries/iommu.c:908:49: error: 'struct dma_win' has no member named 'direct'
Guenter
Hello,
Quoted 5 lines · On 2023-12-05T12:16:45+09:00 Greg Kroah-Hartman <[email protected]>…
This is the start of the stable review cycle for the 5.15.142 release. There are 67 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.
Quoted 8 lines
Responses should be made by Thu, 07 Dec 2023 03:14:57 +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.142-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.
This rc kernel passes DAMON functionality test[1] on my test machine. Attaching the test results summary below. Please note that I retrieved the kernel from linux-stable-rc tree[2].
[1] https://github.com/awslabs/damon-tests/tree/next/corr
[2] bff845be423f ("Linux 5.15.142-rc1")
Thanks,
SJ
[...]
---
ok 1 selftests: damon: debugfs_attrs.sh
ok 1 selftests: damon-tests: kunit.sh
ok 2 selftests: damon-tests: huge_count_read_write.sh
ok 3 selftests: damon-tests: buffer_overflow.sh
ok 4 selftests: damon-tests: rm_contexts.sh
ok 5 selftests: damon-tests: record_null_deref.sh
ok 6 selftests: damon-tests: dbgfs_target_ids_read_before_terminate_race.sh ok 7 selftests: damon-tests: dbgfs_target_ids_pid_leak.sh
ok 8 selftests: damon-tests: damo_tests.sh
ok 9 selftests: damon-tests: masim-record.sh
ok 10 selftests: damon-tests: build_i386.sh
ok 11 selftests: damon-tests: build_arm64.sh
ok 12 selftests: damon-tests: build_i386_idle_flag.sh
ok 13 selftests: damon-tests: build_i386_highpte.sh
ok 14 selftests: damon-tests: build_nomemcg.sh
[33m
[92mPASS [39m
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.142 release. There are 67 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, 07 Dec 2023 03:14:57 +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.142-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 10 lines
This is the start of the stable review cycle for the 5.15.142 release. There are 67 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, 07 Dec 2023 03:14:57 +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.142-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 x86_64 and ARM64 test systems. No errors or regressions.
Perf builds fine too.
Thanks.
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.142 release. There are 67 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, 07 Dec 2023 03:14:57 +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.142-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.
thanks,
-- Shuah