5.7.17-rc1 review
Subsystems (4)
Greg Kroah-Hartman
maintainerPATCH 150/204 nfs: ensure correct writeback errors are returned on close()
In reply to Greg Kroah-HartmanFrom: Scott Mayhew <[email protected]>
[ Upstream commit 67dd23f9e6fbaf163431912ef5599c5e0693476c ]
nfs_wb_all() calls filemap_write_and_wait(), which uses filemap_check_errors() to determine the error to return. filemap_check_errors() only looks at the mapping->flags and will therefore only return either -ENOSPC or -EIO. To ensure that the correct error is returned on close(), nfs{,4}_file_flush() should call filemap_check_wb_err() which looks at the errseq value in mapping->wb_err without consuming it.
generic one")
--- fs/nfs/file.c | 5 ++++- fs/nfs/nfs4file.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-)
fs/nfs/file.c +4 -1
@@ -140,6 +140,7 @@ static int nfs_file_flush(struct file *file, fl_owner_t id) {struct inode *inode =file_inode (file); +errseq_t since;dprintk ("NFS: flush(%pD2)\n" , file);
@@ -148,7 +149,9 @@ nfs_file_flush(struct file *file, fl_owner_t id)return 0 ;/* Flush writes to the server and return any errors */ -return nfs_wb_all (inode); + since =filemap_sample_wb_err (file->f_mapping); +nfs_wb_all (inode); +return filemap_check_wb_err (file->f_mapping, since); }ssize_t
fs/nfs/nfs4file.c +4 -1
@@ -110,6 +110,7 @@ static int nfs4_file_flush(struct file *file, fl_owner_t id) {struct inode *inode =file_inode (file); +errseq_t since;dprintk ("NFS: flush(%pD2)\n" , file);
@@ -125,7 +126,9 @@ nfs4_file_flush(struct file *file, fl_owner_t id)return filemap_fdatawrite (file->f_mapping);/* Flush writes to the server and return any errors */ -return nfs_wb_all (inode); + since =filemap_sample_wb_err (file->f_mapping); +nfs_wb_all (inode); +return filemap_check_wb_err (file->f_mapping, since); }#ifdef CONFIG_NFS_V4_2
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 151/204 ubifs: Fix wrong orphan node deletion in ubifs_jnl_update|rename
In reply to Greg Kroah-HartmanFrom: Zhihao Cheng <[email protected]>
[ Upstream commit 094b6d1295474f338201b846a1f15e72eb0b12cf ]
There a wrong orphan node deleting in error handling path in ubifs_jnl_update() and ubifs_jnl_rename(), which may cause following error msg:
UBIFS error (ubi0:0 pid 1522): ubifs_delete_orphan [ubifs]:
missing orphan ino 65
Fix this by checking whether the node has been operated for adding to orphan list before being deleted,
--- fs/ubifs/journal.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
fs/ubifs/journal.c +6 -4
@@ -539,7 +539,7 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir, const struct fscrypt_name *nm, const struct inode *inode, int deletion, int xent) { - int err, dlen, ilen, len, lnum, ino_offs, dent_offs; + int err, dlen, ilen, len, lnum, ino_offs, dent_offs, orphan_added = 0;int aligned_dlen, aligned_ilen, sync =IS_DIRSYNC (dir);int last_reference = !!(deletion && inode->i_nlink ==0 );struct ubifs_inode *ui =ubifs_inode (inode);
@@ -630,6 +630,7 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir, goto out_finish; } ui->del_cmtno = c->cmt_no; + orphan_added =1 ; } err =write_head (c,BASEHD , dent, len, &lnum, &dent_offs, sync);
@@ -702,7 +703,7 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir,kfree (dent); out_ro:ubifs_ro_mode (c, err); -if (last_reference) +if (orphan_added)ubifs_delete_orphan (c, inode->i_ino);finish_reservation (c);return err;
@@ -1218,7 +1219,7 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir,void *p;union ubifs_key key;struct ubifs_dent_node *dent, *dent2; -int err, dlen1, dlen2, ilen, lnum, offs, len; +int err, dlen1, dlen2, ilen, lnum, offs, len, orphan_added =0 ;int aligned_dlen1, aligned_dlen2, plen =UBIFS_INO_NODE_SZ ;int last_reference = !!(new_inode && new_inode->i_nlink ==0 );int move = (old_dir != new_dir);
@@ -1334,6 +1335,7 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, goto out_finish; } new_ui->del_cmtno = c->cmt_no; + orphan_added =1 ; } err =write_head (c,BASEHD , dent, len, &lnum, &offs, sync);
@@ -1415,7 +1417,7 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir,release_head (c,BASEHD ); out_ro:ubifs_ro_mode (c, err); -if (last_reference) +if (orphan_added)ubifs_delete_orphan (c, new_inode->i_ino); out_finish:finish_reservation (c);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 152/204 clk: bcm2835: Do not use prediv with bcm2711s PLLs
In reply to Greg Kroah-HartmanFrom: Nicolas Saenz Julienne <[email protected]>
[ Upstream commit f34e4651ce66a754f41203284acf09b28b9dd955 ]
Contrary to previous SoCs, bcm2711 doesn't have a prescaler in the PLL feedback loop. Bypass it by zeroing fb_prediv_mask when running on bcm2711.
Note that, since the prediv configuration bits were re-purposed, this was triggering miscalculations on all clocks hanging from the VPU clock, notably the aux UART, making its output unintelligible.
--- drivers/clk/bcm/clk-bcm2835.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)
drivers/clk/bcm/clk-bcm2835.c +21 -4
@@ -314,6 +314,7 @@ struct bcm2835_cprman {struct device *dev;void __iomem *regs;spinlock_t regs_lock;/* spinlock for all clocks */ +unsigned int soc;/* * Real names of cprman clock parents looked up through
@@ -525,6 +526,20 @@ static int bcm2835_pll_is_on(struct clk_hw *hw)A2W_PLL_CTRL_PRST_DISABLE ; } +static u32 bcm2835_pll_get_prediv_mask (struct bcm2835_cprman *cprman, +const struct bcm2835_pll_data *data) +{ +/* +* On BCM2711 there isn't a pre-divisor available in the PLL feedback +* loop. Bits 13:14 of ANA1 (PLLA,PLLB,PLLC,PLLD) have been re-purposed +* for to for VCO RANGE bits. +*/ +if (cprman->soc &SOC_BCM2711 ) +return 0 ; + +return data->ana->fb_prediv_mask; +} +static void bcm2835_pll_choose_ndiv_and_fdiv (unsigned long rate,unsigned long parent_rate,u32 *ndiv,u32 *fdiv)
@@ -582,7 +597,7 @@ static unsigned long bcm2835_pll_get_rate(struct clk_hw *hw, ndiv = (a2wctrl &A2W_PLL_CTRL_NDIV_MASK ) >>A2W_PLL_CTRL_NDIV_SHIFT ; pdiv = (a2wctrl &A2W_PLL_CTRL_PDIV_MASK ) >>A2W_PLL_CTRL_PDIV_SHIFT ; using_prediv =cprman_read (cprman, data->ana_reg_base +4 ) & - data->ana->fb_prediv_mask; +bcm2835_pll_get_prediv_mask (cprman, data);if (using_prediv) { ndiv *=2 ;
@@ -665,6 +680,7 @@ static int bcm2835_pll_set_rate(struct clk_hw *hw, struct bcm2835_pll *pll = container_of(hw, struct bcm2835_pll, hw);struct bcm2835_cprman *cprman = pll->cprman;const struct bcm2835_pll_data *data = pll->data; +u32 prediv_mask =bcm2835_pll_get_prediv_mask (cprman, data);bool was_using_prediv, use_fb_prediv, do_ana_setup_first;u32 ndiv, fdiv, a2w_ctl;u32 ana[4 ];
@@ -682,7 +698,7 @@ static int bcm2835_pll_set_rate(struct clk_hw *hw,for (i =3 ; i >=0 ; i--) ana[i] =cprman_read (cprman, data->ana_reg_base + i *4 ); - was_using_prediv = ana[1 ] & data->ana->fb_prediv_mask; + was_using_prediv = ana[1 ] & prediv_mask; ana[0 ] &= ~data->ana->mask0; ana[0 ] |= data->ana->set0;
@@ -692,10 +708,10 @@ static int bcm2835_pll_set_rate(struct clk_hw *hw, ana[3 ] |= data->ana->set3;if (was_using_prediv && !use_fb_prediv) { - ana[1 ] &= ~data->ana->fb_prediv_mask; + ana[1 ] &= ~prediv_mask; do_ana_setup_first = true; }else if (!was_using_prediv && use_fb_prediv) { - ana[1 ] |= data->ana->fb_prediv_mask; + ana[1 ] |= prediv_mask; do_ana_setup_first = false; }else { do_ana_setup_first = true;
@@ -2232,6 +2248,7 @@ static int bcm2835_clk_probe(struct platform_device *pdev)platform_set_drvdata (pdev, cprman); cprman->onecell.num = asize; + cprman->soc = pdata->soc; hws = cprman->onecell.hws;for (i =0 ; i < asize; i++) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 153/204 libnvdimm/security: fix a typo
In reply to Greg Kroah-HartmanFrom: Jane Chu <[email protected]>
[ Upstream commit dad42d17558f316e9e807698cd4207359b636084 ]
commit d78c620a2e82 ("libnvdimm/security: Introduce a 'frozen' attribute") introduced a typo, causing a 'nvdimm->sec.flags' update being overwritten by the subsequent update meant for 'nvdimm->sec.ext_flags'.
--- drivers/nvdimm/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvdimm/security.c +1 -1
@@ -457,7 +457,7 @@ void __nvdimm_security_overwrite_query(struct nvdimm *nvdimm)clear_bit (NDD_WORK_PENDING , &nvdimm->flags);put_device (&nvdimm->dev); nvdimm->sec.flags =nvdimm_security_flags (nvdimm,NVDIMM_USER ); - nvdimm->sec.flags =nvdimm_security_flags (nvdimm,NVDIMM_MASTER ); + nvdimm->sec.ext_flags =nvdimm_security_flags (nvdimm,NVDIMM_MASTER ); }void nvdimm_security_overwrite_query (struct work_struct *work)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 154/204 libnvdimm/security: ensure sysfs poll thread woke up and fetch updated attr
In reply to Greg Kroah-HartmanFrom: Jane Chu <[email protected]>
[ Upstream commit 7f674025d9f7321dea11b802cc0ab3f09cbe51c5 ]
commit 7d988097c546 ("acpi/nfit, libnvdimm/security: Add security DSM overwrite support") adds a sysfs_notify_dirent() to wake up userspace poll thread when the "overwrite" operation has completed. But the notification is issued before the internal dimm security state and flags have been updated, so the userspace poll thread wakes up and fetches the not-yet-updated attr and falls back to sleep, forever. But if user from another terminal issue "ndctl wait-overwrite nmemX" again, the command returns instantly.
--- drivers/nvdimm/security.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/nvdimm/security.c +8 -3
@@ -450,14 +450,19 @@ void __nvdimm_security_overwrite_query(struct nvdimm *nvdimm)else dev_dbg (&nvdimm->dev,"overwrite completed\n" ); -if (nvdimm->sec.overwrite_state) -sysfs_notify_dirent (nvdimm->sec.overwrite_state); +/* +* Mark the overwrite work done and update dimm security flags, +* then send a sysfs event notification to wake up userspace +* poll threads to picked up the changed state. +*/ nvdimm->sec.overwrite_tmo =0 ;clear_bit (NDD_SECURITY_OVERWRITE , &nvdimm->flags);clear_bit (NDD_WORK_PENDING , &nvdimm->flags); -put_device (&nvdimm->dev); nvdimm->sec.flags =nvdimm_security_flags (nvdimm,NVDIMM_USER ); nvdimm->sec.ext_flags =nvdimm_security_flags (nvdimm,NVDIMM_MASTER ); +if (nvdimm->sec.overwrite_state) +sysfs_notify_dirent (nvdimm->sec.overwrite_state); +put_device (&nvdimm->dev); }void nvdimm_security_overwrite_query (struct work_struct *work)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 155/204 openrisc: Fix oops caused when dumping stack
In reply to Greg Kroah-HartmanFrom: Stafford Horne <[email protected]>
[ Upstream commit 57b8e277c33620e115633cdf700a260b55095460 ]
When dumping a stack with 'cat /proc/#/stack' the kernel would oops. For example:
# cat /proc/690/stack
Unable to handle kernel access
at virtual address 0x7fc60f58 Oops#: 0000
CPU #: 0
PC: c00097fc SR: 0000807f SP: d6f09b9c
GPR00: 00000000 GPR01: d6f09b9c GPR02: d6f09bb8 GPR03: d6f09bc4
GPR04: 7fc60f5c GPR05: c00099b4 GPR06: 00000000 GPR07: d6f09ba3
GPR08: ffffff00 GPR09: c0009804 GPR10: d6f08000 GPR11: 00000000
GPR12: ffffe000 GPR13: dbb86000 GPR14: 00000001 GPR15: dbb86250
GPR16: 7fc60f63 GPR17: 00000f5c GPR18: d6f09bc4 GPR19: 00000000
GPR20: c00099b4 GPR21: ffffffc0 GPR22: 00000000 GPR23: 00000000
GPR24: 00000001 GPR25: 000002c6 GPR26: d78b6850 GPR27: 00000001
GPR28: 00000000 GPR29: dbb86000 GPR30: ffffffff GPR31: dbb862fc
RES: 00000000 oGPR11: ffffffff
Process cat (pid: 702, stackpage=d79d6000)
Stack:
Call trace:
[<598977f2>] save_stack_trace_tsk+0x40/0x74
[<95063f0e>] stack_trace_save_tsk+0x44/0x58
[<b557bfdd>] proc_pid_stack+0xd0/0x13c
[<a2df8eda>] proc_single_show+0x6c/0xf0
[<e5a737b7>] seq_read+0x1b4/0x688
[<2d6c7480>] do_iter_read+0x208/0x248
[<2182a2fb>] vfs_readv+0x64/0x90This was caused by the stack trace code in save_stack_trace_tsk using the wrong stack pointer. It was using the user stack pointer instead of the kernel stack pointer. Fix this by using the right stack.
Also for good measure we add try_get_task_stack/put_task_stack to ensure the task is not lost while we are walking it's stack.
--- arch/openrisc/kernel/stacktrace.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
arch/openrisc/kernel/stacktrace.c +16 -2
@@ -13,6 +13,7 @@#include <linux/export.h> #include <linux/sched.h> #include <linux/sched/debug.h> +#include <linux/sched/task_stack.h> #include <linux/stacktrace.h> #include <asm/processor.h>
@@ -68,12 +69,25 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) {unsigned long *sp =NULL ; +if (!try_get_task_stack (tsk)) +return ; +if (tsk == current) sp = (unsigned long *) &sp; -else - sp = (unsigned long *)KSTK_ESP (tsk); +else { +unsigned long ksp; + +/* Locate stack from kernel context */ + ksp =task_thread_info (tsk)->ksp; + ksp +=STACK_FRAME_OVERHEAD ;/* redzone */ + ksp +=sizeof (struct pt_regs ); + + sp = (unsigned long *) ksp; + }unwind_stack (trace, sp, save_stack_address_nosched); + +put_task_stack (tsk); }EXPORT_SYMBOL_GPL (save_stack_trace_tsk);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 156/204 scsi: lpfc: nvmet: Avoid hang / use-after-free again when destroying targetport
In reply to Greg Kroah-HartmanFrom: Ewan D. Milne <[email protected]>
[ Upstream commit af6de8c60fe9433afa73cea6fcccdccd98ad3e5e ]
We cannot wait on a completion object in the lpfc_nvme_targetport structure in the _destroy_targetport() code path because the NVMe/fc transport will free that structure immediately after the .targetport_delete() callback. This results in a use-after-free, and a crash if slub_debug=FZPU is enabled.
An earlier fix put put the completion on the stack, but commit 2a0fb340fcc8 ("scsi: lpfc: Correct localport timeout duration error") subsequently changed the code to reference the completion through a pointer in the object rather than the local stack variable. Fix this by using the stack variable directly.
--- drivers/scsi/lpfc/lpfc_nvmet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_nvmet.c +1 -1
@@ -1914,7 +1914,7 @@ lpfc_nvmet_destroy_targetport(struct lpfc_hba *phba) } tgtp->tport_unreg_cmp = &tport_unreg_cmp;nvmet_fc_unregister_targetport (phba->targetport); -if (!wait_for_completion_timeout (tgtp->tport_unreg_cmp, +if (!wait_for_completion_timeout (&tport_unreg_cmp,msecs_to_jiffies (LPFC_NVMET_WAIT_TMO )))lpfc_printf_log (phba,KERN_ERR ,LOG_NVME , "6179 Unreg targetport x%px timeout "
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 157/204 nfs: nfs_file_write() should check for writeback errors
In reply to Greg Kroah-HartmanFrom: Scott Mayhew <[email protected]>
[ Upstream commit ce368536dd614452407dc31e2449eb84681a06af ]
The NFS_CONTEXT_ERROR_WRITE flag (as well as the check of said flag) was removed by commit 6fbda89b257f. The absence of an error check allows writes to be continually queued up for a server that may no longer be able to handle them. Fix it by adding an error check using the generic error reporting functions.
--- fs/nfs/file.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
fs/nfs/file.c +9 -3
@@ -590,12 +590,14 @@ static const struct vm_operations_struct nfs_file_vm_ops = { .page_mkwrite = nfs_vm_page_mkwrite, }; -static int nfs_need_check_write (struct file *filp,struct inode *inode) +static int nfs_need_check_write (struct file *filp,struct inode *inode, +int error) {struct nfs_open_context *ctx; ctx =nfs_file_open_context (filp); -if (nfs_ctx_key_to_expire (ctx, inode)) +if (nfs_error_is_fatal_on_server (error) || +nfs_ctx_key_to_expire (ctx, inode))return 1 ;return 0 ; }
@@ -606,6 +608,8 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)struct inode *inode =file_inode (file);unsigned long written =0 ;ssize_t result; +errseq_t since; +int error; result =nfs_key_timeout_notify (file, inode);if (result)
@@ -630,6 +634,7 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)if (iocb->ki_pos >i_size_read (inode))nfs_revalidate_mapping (inode, file->f_mapping); + since =filemap_sample_wb_err (file->f_mapping);nfs_start_io_write (inode); result =generic_write_checks (iocb, from);if (result >0 ) {
@@ -648,7 +653,8 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from) goto out;/* Return error values */ -if (nfs_need_check_write (file, inode)) { + error =filemap_check_wb_err (file->f_mapping, since); +if (nfs_need_check_write (file, inode, error)) {int err =nfs_wb_all (inode);if (err <0 ) result = err;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 158/204 watchdog: initialize device before misc_register
In reply to Greg Kroah-HartmanFrom: Krzysztof Sobota <[email protected]>
[ Upstream commit cb36e29bb0e4b0c33c3d5866a0a4aebace4c99b7 ]
When watchdog device is being registered, it calls misc_register that makes watchdog available for systemd to open. This is a data race scenario, because when device is open it may still have device struct not initialized - this in turn causes a crash. This patch moves device initialization before misc_register call and it solves the problem printed below.
------------[ cut here ]------------ WARNING: CPU: 3 PID: 1 at lib/kobject.c:612 kobject_get+0x50/0x54 kobject: '(null)' ((ptrval)): is not initialized, yet kobject_get() is being called. Modules linked in: k2_reset_status(O) davinci_wdt(+) sfn_platform_hwbcn(O) fsmddg_sfn(O) clk_misc_mmap(O) clk_sw_bcn(O) fsp_reset(O) cma_mod(O) slave_sup_notif(O) fpga_master(O) latency(O+) evnotify(O) enable_arm_pmu(O) xge(O) rio_mport_cdev br_netfilter bridge stp llc nvrd_checksum(O) ipv6 CPU: 3 PID: 1 Comm: systemd Tainted: G O 4.19.113-g2579778-fsm4_k2 #1 Hardware name: Keystone [<c02126c4>] (unwind_backtrace) from [<c020da94>] (show_stack+0x18/0x1c) [<c020da94>] (show_stack) from [<c07f87d8>] (dump_stack+0xb4/0xe8) [<c07f87d8>] (dump_stack) from [<c0221f70>] (__warn+0xfc/0x114) [<c0221f70>] (__warn) from [<c0221fd8>] (warn_slowpath_fmt+0x50/0x74) [<c0221fd8>] (warn_slowpath_fmt) from [<c07fd394>] (kobject_get+0x50/0x54) [<c07fd394>] (kobject_get) from [<c0602ce8>] (get_device+0x1c/0x24) [<c0602ce8>] (get_device) from [<c06961e0>] (watchdog_open+0x90/0xf0) [<c06961e0>] (watchdog_open) from [<c06001dc>] (misc_open+0x130/0x17c) [<c06001dc>] (misc_open) from [<c0388228>] (chrdev_open+0xec/0x1a8) [<c0388228>] (chrdev_open) from [<c037fa98>] (do_dentry_open+0x204/0x3cc) [<c037fa98>] (do_dentry_open) from [<c0391e2c>] (path_openat+0x330/0x1148) [<c0391e2c>] (path_openat) from [<c0394518>] (do_filp_open+0x78/0xec) [<c0394518>] (do_filp_open) from [<c0381100>] (do_sys_open+0x130/0x1f4) [<c0381100>] (do_sys_open) from [<c0201000>] (ret_fast_syscall+0x0/0x28) Exception stack(0xd2ceffa8 to 0xd2cefff0) ffa0: b6f69968 00000000 ffffff9c b6ebd210 000a0001 00000000 ffc0: b6f69968 00000000 00000000 00000142 fffffffd ffffffff 00b65530 bed7bb78 ffe0: 00000142 bed7ba70 b6cc2503 b6cc41d6 ---[ end trace 7b16eb105513974f ]--- ------------[ cut here ]------------ WARNING: CPU: 3 PID: 1 at lib/refcount.c:153 kobject_get+0x24/0x54 refcount_t: increment on 0; use-after-free. Modules linked in: k2_reset_status(O) davinci_wdt(+) sfn_platform_hwbcn(O) fsmddg_sfn(O) clk_misc_mmap(O) clk_sw_bcn(O) fsp_reset(O) cma_mod(O) slave_sup_notif(O) fpga_master(O) latency(O+) evnotify(O) enable_arm_pmu(O) xge(O) rio_mport_cdev br_netfilter bridge stp llc nvrd_checksum(O) ipv6 CPU: 3 PID: 1 Comm: systemd Tainted: G W O 4.19.113-g2579778-fsm4_k2 #1 Hardware name: Keystone [<c02126c4>] (unwind_backtrace) from [<c020da94>] (show_stack+0x18/0x1c) [<c020da94>] (show_stack) from [<c07f87d8>] (dump_stack+0xb4/0xe8) [<c07f87d8>] (dump_stack) from [<c0221f70>] (__warn+0xfc/0x114) [<c0221f70>] (__warn) from [<c0221fd8>] (warn_slowpath_fmt+0x50/0x74) [<c0221fd8>] (warn_slowpath_fmt) from [<c07fd368>] (kobject_get+0x24/0x54) [<c07fd368>] (kobject_get) from [<c0602ce8>] (get_device+0x1c/0x24) [<c0602ce8>] (get_device) from [<c06961e0>] (watchdog_open+0x90/0xf0) [<c06961e0>] (watchdog_open) from [<c06001dc>] (misc_open+0x130/0x17c) [<c06001dc>] (misc_open) from [<c0388228>] (chrdev_open+0xec/0x1a8) [<c0388228>] (chrdev_open) from [<c037fa98>] (do_dentry_open+0x204/0x3cc) [<c037fa98>] (do_dentry_open) from [<c0391e2c>] (path_openat+0x330/0x1148) [<c0391e2c>] (path_openat) from [<c0394518>] (do_filp_open+0x78/0xec) [<c0394518>] (do_filp_open) from [<c0381100>] (do_sys_open+0x130/0x1f4) [<c0381100>] (do_sys_open) from [<c0201000>] (ret_fast_syscall+0x0/0x28) Exception stack(0xd2ceffa8 to 0xd2cefff0) ffa0: b6f69968 00000000 ffffff9c b6ebd210 000a0001 00000000 ffc0: b6f69968 00000000 00000000 00000142 fffffffd ffffffff 00b65530 bed7bb78 ffe0: 00000142 bed7ba70 b6cc2503 b6cc41d6 ---[ end trace 7b16eb1055139750 ]---
--- drivers/watchdog/watchdog_dev.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/watchdog/watchdog_dev.c +9 -9
@@ -994,6 +994,15 @@ static int watchdog_cdev_register(struct watchdog_device *wdd)if (IS_ERR_OR_NULL (watchdog_kworker))return -ENODEV ; +device_initialize (&wd_data->dev); + wd_data->dev.devt =MKDEV (MAJOR (watchdog_devt), wdd->id); + wd_data->dev.class = &watchdog_class; + wd_data->dev.parent = wdd->parent; + wd_data->dev.groups = wdd->groups; + wd_data->dev.release = watchdog_core_data_release; +dev_set_drvdata (&wd_data->dev, wdd); +dev_set_name (&wd_data->dev,"watchdog%d" , wdd->id); +kthread_init_work (&wd_data->work, watchdog_ping_work);hrtimer_init (&wd_data->timer,CLOCK_MONOTONIC ,HRTIMER_MODE_REL_HARD ); wd_data->timer.function = watchdog_timer_expired;
@@ -1014,15 +1023,6 @@ static int watchdog_cdev_register(struct watchdog_device *wdd) } } -device_initialize (&wd_data->dev); - wd_data->dev.devt =MKDEV (MAJOR (watchdog_devt), wdd->id); - wd_data->dev.class = &watchdog_class; - wd_data->dev.parent = wdd->parent; - wd_data->dev.groups = wdd->groups; - wd_data->dev.release = watchdog_core_data_release; -dev_set_drvdata (&wd_data->dev, wdd); -dev_set_name (&wd_data->dev,"watchdog%d" , wdd->id); -/* Fill in the data structures */ cdev_init (&wd_data->cdev, &watchdog_fops);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 159/204 watchdog: rti-wdt: balance pm runtime enable calls
In reply to Greg Kroah-HartmanFrom: Tero Kristo <[email protected]>
[ Upstream commit d5b29c2c5ba2bd5bbdb5b744659984185d17d079 ]
PM runtime should be disabled in the fail path of probe and when the driver is removed.
--- drivers/watchdog/rti_wdt.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/watchdog/rti_wdt.c +2 -0
@@ -211,6 +211,7 @@ static int rti_wdt_probe(struct platform_device *pdev) err_iomap:pm_runtime_put_sync (&pdev->dev); +pm_runtime_disable (&pdev->dev);return ret; }
@@ -221,6 +222,7 @@ static int rti_wdt_remove(struct platform_device *pdev)watchdog_unregister_device (&wdt->wdd);pm_runtime_put (&pdev->dev); +pm_runtime_disable (&pdev->dev);return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 160/204 md-cluster: Fix potential error pointer dereference in resize_bitmaps()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit e8abe1de43dac658dacbd04a4543e0c988a8d386 ]
The error handling calls md_bitmap_free(bitmap) which checks for NULL but will Oops if we pass an error pointer. Let's set "bitmap" to NULL on this error path.
--- drivers/md/md-cluster.c | 1 + 1 file changed, 1 insertion(+)
drivers/md/md-cluster.c +1 -0
@@ -1139,6 +1139,7 @@ static int resize_bitmaps(struct mddev *mddev, sector_t newsize, sector_t oldsiz bitmap =get_bitmap_from_slot (mddev, i);if (IS_ERR (bitmap)) {pr_err ("can't get bitmap from slot %d\n" , i); + bitmap =NULL ; goto out; } counts = &bitmap->counts;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 161/204 x86/tsr: Fix tsc frequency enumeration bug on Lightning Mountain SoC
In reply to Greg Kroah-HartmanFrom: Dilip Kota <[email protected]>
[ Upstream commit 7d98585860d845e36ee612832a5ff021f201dbaf ]
Frequency descriptor of Lightning Mountain SoC doesn't have all the frequency entries so resulting in the below failure causing a kernel hang:
Error MSR_FSB_FREQ index 15 is unknown
tsc: Fast TSC calibration failed
So, add all the frequency entries in the Lightning Mountain SoC frequency descriptor.
--- arch/x86/kernel/tsc_msr.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
arch/x86/kernel/tsc_msr.c +7 -2
@@ -133,10 +133,15 @@ static const struct freq_desc freq_desc_ann = { .mask = 0x0f, }; -/* 24 MHz crystal? : 24 * 13 / 4 = 78 MHz */ +/* +* 24 MHz crystal? : 24 * 13 / 4 = 78 MHz +* Frequency step for Lightning Mountain SoC is fixed to 78 MHz, +* so all the frequency entries are 78000. +*/ static const struct freq_desc freq_desc_lgm = { .use_msr_plat = true, - .freqs = {78000 ,78000 ,78000 ,78000 ,78000 ,78000 ,78000 ,78000 }, + .freqs = {78000 ,78000 ,78000 ,78000 ,78000 ,78000 ,78000 ,78000 , +78000 ,78000 ,78000 ,78000 ,78000 ,78000 ,78000 ,78000 }, .mask =0x0f , };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 162/204 x86/bugs/multihit: Fix mitigation reporting when VMX is not in use
In reply to Greg Kroah-HartmanFrom: Pawan Gupta <[email protected]>
[ Upstream commit f29dfa53cc8ae6ad93bae619bcc0bf45cab344f7 ]
On systems that have virtualization disabled or unsupported, sysfs mitigation for X86_BUG_ITLB_MULTIHIT is reported incorrectly as:
$ cat /sys/devices/system/cpu/vulnerabilities/itlb_multihit KVM: Vulnerable
System is not vulnerable to DoS attack from a rogue guest when virtualization is disabled or unsupported in the hardware. Change the mitigation reporting for these cases.
--- Documentation/admin-guide/hw-vuln/multihit.rst | 4 ++++ arch/x86/kernel/cpu/bugs.c | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-)
Documentation/admin-guide/hw-vuln/multihit.rst +4 -0
@@ -80,6 +80,10 @@ The possible values in this file are: - The processor is not vulnerable. * - KVM: Mitigation: Split huge pages - Software changes mitigate this issue. + * - KVM: Mitigation: VMX unsupported + - KVM is not vulnerable because Virtual Machine Extensions (VMX) is not supported. + * - KVM: Mitigation: VMX disabled + - KVM is not vulnerable because Virtual Machine Extensions (VMX) is disabled. * - KVM: Vulnerable - The processor is vulnerable, but no mitigation enabled
arch/x86/kernel/cpu/bugs.c +7 -1
@@ -31,6 +31,7 @@#include <asm/intel-family.h> #include <asm/e820/api.h> #include <asm/hypervisor.h> +#include <asm/tlbflush.h> #include "cpu.h"
@@ -1556,7 +1557,12 @@ static ssize_t l1tf_show_state(char *buf)static ssize_t itlb_multihit_show_state (char *buf) { -if (itlb_multihit_kvm_mitigation) +if (!boot_cpu_has (X86_FEATURE_MSR_IA32_FEAT_CTL ) || + !boot_cpu_has (X86_FEATURE_VMX )) +return sprintf (buf,"KVM: Mitigation: VMX unsupported\n" ); +else if (!(cr4_read_shadow () &X86_CR4_VMXE )) +return sprintf (buf,"KVM: Mitigation: VMX disabled\n" ); +else if (itlb_multihit_kvm_mitigation)return sprintf (buf,"KVM: Mitigation: Split huge pages\n" );else return sprintf (buf,"KVM: Vulnerable\n" );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 163/204 selftests/bpf: Prevent runqslower from racing on building bpftool
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 6bcaf41f9613278cd5897fc80ab93033bda8efaa ]
runqslower's Makefile is building/installing bpftool into $(OUTPUT)/sbin/bpftool, which coincides with $(DEFAULT_BPFTOOL). In practice this means that often when building selftests from scratch (after make clean), selftests are racing with runqslower to simultaneously build bpftool and one of the two processes fail due to file being busy. Prevent this race by explicitly order-depending on $(BPFTOOL_DEFAULT).
--- tools/testing/selftests/bpf/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/Makefile +3 -2
@@ -138,7 +138,9 @@ VMLINUX_BTF_PATHS := $(if $(O),$(O)/vmlinux) \ /boot/vmlinux-$(shell uname -r) VMLINUX_BTF := $(abspath $(firstword $(wildcard $(VMLINUX_BTF_PATHS)))) -$(OUTPUT)/runqslower: $(BPFOBJ) +DEFAULT_BPFTOOL := $(SCRATCH_DIR)/sbin/bpftool + +$(OUTPUT)/runqslower: $(BPFOBJ) | $(DEFAULT_BPFTOOL) $(Q)$(MAKE) $(submake_extras) -C $(TOOLSDIR)/bpf/runqslower \ OUTPUT=$(SCRATCH_DIR)/ VMLINUX_BTF=$(VMLINUX_BTF) \ BPFOBJ=$(BPFOBJ) BPF_INCLUDE=$(INCLUDE_DIR) && \
@@ -160,7 +162,6 @@ $(OUTPUT)/test_netcnt: cgroup_helpers.c $(OUTPUT)/test_sock_fields: cgroup_helpers.c $(OUTPUT)/test_sysctl: cgroup_helpers.c -DEFAULT_BPFTOOL := $(SCRATCH_DIR)/sbin/bpftool BPFTOOL ?= $(DEFAULT_BPFTOOL) $(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \ $(BPFOBJ) | $(BUILD_DIR)/bpftool
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 164/204 Input: sentelic - fix error return when fsp_reg_write fails
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit ea38f06e0291986eb93beb6d61fd413607a30ca4 ]
Currently when the call to fsp_reg_write fails -EIO is not being returned because the count is being returned instead of the return value in retval. Fix this by returning the value in retval instead of count.
Addresses-Coverity: ("Unused value")
--- drivers/input/mouse/sentelic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/mouse/sentelic.c +1 -1
@@ -441,7 +441,7 @@ static ssize_t fsp_attr_set_setreg(struct psmouse *psmouse, void *data,fsp_reg_write_enable (psmouse, false); -return count; +return retval; }PSMOUSE_DEFINE_WO_ATTR (setreg,S_IWUSR ,NULL , fsp_attr_set_setreg);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 165/204 vdpa_sim: init iommu lock
In reply to Greg Kroah-HartmanFrom: Michael S. Tsirkin <[email protected]>
[ Upstream commit 1e3e792650d2c0df8dd796906275b7c79e278664 ]
The patch adding the iommu lock did not initialize it. The struct is zero-initialized so this is mostly a problem when using lockdep.
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 1 + 1 file changed, 1 insertion(+)
drivers/vdpa/vdpa_sim/vdpa_sim.c +1 -0
@@ -330,6 +330,7 @@ static struct vdpasim *vdpasim_create(void)INIT_WORK (&vdpasim->work, vdpasim_work);spin_lock_init (&vdpasim->lock); +spin_lock_init (&vdpasim->iommu_lock); dev = &vdpasim->vdpa.dev; dev->coherent_dma_mask =DMA_BIT_MASK (64 );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 166/204 recordmcount: Fix build failure on non arm64
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit 3df14264ad9930733a8166e5bd0eccc1727564bb ]
Commit ea0eada45632 leads to the following build failure on powerpc:
HOSTCC scripts/recordmcountscripts/recordmcount.c: In function 'arm64_is_fake_mcount':scripts/recordmcount.c:440: error: 'R_AARCH64_CALL26' undeclared (first use in this function) scripts/recordmcount.c:440: error: (Each undeclared identifier is reported only once scripts/recordmcount.c:440: error: for each function it appears in.)
make[2]: *** [scripts/recordmcount] Error 1
Make sure R_AARCH64_CALL26 is always defined.
--- scripts/recordmcount.c | 2 ++ 1 file changed, 2 insertions(+)
scripts/recordmcount.c +2 -0
@@ -42,6 +42,8 @@#define R_ARM_THM_CALL 10#define R_ARM_CALL 28 +#define R_AARCH64_CALL26 283 +static int fd_map;/* File descriptor for file being modified. */ static int mmap_failed;/* Boolean flag. */ static char gpfx;/* prefix for global symbol name (sometimes '_') */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 167/204 vdpa: Fix pointer math bug in vdpasim_get_config()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit cf16fe9243bfa2863491026fc727618c7c593c84 ]
If "offset" is non-zero then we end up copying from beyond the end of the config because of pointer math. We can fix this by casting the struct to a u8 pointer.
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vdpa/vdpa_sim/vdpa_sim.c +1 -1
@@ -521,7 +521,7 @@ static void vdpasim_get_config(struct vdpa_device *vdpa, unsigned int offset,struct vdpasim *vdpasim =vdpa_to_sim (vdpa);if (offset + len <sizeof (struct virtio_net_config )) -memcpy (buf, &vdpasim->config + offset, len); +memcpy (buf, (u8 *)&vdpasim->config + offset, len); } static void vdpasim_set_config(struct vdpa_device *vdpa, unsigned int offset,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 168/204 drm/vmwgfx: Use correct vmw_legacy_display_unit pointer
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 1d2c0c565bc0da25f5e899a862fb58e612b222df ]
The "entry" pointer is an offset from the list head and it doesn't point to a valid vmw_legacy_display_unit struct. Presumably the intent was to point to the last entry.
Also the "i++" wasn't used so I have removed that as well.
--- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +2 -3
@@ -81,7 +81,7 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv)struct vmw_legacy_display_unit *entry;struct drm_framebuffer *fb =NULL ;struct drm_crtc *crtc =NULL ; -int i =0 ; +int i;/* If there is no display topology the host just assumes * that the guest will set the same layout as the host.
@@ -92,12 +92,11 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv) crtc = &entry->base.crtc; w =max (w, crtc->x + crtc->mode.hdisplay); h =max (h, crtc->y + crtc->mode.vdisplay); - i++; }if (crtc ==NULL )return 0 ; - fb = entry->base.crtc.primary->state->fb; + fb = crtc->primary->state->fb; return vmw_kms_write_svga(dev_priv, w, h, fb->pitches[0], fb->format->cpp[0] * 8,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 169/204 drm/vmwgfx: Fix two list_for_each loop exit tests
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 4437c1152ce0e57ab8f401aa696ea6291cc07ab1 ]
These if statements are supposed to be true if we ended the list_for_each_entry() loops without hitting a break statement but they don't work.
In the first loop, we increment "i" after the "if (i == unit)" condition so we don't necessarily know that "i" is not equal to unit at the end of the loop.
In the second loop we exit when mode is not pointing to a valid drm_display_mode struct so it doesn't make sense to check "mode->type".
--- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +4 -4
@@ -2578,7 +2578,7 @@ int vmw_kms_fbdev_init_data(struct vmw_private *dev_priv, ++i; } -if (i != unit) { +if (&con->head == &dev_priv->dev->mode_config.connector_list) {DRM_ERROR ("Could not find initial display unit.\n" ); ret = -EINVAL ; goto out_unlock;
@@ -2602,13 +2602,13 @@ int vmw_kms_fbdev_init_data(struct vmw_private *dev_priv,break ; } -if (mode->type &DRM_MODE_TYPE_PREFERRED ) - *p_mode = mode; -else { +if (&mode->head == &con->modes) {WARN_ONCE (true,"Could not find initial preferred mode.\n" ); *p_mode =list_first_entry (&con->modes, struct drm_display_mode, head); + }else { + *p_mode = mode; } out_unlock:
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 170/204 s390/test_unwind: fix possible memleak in test_unwind()
In reply to Greg Kroah-HartmanFrom: Wang Hai <[email protected]>
[ Upstream commit 75d3e7f4769d276a056efa1cc7f08de571fc9b4b ]
test_unwind() misses to call kfree(bt) in an error path. Add the missed function call to fix it.
--- arch/s390/lib/test_unwind.c | 1 + 1 file changed, 1 insertion(+)
arch/s390/lib/test_unwind.c +1 -0
@@ -63,6 +63,7 @@ static noinline int test_unwind(struct task_struct *task, struct pt_regs *regs,break ;if (state.reliable && !addr) {pr_err ("unwind state reliable but addr is 0\n" ); +kfree (bt);return -EINVAL ; }sprint_symbol (sym, addr);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 171/204 s390/Kconfig: add missing ZCRYPT dependency to VFIO_AP
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 929a343b858612100cb09443a8aaa20d4a4706d3 ]
The VFIO_AP uses ap_driver_register() (and deregister) functions implemented in ap_bus.c (compiled into ap.o). However the ap.o will be built only if CONFIG_ZCRYPT is selected.
This was not visible before commit e93a1695d7fb ("iommu: Enable compile testing for some of drivers") because the CONFIG_VFIO_AP depends on CONFIG_S390_AP_IOMMU which depends on the missing CONFIG_ZCRYPT. After adding COMPILE_TEST, it is possible to select a configuration with VFIO_AP and S390_AP_IOMMU but without the ZCRYPT.
Add proper dependency to the VFIO_AP to fix build errors:
ERROR: modpost: "ap_driver_register" [drivers/s390/crypto/vfio_ap.ko] undefined!
ERROR: modpost: "ap_driver_unregister" [drivers/s390/crypto/vfio_ap.ko] undefined!
--- arch/s390/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/s390/Kconfig +1 -0
@@ -769,6 +769,7 @@ config VFIO_AP def_tristate n prompt "VFIO support for AP devices" depends on S390_AP_IOMMU && VFIO_MDEV_DEVICE && KVM + depends on ZCRYPT help This driver grants access to Adjunct Processor (AP) devices via the VFIO mediated device interface.
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 172/204 net: qcom/emac: add missed clk_disable_unprepare in error path of emac_clks_phase1_init
In reply to Greg Kroah-HartmanFrom: Wang Hai <[email protected]>
[ Upstream commit 50caa777a3a24d7027748e96265728ce748b41ef ]
Fix the missing clk_disable_unprepare() before return from emac_clks_phase1_init() in the error handling case.
--- drivers/net/ethernet/qualcomm/emac/emac.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
drivers/net/ethernet/qualcomm/emac/emac.c +14 -3
@@ -473,13 +473,24 @@ static int emac_clks_phase1_init(struct platform_device *pdev, ret =clk_prepare_enable (adpt->clk[EMAC_CLK_CFG_AHB ]);if (ret) -return ret; + goto disable_clk_axi; ret =clk_set_rate (adpt->clk[EMAC_CLK_HIGH_SPEED ],19200000 );if (ret) -return ret; + goto disable_clk_cfg_ahb; + + ret =clk_prepare_enable (adpt->clk[EMAC_CLK_HIGH_SPEED ]); +if (ret) + goto disable_clk_cfg_ahb; -return clk_prepare_enable (adpt->clk[EMAC_CLK_HIGH_SPEED ]); +return 0 ; + +disable_clk_cfg_ahb: +clk_disable_unprepare (adpt->clk[EMAC_CLK_CFG_AHB ]); +disable_clk_axi: +clk_disable_unprepare (adpt->clk[EMAC_CLK_AXI ]); + +return ret; }/* Enable clocks; needs emac_clks_phase1_init to be called before */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 173/204 nfs: Fix getxattr kernel panic and memory overflow
In reply to Greg Kroah-HartmanFrom: Jeffrey Mitchell <[email protected]>
[ Upstream commit b4487b93545214a9db8cbf32e86411677b0cca21 ]
Move the buffer size check to decode_attr_security_label() before memcpy() Only call memcpy() if the buffer is large enough
--- fs/nfs/nfs4proc.c | 2 -- fs/nfs/nfs4xdr.c | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-)
fs/nfs/nfs4proc.c +0 -2
@@ -5845,8 +5845,6 @@ static int _nfs4_get_security_label(struct inode *inode, void *buf,return ret;if (!(fattr.valid &NFS_ATTR_FATTR_V4_SECURITY_LABEL ))return -ENOENT ; -if (buflen < label.len) -return -ERANGE ;return 0 ; }
fs/nfs/nfs4xdr.c +5 -1
@@ -4166,7 +4166,11 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap,return -EIO ;if (len <NFS4_MAXLABELLEN ) {if (label) { -memcpy (label->label, p, len); +if (label->len) { +if (label->len < len) +return -ERANGE ; +memcpy (label->label, p, len); + } label->len = len; label->pi = pi; label->lfs = lfs;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 174/204 NFS: Fix flexfiles read failover
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit 563c53e73b8b6ec842828736f77e633f7b0911e9 ]
The current mirrored read failover code is correctly resetting the mirror index between failed reads, however it is not able to actually flip the RPC call over to the next RPC client.
The end result is that we keep resending the RPC call to the same client over and over.
The fix is to use the pnfs_read_resend_pnfs() mechanism to schedule a new RPC call, but we need to add the ability to pass in a mirror index so that we always retry the next mirror in the list.
--- fs/nfs/flexfilelayout/flexfilelayout.c | 50 ++++++++++++++++++-------- fs/nfs/pnfs.c | 4 ++- fs/nfs/pnfs.h | 2 +- 3 files changed, 40 insertions(+), 16 deletions(-)
fs/nfs/flexfilelayout/flexfilelayout.c +36 -14
@@ -790,6 +790,19 @@ ff_layout_choose_best_ds_for_read(struct pnfs_layout_segment *lseg,return ff_layout_choose_any_ds_for_read (lseg, start_idx, best_idx); } +static struct nfs4_pnfs_ds * +ff_layout_get_ds_for_read (struct nfs_pageio_descriptor *pgio,int *best_idx) +{ +struct pnfs_layout_segment *lseg = pgio->pg_lseg; +struct nfs4_pnfs_ds *ds; + + ds =ff_layout_choose_best_ds_for_read (lseg, pgio->pg_mirror_idx, + best_idx); +if (ds || !pgio->pg_mirror_idx) +return ds; +return ff_layout_choose_best_ds_for_read (lseg,0 , best_idx); +} + static void ff_layout_pg_get_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *req,
@@ -840,7 +853,7 @@ ff_layout_pg_init_read(struct nfs_pageio_descriptor *pgio, goto out_nolseg; } - ds =ff_layout_choose_best_ds_for_read (pgio->pg_lseg,0 , &ds_idx); + ds =ff_layout_get_ds_for_read (pgio, &ds_idx);if (!ds) {if (!ff_layout_no_fallback_to_mds (pgio->pg_lseg)) goto out_mds;
@@ -1028,11 +1041,24 @@ static void ff_layout_reset_write(struct nfs_pgio_header *hdr, bool retry_pnfs) } } +static void ff_layout_resend_pnfs_read (struct nfs_pgio_header *hdr) +{ +u32 idx = hdr->pgio_mirror_idx +1 ; +int new_idx =0 ; + +if (ff_layout_choose_any_ds_for_read (hdr->lseg, idx +1 , &new_idx)) +ff_layout_send_layouterror (hdr->lseg); +else +pnfs_error_mark_layout_for_return (hdr->inode, hdr->lseg); +pnfs_read_resend_pnfs (hdr, new_idx); +} +static void ff_layout_reset_read (struct nfs_pgio_header *hdr) {struct rpc_task *task = &hdr->task;pnfs_layoutcommit_inode (hdr->inode, false); +pnfs_error_mark_layout_for_return (hdr->inode, hdr->lseg);if (!test_and_set_bit (NFS_IOHDR_REDO , &hdr->flags)) { dprintk("%s Reset task %5u for i/o through MDS "
@@ -1234,6 +1260,12 @@ static void ff_layout_io_track_ds_error(struct pnfs_layout_segment *lseg,break ;case NFS4ERR_NXIO :ff_layout_mark_ds_unreachable (lseg, idx); +/* +* Don't return the layout if this is a read and we still +* have layouts to try +*/ +if (opnum ==OP_READ ) +break ;/* Fallthrough */ default : pnfs_error_mark_layout_for_return(lseg->pls_layout->plh_inode,
@@ -1247,7 +1279,6 @@ static void ff_layout_io_track_ds_error(struct pnfs_layout_segment *lseg,static int ff_layout_read_done_cb (struct rpc_task *task,struct nfs_pgio_header *hdr) { -int new_idx = hdr->pgio_mirror_idx;int err;if (task->tk_status <0 ) {
@@ -1267,10 +1298,6 @@ static int ff_layout_read_done_cb(struct rpc_task *task,clear_bit (NFS_IOHDR_RESEND_MDS , &hdr->flags);switch (err) {case -NFS4ERR_RESET_TO_PNFS : -if (ff_layout_choose_best_ds_for_read (hdr->lseg, - hdr->pgio_mirror_idx +1 , - &new_idx)) - goto out_layouterror;set_bit (NFS_IOHDR_RESEND_PNFS , &hdr->flags);return task->tk_status;case -NFS4ERR_RESET_TO_MDS :
@@ -1281,10 +1308,6 @@ static int ff_layout_read_done_cb(struct rpc_task *task, }return 0 ; -out_layouterror: -ff_layout_read_record_layoutstats_done (task, hdr); -ff_layout_send_layouterror (hdr->lseg); - hdr->pgio_mirror_idx = new_idx; out_eagain:rpc_restart_call_prepare (task);return -EAGAIN ;
@@ -1411,10 +1434,9 @@ static void ff_layout_read_release(void *data)struct nfs_pgio_header *hdr = data;ff_layout_read_record_layoutstats_done (&hdr->task, hdr); -if (test_bit (NFS_IOHDR_RESEND_PNFS , &hdr->flags)) { -ff_layout_send_layouterror (hdr->lseg); -pnfs_read_resend_pnfs (hdr); - }else if (test_bit (NFS_IOHDR_RESEND_MDS , &hdr->flags)) +if (test_bit (NFS_IOHDR_RESEND_PNFS , &hdr->flags)) +ff_layout_resend_pnfs_read (hdr); +else if (test_bit (NFS_IOHDR_RESEND_MDS , &hdr->flags))ff_layout_reset_read (hdr);pnfs_generic_rw_release (data); }
fs/nfs/pnfs.c +3 -1
@@ -2939,7 +2939,8 @@ pnfs_try_to_read_data(struct nfs_pgio_header *hdr, }/* Resend all requests through pnfs. */ -void pnfs_read_resend_pnfs (struct nfs_pgio_header *hdr) +void pnfs_read_resend_pnfs (struct nfs_pgio_header *hdr, +unsigned int mirror_idx) {struct nfs_pageio_descriptor pgio;
@@ -2950,6 +2951,7 @@ void pnfs_read_resend_pnfs(struct nfs_pgio_header *hdr)nfs_pageio_init_read (&pgio, hdr->inode, false, hdr->completion_ops); + pgio.pg_mirror_idx = mirror_idx; hdr->task.tk_status =nfs_pageio_resend (&pgio, hdr); } }
fs/nfs/pnfs.h +1 -1
@@ -311,7 +311,7 @@ int _pnfs_return_layout(struct inode *);int pnfs_commit_and_return_layout (struct inode *);void pnfs_ld_write_done (struct nfs_pgio_header *);void pnfs_ld_read_done (struct nfs_pgio_header *); -void pnfs_read_resend_pnfs (struct nfs_pgio_header *); +void pnfs_read_resend_pnfs (struct nfs_pgio_header *,unsigned int mirror_idx); struct pnfs_layout_segment *pnfs_update_layout(struct inode *ino, struct nfs_open_context *ctx, loff_t pos,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 175/204 lib/test_lockup.c: fix return value of test_lockup_init()
In reply to Greg Kroah-HartmanFrom: Tiezhu Yang <[email protected]>
[ Upstream commit 3adf3bae0d612357da516d39e1584f1547eb6e86 ]
Since filp_open() returns an error pointer, we should use IS_ERR() to check the return value and then return PTR_ERR() if failed to get the actual return value instead of always -EINVAL.
E.g. without this patch:
[root@localhost loongson]# ls no_such_file
ls: cannot access no_such_file: No such file or directory
[root@localhost loongson]# modprobe test_lockup file_path=no_such_file lock_sb_umount time_secs=60 state=S
modprobe: ERROR: could not insert 'test_lockup': Invalid argument
[root@localhost loongson]# dmesg | tail -1
[ 126.100596] test_lockup: cannot find file_path
With this patch:
[root@localhost loongson]# ls no_such_file
ls: cannot access no_such_file: No such file or directory
[root@localhost loongson]# modprobe test_lockup file_path=no_such_file lock_sb_umount time_secs=60 state=S
modprobe: ERROR: could not insert 'test_lockup': Unknown symbol in module, or unknown parameter (see dmesg) [root@localhost loongson]# dmesg | tail -1
[ 95.134362] test_lockup: failed to open no_such_file: -2
--- lib/test_lockup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/test_lockup.c +2 -2
@@ -512,8 +512,8 @@ static int __init test_lockup_init(void)if (test_file_path[0 ]) { test_file =filp_open (test_file_path,O_RDONLY ,0 );if (IS_ERR (test_file)) { -pr_err ("cannot find file_path\n" ); -return -EINVAL ; +pr_err ("failed to open %s: %ld\n" , test_file_path,PTR_ERR (test_file)); +return PTR_ERR (test_file); } test_inode =file_inode (test_file); } else if (test_lock_inode ||
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 176/204 fs/minix: set s_maxbytes correctly
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
[ Upstream commit 32ac86efff91a3e4ef8c3d1cadd4559e23c8e73a ]
The minix filesystem leaves super_block::s_maxbytes at MAX_NON_LFS rather than setting it to the actual filesystem-specific limit. This is broken because it means userspace doesn't see the standard behavior like getting EFBIG and SIGXFSZ when exceeding the maximum file size.
Fix this by setting s_maxbytes correctly.
--- fs/minix/inode.c | 12 +++++++----- fs/minix/itree_v1.c | 2 +- fs/minix/itree_v2.c | 3 +-- fs/minix/minix.h | 1 - 4 files changed, 9 insertions(+), 9 deletions(-)
fs/minix/inode.c +7 -5
@@ -150,8 +150,10 @@ static int minix_remount (struct super_block * sb, int * flags, char * data)return 0 ; } -static bool minix_check_superblock (struct minix_sb_info *sbi) +static bool minix_check_superblock (struct super_block *sb) { +struct minix_sb_info *sbi =minix_sb (sb); +if (sbi->s_imap_blocks ==0 || sbi->s_zmap_blocks ==0 )return false;
@@ -161,7 +163,7 @@ static bool minix_check_superblock(struct minix_sb_info *sbi)* of indirect blocks which places the limit well above U32_MAX. */ if (sbi->s_version ==MINIX_V1 && - sbi->s_max_size > (7 +512 +512 *512 ) *BLOCK_SIZE ) + sb->s_maxbytes > (7 +512 +512 *512 ) *BLOCK_SIZE )return false;return true;
@@ -202,7 +204,7 @@ static int minix_fill_super(struct super_block *s, void *data, int silent) sbi->s_zmap_blocks = ms->s_zmap_blocks; sbi->s_firstdatazone = ms->s_firstdatazone; sbi->s_log_zone_size = ms->s_log_zone_size; - sbi->s_max_size = ms->s_max_size; + s->s_maxbytes = ms->s_max_size; s->s_magic = ms->s_magic;if (s->s_magic ==MINIX_SUPER_MAGIC ) { sbi->s_version =MINIX_V1 ;
@@ -233,7 +235,7 @@ static int minix_fill_super(struct super_block *s, void *data, int silent) sbi->s_zmap_blocks = m3s->s_zmap_blocks; sbi->s_firstdatazone = m3s->s_firstdatazone; sbi->s_log_zone_size = m3s->s_log_zone_size; - sbi->s_max_size = m3s->s_max_size; + s->s_maxbytes = m3s->s_max_size; sbi->s_ninodes = m3s->s_ninodes; sbi->s_nzones = m3s->s_zones; sbi->s_dirsize =64 ;
@@ -245,7 +247,7 @@ static int minix_fill_super(struct super_block *s, void *data, int silent) }else goto out_no_fs; -if (!minix_check_superblock (sbi)) +if (!minix_check_superblock (s)) goto out_illegal_sb;/*
fs/minix/itree_v1.c +1 -1
@@ -29,7 +29,7 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH])if (block <0 ) {printk ("MINIX-fs: block_to_path: block %ld < 0 on dev %pg\n" , block, inode->i_sb->s_bdev); - }else if (block >= (minix_sb (inode->i_sb)->s_max_size/BLOCK_SIZE )) { + }else if (block >= inode->i_sb->s_maxbytes/BLOCK_SIZE ) {if (printk_ratelimit ()) printk("MINIX-fs: block_to_path: " "block %ld too big on dev %pg\n",
fs/minix/itree_v2.c +1 -2
@@ -32,8 +32,7 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH])if (block <0 ) {printk ("MINIX-fs: block_to_path: block %ld < 0 on dev %pg\n" , block, sb->s_bdev); - }else if ((u64 )block * (u64 )sb->s_blocksize >= -minix_sb (sb)->s_max_size) { + }else if ((u64 )block * (u64 )sb->s_blocksize >= sb->s_maxbytes) {if (printk_ratelimit ()) printk("MINIX-fs: block_to_path: " "block %ld too big on dev %pg\n",
fs/minix/minix.h +0 -1
@@ -32,7 +32,6 @@ struct minix_sb_info {unsigned long s_zmap_blocks;unsigned long s_firstdatazone;unsigned long s_log_zone_size; -unsigned long s_max_size;int s_dirsize;int s_namelen;struct buffer_head ** s_imap;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 177/204 fs/minix: fix block limit check for V1 filesystems
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
[ Upstream commit 0a12c4a8069607247cb8edc3b035a664e636fd9a ]
The minix filesystem reads its maximum file size from its on-disk superblock. This value isn't necessarily a multiple of the block size. When it's not, the V1 block mapping code doesn't allow mapping the last possible block. Commit 6ed6a722f9ab ("minixfs: fix block limit check") fixed this in the V2 mapping code. Fix it in the V1 mapping code too.
--- fs/minix/itree_v1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/minix/itree_v1.c +1 -1
@@ -29,7 +29,7 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH])if (block <0 ) {printk ("MINIX-fs: block_to_path: block %ld < 0 on dev %pg\n" , block, inode->i_sb->s_bdev); - }else if (block >= inode->i_sb->s_maxbytes/BLOCK_SIZE ) { + }else if ((u64 )block *BLOCK_SIZE >= inode->i_sb->s_maxbytes) {if (printk_ratelimit ()) printk("MINIX-fs: block_to_path: " "block %ld too big on dev %pg\n",
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 178/204 fs/minix: remove expected error message in block_to_path()
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
[ Upstream commit f666f9fb9a36f1c833b9d18923572f0e4d304754 ]
When truncating a file to a size within the last allowed logical block, block_to_path() is called with the *next* block. This exceeds the limit, causing the "block %ld too big" error message to be printed.
This case isn't actually an error; there are just no more blocks past that point. So, remove this error message.
--- fs/minix/itree_v1.c | 12 ++++++------ fs/minix/itree_v2.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-)
fs/minix/itree_v1.c +6 -6
@@ -29,12 +29,12 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH])if (block <0 ) {printk ("MINIX-fs: block_to_path: block %ld < 0 on dev %pg\n" , block, inode->i_sb->s_bdev); - }else if ((u64 )block *BLOCK_SIZE >= inode->i_sb->s_maxbytes) { -if (printk_ratelimit ()) -printk ("MINIX-fs: block_to_path: " -"block %ld too big on dev %pg\n" , - block, inode->i_sb->s_bdev); - }else if (block <7 ) { +return 0 ; + } +if ((u64 )block *BLOCK_SIZE >= inode->i_sb->s_maxbytes) +return 0 ; + +if (block <7 ) { offsets[n++] = block; }else if ((block -=7 ) <512 ) { offsets[n++] =7 ;
fs/minix/itree_v2.c +6 -6
@@ -32,12 +32,12 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH])if (block <0 ) {printk ("MINIX-fs: block_to_path: block %ld < 0 on dev %pg\n" , block, sb->s_bdev); - }else if ((u64 )block * (u64 )sb->s_blocksize >= sb->s_maxbytes) { -if (printk_ratelimit ()) -printk ("MINIX-fs: block_to_path: " -"block %ld too big on dev %pg\n" , - block, sb->s_bdev); - }else if (block <DIRCOUNT ) { +return 0 ; + } +if ((u64 )block * (u64 )sb->s_blocksize >= sb->s_maxbytes) +return 0 ; + +if (block <DIRCOUNT ) { offsets[n++] = block; }else if ((block -=DIRCOUNT ) <INDIRCOUNT (sb)) { offsets[n++] =DIRCOUNT ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 179/204 fs/ufs: avoid potential u32 multiplication overflow
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 88b2e9b06381551b707d980627ad0591191f7a2d ]
The 64 bit ino is being compared to the product of two u32 values, however, the multiplication is being performed using a 32 bit multiply so there is a potential of an overflow. To be fully safe, cast uspi->s_ncg to a u64 to ensure a 64 bit multiplication occurs to avoid any chance of overflow.
Addresses-Coverity: ("Unintentional integer overflow")
--- fs/ufs/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ufs/super.c +1 -1
@@ -101,7 +101,7 @@ static struct inode *ufs_nfs_get_inode(struct super_block *sb, u64 ino, u32 genestruct ufs_sb_private_info *uspi =UFS_SB (sb)->s_uspi;struct inode *inode; -if (ino <UFS_ROOTINO || ino > uspi->s_ncg * uspi->s_ipg) +if (ino <UFS_ROOTINO || ino > (u64 )uspi->s_ncg * uspi->s_ipg)return ERR_PTR (-ESTALE ); inode =ufs_iget (sb, ino);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 180/204 test_kmod: avoid potential double free in trigger_config_run_type()
In reply to Greg Kroah-HartmanFrom: Tiezhu Yang <[email protected]>
[ Upstream commit 0776d1231bec0c7ab43baf440a3f5ef5f49dd795 ]
Reset the member "test_fs" of the test configuration after a call of the function "kfree_const" to a null pointer so that a double memory release will not be performed.
--- lib/test_kmod.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/test_kmod.c +1 -1
@@ -745,7 +745,7 @@ static int trigger_config_run_type(struct kmod_test_device *test_dev,break ;case TEST_KMOD_FS_TYPE :kfree_const (config->test_fs); - config->test_driver =NULL ; + config->test_fs =NULL ; copied =config_copy_test_fs (config, test_str,strlen (test_str));break ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 181/204 i2c: iproc: fix race between client unreg and isr
In reply to Greg Kroah-HartmanFrom: Dhananjay Phadke <[email protected]>
[ Upstream commit b1eef236f50ba6afea680da039ef3a2ca9c43d11 ]
When i2c client unregisters, synchronize irq before setting iproc_i2c->slave to NULL.
(1) disable_irq()
(2) Mask event enable bits in control reg
(3) Erase slave address (avoid further writes to rx fifo)
(4) Flush tx and rx FIFOs
(5) Clear pending event (interrupt) bits in status reg
(6) enable_irq()
(7) Set client pointer to NULL
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000318
[ 371.020421] pc : bcm_iproc_i2c_isr+0x530/0x11f0 [ 371.025098] lr : __handle_irq_event_percpu+0x6c/0x170 [ 371.030309] sp : ffff800010003e40 [ 371.033727] x29: ffff800010003e40 x28: 0000000000000060 [ 371.039206] x27: ffff800010ca9de0 x26: ffff800010f895df [ 371.044686] x25: ffff800010f18888 x24: ffff0008f7ff3600 [ 371.050165] x23: 0000000000000003 x22: 0000000001600000 [ 371.055645] x21: ffff800010f18888 x20: 0000000001600000 [ 371.061124] x19: ffff0008f726f080 x18: 0000000000000000 [ 371.066603] x17: 0000000000000000 x16: 0000000000000000 [ 371.072082] x15: 0000000000000000 x14: 0000000000000000 [ 371.077561] x13: 0000000000000000 x12: 0000000000000001 [ 371.083040] x11: 0000000000000000 x10: 0000000000000040 [ 371.088519] x9 : ffff800010f317c8 x8 : ffff800010f317c0 [ 371.093999] x7 : ffff0008f805b3b0 x6 : 0000000000000000 [ 371.099478] x5 : ffff0008f7ff36a4 x4 : ffff8008ee43d000 [ 371.104957] x3 : 0000000000000000 x2 : ffff8000107d64c0 [ 371.110436] x1 : 00000000c00000af x0 : 0000000000000000
[ 371.115916] Call trace: [ 371.118439] bcm_iproc_i2c_isr+0x530/0x11f0 [ 371.122754] __handle_irq_event_percpu+0x6c/0x170 [ 371.127606] handle_irq_event_percpu+0x34/0x88 [ 371.132189] handle_irq_event+0x40/0x120 [ 371.136234] handle_fasteoi_irq+0xcc/0x1a0 [ 371.140459] generic_handle_irq+0x24/0x38 [ 371.144594] __handle_domain_irq+0x60/0xb8 [ 371.148820] gic_handle_irq+0xc0/0x158 [ 371.152687] el1_irq+0xb8/0x140 [ 371.155927] arch_cpu_idle+0x10/0x18 [ 371.159615] do_idle+0x204/0x290 [ 371.162943] cpu_startup_entry+0x24/0x60 [ 371.166990] rest_init+0xb0/0xbc [ 371.170322] arch_call_rest_init+0xc/0x14 [ 371.174458] start_kernel+0x404/0x430
--- drivers/i2c/busses/i2c-bcm-iproc.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-bcm-iproc.c +12 -1
@@ -1074,7 +1074,7 @@ static int bcm_iproc_i2c_unreg_slave(struct i2c_client *slave)if (!iproc_i2c->slave)return -EINVAL ; - iproc_i2c->slave =NULL ; +disable_irq (iproc_i2c->irq);/* disable all slave interrupts */ tmp =iproc_i2c_rd_reg (iproc_i2c,IE_OFFSET );
@@ -1087,6 +1087,17 @@ static int bcm_iproc_i2c_unreg_slave(struct i2c_client *slave) tmp &= ~BIT (S_CFG_EN_NIC_SMB_ADDR3_SHIFT );iproc_i2c_wr_reg (iproc_i2c,S_CFG_SMBUS_ADDR_OFFSET , tmp); +/* flush TX/RX FIFOs */ + tmp = (BIT (S_FIFO_RX_FLUSH_SHIFT ) |BIT (S_FIFO_TX_FLUSH_SHIFT )); +iproc_i2c_wr_reg (iproc_i2c,S_FIFO_CTRL_OFFSET , tmp); + +/* clear all pending slave interrupts */ +iproc_i2c_wr_reg (iproc_i2c,IS_OFFSET ,ISR_MASK_SLAVE ); + + iproc_i2c->slave =NULL ; + +enable_irq (iproc_i2c->irq); +return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 182/204 mfd: dln2: Run event handler loop under spinlock
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 3d858942250820b9adc35f963a257481d6d4c81d ]
The event handler loop must be run with interrupts disabled. Otherwise we will have a warning:
[ 1970.785649] irq 31 handler lineevent_irq_handler+0x0/0x20 enabled interrupts [ 1970.792739] WARNING: CPU: 0 PID: 0 at kernel/irq/handle.c:159 __handle_irq_event_percpu+0x162/0x170 [ 1970.860732] RIP: 0010:__handle_irq_event_percpu+0x162/0x170 ... [ 1970.946994] Call Trace: [ 1970.949446] <IRQ> [ 1970.951471] handle_irq_event_percpu+0x2c/0x80 [ 1970.955921] handle_irq_event+0x23/0x43 [ 1970.959766] handle_simple_irq+0x57/0x70 [ 1970.963695] generic_handle_irq+0x42/0x50 [ 1970.967717] dln2_rx+0xc1/0x210 [dln2] [ 1970.971479] ? usb_hcd_unmap_urb_for_dma+0xa6/0x1c0 [ 1970.976362] __usb_hcd_giveback_urb+0x77/0xe0 [ 1970.980727] usb_giveback_urb_bh+0x8e/0xe0 [ 1970.984837] tasklet_action_common.isra.0+0x4a/0xe0
...
Recently xHCI driver switched to tasklets in the commit 36dc01657b49 ("usb: host: xhci: Support running urb giveback in tasklet context").
The handle_irq_event_* functions are expected to be called with interrupts disabled and they rightfully complain here because we run in tasklet context with interrupts enabled.
Use a event spinlock to protect event handler from being interrupted.
Note, that there are only two users of this GPIO and ADC drivers and both of them are using generic_handle_irq() which makes above happen.
--- drivers/mfd/dln2.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/mfd/dln2.c +4 -0
@@ -287,7 +287,11 @@ static void dln2_rx(struct urb *urb) len = urb->actual_length -sizeof (struct dln2_header );if (handle ==DLN2_HANDLE_EVENT ) { +unsigned long flags; + +spin_lock_irqsave (&dln2->event_cb_lock, flags);dln2_run_event_callbacks (dln2, id, echo, data, len); +spin_unlock_irqrestore (&dln2->event_cb_lock, flags); }else {/* URB will be re-submitted in _dln2_transfer (free_rx_slot) */ if (dln2_transfer_complete (dln2, urb, handle, echo))
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 183/204 crypto: algif_aead - fix uninitialized ctx->init
In reply to Greg Kroah-HartmanFrom: Ondrej Mosnacek <[email protected]>
[ Upstream commit 21dfbcd1f5cbff9cf2f9e7e43475aed8d072b0dd ]
In skcipher_accept_parent_nokey() the whole af_alg_ctx structure is cleared by memset() after allocation, so add such memset() also to aead_accept_parent_nokey() so that the new "init" field is also initialized to zero. Without that the initial ctx->init checks might randomly return true and cause errors.
While there, also remove the redundant zero assignments in both functions.
Found via libkcapi testsuite.
--- crypto/algif_aead.c | 6 ------ crypto/algif_skcipher.c | 7 +------ 2 files changed, 1 insertion(+), 12 deletions(-)
crypto/algif_aead.c +0 -6
@@ -558,12 +558,6 @@ static int aead_accept_parent_nokey(void *private, struct sock *sk)INIT_LIST_HEAD (&ctx->tsgl_list); ctx->len = len; - ctx->used =0 ; -atomic_set (&ctx->rcvused,0 ); - ctx->more =0 ; - ctx->merge =0 ; - ctx->enc =0 ; - ctx->aead_assoclen =0 ;crypto_init_wait (&ctx->wait); ask->private = ctx;
crypto/algif_skcipher.c +1 -6
@@ -333,6 +333,7 @@ static int skcipher_accept_parent_nokey(void *private, struct sock *sk) ctx =sock_kmalloc (sk, len,GFP_KERNEL );if (!ctx)return -ENOMEM ; +memset (ctx,0 , len); ctx->iv =sock_kmalloc (sk,crypto_skcipher_ivsize (tfm),GFP_KERNEL );
@@ -340,16 +341,10 @@ static int skcipher_accept_parent_nokey(void *private, struct sock *sk)sock_kfree_s (sk, ctx, len);return -ENOMEM ; } -memset (ctx->iv,0 ,crypto_skcipher_ivsize (tfm));INIT_LIST_HEAD (&ctx->tsgl_list); ctx->len = len; - ctx->used =0 ; -atomic_set (&ctx->rcvused,0 ); - ctx->more =0 ; - ctx->merge =0 ; - ctx->enc =0 ;crypto_init_wait (&ctx->wait); ask->private = ctx;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 184/204 ALSA: echoaudio: Fix potential Oops in snd_echo_resume()
In reply to Greg Kroah-HartmanFrom: Dinghao Liu <[email protected]>
[ Upstream commit 5a25de6df789cc805a9b8ba7ab5deef5067af47e ]
Freeing chip on error may lead to an Oops at the next time the system goes to resume. Fix this by removing all snd_echo_free() calls on error.
--- sound/pci/echoaudio/echoaudio.c | 2 -- 1 file changed, 2 deletions(-)
sound/pci/echoaudio/echoaudio.c +0 -2
@@ -2158,7 +2158,6 @@ static int snd_echo_resume(struct device *dev)if (err <0 ) {kfree (commpage_bak);dev_err (dev,"resume init_hw err=%d\n" , err); -snd_echo_free (chip);return err; }
@@ -2185,7 +2184,6 @@ static int snd_echo_resume(struct device *dev)if (request_irq (pci->irq, snd_echo_interrupt,IRQF_SHARED ,KBUILD_MODNAME , chip)) {dev_err (chip->card->dev,"cannot grab irq\n" ); -snd_echo_free (chip);return -EBUSY ; } chip->irq = pci->irq;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 185/204 perf bench mem: Always memset source before memcpy
In reply to Greg Kroah-HartmanFrom: Vincent Whitchurch <[email protected]>
[ Upstream commit 1beaef29c34154ccdcb3f1ae557f6883eda18840 ]
For memcpy, the source pages are memset to zero only when --cycles is used. This leads to wildly different results with or without --cycles, since all sources pages are likely to be mapped to the same zero page without explicit writes.
Before this fix:
$ export cmd="./perf stat -e LLC-loads -- ./perf bench \ mem memcpy -s 1024MB -l 100 -f default" $ $cmd
2,935,826 LLC-loads
3.821677452 seconds time elapsed$ $cmd --cycles
217,533,436 LLC-loads
8.616725985 seconds time elapsedAfter this fix:
$ $cmd
214,459,686 LLC-loads
8.674301124 seconds time elapsed$ $cmd --cycles
214,758,651 LLC-loads
8.644480006 seconds time elapsed--- tools/perf/bench/mem-functions.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
tools/perf/bench/mem-functions.c +11 -10
@@ -223,12 +223,8 @@ static int bench_mem_common(int argc, const char **argv, struct bench_mem_info *return 0 ; } -static u64 do_memcpy_cycles (const struct function *r,size_t size,void *src,void *dst) +static void memcpy_prefault (memcpy_t fn,size_t size,void *src,void *dst) { -u64 cycle_start =0ULL , cycle_end =0ULL ; -memcpy_t fn = r->fn.memcpy; -int i; -/* Make sure to always prefault zero pages even if MMAP_THRESH is crossed: */ memset (src,0 , size);
@@ -237,6 +233,15 @@ static u64 do_memcpy_cycles(const struct function *r, size_t size, void *src, vo* to not measure page fault overhead: */ fn (dst, src, size); +} + +static u64 do_memcpy_cycles (const struct function *r,size_t size,void *src,void *dst) +{ +u64 cycle_start =0ULL , cycle_end =0ULL ; +memcpy_t fn = r->fn.memcpy; +int i; + +memcpy_prefault (fn, size, src, dst); cycle_start =get_cycles ();for (i =0 ; i < nr_loops; ++i)
@@ -252,11 +257,7 @@ static double do_memcpy_gettimeofday(const struct function *r, size_t size, voidmemcpy_t fn = r->fn.memcpy;int i; -/* -* We prefault the freshly allocated memory range here, -* to not measure page fault overhead: -*/ -fn (dst, src, size); +memcpy_prefault (fn, size, src, dst);BUG_ON (gettimeofday (&tv_start,NULL ));for (i =0 ; i < nr_loops; ++i)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 186/204 tools build feature: Quote CC and CXX for their arguments
In reply to Greg Kroah-HartmanFrom: Daniel Díaz <[email protected]>
[ Upstream commit fa5c893181ed2ca2f96552f50073786d2cfce6c0 ]
When using a cross-compilation environment, such as OpenEmbedded, the CC an CXX variables are set to something more than just a
command: there are arguments (such as --sysroot) that need to be passed on to the compiler so that the right set of headers and libraries are used.
For the particular case that our systems detected, CC is set to the following:
export CC="aarch64-linaro-linux-gcc --sysroot=/oe/build/tmp/work/machine/perf/1.0-r9/recipe-sysroot"
Without quotes, detection is as follows:
Auto-detecting system features:
... dwarf: [ OFF ]
... dwarf_getlocations: [ OFF ]
... glibc: [ OFF ]
... gtk2: [ OFF ]
... libbfd: [ OFF ] ... libcap: [ OFF ] ... libelf: [ OFF ] ... libnuma: [ OFF ] ... numa_num_possible_cpus: [ OFF ] ... libperl: [ OFF ] ... libpython: [ OFF ] ... libcrypto: [ OFF ] ... libunwind: [ OFF ]
... libdw-dwarf-unwind: [ OFF ]
... zlib: [ OFF ]
... lzma: [ OFF ]
... get_cpuid: [ OFF ]
... bpf: [ OFF ]
... libaio: [ OFF ]
... libzstd: [ OFF ]
... disassembler-four-args: [ OFF ]
Makefile.config:414: *** No gnu/libc-version.h found, please install glibc-dev[el]. Stop. Makefile.perf:230: recipe for target 'sub-make' failed
make[1]: *** [sub-make] Error 2
Makefile:69: recipe for target 'all' failed
make: *** [all] Error 2
With CC and CXX quoted, some of those features are now detected.
--- tools/build/Makefile.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/build/Makefile.feature +1 -1
@@ -8,7 +8,7 @@ endif feature_check = $(eval $(feature_check_code)) define feature_check_code - feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CC=$(CC) CXX=$(CXX) CFLAGS="$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" CXXFLAGS="$(EXTRA_CXXFLAGS) $(FEATURE_CHECK_CXXFLAGS-$(1))" LDFLAGS="$(LDFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" -C $(feature_dir) $(OUTPUT_FEATURES)test-$1.bin >/dev/null 2>/dev/null && echo 1 || echo 0) + feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" CXXFLAGS="$(EXTRA_CXXFLAGS) $(FEATURE_CHECK_CXXFLAGS-$(1))" LDFLAGS="$(LDFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" -C $(feature_dir) $(OUTPUT_FEATURES)test-$1.bin >/dev/null 2>/dev/null && echo 1 || echo 0) endef feature_set = $(eval $(feature_set_code))
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 187/204 perf/x86/rapl: Fix missing psys sysfs attributes
In reply to Greg Kroah-HartmanFrom: Zhang Rui <[email protected]>
[ Upstream commit 4bb5fcb97a5df0bbc0a27e0252b1e7ce140a8431 ]
This fixes a problem introduced by commit:
5fb5273a905c ("perf/x86/rapl: Use new MSR detection interface")
that perf event sysfs attributes for psys RAPL domain are missing.
--- arch/x86/events/rapl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/rapl.c +1 -1
@@ -642,7 +642,7 @@ static const struct attribute_group *rapl_attr_update[] = { &rapl_events_pkg_group, &rapl_events_ram_group, &rapl_events_gpu_group, - &rapl_events_gpu_group, + &rapl_events_psys_group, NULL, };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 188/204 sh: landisk: Add missing initialization of sh_io_port_base
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 0c64a0dce51faa9c706fdf1f957d6f19878f4b81 ]
The Landisk setup code maps the CF IDE area using ioremap_prot(), and passes the resulting virtual addresses to the pata_platform driver, disguising them as I/O port addresses. Hence the pata_platform driver translates them again using ioport_map().
As CONFIG_GENERIC_IOMAP=n, and CONFIG_HAS_IOPORT_MAP=y, the SuperH-specific mapping code in arch/sh/kernel/ioport.c translates I/O port addresses to virtual addresses by adding sh_io_port_base, which defaults to -1, thus breaking the assumption of an identity mapping.
Fix this by setting sh_io_port_base to zero.
--- arch/sh/boards/mach-landisk/setup.c | 3 +++ 1 file changed, 3 insertions(+)
arch/sh/boards/mach-landisk/setup.c +3 -0
@@ -82,6 +82,9 @@ device_initcall(landisk_devices_setup);static void __init landisk_setup (char **cmdline_p) { +/* I/O port identity mapping */ +__set_io_port_base (0 ); +/* LED ON */ __raw_writeb (__raw_readb (PA_LED ) |0x03 ,PA_LED );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 189/204 khugepaged: retract_page_tables() remember to test exit
In reply to Greg Kroah-HartmanFrom: Hugh Dickins <[email protected]>
commit 18e77600f7a1ed69f8ce46c9e11cad0985712dfa upstream.
Only once have I seen this scenario (and forgot even to notice what forced the eventual crash): a sequence of "BUG: Bad page map" alerts from vm_normal_page(), from zap_pte_range() servicing exit_mmap(); pmd:00000000, pte values corresponding to data in physical page 0.
The pte mappings being zapped in this case were supposed to be from a huge page of ext4 text (but could as well have been shmem): my belief is that it was racing with collapse_file()'s retract_page_tables(), found *pmd pointing to a page table, locked it, but *pmd had become 0 by the time start_pte was decided.
In most cases, that possibility is excluded by holding mmap lock; but exit_mmap() proceeds without mmap lock. Most of what's run by khugepaged checks khugepaged_test_exit() after acquiring mmap lock:khugepaged_collapse_pte_mapped_thps() and hugepage_vma_revalidate() do so, for example. But retract_page_tables() did not: fix that.
The fix is for retract_page_tables() to check khugepaged_test_exit(), after acquiring mmap lock, before doing anything to the page table. Getting the mmap lock serializes with __mmput(), which briefly takes and drops it in __khugepaged_exit(); then the khugepaged_test_exit() check on mm_users makes sure we don't touch the page table once exit_mmap() might reach it, since exit_mmap() will be proceeding without mmap lock, not expecting anyone to be racing with it.
--- mm/khugepaged.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
mm/khugepaged.c +14 -10
@@ -1433,6 +1433,7 @@ out:static void retract_page_tables (struct address_space *mapping,pgoff_t pgoff) {struct vm_area_struct *vma; +struct mm_struct *mm;unsigned long addr;pmd_t *pmd, _pmd;
@@ -1461,7 +1462,8 @@ static void retract_page_tables(struct acontinue ;if (vma->vm_end < addr +HPAGE_PMD_SIZE )continue ; - pmd =mm_find_pmd (vma->vm_mm, addr); + mm = vma->vm_mm; + pmd =mm_find_pmd (mm, addr);if (!pmd)continue ;/*
@@ -1471,17 +1473,19 @@ static void retract_page_tables(struct a* mmap_sem while holding page lock. Fault path does it in * reverse order. Trylock is a way to avoid deadlock. */ -if (down_write_trylock (&vma->vm_mm->mmap_sem)) { -spinlock_t *ptl =pmd_lock (vma->vm_mm, pmd); -/* assume page table is clear */ - _pmd =pmdp_collapse_flush (vma, addr, pmd); -spin_unlock (ptl); -up_write (&vma->vm_mm->mmap_sem); -mm_dec_nr_ptes (vma->vm_mm); -pte_free (vma->vm_mm,pmd_pgtable (_pmd)); +if (down_write_trylock (&mm->mmap_sem)) { +if (!khugepaged_test_exit (mm)) { +spinlock_t *ptl =pmd_lock (mm, pmd); +/* assume page table is clear */ + _pmd =pmdp_collapse_flush (vma, addr, pmd); +spin_unlock (ptl); +mm_dec_nr_ptes (mm); +pte_free (mm,pmd_pgtable (_pmd)); + } +up_write (&mm->mmap_sem); }else {/* Try again later */ -khugepaged_add_pte_mapped_thp (vma->vm_mm, addr); +khugepaged_add_pte_mapped_thp (mm, addr); } }i_mmap_unlock_write (mapping);
Greg Kroah-Hartman
maintainerPATCH 190/204 ASoC: tegra: Use device managed resource APIs to get the clock
In reply to Greg Kroah-HartmanFrom: Sowjanya Komatineni <[email protected]>
commit 0de6db30ef79b391cedd749801a49c485d2daf4b upstream.
tegra_asoc_utils uses clk_get() to get the clock and clk_put() to free them explicitly.
This patch updates it to use device managed resource API devm_clk_get() so the clock will be automatically released and freed when the device is unbound and removes tegra_asoc_utils_fini() as its no longer needed.
--- sound/soc/tegra/tegra_alc5632.c | 7 +------ sound/soc/tegra/tegra_asoc_utils.c | 34 +++++++--------------------------- sound/soc/tegra/tegra_asoc_utils.h | 1 - sound/soc/tegra/tegra_max98090.c | 22 ++++++---------------- sound/soc/tegra/tegra_rt5640.c | 22 ++++++---------------- sound/soc/tegra/tegra_rt5677.c | 7 +------ sound/soc/tegra/tegra_sgtl5000.c | 7 +------ sound/soc/tegra/tegra_wm8753.c | 22 ++++++---------------- sound/soc/tegra/tegra_wm8903.c | 22 ++++++---------------- sound/soc/tegra/tegra_wm9712.c | 8 ++------ sound/soc/tegra/trimslice.c | 18 ++++-------------- 11 files changed, 40 insertions(+), 130 deletions(-)
sound/soc/tegra/tegra_alc5632.c +1 -6
@@ -205,13 +205,11 @@ static int tegra_alc5632_probe(struct plif (ret) {dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , ret); - goto err_fini_utils; + goto err_put_cpu_of_node; }return 0 ; -err_fini_utils: -tegra_asoc_utils_fini (&alc5632->util_data); err_put_cpu_of_node:of_node_put (tegra_alc5632_dai.cpus->of_node); tegra_alc5632_dai.cpus->of_node =NULL ;
@@ -226,12 +224,9 @@ err:static int tegra_alc5632_remove (struct platform_device *pdev) {struct snd_soc_card *card =platform_get_drvdata (pdev); -struct tegra_alc5632 *machine =snd_soc_card_get_drvdata (card);snd_soc_unregister_card (card); -tegra_asoc_utils_fini (&machine->util_data); -of_node_put (tegra_alc5632_dai.cpus->of_node); tegra_alc5632_dai.cpus->of_node =NULL ; tegra_alc5632_dai.platforms->of_node =NULL ;
sound/soc/tegra/tegra_asoc_utils.c +7 -27
@@ -175,52 +175,32 @@ int tegra_asoc_utils_init(struct tegra_areturn -EINVAL ; } - data->clk_pll_a =clk_get (dev,"pll_a" ); + data->clk_pll_a =devm_clk_get (dev,"pll_a" );if (IS_ERR (data->clk_pll_a)) {dev_err (data->dev,"Can't retrieve clk pll_a\n" ); - ret =PTR_ERR (data->clk_pll_a); - goto err; +return PTR_ERR (data->clk_pll_a); } - data->clk_pll_a_out0 =clk_get (dev,"pll_a_out0" ); + data->clk_pll_a_out0 =devm_clk_get (dev,"pll_a_out0" );if (IS_ERR (data->clk_pll_a_out0)) {dev_err (data->dev,"Can't retrieve clk pll_a_out0\n" ); - ret =PTR_ERR (data->clk_pll_a_out0); - goto err_put_pll_a; +return PTR_ERR (data->clk_pll_a_out0); } - data->clk_cdev1 =clk_get (dev,"mclk" ); + data->clk_cdev1 =devm_clk_get (dev,"mclk" );if (IS_ERR (data->clk_cdev1)) {dev_err (data->dev,"Can't retrieve clk cdev1\n" ); - ret =PTR_ERR (data->clk_cdev1); - goto err_put_pll_a_out0; +return PTR_ERR (data->clk_cdev1); } ret =tegra_asoc_utils_set_rate (data,44100 ,256 *44100 );if (ret) - goto err_put_cdev1; +return ret;return 0 ; - -err_put_cdev1: -clk_put (data->clk_cdev1); -err_put_pll_a_out0: -clk_put (data->clk_pll_a_out0); -err_put_pll_a: -clk_put (data->clk_pll_a); -err: -return ret; }EXPORT_SYMBOL_GPL (tegra_asoc_utils_init); -void tegra_asoc_utils_fini (struct tegra_asoc_utils_data *data) -{ -clk_put (data->clk_cdev1); -clk_put (data->clk_pll_a_out0); -clk_put (data->clk_pll_a); -} -EXPORT_SYMBOL_GPL (tegra_asoc_utils_fini); -MODULE_AUTHOR ("Stephen Warren <[email protected]>" );MODULE_DESCRIPTION ("Tegra ASoC utility code" );MODULE_LICENSE ("GPL" );
sound/soc/tegra/tegra_asoc_utils.h +0 -1
@@ -34,6 +34,5 @@ int tegra_asoc_utils_set_rate(struct tegint tegra_asoc_utils_set_ac97_rate (struct tegra_asoc_utils_data *data);int tegra_asoc_utils_init (struct tegra_asoc_utils_data *data,struct device *dev); -void tegra_asoc_utils_fini (struct tegra_asoc_utils_data *data);#endif
sound/soc/tegra/tegra_max98090.c +6 -16
@@ -218,19 +218,18 @@ static int tegra_max98090_probe(struct p ret =snd_soc_of_parse_card_name (card,"nvidia,model" );if (ret) - goto err; +return ret; ret =snd_soc_of_parse_audio_routing (card,"nvidia,audio-routing" );if (ret) - goto err; +return ret; tegra_max98090_dai.codecs->of_node =of_parse_phandle (np,"nvidia,audio-codec" ,0 );if (!tegra_max98090_dai.codecs->of_node) {dev_err (&pdev->dev,"Property 'nvidia,audio-codec' missing or invalid\n" ); - ret = -EINVAL ; - goto err; +return -EINVAL ; } tegra_max98090_dai.cpus->of_node = of_parse_phandle(np,
@@ -238,40 +237,31 @@ static int tegra_max98090_probe(struct pif (!tegra_max98090_dai.cpus->of_node) {dev_err (&pdev->dev,"Property 'nvidia,i2s-controller' missing or invalid\n" ); - ret = -EINVAL ; - goto err; +return -EINVAL ; } tegra_max98090_dai.platforms->of_node = tegra_max98090_dai.cpus->of_node; ret =tegra_asoc_utils_init (&machine->util_data, &pdev->dev);if (ret) - goto err; +return ret; ret =snd_soc_register_card (card);if (ret) {dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , ret); - goto err_fini_utils; +return ret; }return 0 ; - -err_fini_utils: -tegra_asoc_utils_fini (&machine->util_data); -err: -return ret; }static int tegra_max98090_remove (struct platform_device *pdev) {struct snd_soc_card *card =platform_get_drvdata (pdev); -struct tegra_max98090 *machine =snd_soc_card_get_drvdata (card);snd_soc_unregister_card (card); -tegra_asoc_utils_fini (&machine->util_data); -return 0 ; }
sound/soc/tegra/tegra_rt5640.c +6 -16
@@ -164,19 +164,18 @@ static int tegra_rt5640_probe(struct pla ret =snd_soc_of_parse_card_name (card,"nvidia,model" );if (ret) - goto err; +return ret; ret =snd_soc_of_parse_audio_routing (card,"nvidia,audio-routing" );if (ret) - goto err; +return ret; tegra_rt5640_dai.codecs->of_node =of_parse_phandle (np,"nvidia,audio-codec" ,0 );if (!tegra_rt5640_dai.codecs->of_node) {dev_err (&pdev->dev,"Property 'nvidia,audio-codec' missing or invalid\n" ); - ret = -EINVAL ; - goto err; +return -EINVAL ; } tegra_rt5640_dai.cpus->of_node = of_parse_phandle(np,
@@ -184,40 +183,31 @@ static int tegra_rt5640_probe(struct plaif (!tegra_rt5640_dai.cpus->of_node) {dev_err (&pdev->dev,"Property 'nvidia,i2s-controller' missing or invalid\n" ); - ret = -EINVAL ; - goto err; +return -EINVAL ; } tegra_rt5640_dai.platforms->of_node = tegra_rt5640_dai.cpus->of_node; ret =tegra_asoc_utils_init (&machine->util_data, &pdev->dev);if (ret) - goto err; +return ret; ret =snd_soc_register_card (card);if (ret) {dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , ret); - goto err_fini_utils; +return ret; }return 0 ; - -err_fini_utils: -tegra_asoc_utils_fini (&machine->util_data); -err: -return ret; }static int tegra_rt5640_remove (struct platform_device *pdev) {struct snd_soc_card *card =platform_get_drvdata (pdev); -struct tegra_rt5640 *machine =snd_soc_card_get_drvdata (card);snd_soc_unregister_card (card); -tegra_asoc_utils_fini (&machine->util_data); -return 0 ; }
sound/soc/tegra/tegra_rt5677.c +1 -6
@@ -270,13 +270,11 @@ static int tegra_rt5677_probe(struct plaif (ret) {dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , ret); - goto err_fini_utils; + goto err_put_cpu_of_node; }return 0 ; -err_fini_utils: -tegra_asoc_utils_fini (&machine->util_data); err_put_cpu_of_node:of_node_put (tegra_rt5677_dai.cpus->of_node); tegra_rt5677_dai.cpus->of_node =NULL ;
@@ -291,12 +289,9 @@ err:static int tegra_rt5677_remove (struct platform_device *pdev) {struct snd_soc_card *card =platform_get_drvdata (pdev); -struct tegra_rt5677 *machine =snd_soc_card_get_drvdata (card);snd_soc_unregister_card (card); -tegra_asoc_utils_fini (&machine->util_data); - tegra_rt5677_dai.platforms->of_node =NULL ;of_node_put (tegra_rt5677_dai.codecs->of_node); tegra_rt5677_dai.codecs->of_node =NULL ;
sound/soc/tegra/tegra_sgtl5000.c +1 -6
@@ -156,13 +156,11 @@ static int tegra_sgtl5000_driver_probe(sif (ret) {dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , ret); - goto err_fini_utils; + goto err_put_cpu_of_node; }return 0 ; -err_fini_utils: -tegra_asoc_utils_fini (&machine->util_data); err_put_cpu_of_node:of_node_put (tegra_sgtl5000_dai.cpus->of_node); tegra_sgtl5000_dai.cpus->of_node =NULL ;
@@ -177,13 +175,10 @@ err:static int tegra_sgtl5000_driver_remove (struct platform_device *pdev) {struct snd_soc_card *card =platform_get_drvdata (pdev); -struct tegra_sgtl5000 *machine =snd_soc_card_get_drvdata (card);int ret; ret =snd_soc_unregister_card (card); -tegra_asoc_utils_fini (&machine->util_data); -of_node_put (tegra_sgtl5000_dai.cpus->of_node); tegra_sgtl5000_dai.cpus->of_node =NULL ; tegra_sgtl5000_dai.platforms->of_node =NULL ;
sound/soc/tegra/tegra_wm8753.c +6 -16
@@ -127,19 +127,18 @@ static int tegra_wm8753_driver_probe(str ret =snd_soc_of_parse_card_name (card,"nvidia,model" );if (ret) - goto err; +return ret; ret =snd_soc_of_parse_audio_routing (card,"nvidia,audio-routing" );if (ret) - goto err; +return ret; tegra_wm8753_dai.codecs->of_node =of_parse_phandle (np,"nvidia,audio-codec" ,0 );if (!tegra_wm8753_dai.codecs->of_node) {dev_err (&pdev->dev,"Property 'nvidia,audio-codec' missing or invalid\n" ); - ret = -EINVAL ; - goto err; +return -EINVAL ; } tegra_wm8753_dai.cpus->of_node = of_parse_phandle(np,
@@ -147,40 +146,31 @@ static int tegra_wm8753_driver_probe(strif (!tegra_wm8753_dai.cpus->of_node) {dev_err (&pdev->dev,"Property 'nvidia,i2s-controller' missing or invalid\n" ); - ret = -EINVAL ; - goto err; +return -EINVAL ; } tegra_wm8753_dai.platforms->of_node = tegra_wm8753_dai.cpus->of_node; ret =tegra_asoc_utils_init (&machine->util_data, &pdev->dev);if (ret) - goto err; +return ret; ret =snd_soc_register_card (card);if (ret) {dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , ret); - goto err_fini_utils; +return ret; }return 0 ; - -err_fini_utils: -tegra_asoc_utils_fini (&machine->util_data); -err: -return ret; }static int tegra_wm8753_driver_remove (struct platform_device *pdev) {struct snd_soc_card *card =platform_get_drvdata (pdev); -struct tegra_wm8753 *machine =snd_soc_card_get_drvdata (card);snd_soc_unregister_card (card); -tegra_asoc_utils_fini (&machine->util_data); -return 0 ; }
sound/soc/tegra/tegra_wm8903.c +6 -16
@@ -323,19 +323,18 @@ static int tegra_wm8903_driver_probe(str ret =snd_soc_of_parse_card_name (card,"nvidia,model" );if (ret) - goto err; +return ret; ret =snd_soc_of_parse_audio_routing (card,"nvidia,audio-routing" );if (ret) - goto err; +return ret; tegra_wm8903_dai.codecs->of_node =of_parse_phandle (np,"nvidia,audio-codec" ,0 );if (!tegra_wm8903_dai.codecs->of_node) {dev_err (&pdev->dev,"Property 'nvidia,audio-codec' missing or invalid\n" ); - ret = -EINVAL ; - goto err; +return -EINVAL ; } tegra_wm8903_dai.cpus->of_node = of_parse_phandle(np,
@@ -343,40 +342,31 @@ static int tegra_wm8903_driver_probe(strif (!tegra_wm8903_dai.cpus->of_node) {dev_err (&pdev->dev,"Property 'nvidia,i2s-controller' missing or invalid\n" ); - ret = -EINVAL ; - goto err; +return -EINVAL ; } tegra_wm8903_dai.platforms->of_node = tegra_wm8903_dai.cpus->of_node; ret =tegra_asoc_utils_init (&machine->util_data, &pdev->dev);if (ret) - goto err; +return ret; ret =snd_soc_register_card (card);if (ret) {dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , ret); - goto err_fini_utils; +return ret; }return 0 ; - -err_fini_utils: -tegra_asoc_utils_fini (&machine->util_data); -err: -return ret; }static int tegra_wm8903_driver_remove (struct platform_device *pdev) {struct snd_soc_card *card =platform_get_drvdata (pdev); -struct tegra_wm8903 *machine =snd_soc_card_get_drvdata (card);snd_soc_unregister_card (card); -tegra_asoc_utils_fini (&machine->util_data); -return 0 ; }
sound/soc/tegra/tegra_wm9712.c +2 -6
@@ -113,19 +113,17 @@ static int tegra_wm9712_driver_probe(str ret =tegra_asoc_utils_set_ac97_rate (&machine->util_data);if (ret) - goto asoc_utils_fini; + goto codec_unregister; ret =snd_soc_register_card (card);if (ret) {dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , ret); - goto asoc_utils_fini; + goto codec_unregister; }return 0 ; -asoc_utils_fini: -tegra_asoc_utils_fini (&machine->util_data); codec_unregister:platform_device_del (machine->codec); codec_put:
@@ -140,8 +138,6 @@ static int tegra_wm9712_driver_remove(stsnd_soc_unregister_card (card); -tegra_asoc_utils_fini (&machine->util_data); -platform_device_unregister (machine->codec);return 0 ;
sound/soc/tegra/trimslice.c +4 -14
@@ -125,8 +125,7 @@ static int tegra_snd_trimslice_probe(strif (!trimslice_tlv320aic23_dai.codecs->of_node) {dev_err (&pdev->dev,"Property 'nvidia,audio-codec' missing or invalid\n" ); - ret = -EINVAL ; - goto err; +return -EINVAL ; } trimslice_tlv320aic23_dai.cpus->of_node = of_parse_phandle(np,
@@ -134,8 +133,7 @@ static int tegra_snd_trimslice_probe(strif (!trimslice_tlv320aic23_dai.cpus->of_node) {dev_err (&pdev->dev,"Property 'nvidia,i2s-controller' missing or invalid\n" ); - ret = -EINVAL ; - goto err; +return -EINVAL ; } trimslice_tlv320aic23_dai.platforms->of_node =
@@ -143,32 +141,24 @@ static int tegra_snd_trimslice_probe(str ret =tegra_asoc_utils_init (&trimslice->util_data, &pdev->dev);if (ret) - goto err; +return ret; ret =snd_soc_register_card (card);if (ret) {dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , ret); - goto err_fini_utils; +return ret; }return 0 ; - -err_fini_utils: -tegra_asoc_utils_fini (&trimslice->util_data); -err: -return ret; }static int tegra_snd_trimslice_remove (struct platform_device *pdev) {struct snd_soc_card *card =platform_get_drvdata (pdev); -struct tegra_trimslice *trimslice =snd_soc_card_get_drvdata (card);snd_soc_unregister_card (card); -tegra_asoc_utils_fini (&trimslice->util_data); -return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 191/204 ASoC: tegra: Add audio mclk parent configuration
In reply to Greg Kroah-HartmanFrom: Sowjanya Komatineni <[email protected]>
commit 1e4e0bf136aa4b4aa59c1e6af19844bd6d807794 upstream.
Tegra PMC clock clk_out_1 is dedicated for audio mclk from Tegra30 through Tegra210 and currently Tegra clock driver does the initial parent configuration for audio mclk and keeps it enabled by default.
With the move of PMC clocks from clock driver into PMC driver, audio clocks parent configuration can be specified through the device tree using assigned-clock-parents property and audio mclk control should be taken care of by the audio driver.
This patch has implementation for parent configuration when default parent configuration through assigned-clock-parents property is not specified in the device tree.
--- sound/soc/tegra/tegra_asoc_utils.c | 68 +++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 28 deletions(-)
sound/soc/tegra/tegra_asoc_utils.c +40 -28
@@ -60,8 +60,6 @@ int tegra_asoc_utils_set_rate(struct teg data->set_mclk =0 ;clk_disable_unprepare (data->clk_cdev1); -clk_disable_unprepare (data->clk_pll_a_out0); -clk_disable_unprepare (data->clk_pll_a); err =clk_set_rate (data->clk_pll_a, new_baseclock);if (err) {
@@ -77,18 +75,6 @@ int tegra_asoc_utils_set_rate(struct teg/* Don't set cdev1/extern1 rate; it's locked to pll_a_out0 */ - err =clk_prepare_enable (data->clk_pll_a); -if (err) { -dev_err (data->dev,"Can't enable pll_a: %d\n" , err); -return err; - } - - err =clk_prepare_enable (data->clk_pll_a_out0); -if (err) { -dev_err (data->dev,"Can't enable pll_a_out0: %d\n" , err); -return err; - } - err =clk_prepare_enable (data->clk_cdev1);if (err) {dev_err (data->dev,"Can't enable cdev1: %d\n" , err);
@@ -109,8 +95,6 @@ int tegra_asoc_utils_set_ac97_rate(strucint err;clk_disable_unprepare (data->clk_cdev1); -clk_disable_unprepare (data->clk_pll_a_out0); -clk_disable_unprepare (data->clk_pll_a);/* * AC97 rate is fixed at 24.576MHz and is used for both the host
@@ -130,18 +114,6 @@ int tegra_asoc_utils_set_ac97_rate(struc/* Don't set cdev1/extern1 rate; it's locked to pll_a_out0 */ - err =clk_prepare_enable (data->clk_pll_a); -if (err) { -dev_err (data->dev,"Can't enable pll_a: %d\n" , err); -return err; - } - - err =clk_prepare_enable (data->clk_pll_a_out0); -if (err) { -dev_err (data->dev,"Can't enable pll_a_out0: %d\n" , err); -return err; - } - err =clk_prepare_enable (data->clk_cdev1);if (err) {dev_err (data->dev,"Can't enable cdev1: %d\n" , err);
@@ -158,6 +130,7 @@ EXPORT_SYMBOL_GPL(tegra_asoc_utils_set_aint tegra_asoc_utils_init (struct tegra_asoc_utils_data *data,struct device *dev) { +struct clk *clk_out_1, *clk_extern1;int ret; data->dev = dev;
@@ -193,6 +166,45 @@ int tegra_asoc_utils_init(struct tegra_areturn PTR_ERR (data->clk_cdev1); } +/* +* If clock parents are not set in DT, configure here to use clk_out_1 +* as mclk and extern1 as parent for Tegra30 and higher. +*/ +if (!of_find_property (dev->of_node,"assigned-clock-parents" ,NULL ) && + data->soc >TEGRA_ASOC_UTILS_SOC_TEGRA20 ) { +dev_warn (data->dev, +"Configuring clocks for a legacy device-tree\n" ); +dev_warn (data->dev, +"Please update DT to use assigned-clock-parents\n" ); + clk_extern1 =devm_clk_get (dev,"extern1" ); +if (IS_ERR (clk_extern1)) { +dev_err (data->dev,"Can't retrieve clk extern1\n" ); +return PTR_ERR (clk_extern1); + } + + ret =clk_set_parent (clk_extern1, data->clk_pll_a_out0); +if (ret <0 ) { +dev_err (data->dev, +"Set parent failed for clk extern1\n" ); +return ret; + } + + clk_out_1 =devm_clk_get (dev,"pmc_clk_out_1" ); +if (IS_ERR (clk_out_1)) { +dev_err (data->dev,"Can't retrieve pmc_clk_out_1\n" ); +return PTR_ERR (clk_out_1); + } + + ret =clk_set_parent (clk_out_1, clk_extern1); +if (ret <0 ) { +dev_err (data->dev, +"Set parent failed for pmc_clk_out_1\n" ); +return ret; + } + + data->clk_cdev1 = clk_out_1; + } + ret =tegra_asoc_utils_set_rate (data,44100 ,256 *44100 );if (ret)return ret;
Greg Kroah-Hartman
maintainerPATCH 192/204 ASoC: tegra: Enable audio mclk during tegra_asoc_utils_init()
In reply to Greg Kroah-HartmanFrom: Sowjanya Komatineni <[email protected]>
commit ff5d18cb04f4ecccbcf05b7f83ab6df2a0d95c16 upstream.
Tegra PMC clock clk_out_1 is dedicated for audio mclk from Tegra30 through Tegra210 and currently Tegra clock driver keeps the audio mclk enabled.
With the move of PMC clocks from clock driver into pmc driver, audio mclk enable from clock driver is removed and this should be taken care of by the audio driver.
tegra_asoc_utils_init() calls tegra_asoc_utils_set_rate() and audio mclk rate configuration is not needed during init and the rate is actually set during the ->hw_params() callback.
So, this patch removes tegra_asoc_utils_set_rate() call and just leaves the audio mclk enabled.
--- sound/soc/tegra/tegra_asoc_utils.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
sound/soc/tegra/tegra_asoc_utils.c +9 -2
@@ -205,9 +205,16 @@ int tegra_asoc_utils_init(struct tegra_a data->clk_cdev1 = clk_out_1; } - ret =tegra_asoc_utils_set_rate (data,44100 ,256 *44100 ); -if (ret) +/* +* FIXME: There is some unknown dependency between audio mclk disable +* and suspend-resume functionality on Tegra30, although audio mclk is +* only needed for audio. +*/ + ret =clk_prepare_enable (data->clk_cdev1); +if (ret) { +dev_err (data->dev,"Can't enable cdev1: %d\n" , ret);return ret; + }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 193/204 drm/radeon: fix fb_div check in ni_init_smc_spll_table()
In reply to Greg Kroah-HartmanFrom: Denis Efremov <[email protected]>
commit f29aa08852e1953e461f2d47ab13c34e14bc08b3 upstream.
clk_s is checked twice in a row in ni_init_smc_spll_table(). fb_div should be checked instead.
--- drivers/gpu/drm/radeon/ni_dpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/radeon/ni_dpm.c +1 -1
@@ -2124,7 +2124,7 @@ static int ni_init_smc_spll_table(structif (p_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_PDIV_MASK >>SMC_NISLANDS_SPLL_DIV_TABLE_PDIV_SHIFT )) ret = -EINVAL ; -if (clk_s & ~(SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_MASK >>SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_SHIFT )) +if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >>SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT )) ret = -EINVAL ;if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >>SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT ))
Greg Kroah-Hartman
maintainerPATCH 194/204 drm/i915/gt: Force the GT reset on shutdown
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
commit 7c4541a37bbbf83c0f16f779e85eb61d9348ed29 upstream.
Before we return control to the system, and letting it reuse all the pages being accessed by HW, we must disable the HW. At the moment, we dare not reset the GPU if it will clobber the display, but once we know the display has been disabled, we can proceed with the reset as we shutdown the module. We know the next user must reinitialise the HW for their purpose.
--- drivers/gpu/drm/i915/gt/intel_gt.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/gt/intel_gt.c +5 -0
@@ -656,6 +656,11 @@ void intel_gt_driver_unregister(struct ivoid intel_gt_driver_release (struct intel_gt *gt) {struct i915_address_space *vm; +intel_wakeref_t wakeref; + +/* Scrub all HW state upon release */ + with_intel_runtime_pm(gt->uncore->rpm, wakeref) +__intel_gt_reset (gt,ALL_ENGINES ); vm =fetch_and_zero (>->vm);if (vm)/* FIXME being called twice on error paths :( */
Greg Kroah-Hartman
maintainerPATCH 195/204 drm/panfrost: Use kvfree() to free bo->sgts
In reply to Greg Kroah-HartmanFrom: Denis Efremov <[email protected]>
commit 114427b8927a4def2942b2b886f7e4aeae289ccb upstream.
Use kvfree() to free bo->sgts, because the memory is allocated with kvmalloc_array() in panfrost_mmu_map_fault_addr().
--- drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +- drivers/gpu/drm/panfrost/panfrost_mmu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/panfrost/panfrost_gem.c +1 -1
@@ -46,7 +46,7 @@ static void panfrost_gem_free_object(strsg_free_table (&bo->sgts[i]); } } -kfree (bo->sgts); +kvfree (bo->sgts); }drm_gem_shmem_free_object (obj);
drivers/gpu/drm/panfrost/panfrost_mmu.c +1 -1
@@ -486,7 +486,7 @@ static int panfrost_mmu_map_fault_addr(s pages =kvmalloc_array (bo->base.base.size >>PAGE_SHIFT ,sizeof (struct page *),GFP_KERNEL | __GFP_ZERO);if (!pages) { -kfree (bo->sgts); +kvfree (bo->sgts); bo->sgts =NULL ;mutex_unlock (&bo->base.pages_lock); ret = -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 196/204 drm/dp_mst: Fix the DDC I2C device registration of an MST port
In reply to Greg Kroah-HartmanFrom: Imre Deak <[email protected]>
commit d8bd15b37d328a935a4fc695fed8b19157503950 upstream.
During the initial MST probing an MST port's I2C device will be registered using the kdev of the DRM device as a parent. Later after MST Connection Status Notifications this I2C device will be re-registered with the kdev of the port's connector. This will also move inconsistently the I2C device's sysfs entry from the DRM device's sysfs dir to the connector's dir.
Fix the above by keeping the DRM kdev as the parent of the I2C device.
Ideally the connector's kdev would be used as a parent, similarly to non-MST connectors, however that needs some more refactoring to ensure the connector's kdev is already available early enough. So keep the existing (initial) behavior for now.
--- drivers/gpu/drm/drm_dp_mst_topology.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
drivers/gpu/drm/drm_dp_mst_topology.c +16 -12
@@ -88,8 +88,8 @@ static int drm_dp_send_enum_path_resourcstatic bool drm_dp_validate_guid (struct drm_dp_mst_topology_mgr *mgr,u8 *guid); -static int drm_dp_mst_register_i2c_bus (struct drm_dp_aux *aux); -static void drm_dp_mst_unregister_i2c_bus (struct drm_dp_aux *aux); +static int drm_dp_mst_register_i2c_bus (struct drm_dp_mst_port *port); +static void drm_dp_mst_unregister_i2c_bus (struct drm_dp_mst_port *port);static void drm_dp_mst_kick_tx (struct drm_dp_mst_topology_mgr *mgr);#define DBG_PREFIX "[dp_mst]"
@@ -1981,7 +1981,7 @@ drm_dp_port_set_pdt(struct drm_dp_mst_po }/* remove i2c over sideband */ -drm_dp_mst_unregister_i2c_bus (&port->aux); +drm_dp_mst_unregister_i2c_bus (port); }else {mutex_lock (&mgr->lock);drm_dp_mst_topology_put_mstb (port->mstb);
@@ -1996,7 +1996,7 @@ drm_dp_port_set_pdt(struct drm_dp_mst_poif (port->pdt !=DP_PEER_DEVICE_NONE ) {if (drm_dp_mst_is_end_device (port->pdt, port->mcs)) {/* add i2c over sideband */ - ret =drm_dp_mst_register_i2c_bus (&port->aux); + ret =drm_dp_mst_register_i2c_bus (port); }else { lct =drm_dp_calculate_rad (port, rad); mstb =drm_dp_add_mst_branch_device (lct, rad);
@@ -5406,22 +5406,26 @@ static const struct i2c_algorithm drm_dp/** * drm_dp_mst_register_i2c_bus() - register an I2C adapter for I2C-over-AUX -* @aux: DisplayPort AUX channel +* @port: The port to add the I2C bus on * * Returns 0 on success or a negative error code on failure. */ -static int drm_dp_mst_register_i2c_bus (struct drm_dp_aux *aux) +static int drm_dp_mst_register_i2c_bus (struct drm_dp_mst_port *port) { +struct drm_dp_aux *aux = &port->aux; +struct device *parent_dev = port->mgr->dev->dev; + aux->ddc.algo = &drm_dp_mst_i2c_algo; aux->ddc.algo_data = aux; aux->ddc.retries =3 ; aux->ddc.class =I2C_CLASS_DDC ; aux->ddc.owner =THIS_MODULE ; - aux->ddc.dev.parent = aux->dev; - aux->ddc.dev.of_node = aux->dev->of_node; +/* FIXME: set the kdev of the port's connector as parent */ + aux->ddc.dev.parent = parent_dev; + aux->ddc.dev.of_node = parent_dev->of_node; -strlcpy (aux->ddc.name, aux->name ? aux->name :dev_name (aux->dev), +strlcpy (aux->ddc.name, aux->name ? aux->name :dev_name (parent_dev),sizeof (aux->ddc.name));return i2c_add_adapter (&aux->ddc);
@@ -5429,11 +5433,11 @@ static int drm_dp_mst_register_i2c_bus(s/** * drm_dp_mst_unregister_i2c_bus() - unregister an I2C-over-AUX adapter -* @aux: DisplayPort AUX channel +* @port: The port to remove the I2C bus from */ -static void drm_dp_mst_unregister_i2c_bus (struct drm_dp_aux *aux) +static void drm_dp_mst_unregister_i2c_bus (struct drm_dp_mst_port *port) { -i2c_del_adapter (&aux->ddc); +i2c_del_adapter (&port->aux.ddc); }/**
Greg Kroah-Hartman
maintainerPATCH 197/204 drm/amdgpu: fix ordering of psp suspend
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
The ordering of psp_tmr_terminate() and psp_asd_unload() got reversed when the patches were applied to stable.
This patch does not exist in Linus' tree because the ordering is correct there. It got reversed when the patches were applied to stable. This patch is for stable only.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +4 -4
@@ -1679,15 +1679,15 @@ static int psp_suspend(void *handle) } } - ret =psp_tmr_terminate (psp); + ret =psp_asd_unload (psp);if (ret) { -DRM_ERROR ("Falied to terminate tmr\n" ); +DRM_ERROR ("Failed to unload asd\n" );return ret; } - ret =psp_asd_unload (psp); + ret =psp_tmr_terminate (psp);if (ret) { -DRM_ERROR ("Failed to unload asd\n" ); +DRM_ERROR ("Falied to terminate tmr\n" );return ret; }
Greg Kroah-Hartman
maintainerPATCH 198/204 drm/omap: force runtime PM suspend on system suspend
In reply to Greg Kroah-HartmanFrom: Tomi Valkeinen <[email protected]>
commit ecfdedd7da5d54416db5ca0f851264dca8736f59 upstream.
Use SET_LATE_SYSTEM_SLEEP_PM_OPS in DSS submodules to force runtime PM suspend and resume.
We use suspend late version so that omapdrm's system suspend callback is called first, as that will disable all the display outputs after which it's safe to force DSS into suspend.
--- drivers/gpu/drm/omapdrm/dss/dispc.c | 1 + drivers/gpu/drm/omapdrm/dss/dsi.c | 1 + drivers/gpu/drm/omapdrm/dss/dss.c | 1 + drivers/gpu/drm/omapdrm/dss/venc.c | 1 + 4 files changed, 4 insertions(+)
drivers/gpu/drm/omapdrm/dss/dispc.c +1 -0
@@ -4936,6 +4936,7 @@ static int dispc_runtime_resume(struct dstatic const struct dev_pm_ops dispc_pm_ops = { .runtime_suspend = dispc_runtime_suspend, .runtime_resume = dispc_runtime_resume, +SET_LATE_SYSTEM_SLEEP_PM_OPS (pm_runtime_force_suspend, pm_runtime_force_resume) };struct platform_driver omap_dispchw_driver = {
drivers/gpu/drm/omapdrm/dss/dsi.c +1 -0
@@ -5467,6 +5467,7 @@ static int dsi_runtime_resume(struct devstatic const struct dev_pm_ops dsi_pm_ops = { .runtime_suspend = dsi_runtime_suspend, .runtime_resume = dsi_runtime_resume, +SET_LATE_SYSTEM_SLEEP_PM_OPS (pm_runtime_force_suspend, pm_runtime_force_resume) };struct platform_driver omap_dsihw_driver = {
drivers/gpu/drm/omapdrm/dss/dss.c +1 -0
@@ -1614,6 +1614,7 @@ static int dss_runtime_resume(struct devstatic const struct dev_pm_ops dss_pm_ops = { .runtime_suspend = dss_runtime_suspend, .runtime_resume = dss_runtime_resume, +SET_LATE_SYSTEM_SLEEP_PM_OPS (pm_runtime_force_suspend, pm_runtime_force_resume) };struct platform_driver omap_dsshw_driver = {
drivers/gpu/drm/omapdrm/dss/venc.c +1 -0
@@ -945,6 +945,7 @@ static int venc_runtime_resume(struct destatic const struct dev_pm_ops venc_pm_ops = { .runtime_suspend = venc_runtime_suspend, .runtime_resume = venc_runtime_resume, +SET_LATE_SYSTEM_SLEEP_PM_OPS (pm_runtime_force_suspend, pm_runtime_force_resume) };static const struct of_device_id venc_of_match[] = {
Greg Kroah-Hartman
maintainerPATCH 199/204 drm/tidss: fix modeset init for DPI panels
In reply to Greg Kroah-HartmanFrom: Tomi Valkeinen <[email protected]>
commit a72a6a16d51034045cb6355924b62221a8221ca3 upstream.
The connector type for DISPC's DPI videoport was set the LVDS instead of DPI. This causes any DPI panel setup to fail with tidss, making all DPI panels unusable.
Fix this by using correct connector type.
--- drivers/gpu/drm/tidss/tidss_kms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/tidss/tidss_kms.c +1 -1
@@ -154,7 +154,7 @@ static int tidss_dispc_modeset_init(strubreak ;case DISPC_VP_DPI : enc_type =DRM_MODE_ENCODER_DPI ; - conn_type =DRM_MODE_CONNECTOR_LVDS ; + conn_type =DRM_MODE_CONNECTOR_DPI ;break ;default :WARN_ON (1 );
Greg Kroah-Hartman
maintainerPATCH 200/204 drm: Added orientation quirk for ASUS tablet model T103HAF
In reply to Greg Kroah-HartmanFrom: Marius Iacob <[email protected]>
commit b5ac98cbb8e5e30c34ebc837d1e5a3982d2b5f5c upstream.
--- drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/drm_panel_orientation_quirks.c +6 -0
@@ -121,6 +121,12 @@ static const struct dmi_system_id orient DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T101HA"), }, .driver_data = (void *)&lcd800x1280_rightside_up, + }, { /* Asus T103HAF */ + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T103HAF"), + }, + .driver_data = (void *)&lcd800x1280_rightside_up, }, { /* GPD MicroPC (generic strings, also match on bios date) */ .matches = { DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Default string"),
Greg Kroah-Hartman
maintainerPATCH 201/204 drm: fix drm_dp_mst_port refcount leaks in drm_dp_mst_allocate_vcpi
In reply to Greg Kroah-HartmanFrom: Xin Xiong <[email protected]>
commit a34a0a632dd991a371fec56431d73279f9c54029 upstream.
drm_dp_mst_allocate_vcpi() invokes drm_dp_mst_topology_get_port_validated(), which increases the refcount of the "port".
These reference counting issues take place in two exception handling paths separately. Either when “slots” is less than 0 or when drm_dp_init_vcpi() returns a negative value, the function forgets to reduce the refcnt increased drm_dp_mst_topology_get_port_validated(), which results in a refcount leak.
Fix these issues by pulling up the error handling when "slots" is less than 0, and calling drm_dp_mst_topology_put_port() before termination when drm_dp_init_vcpi() returns a negative value.
--- drivers/gpu/drm/drm_dp_mst_topology.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_dp_mst_topology.c +4 -3
@@ -4319,11 +4319,11 @@ bool drm_dp_mst_allocate_vcpi(struct drm {int ret; - port =drm_dp_mst_topology_get_port_validated (mgr, port); -if (!port) +if (slots <0 )return false; -if (slots <0 ) + port =drm_dp_mst_topology_get_port_validated (mgr, port); +if (!port)return false;if (port->vcpi.vcpi >0 ) {
@@ -4339,6 +4339,7 @@ bool drm_dp_mst_allocate_vcpi(struct drmif (ret) {DRM_DEBUG_KMS ("failed to init vcpi slots=%d max=63 ret=%d\n" ,DIV_ROUND_UP (pbn, mgr->pbn_div), ret); +drm_dp_mst_topology_put_port (port); goto out; } DRM_DEBUG_KMS("initing vcpi for pbn=%d slots=%d\n",
Greg Kroah-Hartman
maintainerPATCH 202/204 drm/amdgpu: Fix bug where DPM is not enabled after hibernate and resume
In reply to Greg Kroah-HartmanFrom: Sandeep Raghuraman <[email protected]>
commit f87812284172a9809820d10143b573d833cd3f75 upstream.
Reproducing bug report here:
After hibernating and resuming, DPM is not enabled. This remains the case even if you test hibernate using the steps here:
https://www.kernel.org/doc/html/latest/power/basic-pm-debugging.html
I debugged the problem, and figured out that in the file hardwaremanager.c,
in the function, phm_enable_dynamic_state_management(), the check
'if (!hwmgr->pp_one_vf && smum_is_dpm_running(hwmgr) && !amdgpu_passthrough(adev) && adev->in_suspend)' returns true for the hibernate case, and false for the suspend case.
This means that for the hibernate case, the AMDGPU driver doesn't enable DPM (even though it should) and simply returns from that function.
In the suspend case, it goes ahead and enables DPM, even though it doesn't need to.
I debugged further, and found out that in the case of suspend, for the CIK/Hawaii GPUs, smum_is_dpm_running(hwmgr) returns false, while in the case of hibernate, smum_is_dpm_running(hwmgr) returns true.
For CIK, the ci_is_dpm_running() function calls the ci_is_smc_ram_running() function, which is ultimately used to determine if DPM is currently enabled or not, and this seems to provide the wrong answer.
I've changed the ci_is_dpm_running() function to instead use the same method that some other AMD GPU chips do (e.g Fiji), which seems to read the voltage controller. I've tested on my R9 390 and it seems to work correctly for both suspend and hibernate use cases, and has been stable so far.
--- drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c +4 -1
@@ -2725,7 +2725,10 @@ static int ci_initialize_mc_reg_table(ststatic bool ci_is_dpm_running (struct pp_hwmgr *hwmgr) { -return ci_is_smc_ram_running (hwmgr); +return (1 ==PHM_READ_INDIRECT_FIELD (hwmgr->device, +CGS_IND_REG__SMC ,FEATURE_STATUS , +VOLTAGE_CONTROLLER_ON )) + ? true : false; }static int ci_smu_init (struct pp_hwmgr *hwmgr)
Greg Kroah-Hartman
maintainerPATCH 203/204 drm/amd/display: Fix dmesg warning from setting abm level
In reply to Greg Kroah-HartmanFrom: Stylon Wang <[email protected]>
commit c5892a10218214d729699ab61bad6fc109baf0ce upstream.
[Why]
Setting abm level does not correctly update CRTC state. As a result no surface update is added to dc stream state and triggers warning.
[How]
Correctly update CRTC state when setting abm level property.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +23 -0
@@ -8458,6 +8458,29 @@ static int amdgpu_dm_atomic_check(structif (ret) goto fail; +/* Check connector changes */ +for_each_oldnew_connector_in_state (state, connector, old_con_state, new_con_state, i) { +struct dm_connector_state *dm_old_con_state =to_dm_connector_state (old_con_state); +struct dm_connector_state *dm_new_con_state =to_dm_connector_state (new_con_state); + +/* Skip connectors that are disabled or part of modeset already. */ +if (!old_con_state->crtc && !new_con_state->crtc) +continue ; + +if (!new_con_state->crtc) +continue ; + + new_crtc_state =drm_atomic_get_crtc_state (state, new_con_state->crtc); +if (IS_ERR (new_crtc_state)) { + ret =PTR_ERR (new_crtc_state); + goto fail; + } + +if (dm_old_con_state->abm_level != + dm_new_con_state->abm_level) + new_crtc_state->connectors_changed = true; + } +#if defined(CONFIG_DRM_AMD_DC_DCN )if (!compute_mst_dsc_configs_for_state (state, dm_state->context)) goto fail;
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.7.17 release. There are 204 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 Sat, 22 Aug 2020 09:15:09 +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.7.17-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.7.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.7:
11 builds: 11 pass, 0 fail
26 boots: 26 pass, 0 fail
56 tests: 56 pass, 0 failLinux version: 5.7.17-rc1-g7366707e7e99
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra210-p3450-0000,
tegra30-cardhu-a04Jon
Greg Kroah-Hartman
maintainerPATCH 204/204 drm/amd/display: dchubbub p-state warning during surface planes switch
In reply to Greg Kroah-HartmanFrom: hersen wu <[email protected]>
commit 8b0379a85762b516c7b46aed7dbf2a4947c00564 upstream.
[Why]ramp_up_dispclk_with_dpp is to change dispclk, dppclk and dprefclk according to bandwidth requirement. call stack: rv1_update_clocks --> update_clocks --> dcn10_prepare_bandwidth / dcn10_optimize_bandwidth --> prepare_bandwidth / optimize_bandwidth. before change dcn hw, prepare_bandwidth will be called first to allow enough clock, watermark for change, after end of dcn hw change, optimize_bandwidth is executed to lower clock to save power for new dcn hw settings.
below is sequence of commit_planes_for_stream:
step 1: prepare_bandwidth - raise clock to have enough bandwidth step 2: lock_doublebuffer_enable
step 3: pipe_control_lock(true) - make dchubp register change will not take effect right way
step 4: apply_ctx_for_surface - program dchubp
step 5: pipe_control_lock(false) - dchubp register change take effect step 6: optimize_bandwidth --> dc_post_update_surfaces_to_stream for full_date, optimize clock to save power
at end of step 1, dcn clocks (dprefclk, dispclk, dppclk) may be changed for new dchubp configuration. but real dcn hub dchubps are still running with old configuration until end of step 5. this need clocks settings at step 1 should not less than that before step 1. this is checked by two conditions: 1. if (should_set_clock(safe_to_lower , new_clocks->dispclk_khz, clk_mgr_base->clks.dispclk_khz) || new_clocks->dispclk_khz == clk_mgr_base->clks.dispclk_khz)
2. request_dpp_div = new_clocks->dispclk_khz > new_clocks->dppclk_khz
the second condition is based on new dchubp configuration. dppclk for new dchubp may be different from dppclk before step 1. for example, before step 1, dchubps are as below:
pipe 0: recout=(0,40,1920,980) viewport=(0,0,1920,979) pipe 1: recout=(0,0,1920,1080) viewport=(0,0,1920,1080) for dppclk for pipe0 need dppclk = dispclk
new dchubp pipe split configuration:
pipe 0: recout=(0,0,960,1080) viewport=(0,0,960,1080) pipe 1: recout=(960,0,960,1080) viewport=(960,0,960,1080) dppclk only needs dppclk = dispclk /2.
dispclk, dppclk are not lock by otg master lock. they take effect after step 1. during this transition, dispclk are the same, but dppclk is changed to half of previous clock for old dchubp configuration between step 1 and step 6. This may cause p-state warning intermittently.
[How]
for new_clocks->dispclk_khz == clk_mgr_base->clks.dispclk_khz, we need make sure dppclk are not changed to less between step 1 and 6. for new_clocks->dispclk_khz > clk_mgr_base->clks.dispclk_khz, new display clock is raised, but we do not know ratio of new_clocks->dispclk_khz and clk_mgr_base->clks.dispclk_khz, new_clocks->dispclk_khz /2 does not guarantee equal or higher than old dppclk. we could ignore power saving different between dppclk = displck and dppclk = dispclk / 2 between step 1 and step 6. as long as safe_to_lower = false, set dpclk = dispclk to simplify condition check.
--- drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 69 ++++++++++++- 1 file changed, 67 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c +67 -2
@@ -85,12 +85,77 @@ static int rv1_determine_dppclk_thresholreturn disp_clk_threshold; } -static void ramp_up_dispclk_with_dpp (struct clk_mgr_internal *clk_mgr,struct dc *dc,struct dc_clocks *new_clocks) +static void ramp_up_dispclk_with_dpp ( +struct clk_mgr_internal *clk_mgr, +struct dc *dc, +struct dc_clocks *new_clocks, +bool safe_to_lower) {int i;int dispclk_to_dpp_threshold =rv1_determine_dppclk_threshold (clk_mgr, new_clocks);bool request_dpp_div = new_clocks->dispclk_khz > new_clocks->dppclk_khz; +/* this function is to change dispclk, dppclk and dprefclk according to +* bandwidth requirement. Its call stack is rv1_update_clocks --> +* update_clocks --> dcn10_prepare_bandwidth / dcn10_optimize_bandwidth +* --> prepare_bandwidth / optimize_bandwidth. before change dcn hw, +* prepare_bandwidth will be called first to allow enough clock, +* watermark for change, after end of dcn hw change, optimize_bandwidth +* is executed to lower clock to save power for new dcn hw settings. +* +* below is sequence of commit_planes_for_stream: +* +* step 1: prepare_bandwidth - raise clock to have enough bandwidth +* step 2: lock_doublebuffer_enable +* step 3: pipe_control_lock(true) - make dchubp register change will +* not take effect right way +* step 4: apply_ctx_for_surface - program dchubp +* step 5: pipe_control_lock(false) - dchubp register change take effect +* step 6: optimize_bandwidth --> dc_post_update_surfaces_to_stream +* for full_date, optimize clock to save power +* +* at end of step 1, dcn clocks (dprefclk, dispclk, dppclk) may be +* changed for new dchubp configuration. but real dcn hub dchubps are +* still running with old configuration until end of step 5. this need +* clocks settings at step 1 should not less than that before step 1. +* this is checked by two conditions: 1. if (should_set_clock(safe_to_lower +* , new_clocks->dispclk_khz, clk_mgr_base->clks.dispclk_khz) || +* new_clocks->dispclk_khz == clk_mgr_base->clks.dispclk_khz) +* 2. request_dpp_div = new_clocks->dispclk_khz > new_clocks->dppclk_khz +* +* the second condition is based on new dchubp configuration. dppclk +* for new dchubp may be different from dppclk before step 1. +* for example, before step 1, dchubps are as below: +* pipe 0: recout=(0,40,1920,980) viewport=(0,0,1920,979) +* pipe 1: recout=(0,0,1920,1080) viewport=(0,0,1920,1080) +* for dppclk for pipe0 need dppclk = dispclk +* +* new dchubp pipe split configuration: +* pipe 0: recout=(0,0,960,1080) viewport=(0,0,960,1080) +* pipe 1: recout=(960,0,960,1080) viewport=(960,0,960,1080) +* dppclk only needs dppclk = dispclk /2. +* +* dispclk, dppclk are not lock by otg master lock. they take effect +* after step 1. during this transition, dispclk are the same, but +* dppclk is changed to half of previous clock for old dchubp +* configuration between step 1 and step 6. This may cause p-state +* warning intermittently. +* +* for new_clocks->dispclk_khz == clk_mgr_base->clks.dispclk_khz, we +* need make sure dppclk are not changed to less between step 1 and 6. +* for new_clocks->dispclk_khz > clk_mgr_base->clks.dispclk_khz, +* new display clock is raised, but we do not know ratio of +* new_clocks->dispclk_khz and clk_mgr_base->clks.dispclk_khz, +* new_clocks->dispclk_khz /2 does not guarantee equal or higher than +* old dppclk. we could ignore power saving different between +* dppclk = displck and dppclk = dispclk / 2 between step 1 and step 6. +* as long as safe_to_lower = false, set dpclk = dispclk to simplify +* condition check. +* todo: review this change for other asic. +**/ +if (!safe_to_lower) + request_dpp_div = false; +/* set disp clk to dpp clk threshold */ clk_mgr->funcs->set_dispclk (clk_mgr, dispclk_to_dpp_threshold);
@@ -209,7 +274,7 @@ static void rv1_update_clocks(struct clk/* program dispclk on = as a w/a for sleep resume clock ramping issues */ if (should_set_clock (safe_to_lower, new_clocks->dispclk_khz, clk_mgr_base->clks.dispclk_khz) || new_clocks->dispclk_khz == clk_mgr_base->clks.dispclk_khz) { -ramp_up_dispclk_with_dpp (clk_mgr, dc, new_clocks); +ramp_up_dispclk_with_dpp (clk_mgr, dc, new_clocks, safe_to_lower); clk_mgr_base->clks.dispclk_khz = new_clocks->dispclk_khz; send_request_to_lower = true; }
Quoted 15 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.7.17 release. There are 204 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 Sat, 22 Aug 2020 09:15:09 +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.7.17-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.7.y
and the diffstat can be found below.
Quoted 6 lines
thanks,
greg k-h
Herbert Xu <[email protected]>
crypto:af_alg- Fix regression on empty requests
Results from Linaro’s test farm.
Regressions detected.
LTP crypto af_alg02 and cve-2017-17805 failed on stable-rc 5.7 and 5.8 branches on arm, arm64, i386 and x86_64.
ltp-crypto-tests:
* af_alg02
ltp-cve-tests:
* cve-2017-17805
Summary
------------------------------------------------------------------------
kernel: 5.7.17-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-5.7.y
git commit: 7366707e7e9962245a618a0aee04c22ab31115c2
git describe: v5.7.16-205-g7366707e7e99
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-5.7-oe/build/v5.7.16-205-g7366707e7e99
Regressions (compared to build v5.7.16)
------------------------------------------------------------------------
ltp-crypto-tests:
* af_alg02
ltp-cve-tests:
* cve-2017-17805
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Quoted 22 lines · Naresh Kamboju
Quoted 18 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.7.17 release. There are 204 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 Sat, 22 Aug 2020 09:15:09 +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.7.17-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.7.y
and the diffstat can be found below.thanks,
greg k-h
Quoted 8 lines
Quoted 2 lines
Herbert Xu <[email protected]>
crypto:af_alg- Fix regression on empty requestsResults from Linaro’s test farm.
Regressions detected.LTP crypto
af_alg02and cve-2017-17805 failed on stable-rc 5.7 and 5.8 branches on arm, arm64, i386 andx86_64.
Apart from the reported LTP crypto test case problem all other results look good to me.
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 5.7.17
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-5.7.y
git commit: 3f45898cffc4e386952f3e4821810500adccea1f
git describe: v5.7.17
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-5.7-oe/build/v5.7.17
No regressions (compared to build v5.7.16)
No fixes (compared to build v5.7.16)
Ran 32841 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c
- hi6220-hikey
- i386
- juno-r2
- nxp-ls2088
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15
- x86
- x86-kasan
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* linux-log-parser
* ltp-cap_bounds-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-hugetlb-tests
* ltp-ipc-tests
* ltp-mm-tests
* ltp-sched-tests
* perf
* ltp-containers-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-securebits-tests
* v4l2-compliance
* libhugetlbfs
* ltp-commands-tests
* ltp-controllers-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-io-tests
* ltp-math-tests
* ltp-open-posix-tests
* ltp-syscalls-tests
* ltp-tracing-tests
* network-basic-tests
* igt-gpu-tools
* kselftest
* kselftest/drivers
* kselftest/filesystems
* kselftest/net
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-native/drivers
* kselftest-vsyscall-mode-native/filesystems
* kselftest-vsyscall-mode-native/net
* kselftest-vsyscall-mode-none
* kselftest-vsyscall-mode-none/drivers
* kselftest-vsyscall-mode-none/filesystems
* kselftest-vsyscall-mode-none/net
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.7.17 release. There are 204 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 Sat, 22 Aug 2020 09:15:09 +0000. Anything received after that time might be too late.
Build results:
total: 158 pass: 158 fail: 0 Qemu test results: total: 431 pass: 431 fail: 0
Guenter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.7.17 release. There are 204 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 Sat, 22 Aug 2020 09:15:09 +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.7.17-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.7.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah