5.15.112-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 1/134 ring-buffer: Ensure proper resetting of atomic variables in ring_buffer_reset_online_cpus
In reply to Greg Kroah-HartmanFrom: Tze-nan Wu <[email protected]>
[ Upstream commit 7c339fb4d8577792378136c15fde773cfb863cb8 ]
In ring_buffer_reset_online_cpus, the buffer_size_kb write operation may permanently fail if the cpu_online_mask changes between two for_each_online_buffer_cpu loops. The number of increases and decreases on both cpu_buffer->resize_disabled and cpu_buffer->record_disabled may be inconsistent, causing some CPUs to have non-zero values for these atomic variables after the function returns.
This issue can be reproduced by "echo 0 > trace" while hotplugging cpu. After reproducing success, we can find out buffer_size_kb will not be functional anymore.
To prevent leaving 'resize_disabled' and 'record_disabled' non-zero after ring_buffer_reset_online_cpus returns, we ensure that each atomic variable has been set up before atomic_sub() to it.
--- kernel/trace/ring_buffer.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
kernel/trace/ring_buffer.c +13 -3
@@ -5295,6 +5295,9 @@ void ring_buffer_reset_cpu(struct trace_buffer *buffer, int cpu) }EXPORT_SYMBOL_GPL (ring_buffer_reset_cpu); +/* Flag to ensure proper resetting of atomic variables */ +#define RESET_BIT (1 << 30) +/** * ring_buffer_reset_cpu - reset a ring buffer per CPU buffer * @buffer: The ring buffer to reset a per cpu buffer of
@@ -5311,20 +5314,27 @@ void ring_buffer_reset_online_cpus(struct trace_buffer *buffer)for_each_online_buffer_cpu (buffer, cpu) { cpu_buffer = buffer->buffers[cpu]; -atomic_inc (&cpu_buffer->resize_disabled); +atomic_add (RESET_BIT , &cpu_buffer->resize_disabled);atomic_inc (&cpu_buffer->record_disabled); }/* Make sure all commits have finished */ synchronize_rcu (); -for_each_online_buffer_cpu (buffer, cpu) { +for_each_buffer_cpu (buffer, cpu) { cpu_buffer = buffer->buffers[cpu]; +/* +* If a CPU came online during the synchronize_rcu(), then +* ignore it. +*/ +if (!(atomic_read (&cpu_buffer->resize_disabled) &RESET_BIT )) +continue ; +reset_disabled_cpu_buffer (cpu_buffer);atomic_dec (&cpu_buffer->record_disabled); -atomic_dec (&cpu_buffer->resize_disabled); +atomic_sub (RESET_BIT , &cpu_buffer->resize_disabled); }mutex_unlock (&buffer->mutex);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 10/134 mailbox: zynqmp: Fix counts of child nodes
In reply to Greg Kroah-HartmanFrom: Tanmay Shah <[email protected]>
[ Upstream commit f72f805e72882c361e2a612c64a6e549f3da7152 ]
If child mailbox node status is disabled it causes crash in interrupt handler. Fix this by assigning only available child node during driver probe.
--- drivers/mailbox/zynqmp-ipi-mailbox.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/mailbox/zynqmp-ipi-mailbox.c +6 -1
@@ -634,7 +634,12 @@ static int zynqmp_ipi_probe(struct platform_device *pdev)struct zynqmp_ipi_mbox *mbox;int num_mboxes, ret = -EINVAL ; - num_mboxes =of_get_child_count (np); + num_mboxes =of_get_available_child_count (np); +if (num_mboxes ==0 ) { +dev_err (dev,"mailbox nodes not available\n" ); +return -EINVAL ; + } + pdata =devm_kzalloc (dev,struct_size (pdata, ipi_mboxes, num_mboxes),GFP_KERNEL );if (!pdata)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 2/134 crypto: ccp - Clear PSP interrupt status register before calling handler
In reply to Greg Kroah-HartmanFrom: Jeremi Piotrowski <[email protected]>
[ Upstream commit 45121ad4a1750ca47ce3f32bd434bdb0cdbf0043 ]
The PSP IRQ is edge-triggered (MSI or MSI-X) in all cases supported by the psp module so clear the interrupt status register early in the handler to prevent missed interrupts. sev_irq_handler() calls wake_up() on a wait queue, which can result in a new command being submitted from a different CPU. This then races with the clearing of isr and can result in missed interrupts. A missed interrupt results in a command waiting until it times out, which results in the psp being declared dead.
This is unlikely on bare metal, but has been observed when running virtualized. In the cases where this is observed, sev->cmdresp_reg has PSP_CMDRESP_RESP set which indicates that the command was processed correctly but no interrupt was asserted.
The full sequence of events looks like this:
CPU 1: submits SEV cmd #1 CPU 1: calls wait_event_timeout() CPU 0: enters psp_irq_handler() CPU 0: calls sev_handler()->wake_up() CPU 1: wakes up; finishes processing cmd #1 CPU 1: submits SEV cmd #2 CPU 1: calls wait_event_timeout() PSP: finishes processing cmd #2; interrupt status is still set; no interrupt CPU 0: clears intsts CPU 0: exits psp_irq_handler() CPU 1: wait_event_timeout() times out; psp_dead=true
--- drivers/crypto/ccp/psp-dev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/crypto/ccp/psp-dev.c +3 -3
@@ -42,6 +42,9 @@ static irqreturn_t psp_irq_handler(int irq, void *data)/* Read the interrupt status: */ status =ioread32 (psp->io_regs + psp->vdata->intsts_reg); +/* Clear the interrupt status by writing the same value we read. */ +iowrite32 (status, psp->io_regs + psp->vdata->intsts_reg); +/* invoke subdevice interrupt handlers */ if (status) {if (psp->sev_irq_handler)
@@ -51,9 +54,6 @@ static irqreturn_t psp_irq_handler(int irq, void *data) psp->tee_irq_handler (irq, psp->tee_irq_data, status); } -/* Clear the interrupt status by writing the same value we read. */ -iowrite32 (status, psp->io_regs + psp->vdata->intsts_reg); -return IRQ_HANDLED ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 3/134 ubifs: Fix AA deadlock when setting xattr for encrypted file
In reply to Greg Kroah-HartmanFrom: Zhihao Cheng <[email protected]>
[ Upstream commit a0c51565730729f0df2ee886e34b4da6d359a10b ]
Following process:vfs_setxattr(host)
ubifs_xattr_set
down_write(host_ui->xattr_sem) <- lock first time
create_xattr
ubifs_new_inode(host)
fscrypt_prepare_new_inode(host)
fscrypt_policy_to_inherit(host)
if (IS_ENCRYPTED(inode))
fscrypt_require_key(host)
fscrypt_get_encryption_info(host)
ubifs_xattr_get(host)
down_read(host_ui->xattr_sem) <- AA deadlock, which may trigger an AA deadlock problem:
[ 102.620871] INFO: task setfattr:1599 blocked for more than 10 seconds. [ 102.625298] Not tainted 5.19.0-rc7-00001-gb666b6823ce0-dirty #711 [ 102.628732] task:setfattr state:D stack: 0 pid: 1599 [ 102.628749] Call Trace: [ 102.628753] <TASK> [ 102.628776] __schedule+0x482/0x1060 [ 102.629964] schedule+0x92/0x1a0 [ 102.629976] rwsem_down_read_slowpath+0x287/0x8c0 [ 102.629996] down_read+0x84/0x170 [ 102.630585] ubifs_xattr_get+0xd1/0x370 [ubifs] [ 102.630730] ubifs_crypt_get_context+0x1f/0x30 [ubifs] [ 102.630791] fscrypt_get_encryption_info+0x7d/0x1c0 [ 102.630810] fscrypt_policy_to_inherit+0x56/0xc0 [ 102.630817] fscrypt_prepare_new_inode+0x35/0x160 [ 102.630830] ubifs_new_inode+0xcc/0x4b0 [ubifs] [ 102.630873] ubifs_xattr_set+0x591/0x9f0 [ubifs] [ 102.630961] xattr_set+0x8c/0x3e0 [ubifs] [ 102.631003] __vfs_setxattr+0x71/0xc0 [ 102.631026] vfs_setxattr+0x105/0x270 [ 102.631034] do_setxattr+0x6d/0x110 [ 102.631041] setxattr+0xa0/0xd0 [ 102.631087] __x64_sys_setxattr+0x2f/0x40
Fetch a reproducer in [Link].
Just like ext4 does, which skips encrypting for inode with EXT4_EA_INODE_FL flag. Stop encypting xattr inode for ubifs.
Stable-dep-of: 3a36d20e0129 ("ubifs: Fix memory leak in do_rename")
--- fs/ubifs/dir.c | 25 ++++++++++++++----------- fs/ubifs/ubifs.h | 2 +- fs/ubifs/xattr.c | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-)
fs/ubifs/dir.c +14 -11
@@ -68,13 +68,14 @@ static int inherit_flags(const struct inode *dir, umode_t mode)* @c: UBIFS file-system description object * @dir: parent directory inode * @mode: inode mode flags +* @is_xattr: whether the inode is xattr inode * * This function finds an unused inode number, allocates new inode and * initializes it. Returns new inode in case of success and an error code in * case of failure. */ struct inode *ubifs_new_inode (struct ubifs_info *c,struct inode *dir, -umode_t mode) +umode_t mode,bool is_xattr) {int err;struct inode *inode;
@@ -99,10 +100,12 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, struct inode *dir,current_time (inode); inode->i_mapping->nrpages =0 ; - err =fscrypt_prepare_new_inode (dir, inode, &encrypted); -if (err) { -ubifs_err (c,"fscrypt_prepare_new_inode failed: %i" , err); - goto out_iput; +if (!is_xattr) { + err =fscrypt_prepare_new_inode (dir, inode, &encrypted); +if (err) { +ubifs_err (c,"fscrypt_prepare_new_inode failed: %i" , err); + goto out_iput; + } }switch (mode &S_IFMT ) {
@@ -309,7 +312,7 @@ static int ubifs_create(struct user_namespace *mnt_userns, struct inode *dir, sz_change =CALC_DENT_SIZE (fname_len (&nm)); - inode =ubifs_new_inode (c, dir, mode); + inode =ubifs_new_inode (c, dir, mode, false);if (IS_ERR (inode)) { err =PTR_ERR (inode); goto out_fname;
@@ -370,7 +373,7 @@ static struct inode *create_whiteout(struct inode *dir, struct dentry *dentry)if (err)return ERR_PTR (err); - inode =ubifs_new_inode (c, dir, mode); + inode =ubifs_new_inode (c, dir, mode, false);if (IS_ERR (inode)) { err =PTR_ERR (inode); goto out_free;
@@ -462,7 +465,7 @@ static int ubifs_tmpfile(struct user_namespace *mnt_userns, struct inode *dir,return err; } - inode =ubifs_new_inode (c, dir, mode); + inode =ubifs_new_inode (c, dir, mode, false);if (IS_ERR (inode)) { err =PTR_ERR (inode); goto out_budg;
@@ -1005,7 +1008,7 @@ static int ubifs_mkdir(struct user_namespace *mnt_userns, struct inode *dir, sz_change =CALC_DENT_SIZE (fname_len (&nm)); - inode =ubifs_new_inode (c, dir,S_IFDIR | mode); + inode =ubifs_new_inode (c, dir,S_IFDIR | mode, false);if (IS_ERR (inode)) { err =PTR_ERR (inode); goto out_fname;
@@ -1092,7 +1095,7 @@ static int ubifs_mknod(struct user_namespace *mnt_userns, struct inode *dir, sz_change =CALC_DENT_SIZE (fname_len (&nm)); - inode =ubifs_new_inode (c, dir, mode); + inode =ubifs_new_inode (c, dir, mode, false);if (IS_ERR (inode)) {kfree (dev); err =PTR_ERR (inode);
@@ -1174,7 +1177,7 @@ static int ubifs_symlink(struct user_namespace *mnt_userns, struct inode *dir, sz_change =CALC_DENT_SIZE (fname_len (&nm)); - inode =ubifs_new_inode (c, dir,S_IFLNK |S_IRWXUGO ); + inode =ubifs_new_inode (c, dir,S_IFLNK |S_IRWXUGO , false);if (IS_ERR (inode)) { err =PTR_ERR (inode); goto out_fname;
fs/ubifs/ubifs.h +1 -1
@@ -2002,7 +2002,7 @@ int ubifs_update_time(struct inode *inode, struct timespec64 *time, int flags);/* dir.c */ struct inode *ubifs_new_inode (struct ubifs_info *c,struct inode *dir, -umode_t mode); +umode_t mode,bool is_xattr);int ubifs_getattr (struct user_namespace *mnt_userns,const struct path *path,struct kstat *stat,u32 request_mask,unsigned int flags);int ubifs_check_dir_empty (struct inode *dir);
fs/ubifs/xattr.c +1 -1
@@ -110,7 +110,7 @@ static int create_xattr(struct ubifs_info *c, struct inode *host,if (err)return err; - inode =ubifs_new_inode (c, host,S_IFREG |S_IRWXUGO ); + inode =ubifs_new_inode (c, host,S_IFREG |S_IRWXUGO , true);if (IS_ERR (inode)) { err =PTR_ERR (inode); goto out_budg;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 4/134 ubifs: Fix memory leak in do_rename
In reply to Greg Kroah-HartmanFrom: Mårten Lindahl <[email protected]>
[ Upstream commit 3a36d20e012903f45714df2731261fdefac900cb ]
If renaming a file in an encrypted directory, function fscrypt_setup_filename allocates memory for a file name. This name is never used, and before returning to the caller the memory for it is not freed.
When running kmemleak on it we see that it is registered as a leak. The report below is triggered by a simple program 'rename' that renames a file in an encrypted directory:
unreferenced object 0xffff888101502840 (size 32):
comm "rename", pid 9404, jiffies 4302582475 (age 435.735s)
backtrace:
__kmem_cache_alloc_node
__kmalloc
fscrypt_setup_filename
do_rename
ubifs_rename
vfs_rename
do_renameat2To fix this we can remove the call to fscrypt_setup_filename as it's not needed.
--- fs/ubifs/dir.c | 6 ------ 1 file changed, 6 deletions(-)
fs/ubifs/dir.c +0 -6
@@ -358,7 +358,6 @@ static struct inode *create_whiteout(struct inode *dir, struct dentry *dentry)umode_t mode =S_IFCHR |WHITEOUT_MODE ;struct inode *inode;struct ubifs_info *c = dir->i_sb->s_fs_info; -struct fscrypt_name nm;/* * Create an inode('nlink = 1') for whiteout without updating journal,
@@ -369,10 +368,6 @@ static struct inode *create_whiteout(struct inode *dir, struct dentry *dentry)dbg_gen ("dent '%pd', mode %#hx in dir ino %lu" , dentry, mode, dir->i_ino); - err =fscrypt_setup_filename (dir, &dentry->d_name,0 , &nm); -if (err) -return ERR_PTR (err); - inode =ubifs_new_inode (c, dir, mode, false);if (IS_ERR (inode)) { err =PTR_ERR (inode);
@@ -395,7 +390,6 @@ static struct inode *create_whiteout(struct inode *dir, struct dentry *dentry)make_bad_inode (inode);iput (inode); out_free: -fscrypt_free_filename (&nm);ubifs_err (c,"cannot create whiteout file, error %d" , err);return ERR_PTR (err); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 5/134 bus: mhi: Move host MHI code to "host" directory
In reply to Greg Kroah-HartmanFrom: Manivannan Sadhasivam <[email protected]>
[ Upstream commit a0f5a630668cb8b2ebf5204f08e957875e991780 ]
In preparation of the endpoint MHI support, let's move the host MHI code to its own "host" directory and adjust the toplevel MHI Kconfig & Makefile.
While at it, let's also move the "pci_generic" driver to "host" directory as it is a host MHI controller driver.
Stable-dep-of: d469d9448a0f ("bus: mhi: host: Remove duplicate ee check for syserr")
---
drivers/bus/Makefile | 2 +-
drivers/bus/mhi/Kconfig | 27 ++------------------
drivers/bus/mhi/Makefile | 8 ++----
drivers/bus/mhi/host/Kconfig | 31 +++++++++++++++++++++++
drivers/bus/mhi/{core => host}/Makefile | 4 ++-
drivers/bus/mhi/{core => host}/boot.c | 0
drivers/bus/mhi/{core => host}/debugfs.c | 0
drivers/bus/mhi/{core => host}/init.c | 0
drivers/bus/mhi/{core => host}/internal.h | 0
drivers/bus/mhi/{core => host}/main.c | 0
drivers/bus/mhi/{ => host}/pci_generic.c | 0
drivers/bus/mhi/{core => host}/pm.c | 0
12 files changed, 39 insertions(+), 33 deletions(-)
create mode 100644 drivers/bus/mhi/host/Kconfig
rename drivers/bus/mhi/{core => host}/Makefile (54%)
rename drivers/bus/mhi/{core => host}/boot.c (100%)
rename drivers/bus/mhi/{core => host}/debugfs.c (100%)
rename drivers/bus/mhi/{core => host}/init.c (100%)
rename drivers/bus/mhi/{core => host}/internal.h (100%)
rename drivers/bus/mhi/{core => host}/main.c (100%)
rename drivers/bus/mhi/{ => host}/pci_generic.c (100%)
rename drivers/bus/mhi/{core => host}/pm.c (100%)drivers/bus/Makefile +1 -1
@@ -39,4 +39,4 @@ obj-$(CONFIG_VEXPRESS_CONFIG) += vexpress-config.o obj-$(CONFIG_DA8XX_MSTPRI) += da8xx-mstpri.o # MHI -obj-$(CONFIG_MHI_BUS) += mhi/ +obj-y += mhi/
drivers/bus/mhi/Kconfig +2 -25
@@ -2,30 +2,7 @@ # # MHI bus # -# Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. +# Copyright (c) 2021, Linaro Ltd. # -config MHI_BUS - tristate "Modem Host Interface (MHI) bus" - help - Bus driver for MHI protocol. Modem Host Interface (MHI) is a - communication protocol used by the host processors to control - and communicate with modem devices over a high speed peripheral - bus or shared memory. - -config MHI_BUS_DEBUG - bool "Debugfs support for the MHI bus" - depends on MHI_BUS && DEBUG_FS - help - Enable debugfs support for use with the MHI transport. Allows - reading and/or modifying some values within the MHI controller - for debug and test purposes. - -config MHI_BUS_PCI_GENERIC - tristate "MHI PCI controller driver" - depends on MHI_BUS - depends on PCI - help - This driver provides MHI PCI controller driver for devices such as - Qualcomm SDX55 based PCIe modems. - +source "drivers/bus/mhi/host/Kconfig"
drivers/bus/mhi/Makefile +2 -6
@@ -1,6 +1,2 @@ -# core layer -obj-y += core/ - -obj-$(CONFIG_MHI_BUS_PCI_GENERIC) += mhi_pci_generic.o -mhi_pci_generic-y += pci_generic.o - +# Host MHI stack +obj-y += host/
drivers/bus/mhi/host/Kconfig new file +31 -0
@@ -0,0 +1,31 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# MHI bus +# +# Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. +# + +config MHI_BUS + tristate "Modem Host Interface (MHI) bus" + help + Bus driver for MHI protocol. Modem Host Interface (MHI) is a + communication protocol used by the host processors to control + and communicate with modem devices over a high speed peripheral + bus or shared memory. + +config MHI_BUS_DEBUG + bool "Debugfs support for the MHI bus" + depends on MHI_BUS && DEBUG_FS + help + Enable debugfs support for use with the MHI transport. Allows + reading and/or modifying some values within the MHI controller + for debug and test purposes. + +config MHI_BUS_PCI_GENERIC + tristate "MHI PCI controller driver" + depends on MHI_BUS + depends on PCI + help + This driver provides MHI PCI controller driver for devices such as + Qualcomm SDX55 based PCIe modems. +
drivers/bus/mhi/host/Makefile renamed from drivers/bus/mhi/core/Makefile +3 -1
@@ -1,4 +1,6 @@ obj-$(CONFIG_MHI_BUS) += mhi.o - mhi-y := init.o main.o pm.o boot.o mhi-$(CONFIG_MHI_BUS_DEBUG) += debugfs.o + +obj-$(CONFIG_MHI_BUS_PCI_GENERIC) += mhi_pci_generic.o +mhi_pci_generic-y += pci_generic.o
drivers/bus/mhi/host/boot.c renamed from drivers/bus/mhi/core/boot.c +0 -0
drivers/bus/mhi/host/debugfs.c renamed from drivers/bus/mhi/core/debugfs.c +0 -0
drivers/bus/mhi/host/init.c renamed from drivers/bus/mhi/core/init.c +0 -0
drivers/bus/mhi/host/internal.h renamed from drivers/bus/mhi/core/internal.h +0 -0
drivers/bus/mhi/host/main.c renamed from drivers/bus/mhi/core/main.c +0 -0
drivers/bus/mhi/host/pci_generic.c renamed from drivers/bus/mhi/pci_generic.c +0 -0
drivers/bus/mhi/host/pm.c renamed from drivers/bus/mhi/core/pm.c +0 -0
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 6/134 bus: mhi: host: Remove duplicate ee check for syserr
In reply to Greg Kroah-HartmanFrom: Jeffrey Hugo <[email protected]>
[ Upstream commit d469d9448a0f1a33c175d3280b1542fa0158ad7a ]
If we detect a system error via intvec, we only process the syserr if the current ee is different than the last observed ee. The reason for this check is to prevent bhie from running multiple times, but with the single queue handling syserr, that is not possible.
The check can cause an issue with device recovery. If PBL loads a bad SBL via BHI, but that SBL hangs before notifying the host of an ee change, then issuing soc_reset to crash the device and retry (after supplying a fixed SBL) will not recover the device as the host will observe a PBL->PBL transition and not process the syserr. The device will be stuck until either the driver is reloaded, or the host is rebooted. Instead, remove the check so that we can attempt to recover the device.
--- drivers/bus/mhi/host/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bus/mhi/host/main.c +1 -1
@@ -489,7 +489,7 @@ irqreturn_t mhi_intvec_threaded_handler(int irq_number, void *priv) }write_unlock_irq (&mhi_cntrl->pm_lock); -if (pm_state !=MHI_PM_SYS_ERR_DETECT || ee == mhi_cntrl->ee) +if (pm_state !=MHI_PM_SYS_ERR_DETECT ) goto exit_intvec;switch (ee) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 7/134 bus: mhi: host: Use mhi_tryset_pm_state() for setting fw error state
In reply to Greg Kroah-HartmanFrom: Jeffrey Hugo <[email protected]>
[ Upstream commit 1d1493bdc25f498468a606a4ece947d155cfa3a9 ]
If firmware loading fails, the controller's pm_state is updated to MHI_PM_FW_DL_ERR unconditionally. This can corrupt the pm_state as the update is not done under the proper lock, and also does not validate the state transition. The firmware loading can fail due to a detected syserr, but if MHI_PM_FW_DL_ERR is unconditionally set as the pm_state, the handling of the syserr can break when it attempts to transition from syserr detect, to syserr process.
By grabbing the lock, we ensure we don't race with some other pm_state update. By using mhi_try_set_pm_state(), we check that the transition to MHI_PM_FW_DL_ERR is valid via the state machine logic. If it is not valid, then some other transition is occurring like syserr processing, and we assume that will resolve the firmware loading error.
--- drivers/bus/mhi/host/boot.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/bus/mhi/host/boot.c +12 -4
@@ -390,6 +390,7 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl) {const struct firmware *firmware =NULL ;struct device *dev = &mhi_cntrl->mhi_dev->dev; +enum mhi_pm_state new_state;const char *fw_name;void *buf;dma_addr_t dma_addr;
@@ -507,14 +508,18 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl) } error_fw_load: - mhi_cntrl->pm_state =MHI_PM_FW_DL_ERR ; -wake_up_all (&mhi_cntrl->state_event); +write_lock_irq (&mhi_cntrl->pm_lock); + new_state =mhi_tryset_pm_state (mhi_cntrl,MHI_PM_FW_DL_ERR ); +write_unlock_irq (&mhi_cntrl->pm_lock); +if (new_state ==MHI_PM_FW_DL_ERR ) +wake_up_all (&mhi_cntrl->state_event); }int mhi_download_amss_image (struct mhi_controller *mhi_cntrl) {struct image_info *image_info = mhi_cntrl->fbc_image;struct device *dev = &mhi_cntrl->mhi_dev->dev; +enum mhi_pm_state new_state;int ret;if (!image_info)
@@ -525,8 +530,11 @@ int mhi_download_amss_image(struct mhi_controller *mhi_cntrl) &image_info->mhi_buf[image_info->entries - 1]);if (ret) {dev_err (dev,"MHI did not load AMSS, ret:%d\n" , ret); - mhi_cntrl->pm_state =MHI_PM_FW_DL_ERR ; -wake_up_all (&mhi_cntrl->state_event); +write_lock_irq (&mhi_cntrl->pm_lock); + new_state =mhi_tryset_pm_state (mhi_cntrl,MHI_PM_FW_DL_ERR ); +write_unlock_irq (&mhi_cntrl->pm_lock); +if (new_state ==MHI_PM_FW_DL_ERR ) +wake_up_all (&mhi_cntrl->state_event); }return ret;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 8/134 bus: mhi: host: Range check CHDBOFF and ERDBOFF
In reply to Greg Kroah-HartmanFrom: Jeffrey Hugo <[email protected]>
[ Upstream commit 6a0c637bfee69a74c104468544d9f2a6579626d0 ]
If the value read from the CHDBOFF and ERDBOFF registers is outside the range of the MHI register space then an invalid address might be computed which later causes a kernel panic. Range check the read value to prevent a crash due to bad data from the device.
--- drivers/bus/mhi/host/init.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/bus/mhi/host/init.c +12 -0
@@ -517,6 +517,12 @@ int mhi_init_mmio(struct mhi_controller *mhi_cntrl)return -EIO ; } +if (val >= mhi_cntrl->reg_len - (8 *MHI_DEV_WAKE_DB )) { +dev_err (dev,"CHDB offset: 0x%x is out of range: 0x%zx\n" , + val, mhi_cntrl->reg_len - (8 *MHI_DEV_WAKE_DB )); +return -ERANGE ; + } +/* Setup wake db */ mhi_cntrl->wake_db = base + val + (8 *MHI_DEV_WAKE_DB ); mhi_cntrl->wake_set = false;
@@ -534,6 +540,12 @@ int mhi_init_mmio(struct mhi_controller *mhi_cntrl)return -EIO ; } +if (val >= mhi_cntrl->reg_len - (8 * mhi_cntrl->total_ev_rings)) { +dev_err (dev,"ERDB offset: 0x%x is out of range: 0x%zx\n" , + val, mhi_cntrl->reg_len - (8 * mhi_cntrl->total_ev_rings)); +return -ERANGE ; + } +/* Setup event db address for each ev_ring */ mhi_event = mhi_cntrl->mhi_event;for (i =0 ; i < mhi_cntrl->total_ev_rings; i++, val +=8 , mhi_event++) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 9/134 mailbox: zynq: Switch to flexible array to simplify code
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 043f85ce81cb1714e14d31c322c5646513dde3fb ]
Using flexible array is more straight forward. It
- saves 1 pointer in the 'zynqmp_ipi_pdata' structure
- saves an indirection when using this array
- saves some LoC and avoids some always spurious pointer arithmetic
Stable-dep-of: f72f805e7288 ("mailbox: zynqmp: Fix counts of child nodes")
--- drivers/mailbox/zynqmp-ipi-mailbox.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/mailbox/zynqmp-ipi-mailbox.c +2 -4
@@ -110,7 +110,7 @@ struct zynqmp_ipi_pdata {unsigned int method;u32 local_id;int num_mboxes; -struct zynqmp_ipi_mbox *ipi_mboxes; +struct zynqmp_ipi_mbox ipi_mboxes[]; };static struct device_driver zynqmp_ipi_mbox_driver = {
@@ -635,7 +635,7 @@ static int zynqmp_ipi_probe(struct platform_device *pdev)int num_mboxes, ret = -EINVAL ; num_mboxes =of_get_child_count (np); - pdata =devm_kzalloc (dev,sizeof (*pdata) + (num_mboxes *sizeof (*mbox)), + pdata =devm_kzalloc (dev,struct_size (pdata, ipi_mboxes, num_mboxes),GFP_KERNEL );if (!pdata)return -ENOMEM ;
@@ -649,8 +649,6 @@ static int zynqmp_ipi_probe(struct platform_device *pdev) } pdata->num_mboxes = num_mboxes; - pdata->ipi_mboxes = (struct zynqmp_ipi_mbox *) - ((char *)pdata +sizeof (*pdata)); mbox = pdata->ipi_mboxes;for_each_available_child_of_node (np, nc) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainercover 5.15.112-rc1 review
This is the start of the stable review cycle for the 5.15.112 release. There are 134 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 17 May 2023 16:16:37 +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.112-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.112-rc1
Aurabindo Pillai <[email protected]>
drm/amd/display: Fix hang when skipping modeset
Alexandre Ghiti <[email protected]>
RISC-V: Fix up a cherry-pick warning in setup_vm_final()
Christoph Böhmwalder <[email protected]>
drbd: correctly submit flush bio on barrier
Ilpo Järvinen <[email protected]>
serial: 8250: Fix serial8250_tx_empty() race with DMA Tx
Konrad Dybcio <[email protected]>
drm/msm/adreno: adreno_gpu: Use suspend() instead of idle() on load error
Theodore Ts'o <[email protected]>
ext4: fix invalid free tracking in ext4_xattr_move_to_block()
Theodore Ts'o <[email protected]>
ext4: remove a BUG_ON in ext4_mb_release_group_pa()
Theodore Ts'o <[email protected]>
ext4: bail out of ext4_xattr_ibody_get() fails for any reason
Theodore Ts'o <[email protected]>
ext4: add bounds checking in get_max_inline_xattr_value_size()
Theodore Ts'o <[email protected]>
ext4: fix deadlock when converting an inline directory in nojournal mode
Theodore Ts'o <[email protected]>
ext4: improve error handling from ext4_dirhash()
Theodore Ts'o <[email protected]>
ext4: improve error recovery code paths in __ext4_remount()
Baokun Li <[email protected]>
ext4: check iomap type only if ext4_iomap_begin() does not fail
Jan Kara <[email protected]>
ext4: fix data races when using cached status extents
Tudor Ambarus <[email protected]>
ext4: avoid a potential slab-out-of-bounds in ext4_group_desc_csum
Ye Bin <[email protected]>
ext4: fix WARNING in mb_find_extent
John Stultz <[email protected]>
locking/rwsem: Add __always_inline annotation to __down_read_common() and inlined callers
Namjae Jeon <[email protected]>
ksmbd: not allow guest user on multichannel
Namjae Jeon <[email protected]>
ksmbd: fix deadlock in ksmbd_find_crypto_ctx()
Namjae Jeon <[email protected]>
ksmbd: fix racy issue while destroying session on multichannel
Namjae Jeon <[email protected]>
ksmbd: fix kernel oops from idr_remove()
Namjae Jeon <[email protected]>
ksmbd: add channel rwlock
Namjae Jeon <[email protected]>
ksmbd: replace sessions list in connection with xarray
Namjae Jeon <[email protected]>
ksmbd: fix multi session connection failure
Namjae Jeon <[email protected]>
ksmbd: set RSS capable in FSCTL_QUERY_NETWORK_INTERFACE_INFO
Sascha Hauer <[email protected]>
wifi: rtw88: rtw8821c: Fix rfe_option field width
Nicholas Kazlauskas <[email protected]>
drm/amd/display: Add NULL plane_state check for cursor disable logic
Dale Zhao <[email protected]>
drm/amd/display: Refine condition of cursor visibility for pipe-split
Johan Hovold <[email protected]>
drm/msm/adreno: fix runtime PM imbalance at gpu load
Rob Clark <[email protected]>
drm/msm: Remove struct_mutex usage
Ankit Nautiyal <[email protected]>
drm/i915/dg2: Add HDMI pixel clock frequencies 267.30 and 319.89 MHz
Taylor, Clinton A <[email protected]>
drm/i915/dg2: Add additional HDMI pixel clock frequencies
Vandita Kulkarni <[email protected]>
drm/i915/dg2: Support 4k@30 on HDMI
Kuninori Morimoto <[email protected]>
ASoC: soc-pcm.c: call __soc_pcm_close() in soc_pcm_close()
Takashi Iwai <[email protected]>
ASoC: DPCM: Don't pick up BE without substream
Takashi Iwai <[email protected]>
ASoC: soc-pcm: Move debugfs removal out of spinlock
Daniel Baluta <[email protected]>
ASoC: soc-compress: Inherit atomicity from DAI link for Compress FE
Takashi Iwai <[email protected]>
ASoC: soc-pcm: Fix DPCM lockdep warning due to nested stream locks
Konstantin Komarov <[email protected]>
fs/ntfs3: Refactoring of various minor issues
Ping Cheng <[email protected]>
HID: wacom: insert timestamp to packed Bluetooth (BT) events
Ping Cheng <[email protected]>
HID: wacom: Set a default resolution for older tablets
Guchun Chen <[email protected]>
drm/amdgpu: disable sdma ecc irq only when sdma RAS is enabled in suspend
Lin.Cao <[email protected]>
drm/amdgpu: Fix vram recover doesn't work after whole GPU reset (v2)
Guchun Chen <[email protected]>
drm/amdgpu/gfx: disable gfx9 cp_ecc_error_irq only when enabling legacy gfx ras
Hamza Mahfooz <[email protected]>
drm/amdgpu: fix an amdgpu_irq_put() issue in gmc_v9_0_hw_fini()
Hamza Mahfooz <[email protected]>
drm/amd/display: fix flickering caused by S/G mode
James Cowgill <[email protected]>
drm/panel: otm8009a: Set backlight parent to panel device
Jaegeuk Kim <[email protected]>
f2fs: fix potential corruption when moving a directory
Johan Hovold <[email protected]>
drm/msm: fix NULL-deref on irq uninstall
Johan Hovold <[email protected]>
drm/msm: fix NULL-deref on snapshot tear down
Francesco Dolcini <[email protected]>
drm/bridge: lt8912b: Fix DSI Video Mode
Krzysztof Kozlowski <[email protected]>
ARM: dts: s5pv210: correct MIPI CSIS clock name
Krzysztof Kozlowski <[email protected]>
ARM: dts: exynos: fix WM8960 clock name in Itop Elite
Mathieu Poirier <[email protected]>
remoteproc: imx_rproc: Call of_node_put() on iteration error
Mathieu Poirier <[email protected]>
remoteproc: st: Call of_node_put() on iteration error
Mathieu Poirier <[email protected]>
remoteproc: stm32: Call of_node_put() on iteration error
Randy Dunlap <[email protected]>
sh: nmi_debug: fix return value of __setup handler
Randy Dunlap <[email protected]>
sh: init: use OF_EARLY_FLATTREE for early init
Randy Dunlap <[email protected]>
sh: mcount.S: fix build error when PRINTK is not enabled
Randy Dunlap <[email protected]>
sh: math-emu: fix macro redefined warning
Steve French <[email protected]>
SMB3: force unmount was failing to close deferred close files
Steve French <[email protected]>
smb3: fix problem remounting a share after shutdown
Jan Kara <[email protected]>
inotify: Avoid reporting event with invalid wd
Andrey Avdeev <[email protected]>
platform/x86: touchscreen_dmi: Add info for the Dexp Ursus KX210i
Hans de Goede <[email protected]>
platform/x86: touchscreen_dmi: Add upside-down quirk for GDIX1002 ts on the Juno Tablet
Steve French <[email protected]>
cifs: release leases for deferred close handles when freezing
Pawel Witek <[email protected]>
cifs: fix pcchunk length type in smb2_copychunk_range
Filipe Manana <[email protected]>
btrfs: fix space cache inconsistency after error loading it from disk
Anastasia Belova <[email protected]>
btrfs: print-tree: parent bytenr must be aligned to sector size
Christoph Hellwig <[email protected]>
btrfs: zero the buffer before marking it dirty in btrfs_redirty_list_add
Josef Bacik <[email protected]>
btrfs: don't free qgroup space unless specified
Boris Burkov <[email protected]>
btrfs: fix encoded write i_size corruption with no-holes
Naohiro Aota <[email protected]>
btrfs: zoned: fix wrong use of bitops API in btrfs_ensure_empty_zones
Filipe Manana <[email protected]>
btrfs: fix btrfs_prev_leaf() to not return the same key twice
Dmitrii Dolgov <[email protected]>
perf stat: Separate bperf from bpf_profiler
Ian Rogers <[email protected]>
perf evlist: Refactor evlist__for_each_cpu()
Yang Jihong <[email protected]>
perf symbols: Fix return incorrect build_id size in elf_read_build_id()
Olivier Bacon <[email protected]>
crypto: engine - fix crypto_queue backlog handling
Herbert Xu <[email protected]>
crypto: engine - Use crypto_request_complete
Herbert Xu <[email protected]>
crypto: api - Add scaffolding to change completion function signature
Corentin Labbe <[email protected]>
crypto: engine - check if BH is disabled during completion
Christophe JAILLET <[email protected]>
crypto: sun8i-ss - Fix a test in sun8i_ss_setup_ivs()
Markus Elfring <[email protected]>
perf map: Delete two variable initialisations before null pointer checks in sort__sym_from_cmp()
Arnaldo Carvalho de Melo <[email protected]>
perf pmu: zfree() expects a pointer to a pointer to zero it after freeing its contents
Kajol Jain <[email protected]>
perf vendor events power9: Remove UTF-8 characters from JSON files
Roman Lozko <[email protected]>
perf scripts intel-pt-events.py: Fix IPC output for Python 2
Florian Fainelli <[email protected]>
net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop()
Wei Fang <[email protected]>
net: enetc: check the index of the SFI rather than the handle
Wenliang Wang <[email protected]>
virtio_net: suppress cpu stall when free_unused_bufs
Xuan Zhuo <[email protected]>
virtio_net: split free_unused_bufs()
Arınç ÜNAL <[email protected]>
net: dsa: mt7530: fix corrupt frames using trgmii on 40 MHz XTAL MT7621
Ruliang Lin <[email protected]>
ALSA: caiaq: input: Add error handling for unsupported input methods in snd_usb_caiaq_input_init
Chia-I Wu <[email protected]>
drm/amdgpu: add a missing lock for AMDGPU_SCHED
Kuniyuki Iwashima <[email protected]>
af_packet: Don't send zero-byte data in packet_sendmsg_spkt().
Shannon Nelson <[email protected]>
ionic: catch failure from devlink_alloc
Ido Schimmel <[email protected]>
ethtool: Fix uninitialized number of lanes
Shannon Nelson <[email protected]>
ionic: remove noise from ethtool rxnfc error msg
Subbaraya Sundeep <[email protected]>
octeontx2-vf: Detach LF resources on probe cleanup
Subbaraya Sundeep <[email protected]>
octeontx2-pf: Disable packet I/O for graceful exit
Ratheesh Kannoth <[email protected]>
octeontx2-af: Skip PFs if not enabled
Geetha sowjanya <[email protected]>
octeontx2-af: Secure APR table update with the lock
David Howells <[email protected]>
rxrpc: Fix hard call timeout units
Andy Moreton <[email protected]>
sfc: Fix module EEPROM reporting for QSFP modules
Hayes Wang <[email protected]>
r8152: move setting r8153b_rx_agg_chg_indicate()
Hayes Wang <[email protected]>
r8152: fix the poor throughput for 2.5G devices
Hayes Wang <[email protected]>
r8152: fix flow control issue of RTL8156A
Victor Nogueira <[email protected]>
net/sched: act_mirred: Add carrier check
Sia Jee Heng <[email protected]>
RISC-V: mm: Enable huge page support to kernel_page_present() function
Christophe JAILLET <[email protected]>
watchdog: dw_wdt: Fix the error handling path of dw_wdt_drv_probe()
Maxim Korotkov <[email protected]>
writeback: fix call of incorrect macro
Angelo Dureghello <[email protected]>
net: dsa: mv88e6xxx: add mv88e6321 rsvd2cpu
Andrea Mayer <[email protected]>
selftests: srv6: make srv6_end_dt46_l3vpn_test more robust
Cong Wang <[email protected]>
sit: update dev->needed_headroom in ipip6_tunnel_bind_dev()
Vlad Buslov <[email protected]>
net/sched: cls_api: remove block_cb from driver_list before freeing
Cosmo Chou <[email protected]>
net/ncsi: clear Tx enable mode when handling a Config required AEN
Zheng Wang <[email protected]>
scsi: qedi: Fix use after free bug in qedi_remove()
Saurabh Sengar <[email protected]>
drm/hyperv: Don't overwrite dirt_needed value set by host
ZhangPeng <[email protected]>
fs/ntfs3: Fix null-ptr-deref on inode->i_op in ntfs_lookup()
Pierre-Louis Bossart <[email protected]>
ASoC: soc-pcm: fix BE handling of PAUSE_RELEASE
Pierre-Louis Bossart <[email protected]>
ASoC: soc-pcm: test refcount before triggering
Takashi Iwai <[email protected]>
ASoC: soc-pcm: serialize BE triggers
Takashi Iwai <[email protected]>
ASoC: soc-pcm: Fix and cleanup DPCM locking
Pierre-Louis Bossart <[email protected]>
ASoC: soc-pcm: align BE 'atomicity' with that of the FE
Pierre-Louis Bossart <[email protected]>
ASoC: soc-pcm: use GFP_ATOMIC for dpcm structure
Tanmay Shah <[email protected]>
mailbox: zynqmp: Fix counts of child nodes
Christophe JAILLET <[email protected]>
mailbox: zynq: Switch to flexible array to simplify code
Jeffrey Hugo <[email protected]>
bus: mhi: host: Range check CHDBOFF and ERDBOFF
Jeffrey Hugo <[email protected]>
bus: mhi: host: Use mhi_tryset_pm_state() for setting fw error state
Jeffrey Hugo <[email protected]>
bus: mhi: host: Remove duplicate ee check for syserr
Manivannan Sadhasivam <[email protected]>
bus: mhi: Move host MHI code to "host" directory
Mårten Lindahl <[email protected]>
ubifs: Fix memory leak in do_rename
Zhihao Cheng <[email protected]>
ubifs: Fix AA deadlock when setting xattr for encrypted file
Jeremi Piotrowski <[email protected]>
crypto: ccp - Clear PSP interrupt status register before calling handler
Tze-nan Wu <[email protected]>
ring-buffer: Ensure proper resetting of atomic variables in ring_buffer_reset_online_cpus
-------------
Diffstat:
Makefile | 4 +-
arch/arm/boot/dts/exynos4412-itop-elite.dts | 2 +-
arch/arm/boot/dts/s5pv210.dtsi | 2 +-
arch/riscv/mm/init.c | 3 +-
arch/riscv/mm/pageattr.c | 8 +
arch/sh/Kconfig.debug | 2 +-
arch/sh/kernel/head_32.S | 6 +-
arch/sh/kernel/nmi_debug.c | 4 +-
arch/sh/kernel/setup.c | 4 +-
arch/sh/math-emu/sfp-util.h | 4 -
crypto/algapi.c | 3 +
crypto/crypto_engine.c | 11 +-
drivers/block/drbd/drbd_receiver.c | 2 +-
drivers/bus/Makefile | 2 +-
drivers/bus/mhi/Kconfig | 27 +-
drivers/bus/mhi/Makefile | 8 +-
drivers/bus/mhi/host/Kconfig | 31 +
drivers/bus/mhi/{core => host}/Makefile | 4 +-
drivers/bus/mhi/{core => host}/boot.c | 16 +-
drivers/bus/mhi/{core => host}/debugfs.c | 0
drivers/bus/mhi/{core => host}/init.c | 12 +
drivers/bus/mhi/{core => host}/internal.h | 0
drivers/bus/mhi/{core => host}/main.c | 2 +-
drivers/bus/mhi/{ => host}/pci_generic.c | 0
drivers/bus/mhi/{core => host}/pm.c | 0
.../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 2 +-
drivers/crypto/ccp/psp-dev.c | 6 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 6 +-
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 3 +-
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 1 -
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 8 +-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +-
drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 +
.../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 45 +-
drivers/gpu/drm/bridge/lontium-lt8912b.c | 1 -
drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 2 -
drivers/gpu/drm/i915/display/intel_snps_phy.c | 1210 ++++++++++++++++++++
drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 +-
drivers/gpu/drm/msm/adreno/adreno_device.c | 20 +-
drivers/gpu/drm/msm/msm_debugfs.c | 12 +-
drivers/gpu/drm/msm/msm_drv.c | 11 +-
drivers/gpu/drm/msm/msm_gpu.c | 14 +-
drivers/gpu/drm/msm/msm_gpu.h | 20 +-
drivers/gpu/drm/msm/msm_perf.c | 9 +-
drivers/gpu/drm/msm/msm_rd.c | 16 +-
drivers/gpu/drm/msm/msm_ringbuffer.c | 4 +-
drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 2 +-
drivers/hid/wacom_wac.c | 38 +-
drivers/hid/wacom_wac.h | 1 +
drivers/mailbox/zynqmp-ipi-mailbox.c | 13 +-
drivers/net/dsa/mt7530.c | 4 +-
drivers/net/dsa/mv88e6xxx/chip.c | 1 +
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 1 -
drivers/net/ethernet/freescale/enetc/enetc_qos.c | 2 +-
drivers/net/ethernet/marvell/octeontx2/af/mbox.c | 5 +-
drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 3 +-
drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 49 +-
.../net/ethernet/marvell/octeontx2/af/rvu_cn10k.c | 13 +-
.../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 11 +-
.../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 +-
.../net/ethernet/pensando/ionic/ionic_devlink.c | 2 +
.../net/ethernet/pensando/ionic/ionic_ethtool.c | 2 +-
drivers/net/ethernet/sfc/mcdi_port_common.c | 11 +-
drivers/net/usb/r8152.c | 84 +-
drivers/net/virtio_net.c | 43 +-
drivers/net/wireless/realtek/rtw88/rtw8821c.c | 2 +-
drivers/platform/x86/touchscreen_dmi.c | 41 +
drivers/remoteproc/imx_rproc.c | 7 +-
drivers/remoteproc/st_remoteproc.c | 5 +-
drivers/remoteproc/stm32_rproc.c | 6 +-
drivers/scsi/qedi/qedi_main.c | 3 +
drivers/tty/serial/8250/8250.h | 12 +
drivers/tty/serial/8250/8250_port.c | 12 +-
drivers/watchdog/dw_wdt.c | 7 +-
fs/btrfs/block-rsv.c | 3 +-
fs/btrfs/ctree.c | 32 +-
fs/btrfs/file-item.c | 5 +-
fs/btrfs/free-space-cache.c | 7 +-
fs/btrfs/print-tree.c | 6 +-
fs/btrfs/zoned.c | 10 +-
fs/cifs/cifsfs.c | 16 +
fs/cifs/connect.c | 7 +
fs/cifs/smb2ops.c | 2 +-
fs/ext4/balloc.c | 25 +
fs/ext4/extents_status.c | 30 +-
fs/ext4/hash.c | 6 +-
fs/ext4/inline.c | 17 +-
fs/ext4/inode.c | 2 +-
fs/ext4/mballoc.c | 6 +-
fs/ext4/namei.c | 53 +-
fs/ext4/super.c | 19 +-
fs/ext4/xattr.c | 5 +-
fs/f2fs/namei.c | 16 +-
fs/fs-writeback.c | 2 +-
fs/ksmbd/auth.c | 98 +-
fs/ksmbd/auth.h | 19 +-
fs/ksmbd/connection.c | 3 +-
fs/ksmbd/connection.h | 16 +-
fs/ksmbd/mgmt/tree_connect.c | 5 +-
fs/ksmbd/mgmt/tree_connect.h | 4 +-
fs/ksmbd/mgmt/user_config.c | 10 +
fs/ksmbd/mgmt/user_config.h | 1 +
fs/ksmbd/mgmt/user_session.c | 97 +-
fs/ksmbd/mgmt/user_session.h | 14 +-
fs/ksmbd/oplock.c | 11 +-
fs/ksmbd/smb2pdu.c | 94 +-
fs/ksmbd/smb_common.h | 2 +-
fs/ksmbd/vfs.c | 3 +-
fs/ksmbd/vfs_cache.c | 2 +-
fs/notify/inotify/inotify_fsnotify.c | 11 +-
fs/ntfs3/bitmap.c | 3 +-
fs/ntfs3/namei.c | 10 +
fs/ntfs3/ntfs.h | 3 -
fs/ubifs/dir.c | 31 +-
fs/ubifs/ubifs.h | 2 +-
fs/ubifs/xattr.c | 2 +-
include/crypto/algapi.h | 7 +
include/linux/crypto.h | 6 +
include/sound/pcm.h | 15 +
include/sound/soc-dpcm.h | 2 +
include/sound/soc.h | 2 -
kernel/locking/rwsem.c | 8 +-
kernel/trace/ring_buffer.c | 16 +-
net/ethtool/ioctl.c | 2 +-
net/ipv6/sit.c | 8 +-
net/ncsi/ncsi-aen.c | 1 +
net/packet/af_packet.c | 2 +-
net/rxrpc/sendmsg.c | 2 +-
net/sched/act_mirred.c | 2 +-
net/sched/cls_api.c | 1 +
sound/core/pcm_native.c | 13 +
sound/soc/soc-compress.c | 3 +
sound/soc/soc-core.c | 1 -
sound/soc/soc-pcm.c | 364 ++++--
sound/usb/caiaq/input.c | 1 +
tools/perf/builtin-stat.c | 185 ++-
.../perf/pmu-events/arch/powerpc/power9/other.json | 4 +-
.../pmu-events/arch/powerpc/power9/pipeline.json | 2 +-
tools/perf/scripts/python/intel-pt-events.py | 2 +-
tools/perf/util/evlist.c | 148 +--
tools/perf/util/evlist.h | 50 +-
tools/perf/util/evsel.h | 6 +-
tools/perf/util/pmu.c | 2 +-
tools/perf/util/sort.c | 3 +-
tools/perf/util/symbol-elf.c | 2 +-
.../selftests/net/srv6_end_dt46_l3vpn_test.sh | 10 +-
147 files changed, 2754 insertions(+), 786 deletions(-)Greg Kroah-Hartman
maintainerPATCH 12/134 ASoC: soc-pcm: align BE atomicity with that of the FE
From: Pierre-Louis Bossart <[email protected]>
[ Upstream commit bbf7d3b1c4f40eb02dd1dffb500ba00b0bff0303 ]
Since the flow for DPCM is based on taking a lock for the FE first, we need to make sure during the connection between a BE and an FE that they both use the same 'atomicity', otherwise we may sleep in atomic context.
If the FE is nonatomic, this patch forces the BE to be nonatomic as well. That should have no negative impact since the BE 'inherits' the FE properties.
However, if the FE is atomic and the BE is not, then the configuration is flagged as invalid.
--- sound/soc/soc-pcm.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
sound/soc/soc-pcm.c +16 -0
@@ -1123,6 +1123,8 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)static int dpcm_be_connect (struct snd_soc_pcm_runtime *fe,struct snd_soc_pcm_runtime *be,int stream) { +struct snd_pcm_substream *fe_substream; +struct snd_pcm_substream *be_substream;struct snd_soc_dpcm *dpcm;unsigned long flags;
@@ -1132,6 +1134,20 @@ static int dpcm_be_connect(struct snd_soc_pcm_runtime *fe,return 0 ; } + fe_substream =snd_soc_dpcm_get_substream (fe, stream); + be_substream =snd_soc_dpcm_get_substream (be, stream); + +if (!fe_substream->pcm->nonatomic && be_substream->pcm->nonatomic) { +dev_err (be->dev,"%s: FE is atomic but BE is nonatomic, invalid configuration\n" , + __func__); +return -EINVAL ; + } +if (fe_substream->pcm->nonatomic && !be_substream->pcm->nonatomic) { +dev_warn (be->dev,"%s: FE is nonatomic but BE is not, forcing BE as nonatomic\n" , + __func__); + be_substream->pcm->nonatomic =1 ; + } + dpcm =kzalloc (sizeof (struct snd_soc_dpcm ),GFP_ATOMIC );if (!dpcm)return -ENOMEM ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 21/134 net/sched: cls_api: remove block_cb from driver_list before freeing
In reply to Greg Kroah-HartmanFrom: Vlad Buslov <[email protected]>
[ Upstream commit da94a7781fc3c92e7df7832bc2746f4d39bc624e ]
Error handler of tcf_block_bind() frees the whole bo->cb_list on error. However, by that time the flow_block_cb instances are already in the driver list because driver ndo_setup_tc() callback is called before that up the call chain in tcf_block_offload_cmd(). This leaves dangling pointers to freed objects in the list and causes use-after-free[0]. Fix it by also removing flow_block_cb instances from driver_list before deallocating them.
[0]:
[ 279.868433] ================================================================== [ 279.869964] BUG: KASAN: slab-use-after-free in flow_block_cb_setup_simple+0x631/0x7c0 [ 279.871527] Read of size 8 at addr ffff888147e2bf20 by task tc/2963
[ 279.873151] CPU: 6 PID: 2963 Comm: tc Not tainted 6.3.0-rc6+ #4 [ 279.874273] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014 [ 279.876295] Call Trace: [ 279.876882] <TASK> [ 279.877413] dump_stack_lvl+0x33/0x50 [ 279.878198] print_report+0xc2/0x610 [ 279.878987] ? flow_block_cb_setup_simple+0x631/0x7c0 [ 279.879994] kasan_report+0xae/0xe0 [ 279.880750] ? flow_block_cb_setup_simple+0x631/0x7c0 [ 279.881744] ? mlx5e_tc_reoffload_flows_work+0x240/0x240 [mlx5_core] [ 279.883047] flow_block_cb_setup_simple+0x631/0x7c0 [ 279.884027] tcf_block_offload_cmd.isra.0+0x189/0x2d0 [ 279.885037] ? tcf_block_setup+0x6b0/0x6b0 [ 279.885901] ? mutex_lock+0x7d/0xd0 [ 279.886669] ? __mutex_unlock_slowpath.constprop.0+0x2d0/0x2d0 [ 279.887844] ? ingress_init+0x1c0/0x1c0 [sch_ingress] [ 279.888846] tcf_block_get_ext+0x61c/0x1200 [ 279.889711] ingress_init+0x112/0x1c0 [sch_ingress] [ 279.890682] ? clsact_init+0x2b0/0x2b0 [sch_ingress] [ 279.891701] qdisc_create+0x401/0xea0 [ 279.892485] ? qdisc_tree_reduce_backlog+0x470/0x470 [ 279.893473] tc_modify_qdisc+0x6f7/0x16d0 [ 279.894344] ? tc_get_qdisc+0xac0/0xac0 [ 279.895213] ? mutex_lock+0x7d/0xd0 [ 279.896005] ? __mutex_lock_slowpath+0x10/0x10 [ 279.896910] rtnetlink_rcv_msg+0x5fe/0x9d0 [ 279.897770] ? rtnl_calcit.isra.0+0x2b0/0x2b0 [ 279.898672] ? __sys_sendmsg+0xb5/0x140 [ 279.899494] ? do_syscall_64+0x3d/0x90 [ 279.900302] ? entry_SYSCALL_64_after_hwframe+0x46/0xb0 [ 279.901337] ? kasan_save_stack+0x2e/0x40 [ 279.902177] ? kasan_save_stack+0x1e/0x40 [ 279.903058] ? kasan_set_track+0x21/0x30 [ 279.903913] ? kasan_save_free_info+0x2a/0x40 [ 279.904836] ? ____kasan_slab_free+0x11a/0x1b0 [ 279.905741] ? kmem_cache_free+0x179/0x400 [ 279.906599] netlink_rcv_skb+0x12c/0x360 [ 279.907450] ? rtnl_calcit.isra.0+0x2b0/0x2b0 [ 279.908360] ? netlink_ack+0x1550/0x1550 [ 279.909192] ? rhashtable_walk_peek+0x170/0x170 [ 279.910135] ? kmem_cache_alloc_node+0x1af/0x390 [ 279.911086] ? _copy_from_iter+0x3d6/0xc70 [ 279.912031] netlink_unicast+0x553/0x790 [ 279.912864] ? netlink_attachskb+0x6a0/0x6a0 [ 279.913763] ? netlink_recvmsg+0x416/0xb50 [ 279.914627] netlink_sendmsg+0x7a1/0xcb0 [ 279.915473] ? netlink_unicast+0x790/0x790 [ 279.916334] ? iovec_from_user.part.0+0x4d/0x220 [ 279.917293] ? netlink_unicast+0x790/0x790 [ 279.918159] sock_sendmsg+0xc5/0x190 [ 279.918938] ____sys_sendmsg+0x535/0x6b0 [ 279.919813] ? import_iovec+0x7/0x10 [ 279.920601] ? kernel_sendmsg+0x30/0x30 [ 279.921423] ? __copy_msghdr+0x3c0/0x3c0 [ 279.922254] ? import_iovec+0x7/0x10 [ 279.923041] ___sys_sendmsg+0xeb/0x170 [ 279.923854] ? copy_msghdr_from_user+0x110/0x110 [ 279.924797] ? ___sys_recvmsg+0xd9/0x130 [ 279.925630] ? __perf_event_task_sched_in+0x183/0x470 [ 279.926656] ? ___sys_sendmsg+0x170/0x170 [ 279.927529] ? ctx_sched_in+0x530/0x530 [ 279.928369] ? update_curr+0x283/0x4f0 [ 279.929185] ? perf_event_update_userpage+0x570/0x570 [ 279.930201] ? __fget_light+0x57/0x520 [ 279.931023] ? __switch_to+0x53d/0xe70 [ 279.931846] ? sockfd_lookup_light+0x1a/0x140 [ 279.932761] __sys_sendmsg+0xb5/0x140 [ 279.933560] ? __sys_sendmsg_sock+0x20/0x20 [ 279.934436] ? fpregs_assert_state_consistent+0x1d/0xa0 [ 279.935490] do_syscall_64+0x3d/0x90 [ 279.936300] entry_SYSCALL_64_after_hwframe+0x46/0xb0 [ 279.937311] RIP: 0033:0x7f21c814f887 [ 279.938085] Code: 0a 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b9 0f 1f 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 2e 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 89 54 24 1c 48 89 74 24 10 [ 279.941448] RSP: 002b:00007fff11efd478 EFLAGS: 00000246 ORIG_RAX: 000000000000002e [ 279.942964] RAX: ffffffffffffffda RBX: 0000000064401979 RCX: 00007f21c814f887 [ 279.944337] RDX: 0000000000000000 RSI: 00007fff11efd4e0 RDI: 0000000000000003 [ 279.945660] RBP: 0000000000000000 R08: 0000000000000001 R09: 0000000000000000 [ 279.947003] R10: 00007f21c8008708 R11: 0000000000000246 R12: 0000000000000001 [ 279.948345] R13: 0000000000409980 R14: 000000000047e538 R15: 0000000000485400 [ 279.949690] </TASK>
[ 279.950706] Allocated by task 2960: [ 279.951471] kasan_save_stack+0x1e/0x40 [ 279.952338] kasan_set_track+0x21/0x30 [ 279.953165] __kasan_kmalloc+0x77/0x90 [ 279.954006] flow_block_cb_setup_simple+0x3dd/0x7c0 [ 279.955001] tcf_block_offload_cmd.isra.0+0x189/0x2d0 [ 279.956020] tcf_block_get_ext+0x61c/0x1200 [ 279.956881] ingress_init+0x112/0x1c0 [sch_ingress] [ 279.957873] qdisc_create+0x401/0xea0 [ 279.958656] tc_modify_qdisc+0x6f7/0x16d0 [ 279.959506] rtnetlink_rcv_msg+0x5fe/0x9d0 [ 279.960392] netlink_rcv_skb+0x12c/0x360 [ 279.961216] netlink_unicast+0x553/0x790 [ 279.962044] netlink_sendmsg+0x7a1/0xcb0 [ 279.962906] sock_sendmsg+0xc5/0x190 [ 279.963702] ____sys_sendmsg+0x535/0x6b0 [ 279.964534] ___sys_sendmsg+0xeb/0x170 [ 279.965343] __sys_sendmsg+0xb5/0x140 [ 279.966132] do_syscall_64+0x3d/0x90 [ 279.966908] entry_SYSCALL_64_after_hwframe+0x46/0xb0
[ 279.968407] Freed by task 2960: [ 279.969114] kasan_save_stack+0x1e/0x40 [ 279.969929] kasan_set_track+0x21/0x30 [ 279.970729] kasan_save_free_info+0x2a/0x40 [ 279.971603] ____kasan_slab_free+0x11a/0x1b0 [ 279.972483] __kmem_cache_free+0x14d/0x280 [ 279.973337] tcf_block_setup+0x29d/0x6b0 [ 279.974173] tcf_block_offload_cmd.isra.0+0x226/0x2d0 [ 279.975186] tcf_block_get_ext+0x61c/0x1200 [ 279.976080] ingress_init+0x112/0x1c0 [sch_ingress] [ 279.977065] qdisc_create+0x401/0xea0 [ 279.977857] tc_modify_qdisc+0x6f7/0x16d0 [ 279.978695] rtnetlink_rcv_msg+0x5fe/0x9d0 [ 279.979562] netlink_rcv_skb+0x12c/0x360 [ 279.980388] netlink_unicast+0x553/0x790 [ 279.981214] netlink_sendmsg+0x7a1/0xcb0 [ 279.982043] sock_sendmsg+0xc5/0x190 [ 279.982827] ____sys_sendmsg+0x535/0x6b0 [ 279.983703] ___sys_sendmsg+0xeb/0x170 [ 279.984510] __sys_sendmsg+0xb5/0x140 [ 279.985298] do_syscall_64+0x3d/0x90 [ 279.986076] entry_SYSCALL_64_after_hwframe+0x46/0xb0
[ 279.987532] The buggy address belongs to the object at ffff888147e2bf00
which belongs to the cache kmalloc-192 of size 192
[ 279.989747] The buggy address is located 32 bytes inside of
freed 192-byte region [ffff888147e2bf00, ffff888147e2bfc0)[ 279.992367] The buggy address belongs to the physical page: [ 279.993430] page:00000000550f405c refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x147e2a [ 279.995182] head:00000000550f405c order:1 entire_mapcount:0 nr_pages_mapped:0 pincount:0 [ 279.996713] anon flags: 0x200000000010200(slab|head|node=0|zone=2) [ 279.997878] raw: 0200000000010200 ffff888100042a00 0000000000000000 dead000000000001 [ 279.999384] raw: 0000000000000000 0000000000200020 00000001ffffffff 0000000000000000 [ 280.000894] page dumped because: kasan: bad access detected
[ 280.002386] Memory state around the buggy address: [ 280.003338] ffff888147e2be00: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 280.004781] ffff888147e2be80: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc [ 280.006224] >ffff888147e2bf00: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 280.007700] ^ [ 280.008592] ffff888147e2bf80: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc [ 280.010035] ffff888147e2c000: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 280.011564] ==================================================================
--- net/sched/cls_api.c | 1 + 1 file changed, 1 insertion(+)
net/sched/cls_api.c +1 -0
@@ -1465,6 +1465,7 @@ static int tcf_block_bind(struct tcf_block *block, err_unroll:list_for_each_entry_safe (block_cb, next, &bo->cb_list, list) { +list_del (&block_cb->driver_list);if (i-- >0 ) {list_del (&block_cb->list); tcf_block_playback_offloads(block, block_cb->cb,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 22/134 sit: update dev->needed_headroom in ipip6_tunnel_bind_dev()
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
[ Upstream commit c88f8d5cd95fd039cff95d682b8e71100c001df0 ]
When a tunnel device is bound with the underlying device, its dev->needed_headroom needs to be updated properly. IPv4 tunnels already do the same in ip_tunnel_bind_dev(). Otherwise we may not have enough header room for skb, especially after commit b17f709a2401 ("gue: TX support for using remote checksum offload option").
--- net/ipv6/sit.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/ipv6/sit.c +5 -3
@@ -1101,12 +1101,13 @@ static netdev_tx_t sit_tunnel_xmit(struct sk_buff *skb,static void ipip6_tunnel_bind_dev (struct net_device *dev) { +struct ip_tunnel *tunnel =netdev_priv (dev); +int t_hlen = tunnel->hlen +sizeof (struct iphdr );struct net_device *tdev =NULL ; -struct ip_tunnel *tunnel; +int hlen =LL_MAX_HEADER ;const struct iphdr *iph;struct flowi4 fl4; - tunnel =netdev_priv (dev); iph = &tunnel->parms.iph;if (iph->daddr) {
@@ -1129,14 +1130,15 @@ static void ipip6_tunnel_bind_dev(struct net_device *dev) tdev =__dev_get_by_index (tunnel->net, tunnel->parms.link);if (tdev && !netif_is_l3_master (tdev)) { -int t_hlen = tunnel->hlen +sizeof (struct iphdr );int mtu; mtu = tdev->mtu - t_hlen;if (mtu <IPV6_MIN_MTU ) mtu =IPV6_MIN_MTU ;WRITE_ONCE (dev->mtu, mtu); + hlen = tdev->hard_header_len + tdev->needed_headroom; } + dev->needed_headroom = t_hlen + hlen; } static void ipip6_tunnel_update(struct ip_tunnel *t, struct ip_tunnel_parm *p,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 23/134 selftests: srv6: make srv6_end_dt46_l3vpn_test more robust
In reply to Greg Kroah-HartmanFrom: Andrea Mayer <[email protected]>
[ Upstream commit 46ef24c60f8ee70662968ac55325297ed4624d61 ]
On some distributions, the rp_filter is automatically set (=1) by default on a netdev basis (also on VRFs).
In an SRv6 End.DT46 behavior, decapsulated IPv4 packets are routed using the table associated with the VRF bound to that tunnel. During lookup operations, the rp_filter can lead to packet loss when activated on the VRF.
Therefore, we chose to make this selftest more robust by explicitly disabling the rp_filter during tests (as it is automatically set by some Linux distributions).
--- .../testing/selftests/net/srv6_end_dt46_l3vpn_test.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
tools/testing/selftests/net/srv6_end_dt46_l3vpn_test.sh +5 -5
@@ -292,6 +292,11 @@ setup_hs() ip netns exec ${hsname} sysctl -wq net.ipv6.conf.all.accept_dad=0 ip netns exec ${hsname} sysctl -wq net.ipv6.conf.default.accept_dad=0 + # disable the rp_filter otherwise the kernel gets confused about how + # to route decap ipv4 packets. + ip netns exec ${rtname} sysctl -wq net.ipv4.conf.all.rp_filter=0 + ip netns exec ${rtname} sysctl -wq net.ipv4.conf.default.rp_filter=0 + ip -netns ${hsname} link add veth0 type veth peer name ${rtveth} ip -netns ${hsname} link set ${rtveth} netns ${rtname} ip -netns ${hsname} addr add ${IPv6_HS_NETWORK}::${hs}/64 dev veth0 nodad
@@ -316,11 +321,6 @@ setup_hs() ip netns exec ${rtname} sysctl -wq net.ipv6.conf.${rtveth}.proxy_ndp=1 ip netns exec ${rtname} sysctl -wq net.ipv4.conf.${rtveth}.proxy_arp=1 - # disable the rp_filter otherwise the kernel gets confused about how - # to route decap ipv4 packets. - ip netns exec ${rtname} sysctl -wq net.ipv4.conf.all.rp_filter=0 - ip netns exec ${rtname} sysctl -wq net.ipv4.conf.${rtveth}.rp_filter=0 - ip netns exec ${rtname} sh -c "echo 1 > /proc/sys/net/vrf/strict_mode" }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 24/134 net: dsa: mv88e6xxx: add mv88e6321 rsvd2cpu
In reply to Greg Kroah-HartmanFrom: Angelo Dureghello <[email protected]>
[ Upstream commit 6686317855c6997671982d4489ccdd946f644957 ]
Add rsvd2cpu capability for mv88e6321 model, to allow proper bpdu processing.
--- drivers/net/dsa/mv88e6xxx/chip.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/dsa/mv88e6xxx/chip.c +1 -0
@@ -4575,6 +4575,7 @@ static const struct mv88e6xxx_ops mv88e6321_ops = { .set_cpu_port = mv88e6095_g1_set_cpu_port, .set_egress_port = mv88e6095_g1_set_egress_port, .watchdog_ops = &mv88e6390_watchdog_ops, + .mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, .vtu_getnext = mv88e6185_g1_vtu_getnext, .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 25/134 writeback: fix call of incorrect macro
In reply to Greg Kroah-HartmanFrom: Maxim Korotkov <[email protected]>
[ Upstream commit 3e46c89c74f2c38e5337d2cf44b0b551adff1cb4 ]
the variable 'history' is of type u16, it may be an error that the hweight32 macro was used for it
I guess macro hweight16 should be used
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- fs/fs-writeback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/fs-writeback.c +1 -1
@@ -825,7 +825,7 @@ void wbc_detach_inode(struct writeback_control *wbc)* is okay. The main goal is avoiding keeping an inode on * the wrong wb for an extended period of time. */ -if (hweight32 (history) >WB_FRN_HIST_THR_SLOTS ) +if (hweight16 (history) >WB_FRN_HIST_THR_SLOTS )inode_switch_wbs (inode, max_id); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 26/134 watchdog: dw_wdt: Fix the error handling path of dw_wdt_drv_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 7f5390750645756bd5da2b24fac285f2654dd922 ]
The commit in Fixes has only updated the remove function and missed the error handling path of the probe.
Add the missing reset_control_assert() call.
--- drivers/watchdog/dw_wdt.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/watchdog/dw_wdt.c +5 -2
@@ -637,7 +637,7 @@ static int dw_wdt_drv_probe(struct platform_device *pdev) ret =dw_wdt_init_timeouts (dw_wdt, dev);if (ret) - goto out_disable_clk; + goto out_assert_rst; wdd = &dw_wdt->wdd; wdd->ops = &dw_wdt_ops;
@@ -668,12 +668,15 @@ static int dw_wdt_drv_probe(struct platform_device *pdev) ret =watchdog_register_device (wdd);if (ret) - goto out_disable_pclk; + goto out_assert_rst;dw_wdt_dbgfs_init (dw_wdt);return 0 ; +out_assert_rst: +reset_control_assert (dw_wdt->rst); + out_disable_pclk:clk_disable_unprepare (dw_wdt->pclk);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 27/134 RISC-V: mm: Enable huge page support to kernel_page_present() function
In reply to Greg Kroah-HartmanFrom: Sia Jee Heng <[email protected]>
[ Upstream commit a15c90b67a662c75f469822a7f95c7aaa049e28f ]
Currently kernel_page_present() function doesn't support huge page detection causes the function to mistakenly return false to the hibernation core.
Add huge page detection to the function to solve the problem.
--- arch/riscv/mm/pageattr.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/riscv/mm/pageattr.c +8 -0
@@ -217,18 +217,26 @@ bool kernel_page_present(struct page *page) pgd =pgd_offset_k (addr);if (!pgd_present (*pgd))return false; +if (pgd_leaf (*pgd)) +return true; p4d =p4d_offset (pgd, addr);if (!p4d_present (*p4d))return false; +if (p4d_leaf (*p4d)) +return true; pud =pud_offset (p4d, addr);if (!pud_present (*pud))return false; +if (pud_leaf (*pud)) +return true; pmd =pmd_offset (pud, addr);if (!pmd_present (*pmd))return false; +if (pmd_leaf (*pmd)) +return true; pte =pte_offset_kernel (pmd, addr);return pte_present (*pte);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 28/134 net/sched: act_mirred: Add carrier check
In reply to Greg Kroah-HartmanFrom: Victor Nogueira <[email protected]>
[ Upstream commit 526f28bd0fbdc699cda31426928802650c1528e5 ]
There are cases where the device is adminstratively UP, but operationally down. For example, we have a physical device (Nvidia ConnectX-6 Dx, 25Gbps) who's cable was pulled out, here is its ip link output:
5: ens2f1: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc mq state DOWN mode DEFAULT group default qlen 1000
link/ether b8:ce:f6:4b:68:35 brd ff:ff:ff:ff:ff:ff
altname enp179s0f1np1As you can see, it's administratively UP but operationally down. In this case, sending a packet to this port caused a nasty kernel hang (so nasty that we were unable to capture it). Aborting a transmit based on operational status (in addition to administrative status) fixes the issue.
v1->v2: Add fixes tagv2->v3: Remove blank line between tags + add change log, suggested by Leon
--- net/sched/act_mirred.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/act_mirred.c +1 -1
@@ -261,7 +261,7 @@ static int tcf_mirred_act(struct sk_buff *skb, const struct tc_action *a, goto out; } -if (unlikely (!(dev->flags &IFF_UP ))) { +if (unlikely (!(dev->flags &IFF_UP )) || !netif_carrier_ok (dev)) {net_notice_ratelimited ("tc mirred to Houston: device %s is down\n" , dev->name); goto out;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 29/134 r8152: fix flow control issue of RTL8156A
In reply to Greg Kroah-HartmanFrom: Hayes Wang <[email protected]>
[ Upstream commit 8ceda6d5a1e5402fd852e6cc59a286ce3dc545ee ]
The feature of flow control becomes abnormal, if the device sends a pause frame and the tx/rx is disabled before sending a release frame. It causes the lost of packets.
Set PLA_RX_FIFO_FULL and PLA_RX_FIFO_EMPTY to zeros before disabling the tx/rx. And, toggle FC_PATCH_TASK before enabling tx/rx to reset the flow control patch and timer. Then, the hardware could clear the state and the flow control becomes normal after enabling tx/rx.
Besides, remove inline for fc_pause_on_auto() and fc_pause_off_auto().
--- drivers/net/usb/r8152.c | 56 ++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 20 deletions(-)
drivers/net/usb/r8152.c +36 -20
@@ -5979,6 +5979,25 @@ static void rtl8153_disable(struct r8152 *tp)r8153_aldps_en (tp, true); } +static u32 fc_pause_on_auto (struct r8152 *tp) +{ +return (ALIGN (mtu_to_size (tp->netdev->mtu),1024 ) +6 *1024 ); +} + +static u32 fc_pause_off_auto (struct r8152 *tp) +{ +return (ALIGN (mtu_to_size (tp->netdev->mtu),1024 ) +14 *1024 ); +} + +static void r8156_fc_parameter (struct r8152 *tp) +{ +u32 pause_on = tp->fc_pause_on ? tp->fc_pause_on :fc_pause_on_auto (tp); +u32 pause_off = tp->fc_pause_off ? tp->fc_pause_off :fc_pause_off_auto (tp); + +ocp_write_word (tp,MCU_TYPE_PLA ,PLA_RX_FIFO_FULL , pause_on /16 ); +ocp_write_word (tp,MCU_TYPE_PLA ,PLA_RX_FIFO_EMPTY , pause_off /16 ); +} +static int rtl8156_enable (struct r8152 *tp) {u32 ocp_data;
@@ -5987,6 +6006,7 @@ static int rtl8156_enable(struct r8152 *tp)if (test_bit (RTL8152_UNPLUG , &tp->flags))return -ENODEV ; +r8156_fc_parameter (tp);set_tx_qlen (tp);rtl_set_eee_plus (tp);r8153_set_rx_early_timeout (tp);
@@ -6018,9 +6038,24 @@ static int rtl8156_enable(struct r8152 *tp)ocp_write_word (tp,MCU_TYPE_USB ,USB_L1_CTRL , ocp_data); } + ocp_data =ocp_read_word (tp,MCU_TYPE_USB ,USB_FW_TASK ); + ocp_data &= ~FC_PATCH_TASK ; +ocp_write_word (tp,MCU_TYPE_USB ,USB_FW_TASK , ocp_data); +usleep_range (1000 ,2000 ); + ocp_data |=FC_PATCH_TASK ; +ocp_write_word (tp,MCU_TYPE_USB ,USB_FW_TASK , ocp_data); +return rtl_enable (tp); } +static void rtl8156_disable (struct r8152 *tp) +{ +ocp_write_word (tp,MCU_TYPE_PLA ,PLA_RX_FIFO_FULL ,0 ); +ocp_write_word (tp,MCU_TYPE_PLA ,PLA_RX_FIFO_EMPTY ,0 ); + +rtl8153_disable (tp); +} +static int rtl8156b_enable (struct r8152 *tp) {u32 ocp_data;
@@ -6422,25 +6457,6 @@ static void rtl8153c_up(struct r8152 *tp)r8153b_u1u2en (tp, true); } -static inline u32 fc_pause_on_auto (struct r8152 *tp) -{ -return (ALIGN (mtu_to_size (tp->netdev->mtu),1024 ) +6 *1024 ); -} - -static inline u32 fc_pause_off_auto (struct r8152 *tp) -{ -return (ALIGN (mtu_to_size (tp->netdev->mtu),1024 ) +14 *1024 ); -} - -static void r8156_fc_parameter (struct r8152 *tp) -{ -u32 pause_on = tp->fc_pause_on ? tp->fc_pause_on :fc_pause_on_auto (tp); -u32 pause_off = tp->fc_pause_off ? tp->fc_pause_off :fc_pause_off_auto (tp); - -ocp_write_word (tp,MCU_TYPE_PLA ,PLA_RX_FIFO_FULL , pause_on /16 ); -ocp_write_word (tp,MCU_TYPE_PLA ,PLA_RX_FIFO_EMPTY , pause_off /16 ); -} -static void rtl8156_change_mtu (struct r8152 *tp) {u32 rx_max_size =mtu_to_size (tp->netdev->mtu);
@@ -9366,7 +9382,7 @@ static int rtl_ops_init(struct r8152 *tp)case RTL_VER_10 : ops->init = r8156_init; ops->enable = rtl8156_enable; - ops->disable = rtl8153_disable; + ops->disable = rtl8156_disable; ops->up = rtl8156_up; ops->down = rtl8156_down; ops->unload = rtl8153_unload;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 30/134 r8152: fix the poor throughput for 2.5G devices
In reply to Greg Kroah-HartmanFrom: Hayes Wang <[email protected]>
[ Upstream commit 61b0ad6f58e2066e054c6d4839d67974d2861a7d ]
Fix the poor throughput for 2.5G devices, when changing the speed from auto mode to force mode. This patch is used to notify the MAC when the mode is changed.
--- drivers/net/usb/r8152.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/net/usb/r8152.c +14 -0
@@ -199,6 +199,7 @@#define OCP_EEE_AR 0xa41a#define OCP_EEE_DATA 0xa41c#define OCP_PHY_STATUS 0xa420 +#define OCP_INTR_EN 0xa424#define OCP_NCTL_CFG 0xa42c#define OCP_POWER_CFG 0xa430#define OCP_EEE_CFG 0xa432
@@ -620,6 +621,9 @@ enum spd_duplex {#define PHY_STAT_LAN_ON 3#define PHY_STAT_PWRDN 5 +/* OCP_INTR_EN */ +#define INTR_SPEED_FORCE BIT(3) +/* OCP_NCTL_CFG */ #define PGA_RETURN_EN BIT(1)
@@ -7547,6 +7551,11 @@ static void r8156_hw_phy_cfg(struct r8152 *tp) ((swap_a &0x1f ) <<8 ) | ((swap_a >> 8) & 0x1f)); } + +/* Notify the MAC when the speed is changed to force mode. */ + data =ocp_reg_read (tp,OCP_INTR_EN ); + data |=INTR_SPEED_FORCE ; +ocp_reg_write (tp,OCP_INTR_EN , data);break ;default :break ;
@@ -7942,6 +7951,11 @@ static void r8156b_hw_phy_cfg(struct r8152 *tp)break ; } +/* Notify the MAC when the speed is changed to force mode. */ + data =ocp_reg_read (tp,OCP_INTR_EN ); + data |=INTR_SPEED_FORCE ; +ocp_reg_write (tp,OCP_INTR_EN , data); +if (rtl_phy_patch_request (tp, true, true))return ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 13/134 ASoC: soc-pcm: Fix and cleanup DPCM locking
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit b7898396f4bbe160f546d0c5e9fa17cca9a7d153 ]
The existing locking for DPCM has several issues
a) a confusing mix of card->mutex and card->pcm_mutex.
b) a dpcm_lock spinlock added inconsistently and on paths that could be recursively taken. The use of irqsave/irqrestore was also overkill.
The suggested model is:
1) The pcm_mutex is the top-most protection of BE links in the FE. The pcm_mutex is applied always on either the top PCM callbacks or the external call from DAPM, not taken in the internal functions.
2) the FE stream lock is taken in higher levels before invoking dpcm_be_dai_trigger()
3) when adding and deleting a BE, both the pcm_mutex and FE stream lock are taken.
--- include/sound/soc.h | 2 - sound/soc/soc-core.c | 1 - sound/soc/soc-pcm.c | 229 ++++++++++++++++++++++++++++--------------- 3 files changed, 152 insertions(+), 80 deletions(-)
include/sound/soc.h +0 -2
@@ -893,8 +893,6 @@ struct snd_soc_card {struct mutex pcm_mutex;enum snd_soc_pcm_subclass pcm_subclass; -spinlock_t dpcm_lock; -int (*probe)(struct snd_soc_card *card);int (*late_probe)(struct snd_soc_card *card);int (*remove)(struct snd_soc_card *card);
sound/soc/soc-core.c +0 -1
@@ -2339,7 +2339,6 @@ int snd_soc_register_card(struct snd_soc_card *card)mutex_init (&card->mutex);mutex_init (&card->dapm_mutex);mutex_init (&card->pcm_mutex); -spin_lock_init (&card->dpcm_lock);return snd_soc_bind_card (card); }
sound/soc/soc-pcm.c +152 -77
635 lines not on this page · raw message
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 31/134 r8152: move setting r8153b_rx_agg_chg_indicate()
In reply to Greg Kroah-HartmanFrom: Hayes Wang <[email protected]>
[ Upstream commit cce8334f4aacd9936309a002d4a4de92a07cd2c2 ]
Move setting r8153b_rx_agg_chg_indicate() for 2.5G devices. The r8153b_rx_agg_chg_indicate() has to be called after enabling tx/rx. Otherwise, the coalescing settings are useless.
--- drivers/net/usb/r8152.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/net/usb/r8152.c +8 -6
@@ -3020,12 +3020,16 @@ static int rtl_enable(struct r8152 *tp)ocp_write_byte (tp,MCU_TYPE_PLA ,PLA_CR , ocp_data);switch (tp->version) { -case RTL_VER_08 : -case RTL_VER_09 : -case RTL_VER_14 : -r8153b_rx_agg_chg_indicate (tp); +case RTL_VER_01 : +case RTL_VER_02 : +case RTL_VER_03 : +case RTL_VER_04 : +case RTL_VER_05 : +case RTL_VER_06 : +case RTL_VER_07 :break ;default : +r8153b_rx_agg_chg_indicate (tp);break ; }
@@ -3079,7 +3083,6 @@ static void r8153_set_rx_early_timeout(struct r8152 *tp) 640 / 8);ocp_write_word (tp,MCU_TYPE_USB ,USB_RX_EXTRA_AGGR_TMR , ocp_data); -r8153b_rx_agg_chg_indicate (tp);break ;default :
@@ -3113,7 +3116,6 @@ static void r8153_set_rx_early_size(struct r8152 *tp)case RTL_VER_15 :ocp_write_word (tp,MCU_TYPE_USB ,USB_RX_EARLY_SIZE , ocp_data /8 ); -r8153b_rx_agg_chg_indicate (tp);break ;default :WARN_ON_ONCE (1 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 32/134 sfc: Fix module EEPROM reporting for QSFP modules
In reply to Greg Kroah-HartmanFrom: Andy Moreton <[email protected]>
[ Upstream commit 281900a923d4c50df109b52a22ae3cdac150159b ]
The sfc driver does not report QSFP module EEPROM contents correctly as only the first page is fetched from hardware.
Commit 0e1a2a3e6e7d ("ethtool: Add SFF-8436 and SFF-8636 max EEPROM length definitions") added ETH_MODULE_SFF_8436_MAX_LEN for the overall size of the EEPROM info, so use that to report the full EEPROM contents.
--- drivers/net/ethernet/sfc/mcdi_port_common.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/net/ethernet/sfc/mcdi_port_common.c +7 -4
@@ -974,12 +974,15 @@ static u32 efx_mcdi_phy_module_type(struct efx_nic *efx)/* A QSFP+ NIC may actually have an SFP+ module attached. * The ID is page 0, byte 0. +* QSFP28 is of type SFF_8636, however, this is treated +* the same by ethtool, so we can also treat them the same. */ switch (efx_mcdi_phy_get_module_eeprom_byte (efx,0 ,0 )) { -case 0x3 : +case 0x3 :/* SFP */ return MC_CMD_MEDIA_SFP_PLUS ; -case 0xc : -case 0xd : +case 0xc :/* QSFP */ +case 0xd :/* QSFP+ */ +case 0x11 :/* QSFP28 */ return MC_CMD_MEDIA_QSFP_PLUS ;default :return 0 ;
@@ -1077,7 +1080,7 @@ int efx_mcdi_phy_get_module_info(struct efx_nic *efx, struct ethtool_modinfo *mocase MC_CMD_MEDIA_QSFP_PLUS : modinfo->type =ETH_MODULE_SFF_8436 ; - modinfo->eeprom_len =ETH_MODULE_SFF_8436_LEN ; + modinfo->eeprom_len =ETH_MODULE_SFF_8436_MAX_LEN ;break ;default :
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 33/134 rxrpc: Fix hard call timeout units
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit 0d098d83c5d9e107b2df7f5e11f81492f56d2fe7 ]
The hard call timeout is specified in the RXRPC_SET_CALL_TIMEOUT cmsg in seconds, so fix the point at which sendmsg() applies it to the call to convert to jiffies from seconds, not milliseconds.
--- net/rxrpc/sendmsg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/rxrpc/sendmsg.c +1 -1
@@ -736,7 +736,7 @@ int rxrpc_do_sendmsg(struct rxrpc_sock *rx, struct msghdr *msg, size_t len) fallthrough;case 1 :if (p.call.timeouts.hard >0 ) { - j =msecs_to_jiffies (p.call.timeouts.hard); + j = p.call.timeouts.hard *HZ ; now = jiffies; j += now;WRITE_ONCE (call->expect_term_by, j);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 34/134 octeontx2-af: Secure APR table update with the lock
In reply to Greg Kroah-HartmanFrom: Geetha sowjanya <[email protected]>
[ Upstream commit 048486f81d01db4d100af021ee2ea211d19732a0 ]
APR table contains the lmtst base address of PF/VFs. These entries are updated by the PF/VF during the device probe. The lmtst address is fetched from HW using "TXN_REQ" and "ADDR_RSP_STS" registers. The lock tries to protect these registers from getting overwritten when multiple PFs invokes rvu_get_lmtaddr() simultaneously.
For example, if PF1 submit the request and got permitted before it reads the response and PF2 got scheduled submit the request then the response of PF1 is overwritten by the PF2 response.
--- .../net/ethernet/marvell/octeontx2/af/rvu_cn10k.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu_cn10k.c +8 -5
@@ -60,13 +60,14 @@ static int rvu_get_lmtaddr(struct rvu *rvu, u16 pcifunc, u64 iova, u64 *lmt_addr) { u64 pa, val, pf; -int err; +int err =0 ;if (!iova) {dev_err (rvu->dev,"%s Requested Null address for transulation\n" , __func__);return -EINVAL ; } +mutex_lock (&rvu->rsrc_lock);rvu_write64 (rvu,BLKADDR_RVUM ,RVU_AF_SMMU_ADDR_REQ , iova); pf =rvu_get_pf (pcifunc) &0x1F ; val = BIT_ULL(63) | BIT_ULL(14) | BIT_ULL(13) | pf << 8 |
@@ -76,12 +77,13 @@ static int rvu_get_lmtaddr(struct rvu *rvu, u16 pcifunc, err =rvu_poll_reg (rvu,BLKADDR_RVUM ,RVU_AF_SMMU_ADDR_RSP_STS ,BIT_ULL (0 ), false);if (err) {dev_err (rvu->dev,"%s LMTLINE iova transulation failed\n" , __func__); -return err; + goto exit; } val =rvu_read64 (rvu,BLKADDR_RVUM ,RVU_AF_SMMU_ADDR_RSP_STS );if (val & ~0x1ULL ) {dev_err (rvu->dev,"%s LMTLINE iova transulation failed err:%llx\n" , __func__, val); -return -EIO ; + err = -EIO ; + goto exit; }/* PA[51:12] = RVU_AF_SMMU_TLN_FLIT0[57:18] * PA[11:0] = IOVA[11:0]
@@ -89,8 +91,9 @@ static int rvu_get_lmtaddr(struct rvu *rvu, u16 pcifunc, pa =rvu_read64 (rvu,BLKADDR_RVUM ,RVU_AF_SMMU_TLN_FLIT0 ) >>18 ; pa &=GENMASK_ULL (39 ,0 ); *lmt_addr = (pa <<12 ) | (iova &0xFFF ); - -return 0 ; +exit: +mutex_unlock (&rvu->rsrc_lock); +return err; }static int rvu_update_lmtaddr (struct rvu *rvu,u16 pcifunc,u64 lmt_addr)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 35/134 octeontx2-af: Skip PFs if not enabled
In reply to Greg Kroah-HartmanFrom: Ratheesh Kannoth <[email protected]>
[ Upstream commit 5eb1b7220948a69298a436148a735f32ec325289 ]
Firmware enables PFs and allocate mbox resources for each of the PFs. Currently PF driver configures mbox resources without checking whether PF is enabled or not. This results in crash. This patch fixes this issue by skipping disabled PF's mbox initialization.
--- .../net/ethernet/marvell/octeontx2/af/mbox.c | 5 +- .../net/ethernet/marvell/octeontx2/af/mbox.h | 3 +- .../net/ethernet/marvell/octeontx2/af/rvu.c | 49 +++++++++++++++---- 3 files changed, 46 insertions(+), 11 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/mbox.c +4 -1
@@ -157,7 +157,7 @@ EXPORT_SYMBOL(otx2_mbox_init);*/ int otx2_mbox_regions_init (struct otx2_mbox *mbox,void **hwbase,struct pci_dev *pdev,void *reg_base, -int direction,int ndevs) +int direction,int ndevs,unsigned long *pf_bmap) {struct otx2_mbox_dev *mdev;int devid, err;
@@ -169,6 +169,9 @@ int otx2_mbox_regions_init(struct otx2_mbox *mbox, void **hwbase, mbox->hwbase = hwbase[0 ];for (devid =0 ; devid < ndevs; devid++) { +if (!test_bit (devid, pf_bmap)) +continue ; + mdev = &mbox->dev[devid]; mdev->mbase = hwbase[devid]; mdev->hwbase = hwbase[devid];
drivers/net/ethernet/marvell/octeontx2/af/mbox.h +2 -1
@@ -96,9 +96,10 @@ void otx2_mbox_destroy(struct otx2_mbox *mbox);int otx2_mbox_init (struct otx2_mbox *mbox,void __force *hwbase,struct pci_dev *pdev,void __force *reg_base,int direction,int ndevs); +int otx2_mbox_regions_init (struct otx2_mbox *mbox,void __force **hwbase,struct pci_dev *pdev,void __force *reg_base, -int direction,int ndevs); +int direction,int ndevs,unsigned long *bmap);void otx2_mbox_msg_send (struct otx2_mbox *mbox,int devid);int otx2_mbox_wait_for_rsp (struct otx2_mbox *mbox,int devid);int otx2_mbox_busy_poll_for_rsp (struct otx2_mbox *mbox,int devid);
drivers/net/ethernet/marvell/octeontx2/af/rvu.c +40 -9
116 lines not on this page · raw message
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 36/134 octeontx2-pf: Disable packet I/O for graceful exit
In reply to Greg Kroah-HartmanFrom: Subbaraya Sundeep <[email protected]>
[ Upstream commit c926252205c424c4842dbdbe02f8e3296f623204 ]
At the stage of enabling packet I/O in otx2_open, If mailbox timeout occurs then interface ends up in down state where as hardware packet I/O is enabled. Hence disable packet I/O also before bailing out.
--- drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +10 -1
@@ -1761,13 +1761,22 @@ int otx2_open(struct net_device *netdev)otx2_dmacflt_reinstall_flows (pf); err =otx2_rxtx_enable (pf, true); -if (err) +/* If a mbox communication error happens at this point then interface +* will end up in a state such that it is in down state but hardware +* mcam entries are enabled to receive the packets. Hence disable the +* packet I/O. +*/ +if (err ==EIO ) + goto err_disable_rxtx; +else if (err) goto err_tx_stop_queues;otx2_do_set_rx_mode (pf);return 0 ; +err_disable_rxtx: +otx2_rxtx_enable (pf, false); err_tx_stop_queues:netif_tx_stop_all_queues (netdev);netif_carrier_off (netdev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 37/134 octeontx2-vf: Detach LF resources on probe cleanup
In reply to Greg Kroah-HartmanFrom: Subbaraya Sundeep <[email protected]>
[ Upstream commit 99ae1260fdb5f15beab8a3adfb93a9041c87a2c1 ]
When a VF device probe fails due to error in MSIX vector allocation then the resources NIX and NPA LFs were not detached. Fix this by detaching the LFs when MSIX vector allocation fails.
--- drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c +1 -1
@@ -630,7 +630,7 @@ static int otx2vf_probe(struct pci_dev *pdev, const struct pci_device_id *id) err =otx2vf_realloc_msix_vectors (vf);if (err) - goto err_mbox_destroy; + goto err_detach_rsrc; err =otx2_set_real_num_queues (netdev, qcount, qcount);if (err)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 38/134 ionic: remove noise from ethtool rxnfc error msg
In reply to Greg Kroah-HartmanFrom: Shannon Nelson <[email protected]>
[ Upstream commit 3711d44fac1f80ea69ecb7315fed05b3812a7401 ]
It seems that ethtool is calling into .get_rxnfc more often with ETHTOOL_GRXCLSRLCNT which ionic doesn't know about. We don't need to log a message about it, just return not supported.
--- drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c +1 -1
@@ -724,7 +724,7 @@ static int ionic_get_rxnfc(struct net_device *netdev, info->data = lif->nxqs;break ;default : -netdev_err (netdev,"Command parameter %d is not supported\n" , +netdev_dbg (netdev,"Command parameter %d is not supported\n" , info->cmd); err = -EOPNOTSUPP ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 39/134 ethtool: Fix uninitialized number of lanes
In reply to Greg Kroah-HartmanFrom: Ido Schimmel <[email protected]>
[ Upstream commit 9ad685dbfe7e856bbf17a7177b64676d324d6ed7 ]
It is not possible to set the number of lanes when setting link modes using the legacy IOCTL ethtool interface. Since 'struct ethtool_link_ksettings' is not initialized in this path, drivers receive an uninitialized number of lanes in 'struct ethtool_link_ksettings::lanes'.
When this information is later queried from drivers, it results in the ethtool code making decisions based on uninitialized memory, leading to the following KMSAN splat [1]. In practice, this most likely only happens with the tun driver that simply returns whatever it got in the set operation.
As far as I can tell, this uninitialized memory is not leaked to user space thanks to the 'ethtool_ops->cap_link_lanes_supported' check in linkmodes_prepare_data().
Fix by initializing the structure in the IOCTL path. Did not find any more call sites that pass an uninitialized structure when calling 'ethtool_ops::set_link_ksettings()'.
[1]
BUG: KMSAN: uninit-value in ethnl_update_linkmodes net/ethtool/linkmodes.c:273 [inline] BUG: KMSAN: uninit-value in ethnl_set_linkmodes+0x190b/0x19d0 net/ethtool/linkmodes.c:333 ethnl_update_linkmodes net/ethtool/linkmodes.c:273 [inline] ethnl_set_linkmodes+0x190b/0x19d0 net/ethtool/linkmodes.c:333 ethnl_default_set_doit+0x88d/0xde0 net/ethtool/netlink.c:640 genl_family_rcv_msg_doit net/netlink/genetlink.c:968 [inline] genl_family_rcv_msg net/netlink/genetlink.c:1048 [inline] genl_rcv_msg+0x141a/0x14c0 net/netlink/genetlink.c:1065 netlink_rcv_skb+0x3f8/0x750 net/netlink/af_netlink.c:2577 genl_rcv+0x40/0x60 net/netlink/genetlink.c:1076 netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline] netlink_unicast+0xf41/0x1270 net/netlink/af_netlink.c:1365 netlink_sendmsg+0x127d/0x1430 net/netlink/af_netlink.c:1942 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg net/socket.c:747 [inline] ____sys_sendmsg+0xa24/0xe40 net/socket.c:2501 ___sys_sendmsg+0x2a1/0x3f0 net/socket.c:2555 __sys_sendmsg net/socket.c:2584 [inline] __do_sys_sendmsg net/socket.c:2593 [inline] __se_sys_sendmsg net/socket.c:2591 [inline] __x64_sys_sendmsg+0x36b/0x540 net/socket.c:2591 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
Uninit was stored to memory at:
tun_get_link_ksettings+0x37/0x60 drivers/net/tun.c:3544 __ethtool_get_link_ksettings+0x17b/0x260 net/ethtool/ioctl.c:441 ethnl_set_linkmodes+0xee/0x19d0 net/ethtool/linkmodes.c:327 ethnl_default_set_doit+0x88d/0xde0 net/ethtool/netlink.c:640 genl_family_rcv_msg_doit net/netlink/genetlink.c:968 [inline] genl_family_rcv_msg net/netlink/genetlink.c:1048 [inline] genl_rcv_msg+0x141a/0x14c0 net/netlink/genetlink.c:1065 netlink_rcv_skb+0x3f8/0x750 net/netlink/af_netlink.c:2577 genl_rcv+0x40/0x60 net/netlink/genetlink.c:1076 netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline] netlink_unicast+0xf41/0x1270 net/netlink/af_netlink.c:1365 netlink_sendmsg+0x127d/0x1430 net/netlink/af_netlink.c:1942 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg net/socket.c:747 [inline] ____sys_sendmsg+0xa24/0xe40 net/socket.c:2501 ___sys_sendmsg+0x2a1/0x3f0 net/socket.c:2555 __sys_sendmsg net/socket.c:2584 [inline] __do_sys_sendmsg net/socket.c:2593 [inline] __se_sys_sendmsg net/socket.c:2591 [inline] __x64_sys_sendmsg+0x36b/0x540 net/socket.c:2591 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
Uninit was stored to memory at:
tun_set_link_ksettings+0x37/0x60 drivers/net/tun.c:3553 ethtool_set_link_ksettings+0x600/0x690 net/ethtool/ioctl.c:609 __dev_ethtool net/ethtool/ioctl.c:3024 [inline] dev_ethtool+0x1db9/0x2a70 net/ethtool/ioctl.c:3078 dev_ioctl+0xb07/0x1270 net/core/dev_ioctl.c:524 sock_do_ioctl+0x295/0x540 net/socket.c:1213 sock_ioctl+0x729/0xd90 net/socket.c:1316 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:870 [inline] __se_sys_ioctl+0x222/0x400 fs/ioctl.c:856 __x64_sys_ioctl+0x96/0xe0 fs/ioctl.c:856 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
Local variable link_ksettings created at:
ethtool_set_link_ksettings+0x54/0x690 net/ethtool/ioctl.c:577 __dev_ethtool net/ethtool/ioctl.c:3024 [inline] dev_ethtool+0x1db9/0x2a70 net/ethtool/ioctl.c:3078
--- net/ethtool/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ethtool/ioctl.c +1 -1
@@ -568,8 +568,8 @@ static int ethtool_get_link_ksettings(struct net_device *dev,static int ethtool_set_link_ksettings (struct net_device *dev,void __user *useraddr) { +struct ethtool_link_ksettings link_ksettings = {};int err; -struct ethtool_link_ksettings link_ksettings;ASSERT_RTNL ();
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 40/134 ionic: catch failure from devlink_alloc
In reply to Greg Kroah-HartmanFrom: Shannon Nelson <[email protected]>
[ Upstream commit 4a54903ff68ddb33b6463c94b4eb37fc584ef760 ]
Add a check for NULL on the alloc return. If devlink_alloc() fails and we try to use devlink_priv() on the NULL return, the kernel gets very unhappy and panics. With this fix, the driver load will still fail, but at least it won't panic the kernel.
--- drivers/net/ethernet/pensando/ionic/ionic_devlink.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/pensando/ionic/ionic_devlink.c +2 -0
@@ -65,6 +65,8 @@ struct ionic *ionic_devlink_alloc(struct device *dev)struct devlink *dl; dl =devlink_alloc (&ionic_dl_ops,sizeof (struct ionic ), dev); +if (!dl) +return NULL ;return devlink_priv (dl); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 14/134 ASoC: soc-pcm: serialize BE triggers
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit b2ae80663008a7662febe7d13f14ea1b2eb0cd51 ]
When more than one FE is connected to a BE, e.g. in a mixing use case, the BE can be triggered multiple times when the FE are opened/started concurrently. This race condition is problematic in the case of SoundWire BE dailinks, and this is not desirable in a general case.
This patch relies on the existing BE PCM lock, which takes atomicity into account. The locking model assumes that all interactions start with the FE, so that there is no deadlock between FE and BE locks.
--- sound/soc/soc-pcm.c | 46 ++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-)
sound/soc/soc-pcm.c +29 -17
@@ -46,12 +46,18 @@ static inline void snd_soc_dpcm_stream_lock_irq(struct snd_soc_pcm_runtime *rtd,snd_pcm_stream_lock_irq (snd_soc_dpcm_get_substream (rtd, stream)); } +#define snd_soc_dpcm_stream_lock_irqsave (rtd, stream, flags) \ + snd_pcm_stream_lock_irqsave(snd_soc_dpcm_get_substream(rtd, stream), flags) +static inline void snd_soc_dpcm_stream_unlock_irq (struct snd_soc_pcm_runtime *rtd,int stream) {snd_pcm_stream_unlock_irq (snd_soc_dpcm_get_substream (rtd, stream)); } +#define snd_soc_dpcm_stream_unlock_irqrestore (rtd, stream, flags) \ + snd_pcm_stream_unlock_irqrestore(snd_soc_dpcm_get_substream(rtd, stream), flags) +#define DPCM_MAX_BE_USERS 8static inline const char *soc_cpu_dai_name (struct snd_soc_pcm_runtime *rtd)
@@ -2094,6 +2100,7 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, {struct snd_soc_pcm_runtime *be;struct snd_soc_dpcm *dpcm; +unsigned long flags;int ret =0 ;for_each_dpcm_be (fe, stream, dpcm) {
@@ -2102,9 +2109,11 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, be = dpcm->be; be_substream =snd_soc_dpcm_get_substream (be, stream); +snd_soc_dpcm_stream_lock_irqsave (be, stream, flags); +/* is this op for this BE ? */ if (!snd_soc_dpcm_be_can_update (fe, be, stream)) -continue ; + goto next;dev_dbg (be->dev,"ASoC: trigger BE %s cmd %d\n" , be->dai_link->name, cmd);
@@ -2114,77 +2123,80 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream,if ((be->dpcm[stream].state !=SND_SOC_DPCM_STATE_PREPARE ) && (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_STOP ) && (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_PAUSED )) -continue ; + goto next; ret =soc_pcm_trigger (be_substream, cmd);if (ret) - goto end; + goto next; be->dpcm[stream].state =SND_SOC_DPCM_STATE_START ;break ;case SNDRV_PCM_TRIGGER_RESUME :if ((be->dpcm[stream].state !=SND_SOC_DPCM_STATE_SUSPEND )) -continue ; + goto next; ret =soc_pcm_trigger (be_substream, cmd);if (ret) - goto end; + goto next; be->dpcm[stream].state =SND_SOC_DPCM_STATE_START ;break ;case SNDRV_PCM_TRIGGER_PAUSE_RELEASE :if ((be->dpcm[stream].state !=SND_SOC_DPCM_STATE_PAUSED )) -continue ; + goto next; ret =soc_pcm_trigger (be_substream, cmd);if (ret) - goto end; + goto next; be->dpcm[stream].state =SND_SOC_DPCM_STATE_START ;break ;case SNDRV_PCM_TRIGGER_STOP :if ((be->dpcm[stream].state !=SND_SOC_DPCM_STATE_START ) && (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_PAUSED )) -continue ; + goto next;if (!snd_soc_dpcm_can_be_free_stop (fe, be, stream)) -continue ; + goto next; ret =soc_pcm_trigger (be_substream, cmd);if (ret) - goto end; + goto next; be->dpcm[stream].state =SND_SOC_DPCM_STATE_STOP ;break ;case SNDRV_PCM_TRIGGER_SUSPEND :if (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_START ) -continue ; + goto next;if (!snd_soc_dpcm_can_be_free_stop (fe, be, stream)) -continue ; + goto next; ret =soc_pcm_trigger (be_substream, cmd);if (ret) - goto end; + goto next; be->dpcm[stream].state =SND_SOC_DPCM_STATE_SUSPEND ;break ;case SNDRV_PCM_TRIGGER_PAUSE_PUSH :if (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_START ) -continue ; + goto next;if (!snd_soc_dpcm_can_be_free_stop (fe, be, stream)) -continue ; + goto next; ret =soc_pcm_trigger (be_substream, cmd);if (ret) - goto end; + goto next; be->dpcm[stream].state =SND_SOC_DPCM_STATE_PAUSED ;break ; } +next: +snd_soc_dpcm_stream_unlock_irqrestore (be, stream, flags); +if (ret) +break ; } -end:if (ret <0 )dev_err (fe->dev,"ASoC: %s() failed at %s (%d)\n" , __func__, be->dai_link->name, ret);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 41/134 af_packet: Dont send zero-byte data in packet_sendmsg_spkt().
In reply to Greg Kroah-HartmanFrom: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 6a341729fb31b4c5df9f74f24b4b1c98410c9b87 ]
syzkaller reported a warning below [0].
We can reproduce it by sending 0-byte data from the (AF_PACKET, SOCK_PACKET) socket via some devices whose dev->hard_header_len is 0.
struct sockaddr_pkt addr = {
.spkt_family = AF_PACKET,
.spkt_device = "tun0",
};
int fd;
fd = socket(AF_PACKET, SOCK_PACKET, 0);
sendto(fd, NULL, 0, 0, (struct sockaddr *)&addr, sizeof(addr));We have a similar fix for the (AF_PACKET, SOCK_RAW) socket as commit dc633700f00f ("net/af_packet: check len when min_header_len equals to 0").
Let's add the same test for the SOCK_PACKET socket.
[0]:skb_assert_len
WARNING: CPU: 1 PID: 19945 at include/linux/skbuff.h:2552 skb_assert_len include/linux/skbuff.h:2552 [inline] WARNING: CPU: 1 PID: 19945 at include/linux/skbuff.h:2552 __dev_queue_xmit+0x1f26/0x31d0 net/core/dev.c:4159 Modules linked in: CPU: 1 PID: 19945 Comm: syz-executor.0 Not tainted 6.3.0-rc7-02330-gca6270c12e20 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014 RIP: 0010:skb_assert_len include/linux/skbuff.h:2552 [inline] RIP: 0010:__dev_queue_xmit+0x1f26/0x31d0 net/core/dev.c:4159 Code: 89 de e8 1d a2 85 fd 84 db 75 21 e8 64 a9 85 fd 48 c7 c6 80 2a 1f 86 48 c7 c7 c0 06 1f 86 c6 05 23 cf 27 04 01 e8 fa ee 56 fd <0f> 0b e8 43 a9 85 fd 0f b6 1d 0f cf 27 04 31 ff 89 de e8 e3 a1 85 RSP: 0018:ffff8880217af6e0 EFLAGS: 00010282 RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffffc90001133000 RDX: 0000000000040000 RSI: ffffffff81186922 RDI: 0000000000000001 RBP: ffff8880217af8b0 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000001 R11: 0000000000000001 R12: ffff888030045640 R13: ffff8880300456b0 R14: ffff888030045650 R15: ffff888030045718 FS: 00007fc5864da640(0000) GS:ffff88806cd00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000020005740 CR3: 000000003f856003 CR4: 0000000000770ee0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: <TASK> dev_queue_xmit include/linux/netdevice.h:3085 [inline] packet_sendmsg_spkt+0xc4b/0x1230 net/packet/af_packet.c:2066 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg+0x1b4/0x200 net/socket.c:747 ____sys_sendmsg+0x331/0x970 net/socket.c:2503 ___sys_sendmsg+0x11d/0x1c0 net/socket.c:2557 __sys_sendmmsg+0x18c/0x430 net/socket.c:2643 __do_sys_sendmmsg net/socket.c:2672 [inline] __se_sys_sendmmsg net/socket.c:2669 [inline] __x64_sys_sendmmsg+0x9c/0x100 net/socket.c:2669 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3c/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc RIP: 0033:0x7fc58791de5d Code: ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 73 9f 1b 00 f7 d8 64 89 01 48 RSP: 002b:00007fc5864d9cc8 EFLAGS: 00000246 ORIG_RAX: 0000000000000133 RAX: ffffffffffffffda RBX: 00000000004bbf80 RCX: 00007fc58791de5d RDX: 0000000000000001 RSI: 0000000020005740 RDI: 0000000000000004 RBP: 00000000004bbf80 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 000000000000000b R14: 00007fc58797e530 R15: 0000000000000000 </TASK> ---[ end trace 0000000000000000 ]---
skb len=0 headroom=16 headlen=0 tailroom=304 mac=(16,0) net=(16,-1) trans=-1 shinfo(txflags=0 nr_frags=0 gso(size=0 type=0 segs=0)) csum(0x0 ip_summed=0 complete_sw=0 valid=0 level=0) hash(0x0 sw=0 l4=0) proto=0x0000 pkttype=0 iif=0 dev name=sit0 feat=0x00000006401d7869
sk family=17 type=10 proto=0
--- net/packet/af_packet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/packet/af_packet.c +1 -1
@@ -1999,7 +1999,7 @@ static int packet_sendmsg_spkt(struct socket *sock, struct msghdr *msg, goto retry; } -if (!dev_validate_header (dev, skb->data, len)) { +if (!dev_validate_header (dev, skb->data, len) || !skb->len) { err = -EINVAL ; goto out_unlock; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 42/134 drm/amdgpu: add a missing lock for AMDGPU_SCHED
In reply to Greg Kroah-HartmanFrom: Chia-I Wu <[email protected]>
[ Upstream commit 2397e3d8d2e120355201a8310b61929f5a8bd2c0 ]
mgr->ctx_handles should be protected by mgr->lock.
v2: improve commit message
v3: add a Fixes tag
--- drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c +5 -1
@@ -66,6 +66,7 @@ static int amdgpu_sched_process_priority_override(struct amdgpu_device *adev, {struct fd f =fdget (fd);struct amdgpu_fpriv *fpriv; +struct amdgpu_ctx_mgr *mgr;struct amdgpu_ctx *ctx;uint32_t id;int r;
@@ -79,8 +80,11 @@ static int amdgpu_sched_process_priority_override(struct amdgpu_device *adev,return r; } -idr_for_each_entry (&fpriv->ctx_mgr.ctx_handles, ctx, id) + mgr = &fpriv->ctx_mgr; +mutex_lock (&mgr->lock); +idr_for_each_entry (&mgr->ctx_handles, ctx, id)amdgpu_ctx_priority_override (ctx, priority); +mutex_unlock (&mgr->lock);fdput (f);return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 43/134 ALSA: caiaq: input: Add error handling for unsupported input methods in `snd_usb_caiaq_input_init`
In reply to Greg Kroah-HartmanFrom: Ruliang Lin <[email protected]>
[ Upstream commit 0d727e1856ef22dd9337199430258cb64cbbc658 ]
Smatch complains that:snd_usb_caiaq_input_init() warn: missing error code 'ret'
This patch adds a new case to handle the situation where the device does not support any input methods in the snd_usb_caiaq_input_init function. It returns an -EINVAL error code to indicate that no input methods are supported on the device.
--- sound/usb/caiaq/input.c | 1 + 1 file changed, 1 insertion(+)
sound/usb/caiaq/input.c +1 -0
@@ -804,6 +804,7 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *cdev)default :/* no input methods supported on this device */ + ret = -EINVAL ; goto exit_free_idev; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 15/134 ASoC: soc-pcm: test refcount before triggering
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 848aedfdc6ba25ad5652797db9266007773e44dd ]
On start/pause_release/resume, when more than one FE is connected to the same BE, it's possible that the trigger is sent more than once. This is not desirable, we only want to trigger a BE once, which is straightforward to implement with a refcount.
For stop/pause/suspend, the problem is more complicated: the check implemented in snd_soc_dpcm_can_be_free_stop() may fail due to a conceptual deadlock when we trigger the BE before the FE. In this case, the FE states have not yet changed, so there are corner cases where the TRIGGER_STOP is never sent - the dual case of start where multiple triggers might be sent.
This patch suggests an unconditional trigger in all cases, without checking the FE states, using a refcount protected by the BE PCM stream lock.
--- include/sound/soc-dpcm.h | 2 ++ sound/soc/soc-pcm.c | 53 +++++++++++++++++++++++++++++++--------- 2 files changed, 44 insertions(+), 11 deletions(-)
include/sound/soc-dpcm.h +2 -0
@@ -101,6 +101,8 @@ struct snd_soc_dpcm_runtime {enum snd_soc_dpcm_state state;int trigger_pending;/* trigger cmd + 1 if pending, 0 if not */ + +int be_start;/* refcount protected by BE stream pcm lock */ };#define for_each_dpcm_fe (be, stream, _dpcm) \
sound/soc/soc-pcm.c +42 -11
117 lines not on this page · raw message
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 16/134 ASoC: soc-pcm: fix BE handling of PAUSE_RELEASE
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 3aa1e96a2b95e2ece198f8dd01e96818971b84df ]
A BE connected to more than one FE, e.g. in a mixer case, can go through the following transitions.
play FE1 -> BE state is START pause FE1 -> BE state is PAUSED play FE2 -> BE state is START stop FE2 -> BE state is STOP (see note [1] below)
release FE1 -> BE state is START
stop FE1 -> BE state is STOP
play FE1 -> BE state is START pause FE1 -> BE state is PAUSED play FE2 -> BE state is START
release FE1 -> BE state is START
stop FE2 -> BE state is START
stop FE1 -> BE state is STOP
play FE1 -> BE state is START play FE2 -> BE state is START (no change) pause FE1 -> BE state is START (no change) pause FE2 -> BE state is PAUSED
release FE1 -> BE state is START
release FE2 -> BE state is START (no change)
stop FE1 -> BE state is START (no change)
stop FE2 -> BE state is STOP
The existing code for PAUSE_RELEASE only allows for the case where the BE is paused, which clearly would not work in the sequences above.
Extend the allowed states to restart the BE when PAUSE_RELEASE is received, and increase the refcount if the BE is already in START.
[1] the existing logic does not move the BE state back to PAUSED when the FE2 is stopped. This patch does not change the logic; it would be painful to keep a history of changes on the FE side, the state machine is already rather complicated with transitions based on the last BE state and the trigger type.
--- sound/soc/soc-pcm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/soc-pcm.c +4 -1
@@ -2155,7 +2155,10 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, be->dpcm[stream].state =SND_SOC_DPCM_STATE_START ;break ;case SNDRV_PCM_TRIGGER_PAUSE_RELEASE : -if ((be->dpcm[stream].state !=SND_SOC_DPCM_STATE_PAUSED )) +if (!be->dpcm[stream].be_start && + (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_START ) && + (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_STOP ) && + (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_PAUSED )) goto next; be->dpcm[stream].be_start++;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 17/134 fs/ntfs3: Fix null-ptr-deref on inode->i_op in ntfs_lookup()
In reply to Greg Kroah-HartmanFrom: ZhangPeng <[email protected]>
[ Upstream commit 254e69f284d7270e0abdc023ee53b71401c3ba0c ]
Syzbot reported a null-ptr-deref bug:
ntfs3: loop0: Different NTFS' sector size (1024) and media sector size
(512)
ntfs3: loop0: Mark volume as dirty due to NTFS errors
general protection fault, probably for non-canonical address 0xdffffc0000000001: 0000 [#1] PREEMPT SMP KASAN KASAN: null-ptr-deref in range [0x0000000000000008-0x000000000000000f] RIP: 0010:d_flags_for_inode fs/dcache.c:1980 [inline] RIP: 0010:__d_add+0x5ce/0x800 fs/dcache.c:2796 Call Trace: <TASK> d_splice_alias+0x122/0x3b0 fs/dcache.c:3191 lookup_open fs/namei.c:3391 [inline] open_last_lookups fs/namei.c:3481 [inline] path_openat+0x10e6/0x2df0 fs/namei.c:3688 do_filp_open+0x264/0x4f0 fs/namei.c:3718 do_sys_openat2+0x124/0x4e0 fs/open.c:1310 do_sys_open fs/open.c:1326 [inline] __do_sys_open fs/open.c:1334 [inline] __se_sys_open fs/open.c:1330 [inline] __x64_sys_open+0x221/0x270 fs/open.c:1330 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
If the MFT record of ntfs inode is not a base record, inode->i_op can be NULL. And a null-ptr-deref may happen:
ntfs_lookup()
dir_search_u() # inode->i_op is set to NULL
d_splice_alias()
__d_add()
d_flags_for_inode() # inode->i_op->get_link null-ptr-derefFix this by adding a Check on inode->i_op before calling the d_splice_alias() function.
--- fs/ntfs3/namei.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/ntfs3/namei.c +10 -0
@@ -86,6 +86,16 @@ static struct dentry *ntfs_lookup(struct inode *dir, struct dentry *dentry,__putname (uni); } +/* +* Check for a null pointer +* If the MFT record of ntfs inode is not a base record, inode->i_op can be NULL. +* This causes null pointer dereference in d_splice_alias(). +*/ +if (!IS_ERR (inode) && inode->i_op ==NULL ) { +iput (inode); + inode =ERR_PTR (-EINVAL ); + } +return d_splice_alias (inode, dentry); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 18/134 drm/hyperv: Dont overwrite dirt_needed value set by host
In reply to Greg Kroah-HartmanFrom: Saurabh Sengar <[email protected]>
[ Upstream commit 19b5e6659eaf537ebeac90ae30c7df0296fe5ab9 ]
Existing code is causing a race condition where dirt_needed value is already set by the host and gets overwritten with default value. Remove this default setting of dirt_needed, to avoid overwriting the value received in the channel callback set by vmbus_open. Removing this setting also means the default value for dirt_needed is changed to false as it's allocated by kzalloc which is similar to legacy hyperv_fb driver.
--- drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/hyperv/hyperv_drm_drv.c +0 -2
@@ -198,8 +198,6 @@ static int hyperv_vmbus_probe(struct hv_device *hdev,if (ret)drm_warn (dev,"Failed to update vram location.\n" ); - hv->dirt_needed = true; - ret =hyperv_mode_config_init (hv);if (ret) goto err_vmbus_close;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 19/134 scsi: qedi: Fix use after free bug in qedi_remove()
In reply to Greg Kroah-HartmanFrom: Zheng Wang <[email protected]>
[ Upstream commit c5749639f2d0a1f6cbe187d05f70c2e7c544d748 ]
In qedi_probe() we call __qedi_probe() which initializes &qedi->recovery_work with qedi_recovery_handler() and &qedi->board_disable_work with qedi_board_disable_work().
When qedi_schedule_recovery_handler() is called, schedule_delayed_work() will finally start the work.
In qedi_remove(), which is called to remove the driver, the following sequence may be observed:
Fix this by finishing the work before cleanup in qedi_remove().
CPU0 CPU1
|qedi_recovery_handler
qedi_remove |
__qedi_remove |
iscsi_host_free |
scsi_host_put |
//free shost |
|iscsi_host_for_each_session
|//use qedi->shostCancel recovery_work and board_disable_work in __qedi_remove().
--- drivers/scsi/qedi/qedi_main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/qedi/qedi_main.c +3 -0
@@ -2455,6 +2455,9 @@ static void __qedi_remove(struct pci_dev *pdev, int mode) qedi_ops->ll2->stop (qedi->cdev); } +cancel_delayed_work_sync (&qedi->recovery_work); +cancel_delayed_work_sync (&qedi->board_disable_work); +qedi_free_iscsi_pf_param (qedi); rval = qedi_ops->common->update_drv_state (qedi->cdev, false);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 20/134 net/ncsi: clear Tx enable mode when handling a Config required AEN
In reply to Greg Kroah-HartmanFrom: Cosmo Chou <[email protected]>
[ Upstream commit 6f75cd166a5a3c0bc50441faa8b8304f60522fdd ]
ncsi_channel_is_tx() determines whether a given channel should be used for Tx or not. However, when reconfiguring the channel by handling a Configuration Required AEN, there is a misjudgment that the channel Tx has already been enabled, which results in the Enable Channel Network Tx command not being sent.
Clear the channel Tx enable flag before reconfiguring the channel to avoid the misjudgment.
--- net/ncsi/ncsi-aen.c | 1 + 1 file changed, 1 insertion(+)
net/ncsi/ncsi-aen.c +1 -0
@@ -165,6 +165,7 @@ static int ncsi_aen_handler_cr(struct ncsi_dev_priv *ndp, nc->state =NCSI_CHANNEL_INACTIVE ;list_add_tail_rcu (&nc->link, &ndp->channel_queue);spin_unlock_irqrestore (&ndp->lock, flags); + nc->modes[NCSI_MODE_TX_ENABLE ].enable =0 ;return ncsi_process_next_channel (ndp); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 11/134 ASoC: soc-pcm: use GFP_ATOMIC for dpcm structure
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit d8a9c6e1f6766a16cf02b4e99a629f3c5512c183 ]
We allocate a structure in dpcm_be_connect(), which may be called in atomic context. Using GFP_KERNEL is not quite right, we have to use GFP_ATOMIC to prevent the allocator from sleeping.
--- sound/soc/soc-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-pcm.c +1 -1
@@ -1132,7 +1132,7 @@ static int dpcm_be_connect(struct snd_soc_pcm_runtime *fe,return 0 ; } - dpcm =kzalloc (sizeof (struct snd_soc_dpcm ),GFP_KERNEL ); + dpcm =kzalloc (sizeof (struct snd_soc_dpcm ),GFP_ATOMIC );if (!dpcm)return -ENOMEM ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 45/134 virtio_net: split free_unused_bufs()
In reply to Greg Kroah-HartmanFrom: Xuan Zhuo <[email protected]>
[ Upstream commit 6e345f8c7cd029ad3aaece15ad4425ac26e4eb63 ]
This patch separates two functions for freeing sq buf and rq buf from free_unused_bufs().
When supporting the enable/disable tx/rq queue in the future, it is necessary to support separate recovery of a sq buf or a rq buf.
Message-Id: <[email protected]>
Stable-dep-of: f8bb51043945 ("virtio_net: suppress cpu stall when free_unused_bufs")
--- drivers/net/virtio_net.c | 41 ++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-)
drivers/net/virtio_net.c +25 -16
@@ -2814,6 +2814,27 @@ static void free_receive_page_frags(struct virtnet_info *vi)put_page (vi->rq[i].alloc_frag.page); } +static void virtnet_sq_free_unused_buf (struct virtqueue *vq,void *buf) +{ +if (!is_xdp_frame (buf)) +dev_kfree_skb (buf); +else +xdp_return_frame (ptr_to_xdp (buf)); +} + +static void virtnet_rq_free_unused_buf (struct virtqueue *vq,void *buf) +{ +struct virtnet_info *vi = vq->vdev->priv; +int i =vq2rxq (vq); + +if (vi->mergeable_rx_bufs) +put_page (virt_to_head_page (buf)); +else if (vi->big_packets) +give_pages (&vi->rq[i], buf); +else +put_page (virt_to_head_page (buf)); +} +static void free_unused_bufs (struct virtnet_info *vi) {void *buf;
@@ -2821,26 +2842,14 @@ static void free_unused_bufs(struct virtnet_info *vi)for (i =0 ; i < vi->max_queue_pairs; i++) {struct virtqueue *vq = vi->sq[i].vq; -while ((buf =virtqueue_detach_unused_buf (vq)) !=NULL ) { -if (!is_xdp_frame (buf)) -dev_kfree_skb (buf); -else -xdp_return_frame (ptr_to_xdp (buf)); - } +while ((buf =virtqueue_detach_unused_buf (vq)) !=NULL ) +virtnet_sq_free_unused_buf (vq, buf); }for (i =0 ; i < vi->max_queue_pairs; i++) {struct virtqueue *vq = vi->rq[i].vq; - -while ((buf =virtqueue_detach_unused_buf (vq)) !=NULL ) { -if (vi->mergeable_rx_bufs) { -put_page (virt_to_head_page (buf)); - }else if (vi->big_packets) { -give_pages (&vi->rq[i], buf); - }else { -put_page (virt_to_head_page (buf)); - } - } +while ((buf =virtqueue_detach_unused_buf (vq)) !=NULL ) +virtnet_rq_free_unused_buf (vq, buf); } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 54/134 crypto: engine - check if BH is disabled during completion
In reply to Greg Kroah-HartmanFrom: Corentin Labbe <[email protected]>
[ Upstream commit 4058cf08945c18a6de193f4118fd05d83d3d4285 ]
When doing iperf over ipsec with crypto hardware sun8i-ce, I hit some spinlock recursion bug.
This is due to completion function called with enabled BH.
Add check a to detect this.
Stable-dep-of: 4140aafcff16 ("crypto: engine - fix crypto_queue backlog handling")
--- crypto/crypto_engine.c | 1 + 1 file changed, 1 insertion(+)
crypto/crypto_engine.c +1 -0
@@ -53,6 +53,7 @@ static void crypto_finalize_request(struct crypto_engine *engine,dev_err (engine->dev,"failed to unprepare request\n" ); } } +lockdep_assert_in_softirq (); req->complete (req, err);kthread_queue_work (engine->kworker, &engine->pump_requests);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 55/134 crypto: api - Add scaffolding to change completion function signature
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit c35e03eaece71101ff6cbf776b86403860ac8cc3 ]
The crypto completion function currently takes a pointer to a struct crypto_async_request object. However, in reality the API does not allow the use of any part of the object apart from the data field. For example, ahash/shash will create a fake object on the stack to pass along a different data field.
This leads to potential bugs where the user may try to dereference or otherwise use the crypto_async_request object.
This patch adds some temporary scaffolding so that the completion function can take a void * instead. Once affected users have been converted this can be removed.
The helper crypto_request_complete will remain even after the conversion is complete. It should be used instead of calling the completion function directly.
Stable-dep-of: 4140aafcff16 ("crypto: engine - fix crypto_queue backlog handling")
--- include/crypto/algapi.h | 7 +++++++ include/linux/crypto.h | 6 ++++++ 2 files changed, 13 insertions(+)
include/crypto/algapi.h +7 -0
@@ -256,4 +256,11 @@ enum { CRYPTO_MSG_ALG_LOADED, }; +static inline void crypto_request_complete (struct crypto_async_request *req, +int err) +{ +crypto_completion_t complete = req->complete; +complete (req, err); +} +#endif /* _CRYPTO_ALGAPI_H */
include/linux/crypto.h +6 -0
@@ -167,6 +167,7 @@ struct crypto_async_request;struct crypto_tfm ;struct crypto_type ; +typedef struct crypto_async_request crypto_completion_data_t ;typedef void (*crypto_completion_t )(struct crypto_async_request *req,int err);/**
@@ -586,6 +587,11 @@ struct crypto_wait {/* * Async ops completion helper functioons */ +static inline void *crypto_get_completion_data (crypto_completion_data_t *req) +{ +return req->data; +} +void crypto_req_done (struct crypto_async_request *req,int err);static inline int crypto_wait_req (int err,struct crypto_wait *wait)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 56/134 crypto: engine - Use crypto_request_complete
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit 6909823d47c17cba84e9244d04050b5db8d53789 ]
Use the crypto_request_complete helper instead of calling the completion function directly.
Stable-dep-of: 4140aafcff16 ("crypto: engine - fix crypto_queue backlog handling")
--- crypto/crypto_engine.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
crypto/crypto_engine.c +3 -3
@@ -54,7 +54,7 @@ static void crypto_finalize_request(struct crypto_engine *engine, } }lockdep_assert_in_softirq (); - req->complete (req, err); +crypto_request_complete (req, err);kthread_queue_work (engine->kworker, &engine->pump_requests); }
@@ -130,7 +130,7 @@ static void crypto_pump_requests(struct crypto_engine *engine, engine->cur_req = async_req;if (backlog) - backlog->complete (backlog, -EINPROGRESS ); +crypto_request_complete (backlog, -EINPROGRESS );if (engine->busy) was_busy = true;
@@ -214,7 +214,7 @@ static void crypto_pump_requests(struct crypto_engine *engine, } req_err_2: - async_req->complete (async_req, ret); +crypto_request_complete (async_req, ret); retry:/* If retry mechanism is supported, send new requests to engine */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 57/134 crypto: engine - fix crypto_queue backlog handling
In reply to Greg Kroah-HartmanFrom: Olivier Bacon <[email protected]>
[ Upstream commit 4140aafcff167b5b9e8dae6a1709a6de7cac6f74 ]
CRYPTO_TFM_REQ_MAY_BACKLOG tells the crypto driver that it should internally backlog requests until the crypto hw's queue becomes full. At that point, crypto_engine backlogs the request and returns -EBUSY. Calling driver such as dm-crypt then waits until the complete() function is called with a status of -EINPROGRESS before sending a new request.
The problem lies in the call to complete() with a value of -EINPROGRESS that is made when a backlog item is present on the queue. The call is done before the successful execution of the crypto request. In the case that do_one_request() returns < 0 and the retry support is available, the request is put back in the queue. This leads upper drivers to send a new request even if the queue is still full.
The problem can be reproduced by doing a large dd into a crypto dm-crypt device. This is pretty easy to see when using Freescale CAAM crypto driver and SWIOTLB dma. Since the actual amount of requests that can be hold in the queue is unlimited we get IOs error and dma allocation.
The fix is to call complete with a value of -EINPROGRESS only if the request is not enqueued back in crypto_queue. This is done by calling complete() later in the code. In order to delay the decision, crypto_queue is modified to correctly set the backlog pointer when a request is enqueued back.
--- crypto/algapi.c | 3 +++ crypto/crypto_engine.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)
crypto/algapi.c +3 -0
@@ -920,6 +920,9 @@ EXPORT_SYMBOL_GPL(crypto_enqueue_request);void crypto_enqueue_request_head (struct crypto_queue *queue,struct crypto_async_request *request) { +if (unlikely (queue->qlen >= queue->max_qlen)) + queue->backlog = queue->backlog->prev; + queue->qlen++;list_add (&request->list, &queue->list); }
crypto/crypto_engine.c +3 -3
@@ -129,9 +129,6 @@ static void crypto_pump_requests(struct crypto_engine *engine,if (!engine->retry_support) engine->cur_req = async_req; -if (backlog) -crypto_request_complete (backlog, -EINPROGRESS ); -if (engine->busy) was_busy = true;else
@@ -217,6 +214,9 @@ static void crypto_pump_requests(struct crypto_engine *engine,crypto_request_complete (async_req, ret); retry: +if (backlog) +crypto_request_complete (backlog, -EINPROGRESS ); +/* If retry mechanism is supported, send new requests to engine */ if (engine->retry_support) {spin_lock_irqsave (&engine->queue_lock, flags);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 58/134 perf symbols: Fix return incorrect build_id size in elf_read_build_id()
In reply to Greg Kroah-HartmanFrom: Yang Jihong <[email protected]>
[ Upstream commit 1511e4696acb715a4fe48be89e1e691daec91c0e ]
In elf_read_build_id(), if gnu build_id is found, should return the size of the actually copied data. If descsz is greater thanBuild_ID_SIZE, write_buildid data access may occur.
--- tools/perf/util/symbol-elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/symbol-elf.c +1 -1
@@ -553,7 +553,7 @@ static int elf_read_build_id(Elf *elf, void *bf, size_t size)size_t sz =min (size, descsz);memcpy (bf, ptr, sz);memset (bf + sz,0 , size - sz); - err = descsz; + err = sz;break ; } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 59/134 perf evlist: Refactor evlist__for_each_cpu()
In reply to Greg Kroah-HartmanFrom: Ian Rogers <[email protected]>
[ Upstream commit 472832d2c000b9611feaea66fe521055c3dbf17a ]
Previously evlist__for_each_cpu() needed to iterate over the evlist in an inner loop and call "skip" routines. Refactor this so that the iteratr is smarter and the next function can update both the current CPU and evsel.
By using a cpu map index, fix apparent off-by-1 in __run_perf_stat's call to perf_evsel__close_cpu().
Stable-dep-of: ecc68ee216c6 ("perf stat: Separate bperf from bpf_profiler")
--- tools/perf/builtin-stat.c | 179 ++++++++++++++++++-------------------- tools/perf/util/evlist.c | 146 +++++++++++++++++-------------- tools/perf/util/evlist.h | 50 +++++++++-- tools/perf/util/evsel.h | 1 - 4 files changed, 210 insertions(+), 166 deletions(-)
tools/perf/builtin-stat.c +86 -93
@@ -405,36 +405,33 @@ static int read_counter_cpu(struct evsel *counter, struct timespec *rs, int cpu)static int read_affinity_counters (struct timespec *rs) { -struct evsel *counter; -struct affinity affinity; -int i, ncpus, cpu; +struct evlist_cpu_iterator evlist_cpu_itr; +struct affinity saved_affinity, *affinity;if (all_counters_use_bpf)return 0 ; -if (affinity__setup (&affinity) <0 ) +if (!target__has_cpu (&target) ||target__has_per_thread (&target)) + affinity =NULL ; +else if (affinity__setup (&saved_affinity) <0 )return -1 ; +else + affinity = &saved_affinity; - ncpus =perf_cpu_map__nr (evsel_list->core.all_cpus); -if (!target__has_cpu (&target) ||target__has_per_thread (&target)) - ncpus =1 ; -evlist__for_each_cpu (evsel_list, i, cpu) { -if (i >= ncpus) -break ; -affinity__set (&affinity, cpu); +evlist__for_each_cpu (evlist_cpu_itr, evsel_list, affinity) { +struct evsel *counter = evlist_cpu_itr.evsel; -evlist__for_each_entry (evsel_list, counter) { -if (evsel__cpu_iter_skip (counter, cpu)) -continue ; -if (evsel__is_bpf (counter)) -continue ; -if (!counter->err) { - counter->err =read_counter_cpu (counter, rs, - counter->cpu_iter -1 ); - } +if (evsel__is_bpf (counter)) +continue ; + +if (!counter->err) { + counter->err =read_counter_cpu (counter, rs, + evlist_cpu_itr.cpu_map_idx); } } -affinity__cleanup (&affinity); +if (affinity) +affinity__cleanup (&saved_affinity); +return 0 ; }
@@ -771,8 +768,9 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)int status =0 ;const bool forks = (argc >0 );bool is_pipe =STAT_RECORD ? perf_stat.data.is_pipe : false; +struct evlist_cpu_iterator evlist_cpu_itr;struct affinity affinity; -int i, cpu, err; +int err;bool second_pass = false;if (forks) {
@@ -797,102 +795,97 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) all_counters_use_bpf = false; } - evlist__for_each_cpu (evsel_list, i, cpu) { +evlist__for_each_cpu (evlist_cpu_itr, evsel_list, &affinity) { + counter = evlist_cpu_itr.evsel; +/* * bperf calls evsel__open_per_cpu() in bperf__load(), so * no need to call it again here. */ if (target.use_bpf)break ; -affinity__set (&affinity, cpu); -evlist__for_each_entry (evsel_list, counter) { -if (evsel__cpu_iter_skip (counter, cpu)) +if (counter->reset_group || counter->errored) +continue ; +if (evsel__is_bpf (counter)) +continue ; +try_again: +if (create_perf_stat_counter (counter, &stat_config, &target, + evlist_cpu_itr.cpu_map_idx) <0 ) { + +/* +* Weak group failed. We cannot just undo this here +* because earlier CPUs might be in group mode, and the kernel +* doesn't support mixing group and non group reads. Defer +* it to later. +* Don't close here because we're in the wrong affinity. +*/ +if ((errno ==EINVAL || errno ==EBADF ) && +evsel__leader (counter) != counter && + counter->weak_group) { +evlist__reset_weak_group (evsel_list, counter, false); +assert (counter->reset_group); + second_pass = true;continue ; -if (counter->reset_group || counter->errored) + } + +switch (stat_handle_error (counter)) { +case COUNTER_FATAL : +return -1 ; +case COUNTER_RETRY : + goto try_again; +case COUNTER_SKIP :continue ; -if (evsel__is_bpf (counter)) +default : +break ; + } + + } + counter->supported = true; + } + +if (second_pass) { +/* +* Now redo all the weak group after closing them, +* and also close errored counters. +*/ + +/* First close errored or weak retry */ +evlist__for_each_cpu (evlist_cpu_itr, evsel_list, &affinity) { + counter = evlist_cpu_itr.evsel; + +if (!counter->reset_group && !counter->errored)continue ; -try_again: + +perf_evsel__close_cpu (&counter->core, evlist_cpu_itr.cpu_map_idx); + } +/* Now reopen weak */ +evlist__for_each_cpu (evlist_cpu_itr, evsel_list, &affinity) { + counter = evlist_cpu_itr.evsel; + +if (!counter->reset_group && !counter->errored) +continue ; +if (!counter->reset_group) +continue ; +try_again_reset: +pr_debug2 ("reopening weak %s\n" ,evsel__name (counter));if (create_perf_stat_counter (counter, &stat_config, &target, - counter->cpu_iter -1 ) <0 ) { - -/* -* Weak group failed. We cannot just undo this here -* because earlier CPUs might be in group mode, and the kernel -* doesn't support mixing group and non group reads. Defer -* it to later. -* Don't close here because we're in the wrong affinity. -*/ -if ((errno ==EINVAL || errno ==EBADF ) && -evsel__leader (counter) != counter && - counter->weak_group) { -evlist__reset_weak_group (evsel_list, counter, false); -assert (counter->reset_group); - second_pass = true; -continue ; - } + evlist_cpu_itr.cpu_map_idx) <0 ) {switch (stat_handle_error (counter)) {case COUNTER_FATAL :return -1 ;case COUNTER_RETRY : - goto try_again; + goto try_again_reset;case COUNTER_SKIP :continue ;default :break ; } - } counter->supported = true; } } - -if (second_pass) { -/* -* Now redo all the weak group after closing them, -* and also close errored counters. -*/ - -evlist__for_each_cpu (evsel_list, i, cpu) { -affinity__set (&affinity, cpu); -/* First close errored or weak retry */ -evlist__for_each_entry (evsel_list, counter) { -if (!counter->reset_group && !counter->errored) -continue ; -if (evsel__cpu_iter_skip_no_inc (counter, cpu)) -continue ; -perf_evsel__close_cpu (&counter->core, counter->cpu_iter); - } -/* Now reopen weak */ -evlist__for_each_entry (evsel_list, counter) { -if (!counter->reset_group && !counter->errored) -continue ; -if (evsel__cpu_iter_skip (counter, cpu)) -continue ; -if (!counter->reset_group) -continue ; -try_again_reset: -pr_debug2 ("reopening weak %s\n" ,evsel__name (counter)); -if (create_perf_stat_counter (counter, &stat_config, &target, - counter->cpu_iter -1 ) <0 ) { - -switch (stat_handle_error (counter)) { -case COUNTER_FATAL : -return -1 ; -case COUNTER_RETRY : - goto try_again_reset; -case COUNTER_SKIP : -continue ; -default : -break ; - } - } - counter->supported = true; - } - } - }affinity__cleanup (&affinity);evlist__for_each_entry (evsel_list, counter) {
tools/perf/util/evlist.c +81 -65
195 lines not on this page · raw message
tools/perf/util/evlist.h +43 -7
60 lines not on this page · raw message
tools/perf/util/evsel.h +0 -1
@@ -119,7 +119,6 @@ struct evsel {bool errored;struct hashmap *per_pkg_mask;int err; -int cpu_iter;struct {evsel__sb_cb_t *cb;void *data;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 60/134 perf stat: Separate bperf from bpf_profiler
In reply to Greg Kroah-HartmanFrom: Dmitrii Dolgov <[email protected]>
[ Upstream commit ecc68ee216c6c5b2f84915e1441adf436f1b019b ]
It seems that perf stat -b <prog id> doesn't produce any results:
$ perf stat -e cycles -b 4 -I 10000 -vvv
Control descriptor is not initialized
cycles: 0 0 0
time counts unit events
10.007641640 <not supported> cyclesLooks like this happens because fentry/fexit progs are getting loaded, but the corresponding perf event is not enabled and not added into the events bpf map. I think there is some mixing up between two type of bpf support, one for bperf and one for bpf_profiler. Both are identified via evsel__is_bpf, based on which perf events are enabled, but for the latter (bpf_profiler) a perf event is required. Using evsel__is_bperf to check only bperf produces expected results:
$ perf stat -e cycles -b 4 -I 10000 -vvv
Control descriptor is not initialized
------------------------------------------------------------
perf_event_attr:
size 136
sample_type IDENTIFIER
read_format TOTAL_TIME_ENABLED|TOTAL_TIME_RUNNING
disabled 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 3
------------------------------------------------------------
[...perf_event_attr for other CPUs...]
------------------------------------------------------------
cycles: 309426 169009 169009
time counts unit events
10.010091271 309426 cyclesThe final numbers correspond (at least in the level of magnitude) to the same metric obtained via bpftool.
--- tools/perf/builtin-stat.c | 4 ++-- tools/perf/util/evsel.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-)
tools/perf/builtin-stat.c +2 -2
@@ -791,7 +791,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) counter->reset_group = false;if (bpf_counter__load (counter, &target))return -1 ; -if (!evsel__is_bpf (counter)) +if (!(evsel__is_bperf (counter))) all_counters_use_bpf = false; }
@@ -807,7 +807,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)if (counter->reset_group || counter->errored)continue ; -if (evsel__is_bpf (counter)) +if (evsel__is_bperf (counter))continue ; try_again: if (create_perf_stat_counter(counter, &stat_config, &target,
tools/perf/util/evsel.h +5 -0
@@ -248,6 +248,11 @@ static inline bool evsel__is_bpf(struct evsel *evsel)return evsel->bpf_counter_ops !=NULL ; } +static inline bool evsel__is_bperf (struct evsel *evsel) +{ +return evsel->bpf_counter_ops !=NULL &&list_empty (&evsel->bpf_counter_list); +} +#define EVSEL__MAX_ALIASES 8extern const char *evsel__hw_cache[PERF_COUNT_HW_CACHE_MAX ][EVSEL__MAX_ALIASES ];
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 61/134 btrfs: fix btrfs_prev_leaf() to not return the same key twice
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit 6f932d4ef007d6a4ae03badcb749fbb8f49196f6 upstream.
A call to btrfs_prev_leaf() may end up returning a path that points to the same item (key) again. This happens if while btrfs_prev_leaf(), after we release the path, a concurrent insertion happens, which moves items off from a sibling into the front of the previous leaf, and an item with the computed previous key does not exists.
For example, suppose we have the two following leaves:
Leaf A
-------------------------------------------------------------
| ... key (300 96 10) key (300 96 15) key (300 96 16) |
-------------------------------------------------------------
slot 20 slot 21 slot 22
Leaf B
-------------------------------------------------------------
| key (300 96 20) key (300 96 21) key (300 96 22) ... |
-------------------------------------------------------------
slot 0 slot 1 slot 2
If we call btrfs_prev_leaf(), from btrfs_previous_item() for example, with a path pointing to leaf B and slot 0 and the following happens:
1) At btrfs_prev_leaf() we compute the previous key to search as:
(300 96 19), which is a key that does not exists in the tree;
2) Then we call btrfs_release_path() at btrfs_prev_leaf();
3) Some other task inserts a key at leaf A, that sorts before the key at slot 20, for example it has an objectid of 299. In order to make room for the new key, the key at slot 22 is moved to the front of leaf B. This happens at push_leaf_right(), called from split_leaf().
After this leaf B now looks like:
--------------------------------------------------------------------------------
| key (300 96 16) key (300 96 20) key (300 96 21) key (300 96 22) ... |
--------------------------------------------------------------------------------
slot 0 slot 1 slot 2 slot 3
4) At btrfs_prev_leaf() we call btrfs_search_slot() for the computed previous key: (300 96 19). Since the key does not exists, btrfs_search_slot() returns 1 and with a path pointing to leaf B and slot 1, the item with key (300 96 20);
5) This makes btrfs_prev_leaf() return a path that points to slot 1 of leaf B, the same key as before it was called, since the key at slot 0 of leaf B (300 96 16) is less than the computed previous key, which is (300 96 19);
6) As a consequence btrfs_previous_item() returns a path that points again to the item with key (300 96 20).
For some users of btrfs_prev_leaf() or btrfs_previous_item() this may not be functional a problem, despite not making sense to return a new path pointing again to the same item/key. However for a caller such as tree-log.c:log_dir_items(), this has a bad consequence, as it can result in not logging some dir index deletions in case the directory is being logged without holding the inode's VFS lock (logging triggered while logging a child inode for example) - for the example scenario above, in case the dir index keys 17, 18 and 19 were deleted in the current transaction.
--- fs/btrfs/ctree.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-)
fs/btrfs/ctree.c +31 -1
@@ -4189,10 +4189,12 @@ int btrfs_del_items(struct btrfs_trans_hint btrfs_prev_leaf (struct btrfs_root *root,struct btrfs_path *path) {struct btrfs_key key; +struct btrfs_key orig_key;struct btrfs_disk_key found_key;int ret;btrfs_item_key_to_cpu (path->nodes[0 ], &key,0 ); + orig_key = key;if (key.offset >0 ) { key.offset--;
@@ -4209,8 +4211,36 @@ int btrfs_prev_leaf(struct btrfs_root *rbtrfs_release_path (path); ret =btrfs_search_slot (NULL , root, &key, path,0 ,0 ); -if (ret <0 ) +if (ret <=0 )return ret; + +/* +* Previous key not found. Even if we were at slot 0 of the leaf we had +* before releasing the path and calling btrfs_search_slot(), we now may +* be in a slot pointing to the same original key - this can happen if +* after we released the path, one of more items were moved from a +* sibling leaf into the front of the leaf we had due to an insertion +* (see push_leaf_right()). +* If we hit this case and our slot is > 0 and just decrement the slot +* so that the caller does not process the same key again, which may or +* may not break the caller, depending on its logic. +*/ +if (path->slots[0 ] <btrfs_header_nritems (path->nodes[0 ])) { +btrfs_item_key (path->nodes[0 ], &found_key, path->slots[0 ]); + ret =comp_keys (&found_key, &orig_key); +if (ret ==0 ) { +if (path->slots[0 ] >0 ) { + path->slots[0 ]--; +return 0 ; + } +/* +* At slot 0, same key as before, it means orig_key is +* the lowest, leftmost, key in the tree. We're done. +*/ +return 1 ; + } + } +btrfs_item_key (path->nodes[0 ], &found_key,0 ); ret =comp_keys (&found_key, &key);/*
Greg Kroah-Hartman
maintainerPATCH 62/134 btrfs: zoned: fix wrong use of bitops API in btrfs_ensure_empty_zones
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
commit 631003e2333c12cc1b52df06a707365b7363a159 upstream.
find_next_bit and find_next_zero_bit take @size as the second parameter and @offset as the third parameter. They are specified opposite in btrfs_ensure_empty_zones(). Thanks to the later loop, it never failed to detect the empty zones. Fix them and (maybe) return the result a bit faster.
Note: the naming is a bit confusing, size has two meanings here, bitmap and our range size.
--- fs/btrfs/zoned.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/btrfs/zoned.c +3 -3
@@ -1014,12 +1014,12 @@ int btrfs_ensure_empty_zones(struct btrfreturn -ERANGE ;/* All the zones are conventional */ -if (find_next_bit (zinfo->seq_zones, begin, end) == end) +if (find_next_bit (zinfo->seq_zones, end, begin) == end)return 0 ;/* All the zones are sequential and empty */ -if (find_next_zero_bit (zinfo->seq_zones, begin, end) == end && -find_next_zero_bit (zinfo->empty_zones, begin, end) == end) +if (find_next_zero_bit (zinfo->seq_zones, end, begin) == end && +find_next_zero_bit (zinfo->empty_zones, end, begin) == end)return 0 ;for (pos = start; pos < start + size; pos += zinfo->zone_size) {
Greg Kroah-Hartman
maintainerPATCH 63/134 btrfs: fix encoded write i_size corruption with no-holes
In reply to Greg Kroah-HartmanFrom: Boris Burkov <[email protected]>
commit e7db9e5c6b9615b287d01f0231904fbc1fbde9c5 upstream.
We have observed a btrfs filesystem corruption on workloads using no-holes and encoded writes via send stream v2. The symptom is that a file appears to be truncated to the end of its last aligned extent, even though the final unaligned extent and even the file extent and otherwise correctly updated inode item have been written.
So if we were writing out a 1MiB+X file via 8 128K extents and one extent of length X, i_size would be set to 1MiB, but the ninth extent, nbyte, etc. would all appear correct otherwise.
The source of the race is a narrow (one line of code) window in which a no-holes fs has read in an updated i_size, but has not yet set a shared disk_i_size variable to write. Therefore, if two ordered extents run in parallel (par for the course for receive workloads), the following sequence can play out: (following "threads" a bit loosely, since there are callbacks involved for endio but extra threads aren't needed to cause the issue)
ENC-WR1 (second to last) ENC-WR2 (last)
------- -------
btrfs_do_encoded_write
set i_size = 1M
submit bio B1 ending at 1M
endio B1
btrfs_inode_safe_disk_i_size_write
local i_size = 1M
falls off a cliff for some reason
btrfs_do_encoded_write
set i_size = 1M+X submit bio B2 ending at 1M+X
endio B2 btrfs_inode_safe_disk_i_size_write
local i_size = 1M+X disk_i_size = 1M+X
disk_i_size = 1M
btrfs_delayed_update_inode
btrfs_delayed_update_inode
And the delayed inode ends up filled with nbytes=1M+X and isize=1M, and writes respect i_size and present a corrupted file missing its last extents.
Fix this by holding the inode lock in the no-holes case so that a thread can't sneak in a write to disk_i_size that gets overwritten with an out of date i_size.
--- fs/btrfs/file-item.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/btrfs/file-item.c +3 -2
@@ -47,13 +47,13 @@ void btrfs_inode_safe_disk_i_size_write(u64 start, end, i_size;int ret; +spin_lock (&inode->lock); i_size = new_i_size ?:i_size_read (&inode->vfs_inode);if (btrfs_fs_incompat (fs_info,NO_HOLES )) { inode->disk_i_size = i_size; -return ; + goto out_unlock; } -spin_lock (&inode->lock); ret =find_contiguous_extent_bit (&inode->file_extent_tree,0 , &start, &end,EXTENT_DIRTY );if (!ret && start ==0 )
@@ -61,6 +61,7 @@ void btrfs_inode_safe_disk_i_size_write(else i_size =0 ; inode->disk_i_size = i_size; +out_unlock:spin_unlock (&inode->lock); }
Greg Kroah-Hartman
maintainerPATCH 46/134 virtio_net: suppress cpu stall when free_unused_bufs
In reply to Greg Kroah-HartmanFrom: Wenliang Wang <[email protected]>
[ Upstream commit f8bb5104394560e29017c25bcade4c6b7aabd108 ]
For multi-queue and large ring-size use case, the following error occurred when free_unused_bufs:
rcu: INFO: rcu_sched self-detected stall on CPU.
--- drivers/net/virtio_net.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/virtio_net.c +2 -0
@@ -2844,12 +2844,14 @@ static void free_unused_bufs(struct virtnet_info *vi)struct virtqueue *vq = vi->sq[i].vq;while ((buf =virtqueue_detach_unused_buf (vq)) !=NULL )virtnet_sq_free_unused_buf (vq, buf); +cond_resched (); }for (i =0 ; i < vi->max_queue_pairs; i++) {struct virtqueue *vq = vi->rq[i].vq;while ((buf =virtqueue_detach_unused_buf (vq)) !=NULL )virtnet_rq_free_unused_buf (vq, buf); +cond_resched (); } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 64/134 btrfs: dont free qgroup space unless specified
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit d246331b78cbef86237f9c22389205bc9b4e1cc1 upstream.
Boris noticed in his simple quotas testing that he was getting a leak with Sweet Tea's change to subvol create that stopped doing a transaction commit. This was just a side effect of that change.
In the delayed inode code we have an optimization that will free extra reservations if we think we can pack a dir item into an already modified leaf. Previously this wouldn't be triggered in the subvolume create case because we'd commit the transaction, it was still possible but much harder to trigger. It could actually be triggered if we did a mkdir && subvol create with qgroups enabled.
This occurs because in btrfs_insert_delayed_dir_index(), which gets called when we're adding the dir item, we do the following:
btrfs_block_rsv_release(fs_info, trans->block_rsv, bytes, NULL);
if we're able to skip reserving space.
The problem here is that trans->block_rsv points at the temporary block rsv for the subvolume create, which has qgroup reservations in the block rsv.
This is a problem because btrfs_block_rsv_release() will do the following:
if (block_rsv->qgroup_rsv_reserved >= block_rsv->qgroup_rsv_size) {
qgroup_to_release = block_rsv->qgroup_rsv_reserved -
block_rsv->qgroup_rsv_size;
block_rsv->qgroup_rsv_reserved = block_rsv->qgroup_rsv_size;}
The temporary block rsv just has ->qgroup_rsv_reserved set, ->qgroup_rsv_size == 0. The optimization in btrfs_insert_delayed_dir_index() sets ->qgroup_rsv_reserved = 0. Then later on when we call btrfs_subvolume_release_metadata() which has
btrfs_block_rsv_release(fs_info, rsv, (u64)-1, &qgroup_to_release); btrfs_qgroup_convert_reserved_meta(root, qgroup_to_release);
qgroup_to_release is set to 0, and we do not convert the reserved metadata space.
The problem here is that the block rsv code has been unconditionally messing with ->qgroup_rsv_reserved, because the main place this is used is delalloc, and any time we call btrfs_block_rsv_release() we do it with qgroup_to_release set, and thus do the proper accounting.
The subvolume code is the only other code that uses the qgroup reservation stuff, but it's intermingled with the above optimization, and thus was getting its reservation freed out from underneath it and thus leaking the reserved space.
The solution is to simply not mess with the qgroup reservations if we don't have qgroup_to_release set. This works with the existing code as anything that messes with the delalloc reservations always have qgroup_to_release set. This fixes the leak that Boris was observing.
--- fs/btrfs/block-rsv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/btrfs/block-rsv.c +2 -1
@@ -121,7 +121,8 @@ static u64 block_rsv_release_bytes(struc }else { num_bytes =0 ; } -if (block_rsv->qgroup_rsv_reserved >= block_rsv->qgroup_rsv_size) { +if (qgroup_to_release_ret && + block_rsv->qgroup_rsv_reserved >= block_rsv->qgroup_rsv_size) { qgroup_to_release = block_rsv->qgroup_rsv_reserved - block_rsv->qgroup_rsv_size; block_rsv->qgroup_rsv_reserved = block_rsv->qgroup_rsv_size;
Greg Kroah-Hartman
maintainerPATCH 65/134 btrfs: zero the buffer before marking it dirty in btrfs_redirty_list_add
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
commit c83b56d1dd87cf67492bb770c26d6f87aee70ed6 upstream.
btrfs_redirty_list_add zeroes the buffer data and sets the EXTENT_BUFFER_NO_CHECK to make sure writeback is fine with a bogus header. But it does that after already marking the buffer dirty, which means that writeback could already be looking at the buffer.
Switch the order of operations around so that the buffer is only marked dirty when we're ready to write it.
--- fs/btrfs/zoned.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/btrfs/zoned.c +2 -2
@@ -1347,11 +1347,11 @@ void btrfs_redirty_list_add(struct btrfs !list_empty(&eb->release_list))return ; +memzero_extent_buffer (eb,0 , eb->len); +set_bit (EXTENT_BUFFER_NO_CHECK , &eb->bflags);set_extent_buffer_dirty (eb);set_extent_bits_nowait (&trans->dirty_pages, eb->start, eb->start + eb->len -1 ,EXTENT_DIRTY ); -memzero_extent_buffer (eb,0 , eb->len); -set_bit (EXTENT_BUFFER_NO_CHECK , &eb->bflags);spin_lock (&trans->releasing_ebs_lock);list_add_tail (&eb->release_list, &trans->releasing_ebs);
Greg Kroah-Hartman
maintainerPATCH 66/134 btrfs: print-tree: parent bytenr must be aligned to sector size
In reply to Greg Kroah-HartmanFrom: Anastasia Belova <[email protected]>
commit c87f318e6f47696b4040b58f460d5c17ea0280e6 upstream.
Check nodesize to sectorsize in alignment check in print_extent_item. The comment states that and this is correct, similar check is done elsewhere in the functions.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- fs/btrfs/print-tree.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/btrfs/print-tree.c +3 -3
@@ -147,10 +147,10 @@ static void print_extent_item(struct extpr_cont ("shared data backref parent %llu count %u\n" , offset,btrfs_shared_data_ref_count (eb, sref));/* -* offset is supposed to be a tree block which -* must be aligned to nodesize. +* Offset is supposed to be a tree block which must be +* aligned to sectorsize. */ -if (!IS_ALIGNED (offset, eb->fs_info->nodesize)) +if (!IS_ALIGNED (offset, eb->fs_info->sectorsize))pr_info ("\t\t\t(parent %llu not aligned to sectorsize %u)\n" , offset, eb->fs_info->sectorsize);
Greg Kroah-Hartman
maintainerPATCH 67/134 btrfs: fix space cache inconsistency after error loading it from disk
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit 0004ff15ea26015a0a3a6182dca3b9d1df32e2b7 upstream.
When loading a free space cache from disk, at __load_free_space_cache(), if we fail to insert a bitmap entry, we still increment the number of total bitmaps in the btrfs_free_space_ctl structure, which is incorrect since we failed to add the bitmap entry. On error we then empty the cache by calling __btrfs_remove_free_space_cache(), which will result in getting the total bitmaps counter set to 1.
A failure to load a free space cache is not critical, so if a failure happens we just rebuild the cache by scanning the extent tree, which happens at block-group.c:caching_thread(). Yet the failure will result in having the total bitmaps of the btrfs_free_space_ctl always bigger by 1 then the number of bitmap entries we have. So fix this by having the total bitmaps counter be incremented only if we successfully added the bitmap entry.
--- fs/btrfs/free-space-cache.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/btrfs/free-space-cache.c +4 -3
@@ -825,15 +825,16 @@ static int __load_free_space_cache(struc }spin_lock (&ctl->tree_lock); ret =link_free_space (ctl, e); - ctl->total_bitmaps++; -recalculate_thresholds (ctl); -spin_unlock (&ctl->tree_lock);if (ret) { +spin_unlock (&ctl->tree_lock);btrfs_err (fs_info,"Duplicate entries in free space cache, dumping" );kmem_cache_free (btrfs_free_space_cachep, e); goto free_cache; } + ctl->total_bitmaps++; +recalculate_thresholds (ctl); +spin_unlock (&ctl->tree_lock);list_add_tail (&e->list, &bitmaps); }
Greg Kroah-Hartman
maintainerPATCH 68/134 cifs: fix pcchunk length type in smb2_copychunk_range
In reply to Greg Kroah-HartmanFrom: Pawel Witek <[email protected]>
commit d66cde50c3c868af7abddafce701bb86e4a93039 upstream.
Change type of pcchunk->Length from u32 to u64 to match smb2_copychunk_range arguments type. Fixes the problem where performing server-side copy with CIFS_IOC_COPYCHUNK_FILE ioctl resulted in incomplete copy of large files while returning -EINVAL.
--- fs/cifs/smb2ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/smb2ops.c +1 -1
@@ -1893,7 +1893,7 @@ smb2_copychunk_range(const unsigned int pcchunk->SourceOffset =cpu_to_le64 (src_off); pcchunk->TargetOffset =cpu_to_le64 (dest_off); pcchunk->Length = -cpu_to_le32 (min_t (u32, len, tcon->max_bytes_chunk)); +cpu_to_le32 (min_t (u64, len, tcon->max_bytes_chunk));/* Request server copy to target from src identified by key */ kfree (retbuf);
Greg Kroah-Hartman
maintainerPATCH 69/134 cifs: release leases for deferred close handles when freezing
In reply to Greg Kroah-HartmanFrom: Steve French <[email protected]>
commit d39fc592ef8ae9a89c5e85c8d9f760937a57d5ba upstream.
We should not be caching closed files when freeze is invoked on an fs (so we can release resources more gracefully).
Fixes xfstests generic/068 generic/390 generic/491
--- fs/cifs/cifsfs.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
fs/cifs/cifsfs.c +15 -0
@@ -730,6 +730,20 @@ static void cifs_umount_begin(struct supreturn ; } +static int cifs_freeze (struct super_block *sb) +{ +struct cifs_sb_info *cifs_sb =CIFS_SB (sb); +struct cifs_tcon *tcon; + +if (cifs_sb ==NULL ) +return 0 ; + + tcon =cifs_sb_master_tcon (cifs_sb); + +cifs_close_all_deferred_files (tcon); +return 0 ; +} +#ifdef CONFIG_CIFS_STATS2 static int cifs_show_stats (struct seq_file *s,struct dentry *root) {
@@ -761,6 +775,7 @@ static const struct super_operations cifas opens */ .show_options = cifs_show_options, .umount_begin = cifs_umount_begin, + .freeze_fs = cifs_freeze,#ifdef CONFIG_CIFS_STATS2 .show_stats = cifs_show_stats,#endif
Greg Kroah-Hartman
maintainerPATCH 70/134 platform/x86: touchscreen_dmi: Add upside-down quirk for GDIX1002 ts on the Juno Tablet
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit 6abfa99ce52f61a31bcfc2aaaae09006f5665495 upstream.
The Juno Computers Juno Tablet has an upside-down mounted Goodix touchscreen. Add a quirk to invert both axis to correct for this.
--- drivers/platform/x86/touchscreen_dmi.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/platform/x86/touchscreen_dmi.c +17 -0
@@ -381,6 +381,11 @@ static const struct ts_dmi_data glavey_t .properties = glavey_tm800a550l_props, }; +static const struct ts_dmi_data gdix1002_00_upside_down_data = { + .acpi_name ="GDIX1002:00" , + .properties = gdix1001_upside_down_props, +}; +static const struct property_entry gp_electronic_t701_props[] = {PROPERTY_ENTRY_U32 ("touchscreen-size-x" ,960 ),PROPERTY_ENTRY_U32 ("touchscreen-size-y" ,640 ),
@@ -1281,6 +1286,18 @@ const struct dmi_system_id touchscreen_d }, }, { +/* Juno Tablet */ + .driver_data = (void *)&gdix1002_00_upside_down_data, + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Default string" ), +/* Both product- and board-name being "Default string" is somewhat rare */ +DMI_MATCH (DMI_PRODUCT_NAME ,"Default string" ), +DMI_MATCH (DMI_BOARD_NAME ,"Default string" ), +/* Above matches are too generic, add partial bios-version match */ + DMI_MATCH(DMI_BIOS_VERSION, "JP2V1."), + }, + }, + {/* Mediacom WinPad 7.0 W700 (same hw as Wintron surftab 7") */ .driver_data = (void *)&trekstor_surftab_wintron70_data, .matches = {
Greg Kroah-Hartman
maintainerPATCH 71/134 platform/x86: touchscreen_dmi: Add info for the Dexp Ursus KX210i
In reply to Greg Kroah-HartmanFrom: Andrey Avdeev <[email protected]>
commit 4b65f95c87c35699bc6ad540d6b9dd7f950d0924 upstream.
Add touchscreen info for the Dexp Ursus KX210i
--- drivers/platform/x86/touchscreen_dmi.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/platform/x86/touchscreen_dmi.c +24 -0
@@ -327,6 +327,22 @@ static const struct ts_dmi_data dexp_urs .properties = dexp_ursus_7w_props, }; +static const struct property_entry dexp_ursus_kx210i_props[] = { +PROPERTY_ENTRY_U32 ("touchscreen-min-x" ,5 ), +PROPERTY_ENTRY_U32 ("touchscreen-min-y" ,2 ), +PROPERTY_ENTRY_U32 ("touchscreen-size-x" ,1720 ), +PROPERTY_ENTRY_U32 ("touchscreen-size-y" ,1137 ), +PROPERTY_ENTRY_STRING ("firmware-name" ,"gsl1680-dexp-ursus-kx210i.fw" ), +PROPERTY_ENTRY_U32 ("silead,max-fingers" ,10 ), +PROPERTY_ENTRY_BOOL ("silead,home-button" ), + { } +}; + +static const struct ts_dmi_data dexp_ursus_kx210i_data = { + .acpi_name ="MSSL1680:00" , + .properties = dexp_ursus_kx210i_props, +}; +static const struct property_entry digma_citi_e200_props[] = {PROPERTY_ENTRY_U32 ("touchscreen-size-x" ,1980 ),PROPERTY_ENTRY_U32 ("touchscreen-size-y" ,1500 ),
@@ -1167,6 +1183,14 @@ const struct dmi_system_id touchscreen_d }, }, { +/* DEXP Ursus KX210i */ + .driver_data = (void *)&dexp_ursus_kx210i_data, + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"INSYDE Corp." ), + DMI_MATCH(DMI_PRODUCT_NAME, "S107I"), + }, + }, + {/* Digma Citi E200 */ .driver_data = (void *)&digma_citi_e200_data, .matches = {
Greg Kroah-Hartman
maintainerPATCH 72/134 inotify: Avoid reporting event with invalid wd
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit c915d8f5918bea7c3962b09b8884ca128bfd9b0c upstream.
When inotify_freeing_mark() races with inotify_handle_inode_event() it can happen that inotify_handle_inode_event() sees that i_mark->wd got already reset to -1 and reports this value to userspace which can confuse the inotify listener. Avoid the problem by validating that wd is sensible (and pretend the mark got removed before the event got generated otherwise).
Message-Id: <[email protected]>
--- fs/notify/inotify/inotify_fsnotify.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
fs/notify/inotify/inotify_fsnotify.c +9 -2
@@ -65,7 +65,7 @@ int inotify_handle_inode_event(struct fsstruct fsnotify_event *fsn_event;struct fsnotify_group *group = inode_mark->group;int ret; -int len =0 ; +int len =0 , wd;int alloc_len =sizeof (struct inotify_event_info );struct mem_cgroup *old_memcg;
@@ -81,6 +81,13 @@ int inotify_handle_inode_event(struct fs fsn_mark);/* +* We can be racing with mark being detached. Don't report event with +* invalid wd. +*/ + wd =READ_ONCE (i_mark->wd); +if (wd ==-1 ) +return 0 ; +/* * Whoever is interested in the event, pays for the allocation. Do not * trigger OOM killer in the target monitoring memcg as it may have * security repercussion.
@@ -110,7 +117,7 @@ int inotify_handle_inode_event(struct fs fsn_event = &event->fse;fsnotify_init_event (fsn_event); event->mask = mask; - event->wd = i_mark->wd; + event->wd = wd; event->sync_cookie = cookie; event->name_len = len;if (len)
Greg Kroah-Hartman
maintainerPATCH 73/134 smb3: fix problem remounting a share after shutdown
In reply to Greg Kroah-HartmanFrom: Steve French <[email protected]>
commit 716a3cf317456fa01d54398bb14ab354f50ed6a2 upstream.
xfstests generic/392 showed a problem where even after a shutdown call was made on a mount, we would still attempt to use the (now inaccessible) superblock if another mount was attempted for the same share.
--- fs/cifs/connect.c | 7 +++++++ 1 file changed, 7 insertions(+)
fs/cifs/connect.c +7 -0
@@ -2474,6 +2474,13 @@ cifs_match_super(struct super_block *sb,spin_lock (&cifs_tcp_ses_lock); cifs_sb =CIFS_SB (sb); + +/* We do not want to use a superblock that has been shutdown */ +if (CIFS_MOUNT_SHUTDOWN & cifs_sb->mnt_cifs_flags) { +spin_unlock (&cifs_tcp_ses_lock); +return 0 ; + } + tlink =cifs_get_tlink (cifs_sb_master_tlink (cifs_sb));if (tlink ==NULL ) {/* can not match superblock if tlink were ever null */
Greg Kroah-Hartman
maintainerPATCH 47/134 net: enetc: check the index of the SFI rather than the handle
In reply to Greg Kroah-HartmanFrom: Wei Fang <[email protected]>
[ Upstream commit 299efdc2380aac588557f4d0b2ce7bee05bd0cf2 ]
We should check whether the current SFI (Stream Filter Instance) table is full before creating a new SFI entry. However, the previous logic checks the handle by mistake and might lead to unpredictable behavior.
--- drivers/net/ethernet/freescale/enetc/enetc_qos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/freescale/enetc/enetc_qos.c +1 -1
@@ -1270,7 +1270,7 @@ static int enetc_psfp_parse_clsflower(struct enetc_ndev_priv *priv,int index; index =enetc_get_free_index (priv); -if (sfi->handle <0 ) { +if (index <0 ) {NL_SET_ERR_MSG_MOD (extack,"No Stream Filter resource!" ); err = -ENOSPC ; goto free_fmi;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 74/134 SMB3: force unmount was failing to close deferred close files
In reply to Greg Kroah-HartmanFrom: Steve French <[email protected]>
commit 2cb6f968775a9fd60c90a6042b9550bcec3ea087 upstream.
In investigating a failure with xfstest generic/392 it was noticed that mounts were reusing a superblock that should already have been freed. This turned out to be related to deferred close files keeping a reference count until the closetimeo expired.
Currently the only way an fs knows that mount is beginning is when force unmount is called, but when this, ie umount_begin(), is called all deferred close files on the share (tree connection) should be closed immediately (unless shared by another mount) to avoid using excess resources on the server and to avoid reusing a superblock which should already be freed.
In umount_begin, close all deferred close handles for that share if this is the last mount using that share on this client (ie send the SMB3 close request over the wire for those that have been already closed by the app but that we have kept a handle lease open for and have not sent closes to the server for yet).
--- fs/cifs/cifsfs.c | 1 + 1 file changed, 1 insertion(+)
fs/cifs/cifsfs.c +1 -0
@@ -715,6 +715,7 @@ static void cifs_umount_begin(struct sup tcon->tidStatus = CifsExiting;spin_unlock (&cifs_tcp_ses_lock); +cifs_close_all_deferred_files (tcon);/* cancel_brl_requests(tcon); */ /* BB mark all brl mids as exiting */ /* cancel_notify_requests(tcon); */ if (tcon->ses && tcon->ses->server) {
Greg Kroah-Hartman
maintainerPATCH 75/134 sh: math-emu: fix macro redefined warning
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
commit 58a49ad90939386a8682e842c474a0d2c00ec39c upstream.
Fix a warning that was reported by the kernel test robot:
In file included from ../include/math-emu/soft-fp.h:27,
from ../arch/sh/math-emu/math.c:22:
../arch/sh/include/asm/sfp-machine.h:17: warning: "__BYTE_ORDER" redefined
17 | #define __BYTE_ORDER __BIG_ENDIAN
In file included from ../arch/sh/math-emu/math.c:21:../arch/sh/math-emu/sfp-util.h:71: note: this is the location of the previous definition
71 | #define __BYTE_ORDER __LITTLE_ENDIAN
--- arch/sh/math-emu/sfp-util.h | 4 ---- 1 file changed, 4 deletions(-)
arch/sh/math-emu/sfp-util.h +0 -4
@@ -67,7 +67,3 @@ } while (0)#define abort () return 0 - -#define __BYTE_ORDER __LITTLE_ENDIAN - -
Greg Kroah-Hartman
maintainerPATCH 76/134 sh: mcount.S: fix build error when PRINTK is not enabled
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
commit c2bd1e18c6f85c0027da2e5e7753b9bfd9f8e6dc upstream.
Fix a build error in mcount.S when CONFIG_PRINTK is not enabled. Fixes this build error:
sh2-linux-ld: arch/sh/lib/mcount.o: in function `stack_panic':
(.text+0xec): undefined reference to `dump_stack'
--- arch/sh/Kconfig.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sh/Kconfig.debug +1 -1
@@ -15,7 +15,7 @@ config SH_STANDARD_BIOS config STACK_DEBUG bool "Check for stack overflows" - depends on DEBUG_KERNEL + depends on DEBUG_KERNEL && PRINTK help This option will cause messages to be printed if free stack space drops below a certain limit. Saying Y here will add overhead to
Greg Kroah-Hartman
maintainerPATCH 48/134 net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop()
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit 93e0401e0fc0c54b0ac05b687cd135c2ac38187c ]
The call to phy_stop() races with the later call to phy_disconnect(), resulting in concurrent phy_suspend() calls being run from different CPUs. The final call to phy_disconnect() ensures that the PHY is stopped and suspended, too.
--- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/broadcom/genet/bcmgenet.c +0 -1
@@ -3416,7 +3416,6 @@ static void bcmgenet_netif_stop(struct net_device *dev)/* Disable MAC transmit. TX DMA disabled must be done before this */ umac_enable_set (priv,CMD_TX_EN , false); -phy_stop (dev->phydev);bcmgenet_disable_rx_napi (priv);bcmgenet_intr_disable (priv);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 49/134 perf scripts intel-pt-events.py: Fix IPC output for Python 2
In reply to Greg Kroah-HartmanFrom: Roman Lozko <[email protected]>
[ Upstream commit 1f64cfdebfe0494264271e8d7a3a47faf5f58ec7 ]
Integers are not converted to floats during division in Python 2 which results in incorrect IPC values. Fix by switching to new division behavior.
--- tools/perf/scripts/python/intel-pt-events.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/scripts/python/intel-pt-events.py +1 -1
@@ -11,7 +11,7 @@ # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # more details. -from __future__ import print_function +from __future__ import division, print_function import os import sys
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 50/134 perf vendor events power9: Remove UTF-8 characters from JSON files
In reply to Greg Kroah-HartmanFrom: Kajol Jain <[email protected]>
[ Upstream commit 5d9df8731c0941f3add30f96745a62586a0c9d52 ]
Commit 3c22ba5243040c13 ("perf vendor events powerpc: Update POWER9 events") added and updated power9 PMU JSON events. However some of the JSON events which are part of other.json and pipeline.json files, contains UTF-8 characters in their brief description. Having UTF-8 character could breaks the perf build on some distros.
Fix this issue by removing the UTF-8 characters from other.json and pipeline.json files.
Result without the fix:
[command]# file -i pmu-events/arch/powerpc/power9/*
pmu-events/arch/powerpc/power9/cache.json: application/json; charset=us-ascii
pmu-events/arch/powerpc/power9/floating-point.json: application/json; charset=us-ascii
pmu-events/arch/powerpc/power9/frontend.json: application/json; charset=us-ascii pmu-events/arch/powerpc/power9/marked.json: application/json; charset=us-ascii pmu-events/arch/powerpc/power9/memory.json: application/json; charset=us-ascii pmu-events/arch/powerpc/power9/metrics.json: application/json; charset=us-ascii pmu-events/arch/powerpc/power9/nest_metrics.json: application/json; charset=us-ascii pmu-events/arch/powerpc/power9/other.json: application/json; charset=utf-8 pmu-events/arch/powerpc/power9/pipeline.json: application/json; charset=utf-8 pmu-events/arch/powerpc/power9/pmc.json: application/json; charset=us-ascii pmu-events/arch/powerpc/power9/translation.json: application/json; charset=us-ascii
[command]#
Result with the fix:
[command]# file -i pmu-events/arch/powerpc/power9/*
pmu-events/arch/powerpc/power9/cache.json: application/json; charset=us-ascii
pmu-events/arch/powerpc/power9/floating-point.json: application/json; charset=us-ascii
pmu-events/arch/powerpc/power9/frontend.json: application/json; charset=us-ascii pmu-events/arch/powerpc/power9/marked.json: application/json; charset=us-ascii pmu-events/arch/powerpc/power9/memory.json: application/json; charset=us-ascii pmu-events/arch/powerpc/power9/metrics.json: application/json; charset=us-ascii pmu-events/arch/powerpc/power9/nest_metrics.json: application/json; charset=us-ascii pmu-events/arch/powerpc/power9/other.json: application/json; charset=us-ascii pmu-events/arch/powerpc/power9/pipeline.json: application/json; charset=us-ascii pmu-events/arch/powerpc/power9/pmc.json: application/json; charset=us-ascii pmu-events/arch/powerpc/power9/translation.json: application/json; charset=us-ascii
[command]#
--- tools/perf/pmu-events/arch/powerpc/power9/other.json | 4 ++-- tools/perf/pmu-events/arch/powerpc/power9/pipeline.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
tools/perf/pmu-events/arch/powerpc/power9/other.json +2 -2
@@ -1417,7 +1417,7 @@ { "EventCode": "0x45054", "EventName": "PM_FMA_CMPL", - "BriefDescription": "two flops operation completed (fmadd, fnmadd, fmsub, fnmsub) Scalar instructions only. " + "BriefDescription": "two flops operation completed (fmadd, fnmadd, fmsub, fnmsub) Scalar instructions only." }, { "EventCode": "0x201E8",
@@ -2017,7 +2017,7 @@ { "EventCode": "0xC0BC", "EventName": "PM_LSU_FLUSH_OTHER", - "BriefDescription": "Other LSU flushes including: Sync (sync ack from L2 caused search of LRQ for oldest snooped load, This will either signal a Precise Flush of the oldest snooped loa or a Flush Next PPC); Data Valid Flush Next (several cases of this, one example is store and reload are lined up such that a store-hit-reload scenario exists and the CDF has already launched and has gotten bad/stale data); Bad Data Valid Flush Next (might be a few cases of this, one example is a larxa (D$ hit) return data and dval but can't allocate to LMQ (LMQ full or other reason). Already gave dval but can't watch it for snoop_hit_larx. Need to take the “bad dval” back and flush all younger ops)" + "BriefDescription": "Other LSU flushes including: Sync (sync ack from L2 caused search of LRQ for oldest snooped load, This will either signal a Precise Flush of the oldest snooped loa or a Flush Next PPC); Data Valid Flush Next (several cases of this, one example is store and reload are lined up such that a store-hit-reload scenario exists and the CDF has already launched and has gotten bad/stale data); Bad Data Valid Flush Next (might be a few cases of this, one example is a larxa (D$ hit) return data and dval but can't allocate to LMQ (LMQ full or other reason). Already gave dval but can't watch it for snoop_hit_larx. Need to take the 'bad dval' back and flush all younger ops)" }, { "EventCode": "0x5094",
tools/perf/pmu-events/arch/powerpc/power9/pipeline.json +1 -1
@@ -442,7 +442,7 @@ { "EventCode": "0x4D052", "EventName": "PM_2FLOP_CMPL", - "BriefDescription": "DP vector version of fmul, fsub, fcmp, fsel, fabs, fnabs, fres ,fsqrte, fneg " + "BriefDescription": "DP vector version of fmul, fsub, fcmp, fsel, fabs, fnabs, fres ,fsqrte, fneg" }, { "EventCode": "0x1F142",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 51/134 perf pmu: zfree() expects a pointer to a pointer to zero it after freeing its contents
In reply to Greg Kroah-HartmanFrom: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit 57f14b5ae1a97537f2abd2828ee7212cada7036e ]
An audit showed just this one problem with zfree(), fix it.
--- tools/perf/util/pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/pmu.c +1 -1
@@ -1858,7 +1858,7 @@ static int perf_pmu__new_caps(struct list_head *list, char *name, char *value)return 0 ; free_name: -zfree (caps->name); +zfree (&caps->name); free_caps:free (caps);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 52/134 perf map: Delete two variable initialisations before null pointer checks in sort__sym_from_cmp()
In reply to Greg Kroah-HartmanFrom: Markus Elfring <[email protected]>
[ Upstream commit c160118a90d4acf335993d8d59b02ae2147a524e ]
Addresses of two data structure members were determined before corresponding null pointer checks in the implementation of the function “sort__sym_from_cmp”.
Thus avoid the risk for undefined behaviour by removing extra initialisations for the local variables “from_l” and “from_r” (also because they were already reassigned with the same value behind this pointer check).
This issue was detected by using the Coccinelle software.
--- tools/perf/util/sort.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
tools/perf/util/sort.c +1 -2
@@ -876,8 +876,7 @@ static int hist_entry__dso_to_filter(struct hist_entry *he, int type,static int64_t sort__sym_from_cmp (struct hist_entry *left,struct hist_entry *right) { -struct addr_map_symbol *from_l = &left->branch_info->from; -struct addr_map_symbol *from_r = &right->branch_info->from; +struct addr_map_symbol *from_l, *from_r;if (!left->branch_info || !right->branch_info)return cmp_null (left->branch_info, right->branch_info);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 53/134 crypto: sun8i-ss - Fix a test in sun8i_ss_setup_ivs()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 8fd91151ebcb21b3f2f2bf158ac6092192550b2b ]
SS_ENCRYPTION is (0 << 7 = 0), so the test can never be true. Use a direct comparison to SS_ENCRYPTION instead.
The same king of test is already done the same way in sun8i_ss_run_task().
--- drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c +1 -1
@@ -132,7 +132,7 @@ static int sun8i_ss_setup_ivs(struct skcipher_request *areq) } rctx->p_iv[i] = a;/* we need to setup all others IVs only in the decrypt way */ -if (rctx->op_dir &SS_ENCRYPTION ) +if (rctx->op_dir ==SS_ENCRYPTION )return 0 ; todo =min (len,sg_dma_len (sg)); len -= todo;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 44/134 net: dsa: mt7530: fix corrupt frames using trgmii on 40 MHz XTAL MT7621
In reply to Greg Kroah-HartmanFrom: Arınç ÜNAL <[email protected]>
[ Upstream commit 37c218d8021e36e226add4bab93d071d30fe0704 ]
The multi-chip module MT7530 switch with a 40 MHz oscillator on the MT7621AT, MT7621DAT, and MT7621ST SoCs forwards corrupt frames using trgmii.
This is caused by the assumption that MT7621 SoCs have got 150 MHz PLL, hence using the ncpo1 value, 0x0780.
My testing shows this value works on Unielec U7621-06, Bartel's testing shows it won't work on Hi-Link HLK-MT7621A and Netgear WAC104. All devices tested have got 40 MHz oscillators.
Using the value for 125 MHz PLL, 0x0640, works on all boards at hand. The definitions for 125 MHz PLL exist on the Banana Pi BPI-R2 BSP source code whilst 150 MHz PLL don't.
Forwarding frames using trgmii on the MCM MT7530 switch with a 25 MHz oscillator on the said MT7621 SoCs works fine because the ncpo1 value defined for it is for 125 MHz PLL.
Change the 150 MHz PLL comment to 125 MHz PLL, and use the 125 MHz PLL ncpo1 values for both oscillator frequencies.
--- drivers/net/dsa/mt7530.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/dsa/mt7530.c +2 -2
@@ -441,9 +441,9 @@ mt7530_pad_clk_setup(struct dsa_switch *ds, phy_interface_t interface)else ssc_delta =0x87 ;if (priv->id ==ID_MT7621 ) { -/* PLL frequency: 150MHz: 1.2GBit */ +/* PLL frequency: 125MHz: 1.0GBit */ if (xtal ==HWTRAP_XTAL_40MHZ ) - ncpo1 =0x0780 ; + ncpo1 =0x0640 ;if (xtal ==HWTRAP_XTAL_25MHZ ) ncpo1 =0x0a00 ; }else {/* PLL frequency: 250MHz: 2.0Gbit */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 78/134 sh: nmi_debug: fix return value of __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
commit d1155e4132de712a9d3066e2667ceaad39a539c5 upstream.
__setup() handlers should return 1 to obsolete_checksetup() in init/main.c to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) argument or environment strings. Also, error return codes don't mean anything to obsolete_checksetup() -- only non-zero (usually 1) or zero. So return 1 from nmi_debug_setup().
--- arch/sh/kernel/nmi_debug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/sh/kernel/nmi_debug.c +2 -2
@@ -49,7 +49,7 @@ static int __init nmi_debug_setup(char *register_die_notifier (&nmi_debug_nb);if (*str !='=' ) -return 0 ; +return 1 ;for (p = str +1 ; *p; p = sep +1 ) { sep =strchr (p,',' );
@@ -70,6 +70,6 @@ static int __init nmi_debug_setup(char *break ; } -return 0 ; +return 1 ; }__setup ("nmi_debug" , nmi_debug_setup);
Greg Kroah-Hartman
maintainerPATCH 87/134 f2fs: fix potential corruption when moving a directory
In reply to Greg Kroah-HartmanFrom: Jaegeuk Kim <[email protected]>
commit d94772154e524b329a168678836745d2773a6e02 upstream.
F2FS has the same issue in ext4_rename causing crash revealed by xfstests/generic/707.
See also commit 0813299c586b ("ext4: Fix possible corruption when moving a directory")
--- fs/f2fs/namei.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
fs/f2fs/namei.c +15 -1
@@ -991,12 +991,20 @@ static int f2fs_rename(struct inode *old goto out; } +/* +* Copied from ext4_rename: we need to protect against old.inode +* directory getting converted from inline directory format into +* a normal one. +*/ +if (S_ISDIR (old_inode->i_mode)) +inode_lock_nested (old_inode,I_MUTEX_NONDIR2 ); + err = -ENOENT ; old_entry =f2fs_find_entry (old_dir, &old_dentry->d_name, &old_page);if (!old_entry) {if (IS_ERR (old_page)) err =PTR_ERR (old_page); - goto out; + goto out_unlock_old; }if (S_ISDIR (old_inode->i_mode)) {
@@ -1104,6 +1112,9 @@ static int f2fs_rename(struct inode *oldf2fs_unlock_op (sbi); +if (S_ISDIR (old_inode->i_mode)) +inode_unlock (old_inode); +if (IS_DIRSYNC (old_dir) ||IS_DIRSYNC (new_dir))f2fs_sync_fs (sbi->sb,1 );
@@ -1118,6 +1129,9 @@ out_dir:f2fs_put_page (old_dir_page,0 ); out_old:f2fs_put_page (old_page,0 ); +out_unlock_old: +if (S_ISDIR (old_inode->i_mode)) +inode_unlock (old_inode); out:if (whiteout)iput (whiteout);
Greg Kroah-Hartman
maintainerPATCH 88/134 drm/panel: otm8009a: Set backlight parent to panel device
In reply to Greg Kroah-HartmanFrom: James Cowgill <[email protected]>
commit ab4f869fba6119997f7630d600049762a2b014fa upstream.
This is the logical place to put the backlight device, and it also fixes a kernel crash if the MIPI host is removed. Previously the backlight device would be unregistered twice when this happened - once as a child of the MIPI host through mipi_dsi_host_unregister, and once when the panel device is destroyed.
--- drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/panel/panel-orisetech-otm8009a.c +1 -1
@@ -444,7 +444,7 @@ static int otm8009a_probe(struct mipi_ds DRM_MODE_CONNECTOR_DSI); ctx->bl_dev =devm_backlight_device_register (dev,dev_name (dev), - dsi->host->dev, ctx, + dev, ctx, &otm8009a_backlight_ops,NULL );if (IS_ERR (ctx->bl_dev)) {
Greg Kroah-Hartman
maintainerPATCH 89/134 drm/amd/display: fix flickering caused by S/G mode
In reply to Greg Kroah-HartmanFrom: Hamza Mahfooz <[email protected]>
commit 08da182175db4c7f80850354849d95f2670e8cd9 upstream.
Currently, on a handful of ASICs. We allow the framebuffer for a given plane to exist in either VRAM or GTT. However, if the plane's new framebuffer is in a different memory domain than it's previous framebuffer, flipping between them can cause the screen to flicker. So, to fix this, don't perform an immediate flip in the aforementioned case.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +11 -2
@@ -8944,6 +8944,13 @@ static void amdgpu_dm_commit_cursors(strhandle_cursor_update (plane, old_plane_state); } +static inline uint32_t get_mem_type (struct drm_framebuffer *fb) +{ +struct amdgpu_bo *abo =gem_to_amdgpu_bo (fb->obj[0 ]); + +return abo->tbo.resource ? abo->tbo.resource->mem_type :0 ; +} + static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, struct dc_state *dc_state, struct drm_device *dev,
@@ -9064,11 +9071,13 @@ static void amdgpu_dm_commit_planes(stru/* * Only allow immediate flips for fast updates that don't -* change FB pitch, DCC state, rotation or mirroing. +* change memory domain, FB pitch, DCC state, rotation or +* mirroring. */ bundle->flip_addrs[planes_count].flip_immediate = crtc->state->async_flip && - acrtc_state->update_type ==UPDATE_TYPE_FAST ; + acrtc_state->update_type ==UPDATE_TYPE_FAST && +get_mem_type (old_plane_state->fb) ==get_mem_type (fb); timestamp_ns =ktime_get_ns (); bundle->flip_addrs[planes_count].flip_timestamp_in_us =div_u64 (timestamp_ns,1000 );
Greg Kroah-Hartman
maintainerPATCH 90/134 drm/amdgpu: fix an amdgpu_irq_put() issue in gmc_v9_0_hw_fini()
In reply to Greg Kroah-HartmanFrom: Hamza Mahfooz <[email protected]>
commit 922a76ba31adf84e72bc947267385be420c689ee upstream.
As made mention of in commit 08c677cb0b43 ("drm/amdgpu: fix amdgpu_irq_put call trace in gmc_v10_0_hw_fini") and commit 13af556104fa ("drm/amdgpu: fix amdgpu_irq_put call trace in gmc_v11_0_hw_fini"). It is meaningless to call amdgpu_irq_put() for gmc.ecc_irq. So, remove it from gmc_v9_0_hw_fini().
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +0 -1
@@ -1819,7 +1819,6 @@ static int gmc_v9_0_hw_fini(void *handlereturn 0 ; } -amdgpu_irq_put (adev, &adev->gmc.ecc_irq,0 );amdgpu_irq_put (adev, &adev->gmc.vm_fault,0 );return 0 ;
Greg Kroah-Hartman
maintainerPATCH 91/134 drm/amdgpu/gfx: disable gfx9 cp_ecc_error_irq only when enabling legacy gfx ras
In reply to Greg Kroah-HartmanFrom: Guchun Chen <[email protected]>
commit 4a76680311330aefe5074bed8f06afa354b85c48 upstream.
gfx9 cp_ecc_error_irq is only enabled when legacy gfx ras is assert. So in gfx_v9_0_hw_fini, interrupt disablement for cp_ecc_error_irq should be executed under such condition, otherwise, an amdgpu_irq_put calltrace will occur.
[ 7283.170322] RIP: 0010:amdgpu_irq_put+0x45/0x70 [amdgpu] [ 7283.170964] RSP: 0018:ffff9a5fc3967d00 EFLAGS: 00010246 [ 7283.170967] RAX: ffff98d88afd3040 RBX: ffff98d89da20000 RCX: 0000000000000000 [ 7283.170969] RDX: 0000000000000000 RSI: ffff98d89da2bef8 RDI: ffff98d89da20000 [ 7283.170971] RBP: ffff98d89da20000 R08: ffff98d89da2ca18 R09: 0000000000000006 [ 7283.170973] R10: ffffd5764243c008 R11: 0000000000000000 R12: 0000000000001050 [ 7283.170975] R13: ffff98d89da38978 R14: ffffffff999ae15a R15: ffff98d880130105 [ 7283.170978] FS: 0000000000000000(0000) GS:ffff98d996f00000(0000) knlGS:0000000000000000 [ 7283.170981] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 7283.170983] CR2: 00000000f7a9d178 CR3: 00000001c42ea000 CR4: 00000000003506e0 [ 7283.170986] Call Trace: [ 7283.170988] <TASK> [ 7283.170989] gfx_v9_0_hw_fini+0x1c/0x6d0 [amdgpu] [ 7283.171655] amdgpu_device_ip_suspend_phase2+0x101/0x1a0 [amdgpu] [ 7283.172245] amdgpu_device_suspend+0x103/0x180 [amdgpu] [ 7283.172823] amdgpu_pmops_freeze+0x21/0x60 [amdgpu] [ 7283.173412] pci_pm_freeze+0x54/0xc0 [ 7283.173419] ? __pfx_pci_pm_freeze+0x10/0x10 [ 7283.173425] dpm_run_callback+0x98/0x200 [ 7283.173430] __device_suspend+0x164/0x5f0
v2: drop gfx11 as it's fixed in a different solution by retiring cp_ecc_irq funcs(Hawking)
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2 -1
@@ -4018,7 +4018,8 @@ static int gfx_v9_0_hw_fini(void *handle {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -amdgpu_irq_put (adev, &adev->gfx.cp_ecc_error_irq,0 ); +if (amdgpu_ras_is_supported (adev,AMDGPU_RAS_BLOCK__GFX )) +amdgpu_irq_put (adev, &adev->gfx.cp_ecc_error_irq,0 );amdgpu_irq_put (adev, &adev->gfx.priv_reg_irq,0 );amdgpu_irq_put (adev, &adev->gfx.priv_inst_irq,0 );
Greg Kroah-Hartman
maintainerPATCH 92/134 drm/amdgpu: Fix vram recover doesnt work after whole GPU reset (v2)
In reply to Greg Kroah-HartmanFrom: Lin.Cao <[email protected]>
commit 6c032c37ac3ef3b7df30937c785ecc4da428edc0 upstream.
v1: Vmbo->shadow is used to back vram bo up when vram lost. So that we should set shadow as vmbo->shadow to recover vmbo->bo
v2: Modify if(vmbo->shadow) shadow = vmbo->shadow as if(!vmbo->shadow) continue;
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +5 -1
@@ -4368,7 +4368,11 @@ static int amdgpu_device_recover_vram(stdev_info (adev->dev,"recover vram bo from shadow start\n" );mutex_lock (&adev->shadow_list_lock);list_for_each_entry (vmbo, &adev->shadow_list, shadow_list) { - shadow = &vmbo->bo; +/* If vm is compute context or adev is APU, shadow will be NULL */ +if (!vmbo->shadow) +continue ; + shadow = vmbo->shadow; +/* No need to recover an evicted BO */ if (shadow->tbo.resource->mem_type != TTM_PL_TT || shadow->tbo.resource->start == AMDGPU_BO_INVALID_OFFSET ||
Greg Kroah-Hartman
maintainerPATCH 93/134 drm/amdgpu: disable sdma ecc irq only when sdma RAS is enabled in suspend
In reply to Greg Kroah-HartmanFrom: Guchun Chen <[email protected]>
commit 8b229ada2669b74fdae06c83fbfda5a5a99fc253 upstream.
sdma_v4_0_ip is shared on a few asics, but in sdma_v4_0_hw_fini, driver unconditionally disables ecc_irq which is only enabled on those asics enabling sdma ecc. This will introduce a warning in suspend cycle on those chips with sdma ip v4.0, while without sdma ecc. So this patch correct this.
[ 7283.166354] RIP: 0010:amdgpu_irq_put+0x45/0x70 [amdgpu] [ 7283.167001] RSP: 0018:ffff9a5fc3967d08 EFLAGS: 00010246 [ 7283.167019] RAX: ffff98d88afd3770 RBX: 0000000000000001 RCX: 0000000000000000 [ 7283.167023] RDX: 0000000000000000 RSI: ffff98d89da30390 RDI: ffff98d89da20000 [ 7283.167025] RBP: ffff98d89da20000 R08: 0000000000036838 R09: 0000000000000006 [ 7283.167028] R10: ffffd5764243c008 R11: 0000000000000000 R12: ffff98d89da30390 [ 7283.167030] R13: ffff98d89da38978 R14: ffffffff999ae15a R15: ffff98d880130105 [ 7283.167032] FS: 0000000000000000(0000) GS:ffff98d996f00000(0000) knlGS:0000000000000000 [ 7283.167036] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 7283.167039] CR2: 00000000f7a9d178 CR3: 00000001c42ea000 CR4: 00000000003506e0 [ 7283.167041] Call Trace: [ 7283.167046] <TASK> [ 7283.167048] sdma_v4_0_hw_fini+0x38/0xa0 [amdgpu] [ 7283.167704] amdgpu_device_ip_suspend_phase2+0x101/0x1a0 [amdgpu] [ 7283.168296] amdgpu_device_suspend+0x103/0x180 [amdgpu] [ 7283.168875] amdgpu_pmops_freeze+0x21/0x60 [amdgpu] [ 7283.169464] pci_pm_freeze+0x54/0xc0
--- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +5 -3
@@ -2044,9 +2044,11 @@ static int sdma_v4_0_hw_fini(void *handlif (amdgpu_sriov_vf (adev))return 0 ; -for (i =0 ; i < adev->sdma.num_instances; i++) { -amdgpu_irq_put (adev, &adev->sdma.ecc_irq, -AMDGPU_SDMA_IRQ_INSTANCE0 + i); +if (amdgpu_ras_is_supported (adev,AMDGPU_RAS_BLOCK__SDMA )) { +for (i =0 ; i < adev->sdma.num_instances; i++) { +amdgpu_irq_put (adev, &adev->sdma.ecc_irq, +AMDGPU_SDMA_IRQ_INSTANCE0 + i); + } }sdma_v4_0_ctx_switch_enable (adev, false);
Greg Kroah-Hartman
maintainerPATCH 94/134 HID: wacom: Set a default resolution for older tablets
In reply to Greg Kroah-HartmanFrom: Ping Cheng <[email protected]>
commit 08a46b4190d345544d04ce4fe2e1844b772b8535 upstream.
Some older tablets may not report physical maximum for X/Y coordinates. Set a default to prevent undefined resolution.
--- drivers/hid/wacom_wac.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/hid/wacom_wac.c +10 -2
@@ -1857,6 +1857,7 @@ static void wacom_map_usage(struct inputint fmax = field->logical_maximum;unsigned int equivalent_usage =wacom_equivalent_usage (usage->hid);int resolution_code = code; +int resolution =hidinput_calc_abs_res (field, resolution_code);if (equivalent_usage ==HID_DG_TWIST ) { resolution_code =ABS_RZ ;
@@ -1877,8 +1878,15 @@ static void wacom_map_usage(struct inputswitch (type) {case EV_ABS :input_set_abs_params (input, code, fmin, fmax, fuzz,0 ); -input_abs_set_res (input, code, -hidinput_calc_abs_res (field, resolution_code)); + +/* older tablet may miss physical usage */ +if ((code ==ABS_X || code ==ABS_Y ) && !resolution) { + resolution =WACOM_INTUOS_RES ; +hid_warn (input, +"Wacom usage (%d) missing resolution \n" , + code); + } +input_abs_set_res (input, code, resolution);break ;case EV_KEY :case EV_MSC :
Greg Kroah-Hartman
maintainerPATCH 95/134 HID: wacom: insert timestamp to packed Bluetooth (BT) events
In reply to Greg Kroah-HartmanFrom: Ping Cheng <[email protected]>
commit 17d793f3ed53080dab6bbeabfc82de890c901001 upstream.
To fully utilize the BT polling/refresh rate, a few input events are sent together to reduce event delay. This causes issue to the timestamp generated by input_sync since all the events in the same packet would pretty much have the same timestamp. This patch inserts time interval to the events by averaging the total time used for sending the packet.
This decision was mainly based on observing the actual time interval between each BT polling. The interval doesn't seem to be constant, due to the network and system environment. So, using solutions other than averaging doesn't end up with valid timestamps.
--- drivers/hid/wacom_wac.c | 26 ++++++++++++++++++++++++++ drivers/hid/wacom_wac.h | 1 + 2 files changed, 27 insertions(+)
drivers/hid/wacom_wac.c +26 -0
@@ -1272,6 +1272,9 @@ static void wacom_intuos_pro2_bt_pen(strstruct input_dev *pen_input = wacom->pen_input;unsigned char *data = wacom->data; +int number_of_valid_frames =0 ; +int time_interval =15000000 ; +ktime_t time_packet_received =ktime_get ();int i; if (wacom->features.type == INTUOSP2_BT ||
@@ -1292,12 +1295,30 @@ static void wacom_intuos_pro2_bt_pen(str wacom->id[0 ] |= (wacom->serial[0 ] >>32 ) &0xFFFFF ; } +/* number of valid frames */ for (i =0 ; i < pen_frames; i++) {unsigned char *frame = &data[i*pen_frame_len +1 ];bool valid = frame[0 ] &0x80 ; + +if (valid) + number_of_valid_frames++; + } + +if (number_of_valid_frames) { +if (wacom->hid_data.time_delayed) + time_interval =ktime_get () - wacom->hid_data.time_delayed; + time_interval /= number_of_valid_frames; + wacom->hid_data.time_delayed = time_packet_received; + } + +for (i =0 ; i < number_of_valid_frames; i++) { +unsigned char *frame = &data[i*pen_frame_len +1 ]; +bool valid = frame[0 ] &0x80 ;bool prox = frame[0 ] &0x40 ;bool range = frame[0 ] &0x20 ;bool invert = frame[0 ] &0x10 ; +int frames_number_reversed = number_of_valid_frames - i -1 ; +int event_timestamp = time_packet_received - frames_number_reversed * time_interval;if (!valid)continue ;
@@ -1310,6 +1331,7 @@ static void wacom_intuos_pro2_bt_pen(str wacom->tool[0 ] =0 ; wacom->id[0 ] =0 ; wacom->serial[0 ] =0 ; + wacom->hid_data.time_delayed =0 ;return ; }
@@ -1346,6 +1368,7 @@ static void wacom_intuos_pro2_bt_pen(str get_unaligned_le16(&frame[11])); } } +if (wacom->tool[0 ]) {input_report_abs (pen_input,ABS_PRESSURE ,get_unaligned_le16 (&frame[5 ])); if (wacom->features.type == INTUOSP2_BT ||
@@ -1369,6 +1392,9 @@ static void wacom_intuos_pro2_bt_pen(str wacom->shared->stylus_in_proximity = prox; +/* add timestamp to unpack the frames */ +input_set_timestamp (pen_input, event_timestamp); +input_sync (pen_input); } }
drivers/hid/wacom_wac.h +1 -0
@@ -321,6 +321,7 @@ struct hid_data {int bat_connected;int ps_connected;bool pad_input_event_flag; +int time_delayed; };struct wacom_remote_data {
Greg Kroah-Hartman
maintainerPATCH 96/134 fs/ntfs3: Refactoring of various minor issues
In reply to Greg Kroah-HartmanFrom: Konstantin Komarov <[email protected]>
commit 6827d50b2c430c329af442b64c9176d174f56521 upstream.
Removed unused macro.
Changed null pointer checking.
Fixed inconsistent indenting.
--- fs/ntfs3/bitmap.c | 3 ++- fs/ntfs3/namei.c | 2 +- fs/ntfs3/ntfs.h | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-)
fs/ntfs3/bitmap.c +2 -1
@@ -666,7 +666,8 @@ int wnd_init(struct wnd_bitmap *wnd, strif (!wnd->bits_last) wnd->bits_last = wbits; - wnd->free_bits =kcalloc (wnd->nwnd,sizeof (u16),GFP_NOFS | __GFP_NOWARN); + wnd->free_bits = +kcalloc (wnd->nwnd,sizeof (u16),GFP_NOFS | __GFP_NOWARN);if (!wnd->free_bits)return -ENOMEM ;
fs/ntfs3/namei.c +1 -1
@@ -91,7 +91,7 @@ static struct dentry *ntfs_lookup(struct* If the MFT record of ntfs inode is not a base record, inode->i_op can be NULL. * This causes null pointer dereference in d_splice_alias(). */ -if (!IS_ERR (inode) && inode->i_op ==NULL ) { +if (!IS_ERR_OR_NULL (inode) && !inode->i_op) {iput (inode); inode =ERR_PTR (-EINVAL ); }
fs/ntfs3/ntfs.h +0 -3
@@ -436,9 +436,6 @@ static inline u64 attr_svcn(const structreturn attr->non_res ?le64_to_cpu (attr->nres.svcn) :0 ; } -/* The size of resident attribute by its resident size. */ -#define BYTES_PER_RESIDENT (b) (0x18 + (b)) -static_assert (sizeof (struct ATTRIB ) ==0x48 );static_assert (sizeof (((struct ATTRIB *)NULL )->res) ==0x08 );static_assert (sizeof (((struct ATTRIB *)NULL )->nres) ==0x38 );
Greg Kroah-Hartman
maintainerPATCH 79/134 remoteproc: stm32: Call of_node_put() on iteration error
In reply to Greg Kroah-HartmanFrom: Mathieu Poirier <[email protected]>
commit ccadca5baf5124a880f2bb50ed1ec265415f025b upstream.
Function of_phandle_iterator_next() calls of_node_put() on the last device_node it iterated over, but when the loop exits prematurely it has to be called explicitly.
--- drivers/remoteproc/stm32_rproc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/remoteproc/stm32_rproc.c +5 -1
@@ -223,11 +223,13 @@ static int stm32_rproc_prepare(struct rpwhile (of_phandle_iterator_next (&it) ==0 ) { rmem =of_reserved_mem_lookup (it.node);if (!rmem) { +of_node_put (it.node);dev_err (dev,"unable to acquire memory-region\n" );return -EINVAL ; }if (stm32_rproc_pa_to_da (rproc, rmem->base, &da) <0 ) { +of_node_put (it.node);dev_err (dev,"memory region not valid %pa\n" , &rmem->base);return -EINVAL ;
@@ -254,8 +256,10 @@ static int stm32_rproc_prepare(struct rp it.node->name); } -if (!mem) +if (!mem) { +of_node_put (it.node);return -ENOMEM ; + }rproc_add_carveout (rproc, mem); index++;
Greg Kroah-Hartman
maintainerPATCH 97/134 ASoC: soc-pcm: Fix DPCM lockdep warning due to nested stream locks
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 3c75c0ea5da749bd1efebd1387f2e5011b8c7d78 upstream.
The recent change for DPCM locking caused spurious lockdep warnings. Actually the warnings are false-positive, as those are triggered due to the nested stream locks for FE and BE. Since both locks belong to the same lock class, lockdep sees it as if a deadlock.
For fixing this, we need to take PCM stream locks for BE with the nested lock primitives. Since currently snd_pcm_stream_lock*() helper assumes only the top-level single locking, a new helper function snd_pcm_stream_lock_irqsave_nested() is defined for a single-depth nested lock, which is now used in the BE DAI trigger that is always performed inside a FE stream lock.
--- include/sound/pcm.h | 15 +++++++++++++++ sound/core/pcm_native.c | 13 +++++++++++++ sound/soc/soc-pcm.c | 6 +++--- 3 files changed, 31 insertions(+), 3 deletions(-)
include/sound/pcm.h +15 -0
@@ -616,6 +616,7 @@ void snd_pcm_stream_unlock(struct snd_pcvoid snd_pcm_stream_lock_irq (struct snd_pcm_substream *substream);void snd_pcm_stream_unlock_irq (struct snd_pcm_substream *substream);unsigned long _snd_pcm_stream_lock_irqsave (struct snd_pcm_substream *substream); +unsigned long _snd_pcm_stream_lock_irqsave_nested (struct snd_pcm_substream *substream);/** * snd_pcm_stream_lock_irqsave - Lock the PCM stream
@@ -635,6 +636,20 @@ void snd_pcm_stream_unlock_irqrestore(st unsigned long flags);/** +* snd_pcm_stream_lock_irqsave_nested - Single-nested PCM stream locking +* @substream: PCM substream +* @flags: irq flags +* +* This locks the PCM stream like snd_pcm_stream_lock_irqsave() but with +* the single-depth lockdep subclass. +*/ +#define snd_pcm_stream_lock_irqsave_nested (substream, flags) \ + do { \ + typecheck(unsigned long, flags); \ + flags = _snd_pcm_stream_lock_irqsave_nested(substream); \ + } while (0) + +/** * snd_pcm_group_for_each_entry - iterate over the linked substreams * @s: the iterator * @substream: the substream
sound/core/pcm_native.c +13 -0
@@ -172,6 +172,19 @@ unsigned long _snd_pcm_stream_lock_irqsa }EXPORT_SYMBOL_GPL (_snd_pcm_stream_lock_irqsave); +unsigned long _snd_pcm_stream_lock_irqsave_nested (struct snd_pcm_substream *substream) +{ +unsigned long flags =0 ; +if (substream->pcm->nonatomic) +mutex_lock_nested (&substream->self_group.mutex, +SINGLE_DEPTH_NESTING ); +else +spin_lock_irqsave_nested (&substream->self_group.lock, flags, +SINGLE_DEPTH_NESTING ); +return flags; +} +EXPORT_SYMBOL_GPL (_snd_pcm_stream_lock_irqsave_nested); +/** * snd_pcm_stream_unlock_irqrestore - Unlock the PCM stream * @substream: PCM substream
sound/soc/soc-pcm.c +3 -3
@@ -46,8 +46,8 @@ static inline void snd_soc_dpcm_stream_lsnd_pcm_stream_lock_irq (snd_soc_dpcm_get_substream (rtd, stream)); } -#define snd_soc_dpcm_stream_lock_irqsave (rtd, stream, flags) \ - snd_pcm_stream_lock_irqsave(snd_soc_dpcm_get_substream(rtd, stream), flags) +#define snd_soc_dpcm_stream_lock_irqsave_nested (rtd, stream, flags) \ + snd_pcm_stream_lock_irqsave_nested(snd_soc_dpcm_get_substream(rtd, stream), flags)static inline void snd_soc_dpcm_stream_unlock_irq (struct snd_soc_pcm_runtime *rtd,int stream)
@@ -2109,7 +2109,7 @@ int dpcm_be_dai_trigger(struct snd_soc_p be = dpcm->be; be_substream =snd_soc_dpcm_get_substream (be, stream); -snd_soc_dpcm_stream_lock_irqsave (be, stream, flags); +snd_soc_dpcm_stream_lock_irqsave_nested (be, stream, flags);/* is this op for this BE ? */ if (!snd_soc_dpcm_be_can_update (fe, be, stream))
Greg Kroah-Hartman
maintainerPATCH 98/134 ASoC: soc-compress: Inherit atomicity from DAI link for Compress FE
In reply to Greg Kroah-HartmanFrom: Daniel Baluta <[email protected]>
commit 37b58becc1cee4d591024f2056d7ffa99c6089e0 upstream.
After commit bbf7d3b1c4f40 ("ASoC: soc-pcm: align BE 'atomicity' with that of the FE") BE and FE atomicity must match.
In the case of Compress PCM there is a mismatch in atomicity between FE and BE and we get errors like this:
[ 36.434566] sai1-wm8960-hifi: dpcm_be_connect: FE is atomic but BE is nonatomic, invalid configuration [ 36.444278] PCM Deep Buffer: ASoC: can't connect SAI1.OUT
In order to fix this we must inherit the atomicity from DAI link associated with current PCM Compress FE.
--- sound/soc/soc-compress.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/soc-compress.c +3 -0
@@ -589,6 +589,9 @@ int snd_soc_new_compress(struct snd_soc_return ret; } +/* inherit atomicity from DAI link */ + be_pcm->nonatomic = rtd->dai_link->nonatomic; + rtd->pcm = be_pcm; rtd->fe_compr =1 ;if (rtd->dai_link->dpcm_playback)
Greg Kroah-Hartman
maintainerPATCH 99/134 ASoC: soc-pcm: Move debugfs removal out of spinlock
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 9f620684c1ef5a002b6622ecc7b5818e81252f48 upstream.
The recent fix for DPCM locking also covered the loop in dpcm_be_disconnect() with the FE stream lock. This caused an unexpected side effect, thought: calling debugfs_remove_recursive() in the spinlock may lead to lockdep splats as the code there assumes the SOFTIRQ-safe context.
For avoiding the problem, this patch changes the disconnection procedure to two phases: at first, the matching entries are removed from the linked list, then the resources are freed outside the lock.
--- sound/soc/soc-pcm.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
sound/soc/soc-pcm.c +9 -3
@@ -1289,6 +1289,7 @@ static void dpcm_be_reparent(struct snd_void dpcm_be_disconnect (struct snd_soc_pcm_runtime *fe,int stream) {struct snd_soc_dpcm *dpcm, *d; +LIST_HEAD (deleted_dpcms);snd_soc_dpcm_mutex_assert_held (fe);
@@ -1308,13 +1309,18 @@ void dpcm_be_disconnect(struct snd_soc_p/* BEs still alive need new FE */ dpcm_be_reparent (fe, dpcm->be, stream); -dpcm_remove_debugfs_state (dpcm); -list_del (&dpcm->list_be); +list_move (&dpcm->list_fe, &deleted_dpcms); + } +snd_soc_dpcm_stream_unlock_irq (fe, stream); + +while (!list_empty (&deleted_dpcms)) { + dpcm = list_first_entry(&deleted_dpcms, struct snd_soc_dpcm, + list_fe);list_del (&dpcm->list_fe); +dpcm_remove_debugfs_state (dpcm);kfree (dpcm); } -snd_soc_dpcm_stream_unlock_irq (fe, stream); }/* get BE for DAI widget and stream */
Greg Kroah-Hartman
maintainerPATCH 100/134 ASoC: DPCM: Dont pick up BE without substream
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 754590651ccbbcc74a7c20907be4bb15d642bde3 upstream.
When DPCM tries to add valid BE connections at dpcm_add_paths(), it doesn't check whether the picked BE actually supports for the given stream direction. Due to that, when an asymmetric BE stream is present, it picks up wrongly and this may result in a NULL dereference at a later point where the code assumes the existence of a corresponding BE substream.
This patch adds the check for the presence of the substream for the target BE for avoiding the problem above.
Note that we have already some fix for non-existing BE substream at commit 6246f283d5e0 ("ASoC: dpcm: skip missing substream while applying symmetry"). But the code path we've hit recently is rather happening before the previous fix. So this patch tries to fix at picking up a BE instead of parsing BE lists.
--- sound/soc/soc-pcm.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/soc-pcm.c +3 -0
@@ -1339,6 +1339,9 @@ static struct snd_soc_pcm_runtime *dpcm_if (!be->dai_link->no_pcm)continue ; +if (!snd_soc_dpcm_get_substream (be, stream)) +continue ; +for_each_rtd_dais (be, i, dai) { w =snd_soc_dai_get_widget (dai, stream);
Greg Kroah-Hartman
maintainerPATCH 101/134 ASoC: soc-pcm.c: call __soc_pcm_close() in soc_pcm_close()
In reply to Greg Kroah-HartmanFrom: Kuninori Morimoto <[email protected]>
commit 6bbabd28805f36baf6d0f3eb082db032a638f612 upstream.
commit b7898396f4bbe16 ("ASoC: soc-pcm: Fix and cleanup DPCM locking") added __soc_pcm_close() for non-lock version of soc_pcm_close(). But soc_pcm_close() is not using it. It is no problem, but confusable.
static int __soc_pcm_close(...)
{
=> return soc_pcm_clean(rtd, substream, 0);
}
static int soc_pcm_close(...)
{
...
snd_soc_dpcm_mutex_lock(rtd);
=> soc_pcm_clean(rtd, substream, 0);
snd_soc_dpcm_mutex_unlock(rtd);
return 0;
}This patch use it.
--- sound/soc/soc-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-pcm.c +1 -1
@@ -723,7 +723,7 @@ static int soc_pcm_close(struct snd_pcm_struct snd_soc_pcm_runtime *rtd =asoc_substream_to_rtd (substream);snd_soc_dpcm_mutex_lock (rtd); -soc_pcm_clean (rtd, substream,0 ); +__soc_pcm_close (rtd, substream);snd_soc_dpcm_mutex_unlock (rtd);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 102/134 drm/i915/dg2: Support 4k@30 on HDMI
In reply to Greg Kroah-HartmanFrom: Vandita Kulkarni <[email protected]>
[ Upstream commit edd34368c4c3b45b1386b15f78b2229420f8c6d4 ]
This patch adds a fix to support 297MHz of dot clock by calculating the pll values using synopsis algorithm.
This will help to support 4k@30 mode for HDMI monitors on DG2.
v2: As per the algorithm, set MPLLB VCO range control bits to 3, in register SNPS_PHY_MPLLB_DIV for 297Mhz. (Matt)
v3: Fix typo. (Ankit)
Stable-dep-of: d46746b8b13c ("drm/i915/dg2: Add HDMI pixel clock frequencies 267.30 and 319.89 MHz")
--- drivers/gpu/drm/i915/display/intel_snps_phy.c | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+)
drivers/gpu/drm/i915/display/intel_snps_phy.c +32 -0
@@ -582,6 +582,37 @@ static const struct intel_mpllb_state dg2_hdmi_148_5 = { REG_FIELD_PREP(SNPS_PHY_MPLLB_SSC_UP_SPREAD, 1), }; +/* values in the below table are calculted using the algo */ +static const struct intel_mpllb_state dg2_hdmi_297 = { + .clock =297000 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,3 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,86 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,26214 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,26214 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; +static const struct intel_mpllb_state dg2_hdmi_594 = { .clock =594000 , .ref_control =
@@ -616,6 +647,7 @@ static const struct intel_mpllb_state *dg2_hdmi_tables[] = { &dg2_hdmi_27_0, &dg2_hdmi_74_25, &dg2_hdmi_148_5, + &dg2_hdmi_297, &dg2_hdmi_594, NULL, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 103/134 drm/i915/dg2: Add additional HDMI pixel clock frequencies
In reply to Greg Kroah-HartmanFrom: Taylor, Clinton A <[email protected]>
[ Upstream commit 11c7faa61d136cef92506e4e77d0e6c6e01428bc ]
Using the BSPEC algorithm add addition HDMI pixel clocks to the existing table.
v2: remove 297000 unused entry
Stable-dep-of: d46746b8b13c ("drm/i915/dg2: Add HDMI pixel clock frequencies 267.30 and 319.89 MHz")
--- drivers/gpu/drm/i915/display/intel_snps_phy.c | 1116 +++++++++++++++++ 1 file changed, 1116 insertions(+)
drivers/gpu/drm/i915/display/intel_snps_phy.c +1116 -0
@@ -583,6 +583,1086 @@ static const struct intel_mpllb_state dg2_hdmi_148_5 = { };/* values in the below table are calculted using the algo */ +static const struct intel_mpllb_state dg2_hdmi_25200 = { + .clock =25200 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,7 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,5 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,0 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,128 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,41943 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,2621 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_27027 = { + .clock =27027 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,5 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,0 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,140 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,31876 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,46555 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_28320 = { + .clock =28320 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,5 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,0 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,148 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,40894 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,30408 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_30240 = { + .clock =30240 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,5 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,0 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,160 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,50331 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,42466 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_31500 = { + .clock =31500 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,7 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,4 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,3 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,68 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,26214 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,26214 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_36000 = { + .clock =36000 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,4 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,3 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,82 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,39321 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,39320 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_40000 = { + .clock =40000 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,4 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,2 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,96 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,0 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_49500 = { + .clock =49500 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,4 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,1 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,126 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,13107 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,13107 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_50000 = { + .clock =50000 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,4 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,1 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,128 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,0 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_57284 = { + .clock =57284 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,4 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,0 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,150 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,42886 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,49701 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_58000 = { + .clock =58000 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,4 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,0 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,152 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,52428 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,52427 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_65000 = { + .clock =65000 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,7 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,3 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,3 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,72 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,0 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_71000 = { + .clock =71000 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,3 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,3 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,80 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,52428 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,52427 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_74176 = { + .clock =74176 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,3 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,3 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,86 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,22334 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,43829 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_75000 = { + .clock =75000 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,3 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,3 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,88 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,0 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_78750 = { + .clock =78750 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,3 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,2 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,94 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,0 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_85500 = { + .clock =85500 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,3 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,2 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,104 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,26214 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,26214 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_88750 = { + .clock =88750 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,7 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,15 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,3 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,1 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,110 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,0 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_106500 = { + .clock =106500 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,3 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,0 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,138 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,13107 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,13107 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_108000 = { + .clock =108000 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,3 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,0 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,140 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,26214 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,26214 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_115500 = { + .clock =115500 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,3 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,0 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,152 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,26214 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,26214 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_119000 = { + .clock =119000 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,3 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,0 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,158 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,13107 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,13107 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_135000 = { + .clock =135000 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,7 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,15 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,3 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,76 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,0 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_138500 = { + .clock =138500 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,3 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,78 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,26214 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,26214 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_147160 = { + .clock =147160 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,3 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,84 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,56623 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,6815 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_148352 = { + .clock =148352 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,3 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,86 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,22334 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,43829 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_154000 = { + .clock =154000 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,13 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,2 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,90 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,39321 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,39320 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_162000 = { + .clock =162000 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,2 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,96 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,52428 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,52427 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_209800 = { + .clock =209800 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,7 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,0 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,134 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,60293 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,7864 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_262750 = { + .clock =262750 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,7 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,3 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,72 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,36044 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,52427 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_268500 = { + .clock =268500 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,7 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,3 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,74 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,45875 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,13107 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_296703 = { + .clock =296703 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,3 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,86 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,22321 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,36804 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_241500 = { + .clock =241500 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,0 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,160 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,39321 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,39320 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_497750 = { + .clock =497750 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,15 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,0 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,166 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,36044 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,52427 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_592000 = { + .clock =592000 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,3 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,86 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,13107 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,13107 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_593407 = { + .clock =593407 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,0 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,3 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,86 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,22328 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,7549 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; +static const struct intel_mpllb_state dg2_hdmi_297 = { .clock =297000 , .ref_control =
@@ -649,6 +1729,42 @@ static const struct intel_mpllb_state *dg2_hdmi_tables[] = { &dg2_hdmi_148_5, &dg2_hdmi_297, &dg2_hdmi_594, + &dg2_hdmi_25200, + &dg2_hdmi_27027, + &dg2_hdmi_28320, + &dg2_hdmi_30240, + &dg2_hdmi_31500, + &dg2_hdmi_36000, + &dg2_hdmi_40000, + &dg2_hdmi_49500, + &dg2_hdmi_50000, + &dg2_hdmi_57284, + &dg2_hdmi_58000, + &dg2_hdmi_65000, + &dg2_hdmi_71000, + &dg2_hdmi_74176, + &dg2_hdmi_75000, + &dg2_hdmi_78750, + &dg2_hdmi_85500, + &dg2_hdmi_88750, + &dg2_hdmi_106500, + &dg2_hdmi_108000, + &dg2_hdmi_115500, + &dg2_hdmi_119000, + &dg2_hdmi_135000, + &dg2_hdmi_138500, + &dg2_hdmi_147160, + &dg2_hdmi_148352, + &dg2_hdmi_154000, + &dg2_hdmi_162000, + &dg2_hdmi_209800, + &dg2_hdmi_241500, + &dg2_hdmi_262750, + &dg2_hdmi_268500, + &dg2_hdmi_296703, + &dg2_hdmi_497750, + &dg2_hdmi_592000, + &dg2_hdmi_593407, NULL, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 104/134 drm/i915/dg2: Add HDMI pixel clock frequencies 267.30 and 319.89 MHz
In reply to Greg Kroah-HartmanFrom: Ankit Nautiyal <[email protected]>
[ Upstream commit d46746b8b13cbd377ffc733e465d25800459a31b ]
Add snps phy table values for HDMI pixel clocks 267.30 MHz and 319.89 MHz. Values are based on the Bspec algorithm for PLL programming for HDMI.
--- drivers/gpu/drm/i915/display/intel_snps_phy.c | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+)
drivers/gpu/drm/i915/display/intel_snps_phy.c +62 -0
@@ -1483,6 +1483,36 @@ static const struct intel_mpllb_state dg2_hdmi_262750 = { REG_FIELD_PREP(SNPS_PHY_MPLLB_SSC_UP_SPREAD, 1), }; +static const struct intel_mpllb_state dg2_hdmi_267300 = { + .clock =267300 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,7 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,3 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,74 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,30146 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,36699 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; +static const struct intel_mpllb_state dg2_hdmi_268500 = { .clock =268500 , .ref_control =
@@ -1573,6 +1603,36 @@ static const struct intel_mpllb_state dg2_hdmi_241500 = { REG_FIELD_PREP(SNPS_PHY_MPLLB_SSC_UP_SPREAD, 1), }; +static const struct intel_mpllb_state dg2_hdmi_319890 = { + .clock =319890 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,6 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,14 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,2 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,94 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,65535 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,64094 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,13631 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; +static const struct intel_mpllb_state dg2_hdmi_497750 = { .clock =497750 , .ref_control =
@@ -1760,8 +1820,10 @@ static const struct intel_mpllb_state *dg2_hdmi_tables[] = { &dg2_hdmi_209800, &dg2_hdmi_241500, &dg2_hdmi_262750, + &dg2_hdmi_267300, &dg2_hdmi_268500, &dg2_hdmi_296703, + &dg2_hdmi_319890, &dg2_hdmi_497750, &dg2_hdmi_592000, &dg2_hdmi_593407,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 105/134 drm/msm: Remove struct_mutex usage
In reply to Greg Kroah-HartmanFrom: Rob Clark <[email protected]>
[ Upstream commit c28e2f2b417ed747bfbc5f900c87f3ec9cc6b25e ]
The remaining struct_mutex usage is just to serialize various gpu related things (submit/retire/recover/fault/etc), so replace struct_mutex with gpu->lock.
Stable-dep-of: 0d997f95b70f ("drm/msm/adreno: fix runtime PM imbalance at gpu load")
--- drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 ++-- drivers/gpu/drm/msm/adreno/adreno_device.c | 4 ++-- drivers/gpu/drm/msm/msm_debugfs.c | 12 ++++++------ drivers/gpu/drm/msm/msm_gpu.c | 14 +++++++------- drivers/gpu/drm/msm/msm_gpu.h | 20 +++++++++++++++----- drivers/gpu/drm/msm/msm_perf.c | 9 ++++++--- drivers/gpu/drm/msm/msm_rd.c | 16 +++++++++------- drivers/gpu/drm/msm/msm_ringbuffer.c | 4 ++-- 8 files changed, 49 insertions(+), 34 deletions(-)
drivers/gpu/drm/msm/adreno/a5xx_debugfs.c +2 -2
@@ -107,7 +107,7 @@ reset_set(void *data, u64 val)* try to reset an active GPU. */ -mutex_lock (&dev->struct_mutex); +mutex_lock (&gpu->lock);release_firmware (adreno_gpu->fw[ADRENO_FW_PM4 ]); adreno_gpu->fw[ADRENO_FW_PM4 ] =NULL ;
@@ -133,7 +133,7 @@ reset_set(void *data, u64 val) gpu->funcs->recover (gpu);pm_runtime_put_sync (&gpu->pdev->dev); -mutex_unlock (&dev->struct_mutex); +mutex_unlock (&gpu->lock);return 0 ; }
drivers/gpu/drm/msm/adreno/adreno_device.c +2 -2
@@ -411,9 +411,9 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev)return NULL ; } -mutex_lock (&dev->struct_mutex); +mutex_lock (&gpu->lock); ret =msm_gpu_hw_init (gpu); -mutex_unlock (&dev->struct_mutex); +mutex_unlock (&gpu->lock);pm_runtime_put_autosuspend (&pdev->dev);if (ret) {DRM_DEV_ERROR (dev->dev,"gpu hw init failed: %d\n" , ret);
drivers/gpu/drm/msm/msm_debugfs.c +6 -6
@@ -29,14 +29,14 @@ static int msm_gpu_show(struct seq_file *m, void *arg)struct msm_gpu *gpu = priv->gpu;int ret; - ret =mutex_lock_interruptible (&show_priv->dev->struct_mutex); + ret =mutex_lock_interruptible (&gpu->lock);if (ret)return ret;drm_printf (&p,"%s Status:\n" , gpu->name); gpu->funcs->show (gpu, show_priv->state, &p); -mutex_unlock (&show_priv->dev->struct_mutex); +mutex_unlock (&gpu->lock);return 0 ; }
@@ -48,9 +48,9 @@ static int msm_gpu_release(struct inode *inode, struct file *file)struct msm_drm_private *priv = show_priv->dev->dev_private;struct msm_gpu *gpu = priv->gpu; -mutex_lock (&show_priv->dev->struct_mutex); +mutex_lock (&gpu->lock); gpu->funcs->gpu_state_put (show_priv->state); -mutex_unlock (&show_priv->dev->struct_mutex); +mutex_unlock (&gpu->lock);kfree (show_priv);
@@ -72,7 +72,7 @@ static int msm_gpu_open(struct inode *inode, struct file *file)if (!show_priv)return -ENOMEM ; - ret =mutex_lock_interruptible (&dev->struct_mutex); + ret =mutex_lock_interruptible (&gpu->lock);if (ret) goto free_priv;
@@ -81,7 +81,7 @@ static int msm_gpu_open(struct inode *inode, struct file *file) show_priv->state = gpu->funcs->gpu_state_get (gpu);pm_runtime_put_sync (&gpu->pdev->dev); -mutex_unlock (&dev->struct_mutex); +mutex_unlock (&gpu->lock);if (IS_ERR (show_priv->state)) { ret =PTR_ERR (show_priv->state);
drivers/gpu/drm/msm/msm_gpu.c +7 -7
@@ -150,7 +150,7 @@ int msm_gpu_hw_init(struct msm_gpu *gpu) {int ret; -WARN_ON (!mutex_is_locked (&gpu->dev->struct_mutex)); +WARN_ON (!mutex_is_locked (&gpu->lock));if (!gpu->needs_hw_init)return 0 ;
@@ -361,7 +361,7 @@ static void recover_worker(struct kthread_work *work)char *comm =NULL , *cmd =NULL ;int i; -mutex_lock (&dev->struct_mutex); +mutex_lock (&gpu->lock);DRM_DEV_ERROR (dev->dev,"%s: hangcheck recover!\n" , gpu->name);
@@ -442,7 +442,7 @@ static void recover_worker(struct kthread_work *work) } } -mutex_unlock (&dev->struct_mutex); +mutex_unlock (&gpu->lock);msm_gpu_retire (gpu); }
@@ -450,12 +450,11 @@ static void recover_worker(struct kthread_work *work)static void fault_worker (struct kthread_work *work) { struct msm_gpu *gpu = container_of(work, struct msm_gpu, fault_work); -struct drm_device *dev = gpu->dev;struct msm_gem_submit *submit;struct msm_ringbuffer *cur_ring = gpu->funcs->active_ring (gpu);char *comm =NULL , *cmd =NULL ; -mutex_lock (&dev->struct_mutex); +mutex_lock (&gpu->lock); submit =find_submit (cur_ring, cur_ring->memptrs->fence +1 );if (submit && submit->fault_dumped)
@@ -490,7 +489,7 @@ static void fault_worker(struct kthread_work *work)memset (&gpu->fault_info,0 ,sizeof (gpu->fault_info)); gpu->aspace->mmu->funcs->resume_translation (gpu->aspace->mmu); -mutex_unlock (&dev->struct_mutex); +mutex_unlock (&gpu->lock); }static void hangcheck_timer_reset (struct msm_gpu *gpu)
@@ -734,7 +733,7 @@ void msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit)struct msm_ringbuffer *ring = submit->ring;unsigned long flags; -WARN_ON (!mutex_is_locked (&dev->struct_mutex)); +WARN_ON (!mutex_is_locked (&gpu->lock));pm_runtime_get_sync (&gpu->pdev->dev);
@@ -849,6 +848,7 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,INIT_LIST_HEAD (&gpu->active_list);mutex_init (&gpu->active_lock); +mutex_init (&gpu->lock);kthread_init_work (&gpu->retire_work, retire_worker);kthread_init_work (&gpu->recover_work, recover_worker);kthread_init_work (&gpu->fault_work, fault_worker);
drivers/gpu/drm/msm/msm_gpu.h +15 -5
@@ -143,13 +143,23 @@ struct msm_gpu {*/ struct list_head active_list; +/** +* lock: +* +* General lock for serializing all the gpu things. +* +* TODO move to per-ring locking where feasible (ie. submit/retire +* path, etc) +*/ +struct mutex lock; +/** * active_submits: * * The number of submitted but not yet retired submits, used to * determine transitions between active and idle. * -* Protected by lock +* Protected by active_lock */ int active_submits;
@@ -530,28 +540,28 @@ static inline struct msm_gpu_state *msm_gpu_crashstate_get(struct msm_gpu *gpu) {struct msm_gpu_state *state =NULL ; -mutex_lock (&gpu->dev->struct_mutex); +mutex_lock (&gpu->lock);if (gpu->crashstate) {kref_get (&gpu->crashstate->ref); state = gpu->crashstate; } -mutex_unlock (&gpu->dev->struct_mutex); +mutex_unlock (&gpu->lock);return state; }static inline void msm_gpu_crashstate_put (struct msm_gpu *gpu) { -mutex_lock (&gpu->dev->struct_mutex); +mutex_lock (&gpu->lock);if (gpu->crashstate) {if (gpu->funcs->gpu_state_put (gpu->crashstate)) gpu->crashstate =NULL ; } -mutex_unlock (&gpu->dev->struct_mutex); +mutex_unlock (&gpu->lock); }/*
drivers/gpu/drm/msm/msm_perf.c +6 -3
@@ -155,9 +155,12 @@ static int perf_open(struct inode *inode, struct file *file)struct msm_gpu *gpu = priv->gpu;int ret =0 ; -mutex_lock (&dev->struct_mutex); +if (!gpu) +return -ENODEV ; -if (perf->open || !gpu) { +mutex_lock (&gpu->lock); + +if (perf->open) { ret = -EBUSY ; goto out; }
@@ -171,7 +174,7 @@ static int perf_open(struct inode *inode, struct file *file) perf->next_jiffies = jiffies +SAMPLE_TIME ; out: -mutex_unlock (&dev->struct_mutex); +mutex_unlock (&gpu->lock);return ret; }
drivers/gpu/drm/msm/msm_rd.c +9 -7
@@ -86,7 +86,7 @@ struct msm_rd_state {struct msm_gem_submit *submit;/* fifo access is synchronized on the producer side by -* struct_mutex held by submit code (otherwise we could +* gpu->lock held by submit code (otherwise we could * end up w/ cmds logged in different order than they * were executed). And read_lock synchronizes the reads */
@@ -181,9 +181,12 @@ static int rd_open(struct inode *inode, struct file *file)uint32_t gpu_id;int ret =0 ; -mutex_lock (&dev->struct_mutex); +if (!gpu) +return -ENODEV ; -if (rd->open || !gpu) { +mutex_lock (&gpu->lock); + +if (rd->open) { ret = -EBUSY ; goto out; }
@@ -203,7 +206,7 @@ static int rd_open(struct inode *inode, struct file *file)rd_write_section (rd,RD_GPU_ID , &gpu_id,sizeof (gpu_id)); out: -mutex_unlock (&dev->struct_mutex); +mutex_unlock (&gpu->lock);return ret; }
@@ -343,11 +346,10 @@ static void snapshot_buf(struct msm_rd_state *rd,msm_gem_unlock (&obj->base); } -/* called under struct_mutex */ +/* called under gpu->lock */ void msm_rd_dump_submit (struct msm_rd_state *rd,struct msm_gem_submit *submit,const char *fmt, ...) { -struct drm_device *dev = submit->dev;struct task_struct *task;char msg[256 ];int i, n;
@@ -358,7 +360,7 @@ void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *submit,/* writing into fifo is serialized by caller, and * rd->read_lock is used to serialize the reads */ -WARN_ON (!mutex_is_locked (&dev->struct_mutex)); +WARN_ON (!mutex_is_locked (&submit->gpu->lock));if (fmt) {va_list args;
drivers/gpu/drm/msm/msm_ringbuffer.c +2 -2
@@ -32,11 +32,11 @@ static struct dma_fence *msm_job_run(struct drm_sched_job *job)pm_runtime_get_sync (&gpu->pdev->dev);/* TODO move submit path over to using a per-ring lock.. */ -mutex_lock (&gpu->dev->struct_mutex); +mutex_lock (&gpu->lock);msm_gpu_submit (gpu, submit); -mutex_unlock (&gpu->dev->struct_mutex); +mutex_unlock (&gpu->lock);pm_runtime_put (&gpu->pdev->dev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 106/134 drm/msm/adreno: fix runtime PM imbalance at gpu load
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
[ Upstream commit 0d997f95b70f98987ae031a89677c13e0e223670 ]
A recent commit moved enabling of runtime PM to GPU load time (first open()) but failed to update the error paths so that runtime PM is disabled if initialisation of the GPU fails. This would trigger a warning about the unbalanced disable count on the next open() attempt.
Note that pm_runtime_put_noidle() is sufficient to balance the usage count when pm_runtime_put_sync() fails (and is chosen over pm_runtime_resume_and_get() for consistency reasons).
Patchwork: https://patchwork.freedesktop.org/patch/524971/
--- drivers/gpu/drm/msm/adreno/adreno_device.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/adreno/adreno_device.c +12 -4
@@ -406,20 +406,21 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev) ret =pm_runtime_get_sync (&pdev->dev);if (ret <0 ) { -pm_runtime_put_sync (&pdev->dev); +pm_runtime_put_noidle (&pdev->dev);DRM_DEV_ERROR (dev->dev,"Couldn't power up the GPU: %d\n" , ret); -return NULL ; + goto err_disable_rpm; }mutex_lock (&gpu->lock); ret =msm_gpu_hw_init (gpu);mutex_unlock (&gpu->lock); -pm_runtime_put_autosuspend (&pdev->dev);if (ret) {DRM_DEV_ERROR (dev->dev,"gpu hw init failed: %d\n" , ret); -return NULL ; + goto err_put_rpm; } +pm_runtime_put_autosuspend (&pdev->dev); +#ifdef CONFIG_DEBUG_FS if (gpu->funcs->debugfs_init) { gpu->funcs->debugfs_init (gpu, dev->primary);
@@ -428,6 +429,13 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev)#endif return gpu; + +err_put_rpm: +pm_runtime_put_sync (&pdev->dev); +err_disable_rpm: +pm_runtime_disable (&pdev->dev); + +return NULL ; } static void set_gpu_pdev(struct drm_device *dev,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 80/134 remoteproc: st: Call of_node_put() on iteration error
In reply to Greg Kroah-HartmanFrom: Mathieu Poirier <[email protected]>
commit 8a74918948b40317a5b5bab9739d13dcb5de2784 upstream.
Function of_phandle_iterator_next() calls of_node_put() on the last device_node it iterated over, but when the loop exits prematurely it has to be called explicitly.
--- drivers/remoteproc/st_remoteproc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/remoteproc/st_remoteproc.c +4 -1
@@ -129,6 +129,7 @@ static int st_rproc_parse_fw(struct rprowhile (of_phandle_iterator_next (&it) ==0 ) { rmem =of_reserved_mem_lookup (it.node);if (!rmem) { +of_node_put (it.node);dev_err (dev,"unable to acquire memory-region\n" );return -EINVAL ; }
@@ -150,8 +151,10 @@ static int st_rproc_parse_fw(struct rpro it.node->name); } -if (!mem) +if (!mem) { +of_node_put (it.node);return -ENOMEM ; + }rproc_add_carveout (rproc, mem); index++;
Greg Kroah-Hartman
maintainerPATCH 107/134 drm/amd/display: Refine condition of cursor visibility for pipe-split
In reply to Greg Kroah-HartmanFrom: Dale Zhao <[email protected]>
[ Upstream commit 63f8bee439c0e3f94cff90d0f9c7b719be693265 ]
[Why]
In some scenarios like fullscreen game, major plane is scaled. Then if a upper layer owns the cursor, cursor is invisiable in the majority of the screen.
[How]
Instead assuming upper plane handles cursor, summing up upper split planes on the same layer. If whole upper plane covers current half/whole pipe plane, disable cursor.
Stable-dep-of: d29fb7baab09 ("drm/amd/display: Add NULL plane_state check for cursor disable logic")
--- .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +24 -19
@@ -3211,13 +3211,11 @@ void dcn10_update_dchub(struct dce_hwseq *hws, struct dchub_init_data *dh_data)static bool dcn10_can_pipe_disable_cursor (struct pipe_ctx *pipe_ctx) { -struct pipe_ctx *test_pipe; +struct pipe_ctx *test_pipe, *split_pipe;const struct scaler_data *scl_data = &pipe_ctx->plane_res.scl_data; -const struct rect *r1 = &scl_data->recout, *r2; -int r1_r = r1->x + r1->width, r1_b = r1->y + r1->height, r2_r, r2_b; +struct rect r1 = scl_data->recout, r2, r2_half; +int r1_r = r1.x + r1.width, r1_b = r1.y + r1.height, r2_r, r2_b;int cur_layer = pipe_ctx->plane_state->layer_index; -bool upper_pipe_exists = false; -struct fixed31_32 one =dc_fixpt_from_int (1 );/** * Disable the cursor if there's another pipe above this with a
@@ -3226,26 +3224,33 @@ static bool dcn10_can_pipe_disable_cursor(struct pipe_ctx *pipe_ctx)*/ for (test_pipe = pipe_ctx->top_pipe; test_pipe; test_pipe = test_pipe->top_pipe) { -if (!test_pipe->plane_state->visible) +// Skip invisible layer and pipe-split plane on same layer +if (!test_pipe->plane_state->visible || test_pipe->plane_state->layer_index == cur_layer)continue ; - r2 = &test_pipe->plane_res.scl_data.recout; - r2_r = r2->x + r2->width; - r2_b = r2->y + r2->height; + r2 = test_pipe->plane_res.scl_data.recout; + r2_r = r2.x + r2.width; + r2_b = r2.y + r2.height; + split_pipe = test_pipe; -if (r1->x >= r2->x && r1->y >= r2->y && r1_r <= r2_r && r1_b <= r2_b) -return true; +/** +* There is another half plane on same layer because of +* pipe-split, merge together per same height. +*/ +for (split_pipe = pipe_ctx->top_pipe; split_pipe; + split_pipe = split_pipe->top_pipe) +if (split_pipe->plane_state->layer_index == test_pipe->plane_state->layer_index) { + r2_half = split_pipe->plane_res.scl_data.recout; + r2.x = (r2_half.x < r2.x) ? r2_half.x : r2.x; + r2.width = r2.width + r2_half.width; + r2_r = r2.x + r2.width; +break ; + } -if (test_pipe->plane_state->layer_index < cur_layer) - upper_pipe_exists = true; +if (r1.x >= r2.x && r1.y >= r2.y && r1_r <= r2_r && r1_b <= r2_b) +return true; } -// if plane scaled, assume an upper plane can handle cursor if it exists. -if (upper_pipe_exists && - (scl_data->ratios.horz.value != one.value || - scl_data->ratios.vert.value != one.value)) -return true; -return false; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 108/134 drm/amd/display: Add NULL plane_state check for cursor disable logic
In reply to Greg Kroah-HartmanFrom: Nicholas Kazlauskas <[email protected]>
[ Upstream commit d29fb7baab09b6a1dc484c9c67933253883e770a ]
[Why]
While scanning the top_pipe connections we can run into a case where the bottom pipe is still connected to a top_pipe but with a NULL plane_state.
[How]
Treat a NULL plane_state the same as the plane being invisible for pipe cursor disable logic.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +3 -1
@@ -3225,7 +3225,9 @@ static bool dcn10_can_pipe_disable_cursor(struct pipe_ctx *pipe_ctx)for (test_pipe = pipe_ctx->top_pipe; test_pipe; test_pipe = test_pipe->top_pipe) {// Skip invisible layer and pipe-split plane on same layer -if (!test_pipe->plane_state->visible || test_pipe->plane_state->layer_index == cur_layer) +if (!test_pipe->plane_state || + !test_pipe->plane_state->visible || + test_pipe->plane_state->layer_index == cur_layer)continue ; r2 = test_pipe->plane_res.scl_data.recout;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 109/134 wifi: rtw88: rtw8821c: Fix rfe_option field width
In reply to Greg Kroah-HartmanFrom: Sascha Hauer <[email protected]>
[ Upstream commit 14705f969d98187a1cc2682e0c9bd2e230b8098f ]
On my RTW8821CU chipset rfe_option reads as 0x22. Looking at the vendor driver suggests that the field width of rfe_option is 5 bit, so rfe_option should be masked with 0x1f.
Without this the rfe_option comparisons with 2 further down the driver evaluate as false when they should really evaluate as true. The effect is that 2G channels do not work.
rfe_option is also used as an array index into rtw8821c_rfe_defs[]. rtw8821c_rfe_defs[34] (0x22) was added as part of adding USB support, likely because rfe_option reads as 0x22. As this now becomes 0x2, rtw8821c_rfe_defs[34] is no longer used and can be removed.
Note that this might not be the whole truth. In the vendor driver there are indeed places where the unmasked rfe_option value is used. However, the driver has several places where rfe_option is tested with the pattern if (rfe_option == 2 || rfe_option == 0x22) or if (rfe_option == 4 || rfe_option == 0x24), so that rfe_option BIT(5) has no influence on the code path taken. We therefore mask BIT(5) out from rfe_option entirely until this assumption is proved wrong by some chip variant we do not know yet.
--- drivers/net/wireless/realtek/rtw88/rtw8821c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/rtw8821c.c +1 -1
@@ -40,7 +40,7 @@ static int rtw8821c_read_efuse(struct rtw_dev *rtwdev, u8 *log_map) map = (struct rtw8821c_efuse *)log_map; - efuse->rfe_option = map->rfe_option; + efuse->rfe_option = map->rfe_option &0x1f ; efuse->rf_board_option = map->rf_board_option; efuse->crystal_cap = map->xtal_k; efuse->pa_type_2g = map->pa_type;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 81/134 remoteproc: imx_rproc: Call of_node_put() on iteration error
In reply to Greg Kroah-HartmanFrom: Mathieu Poirier <[email protected]>
commit 5ef074e805ecfd9a16dbb7b6b88bbfa8abad7054 upstream.
Function of_phandle_iterator_next() calls of_node_put() on the last device_node it iterated over, but when the loop exits prematurely it has to be called explicitly.
--- drivers/remoteproc/imx_rproc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/remoteproc/imx_rproc.c +5 -2
@@ -452,6 +452,7 @@ static int imx_rproc_prepare(struct rpro rmem =of_reserved_mem_lookup (it.node);if (!rmem) { +of_node_put (it.node);dev_err (priv->dev,"unable to acquire memory-region\n" );return -EINVAL ; }
@@ -464,10 +465,12 @@ static int imx_rproc_prepare(struct rpro imx_rproc_mem_alloc, imx_rproc_mem_release, it.node->name); -if (mem) +if (mem) {rproc_coredump_add_segment (rproc, da, rmem->size); -else + }else { +of_node_put (it.node);return -ENOMEM ; + }rproc_add_carveout (rproc, mem); }
Greg Kroah-Hartman
maintainerPATCH 82/134 ARM: dts: exynos: fix WM8960 clock name in Itop Elite
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit 6c950c20da38debf1ed531e0b972bd8b53d1c11f upstream.
The WM8960 Linux driver expects the clock to be named "mclk". Otherwise the clock will be ignored and not prepared/enabled by the driver.
--- arch/arm/boot/dts/exynos4412-itop-elite.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/exynos4412-itop-elite.dts +1 -1
@@ -179,7 +179,7 @@ compatible = "wlf,wm8960"; reg = <0x1a>; clocks = <&pmu_system_controller 0>; - clock-names = "MCLK1"; + clock-names = "mclk"; wlf,shared-lrclk; #sound-dai-cells = <0>; };
Greg Kroah-Hartman
maintainerPATCH 83/134 ARM: dts: s5pv210: correct MIPI CSIS clock name
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit 665b9459bb53b8f19bd1541567e1fe9782c83c4b upstream.
The Samsung S5P/Exynos MIPI CSIS bindings and Linux driver expect first clock name to be "csis". Otherwise the driver fails to probe.
--- arch/arm/boot/dts/s5pv210.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/s5pv210.dtsi +1 -1
@@ -582,7 +582,7 @@ interrupts = <29>; clocks = <&clocks CLK_CSIS>, <&clocks SCLK_CSIS>; - clock-names = "clk_csis", + clock-names = "csis", "sclk_csis"; bus-width = <4>; status = "disabled";
Greg Kroah-Hartman
maintainerPATCH 84/134 drm/bridge: lt8912b: Fix DSI Video Mode
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
commit f435b7ef3b360d689df2ffa8326352cd07940d92 upstream.
LT8912 DSI port supports only Non-Burst mode video operation with Sync Events and continuous clock on clock lane, correct dsi mode flags according to that removing MIPI_DSI_MODE_VIDEO_BURST flag.
--- drivers/gpu/drm/bridge/lontium-lt8912b.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/bridge/lontium-lt8912b.c +0 -1
@@ -494,7 +494,6 @@ static int lt8912_attach_dsi(struct lt89 dsi->format =MIPI_DSI_FMT_RGB888 ; dsi->mode_flags =MIPI_DSI_MODE_VIDEO | -MIPI_DSI_MODE_VIDEO_BURST |MIPI_DSI_MODE_LPM |MIPI_DSI_MODE_NO_EOT_PACKET ;
Greg Kroah-Hartman
maintainerPATCH 85/134 drm/msm: fix NULL-deref on snapshot tear down
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit a465353b9250802f87b97123e33a17f51277f0b1 upstream.
In case of early initialisation errors and on platforms that do not use the DPU controller, the deinitilisation code can be called with the kms pointer set to NULL.
Patchwork: https://patchwork.freedesktop.org/patch/525099/
--- drivers/gpu/drm/msm/msm_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_drv.c +2 -1
@@ -359,7 +359,8 @@ static int msm_drm_uninit(struct devicemsm_fbdev_free (ddev);#endif -msm_disp_snapshot_destroy (ddev); +if (kms) +msm_disp_snapshot_destroy (ddev);drm_mode_config_cleanup (ddev);
Greg Kroah-Hartman
maintainerPATCH 86/134 drm/msm: fix NULL-deref on irq uninstall
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit cd459c005de3e2b855a8cc7768e633ce9d018e9f upstream.
In case of early initialisation errors and on platforms that do not use the DPU controller, the deinitilisation code can be called with the kms pointer set to NULL.
Patchwork: https://patchwork.freedesktop.org/patch/525104/
--- drivers/gpu/drm/msm/msm_drv.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/msm/msm_drv.c +5 -3
@@ -364,9 +364,11 @@ static int msm_drm_uninit(struct devicedrm_mode_config_cleanup (ddev); -pm_runtime_get_sync (dev); -msm_irq_uninstall (ddev); -pm_runtime_put_sync (dev); +if (kms) { +pm_runtime_get_sync (dev); +msm_irq_uninstall (ddev); +pm_runtime_put_sync (dev); + }if (kms && kms->funcs) kms->funcs->destroy (kms);
Greg Kroah-Hartman
maintainerPATCH 77/134 sh: init: use OF_EARLY_FLATTREE for early init
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
commit 6cba655543c7959f8a6d2979b9d40a6a66b7ed4f upstream.
When CONFIG_OF_EARLY_FLATTREE and CONFIG_SH_DEVICE_TREE are not set, SH3 build fails with a call to early_init_dt_scan(), so in arch/sh/kernel/setup.c and arch/sh/kernel/head_32.S, use CONFIG_OF_EARLY_FLATTREE instead of CONFIG_OF_FLATTREE.
Fixes this build error:../arch/sh/kernel/setup.c: In function 'sh_fdt_init':../arch/sh/kernel/setup.c:262:26: error: implicit declaration of function 'early_init_dt_scan' [-Werror=implicit-function-declaration]
262 | if (!dt_virt || !early_init_dt_scan(dt_virt)) {
--- arch/sh/kernel/head_32.S | 6 +++--- arch/sh/kernel/setup.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/sh/kernel/head_32.S +3 -3
@@ -64,7 +64,7 @@ ENTRY(_stext) ldc r0, r6_bank #endif -#ifdef CONFIG_OF_FLATTREE +#ifdef CONFIG_OF_EARLY_FLATTREE mov r4, r12 ! Store device tree blob pointer in r12 #endif
@@ -315,7 +315,7 @@ ENTRY(_stext) 10: #endif -#ifdef CONFIG_OF_FLATTREE +#ifdef CONFIG_OF_EARLY_FLATTREE mov.l 8f, r0 ! Make flat device tree available early. jsr @r0 mov r12, r4
@@ -346,7 +346,7 @@ ENTRY(stack_start) 5: .long start_kernel 6: .long cpu_init 7: .long init_thread_union -#if defined(CONFIG_OF_FLATTREE) +#if defined(CONFIG_OF_EARLY_FLATTREE) 8: .long sh_fdt_init #endif
arch/sh/kernel/setup.c +2 -2
@@ -244,7 +244,7 @@ void __init __weak plat_early_device_set { } -#ifdef CONFIG_OF_FLATTREE +#ifdef CONFIG_OF_EARLY_FLATTREE void __ref sh_fdt_init (phys_addr_t dt_phys) {static int done =0 ;
@@ -326,7 +326,7 @@ void __init setup_arch(char **cmdline_p)/* Let earlyprintk output early console messages */ sh_early_platform_driver_probe ("earlyprintk" ,1 ,1 ); -#ifdef CONFIG_OF_FLATTREE +#ifdef CONFIG_OF_EARLY_FLATTREE #ifdef CONFIG_USE_BUILTIN_DTB unflatten_and_copy_device_tree ();#else
Greg Kroah-Hartman
maintainerPATCH 111/134 ksmbd: fix multi session connection failure
In reply to Greg Kroah-HartmanFrom: Namjae Jeon <[email protected]>
[ Upstream commit ce53d365378cde71bb6596d79c257e600d951d29 ]
When RSS mode is enable, windows client do simultaneously send several session requests to server. There is racy issue using sess->ntlmssp.cryptkey on N connection : 1 session. So authetication failed using wrong cryptkey on some session. This patch move cryptkey to ksmbd_conn structure to use each cryptkey on connection.
Stable-dep-of: 7b4323373d84 ("ksmbd: fix deadlock in ksmbd_find_crypto_ctx()")
--- fs/ksmbd/auth.c | 27 ++++++++++++++------------- fs/ksmbd/auth.h | 10 +++++----- fs/ksmbd/connection.h | 7 +------ fs/ksmbd/mgmt/user_session.h | 1 - fs/ksmbd/smb2pdu.c | 8 ++++---- 5 files changed, 24 insertions(+), 29 deletions(-)
fs/ksmbd/auth.c +14 -13
@@ -215,7 +215,7 @@ static int calc_ntlmv2_hash(struct ksmbd_session *sess, char *ntlmv2_hash,* Return: 0 on success, error number on error */ int ksmbd_auth_ntlmv2 (struct ksmbd_session *sess,struct ntlmv2_resp *ntlmv2, -int blen,char *domain_name) +int blen,char *domain_name,char *cryptkey) {char ntlmv2_hash[CIFS_ENCPWD_SIZE ];char ntlmv2_rsp[CIFS_HMAC_MD5_HASH_SIZE ];
@@ -256,7 +256,7 @@ int ksmbd_auth_ntlmv2(struct ksmbd_session *sess, struct ntlmv2_resp *ntlmv2, goto out; } -memcpy (construct, sess->ntlmssp.cryptkey,CIFS_CRYPTO_KEY_SIZE ); +memcpy (construct, cryptkey,CIFS_CRYPTO_KEY_SIZE );memcpy (construct +CIFS_CRYPTO_KEY_SIZE , &ntlmv2->blob_signature, blen); rc =crypto_shash_update (CRYPTO_HMACMD5 (ctx), construct, len);
@@ -295,7 +295,8 @@ int ksmbd_auth_ntlmv2(struct ksmbd_session *sess, struct ntlmv2_resp *ntlmv2,* Return: 0 on success, error number on error */ int ksmbd_decode_ntlmssp_auth_blob (struct authenticate_message *authblob, -int blob_len,struct ksmbd_session *sess) +int blob_len,struct ksmbd_conn *conn, +struct ksmbd_session *sess) {char *domain_name;unsigned int nt_off, dn_off;
@@ -325,7 +326,7 @@ int ksmbd_decode_ntlmssp_auth_blob(struct authenticate_message *authblob,/* TODO : use domain name that imported from configuration file */ domain_name =smb_strndup_from_utf16 ((const char *)authblob + dn_off, - dn_len, true, sess->conn->local_nls); + dn_len, true, conn->local_nls);if (IS_ERR (domain_name))return PTR_ERR (domain_name);
@@ -334,7 +335,7 @@ int ksmbd_decode_ntlmssp_auth_blob(struct authenticate_message *authblob, domain_name); ret =ksmbd_auth_ntlmv2 (sess, (struct ntlmv2_resp *)((char *)authblob + nt_off), nt_len -CIFS_ENCPWD_SIZE , - domain_name); + domain_name, conn->ntlmssp.cryptkey);kfree (domain_name);return ret; }
@@ -348,7 +349,7 @@ int ksmbd_decode_ntlmssp_auth_blob(struct authenticate_message *authblob,* */ int ksmbd_decode_ntlmssp_neg_blob (struct negotiate_message *negblob, -int blob_len,struct ksmbd_session *sess) +int blob_len,struct ksmbd_conn *conn) {if (blob_len <sizeof (struct negotiate_message )) { ksmbd_debug(AUTH, "negotiate blob len %d too small\n",
@@ -362,7 +363,7 @@ int ksmbd_decode_ntlmssp_neg_blob(struct negotiate_message *negblob,return -EINVAL ; } - sess->ntlmssp.client_flags =le32_to_cpu (negblob->NegotiateFlags); + conn->ntlmssp.client_flags =le32_to_cpu (negblob->NegotiateFlags);return 0 ; }
@@ -376,14 +377,14 @@ int ksmbd_decode_ntlmssp_neg_blob(struct negotiate_message *negblob,*/ unsigned int ksmbd_build_ntlmssp_challenge_blob (struct challenge_message *chgblob, -struct ksmbd_session *sess) +struct ksmbd_conn *conn) {struct target_info *tinfo;wchar_t *name;__u8 *target_name;unsigned int flags, blob_off, blob_len, type, target_info_len =0 ;int len, uni_len, conv_len; -int cflags = sess->ntlmssp.client_flags; +int cflags = conn->ntlmssp.client_flags;memcpy (chgblob->Signature,NTLMSSP_SIGNATURE ,8 ); chgblob->MessageType = NtLmChallenge;
@@ -404,7 +405,7 @@ ksmbd_build_ntlmssp_challenge_blob(struct challenge_message *chgblob,if (cflags &NTLMSSP_REQUEST_TARGET ) flags |=NTLMSSP_REQUEST_TARGET ; -if (sess->conn->use_spnego && +if (conn->use_spnego && (cflags &NTLMSSP_NEGOTIATE_EXTENDED_SEC )) flags |=NTLMSSP_NEGOTIATE_EXTENDED_SEC ;
@@ -415,7 +416,7 @@ ksmbd_build_ntlmssp_challenge_blob(struct challenge_message *chgblob,return -ENOMEM ; conv_len =smb_strtoUTF16 ((__le16 *)name,ksmbd_netbios_name (), len, - sess->conn->local_nls); + conn->local_nls);if (conv_len <0 || conv_len > len) {kfree (name);return -EINVAL ;
@@ -431,8 +432,8 @@ ksmbd_build_ntlmssp_challenge_blob(struct challenge_message *chgblob, chgblob->TargetName.BufferOffset =cpu_to_le32 (blob_off);/* Initialize random conn challenge */ -get_random_bytes (sess->ntlmssp.cryptkey,sizeof (__u64)); -memcpy (chgblob->Challenge, sess->ntlmssp.cryptkey, +get_random_bytes (conn->ntlmssp.cryptkey,sizeof (__u64)); +memcpy (chgblob->Challenge, conn->ntlmssp.cryptkey,CIFS_CRYPTO_KEY_SIZE );/* Add Target Information to security buffer */
fs/ksmbd/auth.h +5 -5
@@ -38,16 +38,16 @@ struct kvec;int ksmbd_crypt_message (struct ksmbd_conn *conn,struct kvec *iov,unsigned int nvec,int enc);void ksmbd_copy_gss_neg_header (void *buf); -int ksmbd_auth_ntlm (struct ksmbd_session *sess,char *pw_buf);int ksmbd_auth_ntlmv2 (struct ksmbd_session *sess,struct ntlmv2_resp *ntlmv2, -int blen,char *domain_name); +int blen,char *domain_name,char *cryptkey);int ksmbd_decode_ntlmssp_auth_blob (struct authenticate_message *authblob, -int blob_len,struct ksmbd_session *sess); +int blob_len,struct ksmbd_conn *conn, +struct ksmbd_session *sess);int ksmbd_decode_ntlmssp_neg_blob (struct negotiate_message *negblob, -int blob_len,struct ksmbd_session *sess); +int blob_len,struct ksmbd_conn *conn);unsigned int ksmbd_build_ntlmssp_challenge_blob (struct challenge_message *chgblob, -struct ksmbd_session *sess); +struct ksmbd_conn *conn);int ksmbd_krb5_authenticate (struct ksmbd_session *sess,char *in_blob,int in_len,char *out_blob,int *out_len); int ksmbd_sign_smb2_pdu(struct ksmbd_conn *conn, char *key, struct kvec *iov,
fs/ksmbd/connection.h +1 -6
@@ -72,12 +72,7 @@ struct ksmbd_conn {int connection_type;struct ksmbd_stats stats;char ClientGUID[SMB2_CLIENT_GUID_SIZE ]; -union { -/* pending trans request table */ -struct trans_state *recent_trans; -/* Used by ntlmssp */ -char *ntlmssp_cryptkey; - }; +struct ntlmssp_auth ntlmssp;spinlock_t llist_lock;struct list_head lock_list;
fs/ksmbd/mgmt/user_session.h +0 -1
@@ -45,7 +45,6 @@ struct ksmbd_session {int state;__u8 *Preauth_HashValue; -struct ntlmssp_auth ntlmssp;char sess_key[CIFS_KEY_SIZE ];struct hlist_node hlist;
fs/ksmbd/smb2pdu.c +4 -4
@@ -1316,7 +1316,7 @@ static int ntlm_negotiate(struct ksmbd_work *work,int sz, rc;ksmbd_debug (SMB ,"negotiate phase\n" ); - rc =ksmbd_decode_ntlmssp_neg_blob (negblob, negblob_len, work->sess); + rc =ksmbd_decode_ntlmssp_neg_blob (negblob, negblob_len, work->conn);if (rc)return rc;
@@ -1326,7 +1326,7 @@ static int ntlm_negotiate(struct ksmbd_work *work,memset (chgblob,0 ,sizeof (struct challenge_message ));if (!work->conn->use_spnego) { - sz =ksmbd_build_ntlmssp_challenge_blob (chgblob, work->sess); + sz =ksmbd_build_ntlmssp_challenge_blob (chgblob, work->conn);if (sz <0 )return -ENOMEM ;
@@ -1342,7 +1342,7 @@ static int ntlm_negotiate(struct ksmbd_work *work,return -ENOMEM ; chgblob = (struct challenge_message *)neg_blob; - sz =ksmbd_build_ntlmssp_challenge_blob (chgblob, work->sess); + sz =ksmbd_build_ntlmssp_challenge_blob (chgblob, work->conn);if (sz <0 ) { rc = -ENOMEM ; goto out;
@@ -1480,7 +1480,7 @@ static int ntlm_authenticate(struct ksmbd_work *work) authblob =user_authblob (conn, req); sz =le16_to_cpu (req->SecurityBufferLength); - rc =ksmbd_decode_ntlmssp_auth_blob (authblob, sz, sess); + rc =ksmbd_decode_ntlmssp_auth_blob (authblob, sz, conn, sess);if (rc) {set_user_flag (sess->user,KSMBD_USER_FLAG_BAD_PASSWORD );ksmbd_debug (SMB ,"authentication failed\n" );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 120/134 ext4: avoid a potential slab-out-of-bounds in ext4_group_desc_csum
In reply to Greg Kroah-HartmanFrom: Tudor Ambarus <[email protected]>
commit 4f04351888a83e595571de672e0a4a8b74f4fb31 upstream.
When modifying the block device while it is mounted by the filesystem, syzbot reported the following:
BUG: KASAN: slab-out-of-bounds in crc16+0x206/0x280 lib/crc16.c:58 Read of size 1 at addr ffff888075f5c0a8 by task syz-executor.2/15586 CPU: 1 PID: 15586 Comm: syz-executor.2 Not tainted 6.2.0-rc5-syzkaller-00205-gc96618275234 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/12/2023 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x1b1/0x290 lib/dump_stack.c:106 print_address_description+0x74/0x340 mm/kasan/report.c:306 print_report+0x107/0x1f0 mm/kasan/report.c:417 kasan_report+0xcd/0x100 mm/kasan/report.c:517 crc16+0x206/0x280 lib/crc16.c:58 ext4_group_desc_csum+0x81b/0xb20 fs/ext4/super.c:3187 ext4_group_desc_csum_set+0x195/0x230 fs/ext4/super.c:3210 ext4_mb_clear_bb fs/ext4/mballoc.c:6027 [inline] ext4_free_blocks+0x191a/0x2810 fs/ext4/mballoc.c:6173 ext4_remove_blocks fs/ext4/extents.c:2527 [inline] ext4_ext_rm_leaf fs/ext4/extents.c:2710 [inline] ext4_ext_remove_space+0x24ef/0x46a0 fs/ext4/extents.c:2958 ext4_ext_truncate+0x177/0x220 fs/ext4/extents.c:4416 ext4_truncate+0xa6a/0xea0 fs/ext4/inode.c:4342 ext4_setattr+0x10c8/0x1930 fs/ext4/inode.c:5622 notify_change+0xe50/0x1100 fs/attr.c:482 do_truncate+0x200/0x2f0 fs/open.c:65 handle_truncate fs/namei.c:3216 [inline] do_open fs/namei.c:3561 [inline] path_openat+0x272b/0x2dd0 fs/namei.c:3714 do_filp_open+0x264/0x4f0 fs/namei.c:3741 do_sys_openat2+0x124/0x4e0 fs/open.c:1310 do_sys_open fs/open.c:1326 [inline] __do_sys_creat fs/open.c:1402 [inline] __se_sys_creat fs/open.c:1396 [inline] __x64_sys_creat+0x11f/0x160 fs/open.c:1396 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7f72f8a8c0c9 Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 f1 19 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f72f97e3168 EFLAGS: 00000246 ORIG_RAX: 0000000000000055 RAX: ffffffffffffffda RBX: 00007f72f8bac050 RCX: 00007f72f8a8c0c9 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000020000280 RBP: 00007f72f8ae7ae9 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007ffd165348bf R14: 00007f72f97e3300 R15: 0000000000022000
Replace
le16_to_cpu(sbi->s_es->s_desc_size) with sbi->s_desc_size
It reduces ext4's compiled text size, and makes the code more efficient (we remove an extra indirect reference and a potential byte swap on big endian systems), and there is no downside. It also avoids the potential KASAN / syzkaller failure, as a bonus.
--- fs/ext4/super.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
fs/ext4/super.c +2 -4
@@ -2836,11 +2836,9 @@ static __le16 ext4_group_desc_csum(struc crc =crc16 (crc, (__u8 *)gdp, offset); offset +=sizeof (gdp->bg_checksum);/* skip checksum */ /* for checksum of struct ext4_group_desc do the rest...*/ -if (ext4_has_feature_64bit (sb) && - offset <le16_to_cpu (sbi->s_es->s_desc_size)) +if (ext4_has_feature_64bit (sb) && offset < sbi->s_desc_size) crc =crc16 (crc, (__u8 *)gdp + offset, -le16_to_cpu (sbi->s_es->s_desc_size) - - offset); + sbi->s_desc_size - offset); out:return cpu_to_le16 (crc);
Greg Kroah-Hartman
maintainerPATCH 121/134 ext4: fix data races when using cached status extents
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit 492888df0c7b42fc0843631168b0021bc4caee84 upstream.
When using cached extent stored in extent status tree in tree->cache_es another process holding ei->i_es_lock for reading can be racing with us setting new value of tree->cache_es. If the compiler would decide to refetch tree->cache_es at an unfortunate moment, it could result in a bogus in_range() check. Fix the possible race by using READ_ONCE() when using tree->cache_es only under ei->i_es_lock for reading.
--- fs/ext4/extents_status.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-)
fs/ext4/extents_status.c +13 -17
@@ -269,14 +269,12 @@ static void __es_find_extent_range(struc/* see if the extent has been cached */ es->es_lblk = es->es_len = es->es_pblk =0 ; -if (tree->cache_es) { - es1 = tree->cache_es; -if (in_range (lblk, es1->es_lblk, es1->es_len)) { -es_debug ("%u cached by [%u/%u) %llu %x\n" , - lblk, es1->es_lblk, es1->es_len, -ext4_es_pblock (es1),ext4_es_status (es1)); - goto out; - } + es1 =READ_ONCE (tree->cache_es); +if (es1 &&in_range (lblk, es1->es_lblk, es1->es_len)) { +es_debug ("%u cached by [%u/%u) %llu %x\n" , + lblk, es1->es_lblk, es1->es_len, +ext4_es_pblock (es1),ext4_es_status (es1)); + goto out; } es1 =__es_tree_search (&tree->root, lblk);
@@ -295,7 +293,7 @@ out: }if (es1 &&matching_fn (es1)) { - tree->cache_es = es1; +WRITE_ONCE (tree->cache_es, es1); es->es_lblk = es1->es_lblk; es->es_len = es1->es_len; es->es_pblk = es1->es_pblk;
@@ -934,14 +932,12 @@ int ext4_es_lookup_extent(struct inode */* find extent in cache firstly */ es->es_lblk = es->es_len = es->es_pblk =0 ; -if (tree->cache_es) { - es1 = tree->cache_es; -if (in_range (lblk, es1->es_lblk, es1->es_len)) { -es_debug ("%u cached by [%u/%u)\n" , - lblk, es1->es_lblk, es1->es_len); - found =1 ; - goto out; - } + es1 =READ_ONCE (tree->cache_es); +if (es1 &&in_range (lblk, es1->es_lblk, es1->es_len)) { +es_debug ("%u cached by [%u/%u)\n" , + lblk, es1->es_lblk, es1->es_len); + found =1 ; + goto out; } node = tree->root.rb_node;
Greg Kroah-Hartman
maintainerPATCH 122/134 ext4: check iomap type only if ext4_iomap_begin() does not fail
In reply to Greg Kroah-HartmanFrom: Baokun Li <[email protected]>
commit fa83c34e3e56b3c672af38059e066242655271b1 upstream.
When ext4_iomap_overwrite_begin() calls ext4_iomap_begin() map blocks may fail for some reason (e.g. memory allocation failure, bare disk write), and later because "iomap->type ! = IOMAP_MAPPED" triggers WARN_ON(). When ext4 iomap_begin() returns an error, it is normal that the type of iomap->type may not match the expectation. Therefore, we only determine if iomap->type is as expected when ext4_iomap_begin() is executed successfully.
--- fs/ext4/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/inode.c +1 -1
@@ -3478,7 +3478,7 @@ static int ext4_iomap_overwrite_begin(st*/ flags &= ~IOMAP_WRITE ; ret =ext4_iomap_begin (inode, offset, length, flags, iomap, srcmap); -WARN_ON_ONCE (iomap->type !=IOMAP_MAPPED ); +WARN_ON_ONCE (!ret && iomap->type !=IOMAP_MAPPED );return ret; }
Greg Kroah-Hartman
maintainerPATCH 123/134 ext4: improve error recovery code paths in __ext4_remount()
In reply to Greg Kroah-HartmanFrom: Theodore Ts'o <[email protected]>
commit 4c0b4818b1f636bc96359f7817a2d8bab6370162 upstream.
If there are failures while changing the mount options in __ext4_remount(), we need to restore the old mount options.
This commit fixes two problem. The first is there is a chance that we will free the old quota file names before a potential failure leading to a use-after-free. The second problem addressed in this commit is if there is a failed read/write to read-only transition, if the quota has already been suspended, we need to renable quota handling.
--- fs/ext4/super.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
fs/ext4/super.c +10 -3
@@ -5985,9 +5985,6 @@ static int ext4_remount(struct super_blo }#ifdef CONFIG_QUOTA -/* Release old quota file names */ -for (i =0 ; i <EXT4_MAXQUOTAS ; i++) -kfree (old_opts.s_qf_names[i]);if (enable_quota) {if (sb_any_quota_suspended (sb))dquot_resume (sb,-1 );
@@ -5997,6 +5994,9 @@ static int ext4_remount(struct super_blo goto restore_opts; } } +/* Release old quota file names */ +for (i =0 ; i <EXT4_MAXQUOTAS ; i++) +kfree (old_opts.s_qf_names[i]);#endif if (!test_opt (sb,BLOCK_VALIDITY ) && sbi->s_system_blks)ext4_release_system_zone (sb);
@@ -6017,6 +6017,13 @@ static int ext4_remount(struct super_bloreturn 0 ; restore_opts: +/* +* If there was a failing r/w to ro transition, we may need to +* re-enable quota +*/ +if ((sb->s_flags &SB_RDONLY ) && !(old_sb_flags &SB_RDONLY ) && +sb_any_quota_suspended (sb)) +dquot_resume (sb,-1 ); sb->s_flags = old_sb_flags; sbi->s_mount_opt = old_opts.s_mount_opt; sbi->s_mount_opt2 = old_opts.s_mount_opt2;
Greg Kroah-Hartman
maintainerPATCH 124/134 ext4: improve error handling from ext4_dirhash()
In reply to Greg Kroah-HartmanFrom: Theodore Ts'o <[email protected]>
commit 4b3cb1d108bfc2aebb0d7c8a52261a53cf7f5786 upstream.
The ext4_dirhash() will *almost* never fail, especially when the hash tree feature was first introduced. However, with the addition of support of encrypted, casefolded file names, that function can most certainly fail today.
So make sure the callers of ext4_dirhash() properly check for failures, and reflect the errors back up to their callers.
--- fs/ext4/hash.c | 6 +++++- fs/ext4/namei.c | 53 +++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 42 insertions(+), 17 deletions(-)
fs/ext4/hash.c +5 -1
@@ -277,7 +277,11 @@ static int __ext4fs_dirhash(const struct }default : hinfo->hash =0 ; -return -1 ; + hinfo->minor_hash =0 ; +ext4_warning (dir->i_sb, +"invalid/unsupported hash tree version %u" , + hinfo->hash_version); +return -EINVAL ; } hash = hash & ~1 ;if (hash == (EXT4_HTREE_EOF_32BIT <<1 ))
fs/ext4/namei.c +37 -16
102 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 125/134 ext4: fix deadlock when converting an inline directory in nojournal mode
In reply to Greg Kroah-HartmanFrom: Theodore Ts'o <[email protected]>
commit f4ce24f54d9cca4f09a395f3eecce20d6bec4663 upstream.
In no journal mode, ext4_finish_convert_inline_dir() can self-deadlock by calling ext4_handle_dirty_dirblock() when it already has taken the directory lock. There is a similar self-deadlock in ext4_incvert_inline_data_nolock() for data files which we'll fix at the same time.
A simple reproducer demonstrating the problem:
mke2fs -Fq -t ext2 -O inline_data -b 4k /dev/vdc 64 mount -t ext4 -o dirsync /dev/vdc /vdc
cd /vdc
mkdir file0
cd file0
touch file0
touch file1
attr -s BurnSpaceInEA -V abcde .
touch supercalifragilisticexpialidocious
--- fs/ext4/inline.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/ext4/inline.c +2 -1
@@ -1185,6 +1185,7 @@ static int ext4_finish_convert_inline_diext4_initialize_dirent_tail (dir_block, inode->i_sb->s_blocksize);set_buffer_uptodate (dir_block); +unlock_buffer (dir_block); err =ext4_handle_dirty_dirblock (handle, inode, dir_block);if (err)return err;
@@ -1259,6 +1260,7 @@ static int ext4_convert_inline_data_noloif (!S_ISDIR (inode->i_mode)) {memcpy (data_bh->b_data, buf, inline_size);set_buffer_uptodate (data_bh); +unlock_buffer (data_bh); error =ext4_handle_dirty_metadata (handle, inode, data_bh); }else {
@@ -1266,7 +1268,6 @@ static int ext4_convert_inline_data_nolo buf, inline_size); } -unlock_buffer (data_bh); out_restore:if (error)ext4_restore_inline_data (handle, inode, iloc, buf, inline_size);
Greg Kroah-Hartman
maintainerPATCH 126/134 ext4: add bounds checking in get_max_inline_xattr_value_size()
In reply to Greg Kroah-HartmanFrom: Theodore Ts'o <[email protected]>
commit 2220eaf90992c11d888fe771055d4de330385f01 upstream.
Normally the extended attributes in the inode body would have been checked when the inode is first opened, but if someone is writing to the block device while the file system is mounted, it's possible for the inode table to get corrupted. Add bounds checking to avoid reading beyond the end of allocated memory if this happens.
--- fs/ext4/inline.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
fs/ext4/inline.c +11 -1
@@ -33,6 +33,7 @@ static int get_max_inline_xattr_value_sistruct ext4_xattr_ibody_header *header;struct ext4_xattr_entry *entry;struct ext4_inode *raw_inode; +void *end;int free, min_offs;if (!EXT4_INODE_HAS_XATTR_SPACE (inode))
@@ -56,14 +57,23 @@ static int get_max_inline_xattr_value_si raw_inode =ext4_raw_inode (iloc); header =IHDR (inode, raw_inode); entry =IFIRST (header); + end = (void *)raw_inode +EXT4_SB (inode->i_sb)->s_inode_size;/* Compute min_offs. */ -for (; !IS_LAST_ENTRY (entry); entry =EXT4_XATTR_NEXT (entry)) { +while (!IS_LAST_ENTRY (entry)) { +void *next =EXT4_XATTR_NEXT (entry); + +if (next >= end) { +EXT4_ERROR_INODE (inode, +"corrupt xattr in inline inode" ); +return 0 ; + }if (!entry->e_value_inum && entry->e_value_size) {size_t offs =le16_to_cpu (entry->e_value_offs);if (offs < min_offs) min_offs = offs; } + entry = next; } free = min_offs - ((void *)entry - (void *)IFIRST (header)) -sizeof (__u32);
Greg Kroah-Hartman
maintainerPATCH 127/134 ext4: bail out of ext4_xattr_ibody_get() fails for any reason
In reply to Greg Kroah-HartmanFrom: Theodore Ts'o <[email protected]>
commit 2a534e1d0d1591e951f9ece2fb460b2ff92edabd upstream.
In ext4_update_inline_data(), if ext4_xattr_ibody_get() fails for any reason, it's best if we just fail as opposed to stumbling on, especially if the failure is EFSCORRUPTED.
--- fs/ext4/inline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/inline.c +1 -1
@@ -360,7 +360,7 @@ static int ext4_update_inline_data(handl error =ext4_xattr_ibody_get (inode, i.name_index, i.name, value, len); -if (error == -ENODATA ) +if (error <0 ) goto out;BUFFER_TRACE (is.iloc.bh,"get_write_access" );
Greg Kroah-Hartman
maintainerPATCH 128/134 ext4: remove a BUG_ON in ext4_mb_release_group_pa()
In reply to Greg Kroah-HartmanFrom: Theodore Ts'o <[email protected]>
commit 463808f237cf73e98a1a45ff7460c2406a150a0b upstream.
If a malicious fuzzer overwrites the ext4 superblock while it is mounted such that the s_first_data_block is set to a very large number, the calculation of the block group can underflow, and trigger a BUG_ON check. Change this to be an ext4_warning so that we don't crash the kernel.
--- fs/ext4/mballoc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/ext4/mballoc.c +5 -1
@@ -4832,7 +4832,11 @@ ext4_mb_release_group_pa(struct ext4_budtrace_ext4_mb_release_group_pa (sb, pa);BUG_ON (pa->pa_deleted ==0 );ext4_get_group_no_and_offset (sb, pa->pa_pstart, &group, &bit); -BUG_ON (group != e4b->bd_group && pa->pa_len !=0 ); +if (unlikely (group != e4b->bd_group && pa->pa_len !=0 )) { +ext4_warning (sb,"bad group: expected %u, group %u, pa_start %llu" , + e4b->bd_group, group, pa->pa_pstart); +return 0 ; + }mb_free_blocks (pa->pa_inode, e4b, bit, pa->pa_len);atomic_add (pa->pa_len, &EXT4_SB (sb)->s_mb_discarded);trace_ext4_mballoc_discard (sb,NULL , group, bit, pa->pa_len);
Greg Kroah-Hartman
maintainerPATCH 129/134 ext4: fix invalid free tracking in ext4_xattr_move_to_block()
In reply to Greg Kroah-HartmanFrom: Theodore Ts'o <[email protected]>
commit b87c7cdf2bed4928b899e1ce91ef0d147017ba45 upstream.
In ext4_xattr_move_to_block(), the value of the extended attribute which we need to move to an external block may be allocated by kvmalloc() if the value is stored in an external inode. So at the end of the function the code tried to check if this was the case by testing entry->e_value_inum.
However, at this point, the pointer to the xattr entry is no longer valid, because it was removed from the original location where it had been stored. So we could end up calling kvfree() on a pointer which was not allocated by kvmalloc(); or we could also potentially leak memory by not freeing the buffer when it should be freed. Fix this by storing whether it should be freed in a separate variable.
--- fs/ext4/xattr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/ext4/xattr.c +3 -2
@@ -2563,6 +2563,7 @@ static int ext4_xattr_move_to_block(hand .in_inode = !!entry->e_value_inum, };struct ext4_xattr_ibody_header *header =IHDR (inode, raw_inode); +int needs_kvfree =0 ;int error; is =kzalloc (sizeof (struct ext4_xattr_ibody_find ),GFP_NOFS );
@@ -2585,7 +2586,7 @@ static int ext4_xattr_move_to_block(hand error = -ENOMEM ; goto out; } - + needs_kvfree =1 ; error =ext4_xattr_inode_get (inode, entry, buffer, value_size);if (error) goto out;
@@ -2624,7 +2625,7 @@ static int ext4_xattr_move_to_block(hand out:kfree (b_entry_name); -if (entry->e_value_inum && buffer) +if (needs_kvfree && buffer)kvfree (buffer);if (is)brelse (is->iloc.bh);
Greg Kroah-Hartman
maintainerPATCH 112/134 ksmbd: replace sessions list in connection with xarray
In reply to Greg Kroah-HartmanFrom: Namjae Jeon <[email protected]>
[ Upstream commit e4d3e6b524c0c928f7fc9e03e047885c4951ae60 ]
Replace sessions list in connection with xarray.
Stable-dep-of: 7b4323373d84 ("ksmbd: fix deadlock in ksmbd_find_crypto_ctx()")
--- fs/ksmbd/connection.c | 3 ++- fs/ksmbd/connection.h | 2 +- fs/ksmbd/mgmt/user_session.c | 31 +++++++------------------------ fs/ksmbd/mgmt/user_session.h | 5 ++--- fs/ksmbd/smb2pdu.c | 13 +++++++++---- 5 files changed, 21 insertions(+), 33 deletions(-)
fs/ksmbd/connection.c +2 -1
@@ -36,6 +36,7 @@ void ksmbd_conn_free(struct ksmbd_conn *conn)list_del (&conn->conns_list);write_unlock (&conn_list_lock); +xa_destroy (&conn->sessions);kvfree (conn->request_buf);kfree (conn->preauth_info);kfree (conn);
@@ -66,12 +67,12 @@ struct ksmbd_conn *ksmbd_conn_alloc(void)init_waitqueue_head (&conn->req_running_q);INIT_LIST_HEAD (&conn->conns_list); -INIT_LIST_HEAD (&conn->sessions);INIT_LIST_HEAD (&conn->requests);INIT_LIST_HEAD (&conn->async_requests);spin_lock_init (&conn->request_lock);spin_lock_init (&conn->credits_lock);ida_init (&conn->async_ida); +xa_init (&conn->sessions);spin_lock_init (&conn->llist_lock);INIT_LIST_HEAD (&conn->lock_list);
fs/ksmbd/connection.h +1 -1
@@ -55,7 +55,7 @@ struct ksmbd_conn {struct nls_table *local_nls;struct list_head conns_list;/* smb session 1 per user */ -struct list_head sessions; +struct xarray sessions;unsigned long last_active;/* How many request are running currently */ atomic_t req_running;
fs/ksmbd/mgmt/user_session.c +7 -24
@@ -154,8 +154,6 @@ void ksmbd_session_destroy(struct ksmbd_session *sess)if (!atomic_dec_and_test (&sess->refcnt))return ; -list_del (&sess->sessions_entry); -down_write (&sessions_table_lock);hash_del (&sess->hlist);up_write (&sessions_table_lock);
@@ -183,42 +181,28 @@ static struct ksmbd_session *__session_lookup(unsigned long long id)return NULL ; } -void ksmbd_session_register (struct ksmbd_conn *conn, -struct ksmbd_session *sess) +int ksmbd_session_register (struct ksmbd_conn *conn, +struct ksmbd_session *sess) { sess->conn = conn; -list_add (&sess->sessions_entry, &conn->sessions); +return xa_err (xa_store (&conn->sessions, sess->id, sess,GFP_KERNEL )); }void ksmbd_sessions_deregister (struct ksmbd_conn *conn) {struct ksmbd_session *sess; +unsigned long id; -while (!list_empty (&conn->sessions)) { - sess =list_entry (conn->sessions.next, - struct ksmbd_session, - sessions_entry); - +xa_for_each (&conn->sessions, id, sess) { +xa_erase (&conn->sessions, sess->id);ksmbd_session_destroy (sess); } } -static bool ksmbd_session_id_match (struct ksmbd_session *sess, -unsigned long long id) -{ -return sess->id == id; -} -struct ksmbd_session *ksmbd_session_lookup (struct ksmbd_conn *conn,unsigned long long id) { -struct ksmbd_session *sess =NULL ; - -list_for_each_entry (sess, &conn->sessions, sessions_entry) { -if (ksmbd_session_id_match (sess, id)) -return sess; - } -return NULL ; +return xa_load (&conn->sessions, id); }int get_session (struct ksmbd_session *sess)
@@ -316,7 +300,6 @@ static struct ksmbd_session *__session_create(int protocol) goto error;set_session_flag (sess, protocol); -INIT_LIST_HEAD (&sess->sessions_entry);xa_init (&sess->tree_conns);INIT_LIST_HEAD (&sess->ksmbd_chann_list);INIT_LIST_HEAD (&sess->rpc_handle_list);
fs/ksmbd/mgmt/user_session.h +2 -3
@@ -57,7 +57,6 @@ struct ksmbd_session {__u8 smb3decryptionkey[SMB3_ENC_DEC_KEY_SIZE ];__u8 smb3signingkey[SMB3_SIGN_KEY_SIZE ]; -struct list_head sessions_entry;struct ksmbd_file_table file_table;atomic_t refcnt; };
@@ -84,8 +83,8 @@ void ksmbd_session_destroy(struct ksmbd_session *sess);struct ksmbd_session *ksmbd_session_lookup_slowpath (unsigned long long id);struct ksmbd_session *ksmbd_session_lookup (struct ksmbd_conn *conn,unsigned long long id); -void ksmbd_session_register (struct ksmbd_conn *conn, -struct ksmbd_session *sess); +int ksmbd_session_register (struct ksmbd_conn *conn, +struct ksmbd_session *sess);void ksmbd_sessions_deregister (struct ksmbd_conn *conn);struct ksmbd_session *ksmbd_session_lookup_all (struct ksmbd_conn *conn,unsigned long long id);
fs/ksmbd/smb2pdu.c +9 -4
@@ -595,7 +595,8 @@ int smb2_check_user_session(struct ksmbd_work *work)return -EINVAL ; } -static void destroy_previous_session (struct ksmbd_user *user,u64 id) +static void destroy_previous_session (struct ksmbd_conn *conn, +struct ksmbd_user *user,u64 id) {struct ksmbd_session *prev_sess =ksmbd_session_lookup_slowpath (id);struct ksmbd_user *prev_user;
@@ -614,6 +615,7 @@ static void destroy_previous_session(struct ksmbd_user *user, u64 id) }put_session (prev_sess); +xa_erase (&conn->sessions, prev_sess->id);ksmbd_session_destroy (prev_sess); }
@@ -1452,7 +1454,7 @@ static int ntlm_authenticate(struct ksmbd_work *work)/* Check for previous session */ prev_id =le64_to_cpu (req->PreviousSessionId);if (prev_id && prev_id != sess->id) -destroy_previous_session (user, prev_id); +destroy_previous_session (conn, user, prev_id);if (sess->state ==SMB2_SESSION_VALID ) {/*
@@ -1575,7 +1577,7 @@ static int krb5_authenticate(struct ksmbd_work *work)/* Check previous session */ prev_sess_id =le64_to_cpu (req->PreviousSessionId);if (prev_sess_id && prev_sess_id != sess->id) -destroy_previous_session (sess->user, prev_sess_id); +destroy_previous_session (conn, sess->user, prev_sess_id);if (sess->state ==SMB2_SESSION_VALID )ksmbd_free_user (sess->user);
@@ -1664,7 +1666,9 @@ int smb2_sess_setup(struct ksmbd_work *work) goto out_err; } rsp->hdr.SessionId =cpu_to_le64 (sess->id); -ksmbd_session_register (conn, sess); + rc =ksmbd_session_register (conn, sess); +if (rc) + goto out_err; }else if (conn->dialect >=SMB30_PROT_ID && (server_conf.flags &KSMBD_GLOBAL_FLAG_SMB3_MULTICHANNEL ) && req->Flags &SMB2_SESSION_REQ_FLAG_BINDING ) {
@@ -1845,6 +1849,7 @@ int smb2_sess_setup(struct ksmbd_work *work)if (sess->user && sess->user->flags &KSMBD_USER_FLAG_DELAY_SESSION ) try_delay = true; +xa_erase (&conn->sessions, sess->id);ksmbd_session_destroy (sess); work->sess =NULL ;if (try_delay)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 130/134 drm/msm/adreno: adreno_gpu: Use suspend() instead of idle() on load error
In reply to Greg Kroah-HartmanFrom: Konrad Dybcio <[email protected]>
commit 3eeca5e5f3100435b06a5b5d86daa3d135a8a4bd upstream.
The adreno_load_gpu() path is guarded by an error check on adreno_load_fw(). This function is responsible for loading Qualcomm-only-signed binaries (e.g. SQE and GMU FW for A6XX), but it does not take the vendor-signed ZAP blob into account.
By embedding the SQE (and GMU, if necessary) firmware into the initrd/kernel, we can trigger and unfortunate path that would not bail out early and proceed with gpu->hw_init(). That will fail, as the ZAP loader path will not find the firmware and return back to adreno_load_gpu().
This error path involves pm_runtime_put_sync() which then calls idle() instead of suspend(). This is suboptimal, as it means that we're not going through the clean shutdown sequence. With at least A619_holi, this makes the GPU not wake up until it goes through at least one more start-fail-stop cycle. The pm_runtime_put_sync that appears in the error path actually does not guarantee that because of the earlier enabling of runtime autosuspend.
Fix that by using pm_runtime_put_sync_suspend to force a clean shutdown.
Test cases:
1. All firmware baked into kernel
2. error loading ZAP fw in initrd -> load from rootfs at DE start
Both succeed on A619_holi (SM6375) and A630 (SDM845).
Patchwork: https://patchwork.freedesktop.org/patch/530001/
--- drivers/gpu/drm/msm/adreno/adreno_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/adreno_device.c +1 -1
@@ -431,7 +431,7 @@ struct msm_gpu *adreno_load_gpu(struct dreturn gpu; err_put_rpm: -pm_runtime_put_sync (&pdev->dev); +pm_runtime_put_sync_suspend (&pdev->dev); err_disable_rpm:pm_runtime_disable (&pdev->dev);
Greg Kroah-Hartman
maintainerPATCH 131/134 serial: 8250: Fix serial8250_tx_empty() race with DMA Tx
In reply to Greg Kroah-HartmanFrom: Ilpo Järvinen <[email protected]>
commit 146a37e05d620cef4ad430e5d1c9c077fe6fa76f upstream.
There's a potential race before THRE/TEMT deasserts when DMA Tx is starting up (or the next batch of continuous Tx is being submitted). This can lead to misdetecting Tx empty condition.
It is entirely normal for THRE/TEMT to be set for some time after the DMA Tx had been setup in serial8250_tx_dma(). As Tx side is definitely not empty at that point, it seems incorrect for serial8250_tx_empty() claim Tx is empty.
Fix the race by also checking in serial8250_tx_empty() whether there's DMA Tx active.
Note: This fix only addresses in-kernel race mainly to make using TCSADRAIN/FLUSH robust. Userspace can still cause other races but they seem userspace concurrency control problems.
--- drivers/tty/serial/8250/8250.h | 12 ++++++++++++ drivers/tty/serial/8250/8250_port.c | 12 +++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-)
drivers/tty/serial/8250/8250.h +12 -0
@@ -349,6 +349,13 @@ static inline void serial8250_do_prepareif (dma->prepare_rx_dma) dma->prepare_rx_dma(p); } + +static inline bool serial8250_tx_dma_running (struct uart_8250_port *p) +{ +struct uart_8250_dma *dma = p->dma; + +return dma && dma->tx_running; +}#else static inline int serial8250_tx_dma (struct uart_8250_port *p) {
@@ -364,6 +371,11 @@ static inline int serial8250_request_dma return -1; }static inline void serial8250_release_dma (struct uart_8250_port *p) { } + +static inline bool serial8250_tx_dma_running (struct uart_8250_port *p) +{ +return false; +}#endif static inline int ns16550a_goto_highspeed (struct uart_8250_port *up)
drivers/tty/serial/8250/8250_port.c +9 -3
@@ -1988,19 +1988,25 @@ static int serial8250_tx_threshold_handlstatic unsigned int serial8250_tx_empty (struct uart_port *port) {struct uart_8250_port *up =up_to_u8250p (port); +unsigned int result =0 ;unsigned long flags;unsigned int lsr;serial8250_rpm_get (up);spin_lock_irqsave (&port->lock, flags); - lsr =serial_port_in (port,UART_LSR ); - up->lsr_saved_flags |= lsr &LSR_SAVE_FLAGS ; +if (!serial8250_tx_dma_running (up)) { + lsr =serial_port_in (port,UART_LSR ); + up->lsr_saved_flags |= lsr &LSR_SAVE_FLAGS ; + +if ((lsr &BOTH_EMPTY ) ==BOTH_EMPTY ) + result =TIOCSER_TEMT ; + }spin_unlock_irqrestore (&port->lock, flags);serial8250_rpm_put (up); -return (lsr &BOTH_EMPTY ) ==BOTH_EMPTY ?TIOCSER_TEMT :0 ; +return result; }unsigned int serial8250_do_get_mctrl (struct uart_port *port)
Greg Kroah-Hartman
maintainerPATCH 132/134 drbd: correctly submit flush bio on barrier
In reply to Greg Kroah-HartmanFrom: Christoph Böhmwalder <[email protected]>
commit 3899d94e3831ee07ea6821c032dc297aec80586a upstream.
When we receive a flush command (or "barrier" in DRBD), we currently use a REQ_OP_FLUSH with the REQ_PREFLUSH flag set.
The correct way to submit a flush bio is by using a REQ_OP_WRITE without any data, and set the REQ_PREFLUSH flag.
Since commit b4a6bb3a67aa ("block: add a sanity check for non-write flush/fua bios"), this triggers a warning in the block layer, but this has been broken for quite some time before that.
So use the correct set of flags to actually make the flush happen.
--- drivers/block/drbd/drbd_receiver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/drbd/drbd_receiver.c +1 -1
@@ -1301,7 +1301,7 @@ static void submit_one_flush(struct drbdbio_set_dev (bio, device->ldev->backing_bdev); bio->bi_private = octx; bio->bi_end_io = one_flush_endio; - bio->bi_opf =REQ_OP_FLUSH |REQ_PREFLUSH ; + bio->bi_opf =REQ_OP_WRITE |REQ_PREFLUSH ; device->flush_jif = jiffies;set_bit (FLUSH_PENDING , &device->flags);
Greg Kroah-Hartman
maintainerPATCH 133/134 RISC-V: Fix up a cherry-pick warning in setup_vm_final()
In reply to Greg Kroah-HartmanThis triggers a -Wdeclaration-after-statement as the code has changed a bit since upstream. It might be better to hoist the whole block up, but this is a smaller change so I went with it.
arch/riscv/mm/init.c:755:16: warning: mixing declarations and code is a C99 extension [-Wdeclaration-after-statement]
unsigned long idx = pgd_index(__fix_to_virt(FIX_FDT));
^
1 warning generated.--- arch/riscv/mm/init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/riscv/mm/init.c +2 -1
@@ -714,6 +714,7 @@ static void __init setup_vm_final(void) {uintptr_t va, map_size;phys_addr_t pa, start, end; +unsigned long idx__maybe_unused ;u64 i;/**
@@ -733,7 +734,7 @@ static void __init setup_vm_final(void)* directly in swapper_pg_dir in addition to the pgd entry that points * to fixmap_pte. */ -unsigned long idx =pgd_index (__fix_to_virt (FIX_FDT )); + idx =pgd_index (__fix_to_virt (FIX_FDT ));set_pgd (&swapper_pg_dir[idx], early_pg_dir[idx]);#endif
Greg Kroah-Hartman
maintainerPATCH 134/134 drm/amd/display: Fix hang when skipping modeset
In reply to Greg Kroah-HartmanFrom: Aurabindo Pillai <[email protected]>
commit da5e14909776edea4462672fb4a3007802d262e7 upstream.
[Why&How]
When skipping full modeset since the only state change was a front porch change, the DC commit sequence requires extra checks to handle non existant plane states being asked to be removed from context.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ++++- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4 -1
@@ -9020,6 +9020,8 @@ static void amdgpu_dm_commit_planes(strucontinue ; dc_plane = dm_new_plane_state->dc_state; +if (!dc_plane) +continue ; bundle->surface_updates[planes_count].surface = dc_plane;if (new_pcrtc_state->color_mgmt_changed) {
@@ -10550,8 +10552,9 @@ static int dm_update_plane_state(structreturn -EINVAL ; } +if (dm_old_plane_state->dc_state) +dc_plane_state_release (dm_old_plane_state->dc_state); -dc_plane_state_release (dm_old_plane_state->dc_state); dm_new_plane_state->dc_state =NULL ; *lock_and_validation_needed = true;
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +3 -0
@@ -1434,6 +1434,9 @@ bool dc_remove_plane_from_context(struct dc_stream_status *stream_status =NULL ;struct resource_pool *pool = dc->res_pool; +if (!plane_state) +return true; +for (i =0 ; i < context->stream_count; i++)if (context->streams[i] == stream) { stream_status = &context->stream_status[i];
Greg Kroah-Hartman
maintainerPATCH 113/134 ksmbd: add channel rwlock
In reply to Greg Kroah-HartmanFrom: Namjae Jeon <[email protected]>
[ Upstream commit 8e06b31e348107c5d78e2c90bb7e69388cb97fb6 ]
Add missing rwlock for channel list in session.
Stable-dep-of: 7b4323373d84 ("ksmbd: fix deadlock in ksmbd_find_crypto_ctx()")
--- fs/ksmbd/mgmt/user_session.c | 3 +++ fs/ksmbd/mgmt/user_session.h | 1 + fs/ksmbd/smb2pdu.c | 20 ++++++++++++++++++-- 3 files changed, 22 insertions(+), 2 deletions(-)
fs/ksmbd/mgmt/user_session.c +3 -0
@@ -32,11 +32,13 @@ static void free_channel_list(struct ksmbd_session *sess) {struct channel *chann, *tmp; +write_lock (&sess->chann_lock);list_for_each_entry_safe (chann, tmp, &sess->ksmbd_chann_list, chann_list) {list_del (&chann->chann_list);kfree (chann); } +write_unlock (&sess->chann_lock); } static void __session_rpc_close(struct ksmbd_session *sess,
@@ -305,6 +307,7 @@ static struct ksmbd_session *__session_create(int protocol)INIT_LIST_HEAD (&sess->rpc_handle_list); sess->sequence_number =1 ;atomic_set (&sess->refcnt,1 ); +rwlock_init (&sess->chann_lock);switch (protocol) {case CIFDS_SESSION_FLAG_SMB2 :
fs/ksmbd/mgmt/user_session.h +1 -0
@@ -48,6 +48,7 @@ struct ksmbd_session {char sess_key[CIFS_KEY_SIZE ];struct hlist_node hlist; +rwlock_t chann_lock;struct list_head ksmbd_chann_list;struct xarray tree_conns;struct ida tree_conn_ida;
fs/ksmbd/smb2pdu.c +18 -2
@@ -1525,7 +1525,9 @@ static int ntlm_authenticate(struct ksmbd_work *work) binding_session:if (conn->dialect >=SMB30_PROT_ID ) { +read_lock (&sess->chann_lock); chann =lookup_chann_list (sess, conn); +read_unlock (&sess->chann_lock);if (!chann) { chann =kmalloc (sizeof (struct channel ),GFP_KERNEL );if (!chann)
@@ -1533,7 +1535,9 @@ static int ntlm_authenticate(struct ksmbd_work *work) chann->conn = conn;INIT_LIST_HEAD (&chann->chann_list); +write_lock (&sess->chann_lock);list_add (&chann->chann_list, &sess->ksmbd_chann_list); +write_unlock (&sess->chann_lock); } }
@@ -1608,7 +1612,9 @@ static int krb5_authenticate(struct ksmbd_work *work) }if (conn->dialect >=SMB30_PROT_ID ) { +read_lock (&sess->chann_lock); chann =lookup_chann_list (sess, conn); +read_unlock (&sess->chann_lock);if (!chann) { chann =kmalloc (sizeof (struct channel ),GFP_KERNEL );if (!chann)
@@ -1616,7 +1622,9 @@ static int krb5_authenticate(struct ksmbd_work *work) chann->conn = conn;INIT_LIST_HEAD (&chann->chann_list); +write_lock (&sess->chann_lock);list_add (&chann->chann_list, &sess->ksmbd_chann_list); +write_unlock (&sess->chann_lock); } }
@@ -8388,10 +8396,14 @@ int smb3_check_sign_req(struct ksmbd_work *work)if (le16_to_cpu (hdr->Command) ==SMB2_SESSION_SETUP_HE ) { signing_key = work->sess->smb3signingkey; }else { +read_lock (&work->sess->chann_lock); chann =lookup_chann_list (work->sess, conn); -if (!chann) +if (!chann) { +read_unlock (&work->sess->chann_lock);return 0 ; + } signing_key = chann->smb3signingkey; +read_unlock (&work->sess->chann_lock); }if (!signing_key) {
@@ -8451,10 +8463,14 @@ void smb3_set_sign_rsp(struct ksmbd_work *work) le16_to_cpu(hdr->Command) == SMB2_SESSION_SETUP_HE) { signing_key = work->sess->smb3signingkey; } else { +read_lock (&work->sess->chann_lock); chann =lookup_chann_list (work->sess, work->conn); -if (!chann) +if (!chann) { +read_unlock (&work->sess->chann_lock);return ; + } signing_key = chann->smb3signingkey; +read_unlock (&work->sess->chann_lock); }if (!signing_key)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 114/134 ksmbd: fix kernel oops from idr_remove()
In reply to Greg Kroah-HartmanFrom: Namjae Jeon <[email protected]>
[ Upstream commit 17ea92a9f6d0b9a97aaec5ab748e4591d70a562c ]
There is a report that kernel oops happen from idr_remove().
kernel: BUG: kernel NULL pointer dereference, address: 0000000000000010 kernel: RIP: 0010:idr_remove+0x1/0x20 kernel: __ksmbd_close_fd+0xb2/0x2d0 [ksmbd] kernel: ksmbd_vfs_read+0x91/0x190 [ksmbd] kernel: ksmbd_fd_put+0x29/0x40 [ksmbd] kernel: smb2_read+0x210/0x390 [ksmbd] kernel: __process_request+0xa4/0x180 [ksmbd] kernel: __handle_ksmbd_work+0xf0/0x290 [ksmbd] kernel: handle_ksmbd_work+0x2d/0x50 [ksmbd] kernel: process_one_work+0x21d/0x3f0 kernel: worker_thread+0x50/0x3d0 kernel: rescuer_thread+0x390/0x390 kernel: kthread+0xee/0x120 kthread_complete_and_exit+0x20/0x20 kernel: ret_from_fork+0x22/0x30
While accessing files, If connection is disconnected, windows send session setup request included previous session destroy. But while still processing requests on previous session, this request destroy file table, which mean file table idr will be freed and set to NULL. So kernel oops happen from ft->idr in __ksmbd_close_fd(). This patch don't directly destroy session in destroy_previous_session(). It just set to KSMBD_SESS_EXITING so that connection will be terminated after finishing the rest of requests.
Stable-dep-of: 7b4323373d84 ("ksmbd: fix deadlock in ksmbd_find_crypto_ctx()")
--- fs/ksmbd/mgmt/user_session.c | 2 ++ fs/ksmbd/smb2pdu.c | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-)
fs/ksmbd/mgmt/user_session.c +2 -0
@@ -241,6 +241,8 @@ struct ksmbd_session *ksmbd_session_lookup_all(struct ksmbd_conn *conn, sess =ksmbd_session_lookup (conn, id);if (!sess && conn->binding) sess =ksmbd_session_lookup_slowpath (id); +if (sess && sess->state !=SMB2_SESSION_VALID ) + sess =NULL ;return sess; }
fs/ksmbd/smb2pdu.c +6 -2
@@ -600,6 +600,7 @@ static void destroy_previous_session(struct ksmbd_conn *conn, {struct ksmbd_session *prev_sess =ksmbd_session_lookup_slowpath (id);struct ksmbd_user *prev_user; +struct channel *chann;if (!prev_sess)return ;
@@ -615,8 +616,11 @@ static void destroy_previous_session(struct ksmbd_conn *conn, }put_session (prev_sess); -xa_erase (&conn->sessions, prev_sess->id); -ksmbd_session_destroy (prev_sess); + prev_sess->state =SMB2_SESSION_EXPIRED ; +write_lock (&prev_sess->chann_lock); +list_for_each_entry (chann, &prev_sess->ksmbd_chann_list, chann_list) + chann->conn->status =KSMBD_SESS_EXITING ; +write_unlock (&prev_sess->chann_lock); }/**
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 115/134 ksmbd: fix racy issue while destroying session on multichannel
In reply to Greg Kroah-HartmanFrom: Namjae Jeon <[email protected]>
[ Upstream commit af7c39d971e43cd0af488729bca362427ad99488 ]
After multi-channel connection with windows, Several channels of session are connected. Among them, if there is a problem in one channel, Windows connects again after disconnecting the channel. In this process, the session is released and a kernel oop can occurs while processing requests to other channels. When the channel is disconnected, if other channels still exist in the session after deleting the channel from the channel list in the session, the session should not be released. Finally, the session will be released after all channels are disconnected.
Stable-dep-of: 7b4323373d84 ("ksmbd: fix deadlock in ksmbd_find_crypto_ctx()")
--- fs/ksmbd/auth.c | 56 ++++++++++++++++-------------- fs/ksmbd/auth.h | 11 +++--- fs/ksmbd/connection.h | 7 ---- fs/ksmbd/mgmt/tree_connect.c | 5 +-- fs/ksmbd/mgmt/tree_connect.h | 4 ++- fs/ksmbd/mgmt/user_session.c | 67 ++++++++++++++++++++++++------------ fs/ksmbd/mgmt/user_session.h | 7 ++-- fs/ksmbd/oplock.c | 11 +++--- fs/ksmbd/smb2pdu.c | 21 +++++------ fs/ksmbd/smb_common.h | 2 +- fs/ksmbd/vfs.c | 3 +- fs/ksmbd/vfs_cache.c | 2 +- 12 files changed, 110 insertions(+), 86 deletions(-)
fs/ksmbd/auth.c +31 -25
@@ -120,8 +120,8 @@ static int ksmbd_gen_sess_key(struct ksmbd_session *sess, char *hash,return rc; } -static int calc_ntlmv2_hash (struct ksmbd_session *sess,char *ntlmv2_hash, -char *dname) +static int calc_ntlmv2_hash (struct ksmbd_conn *conn,struct ksmbd_session *sess, +char *ntlmv2_hash,char *dname) {int ret, len, conv_len;wchar_t *domain =NULL ;
@@ -157,7 +157,7 @@ static int calc_ntlmv2_hash(struct ksmbd_session *sess, char *ntlmv2_hash, } conv_len =smb_strtoUTF16 (uniname,user_name (sess->user), len, - sess->conn->local_nls); + conn->local_nls);if (conv_len <0 || conv_len > len) { ret = -EINVAL ; goto out;
@@ -181,7 +181,7 @@ static int calc_ntlmv2_hash(struct ksmbd_session *sess, char *ntlmv2_hash, } conv_len =smb_strtoUTF16 ((__le16 *)domain, dname, len, - sess->conn->local_nls); + conn->local_nls);if (conv_len <0 || conv_len > len) { ret = -EINVAL ; goto out;
@@ -214,8 +214,9 @@ static int calc_ntlmv2_hash(struct ksmbd_session *sess, char *ntlmv2_hash,* * Return: 0 on success, error number on error */ -int ksmbd_auth_ntlmv2 (struct ksmbd_session *sess,struct ntlmv2_resp *ntlmv2, -int blen,char *domain_name,char *cryptkey) +int ksmbd_auth_ntlmv2 (struct ksmbd_conn *conn,struct ksmbd_session *sess, +struct ntlmv2_resp *ntlmv2,int blen,char *domain_name, +char *cryptkey) {char ntlmv2_hash[CIFS_ENCPWD_SIZE ];char ntlmv2_rsp[CIFS_HMAC_MD5_HASH_SIZE ];
@@ -229,7 +230,7 @@ int ksmbd_auth_ntlmv2(struct ksmbd_session *sess, struct ntlmv2_resp *ntlmv2,return -ENOMEM ; } - rc =calc_ntlmv2_hash (sess, ntlmv2_hash, domain_name); + rc =calc_ntlmv2_hash (conn, sess, ntlmv2_hash, domain_name);if (rc) {ksmbd_debug (AUTH ,"could not get v2 hash rc %d\n" , rc); goto out;
@@ -333,7 +334,8 @@ int ksmbd_decode_ntlmssp_auth_blob(struct authenticate_message *authblob,/* process NTLMv2 authentication */ ksmbd_debug (AUTH ,"decode_ntlmssp_authenticate_blob dname%s\n" , domain_name); - ret =ksmbd_auth_ntlmv2 (sess, (struct ntlmv2_resp *)((char *)authblob + nt_off), + ret =ksmbd_auth_ntlmv2 (conn, sess, + (struct ntlmv2_resp *)((char *)authblob + nt_off), nt_len -CIFS_ENCPWD_SIZE , domain_name, conn->ntlmssp.cryptkey);kfree (domain_name);
@@ -633,8 +635,9 @@ struct derivation {bool binding; }; -static int generate_key (struct ksmbd_session *sess,struct kvec label, -struct kvec context,__u8 *key,unsigned int key_size) +static int generate_key (struct ksmbd_conn *conn,struct ksmbd_session *sess, +struct kvec label,struct kvec context,__u8 *key, +unsigned int key_size) {unsigned char zero =0x0 ;__u8 i[4 ] = {0 ,0 ,0 ,1 };
@@ -694,8 +697,8 @@ static int generate_key(struct ksmbd_session *sess, struct kvec label, goto smb3signkey_ret; } -if (sess->conn->cipher_type ==SMB2_ENCRYPTION_AES256_CCM || - sess->conn->cipher_type ==SMB2_ENCRYPTION_AES256_GCM ) +if (conn->cipher_type ==SMB2_ENCRYPTION_AES256_CCM || + conn->cipher_type ==SMB2_ENCRYPTION_AES256_GCM ) rc =crypto_shash_update (CRYPTO_HMACSHA256 (ctx),L256 ,4 );else rc =crypto_shash_update (CRYPTO_HMACSHA256 (ctx),L128 ,4 );
@@ -730,17 +733,17 @@ static int generate_smb3signingkey(struct ksmbd_session *sess,if (!chann)return 0 ; -if (sess->conn->dialect >=SMB30_PROT_ID && signing->binding) +if (conn->dialect >=SMB30_PROT_ID && signing->binding) key = chann->smb3signingkey;else key = sess->smb3signingkey; - rc =generate_key (sess, signing->label, signing->context, key, + rc =generate_key (conn, sess, signing->label, signing->context, key,SMB3_SIGN_KEY_SIZE );if (rc)return rc; -if (!(sess->conn->dialect >=SMB30_PROT_ID && signing->binding)) +if (!(conn->dialect >=SMB30_PROT_ID && signing->binding))memcpy (chann->smb3signingkey, key,SMB3_SIGN_KEY_SIZE );ksmbd_debug (AUTH ,"dumping generated AES signing keys\n" );
@@ -794,30 +797,31 @@ struct derivation_twin {struct derivation decryption; }; -static int generate_smb3encryptionkey (struct ksmbd_session *sess, +static int generate_smb3encryptionkey (struct ksmbd_conn *conn, +struct ksmbd_session *sess,const struct derivation_twin *ptwin) {int rc; - rc =generate_key (sess, ptwin->encryption.label, + rc =generate_key (conn, sess, ptwin->encryption.label, ptwin->encryption.context, sess->smb3encryptionkey,SMB3_ENC_DEC_KEY_SIZE );if (rc)return rc; - rc =generate_key (sess, ptwin->decryption.label, + rc =generate_key (conn, sess, ptwin->decryption.label, ptwin->decryption.context, sess->smb3decryptionkey,SMB3_ENC_DEC_KEY_SIZE );if (rc)return rc;ksmbd_debug (AUTH ,"dumping generated AES encryption keys\n" ); -ksmbd_debug (AUTH ,"Cipher type %d\n" , sess->conn->cipher_type); +ksmbd_debug (AUTH ,"Cipher type %d\n" , conn->cipher_type);ksmbd_debug (AUTH ,"Session Id %llu\n" , sess->id);ksmbd_debug (AUTH ,"Session Key %*ph\n" ,SMB2_NTLMV2_SESSKEY_SIZE , sess->sess_key); -if (sess->conn->cipher_type ==SMB2_ENCRYPTION_AES256_CCM || - sess->conn->cipher_type ==SMB2_ENCRYPTION_AES256_GCM ) { +if (conn->cipher_type ==SMB2_ENCRYPTION_AES256_CCM || + conn->cipher_type ==SMB2_ENCRYPTION_AES256_GCM ) {ksmbd_debug (AUTH ,"ServerIn Key %*ph\n" ,SMB3_GCM256_CRYPTKEY_SIZE , sess->smb3encryptionkey); ksmbd_debug(AUTH, "ServerOut Key %*ph\n",
@@ -831,7 +835,8 @@ static int generate_smb3encryptionkey(struct ksmbd_session *sess,return 0 ; } -int ksmbd_gen_smb30_encryptionkey (struct ksmbd_session *sess) +int ksmbd_gen_smb30_encryptionkey (struct ksmbd_conn *conn, +struct ksmbd_session *sess) {struct derivation_twin twin;struct derivation *d;
@@ -848,10 +853,11 @@ int ksmbd_gen_smb30_encryptionkey(struct ksmbd_session *sess) d->context.iov_base ="ServerIn " ; d->context.iov_len =10 ; -return generate_smb3encryptionkey (sess, &twin); +return generate_smb3encryptionkey (conn, sess, &twin); } -int ksmbd_gen_smb311_encryptionkey (struct ksmbd_session *sess) +int ksmbd_gen_smb311_encryptionkey (struct ksmbd_conn *conn, +struct ksmbd_session *sess) {struct derivation_twin twin;struct derivation *d;
@@ -868,7 +874,7 @@ int ksmbd_gen_smb311_encryptionkey(struct ksmbd_session *sess) d->context.iov_base = sess->Preauth_HashValue; d->context.iov_len =64 ; -return generate_smb3encryptionkey (sess, &twin); +return generate_smb3encryptionkey (conn, sess, &twin); } int ksmbd_gen_preauth_integrity_hash(struct ksmbd_conn *conn, char *buf,
fs/ksmbd/auth.h +7 -4
@@ -38,8 +38,9 @@ struct kvec;int ksmbd_crypt_message (struct ksmbd_conn *conn,struct kvec *iov,unsigned int nvec,int enc);void ksmbd_copy_gss_neg_header (void *buf); -int ksmbd_auth_ntlmv2 (struct ksmbd_session *sess,struct ntlmv2_resp *ntlmv2, -int blen,char *domain_name,char *cryptkey); +int ksmbd_auth_ntlmv2 (struct ksmbd_conn *conn,struct ksmbd_session *sess, +struct ntlmv2_resp *ntlmv2,int blen,char *domain_name, +char *cryptkey);int ksmbd_decode_ntlmssp_auth_blob (struct authenticate_message *authblob,int blob_len,struct ksmbd_conn *conn,struct ksmbd_session *sess);
@@ -58,8 +59,10 @@ int ksmbd_gen_smb30_signingkey(struct ksmbd_session *sess, struct ksmbd_conn *conn);int ksmbd_gen_smb311_signingkey (struct ksmbd_session *sess,struct ksmbd_conn *conn); -int ksmbd_gen_smb30_encryptionkey (struct ksmbd_session *sess); -int ksmbd_gen_smb311_encryptionkey (struct ksmbd_session *sess); +int ksmbd_gen_smb30_encryptionkey (struct ksmbd_conn *conn, +struct ksmbd_session *sess); +int ksmbd_gen_smb311_encryptionkey (struct ksmbd_conn *conn, +struct ksmbd_session *sess);int ksmbd_gen_preauth_integrity_hash (struct ksmbd_conn *conn,char *buf,__u8 *pi_hash); int ksmbd_gen_sd_hash(struct ksmbd_conn *conn, char *sd_buf, int len,
fs/ksmbd/connection.h +0 -7
@@ -20,13 +20,6 @@#define KSMBD_SOCKET_BACKLOG 16 -/* -* WARNING -* -* This is nothing but a HACK. Session status should move to channel -* or to session. As of now we have 1 tcp_conn : 1 ksmbd_session, but -* we need to change it to 1 tcp_conn : N ksmbd_sessions. -*/ enum {KSMBD_SESS_NEW =0 ,KSMBD_SESS_GOOD ,
fs/ksmbd/mgmt/tree_connect.c +3 -2
@@ -16,7 +16,8 @@#include "user_session.h" struct ksmbd_tree_conn_status -ksmbd_tree_conn_connect (struct ksmbd_session *sess,char *share_name) +ksmbd_tree_conn_connect (struct ksmbd_conn *conn,struct ksmbd_session *sess, +char *share_name) {struct ksmbd_tree_conn_status status = {-ENOENT ,NULL };struct ksmbd_tree_connect_response *resp =NULL ;
@@ -41,7 +42,7 @@ ksmbd_tree_conn_connect(struct ksmbd_session *sess, char *share_name) goto out_error; } - peer_addr =KSMBD_TCP_PEER_SOCKADDR (sess->conn); + peer_addr =KSMBD_TCP_PEER_SOCKADDR (conn); resp = ksmbd_ipc_tree_connect_request(sess, sc, tree_conn,
fs/ksmbd/mgmt/tree_connect.h +3 -1
@@ -12,6 +12,7 @@struct ksmbd_share_config ;struct ksmbd_user ; +struct ksmbd_conn ;struct ksmbd_tree_connect {int id;
@@ -40,7 +41,8 @@ static inline int test_tree_conn_flag(struct ksmbd_tree_connect *tree_conn,struct ksmbd_session ;struct ksmbd_tree_conn_status -ksmbd_tree_conn_connect (struct ksmbd_session *sess,char *share_name); +ksmbd_tree_conn_connect (struct ksmbd_conn *conn,struct ksmbd_session *sess, +char *share_name);int ksmbd_tree_conn_disconnect (struct ksmbd_session *sess,struct ksmbd_tree_connect *tree_conn);
fs/ksmbd/mgmt/user_session.c +45 -22
104 lines not on this page · raw message
fs/ksmbd/mgmt/user_session.h +3 -4
@@ -33,8 +33,10 @@ struct preauth_session {struct ksmbd_session {u64 id; +__u16 dialect; +char ClientGUID[SMB2_CLIENT_GUID_SIZE ]; +struct ksmbd_user *user; -struct ksmbd_conn *conn;unsigned int sequence_number;unsigned int flags;
@@ -59,7 +61,6 @@ struct ksmbd_session {__u8 smb3signingkey[SMB3_SIGN_KEY_SIZE ];struct ksmbd_file_table file_table; -atomic_t refcnt; };static inline int test_session_flag (struct ksmbd_session *sess,int bit)
@@ -100,6 +101,4 @@ void ksmbd_release_tree_conn_id(struct ksmbd_session *sess, int id);int ksmbd_session_rpc_open (struct ksmbd_session *sess,char *rpc_name);void ksmbd_session_rpc_close (struct ksmbd_session *sess,int id);int ksmbd_session_rpc_method (struct ksmbd_session *sess,int id); -int get_session (struct ksmbd_session *sess); -void put_session (struct ksmbd_session *sess);#endif /* __USER_SESSION_MANAGEMENT_H__ */
fs/ksmbd/oplock.c +6 -5
@@ -30,6 +30,7 @@ static DEFINE_RWLOCK(lease_list_lock);static struct oplock_info *alloc_opinfo (struct ksmbd_work *work,u64 id,__u16 Tid) { +struct ksmbd_conn *conn = work->conn;struct ksmbd_session *sess = work->sess;struct oplock_info *opinfo;
@@ -38,7 +39,7 @@ static struct oplock_info *alloc_opinfo(struct ksmbd_work *work,return NULL ; opinfo->sess = sess; - opinfo->conn = sess->conn; + opinfo->conn = conn; opinfo->level =SMB2_OPLOCK_LEVEL_NONE ; opinfo->op_state =OPLOCK_STATE_NONE ; opinfo->pending_break =0 ;
@@ -972,7 +973,7 @@ int find_same_lease_key(struct ksmbd_session *sess, struct ksmbd_inode *ci, }list_for_each_entry (lb, &lease_table_list, l_entry) { -if (!memcmp (lb->client_guid, sess->conn->ClientGUID, +if (!memcmp (lb->client_guid, sess->ClientGUID,SMB2_CLIENT_GUID_SIZE )) goto found; }
@@ -988,7 +989,7 @@ int find_same_lease_key(struct ksmbd_session *sess, struct ksmbd_inode *ci,rcu_read_unlock ();if (opinfo->o_fp->f_ci == ci) goto op_next; - err =compare_guid_key (opinfo, sess->conn->ClientGUID, + err =compare_guid_key (opinfo, sess->ClientGUID, lctx->lease_key);if (err) { err = -EINVAL ;
@@ -1122,7 +1123,7 @@ int smb_grant_oplock(struct ksmbd_work *work, int req_op_level, u64 pid,struct oplock_info *m_opinfo;/* is lease already granted ? */ - m_opinfo =same_client_has_lease (ci, sess->conn->ClientGUID, + m_opinfo =same_client_has_lease (ci, sess->ClientGUID, lctx);if (m_opinfo) {copy_lease (m_opinfo, opinfo);
@@ -1240,7 +1241,7 @@ void smb_break_all_levII_oplock(struct ksmbd_work *work, struct ksmbd_file *fp, {struct oplock_info *op, *brk_op;struct ksmbd_inode *ci; -struct ksmbd_conn *conn = work->sess->conn; +struct ksmbd_conn *conn = work->conn;if (!test_share_config_flag (work->tcon->share_conf,KSMBD_SHARE_FLAG_OPLOCKS ))
fs/ksmbd/smb2pdu.c +9 -12
@@ -610,12 +610,9 @@ static void destroy_previous_session(struct ksmbd_conn *conn,if (!prev_user ||strcmp (user->name, prev_user->name) || user->passkey_sz != prev_user->passkey_sz || -memcmp (user->passkey, prev_user->passkey, user->passkey_sz)) { -put_session (prev_sess); +memcmp (user->passkey, prev_user->passkey, user->passkey_sz))return ; - } -put_session (prev_sess); prev_sess->state =SMB2_SESSION_EXPIRED ;write_lock (&prev_sess->chann_lock);list_for_each_entry (chann, &prev_sess->ksmbd_chann_list, chann_list)
@@ -1512,7 +1509,7 @@ static int ntlm_authenticate(struct ksmbd_work *work)if (smb3_encryption_negotiated (conn) && !(req->Flags &SMB2_SESSION_REQ_FLAG_BINDING )) { - rc = conn->ops->generate_encryptionkey (sess); + rc = conn->ops->generate_encryptionkey (conn, sess);if (rc) {ksmbd_debug (SMB ,"SMB3 encryption key generation failed\n" );
@@ -1604,7 +1601,7 @@ static int krb5_authenticate(struct ksmbd_work *work) sess->sign = true;if (smb3_encryption_negotiated (conn)) { - retval = conn->ops->generate_encryptionkey (sess); + retval = conn->ops->generate_encryptionkey (conn, sess);if (retval) {ksmbd_debug (SMB ,"SMB3 encryption key generation failed\n" );
@@ -1692,7 +1689,7 @@ int smb2_sess_setup(struct ksmbd_work *work) goto out_err; } -if (conn->dialect != sess->conn->dialect) { +if (conn->dialect != sess->dialect) { rc = -EINVAL ; goto out_err; }
@@ -1702,7 +1699,7 @@ int smb2_sess_setup(struct ksmbd_work *work) goto out_err; } -if (strncmp (conn->ClientGUID, sess->conn->ClientGUID, +if (strncmp (conn->ClientGUID, sess->ClientGUID,SMB2_CLIENT_GUID_SIZE )) { rc = -ENOENT ; goto out_err;
@@ -1907,7 +1904,7 @@ int smb2_tree_connect(struct ksmbd_work *work)ksmbd_debug (SMB ,"tree connect request for tree %s treename %s\n" , name, treename); - status =ksmbd_tree_conn_connect (sess, name); + status =ksmbd_tree_conn_connect (conn, sess, name);if (status.ret ==KSMBD_TREE_CONN_STATUS_OK ) rsp->hdr.Id.SyncId.TreeId =cpu_to_le32 (status.tree_conn->id);else
@@ -4895,7 +4892,7 @@ static int smb2_get_info_filesystem(struct ksmbd_work *work, struct smb2_query_info_rsp *rsp, void *rsp_org) { struct ksmbd_session *sess = work->sess; -struct ksmbd_conn *conn = sess->conn; +struct ksmbd_conn *conn = work->conn;struct ksmbd_share_config *share = work->tcon->share_conf;int fsinfoclass =0 ;struct kstatfs stfs;
@@ -5831,7 +5828,7 @@ static int set_rename_info(struct ksmbd_work *work, struct ksmbd_file *fp, } next:return smb2_rename (work, fp, user_ns, rename_info, - work->sess->conn->local_nls); + work->conn->local_nls); } static int set_file_disposition_info(struct ksmbd_file *fp,
@@ -5965,7 +5962,7 @@ static int smb2_set_info_file(struct ksmbd_work *work, struct ksmbd_file *fp,return smb2_create_link (work, work->tcon->share_conf, (struct smb2_file_link_info *)req->Buffer, buf_len, fp->filp, - work->sess->conn->local_nls); + work->conn->local_nls); }case FILE_DISPOSITION_INFORMATION : {
fs/ksmbd/smb_common.h +1 -1
@@ -454,7 +454,7 @@ struct smb_version_ops {int (*check_sign_req)(struct ksmbd_work *work);void (*set_sign_rsp)(struct ksmbd_work *work);int (*generate_signingkey)(struct ksmbd_session *sess,struct ksmbd_conn *conn); -int (*generate_encryptionkey)(struct ksmbd_session *sess); +int (*generate_encryptionkey)(struct ksmbd_conn *conn,struct ksmbd_session *sess);bool (*is_transform_hdr)(void *buf);int (*decrypt_req)(struct ksmbd_work *work);int (*encrypt_resp)(struct ksmbd_work *work);
fs/ksmbd/vfs.c +1 -2
@@ -483,12 +483,11 @@ int ksmbd_vfs_write(struct ksmbd_work *work, struct ksmbd_file *fp, char *buf, size_t count, loff_t *pos, bool sync, ssize_t *written) { - struct ksmbd_session *sess = work->sess; struct file *filp;loff_t offset = *pos;int err =0 ; -if (sess->conn->connection_type) { +if (work->conn->connection_type) {if (!(fp->daccess &FILE_WRITE_DATA_LE )) {pr_err ("no right to write(%pd)\n" , fp->filp->f_path.dentry);
fs/ksmbd/vfs_cache.c +1 -1
@@ -570,7 +570,7 @@ struct ksmbd_file *ksmbd_open_fd(struct ksmbd_work *work, struct file *filp)atomic_set (&fp->refcount,1 ); fp->filp = filp; - fp->conn = work->sess->conn; + fp->conn = work->conn; fp->tcon = work->tcon; fp->volatile_id =KSMBD_NO_FID ; fp->persistent_id =KSMBD_NO_FID ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 116/134 ksmbd: fix deadlock in ksmbd_find_crypto_ctx()
In reply to Greg Kroah-HartmanFrom: Namjae Jeon <[email protected]>
[ Upstream commit 7b4323373d844954bb76e0e9f39c4e5fc785fa7b ]
Deadlock is triggered by sending multiple concurrent session setup requests. It should be reused after releasing when getting ctx for crypto. Multiple consecutive ctx uses cause deadlock while waiting for releasing due to the limited number of ctx.
--- fs/ksmbd/auth.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
fs/ksmbd/auth.c +11 -8
@@ -220,22 +220,22 @@ int ksmbd_auth_ntlmv2(struct ksmbd_conn *conn, struct ksmbd_session *sess, {char ntlmv2_hash[CIFS_ENCPWD_SIZE ];char ntlmv2_rsp[CIFS_HMAC_MD5_HASH_SIZE ]; -struct ksmbd_crypto_ctx *ctx; +struct ksmbd_crypto_ctx *ctx =NULL ;char *construct =NULL ;int rc, len; - ctx =ksmbd_crypto_ctx_find_hmacmd5 (); -if (!ctx) { -ksmbd_debug (AUTH ,"could not crypto alloc hmacmd5\n" ); -return -ENOMEM ; - } - rc =calc_ntlmv2_hash (conn, sess, ntlmv2_hash, domain_name);if (rc) {ksmbd_debug (AUTH ,"could not get v2 hash rc %d\n" , rc); goto out; } + ctx =ksmbd_crypto_ctx_find_hmacmd5 (); +if (!ctx) { +ksmbd_debug (AUTH ,"could not crypto alloc hmacmd5\n" ); +return -ENOMEM ; + } + rc =crypto_shash_setkey (CRYPTO_HMACMD5_TFM (ctx), ntlmv2_hash,CIFS_HMAC_MD5_HASH_SIZE );
@@ -271,6 +271,8 @@ int ksmbd_auth_ntlmv2(struct ksmbd_conn *conn, struct ksmbd_session *sess,ksmbd_debug (AUTH ,"Could not generate md5 hash\n" ); goto out; } +ksmbd_release_crypto_ctx (ctx); + ctx =NULL ; rc =ksmbd_gen_sess_key (sess, ntlmv2_hash, ntlmv2_rsp);if (rc) {
@@ -281,7 +283,8 @@ int ksmbd_auth_ntlmv2(struct ksmbd_conn *conn, struct ksmbd_session *sess,if (memcmp (ntlmv2->ntlmv2_hash, ntlmv2_rsp,CIFS_HMAC_MD5_HASH_SIZE ) !=0 ) rc = -EINVAL ; out: -ksmbd_release_crypto_ctx (ctx); +if (ctx) +ksmbd_release_crypto_ctx (ctx);kfree (construct);return rc; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 117/134 ksmbd: not allow guest user on multichannel
In reply to Greg Kroah-HartmanFrom: Namjae Jeon <[email protected]>
[ Upstream commit 3353ab2df5f68dab7da8d5ebb427a2d265a1f2b2 ]
This patch return STATUS_NOT_SUPPORTED if binding session is guest.
--- fs/ksmbd/smb2pdu.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
fs/ksmbd/smb2pdu.c +9 -2
@@ -1462,7 +1462,7 @@ static int ntlm_authenticate(struct ksmbd_work *work)* Reuse session if anonymous try to connect * on reauthetication. */ -if (ksmbd_anonymous_user (user)) { +if (conn->binding == false &&ksmbd_anonymous_user (user)) {ksmbd_free_user (user);return 0 ; }
@@ -1476,7 +1476,7 @@ static int ntlm_authenticate(struct ksmbd_work *work) sess->user = user; } -if (user_guest (sess->user)) { +if (conn->binding == false &&user_guest (sess->user)) { rsp->SessionFlags =SMB2_SESSION_FLAG_IS_GUEST_LE ; }else {struct authenticate_message *authblob;
@@ -1720,6 +1720,11 @@ int smb2_sess_setup(struct ksmbd_work *work) goto out_err; } +if (user_guest (sess->user)) { + rc = -EOPNOTSUPP ; + goto out_err; + } + conn->binding = true; } else if ((conn->dialect < SMB30_PROT_ID || server_conf.flags & KSMBD_GLOBAL_FLAG_SMB3_MULTICHANNEL) &&
@@ -1831,6 +1836,8 @@ int smb2_sess_setup(struct ksmbd_work *work) rsp->hdr.Status =STATUS_NETWORK_SESSION_EXPIRED ; else if (rc == -ENOMEM) rsp->hdr.Status = STATUS_INSUFFICIENT_RESOURCES; + else if (rc == -EOPNOTSUPP) + rsp->hdr.Status = STATUS_NOT_SUPPORTED; else if (rc) rsp->hdr.Status = STATUS_LOGON_FAILURE;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 118/134 locking/rwsem: Add __always_inline annotation to __down_read_common() and inlined callers
In reply to Greg Kroah-HartmanFrom: John Stultz <[email protected]>
commit 92cc5d00a431e96e5a49c0b97e5ad4fa7536bd4b upstream.
Apparently despite it being marked inline, the compiler may not inline __down_read_common() which makes it difficult to identify the cause of lock contention, as the blocked function in traceevents will always be listed as __down_read_common().
So this patch adds __always_inline annotation to the common function (as well as the inlined helper callers) to force it to be inlined so the blocking function will be listed (via Wchan) in traceevents.
--- kernel/locking/rwsem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/locking/rwsem.c +4 -4
@@ -1221,7 +1221,7 @@ static struct rw_semaphore *rwsem_downgr/* * lock for reading */ -static inline int __down_read_common (struct rw_semaphore *sem,int state) +static __always_inline int __down_read_common(struct rw_semaphore *sem, int state) {int ret =0 ;long count;
@@ -1239,17 +1239,17 @@ out:return ret; } -static inline void __down_read (struct rw_semaphore *sem) +static __always_inline void __down_read(struct rw_semaphore *sem) {__down_read_common (sem,TASK_UNINTERRUPTIBLE ); } -static inline int __down_read_interruptible (struct rw_semaphore *sem) +static __always_inline int __down_read_interruptible(struct rw_semaphore *sem) {return __down_read_common (sem,TASK_INTERRUPTIBLE ); } -static inline int __down_read_killable (struct rw_semaphore *sem) +static __always_inline int __down_read_killable(struct rw_semaphore *sem) {return __down_read_common (sem,TASK_KILLABLE ); }
Greg Kroah-Hartman
maintainerPATCH 119/134 ext4: fix WARNING in mb_find_extent
In reply to Greg Kroah-HartmanFrom: Ye Bin <[email protected]>
commit fa08a7b61dff8a4df11ff1e84abfc214b487caf7 upstream.
Syzbot found the following issue:
EXT4-fs: Warning: mounting with data=journal disables delayed allocation, dioread_nolock, O_DIRECT and fast_commit support! EXT4-fs (loop0): orphan cleanup on readonly fs
------------[ cut here ]------------ WARNING: CPU: 1 PID: 5067 at fs/ext4/mballoc.c:1869 mb_find_extent+0x8a1/0xe30 Modules linked in: CPU: 1 PID: 5067 Comm: syz-executor307 Not tainted 6.2.0-rc1-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/26/2022 RIP: 0010:mb_find_extent+0x8a1/0xe30 fs/ext4/mballoc.c:1869 RSP: 0018:ffffc90003c9e098 EFLAGS: 00010293 RAX: ffffffff82405731 RBX: 0000000000000041 RCX: ffff8880783457c0 RDX: 0000000000000000 RSI: 0000000000000041 RDI: 0000000000000040 RBP: 0000000000000040 R08: ffffffff82405723 R09: ffffed10053c9402 R10: ffffed10053c9402 R11: 1ffff110053c9401 R12: 0000000000000000 R13: ffffc90003c9e538 R14: dffffc0000000000 R15: ffffc90003c9e2cc FS: 0000555556665300(0000) GS:ffff8880b9900000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000056312f6796f8 CR3: 0000000022437000 CR4: 00000000003506e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> ext4_mb_complex_scan_group+0x353/0x1100 fs/ext4/mballoc.c:2307 ext4_mb_regular_allocator+0x1533/0x3860 fs/ext4/mballoc.c:2735 ext4_mb_new_blocks+0xddf/0x3db0 fs/ext4/mballoc.c:5605 ext4_ext_map_blocks+0x1868/0x6880 fs/ext4/extents.c:4286 ext4_map_blocks+0xa49/0x1cc0 fs/ext4/inode.c:651 ext4_getblk+0x1b9/0x770 fs/ext4/inode.c:864 ext4_bread+0x2a/0x170 fs/ext4/inode.c:920 ext4_quota_write+0x225/0x570 fs/ext4/super.c:7105 write_blk fs/quota/quota_tree.c:64 [inline] get_free_dqblk+0x34a/0x6d0 fs/quota/quota_tree.c:130 do_insert_tree+0x26b/0x1aa0 fs/quota/quota_tree.c:340 do_insert_tree+0x722/0x1aa0 fs/quota/quota_tree.c:375 do_insert_tree+0x722/0x1aa0 fs/quota/quota_tree.c:375 do_insert_tree+0x722/0x1aa0 fs/quota/quota_tree.c:375 dq_insert_tree fs/quota/quota_tree.c:401 [inline] qtree_write_dquot+0x3b6/0x530 fs/quota/quota_tree.c:420 v2_write_dquot+0x11b/0x190 fs/quota/quota_v2.c:358 dquot_acquire+0x348/0x670 fs/quota/dquot.c:444 ext4_acquire_dquot+0x2dc/0x400 fs/ext4/super.c:6740 dqget+0x999/0xdc0 fs/quota/dquot.c:914 __dquot_initialize+0x3d0/0xcf0 fs/quota/dquot.c:1492 ext4_process_orphan+0x57/0x2d0 fs/ext4/orphan.c:329 ext4_orphan_cleanup+0xb60/0x1340 fs/ext4/orphan.c:474 __ext4_fill_super fs/ext4/super.c:5516 [inline] ext4_fill_super+0x81cd/0x8700 fs/ext4/super.c:5644 get_tree_bdev+0x400/0x620 fs/super.c:1282 vfs_get_tree+0x88/0x270 fs/super.c:1489 do_new_mount+0x289/0xad0 fs/namespace.c:3145 do_mount fs/namespace.c:3488 [inline] __do_sys_mount fs/namespace.c:3697 [inline] __se_sys_mount+0x2d3/0x3c0 fs/namespace.c:3674 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
Add some debug information:mb_find_extent: mb_find_extent block=41, order=0 needed=64 next=0 ex=0/41/1@3735929054 64 64 7block_bitmap: ff 3f 0c 00 fc 01 00 00 d2 3d 00 00 00 00 00 00 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
Acctually, blocks per group is 64, but block bitmap indicate at least has 128 blocks. Now, ext4_validate_block_bitmap() didn't check invalid block's bitmap if set.
To resolve above issue, add check like fsck "Padding at end of block bitmap is not set".
--- fs/ext4/balloc.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
fs/ext4/balloc.c +25 -0
@@ -303,6 +303,22 @@ struct ext4_group_desc * ext4_get_group_return desc; } +static ext4_fsblk_t ext4_valid_block_bitmap_padding (struct super_block *sb, +ext4_group_t block_group, +struct buffer_head *bh) +{ +ext4_grpblk_t next_zero_bit; +unsigned long bitmap_size = sb->s_blocksize *8 ; +unsigned int offset =num_clusters_in_group (sb, block_group); + +if (bitmap_size <= offset) +return 0 ; + + next_zero_bit =ext4_find_next_zero_bit (bh->b_data, bitmap_size, offset); + +return (next_zero_bit < bitmap_size ? next_zero_bit :0 ); +} +/* * Return the block number which was discovered to be invalid, or 0 if * the block bitmap is valid.
@@ -401,6 +417,15 @@ static int ext4_validate_block_bitmap(st EXT4_GROUP_INFO_BBITMAP_CORRUPT);return -EFSCORRUPTED ; } + blk =ext4_valid_block_bitmap_padding (sb, block_group, bh); +if (unlikely (blk !=0 )) { +ext4_unlock_group (sb, block_group); +ext4_error (sb,"bg %u: block %llu: padding at end of block bitmap is not set" , + block_group, blk); +ext4_mark_group_bitmap_corrupted (sb, block_group, +EXT4_GROUP_INFO_BBITMAP_CORRUPT ); +return -EFSCORRUPTED ; + }set_buffer_verified (bh); verified:ext4_unlock_group (sb, block_group);
Greg Kroah-Hartman
maintainerPATCH 110/134 ksmbd: set RSS capable in FSCTL_QUERY_NETWORK_INTERFACE_INFO
In reply to Greg Kroah-HartmanFrom: Namjae Jeon <[email protected]>
[ Upstream commit a58b45a4dbfd0bf2ebb157789da4d8e6368afb1b ]
Set RSS capable in FSCTL_QUERY_NETWORK_INTERFACE_INFO if netdev has multi tx queues. And add ksmbd_compare_user() to avoid racy condition issue in ksmbd_free_user(). because windows client is simultaneously used to send session setup requests for multichannel connection.
Stable-dep-of: 7b4323373d84 ("ksmbd: fix deadlock in ksmbd_find_crypto_ctx()")
--- fs/ksmbd/mgmt/user_config.c | 10 ++++++++++ fs/ksmbd/mgmt/user_config.h | 1 + fs/ksmbd/smb2pdu.c | 15 ++++++++++----- 3 files changed, 21 insertions(+), 5 deletions(-)
fs/ksmbd/mgmt/user_config.c +10 -0
@@ -67,3 +67,13 @@ int ksmbd_anonymous_user(struct ksmbd_user *user)return 1 ;return 0 ; } + +bool ksmbd_compare_user (struct ksmbd_user *u1,struct ksmbd_user *u2) +{ +if (strcmp (u1->name, u2->name)) +return false; +if (memcmp (u1->passkey, u2->passkey, u1->passkey_sz)) +return false; + +return true; +}
fs/ksmbd/mgmt/user_config.h +1 -0
@@ -64,4 +64,5 @@ struct ksmbd_user *ksmbd_login_user(const char *account);struct ksmbd_user *ksmbd_alloc_user (struct ksmbd_login_response *resp);void ksmbd_free_user (struct ksmbd_user *user);int ksmbd_anonymous_user (struct ksmbd_user *user); +bool ksmbd_compare_user (struct ksmbd_user *u1,struct ksmbd_user *u2);#endif /* __USER_CONFIG_MANAGEMENT_H__ */
fs/ksmbd/smb2pdu.c +10 -5
@@ -1463,10 +1463,16 @@ static int ntlm_authenticate(struct ksmbd_work *work)ksmbd_free_user (user);return 0 ; } -ksmbd_free_user (sess->user); + +if (!ksmbd_compare_user (sess->user, user)) { +ksmbd_free_user (user); +return -EPERM ; + } +ksmbd_free_user (user); + }else { + sess->user = user; } - sess->user = user;if (user_guest (sess->user)) { rsp->SessionFlags =SMB2_SESSION_FLAG_IS_GUEST_LE ; }else {
@@ -2071,9 +2077,6 @@ int smb2_session_logoff(struct ksmbd_work *work)ksmbd_debug (SMB ,"request\n" ); -/* Got a valid session, set connection state */ -WARN_ON (sess->conn != conn); -/* setting CifsExiting here may race with start_tcp_sess */ ksmbd_conn_set_need_reconnect (work);ksmbd_close_session_fds (work);
@@ -7302,6 +7305,8 @@ static int fsctl_query_iface_info_ioctl(struct ksmbd_conn *conn, nii_rsp->IfIndex =cpu_to_le32 (netdev->ifindex); nii_rsp->Capability =0 ; +if (netdev->real_num_tx_queues >1 ) + nii_rsp->Capability |=cpu_to_le32 (RSS_CAPABLE );if (ksmbd_rdma_capable_netdev (netdev)) nii_rsp->Capability |=cpu_to_le32 (RDMA_CAPABLE );
Signature · 1 line
2.39.2
Hello Greg,
Quoted 10 lines
From: Greg Kroah-Hartman <[email protected]>
Sent: Monday, May 15, 2023 5:28 PMThis is the start of the stable review cycle for the 5.15.112 release. There are 134 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 17 May 2023 16:16:37 +0000. Anything received after that time might be too late.
CIP configurations built and booted with Linux 5.15.112-rc1 (070cc2c270b1):
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/pipelines/867957735
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/commits/linux-5.15.y
Kind regards, Chris
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.112 release. There are 134 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 17 May 2023 16:16:37 +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.112-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
Re: [PATCH 5.15 048/134] net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop()
In reply to Greg Kroah-HartmanQuoted 9 lines · Greg Kroah-Hartman
From: Florian Fainelli <[email protected]>
[ Upstream commit
93e0401e0fc0c54b0ac05b687cd135c2ac38187c]The call to
phy_stop()races with the later call tophy_disconnect(), resulting in concurrentphy_suspend()calls being run from different CPUs. The final call tophy_disconnect()ensures that the PHY is stopped and suspended, too.
Quoted 4 lines
Fixes c96e731c93ff ("net: bcmgenet: connect and disconnect from the PHY state machine")Signed-off-by Florian Fainelli <[email protected]>Signed-off-by David S. Miller <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Please drop this patch until https://lore.kernel.org/lkml/[email protected]/ is merged, thanks!
Signature · 1 line
Florian
Hi Greg,
Quoted 4 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.112 release. There are 134 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.
Build test (gcc version 12.2.1 20230511):
mips: 62 configs -> no failure
arm: 99 configs -> no failure
arm64: 3 configs -> no failurex86_64: 4 configs -> no failure alpha allmodconfig -> no failure csky allmodconfig -> no failure powerpc allmodconfig -> no failure riscv allmodconfig -> no failure s390 allmodconfig -> no failure xtensa allmodconfig -> no failure
Boot test:x86_64: Booted on my test laptop. No regression.x86_64: Booted on qemu. No regression. [1]
arm64: Booted on rpi4b (4GB model). No regression. [2]
[1]. https://openqa.qa.codethink.co.uk/tests/3532
[2]. https://openqa.qa.codethink.co.uk/tests/3533
Signature · 2 lines
Regards Sudip
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.112 release. There are 134 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 17 May 2023 16:16:37 +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.112-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
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.112 release. There are 134 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.
Successfully compiled and installed bindeb-pkgs on my computer (Acer Aspire E15, Intel Core i3 Haswell). No noticeable regressions.
Signature · 1 line
An old man doll... just what I always wanted! - Clara
Hi Greg,
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.112 release. There are 134 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.
No problems seen on x86_64 and aarch64.
Thanks,
Harshit
Quoted 13 lines
Responses should be made by Wed, 17 May 2023 16:16:37 +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.112-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
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.112 release. There are 134 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 17 May 2023 16:16:37 +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.112-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
Results from Linaro’s test farm.
Regressions on arm64, arm, x86_64 and i386.
We have recently upgraded our selftest sources to stable-rc 6.3 and running on stable rc 6.2, 6.1, 5.15, 5.10, 5.4, 4.19 and 4.14 kernels.
List of test regressions:
========
kselftest-membarrier
- membarrier_membarrier_test_multi_thread
- membarrier_membarrier_test_single_thread
kselftest-memfd
- memfd_memfd_test
kselftest-rseq
- rseq_basic_test
kselftest-kvm
- kvm_hyperv_features
- kvm_xapic_state_test
ltp-commands
- mkfs01_ntfs_sh
NOTE:
The logs are the same as reported on other email reports.
link,
https://lore.kernel.org/stable/CA+G9fYu6ZOu_We2GMP0sFnSovOsqd6waW7oKS-Y1VPrjdibu5Q@mail.gmail.com/
## Build
* kernel: 5.15.112-rc1
* git: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
* git branch: linux-5.15.y
* git commit: 070cc2c270b16bbdaf1701b7ade29ab4475f9423
* git describe: v5.15.111-135-g070cc2c270b1
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.15.y/build/v5.15.111-135-g070cc2c270b1
## Test Regressions (compared to v5.15.111)
* bcm2711-rpi-4-b, kselftest-membarrier
- membarrier_membarrier_test_multi_thread
- membarrier_membarrier_test_single_thread
* bcm2711-rpi-4-b, kselftest-memfd
- memfd_memfd_test
* bcm2711-rpi-4-b, kselftest-rseq
- rseq_basic_test
* dragonboard-410c, kselftest-membarrier
- membarrier_membarrier_test_multi_thread
- membarrier_membarrier_test_single_thread
* dragonboard-410c, kselftest-memfd
- memfd_memfd_test
* dragonboard-410c, kselftest-rseq
- rseq_basic_test
* fvp-aemva, kselftest-membarrier
- membarrier_membarrier_test_multi_thread
- membarrier_membarrier_test_single_thread
* fvp-aemva, kselftest-memfd
- memfd_memfd_test
* i386, kselftest-membarrier
- membarrier_membarrier_test_multi_thread
- membarrier_membarrier_test_single_thread
* i386, kselftest-memfd
- memfd_memfd_test
* i386, kselftest-rseq
- rseq_basic_test
- rseq_run_param_test_sh
* i386, ltp-commands
- mkfs01_ntfs_sh
* juno-r2, kselftest-membarrier
- membarrier_membarrier_test_multi_thread
- membarrier_membarrier_test_single_thread
* juno-r2, kselftest-memfd
- memfd_memfd_test
* juno-r2, kselftest-rseq
- rseq_basic_test
* qemu-arm64, kselftest-membarrier
- membarrier_membarrier_test_multi_thread
- membarrier_membarrier_test_single_thread
* qemu-arm64, kselftest-memfd
- memfd_memfd_test
* qemu-armv7, kselftest-membarrier
- membarrier_membarrier_test_multi_thread
- membarrier_membarrier_test_single_thread
* qemu-i386, kselftest-membarrier
- membarrier_membarrier_test_multi_thread
- membarrier_membarrier_test_single_thread
* qemu-i386, kselftest-memfd
- memfd_memfd_test
* qemu-i386, kselftest-rseq
- rseq_basic_test
* qemu-x86_64, kselftest-membarrier
- membarrier_membarrier_test_multi_thread
- membarrier_membarrier_test_single_thread
* qemu-x86_64, kselftest-memfd
- memfd_memfd_test
* qemu_i386, kselftest-membarrier
- membarrier_membarrier_test_multi_thread
- membarrier_membarrier_test_single_thread
* qemu_i386, kselftest-memfd
- memfd_memfd_test
* qemu_i386, kselftest-rseq
- rseq_basic_test
- rseq_run_param_test_sh
* qemu_i386, log-parser-boot
- check-kernel-bug
- check-kernel-kfence
* qemu_i386, log-parser-test
- check-kernel-warning
* qemu_x86_64, kselftest-membarrier
- membarrier_membarrier_test_multi_thread
- membarrier_membarrier_test_single_thread
* qemu_x86_64, kselftest-memfd
- memfd_memfd_test
* qemu_x86_64, kselftest-rseq
- rseq_basic_test
- rseq_run_param_test_sh
* x15, kselftest-rseq
- rseq_basic_test
* x15, ltp-commands
- mkfs01_ntfs_sh
* x86, kselftest-kvm
- kvm_hyperv_features
- kvm_xapic_state_test
* x86, kselftest-membarrier
- membarrier_membarrier_test_multi_thread
- membarrier_membarrier_test_single_thread
* x86, kselftest-memfd
- memfd_memfd_test
* x86, kselftest-rseq
- rseq_basic_test
- rseq_run_param_test_sh
* x86-kasan, ltp-commands
- mkfs01_ntfs_sh
## Metric Regressions (compared to v5.15.111)
## Test Fixes (compared to v5.15.111)
## Metric Fixes (compared to v5.15.111)
## Test result summary
total: 127590, pass: 106736, fail: 3622, skip: 17042, xfail: 190
## Build Summary
* arc: 5 total, 5 passed, 0 failed
* arm: 117 total, 116 passed, 1 failed
* arm64: 45 total, 43 passed, 2 failed
* i386: 35 total, 32 passed, 3 failed
* mips: 27 total, 26 passed, 1 failed
* parisc: 8 total, 8 passed, 0 failed
* powerpc: 27 total, 26 passed, 1 failed
* riscv: 11 total, 11 passed, 0 failed
* s390: 12 total, 11 passed, 1 failed
* sh: 14 total, 12 passed, 2 failed
* sparc: 8 total, 8 passed, 0 failed
* x86_64: 38 total, 36 passed, 2 failed
## Test suites summary
* boot
* fwts
* igt-gpu-tools
* kselftest-android
* kselftest-arm64
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-drivers-dma-buf
* kselftest-efivarfs
* kselftest-exec
* kselftest-filesystems
* kselftest-filesystems-binderfs
* kselftest-firmware
* kselftest-fpu
* kselftest-ftrace
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-kexec
* kselftest-kvm
* kselftest-lib
* kselftest-livepatch
* kselftest-membarrier
* kselftest-memfd
* kselftest-memory-hotplug
* kselftest-mincore
* kselftest-mount
* kselftest-mqueue
* kselftest-net
* kselftest-net-forwarding
* kselftest-net-mptcp
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-pstore
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-splice
* kselftest-static_keys
* kselftest-sync
* kselftest-sysctl
* kselftest-tc-testing
* kselftest-timens
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user
* kselftest-user_events
* kselftest-vDSO
* kselftest-watchdog
* kselftest-x86
* kselftest-zram
* kunit
* kvm-unit-tests
* libhugetlbfs
* log-parser-boot
* log-parser-test
* ltp-cap_bounds
* ltp-commands
* ltp-containers
* ltp-controllers
* ltp-cpuhotplug
* ltp-crypto
* ltp-cve
* ltp-dio
* ltp-fcntl-locktests
* ltp-filecaps
* ltp-fs
* ltp-fs_bind
* ltp-fs_perms_simple
* ltp-fsx
* ltp-hugetlb
* ltp-io
* ltp-ipc
* ltp-math
* ltp-mm
* ltp-nptl
* ltp-pty
* ltp-sched
* ltp-securebits
* ltp-smoke
* ltp-syscalls
* ltp-tracing
* network-basic-tests
* perf
* rcutorture
* v4l2-compliance
* vdso
--
Linaro LKFT
https://lkft.linaro.org
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.112 release. There are 134 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 17 May 2023 16:16:37 +0000. Anything received after that time might be too late.
Build results:
total: 160 pass: 160 fail: 0 Qemu test results: total: 499 pass: 499 fail: 0
Guenter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.112 release. There are 134 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 17 May 2023 16:16:37 +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.112-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:
11 builds: 11 pass, 0 fail
28 boots: 28 pass, 0 fail
114 tests: 114 pass, 0 failLinux version: 5.15.112-rc1-g070cc2c270b1
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