CIFS: fix POSIX lock leak and invalid ptr deref
Subsystems (50)
Sasha Levin
maintainerPATCH 1/262 CIFS: fix POSIX lock leak and invalid ptr deref
From: Aurelien Aptel <[email protected]>
[ Upstream commit bc31d0cdcfbadb6258b45db97e93b1c83822ba33 ]
We have a customer reporting crashes in lock_get_status() with many "Leaked POSIX lock" messages preceeding the crash.
Leaked POSIX lock on dev=0x0:0x56 ...
Leaked POSIX lock on dev=0x0:0x56 ...
Leaked POSIX lock on dev=0x0:0x56 ...
Leaked POSIX lock on dev=0x0:0x53 ...
Leaked POSIX lock on dev=0x0:0x53 ...
Leaked POSIX lock on dev=0x0:0x53 ...
Leaked POSIX lock on dev=0x0:0x53 ...
POSIX: fl_owner=ffff8900e7b79380 fl_flags=0x1 fl_type=0x1 fl_pid=20709 Leaked POSIX lock on dev=0x0:0x4b ino...
Leaked locks on dev=0x0:0x4b ino=0xf911400000029:
POSIX: fl_owner=ffff89f41c870e00 fl_flags=0x1 fl_type=0x1 fl_pid=19592
stack segment: 0000 [#1] SMP Modules linked in: binfmt_misc msr tcp_diag udp_diag inet_diag unix_diag af_packet_diag netlink_diag rpcsec_gss_krb5 arc4 ecb auth_rpcgss nfsv4 md4 nfs nls_utf8 lockd grace cifs sunrpc ccm dns_resolver fscache af_packet iscsi_ibft iscsi_boot_sysfs vmw_vsock_vmci_transport vsock xfs libcrc32c sb_edac edac_core crct10dif_pclmul crc32_pclmul ghash_clmulni_intel drbg ansi_cprng vmw_balloon aesni_intel aes_x86_64 lrw gf128mul glue_helper ablk_helper cryptd joydev pcspkr vmxnet3 i2c_piix4 vmw_vmci shpchp fjes processor button ac btrfs xor raid6_pq sr_mod cdrom ata_generic sd_mod ata_piix vmwgfx crc32c_intel drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops ttm serio_raw ahci libahci drm libata vmw_pvscsi sg dm_multipath dm_mod scsi_dh_rdac scsi_dh_emc scsi_dh_alua scsi_mod autofs4
Supported: Yes
CPU: 6 PID: 28250 Comm: lsof Not tainted 4.4.156-94.64-default #1 Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 04/05/2016 task: ffff88a345f28740 ti: ffff88c74005c000 task.ti: ffff88c74005c000 RIP: 0010:[<ffffffff8125dcab>] [<ffffffff8125dcab>] lock_get_status+0x9b/0x3b0 RSP: 0018:ffff88c74005fd90 EFLAGS: 00010202 RAX: ffff89bde83e20ae RBX: ffff89e870003d18 RCX: 0000000049534f50 RDX: ffffffff81a3541f RSI: ffffffff81a3544e RDI: ffff89bde83e20ae RBP: 0026252423222120 R08: 0000000020584953 R09: 000000000000ffff R10: 0000000000000000 R11: ffff88c74005fc70 R12: ffff89e5ca7b1340 R13: 00000000000050e5 R14: ffff89e870003d30 R15: ffff89e5ca7b1340 FS: 00007fafd64be800(0000) GS:ffff89f41fd00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000001c80018 CR3: 000000a522048000 CR4: 0000000000360670 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Stack: 0000000000000208 ffffffff81a3d6b6 ffff89e870003d30 ffff89e870003d18 ffff89e5ca7b1340 ffff89f41738d7c0 ffff89e870003d30 ffff89e5ca7b1340 ffffffff8125e08f 0000000000000000 ffff89bc22b67d00 ffff88c74005ff28 Call Trace: [<ffffffff8125e08f>] locks_show+0x2f/0x70 [<ffffffff81230ad1>] seq_read+0x251/0x3a0 [<ffffffff81275bbc>] proc_reg_read+0x3c/0x70 [<ffffffff8120e456>] __vfs_read+0x26/0x140 [<ffffffff8120e9da>] vfs_read+0x7a/0x120 [<ffffffff8120faf2>] SyS_read+0x42/0xa0 [<ffffffff8161cbc3>] entry_SYSCALL_64_fastpath+0x1e/0xb7
When Linux closes a FD (close(), close-on-exec, dup2(), ...) it calls filp_close() which also removes all posix locks.
The lock struct is initialized like so in filp_close() and passed down to cifs
...
lock.fl_type = F_UNLCK;
lock.fl_flags = FL_POSIX | FL_CLOSE;
lock.fl_start = 0;
lock.fl_end = OFFSET_MAX;
...Note the FL_CLOSE flag, which hints the VFS code that this unlocking is done for closing the fd.
filp_close()
locks_remove_posix(filp, id);
vfs_lock_file(filp, F_SETLK, &lock, NULL);
return filp->f_op->lock(filp, cmd, fl) => cifs_lock()
rc = cifs_setlk(file, flock, type, wait_flag, posix_lck, lock, unlock, xid);
rc = server->ops->mand_unlock_range(cfile, flock, xid);
if (flock->fl_flags & FL_POSIX && !rc)
rc = locks_lock_file_wait(file, flock)Notice how we don't call locks_lock_file_wait() which does the generic VFS lock/unlock/wait work on the inode if rc != 0.
If we are closing the handle, the SMB server is supposed to remove any locks associated with it. Similarly, cifs.ko frees and wakes up any lock and lock waiter when closing the file:
cifs_close()
cifsFileInfo_put(file->private_data)
/*
* Delete any outstanding lock records. We'll lose them when the file
* is closed anyway.
*/
down_write(&cifsi->lock_sem);
list_for_each_entry_safe(li, tmp, &cifs_file->llist->locks, llist) {
list_del(&li->llist);
cifs_del_lock_waiters(li);
kfree(li);
}
list_del(&cifs_file->llist->llist);
kfree(cifs_file->llist);
up_write(&cifsi->lock_sem);So we can safely ignore unlocking failures in cifs_lock() if they happen with the FL_CLOSE flag hint set as both the server and the client take care of it during the actual closing.
This is not a proper fix for the unlocking failure but it's safe and it seems to prevent the lock leakages and crashes the customer experiences.
--- fs/cifs/file.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
fs/cifs/file.c +13 -1
@@ -1645,8 +1645,20 @@ cifs_setlk(struct file *file, struct file_lock *flock, __u32 type, rc = server->ops->mand_unlock_range (cfile, flock, xid); out: -if (flock->fl_flags &FL_POSIX && !rc) +if (flock->fl_flags &FL_POSIX ) { +/* +* If this is a request to remove all locks because we +* are closing the file, it doesn't matter if the +* unlocking failed as both cifs.ko and the SMB server +* remove the lock on file close +*/ +if (rc) { +cifs_dbg (VFS ,"%s failed rc=%d\n" , __func__, rc); +if (!(flock->fl_flags &FL_CLOSE )) +return rc; + } rc =locks_lock_file_wait (file, flock); + }return rc; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 2/262 nvme-fc: fix numa_node when dev is null
From: James Smart <[email protected]>
[ Upstream commit 06f3d71ea071b70e62bcc146cd9ff7ed1f9d4e43 ]
A recent change added a numa_node field to the nvme controller and has the transport assign the node using dev_to_node(). However, fcloop registers with a NULL device struct, so the dev_to_node() call oops.
Revise the assignment to assign no node when device struct is null.
--- drivers/nvme/host/fc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/nvme/host/fc.c +4 -1
@@ -3018,7 +3018,10 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, ctrl->ctrl.opts = opts; ctrl->ctrl.nr_reconnects =0 ; - ctrl->ctrl.numa_node =dev_to_node (lport->dev); +if (lport->dev) + ctrl->ctrl.numa_node =dev_to_node (lport->dev); +else + ctrl->ctrl.numa_node =NUMA_NO_NODE ;INIT_LIST_HEAD (&ctrl->ctrl_list); ctrl->lport = lport; ctrl->rport = rport;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 3/262 nvme-loop: init nvmet_ctrl fatal_err_work when allocate
In reply to Sasha LevinFrom: Yufen Yu <[email protected]>
[ Upstream commit d11de63f2b519f0a162b834013b6d3a46dbf3886 ]
After commit 4d43d395fe (workqueue: Try to catch flush_work() without INIT_WORK()), it can cause warning when delete nvme-loop device, trace like:
[ 76.601272] Call Trace: [ 76.601646] ? del_timer+0x72/0xa0 [ 76.602156] __cancel_work_timer+0x1ae/0x270 [ 76.602791] cancel_work_sync+0x14/0x20 [ 76.603407] nvmet_ctrl_free+0x1b7/0x2f0 [nvmet] [ 76.604091] ? free_percpu+0x168/0x300 [ 76.604652] nvmet_sq_destroy+0x106/0x240 [nvmet] [ 76.605346] nvme_loop_destroy_admin_queue+0x30/0x60 [nvme_loop] [ 76.606220] nvme_loop_shutdown_ctrl+0xc3/0xf0 [nvme_loop] [ 76.607026] nvme_loop_delete_ctrl_host+0x19/0x30 [nvme_loop] [ 76.607871] nvme_do_delete_ctrl+0x75/0xb0 [ 76.608477] nvme_sysfs_delete+0x7d/0xc0 [ 76.609057] dev_attr_store+0x24/0x40 [ 76.609603] sysfs_kf_write+0x4c/0x60 [ 76.610144] kernfs_fop_write+0x19a/0x260 [ 76.610742] __vfs_write+0x1c/0x60 [ 76.611246] vfs_write+0xfa/0x280 [ 76.611739] ksys_write+0x6e/0x120 [ 76.612238] __x64_sys_write+0x1e/0x30 [ 76.612787] do_syscall_64+0xbf/0x3a0 [ 76.613329] entry_SYSCALL_64_after_hwframe+0x44/0xa9
We fix it by moving fatal_err_work init to nvmet_alloc_ctrl(), which may more reasonable.
--- drivers/nvme/target/core.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/nvme/target/core.c +10 -10
@@ -1171,6 +1171,15 @@ static void nvmet_release_p2p_ns_map(struct nvmet_ctrl *ctrl)put_device (ctrl->p2p_client); } +static void nvmet_fatal_error_handler (struct work_struct *work) +{ +struct nvmet_ctrl *ctrl = + container_of(work, struct nvmet_ctrl, fatal_err_work); + +pr_err ("ctrl %d fatal error occurred!\n" , ctrl->cntlid); + ctrl->ops->delete_ctrl (ctrl); +} +u16 nvmet_alloc_ctrl (const char *subsysnqn,const char *hostnqn,struct nvmet_req *req,u32 kato,struct nvmet_ctrl **ctrlp) {
@@ -1213,6 +1222,7 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn,INIT_WORK (&ctrl->async_event_work, nvmet_async_event_work);INIT_LIST_HEAD (&ctrl->async_events);INIT_RADIX_TREE (&ctrl->p2p_ns_map,GFP_KERNEL ); +INIT_WORK (&ctrl->fatal_err_work, nvmet_fatal_error_handler);memcpy (ctrl->subsysnqn, subsysnqn,NVMF_NQN_SIZE );memcpy (ctrl->hostnqn, hostnqn,NVMF_NQN_SIZE );
@@ -1316,21 +1326,11 @@ void nvmet_ctrl_put(struct nvmet_ctrl *ctrl)kref_put (&ctrl->ref, nvmet_ctrl_free); } -static void nvmet_fatal_error_handler (struct work_struct *work) -{ -struct nvmet_ctrl *ctrl = - container_of(work, struct nvmet_ctrl, fatal_err_work); - -pr_err ("ctrl %d fatal error occurred!\n" , ctrl->cntlid); - ctrl->ops->delete_ctrl (ctrl); -} -void nvmet_ctrl_fatal_error (struct nvmet_ctrl *ctrl) {mutex_lock (&ctrl->lock);if (!(ctrl->csts &NVME_CSTS_CFS )) { ctrl->csts |=NVME_CSTS_CFS ; -INIT_WORK (&ctrl->fatal_err_work, nvmet_fatal_error_handler);schedule_work (&ctrl->fatal_err_work); }mutex_unlock (&ctrl->lock);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 4/262 h8300: use cc-cross-prefix instead of hardcoding h8300-unknown-linux-
In reply to Sasha LevinFrom: Masahiro Yamada <[email protected]>
[ Upstream commit fc2b47b55f17fd996f7a01975ce1c33c2f2513f6 ]
It believe it is a bad idea to hardcode a specific compiler prefix that may or may not be installed on a user's system. It is annoying when testing features that should not require compilers at all.
For example, mrproper, headers_install, etc. should work without any compiler.
They look like follows on my machine.
$ make ARCH=h8300 mrproper ./scripts/gcc-version.sh: line 26: h8300-unknown-linux-gcc: command not found ./scripts/gcc-version.sh: line 27: h8300-unknown-linux-gcc: command not found make: h8300-unknown-linux-gcc: Command not found make: h8300-unknown-linux-gcc: Command not found [ a bunch of the same error messages continue ]
$ make ARCH=h8300 headers_install ./scripts/gcc-version.sh: line 26: h8300-unknown-linux-gcc: command not found ./scripts/gcc-version.sh: line 27: h8300-unknown-linux-gcc: command not found make: h8300-unknown-linux-gcc: Command not found HOSTCC scripts/basic/fixdep make: h8300-unknown-linux-gcc: Command not found WRAP arch/h8300/include/generated/uapi/asm/kvm_para.h [ snip ]
The solution is to delete this line, or to use cc-cross-prefix like some architectures do. I chose the latter as a moderate fixup.
I added an alternative 'h8300-linux-' because it is available at:
https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/8.1.0/
--- arch/h8300/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/h8300/Makefile +1 -1
@@ -27,7 +27,7 @@ KBUILD_LDFLAGS += $(ldflags-y) CHECKFLAGS += -msize-long ifeq ($(CROSS_COMPILE),) -CROSS_COMPILE := h8300-unknown-linux- +CROSS_COMPILE := $(call cc-cross-prefix, h8300-unknown-linux- h8300-linux-) endif core-y += arch/$(ARCH)/kernel/ arch/$(ARCH)/mm/
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 5/262 f2fs: fix to adapt small inline xattr space in __find_inline_xattr()
In reply to Sasha LevinFrom: Chao Yu <[email protected]>
[ Upstream commit 2c28aba8b2e2a51749fa66e01b68e1cd5b53e022 ]
With below testcase, we will fail to find existed xattr entry:
1. mkfs.f2fs -O extra_attr -O flexible_inline_xattr /dev/zram0
2. mount -t f2fs -o inline_xattr_size=1 /dev/zram0 /mnt/f2fs/
3. touch /mnt/f2fs/file
4. setfattr -n "user.name" -v 0 /mnt/f2fs/file
5. getfattr -n "user.name" /mnt/f2fs/file
/mnt/f2fs/file: user.name: No such attribute
The reason is for inode which has very small inline xattr size, __find_inline_xattr() will fail to traverse any entry due to first entry may not be loaded from xattr node yet, later, we may skip to check entire xattr datas in __find_xattr(), result in such wrong condition.
This patch adds condition to check such case to avoid this issue.
--- fs/f2fs/xattr.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
fs/f2fs/xattr.c +10 -3
@@ -224,11 +224,11 @@ static struct f2fs_xattr_entry *__find_inline_xattr(struct inode *inode, {struct f2fs_xattr_entry *entry;unsigned int inline_size =inline_xattr_size (inode); +void *max_addr = base_addr + inline_size;list_for_each_xattr (entry, base_addr) { -if ((void *)entry +sizeof (__u32) > base_addr + inline_size || - (void *)XATTR_NEXT_ENTRY (entry) +sizeof (__u32) > - base_addr + inline_size) { +if ((void *)entry +sizeof (__u32) > max_addr || + (void *)XATTR_NEXT_ENTRY (entry) > max_addr) { *last_addr = entry;return NULL ; }
@@ -239,6 +239,13 @@ static struct f2fs_xattr_entry *__find_inline_xattr(struct inode *inode,if (!memcmp (entry->e_name, name, len))break ; } + +/* inline xattr header or entry across max inline xattr size */ +if (IS_XATTR_LAST_ENTRY (entry) && + (void *)entry +sizeof (__u32) > max_addr) { + *last_addr = entry; +return NULL ; + }return entry; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 6/262 f2fs: fix to avoid deadlock in f2fs_read_inline_dir()
In reply to Sasha LevinFrom: Chao Yu <[email protected]>
[ Upstream commit aadcef64b22f668c1a107b86d3521d9cac915c24 ]
As Jiqun Li reported in bugzilla:
https://bugzilla.kernel.org/show_bug.cgi?id=202883
sometimes, dead lock when make system call SYS_getdents64 with fsync() is called by another process.
monkey running on android9.0
1. task 9785 held sbi->cp_rwsem and waiting lock_page()
2. task 10349 held mm_sem and waiting sbi->cp_rwsem
3. task 9709 held lock_page() and waiting mm_sem
so this is a dead lock scenario.
task stack is show by crash tools as following
crash_arm64> bt ffffffc03c354080
PID: 9785 TASK: ffffffc03c354080 CPU: 1 COMMAND: "RxIoScheduler-3"
Quoted 1 line
Quoted 1 line
#7 [
ffffffc01b50fac0]__lock_pageatffffff80081b11e8
crash-arm64> bt 10349
PID: 10349 TASK: ffffffc018b83080 CPU: 1 COMMAND: "BUGLY_ASYNC_UPL"
Quoted 1 line
Quoted 1 line
#3 [
ffffffc01f8cfa40]rwsem_down_read_failedatffffff8008a93afc
PC: 00000033 LR: 00000000 SP: 00000000 PSTATE: ffffffffffffffff
crash-arm64> bt 9709
PID: 9709 TASK: ffffffc03e7f3080 CPU: 1 COMMAND: "IntentService[A"
Quoted 2 lines
Quoted 2 lines
#3 [
ffffffc001e67850]rwsem_down_read_failedatffffff8008a93afc#8 [ffffffc001e67b80]el1_iaatffffff8008084fc4
PC: ffffff8008274114 [compat_filldir64+120]
LR: ffffff80083584d4 [f2fs_fill_dentries+448]
SP: ffffffc001e67b80 PSTATE: 80400145
X29: ffffffc001e67b80 X28: 0000000000000000 X27: 000000000000001a
X26: 00000000000093d7 X25: ffffffc070d52480 X24: 0000000000000008
X23: 0000000000000028 X22: 00000000d43dfd60 X21: ffffffc001e67e90
X20: 0000000000000011 X19: ffffff80093a4000 X18: 0000000000000000
X17: 0000000000000000 X16: 0000000000000000 X15: 0000000000000000
X14: ffffffffffffffff X13: 0000000000000008 X12: 0101010101010101
X11: 7f7f7f7f7f7f7f7f X10: 6a6a6a6a6a6a6a6a X9: 7f7f7f7f7f7f7f7f
X8: 0000000080808000 X7: ffffff800827409c X6: 0000000080808000
X5: 0000000000000008 X4: 00000000000093d7 X3: 000000000000001a
X2: 0000000000000011 X1: ffffffc070d52480 X0: 0000000000800238Quoted 1 line
Quoted 1 line
#9 [
ffffffc001e67be0]f2fs_fill_dentriesatffffff80083584d0
PC: 0000003c LR: 00000000 SP: 00000000 PSTATE: 000000d9
X12: f48a02ff X11: d4678960 X10: d43dfc00 X9: d4678ae4
X8: 00000058 X7: d4678994 X6: d43de800 X5: 000000d9
X4: d43dfc0c X3: d43dfc10 X2: d46799c8 X1: 00000000
X0: 00001068Below potential deadlock will happen between three threads:
Thread A Thread B Thread C
- f2fs_do_sync_file
- f2fs_write_checkpoint
- down_write(&sbi->node_change) -- 1)
- do_page_fault
- down_write(&mm->mmap_sem) -- 2)
- do_wp_page
- f2fs_vm_page_mkwrite
- getdents64
- f2fs_read_inline_dir
- lock_page -- 3)
- f2fs_sync_node_pages
- lock_page -- 3)
- __do_map_lock
- down_read(&sbi->node_change) -- 1)
- f2fs_fill_dentries
- dir_emit
- compat_filldir64
- do_page_fault
- down_read(&mm->mmap_sem) -- 2)
Since f2fs_readdir is protected by inode.i_rwsem, there should not be any updates in inode page, we're safe to lookup dents in inode page without its lock held, so taking off the lock to improve concurrency of readdir and avoid potential deadlock.
--- fs/f2fs/inline.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
fs/f2fs/inline.c +7 -1
@@ -659,6 +659,12 @@ int f2fs_read_inline_dir(struct file *file, struct dir_context *ctx,if (IS_ERR (ipage))return PTR_ERR (ipage); +/* +* f2fs_readdir was protected by inode.i_rwsem, it is safe to access +* ipage without page's lock held. +*/ +unlock_page (ipage); + inline_dentry =inline_data_addr (inode, ipage);make_dentry_ptr_inline (inode, &d, inline_dentry);
@@ -667,7 +673,7 @@ int f2fs_read_inline_dir(struct file *file, struct dir_context *ctx,if (!err) ctx->pos = d.max; -f2fs_put_page (ipage,1 ); +f2fs_put_page (ipage,0 );return err <0 ? err :0 ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 7/262 f2fs: fix to avoid deadlock of atomic file operations
In reply to Sasha LevinFrom: Chao Yu <[email protected]>
[ Upstream commit 48432984d718c95cf13e26d487c2d1b697c3c01f ]
Thread A Thread B
- __fput
- f2fs_release_file
- drop_inmem_pages
- mutex_lock(&fi->inmem_lock)
- __revoke_inmem_pages
- lock_page(page)
- open
- f2fs_setattr
- truncate_setsize
- truncate_inode_pages_range
- lock_page(page)
- truncate_cleanup_page
- f2fs_invalidate_page
- drop_inmem_page
- mutex_lock(&fi->inmem_lock);
We may encounter above ABBA deadlock as reported by Kyungtae Kim:
I'm reporting a bug in linux-4.17.19: "INFO: task hung in drop_inmem_page" (no reproducer)
I think this might be somehow related to the following:
https://groups.google.com/forum/#!searchin/syzkaller-bugs/INFO$3A$20task$20hung$20in$20%7Csort:date/syzkaller-bugs/c6soBTrdaIo/AjAzPeIzCgAJ
=========================================
INFO: task syz-executor7:10822 blocked for more than 120 seconds.
Not tainted 4.17.19 #1
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
syz-executor7 D27024 10822 6346 0x00000004
Call Trace:
context_switch kernel/sched/core.c:2867 [inline]
__schedule+0x721/0x1e60 kernel/sched/core.c:3515
schedule+0x88/0x1c0 kernel/sched/core.c:3559
schedule_preempt_disabled+0x18/0x30 kernel/sched/core.c:3617
__mutex_lock_common kernel/locking/mutex.c:833 [inline]
__mutex_lock+0x5bd/0x1410 kernel/locking/mutex.c:893
mutex_lock_nested+0x1b/0x20 kernel/locking/mutex.c:908
drop_inmem_page+0xcb/0x810 fs/f2fs/segment.c:327
f2fs_invalidate_page+0x337/0x5e0 fs/f2fs/data.c:2401
do_invalidatepage mm/truncate.c:165 [inline]
truncate_cleanup_page+0x261/0x330 mm/truncate.c:187
truncate_inode_pages_range+0x552/0x1610 mm/truncate.c:367
truncate_inode_pages mm/truncate.c:478 [inline]
truncate_pagecache+0x6d/0x90 mm/truncate.c:801
truncate_setsize+0x81/0xa0 mm/truncate.c:826
f2fs_setattr+0x44f/0x1270 fs/f2fs/file.c:781
notify_change+0xa62/0xe80 fs/attr.c:313
do_truncate+0x12e/0x1e0 fs/open.c:63
do_last fs/namei.c:2955 [inline]
path_openat+0x2042/0x29f0 fs/namei.c:3505
do_filp_open+0x1bd/0x2c0 fs/namei.c:3540
do_sys_open+0x35e/0x4e0 fs/open.c:1101
__do_sys_open fs/open.c:1119 [inline]
__se_sys_open fs/open.c:1114 [inline]
__x64_sys_open+0x89/0xc0 fs/open.c:1114
do_syscall_64+0xc4/0x4e0 arch/x86/entry/common.c:287
entry_SYSCALL_64_after_hwframe+0x49/0xbe
RIP: 0033:0x4497b9
RSP: 002b:00007f734e459c68 EFLAGS: 00000246 ORIG_RAX: 0000000000000002
RAX: ffffffffffffffda RBX: 00007f734e45a6cc RCX: 00000000004497b9
RDX: 0000000000000104 RSI: 00000000000a8280 RDI: 0000000020000080
RBP: 000000000071bea0 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 00000000ffffffff
R13: 0000000000007230 R14: 00000000006f02d0 R15: 00007f734e45a700
INFO: task syz-executor7:10858 blocked for more than 120 seconds.
Not tainted 4.17.19 #1
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
syz-executor7 D28880 10858 6346 0x00000004
Call Trace:
context_switch kernel/sched/core.c:2867 [inline]
__schedule+0x721/0x1e60 kernel/sched/core.c:3515
schedule+0x88/0x1c0 kernel/sched/core.c:3559
__rwsem_down_write_failed_common kernel/locking/rwsem-xadd.c:565 [inline]
rwsem_down_write_failed+0x5e6/0xc90 kernel/locking/rwsem-xadd.c:594
call_rwsem_down_write_failed+0x17/0x30 arch/x86/lib/rwsem.S:117
__down_write arch/x86/include/asm/rwsem.h:142 [inline]
down_write+0x58/0xa0 kernel/locking/rwsem.c:72
inode_lock include/linux/fs.h:713 [inline]
do_truncate+0x120/0x1e0 fs/open.c:61
do_last fs/namei.c:2955 [inline]
path_openat+0x2042/0x29f0 fs/namei.c:3505
do_filp_open+0x1bd/0x2c0 fs/namei.c:3540
do_sys_open+0x35e/0x4e0 fs/open.c:1101
__do_sys_open fs/open.c:1119 [inline]
__se_sys_open fs/open.c:1114 [inline]
__x64_sys_open+0x89/0xc0 fs/open.c:1114
do_syscall_64+0xc4/0x4e0 arch/x86/entry/common.c:287
entry_SYSCALL_64_after_hwframe+0x49/0xbe
RIP: 0033:0x4497b9
RSP: 002b:00007f734e3b4c68 EFLAGS: 00000246 ORIG_RAX: 0000000000000002
RAX: ffffffffffffffda RBX: 00007f734e3b56cc RCX: 00000000004497b9
RDX: 0000000000000104 RSI: 00000000000a8280 RDI: 0000000020000080
RBP: 000000000071c238 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 00000000ffffffff
R13: 0000000000007230 R14: 00000000006f02d0 R15: 00007f734e3b5700
INFO: task syz-executor5:10829 blocked for more than 120 seconds.
Not tainted 4.17.19 #1
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
syz-executor5 D28760 10829 6308 0x80000002
Call Trace:
context_switch kernel/sched/core.c:2867 [inline]
__schedule+0x721/0x1e60 kernel/sched/core.c:3515
schedule+0x88/0x1c0 kernel/sched/core.c:3559
io_schedule+0x21/0x80 kernel/sched/core.c:5179
wait_on_page_bit_common mm/filemap.c:1100 [inline]
__lock_page+0x2b5/0x390 mm/filemap.c:1273
lock_page include/linux/pagemap.h:483 [inline]
__revoke_inmem_pages+0xb35/0x11c0 fs/f2fs/segment.c:231
drop_inmem_pages+0xa3/0x3e0 fs/f2fs/segment.c:306
f2fs_release_file+0x2c7/0x330 fs/f2fs/file.c:1556
__fput+0x2c7/0x780 fs/file_table.c:209
____fput+0x1a/0x20 fs/file_table.c:243
task_work_run+0x151/0x1d0 kernel/task_work.c:113
exit_task_work include/linux/task_work.h:22 [inline]
do_exit+0x8ba/0x30a0 kernel/exit.c:865
do_group_exit+0x13b/0x3a0 kernel/exit.c:968
get_signal+0x6bb/0x1650 kernel/signal.c:2482
do_signal+0x84/0x1b70 arch/x86/kernel/signal.c:810
exit_to_usermode_loop+0x155/0x190 arch/x86/entry/common.c:162
prepare_exit_to_usermode arch/x86/entry/common.c:196 [inline]
syscall_return_slowpath arch/x86/entry/common.c:265 [inline]
do_syscall_64+0x445/0x4e0 arch/x86/entry/common.c:290
entry_SYSCALL_64_after_hwframe+0x49/0xbe
RIP: 0033:0x4497b9
RSP: 002b:00007f1c68e74ce8 EFLAGS: 00000246 ORIG_RAX: 00000000000000ca
RAX: fffffffffffffe00 RBX: 000000000071bf80 RCX: 00000000004497b9
RDX: 0000000000000000 RSI: 0000000000000000 RDI: 000000000071bf80
RBP: 000000000071bf80 R08: 0000000000000000 R09: 000000000071bf58
R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000
R13: 0000000000000000 R14: 00007f1c68e759c0 R15: 00007f1c68e75700This patch tries to use trylock_page to mitigate such deadlock condition for fix.
--- fs/f2fs/segment.c | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-)
fs/f2fs/segment.c +31 -12
@@ -215,7 +215,8 @@ void f2fs_register_inmem_page(struct inode *inode, struct page *page) }static int __revoke_inmem_pages (struct inode *inode, -struct list_head *head,bool drop,bool recover) +struct list_head *head,bool drop,bool recover, +bool trylock) {struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct inmem_pages *cur, *tmp;
@@ -227,7 +228,16 @@ static int __revoke_inmem_pages(struct inode *inode,if (drop)trace_f2fs_commit_inmem_page (page,INMEM_DROP ); -lock_page (page); +if (trylock) { +/* +* to avoid deadlock in between page lock and +* inmem_lock. +*/ +if (!trylock_page (page)) +continue ; + }else { +lock_page (page); + }f2fs_wait_on_page_writeback (page,DATA , true, true);
@@ -318,13 +328,19 @@ void f2fs_drop_inmem_pages(struct inode *inode)struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct f2fs_inode_info *fi =F2FS_I (inode); -mutex_lock (&fi->inmem_lock); -__revoke_inmem_pages (inode, &fi->inmem_pages, true, false); -spin_lock (&sbi->inode_lock[ATOMIC_FILE ]); -if (!list_empty (&fi->inmem_ilist)) -list_del_init (&fi->inmem_ilist); -spin_unlock (&sbi->inode_lock[ATOMIC_FILE ]); -mutex_unlock (&fi->inmem_lock); +while (!list_empty (&fi->inmem_pages)) { +mutex_lock (&fi->inmem_lock); +__revoke_inmem_pages (inode, &fi->inmem_pages, + true, false, true); + +if (list_empty (&fi->inmem_pages)) { +spin_lock (&sbi->inode_lock[ATOMIC_FILE ]); +if (!list_empty (&fi->inmem_ilist)) +list_del_init (&fi->inmem_ilist); +spin_unlock (&sbi->inode_lock[ATOMIC_FILE ]); + } +mutex_unlock (&fi->inmem_lock); + }clear_inode_flag (inode,FI_ATOMIC_FILE ); fi->i_gc_failures[GC_FAILURE_ATOMIC ] =0 ;
@@ -429,12 +445,15 @@ static int __f2fs_commit_inmem_pages(struct inode *inode)* recovery or rewrite & commit last transaction. For other * error number, revoking was done by filesystem itself. */ - err =__revoke_inmem_pages (inode, &revoke_list, false, true); + err =__revoke_inmem_pages (inode, &revoke_list, + false, true, false);/* drop all uncommitted pages */ -__revoke_inmem_pages (inode, &fi->inmem_pages, true, false); +__revoke_inmem_pages (inode, &fi->inmem_pages, + true, false, false); }else { -__revoke_inmem_pages (inode, &revoke_list, false, false); +__revoke_inmem_pages (inode, &revoke_list, + false, false, false); }return err;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 8/262 swiotlb: add checks for the return value of memblock_alloc*()
In reply to Sasha LevinFrom: Mike Rapoport <[email protected]>
[ Upstream commit a0bf842e89a3842162aa8514b9bf4611c86fee10 ]
Add panic() calls if memblock_alloc() returns NULL.
The panic() format duplicates the one used by memblock itself and in order to avoid explosion with long parameters list replace open coded allocation size calculations with a local variable.
--- kernel/dma/swiotlb.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
kernel/dma/swiotlb.c +13 -6
@@ -191,6 +191,7 @@ void __init swiotlb_update_mem_attributes(void)int __init swiotlb_init_with_tbl (char *tlb,unsigned long nslabs,int verbose) {unsigned long i, bytes; +size_t alloc_size; bytes = nslabs <<IO_TLB_SHIFT ;
@@ -203,12 +204,18 @@ int __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)* to find contiguous free memory regions of size up to IO_TLB_SEGSIZE * between io_tlb_start and io_tlb_end. */ - io_tlb_list =memblock_alloc ( -PAGE_ALIGN (io_tlb_nslabs *sizeof (int )), -PAGE_SIZE ); - io_tlb_orig_addr =memblock_alloc ( -PAGE_ALIGN (io_tlb_nslabs *sizeof (phys_addr_t)), -PAGE_SIZE ); + alloc_size =PAGE_ALIGN (io_tlb_nslabs *sizeof (int )); + io_tlb_list =memblock_alloc (alloc_size,PAGE_SIZE ); +if (!io_tlb_list) +panic ("%s: Failed to allocate %lu bytes align=0x%lx\n" , + __func__, alloc_size,PAGE_SIZE ); + + alloc_size =PAGE_ALIGN (io_tlb_nslabs *sizeof (phys_addr_t)); + io_tlb_orig_addr =memblock_alloc (alloc_size,PAGE_SIZE ); +if (!io_tlb_orig_addr) +panic ("%s: Failed to allocate %lu bytes align=0x%lx\n" , + __func__, alloc_size,PAGE_SIZE ); +for (i =0 ; i < io_tlb_nslabs; i++) { io_tlb_list[i] =IO_TLB_SEGSIZE -OFFSET (i,IO_TLB_SEGSIZE ); io_tlb_orig_addr[i] =INVALID_PHYS_ADDR ;
Signature · 1 line
2.19.1
Re: [PATCH AUTOSEL 5.0 008/262] swiotlb: add checks for the return value of memblock_alloc*()
Hi,
Quoted 9 lines · Sasha Levin
From: Mike Rapoport <[email protected]>
[ Upstream commit
a0bf842e89a3842162aa8514b9bf4611c86fee10]Add
panic()calls ifmemblock_alloc()returns NULL.The
panic()format duplicates the one used by memblock itself and in order to avoid explosion with long parameters list replace open coded allocation size calculations with a local variable.
This patch is a part of a series that removes panic() calls from memblock allocators rather than a fix.
Quoted 78 lines
Signed-off-by Mike Rapoport <[email protected]>Cc Catalin Marinas <[email protected]>Cc Christophe Leroy <[email protected]>Cc Christoph Hellwig <[email protected]>Cc "David S. Miller" <[email protected]>Cc Dennis Zhou <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc Greentime Hu <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Guan Xuetao <[email protected]>Cc Guo Ren <[email protected]>Cc Guo Ren <[email protected]> [c-sky]Cc Heiko Carstens <[email protected]>Cc Juergen Gross <[email protected]> [Xen]Cc Mark Salter <[email protected]>Cc Matt Turner <[email protected]>Cc Max Filippov <[email protected]>Cc Michael Ellerman <[email protected]>Cc Michal Simek <[email protected]>Cc Paul Burton <[email protected]>Cc Petr Mladek <[email protected]>Cc Richard Weinberger <[email protected]>Cc Rich Felker <[email protected]>Cc Rob Herring <[email protected]>Cc Rob Herring <[email protected]>Cc Russell King <[email protected]>Cc Stafford Horne <[email protected]>Cc Tony Luck <[email protected]>Cc Vineet Gupta <[email protected]>Cc Yoshinori Sato <[email protected]>Signed-off-by Andrew Morton <[email protected]>Signed-off-by Linus Torvalds <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- kernel/dma/swiotlb.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)kernel/dma/swiotlb.c +13
-6@@ -191,6 +191,7 @@ void __init swiotlb_update_mem_attributes(void)int __init swiotlb_init_with_tbl (char *tlb,unsigned long nslabs,int verbose) {unsigned long i, bytes; +size_t alloc_size; bytes = nslabs <<IO_TLB_SHIFT ;@@ -203,12 +204,18 @@ int __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)* to find contiguous free memory regions of size up to IO_TLB_SEGSIZE * between io_tlb_start and io_tlb_end. */ - io_tlb_list =memblock_alloc ( -PAGE_ALIGN (io_tlb_nslabs *sizeof (int )), -PAGE_SIZE ); - io_tlb_orig_addr =memblock_alloc ( -PAGE_ALIGN (io_tlb_nslabs *sizeof (phys_addr_t)), -PAGE_SIZE ); + alloc_size =PAGE_ALIGN (io_tlb_nslabs *sizeof (int )); + io_tlb_list =memblock_alloc (alloc_size,PAGE_SIZE ); +if (!io_tlb_list) +panic ("%s: Failed to allocate %lu bytes align=0x%lx\n" , + __func__, alloc_size,PAGE_SIZE ); + + alloc_size =PAGE_ALIGN (io_tlb_nslabs *sizeof (phys_addr_t)); + io_tlb_orig_addr =memblock_alloc (alloc_size,PAGE_SIZE ); +if (!io_tlb_orig_addr) +panic ("%s: Failed to allocate %lu bytes align=0x%lx\n" , + __func__, alloc_size,PAGE_SIZE ); +for (i =0 ; i < io_tlb_nslabs; i++) { io_tlb_list[i] =IO_TLB_SEGSIZE -OFFSET (i,IO_TLB_SEGSIZE ); io_tlb_orig_addr[i] =INVALID_PHYS_ADDR ;Signature · 1 line
2.19.1
Signature · 2 lines
Sincerely yours, Mike.
Sasha Levin
maintainerRe: [PATCH AUTOSEL 5.0 008/262] swiotlb: add checks for the return value of memblock_alloc*()
Quoted 7 lines · Mike Rapoport
Hi,
Quoted 4 lines · Sasha Levin
From: Mike Rapoport <[email protected]>
[ Upstream commit
a0bf842e89a3842162aa8514b9bf4611c86fee10]
Quoted 8 lines
Quoted 5 lines
Add
panic()calls ifmemblock_alloc()returns NULL.The
panic()format duplicates the one used by memblock itself and in order to avoid explosion with long parameters list replace open coded allocation size calculations with a local variable.This patch is a part of a series that removes
panic()calls from memblock allocators rather than a fix.
I've dropped it, thanks!
Sasha Levin
maintainerPATCH 9/262 i2c: sis630: correct format strings
In reply to Sasha LevinFrom: Louis Taylor <[email protected]>
[ Upstream commit 60f7691c624b41a05bfc3493d9b0519e7951b7ef ]
When compiling with -Wformat, clang warns:
drivers/i2c/busses/i2c-sis630.c:482:4: warning: format specifies type
'unsigned short' but the argument has type 'int' [-Wformat]
smbus_base + SMB_STS, ^~~~~~~~~~~~~~~~~~~~
drivers/i2c/busses/i2c-sis630.c:483:4: warning: format specifies type
'unsigned short' but the argument has type 'int' [-Wformat]
smbus_base + SMB_STS + SIS630_SMB_IOREGION - 1);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~drivers/i2c/busses/i2c-sis630.c:531:37: warning: format specifies type
'unsigned short' but the argument has type 'int' [-Wformat]
"SMBus SIS630 adapter at %04hx", smbus_base + SMB_STS);
~~~~~ ^~~~~~~~~~~~~~~~~~~~This patch fixes the format strings to use the format type for int.
--- drivers/i2c/busses/i2c-sis630.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/i2c/busses/i2c-sis630.c +2 -2
@@ -478,7 +478,7 @@ static int sis630_setup(struct pci_dev *sis630_dev)if (!request_region (smbus_base +SMB_STS ,SIS630_SMB_IOREGION , sis630_driver.name)) {dev_err (&sis630_dev->dev, -"I/O Region 0x%04hx-0x%04hx for SMBus already in use.\n" , +"I/O Region 0x%04x-0x%04x for SMBus already in use.\n" , smbus_base +SMB_STS , smbus_base +SMB_STS +SIS630_SMB_IOREGION -1 ); retval = -EBUSY ;
@@ -528,7 +528,7 @@ static int sis630_probe(struct pci_dev *dev, const struct pci_device_id *id) sis630_adapter.dev.parent = &dev->dev;snprintf (sis630_adapter.name,sizeof (sis630_adapter.name), -"SMBus SIS630 adapter at %04hx" , smbus_base +SMB_STS ); +"SMBus SIS630 adapter at %04x" , smbus_base +SMB_STS );return i2c_add_adapter (&sis630_adapter); }
Signature · 1 line
2.19.1
Re: [PATCH AUTOSEL 5.0 009/262] i2c: sis630: correct format strings
Quoted 12 lines
From: Louis Taylor <[email protected]>
[ Upstream commit
60f7691c624b41a05bfc3493d9b0519e7951b7ef]When compiling with -Wformat, clang warns:
drivers/i2c/busses/i2c-sis630.c:482:4: warning: format specifies type
'unsigned short' but the argument has type 'int' [-Wformat]
smbus_base+SMB_STS, ^~~~~~~~~~~~~~~~~~~~
drivers/i2c/busses/i2c-sis630.c:483:4: warning: format specifies type
Quoted 8 lines
'unsigned short' but the argument has type 'int' [-Wformat] smbus_base + SMB_STS + SIS630_SMB_IOREGION - 1); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/i2c/busses/i2c-sis630.c:531:37: warning: format specifies type'unsigned short' but the argument has type 'int' [-Wformat] "SMBus SIS630 adapter at %04hx", smbus_base + SMB_STS); ~~~~~ ^~~~~~~~~~~~~~~~~~~~
Warning with unsupported compiler; not a "serious bug".
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Sasha Levin
maintainerPATCH 10/262 apparmor: fix double free when unpack of secmark rules fails
In reply to Sasha LevinFrom: John Johansen <[email protected]>
[ Upstream commit d8dbb581d4f86a2ac669c056fc71a28ebeb367f4 ]
if secmark rules fail to unpack a double free happens resulting in the following oops
[ 1295.584074] audit: type=1400 audit(1549970525.256:51): apparmor="STATUS" info="failed to unpack profile secmark rules" error=-71 profile="unconfined" name="/root/test" pid=29882 comm="apparmor_parser" name="/root/test" offset=120 [ 1374.042334] ------------[ cut here ]------------ [ 1374.042336] kernel BUG at mm/slub.c:294! [ 1374.042404] invalid opcode: 0000 [#1] SMP PTI [ 1374.042436] CPU: 0 PID: 29921 Comm: apparmor_parser Not tainted 4.20.7-042007-generic #201902061234 [ 1374.042461] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014 [ 1374.042489] RIP: 0010:kfree+0x164/0x180 [ 1374.042502] Code: 74 05 41 0f b6 72 51 4c 89 d7 e8 37 cd f8 ff eb 8b 41 b8 01 00 00 00 48 89 d9 48 89 da 4c 89 d6 e8 11 f6 ff ff e9 72 ff ff ff <0f> 0b 49 8b 42 08 a8 01 75 c2 0f 0b 48 8b 3d a9 f4 19 01 e9 c5 fe [ 1374.042552] RSP: 0018:ffffaf7b812d7b90 EFLAGS: 00010246 [ 1374.042568] RAX: ffff91e437679200 RBX: ffff91e437679200 RCX: ffff91e437679200 [ 1374.042589] RDX: 00000000000088b6 RSI: ffff91e43da27060 RDI: ffff91e43d401a80 [ 1374.042609] RBP: ffffaf7b812d7ba8 R08: 0000000000027080 R09: ffffffffa6627a6d [ 1374.042629] R10: ffffd3af41dd9e40 R11: ffff91e43a1740dc R12: ffff91e3f52e8000 [ 1374.042650] R13: ffffffffa6627a6d R14: ffffffffffffffb9 R15: 0000000000000001 [ 1374.042675] FS: 00007f928df77740(0000) GS:ffff91e43da00000(0000) knlGS:0000000000000000 [ 1374.042697] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1374.042714] CR2: 000055a0c3ab6b50 CR3: 0000000079ed8004 CR4: 0000000000360ef0 [ 1374.042737] Call Trace: [ 1374.042750] kzfree+0x2d/0x40 [ 1374.042763] aa_free_profile+0x12b/0x270 [ 1374.042776] unpack_profile+0xc1/0xf10 [ 1374.042790] aa_unpack+0x115/0x4e0 [ 1374.042802] aa_replace_profiles+0x8e/0xcc0 [ 1374.042817] ? kvmalloc_node+0x6d/0x80 [ 1374.042831] ? __check_object_size+0x166/0x192 [ 1374.042845] policy_update+0xcf/0x1b0 [ 1374.042858] profile_load+0x7d/0xa0 [ 1374.042871] __vfs_write+0x3a/0x190 [ 1374.042883] ? apparmor_file_permission+0x1a/0x20 [ 1374.042899] ? security_file_permission+0x31/0xc0 [ 1374.042918] ? _cond_resched+0x19/0x30 [ 1374.042931] vfs_write+0xab/0x1b0 [ 1374.042963] ksys_write+0x55/0xc0 [ 1374.043004] __x64_sys_write+0x1a/0x20 [ 1374.043046] do_syscall_64+0x5a/0x110 [ 1374.043087] entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- security/apparmor/policy_unpack.c | 1 + 1 file changed, 1 insertion(+)
security/apparmor/policy_unpack.c +1 -0
@@ -579,6 +579,7 @@ static bool unpack_secmark(struct aa_ext *e, struct aa_profile *profile)kfree (profile->secmark[i].label);kfree (profile->secmark); profile->secmark_count =0 ; + profile->secmark =NULL ; } e->pos = pos;
Signature · 1 line
2.19.1
Re: [PATCH AUTOSEL 5.0 010/262] apparmor: fix double free when unpack of secmark rules fails
Quoted 4 lines
From: John Johansen <[email protected]>
[ Upstream commit
d8dbb581d4f86a2ac669c056fc71a28ebeb367f4]
Quoted 8 lines
if secmark rules fail to unpack a double free happens resulting in the following oops
Fixes 9caafbe2b4cf ("apparmor: Parse secmark policy")Reported-by Alex Murray <[email protected]>Signed-off-by John Johansen <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Acked-for-stable: Pavel Machek <[email protected]>
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Sasha Levin
maintainerPATCH 11/262 tracing: kdb: Fix ftdump to not sleep
In reply to Sasha LevinFrom: Douglas Anderson <[email protected]>
[ Upstream commit 31b265b3baaf55f209229888b7ffea523ddab366 ]
As reported back in 2016-11 [1], the "ftdump" kdb command triggers a BUG for "sleeping function called from invalid context".
kdb's "ftdump" command wants to call ring_buffer_read_prepare() in atomic context. A very simple solution for this is to add allocation flags to ring_buffer_read_prepare() so kdb can call it without triggering the allocation error. This patch does that.
Note that in the original email thread about this, it was suggested that perhaps the solution for kdb was to either preallocate the buffer ahead of time or create our own iterator. I'm hoping that this alternative of adding allocation flags to ring_buffer_read_prepare() can be considered since it means I don't need to duplicate more of the core trace code into "trace_kdb.c" (for either creating my own iterator or re-preparing a ring allocator whose memory was already allocated).
NOTE: another option for kdb is to actually figure out how to make it reuse the existing ftrace_dump() function and totally eliminate the duplication. This sounds very appealing and actually works (the "sr z" command can be seen to properly dump the ftrace buffer). The downside here is that ftrace_dump() fully consumes the trace buffer. Unless that is changed I'd rather not use it because it means "ftdump | grep xyz" won't be very useful to search the ftrace buffer since it will throw away the whole trace on the first grep. A future patch to dump only the last few lines of the buffer will also be hard to implement.
[1] https://lkml.kernel.org/r/[email protected]
--- include/linux/ring_buffer.h | 2 +- kernel/trace/ring_buffer.c | 5 +++-- kernel/trace/trace.c | 6 ++++-- kernel/trace/trace_kdb.c | 6 ++++-- 4 files changed, 12 insertions(+), 7 deletions(-)
include/linux/ring_buffer.h +1 -1
@@ -128,7 +128,7 @@ ring_buffer_consume(struct ring_buffer *buffer, int cpu, u64 *ts, unsigned long *lost_events);struct ring_buffer_iter * -ring_buffer_read_prepare (struct ring_buffer *buffer,int cpu); +ring_buffer_read_prepare (struct ring_buffer *buffer,int cpu,gfp_t flags);void ring_buffer_read_prepare_sync (void );void ring_buffer_read_start (struct ring_buffer_iter *iter);void ring_buffer_read_finish (struct ring_buffer_iter *iter);
kernel/trace/ring_buffer.c +3 -2
@@ -4205,6 +4205,7 @@ EXPORT_SYMBOL_GPL(ring_buffer_consume);* ring_buffer_read_prepare - Prepare for a non consuming read of the buffer * @buffer: The ring buffer to read from * @cpu: The cpu buffer to iterate over +* @flags: gfp flags to use for memory allocation * * This performs the initial preparations necessary to iterate * through the buffer. Memory is allocated, buffer recording
@@ -4222,7 +4223,7 @@ EXPORT_SYMBOL_GPL(ring_buffer_consume);* This overall must be paired with ring_buffer_read_finish. */ struct ring_buffer_iter * -ring_buffer_read_prepare (struct ring_buffer *buffer,int cpu) +ring_buffer_read_prepare (struct ring_buffer *buffer,int cpu,gfp_t flags) {struct ring_buffer_per_cpu *cpu_buffer;struct ring_buffer_iter *iter;
@@ -4230,7 +4231,7 @@ ring_buffer_read_prepare(struct ring_buffer *buffer, int cpu)if (!cpumask_test_cpu (cpu, buffer->cpumask))return NULL ; - iter =kmalloc (sizeof (*iter),GFP_KERNEL ); + iter =kmalloc (sizeof (*iter), flags);if (!iter)return NULL ;
kernel/trace/trace.c +4 -2
@@ -3904,7 +3904,8 @@ __tracing_open(struct inode *inode, struct file *file, bool snapshot)if (iter->cpu_file ==RING_BUFFER_ALL_CPUS ) {for_each_tracing_cpu (cpu) { iter->buffer_iter[cpu] = -ring_buffer_read_prepare (iter->trace_buffer->buffer, cpu); +ring_buffer_read_prepare (iter->trace_buffer->buffer, + cpu,GFP_KERNEL ); }ring_buffer_read_prepare_sync ();for_each_tracing_cpu (cpu) {
@@ -3914,7 +3915,8 @@ __tracing_open(struct inode *inode, struct file *file, bool snapshot) }else { cpu = iter->cpu_file; iter->buffer_iter[cpu] = -ring_buffer_read_prepare (iter->trace_buffer->buffer, cpu); +ring_buffer_read_prepare (iter->trace_buffer->buffer, + cpu,GFP_KERNEL );ring_buffer_read_prepare_sync ();ring_buffer_read_start (iter->buffer_iter[cpu]);tracing_iter_reset (iter, cpu);
kernel/trace/trace_kdb.c +4 -2
@@ -51,14 +51,16 @@ static void ftrace_dump_buf(int skip_lines, long cpu_file)if (cpu_file ==RING_BUFFER_ALL_CPUS ) {for_each_tracing_cpu (cpu) { iter.buffer_iter[cpu] = -ring_buffer_read_prepare (iter.trace_buffer->buffer, cpu); +ring_buffer_read_prepare (iter.trace_buffer->buffer, + cpu,GFP_ATOMIC );ring_buffer_read_start (iter.buffer_iter[cpu]);tracing_iter_reset (&iter, cpu); } }else { iter.cpu_file = cpu_file; iter.buffer_iter[cpu_file] = -ring_buffer_read_prepare (iter.trace_buffer->buffer, cpu_file); +ring_buffer_read_prepare (iter.trace_buffer->buffer, + cpu_file,GFP_ATOMIC );ring_buffer_read_start (iter.buffer_iter[cpu_file]);tracing_iter_reset (&iter, cpu_file); }
Signature · 1 line
2.19.1
Re: [PATCH AUTOSEL 5.0 011/262] tracing: kdb: Fix ftdump to not sleep
Quoted 11 lines
From: Douglas Anderson <[email protected]>
[ Upstream commit
31b265b3baaf55f209229888b7ffea523ddab366]As reported back in 2016-11 [1], the "ftdump" kdb command triggers a BUG for "sleeping function called from invalid context".
kdb's "ftdump" command wants to call
ring_buffer_read_prepare()in atomic context. A very simple solution for this is to add allocation flags toring_buffer_read_prepare()so kdb can call it without triggering the allocation error. This patch does that.
I see solution is simple, but now we have a loop with GFP_ATOMIC allocations inside. How many "tracing spus" is this expected to loop over? Will not it exhaust atomically available pages and reliably fail in common configurations?
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH AUTOSEL 5.0 011/262] tracing: kdb: Fix ftdump to not sleep
Hi,
Quoted 13 lines · Pavel Machek
Quoted 5 lines
From: Douglas Anderson <[email protected]>
[ Upstream commit
31b265b3baaf55f209229888b7ffea523ddab366]Quoted 7 lines
As reported back in 2016-11 [1], the "ftdump" kdb command triggers a BUG for "sleeping function called from invalid context".
kdb's "ftdump" command wants to call
ring_buffer_read_prepare()in atomic context. A very simple solution for this is to add allocation flags toring_buffer_read_prepare()so kdb can call it without triggering the allocation error. This patch does that.
Quoted 5 lines
I see solution is simple, but now we have a loop with
GFP_ATOMICallocations inside. How many "tracing spus" is this expected to loop over? Will not it exhaust atomically available pages and reliably fail in common configurations?
Pavel
Each one of these allocations is ~32 bytes and you do one per CPU. Even with systems with a lot of CPUs that's not going to be tons. ...and you only do it with GFP_ATOMIC when you're actively dropped into kdb and debugging. It seems like going for simplicity is the right call here, but of course if Steven or Daniel say that it has to be done a different way then they're the true authorities.
-Doug
Re: [PATCH AUTOSEL 5.0 011/262] tracing: kdb: Fix ftdump to not sleep
Quoted 6 lines · On Thu, 28 Mar 2019 12:45:18 -0700 Doug Anderson <[email protected]> wrote:
Quoted 5 lines
I see solution is simple, but now we have a loop with
GFP_ATOMICallocations inside. How many "tracing spus" is this expected to loop over? Will not it exhaust atomically available pages and reliably fail in common configurations?
Pavel
Quoted 6 lines
Each one of these allocations is ~32 bytes and you do one per CPU. Even with systems with a lot of CPUs that's not going to be tons. ...and you only do it with
GFP_ATOMICwhen you're actively dropped into kdb and debugging. It seems like going for simplicity is the right call here, but of course if Steven or Daniel say that it has to be done a different way then they're the true authorities.
I really don't care. The code in question is only affected when we have CONFIG_KGDB_KDB enabled. But as it gets called from an atomic context, is it any different than what it was doing before? Except now with GFP_ATOMIC it is actually safer.
Now, we could add some helper functions in the ring-buffer code to allow us to pre-allocate the ring_buffer_iter at boot up. Then we could pass in the per-allocated iters and use them here.
-- Steve
Re: [PATCH AUTOSEL 5.0 011/262] tracing: kdb: Fix ftdump to not sleep
Quoted 16 lines · Steven Rostedt
Quoted 6 lines · On Thu, 28 Mar 2019 12:45:18 -0700 Doug Anderson <[email protected]> wrote:
Quoted 5 lines
I see solution is simple, but now we have a loop with
GFP_ATOMICallocations inside. How many "tracing spus" is this expected to loop over? Will not it exhaust atomically available pages and reliably fail in common configurations?
PavelQuoted 6 lines
Each one of these allocations is ~32 bytes and you do one per CPU. Even with systems with a lot of CPUs that's not going to be tons. ...and you only do it with
GFP_ATOMICwhen you're actively dropped into kdb and debugging. It seems like going for simplicity is the right call here, but of course if Steven or Daniel say that it has to be done a different way then they're the true authorities.
Quoted 8 lines
I really don't care. The code in question is only affected when we have
CONFIG_KGDB_KDBenabled. But as it gets called from an atomic context, is it any different than what it was doing before? Except now withGFP_ATOMICit is actually safer.Now, we could add some helper functions in the ring-buffer code to allow us to pre-allocate the
ring_buffer_iterat boot up. Then we could pass in the per-allocated iters and use them here.
Ok, I guess 32 bytes is small enough, I somehow imagined it would be bigger...
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Sasha Levin
maintainerPATCH 12/262 net/mlx5e: Fix access to non-existing receive queue
In reply to Sasha LevinFrom: Tariq Toukan <[email protected]>
[ Upstream commit c475e11e82d16133304321bae285c5c1d4cfc856 ]
In case number of channels is changed while interface is down, RSS indirection table is mistakenly not modified accordingly, causing access to out-of-range non-existing object.
Fix by updating the RSS indireciton table also in the early return flow of interface down.
--- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +3 -0
@@ -357,6 +357,9 @@ int mlx5e_ethtool_set_channels(struct mlx5e_priv *priv,if (!test_bit (MLX5E_STATE_OPENED , &priv->state)) { priv->channels.params = new_channels.params; +if (!netif_is_rxfh_configured (priv->netdev)) +mlx5e_build_default_indir_rqt (priv->rss_params.indirection_rqt, +MLX5E_INDIR_RQT_SIZE , count); goto out; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 13/262 net/mlx5: Avoid panic when setting vport rate
In reply to Sasha LevinFrom: Tonghao Zhang <[email protected]>
[ Upstream commit 24319258660a84dd77f4be026a55b10a12524919 ]
If we try to set VFs rate on a VF (not PF) net device, the kernel will be crash. The commands are show as below:
$ echo 2 > /sys/class/net/$MLX_PF0/device/sriov_numvfs $ ip link set $MLX_VF0 vf 0 max_tx_rate 2 min_tx_rate 1
If not applied the first patch ("net/mlx5: Avoid panic when setting vport mac, getting vport config"), the command:
$ ip link set $MLX_VF0 vf 0 rate 100
can also crash the kernel.
[ 1650.006388] RIP: 0010:mlx5_eswitch_set_vport_rate+0x1f/0x260 [mlx5_core] [ 1650.007092] do_setlink+0x982/0xd20 [ 1650.007129] __rtnl_newlink+0x528/0x7d0 [ 1650.007374] rtnl_newlink+0x43/0x60 [ 1650.007407] rtnetlink_rcv_msg+0x2a2/0x320 [ 1650.007484] netlink_rcv_skb+0xcb/0x100 [ 1650.007519] netlink_unicast+0x17f/0x230 [ 1650.007554] netlink_sendmsg+0x2d2/0x3d0 [ 1650.007592] sock_sendmsg+0x36/0x50 [ 1650.007625] ___sys_sendmsg+0x280/0x2a0 [ 1650.007963] __sys_sendmsg+0x58/0xa0 [ 1650.007998] do_syscall_64+0x5b/0x180 [ 1650.009438] entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +9 -4
@@ -2059,19 +2059,24 @@ static int normalize_vports_min_rate(struct mlx5_eswitch *esw, u32 divider)int mlx5_eswitch_set_vport_rate (struct mlx5_eswitch *esw,int vport,u32 max_rate,u32 min_rate) { -u32 fw_max_bw_share =MLX5_CAP_QOS (esw->dev, max_tsar_bw_share); -bool min_rate_supported =MLX5_CAP_QOS (esw->dev, esw_bw_share) && - fw_max_bw_share >=MLX5_MIN_BW_SHARE ; -bool max_rate_supported =MLX5_CAP_QOS (esw->dev, esw_rate_limit);struct mlx5_vport *evport; +u32 fw_max_bw_share;u32 previous_min_rate;u32 divider; +bool min_rate_supported; +bool max_rate_supported;int err =0 ;if (!ESW_ALLOWED (esw))return -EPERM ;if (!LEGAL_VPORT (esw, vport))return -EINVAL ; + + fw_max_bw_share =MLX5_CAP_QOS (esw->dev, max_tsar_bw_share); + min_rate_supported =MLX5_CAP_QOS (esw->dev, esw_bw_share) && + fw_max_bw_share >=MLX5_MIN_BW_SHARE ; + max_rate_supported =MLX5_CAP_QOS (esw->dev, esw_rate_limit); +if ((min_rate && !min_rate_supported) || (max_rate && !max_rate_supported))return -EOPNOTSUPP ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 14/262 net/mlx5: Avoid panic when setting vport mac, getting vport config
In reply to Sasha LevinFrom: Tonghao Zhang <[email protected]>
[ Upstream commit 6e77c413e8e73d0f36b5358b601389d75ec4451c ]
If we try to set VFs mac address on a VF (not PF) net device, the kernel will be crash. The commands are show as below:
$ echo 2 > /sys/class/net/$MLX_PF0/device/sriov_numvfs $ ip link set $MLX_VF0 vf 0 mac 00:11:22:33:44:00
[exception RIP: mlx5_eswitch_set_vport_mac+41] [ffffb8b7079e3688] do_setlink at ffffffff8f67f85b [ffffb8b7079e37a8] __rtnl_newlink at ffffffff8f683778 [ffffb8b7079e3b68] rtnl_newlink at ffffffff8f683a63 [ffffb8b7079e3b90] rtnetlink_rcv_msg at ffffffff8f67d812 [ffffb8b7079e3c10] netlink_rcv_skb at ffffffff8f6b88ab [ffffb8b7079e3c60] netlink_unicast at ffffffff8f6b808f [ffffb8b7079e3ca0] netlink_sendmsg at ffffffff8f6b8412 [ffffb8b7079e3d18] sock_sendmsg at ffffffff8f6452f6 [ffffb8b7079e3d30] ___sys_sendmsg at ffffffff8f645860 [ffffb8b7079e3eb0] __sys_sendmsg at ffffffff8f647a38 [ffffb8b7079e3f38] do_syscall_64 at ffffffff8f00401b [ffffb8b7079e3f50] entry_SYSCALL_64_after_hwframe at ffffffff8f80008c
and
[exception RIP: mlx5_eswitch_get_vport_config+12] [ffffa70607e57678] mlx5e_get_vf_config at ffffffffc03c7f8f [mlx5_core] [ffffa70607e57688] do_setlink at ffffffffbc67fa59 [ffffa70607e577a8] __rtnl_newlink at ffffffffbc683778 [ffffa70607e57b68] rtnl_newlink at ffffffffbc683a63 [ffffa70607e57b90] rtnetlink_rcv_msg at ffffffffbc67d812 [ffffa70607e57c10] netlink_rcv_skb at ffffffffbc6b88ab [ffffa70607e57c60] netlink_unicast at ffffffffbc6b808f [ffffa70607e57ca0] netlink_sendmsg at ffffffffbc6b8412 [ffffa70607e57d18] sock_sendmsg at ffffffffbc6452f6 [ffffa70607e57d30] ___sys_sendmsg at ffffffffbc645860 [ffffa70607e57eb0] __sys_sendmsg at ffffffffbc647a38 [ffffa70607e57f38] do_syscall_64 at ffffffffbc00401b [ffffa70607e57f50] entry_SYSCALL_64_after_hwframe at ffffffffbc80008c
--- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +2 -2
@@ -1812,7 +1812,7 @@ int mlx5_eswitch_set_vport_mac(struct mlx5_eswitch *esw,u64 node_guid;int err =0 ; -if (!MLX5_CAP_GEN (esw->dev, vport_group_manager)) +if (!esw || !MLX5_CAP_GEN (esw->dev, vport_group_manager))return -EPERM ;if (!LEGAL_VPORT (esw, vport) ||is_multicast_ether_addr (mac))return -EINVAL ;
@@ -1886,7 +1886,7 @@ int mlx5_eswitch_get_vport_config(struct mlx5_eswitch *esw, {struct mlx5_vport *evport; -if (!MLX5_CAP_GEN (esw->dev, vport_group_manager)) +if (!esw || !MLX5_CAP_GEN (esw->dev, vport_group_manager))return -EPERM ;if (!LEGAL_VPORT (esw, vport))return -EINVAL ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 15/262 memblock: memblock_phys_alloc_try_nid(): don't panic
In reply to Sasha LevinFrom: Mike Rapoport <[email protected]>
[ Upstream commit 337555744e6e39dd1d87698c6084dd88a606d60a ]
The memblock_phys_alloc_try_nid() function tries to allocate memory from the requested node and then falls back to allocation from any node in the system. The memblock_alloc_base() fallback used by this function panics if the allocation fails.
Replace the memblock_alloc_base() fallback with the direct call to memblock_alloc_range_nid() and update the memblock_phys_alloc_try_nid() callers to check the returned value and panic in case of error.
--- arch/arm64/mm/numa.c | 4 ++++ arch/powerpc/mm/numa.c | 4 ++++ mm/memblock.c | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-)
arch/arm64/mm/numa.c +4 -0
@@ -237,6 +237,10 @@ static void __init setup_node_data(int nid, u64 start_pfn, u64 end_pfn)pr_info ("Initmem setup node %d [<memory-less node>]\n" , nid); nd_pa =memblock_phys_alloc_try_nid (nd_size,SMP_CACHE_BYTES , nid); +if (!nd_pa) +panic ("Cannot allocate %zu bytes for node %d data\n" , + nd_size, nid); + nd =__va (nd_pa);/* report and initialize */
arch/powerpc/mm/numa.c +4 -0
@@ -788,6 +788,10 @@ static void __init setup_node_data(int nid, u64 start_pfn, u64 end_pfn)int tnid; nd_pa =memblock_phys_alloc_try_nid (nd_size,SMP_CACHE_BYTES , nid); +if (!nd_pa) +panic ("Cannot allocate %zu bytes for node %d data\n" , + nd_size, nid); + nd =__va (nd_pa);/* report and initialize */
mm/memblock.c +3 -1
@@ -1342,7 +1342,9 @@ phys_addr_t __init memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t aliif (res)return res; -return memblock_alloc_base (size, align,MEMBLOCK_ALLOC_ACCESSIBLE ); +return memblock_alloc_range_nid (size, align,0 , +MEMBLOCK_ALLOC_ACCESSIBLE , +NUMA_NO_NODE ,MEMBLOCK_NONE ); }/**
Signature · 1 line
2.19.1
Re: [PATCH AUTOSEL 5.0 015/262] memblock: memblock_phys_alloc_try_nid(): don't panic
Hi,
Quoted 4 lines · Sasha Levin
From: Mike Rapoport <[email protected]>
[ Upstream commit
337555744e6e39dd1d87698c6084dd88a606d60a]
Quoted 8 lines
The
memblock_phys_alloc_try_nid()function tries to allocate memory from the requested node and then falls back to allocation from any node in the system. Thememblock_alloc_base()fallback used by this function panics if the allocation fails.Replace the
memblock_alloc_base()fallback with the direct call tomemblock_alloc_range_nid()and update thememblock_phys_alloc_try_nid()callers to check the returned value and panic in case of error.
This is a part of memblock refactoring, I don't think it should be applied to -stable.
Quoted 88 lines
Signed-off-by Mike Rapoport <[email protected]>Cc Catalin Marinas <[email protected]>Cc Christophe Leroy <[email protected]>Cc Christoph Hellwig <[email protected]>Cc "David S. Miller" <[email protected]>Cc Dennis Zhou <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc Greentime Hu <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Guan Xuetao <[email protected]>Cc Guo Ren <[email protected]>Cc Guo Ren <[email protected]> [c-sky]Cc Heiko Carstens <[email protected]>Cc Juergen Gross <[email protected]> [Xen]Cc Mark Salter <[email protected]>Cc Matt Turner <[email protected]>Cc Max Filippov <[email protected]>Cc Michal Simek <[email protected]>Cc Paul Burton <[email protected]>Cc Petr Mladek <[email protected]>Cc Richard Weinberger <[email protected]>Cc Rich Felker <[email protected]>Cc Rob Herring <[email protected]>Cc Rob Herring <[email protected]>Cc Russell King <[email protected]>Cc Stafford Horne <[email protected]>Cc Tony Luck <[email protected]>Cc Vineet Gupta <[email protected]>Cc Yoshinori Sato <[email protected]>Signed-off-by Andrew Morton <[email protected]>Signed-off-by Linus Torvalds <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- arch/arm64/mm/numa.c | 4 ++++ arch/powerpc/mm/numa.c | 4 ++++ mm/memblock.c | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-)arch/arm64/mm/numa.c +4
-0@@ -237,6 +237,10 @@ static void __init setup_node_data(int nid, u64 start_pfn, u64 end_pfn)pr_info ("Initmem setup node %d [<memory-less node>]\n" , nid); nd_pa =memblock_phys_alloc_try_nid (nd_size,SMP_CACHE_BYTES , nid); +if (!nd_pa) +panic ("Cannot allocate %zu bytes for node %d data\n" , + nd_size, nid); + nd =__va (nd_pa);/* report and initialize */ arch/powerpc/mm/numa.c +4
-0@@ -788,6 +788,10 @@ static void __init setup_node_data(int nid, u64 start_pfn, u64 end_pfn)int tnid; nd_pa =memblock_phys_alloc_try_nid (nd_size,SMP_CACHE_BYTES , nid); +if (!nd_pa) +panic ("Cannot allocate %zu bytes for node %d data\n" , + nd_size, nid); + nd =__va (nd_pa);/* report and initialize */ mm/memblock.c +3
-1@@ -1342,7 +1342,9 @@ phys_addr_t __init memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t aliif (res)return res; -return memblock_alloc_base (size, align,MEMBLOCK_ALLOC_ACCESSIBLE ); +return memblock_alloc_range_nid (size, align,0 , +MEMBLOCK_ALLOC_ACCESSIBLE , +NUMA_NO_NODE ,MEMBLOCK_NONE ); }/** Signature · 1 line
2.19.1
Signature · 2 lines
Sincerely yours, Mike.
Sasha Levin
maintainerRe: [PATCH AUTOSEL 5.0 015/262] memblock: memblock_phys_alloc_try_nid(): don't panic
Quoted 12 lines · Mike Rapoport
Hi,
Quoted 9 lines · Sasha Levin
From: Mike Rapoport <[email protected]>
[ Upstream commit
337555744e6e39dd1d87698c6084dd88a606d60a]The
memblock_phys_alloc_try_nid()function tries to allocate memory from the requested node and then falls back to allocation from any node in the system. Thememblock_alloc_base()fallback used by this function panics if the allocation fails.
Quoted 6 lines
Quoted 3 lines
Replace the
memblock_alloc_base()fallback with the direct call tomemblock_alloc_range_nid()and update thememblock_phys_alloc_try_nid()callers to check the returned value and panic in case of error.This is a part of memblock refactoring, I don't think it should be applied to -stable.
Dropped, thanks!
--
Thanks,
Sasha
Sasha Levin
maintainerPATCH 16/262 xsk: fix to reject invalid flags in xsk_bind
In reply to Sasha LevinFrom: Björn Töpel <[email protected]>
[ Upstream commit f54ba391d88f5a5d032175b4c308c176e34b80b7 ]
Passing a non-existing flag in the sxdp_flags member of struct sockaddr_xdp was, incorrectly, silently ignored. This patch addresses that behavior, and rejects any non-existing flags.
We have examined existing user space code, and to our best knowledge, no one is relying on the current incorrect behavior. AF_XDP is still in its infancy, so from our perspective, the risk of breakage is very low, and addressing this problem now is important.
--- net/xdp/xsk.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/xdp/xsk.c +4 -1
@@ -407,6 +407,10 @@ static int xsk_bind(struct socket *sock, struct sockaddr *addr, int addr_len)if (sxdp->sxdp_family !=AF_XDP )return -EINVAL ; + flags = sxdp->sxdp_flags; +if (flags & ~(XDP_SHARED_UMEM |XDP_COPY |XDP_ZEROCOPY )) +return -EINVAL ; +mutex_lock (&xs->mutex);if (xs->dev) { err = -EBUSY ;
@@ -425,7 +429,6 @@ static int xsk_bind(struct socket *sock, struct sockaddr *addr, int addr_len) } qid = sxdp->sxdp_queue_id; - flags = sxdp->sxdp_flags;if (flags &XDP_SHARED_UMEM ) {struct xdp_sock *umem_xs;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 17/262 clk: ti: clkctrl: Fix clkdm_name regression for TI_CLK_CLKCTRL_COMPAT
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit d17a718db40df2548e99a62dc3d7e5e2b38143cc ]
Commit a72d785021cb ("clk: ti: Prepare for remove of OF node name") changed the code to use kasprintf() for provider->clkdm_name but also changed the offset used later on by three. We don't need to change the offset as we already have the extra three characters in the format for kasprintf with "%pOFnxxx".
This caused the clocks with TI_CLK_CLKCTRL_COMPAT to have NULL clk->clkdm_name for omap4 and 5. And null clkdm_name can cause module reset, enable, and idle to fail.
The issue can also be seen also when enabling DEBUG for clkctrl.c and then we start seeing "clock: could not associate" messages for omap4 and 5 as the generated name is something like "l4_wkclkdm" instead of "l4_wkup_clkdm" that's needed.
Let's fix the issue with a partial revert of commit a72d785021cb ("clk:
ti: Prepare for remove of OF node name").
ALso note that in general code should not depend on the dts node names. And the node names should be generic types like clock-domain in this case. This could be fixed later by using separate compatible properties for the clockdomains, or by adding soc_device_match() table with reg offsets to the driver. But let's fix the regression first.
--- drivers/clk/ti/clkctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/ti/clkctrl.c +1 -1
@@ -530,7 +530,7 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node)* Create default clkdm name, replace _cm from end of parent * node name with _clkdm */ - provider->clkdm_name[strlen (provider->clkdm_name) -5 ] =0 ; + provider->clkdm_name[strlen (provider->clkdm_name) -2 ] =0 ; }else { provider->clkdm_name =kasprintf (GFP_KERNEL ,"%pOFn" , node);if (!provider->clkdm_name) {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 18/262 gpio: gpio-omap: fix level interrupt idling
In reply to Sasha LevinFrom: Russell King <[email protected]>
[ Upstream commit d01849f7deba81f4959fd9e51bf20dbf46987d1c ]
Tony notes that the GPIO module does not idle when level interrupts are in use, as the wakeup appears to get stuck.
After extensive investigation, it appears that the wakeup will only be cleared if the interrupt status register is cleared while the interrupt is enabled. However, we are currently clearing it with the interrupt disabled for level-based interrupts.
It is acknowledged that this observed behaviour conflicts with a statement in the TRM:
CAUTION
After servicing the interrupt, the status bit in the interrupt status register (GPIOi.GPIO_IRQSTATUS_0 or GPIOi.GPIO_IRQSTATUS_1) must be reset and the interrupt line released (by setting the corresponding bit of the interrupt status register to 1) before enabling an interrupt for the GPIO channel in the interrupt-enable register (GPIOi.GPIO_IRQSTATUS_SET_0 or GPIOi.GPIO_IRQSTATUS_SET_1) to prevent the occurrence of unexpected interrupts when enabling an interrupt for the GPIO channel.
However, this does not appear to be a practical problem.
Further, as reported by Grygorii Strashko <[email protected]>, the TI Android kernel tree has an earlier similar patch as "GPIO: OMAP:
Fix the sequence to clear the IRQ status" saying:
if the status is cleared after disabling the IRQ then sWAKEUP will not be cleared and gates the module transition
When we unmask the level interrupt after the interrupt has been handled, enable the interrupt and only then clear the interrupt. If the interrupt is still pending, the hardware will re-assert the interrupt status.
Should the caution note in the TRM prove to be a problem, we could use a clear-enable-clear sequence instead.
--- drivers/gpio/gpio-omap.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/gpio/gpio-omap.c +8 -6
@@ -883,14 +883,16 @@ static void omap_gpio_unmask_irq(struct irq_data *d)if (trigger)omap_set_gpio_triggering (bank, offset, trigger); -/* For level-triggered GPIOs, the clearing must be done after -* the HW source is cleared, thus after the handler has run */ -if (bank->level_mask &BIT (offset)) { -omap_set_gpio_irqenable (bank, offset,0 ); +omap_set_gpio_irqenable (bank, offset,1 ); + +/* +* For level-triggered GPIOs, clearing must be done after the source +* is cleared, thus after the handler has run. OMAP4 needs this done +* after enabing the interrupt to clear the wakeup status. +*/ +if (bank->level_mask &BIT (offset))omap_clear_gpio_irqstatus (bank, offset); - } -omap_set_gpio_irqenable (bank, offset,1 );raw_spin_unlock_irqrestore (&bank->lock, flags); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 19/262 include/linux/relay.h: fix percpu annotation in struct rchan
In reply to Sasha LevinFrom: Luc Van Oostenryck <[email protected]>
[ Upstream commit 62461ac2e5b6520b6d65fc6d7d7b4b8df4b848d8 ]
The percpu member of this structure is declared as:
struct ... ** __percpu member;
So its type is:
__percpu pointer to pointer to struct ...
But looking at how it's used, its type should be:
pointer to __percpu pointer to struct ...
and it should thus be declared as:
struct ... * __percpu *member;
So fix the placement of '__percpu' in the definition of this structures.
This silents a few Sparse's warnings like:
warning: incorrect type in initializer (different address spaces)
expected void const [noderef] <asn:3> *__vpp_verify got struct sched_domain **
--- include/linux/relay.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/relay.h +1 -1
@@ -66,7 +66,7 @@ struct rchanstruct kref kref;/* channel refcount */ void *private_data;/* for user-defined data */ size_t last_toobig;/* tried to log event > subbuf size */ -struct rchan_buf **__percpu buf;/* per-cpu channel buffers */ +struct rchan_buf *__percpu *buf;/* per-cpu channel buffers */ int is_global;/* One global buffer ? */ struct list_head list;/* for channel list */ struct dentry *parent;/* parent dentry passed to open */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 20/262 netfilter: nf_tables: fix set double-free in abort path
In reply to Sasha LevinFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 40ba1d9b4d19796afc9b7ece872f5f3e8f5e2c13 ]
The abort path can cause a double-free of an anonymous set. Added-and-to-be-aborted rule looks like this:
udp dport { 137, 138 } drop
The to-be-aborted transaction list looks like this:
newset
newsetelem
newsetelem
rule
This gets walked in reverse order, so first pass disables the rule, the set elements, then the set.
After synchronize_rcu(), we then destroy those in same order: rule, set element, set element, newset.
Problem is that the anonymous set has already been bound to the rule, so the rule (lookup expression destructor) already frees the set, when then cause use-after-free when trying to delete the elements from this set, then try to free the set again when handling the newset expression.
Rule releases the bound set in first place from the abort path, this causes the use-after-free on set element removal when undoing the new element transactions. To handle this, skip new element transaction if set is bound from the abort path.
This is still causes the use-after-free on set element removal. To handle this, remove transaction from the list when the set is already bound.
Joint work with Florian Westphal.
Bugzilla: https://bugzilla.netfilter.org/show_bug.cgi?id=1325
--- include/net/netfilter/nf_tables.h | 6 ++---- net/netfilter/nf_tables_api.c | 17 +++++++++++------ 2 files changed, 13 insertions(+), 10 deletions(-)
include/net/netfilter/nf_tables.h +2 -4
@@ -416,7 +416,8 @@ struct nft_set {unsigned char *udata;/* runtime data below here */ const struct nft_set_ops *ops____cacheline_aligned ; - u16 flags:14, + u16 flags:13, + bound:1, genmask:2;u8 klen;u8 dlen;
@@ -1329,15 +1330,12 @@ struct nft_trans_rule {struct nft_trans_set {struct nft_set *set;u32 set_id; -bool bound; };#define nft_trans_set (trans) \ (((struct nft_trans_set *)trans->data)->set)#define nft_trans_set_id (trans) \ (((struct nft_trans_set *)trans->data)->set_id) -#define nft_trans_set_bound (trans) \ - (((struct nft_trans_set *)trans->data)->bound)struct nft_trans_chain {bool update;
net/netfilter/nf_tables_api.c +11 -6
@@ -127,7 +127,7 @@ static void nft_set_trans_bind(const struct nft_ctx *ctx, struct nft_set *set)list_for_each_entry_reverse (trans, &net->nft.commit_list, list) {if (trans->msg_type ==NFT_MSG_NEWSET &&nft_trans_set (trans) == set) { -nft_trans_set_bound (trans) = true; + set->bound = true;break ; } }
@@ -6617,8 +6617,7 @@ static void nf_tables_abort_release(struct nft_trans *trans)nf_tables_rule_destroy (&trans->ctx,nft_trans_rule (trans));break ;case NFT_MSG_NEWSET : -if (!nft_trans_set_bound (trans)) -nft_set_destroy (nft_trans_set (trans)); +nft_set_destroy (nft_trans_set (trans));break ;case NFT_MSG_NEWSETELEM : nft_set_elem_destroy(nft_trans_elem_set(trans),
@@ -6691,8 +6690,11 @@ static int __nf_tables_abort(struct net *net)break ;case NFT_MSG_NEWSET : trans->ctx.table->use--; -if (!nft_trans_set_bound (trans)) -list_del_rcu (&nft_trans_set (trans)->list); +if (nft_trans_set (trans)->bound) { +nft_trans_destroy (trans); +break ; + } +list_del_rcu (&nft_trans_set (trans)->list);break ;case NFT_MSG_DELSET : trans->ctx.table->use++;
@@ -6700,8 +6702,11 @@ static int __nf_tables_abort(struct net *net)nft_trans_destroy (trans);break ;case NFT_MSG_NEWSETELEM : +if (nft_trans_elem_set (trans)->bound) { +nft_trans_destroy (trans); +break ; + } te = (struct nft_trans_elem *)trans->data; - te->set->ops->remove (net, te->set, &te->elem);atomic_dec (&te->set->nelems);break ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 21/262 sysctl: handle overflow for file-max
In reply to Sasha LevinFrom: Christian Brauner <[email protected]>
[ Upstream commit 32a5ad9c22852e6bd9e74bdec5934ef9d1480bc5 ]
Currently, when writing
echo 18446744073709551616 > /proc/sys/fs/file-max
/proc/sys/fs/file-max will overflow and be set to 0. That quickly crashes the system.
This commit sets the max and min value for file-max. The max value is set to long int. Any higher value cannot currently be used as the percpu counters are long ints and not unsigned integers.
Note that the file-max value is ultimately parsed via __do_proc_doulongvec_minmax(). This function does not report error when min or max are exceeded. Which means if a value largen that long int is written userspace will not receive an error instead the old value will be kept. There is an argument to be made that this should be changed and __do_proc_doulongvec_minmax() should return an error when a dedicated min or max value are exceeded. However this has the potential to break userspace so let's defer this to an RFC patch.
--- kernel/sysctl.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/sysctl.c +3 -0
@@ -127,6 +127,7 @@ static int __maybe_unused one = 1;static int __maybe_unused two =2 ;static int __maybe_unused four =4 ;static unsigned long one_ul =1 ; +static unsigned long long_max =LONG_MAX ;static int one_hundred =100 ;static int one_thousand =1000 ;#ifdef CONFIG_PRINTK
@@ -1722,6 +1723,8 @@ static struct ctl_table fs_table[] = { .maxlen = sizeof(files_stat.max_files), .mode = 0644, .proc_handler = proc_doulongvec_minmax, + .extra1 = &zero, + .extra2 = &long_max, }, { .procname = "nr_open",
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 22/262 net: stmmac: Avoid sometimes uninitialized Clang warnings
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit df103170854e87124ee7bdd2bca64b178e653f97 ]
When building with -Wsometimes-uninitialized, Clang warns:
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:495:3: warning: variable 'ns' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized] drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:495:3: warning: variable 'ns' is used uninitialized whenever '&&' condition is false [-Wsometimes-uninitialized] drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:532:3: warning: variable 'ns' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized] drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:532:3: warning: variable 'ns' is used uninitialized whenever '&&' condition is false [-Wsometimes-uninitialized] drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:741:3: warning: variable 'sec_inc' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized] drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:741:3: warning: variable 'sec_inc' is used uninitialized whenever '&&' condition is false [-Wsometimes-uninitialized]
Clang is concerned with the use of stmmac_do_void_callback (which stmmac_get_timestamp and stmmac_config_sub_second_increment wrap), as it may fail to initialize these values if the if condition was ever false (meaning the callbacks don't exist). It's not wrong because the callbacks (get_timestamp and config_sub_second_increment respectively) are the ones that initialize the variables. While it's unlikely that the callbacks are ever going to disappear and make that condition false, we can easily avoid this warning by zero initialize the variables.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +3 -3
@@ -474,7 +474,7 @@ static void stmmac_get_tx_hwtstamp(struct stmmac_priv *priv, struct dma_desc *p, struct sk_buff *skb) { struct skb_shared_hwtstamps shhwtstamp; -u64 ns; +u64 ns =0 ;if (!priv->hwts_tx_en)return ;
@@ -513,7 +513,7 @@ static void stmmac_get_rx_hwtstamp(struct stmmac_priv *priv, struct dma_desc *p, {struct skb_shared_hwtstamps *shhwtstamp =NULL ;struct dma_desc *desc = p; -u64 ns; +u64 ns =0 ;if (!priv->hwts_rx_en)return ;
@@ -558,8 +558,8 @@ static int stmmac_hwtstamp_ioctl(struct net_device *dev, struct ifreq *ifr)u32 snap_type_sel =0 ;u32 ts_master_en =0 ;u32 ts_event_en =0 ; +u32 sec_inc =0 ;u32 value =0 ; -u32 sec_inc;bool xmac; xmac = priv->plat->has_gmac4 || priv->plat->has_xgmac;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 23/262 enic: fix build warning without CONFIG_CPUMASK_OFFSTACK
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 43d281662fdb46750d49417559b71069f435298d ]
The enic driver relies on the CONFIG_CPUMASK_OFFSTACK feature to dynamically allocate a struct member, but this is normally intended for local variables.
Building with clang, I get a warning for a few locations that check the address of the cpumask_var_t:
drivers/net/ethernet/cisco/enic/enic_main.c:122:22: error: address of array 'enic->msix[i].affinity_mask' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion]
As far as I can tell, the code is still correct, as the truth value of the pointer is what we need in this configuration. To get rid of the warning, use cpumask_available() instead of checking the pointer directly.
--- drivers/net/ethernet/cisco/enic/enic_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/cisco/enic/enic_main.c +3 -3
@@ -119,7 +119,7 @@ static void enic_init_affinity_hint(struct enic *enic)for (i =0 ; i < enic->intr_count; i++) {if (enic_is_err_intr (enic, i) ||enic_is_notify_intr (enic, i) || - (enic->msix[i].affinity_mask && + (cpumask_available (enic->msix[i].affinity_mask) && !cpumask_empty (enic->msix[i].affinity_mask)))continue ; if (zalloc_cpumask_var(&enic->msix[i].affinity_mask,
@@ -148,7 +148,7 @@ static void enic_set_affinity_hint(struct enic *enic)for (i =0 ; i < enic->intr_count; i++) {if (enic_is_err_intr (enic, i) ||enic_is_notify_intr (enic, i) || - !enic->msix[i].affinity_mask || + !cpumask_available (enic->msix[i].affinity_mask) ||cpumask_empty (enic->msix[i].affinity_mask))continue ; err = irq_set_affinity_hint(enic->msix_entry[i].vector,
@@ -161,7 +161,7 @@ static void enic_set_affinity_hint(struct enic *enic)for (i =0 ; i < enic->wq_count; i++) {int wq_intr =enic_msix_wq_intr (enic, i); -if (enic->msix[wq_intr].affinity_mask && +if (cpumask_available (enic->msix[wq_intr].affinity_mask) && !cpumask_empty (enic->msix[wq_intr].affinity_mask)) netif_set_xps_queue(enic->netdev, enic->msix[wq_intr].affinity_mask,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 24/262 libbpf: force fixdep compilation at the start of the build
In reply to Sasha LevinFrom: Stanislav Fomichev <[email protected]>
[ Upstream commit 8e2688876c7f7073d925e1f150e86b8ed3338f52 ]
libbpf targets don't explicitly depend on fixdep target, so when we do 'make -j$(nproc)', there is a high probability, that some objects will be built before fixdep binary is available.
Fix this by running sub-make; this makes sure that fixdep dependency is properly accounted for.
For the same issue in perf, see commit abb26210a395 ("perf tools: Force fixdep compilation at the start of the build").
Before:
$ rm -rf /tmp/bld; mkdir /tmp/bld; make -j$(nproc) O=/tmp/bld -C tools/lib/bpf/
Auto-detecting system features:
... libelf: [ on ]
... bpf: [ on ]
HOSTCC /tmp/bld/fixdep.o CC /tmp/bld/libbpf.o CC /tmp/bld/bpf.o CC /tmp/bld/btf.o CC /tmp/bld/nlattr.o CC /tmp/bld/libbpf_errno.o CC /tmp/bld/str_error.o CC /tmp/bld/netlink.o CC /tmp/bld/bpf_prog_linfo.o CC /tmp/bld/libbpf_probes.o CC /tmp/bld/xsk.o HOSTLD /tmp/bld/fixdep-in.o LINK /tmp/bld/fixdep LD /tmp/bld/libbpf-in.o LINK /tmp/bld/libbpf.a LINK /tmp/bld/libbpf.so LINK /tmp/bld/test_libbpf
$ head /tmp/bld/.libbpf.o.cmd # cannot find fixdep (/usr/local/google/home/sdf/src/linux/xxx//fixdep) # using basic dep data
/tmp/bld/libbpf.o: libbpf.c /usr/include/stdc-predef.h \
/usr/include/stdlib.h /usr/include/features.h \
/usr/include/x86_64-linux-gnu/sys/cdefs.h \
/usr/include/x86_64-linux-gnu/bits/wordsize.h \
/usr/include/x86_64-linux-gnu/gnu/stubs.h \
/usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
/usr/lib/gcc/x86_64-linux-gnu/7/include/stddef.h \
After:
$ rm -rf /tmp/bld; mkdir /tmp/bld; make -j$(nproc) O=/tmp/bld -C tools/lib/bpf/
Auto-detecting system features:
... libelf: [ on ]
... bpf: [ on ]
HOSTCC /tmp/bld/fixdep.o HOSTLD /tmp/bld/fixdep-in.o LINK /tmp/bld/fixdep CC /tmp/bld/libbpf.o CC /tmp/bld/bpf.o CC /tmp/bld/nlattr.o CC /tmp/bld/btf.o CC /tmp/bld/libbpf_errno.o CC /tmp/bld/str_error.o CC /tmp/bld/netlink.o CC /tmp/bld/bpf_prog_linfo.o CC /tmp/bld/libbpf_probes.o CC /tmp/bld/xsk.o LD /tmp/bld/libbpf-in.o LINK /tmp/bld/libbpf.a LINK /tmp/bld/libbpf.so LINK /tmp/bld/test_libbpf
$ head /tmp/bld/.libbpf.o.cmd cmd_/tmp/bld/libbpf.o := gcc -Wp,-MD,/tmp/bld/.libbpf.o.d -Wp,-MT,/tmp/bld/libbpf.o -g -Wall -DHAVE_LIBELF_MMAP_SUPPORT -DCOMPAT_NEED_REALLOCARRAY -Wbad-function-cast -Wdeclaration-after-statement -Wformat-security -Wformat-y2k -Winit-self -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wno-system-headers -Wold-style-definition -Wpacked -Wredundant-decls -Wshadow -Wstrict-prototypes -Wswitch-default -Wswitch-enum -Wundef -Wwrite-strings -Wformat -Wstrict-aliasing=3 -Werror -Wall -fPIC -I. -I/usr/local/google/home/sdf/src/linux/tools/include -I/usr/local/google/home/sdf/src/linux/tools/arch/x86/include/uapi -I/usr/local/google/home/sdf/src/linux/tools/include/uapi -fvisibility=hidden -D"BUILD_STR(s)=$(pound)s" -c -o /tmp/bld/libbpf.o libbpf.c
source_/tmp/bld/libbpf.o := libbpf.c
deps_/tmp/bld/libbpf.o := \
/usr/include/stdc-predef.h \
/usr/include/stdlib.h \
/usr/include/features.h \
/usr/include/x86_64-linux-gnu/sys/cdefs.h \
/usr/include/x86_64-linux-gnu/bits/wordsize.h \
--- tools/lib/bpf/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/lib/bpf/Makefile +2 -1
@@ -162,7 +162,8 @@ endif TARGETS = $(CMD_TARGETS) -all: fixdep all_cmd +all: fixdep + $(Q)$(MAKE) all_cmd all_cmd: $(CMD_TARGETS) check
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 25/262 scsi: hisi_sas: Set PHY linkrate when disconnected
In reply to Sasha LevinFrom: John Garry <[email protected]>
[ Upstream commit efdcad62e7b8a02fcccc5ccca57806dce1482ac8 ]
When the PHY comes down, we currently do not set the negotiated linkrate:
root@(none)$ pwd /sys/class/sas_phy/phy-0:0 root@(none)$ more enable 1 root@(none)$ more negotiated_linkrate 12.0 Gbit root@(none)$ echo 0 > enable root@(none)$ more negotiated_linkrate 12.0 Gbit root@(none)$
This patch fixes the driver code to set it properly when the PHY comes down.
If the PHY had been enabled, then set unknown; otherwise, flag as disabled.
The logical place to set the negotiated linkrate for this scenario is PHY down routine, which is called from the PHY down ISR.
However, it is not possible to know if the PHY comes down due to PHY disable or loss of link, as sas_phy.enabled member is not set until after the transport disable routine is complete, which races with the PHY down ISR.
As an imperfect solution, use sas_phy_data.enable as the flag to know if the PHY is down due to disable. It's imperfect, as sas_phy_data is internal to libsas.
I can't see another way without adding a new field to hisi_sas_phy and managing it, or changing SCSI SAS transport.
--- drivers/scsi/hisi_sas/hisi_sas_main.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/scsi/hisi_sas/hisi_sas_main.c +10 -0
@@ -10,6 +10,7 @@*/ #include "hisi_sas.h" +#include "../libsas/sas_internal.h" #define DRV_NAME "hisi_sas"#define DEV_IS_GONE (dev) \
@@ -1972,9 +1973,18 @@ static int hisi_sas_write_gpio(struct sas_ha_struct *sha, u8 reg_type,static void hisi_sas_phy_disconnected (struct hisi_sas_phy *phy) { +struct asd_sas_phy *sas_phy = &phy->sas_phy; +struct sas_phy *sphy = sas_phy->phy; +struct sas_phy_data *d = sphy->hostdata; + phy->phy_attached =0 ; phy->phy_type =0 ; phy->port =NULL ; + +if (d->enable) + sphy->negotiated_linkrate =SAS_LINK_RATE_UNKNOWN ; +else + sphy->negotiated_linkrate =SAS_PHY_DISABLED ; }void hisi_sas_phy_down (struct hisi_hba *hisi_hba,int phy_no,int rdy)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 26/262 scsi: hisi_sas: Fix a timeout race of driver internal and SMP IO
In reply to Sasha LevinFrom: Xiang Chen <[email protected]>
[ Upstream commit 4790595723d4b833b18c994973d39f9efb842887 ]
For internal IO and SMP IO, there is a time-out timer for them. In the timer handler, it checks whether IO is done according to the flag task->task_state_lock.
There is an issue which may cause system suspended: internal IO or SMP IO is sent, but at that time because of hardware exception (such as inject 2Bit ECC error), so IO is not completed and also not timeout. But, at that time, the SAS controller reset occurs to recover system. It will release the resource and set the status of IO to be SAS_TASK_STATE_DONE, so when IO timeout, it will never complete the completion of IO and wait for ever.
[ 729.123632] Call trace: [ 729.126791] [<ffff00000808655c>] __switch_to+0x94/0xa8 [ 729.133106] [<ffff000008d96e98>] __schedule+0x1e8/0x7fc [ 729.138975] [<ffff000008d974e0>] schedule+0x34/0x8c [ 729.144401] [<ffff000008d9b000>] schedule_timeout+0x1d8/0x3cc [ 729.150690] [<ffff000008d98218>] wait_for_common+0xdc/0x1a0 [ 729.157101] [<ffff000008d98304>] wait_for_completion+0x28/0x34 [ 729.165973] [<ffff000000dcefb4>] hisi_sas_internal_task_abort+0x2a0/0x424 [hisi_sas_test_main] [ 729.176447] [<ffff000000dd18f4>] hisi_sas_abort_task+0x244/0x2d8 [hisi_sas_test_main] [ 729.185258] [<ffff000008971714>] sas_eh_handle_sas_errors+0x1c8/0x7b8 [ 729.192391] [<ffff000008972774>] sas_scsi_recover_host+0x130/0x398 [ 729.199237] [<ffff00000894d8a8>] scsi_error_handler+0x148/0x5c0 [ 729.206009] [<ffff0000080f4118>] kthread+0x10c/0x138 [ 729.211563] [<ffff0000080855dc>] ret_from_fork+0x10/0x18
To solve the issue, callback function task_done of those IOs need to be called when on SAS controller reset.
--- drivers/scsi/hisi_sas/hisi_sas_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/hisi_sas/hisi_sas_main.c +2 -1
@@ -873,7 +873,8 @@ static void hisi_sas_do_release_task(struct hisi_hba *hisi_hba, struct sas_taskspin_lock_irqsave (&task->task_state_lock, flags); task->task_state_flags &= ~(SAS_TASK_STATE_PENDING |SAS_TASK_AT_INITIATOR ); - task->task_state_flags |=SAS_TASK_STATE_DONE ; +if (!slot->is_internal && task->task_proto !=SAS_PROTOCOL_SMP ) + task->task_state_flags |=SAS_TASK_STATE_DONE ;spin_unlock_irqrestore (&task->task_state_lock, flags); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 27/262 iio: adc: fix warning in Qualcomm PM8xxx HK/XOADC driver
In reply to Sasha LevinFrom: Linus Torvalds <[email protected]>
[ Upstream commit e0f0ae838a25464179d37f355d763f9ec139fc15 ]
The pm8xxx_get_channel() implementation is unclear, and causes gcc to suddenly generate odd warnings. The trigger for the warning (at least for me) was the entirely unrelated commit 79a4e91d1bb2 ("device.h: Add __cold to dev_<level> logging functions"), which apparently changes gcc code generation in the caller function enough to cause this:
drivers/iio/adc/qcom-pm8xxx-xoadc.c: In function ‘pm8xxx_xoadc_probe’:
drivers/iio/adc/qcom-pm8xxx-xoadc.c:633:8: warning: ‘ch’ may be used uninitialized in this function [-Wmaybe-uninitialized]
ret = pm8xxx_read_channel_rsv(adc, ch, AMUX_RSV4,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
&read_nomux_rsv4, true);
~~~~~~~~~~~~~~~~~~~~~~~
drivers/iio/adc/qcom-pm8xxx-xoadc.c:426:27: note: ‘ch’ was declared here
struct pm8xxx_chan_info *ch;
^~because gcc for some reason then isn't able to see that the termination condition for the "for( )" loop in that function is also the condition for returning NULL.
So it's not _actually_ uninitialized, but the function is admittedly just unnecessarily oddly written.
Simplify and clarify the function, making gcc also see that it always returns a valid initialized value.
--- drivers/iio/adc/qcom-pm8xxx-xoadc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/iio/adc/qcom-pm8xxx-xoadc.c +3 -7
@@ -423,18 +423,14 @@ static irqreturn_t pm8xxx_eoc_irq(int irq, void *d)static struct pm8xxx_chan_info *pm8xxx_get_channel (struct pm8xxx_xoadc *adc,u8 chan) { -struct pm8xxx_chan_info *ch;int i;for (i =0 ; i < adc->nchans; i++) { - ch = &adc->chans[i]; +struct pm8xxx_chan_info *ch = &adc->chans[i];if (ch->hwchan->amux_channel == chan) -break ; +return ch; } -if (i == adc->nchans) -return NULL ; - -return ch; +return NULL ; } static int pm8xxx_read_channel_rsv(struct pm8xxx_xoadc *adc,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 28/262 x86/hyperv: Fix kernel panic when kexec on HyperV
In reply to Sasha LevinFrom: Kairui Song <[email protected]>
[ Upstream commit 179fb36abb097976997f50733d5b122a29158cba ]
After commit 68bb7bfb7985 ("X86/Hyper-V: Enable IPI enlightenments"), kexec fails with a kernel panic:
kexec_core: Starting new kernel
BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 Hardware name: Microsoft Corporation Virtual Machine/Virtual Machine, BIOS Hyper-V UEFI Release v3.0 03/02/2018 RIP: 0010:0xffffc9000001d000 Call Trace: ? __send_ipi_mask+0x1c6/0x2d0 ? hv_send_ipi_mask_allbutself+0x6d/0xb0 ? mp_save_irq+0x70/0x70 ? __ioapic_read_entry+0x32/0x50 ? ioapic_read_entry+0x39/0x50 ? clear_IO_APIC_pin+0xb8/0x110 ? native_stop_other_cpus+0x6e/0x170 ? native_machine_shutdown+0x22/0x40 ? kernel_kexec+0x136/0x156
That happens if hypercall based IPIs are used because the hypercall page is reset very early upon kexec reboot, but kexec sends IPIs to stop CPUs, which invokes the hypercall and dereferences the unusable page.
To fix his, reset hv_hypercall_pg to NULL before the page is reset to avoid any misuse, IPI sending will fall back to the non hypercall based method. This only happens on kexec / kdump so just setting the pointer to NULL is good enough.
--- arch/x86/hyperv/hv_init.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/x86/hyperv/hv_init.c +7 -0
@@ -406,6 +406,13 @@ void hyperv_cleanup(void)/* Reset our OS id */ wrmsrl (HV_X64_MSR_GUEST_OS_ID ,0 ); +/* +* Reset hypercall page reference before reset the page, +* let hypercall operations fail safely rather than +* panic the kernel for using invalid hypercall page +*/ + hv_hypercall_pg =NULL ; +/* Reset the hypercall page */ hypercall_msr.as_uint64 =0 ;wrmsrl (HV_X64_MSR_HYPERCALL , hypercall_msr.as_uint64);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 29/262 perf c2c: Fix c2c report for empty numa node
In reply to Sasha LevinFrom: Jiri Olsa <[email protected]>
[ Upstream commit e34c940245437f36d2c492edd1f8237eff391064 ]
Ravi Bangoria reported that we fail with an empty NUMA node with the following message:
$ lscpu NUMA node0 CPU(s): NUMA node1 CPU(s): 0-4
$ sudo ./perf c2c report node/cpu topology bugFailed setup nodes
Fix this by detecting the empty node and keeping its CPU set empty.
--- tools/perf/builtin-c2c.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
tools/perf/builtin-c2c.c +6 -2
@@ -2055,6 +2055,12 @@ static int setup_nodes(struct perf_session *session)if (!set)return -ENOMEM ; + nodes[node] = set; + +/* empty node, skip */ +if (cpu_map__empty (map)) +continue ; +for (cpu =0 ; cpu < map->nr; cpu++) {set_bit (map->map[cpu], set);
@@ -2063,8 +2069,6 @@ static int setup_nodes(struct perf_session *session) cpu2node[map->map[cpu]] = node; } - - nodes[node] = set; }setup_nodes_header ();
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 30/262 mm/sparse: fix a bad comparison
In reply to Sasha LevinFrom: Qian Cai <[email protected]>
[ Upstream commit d778015ac95bc036af73342c878ab19250e01fe1 ]
next_present_section_nr() could only return an unsigned number -1, so just check it specifically where compilers will convert -1 to unsigned if needed.
mm/sparse.c: In function 'sparse_init_nid':
mm/sparse.c:200:20: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits]
((section_nr >= 0) && \
^~
mm/sparse.c:478:2: note: in expansion of macro
'for_each_present_section_nr'
for_each_present_section_nr(pnum_begin, pnum) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~
mm/sparse.c:200:20: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits]
((section_nr >= 0) && \
^~
mm/sparse.c:497:2: note: in expansion of macro
'for_each_present_section_nr'
for_each_present_section_nr(pnum_begin, pnum) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~
mm/sparse.c: In function 'sparse_init':
mm/sparse.c:200:20: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits]
((section_nr >= 0) && \
^~
mm/sparse.c:520:2: note: in expansion of macro
'for_each_present_section_nr'
for_each_present_section_nr(pnum_begin + 1, pnum_end) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~--- mm/sparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/sparse.c +1 -1
@@ -197,7 +197,7 @@ static inline int next_present_section_nr(int section_nr) }#define for_each_present_section_nr (start, section_nr) \ for (section_nr = next_present_section_nr(start-1); \ - ((section_nr >= 0) && \ + ((section_nr != -1) && \ (section_nr <= __highest_present_section_nr)); \ section_nr = next_present_section_nr(section_nr))
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 31/262 mm/cma.c: cma_declare_contiguous: correct err handling
In reply to Sasha LevinFrom: Peng Fan <[email protected]>
[ Upstream commit 0d3bd18a5efd66097ef58622b898d3139790aa9d ]
In case cma_init_reserved_mem failed, need to free the memblock allocated by memblock_reserve or memblock_alloc_range.
Quote Catalin's comments:
https://lkml.org/lkml/2019/2/26/482
Kmemleak is supposed to work with the memblock_{alloc,free} pair and it ignores the memblock_reserve() as a memblock_alloc() implementation detail. It is, however, tolerant to memblock_free() being called on a sub-range or just a different range from a previous memblock_alloc(). So the original patch looks fine to me. FWIW:
--- mm/cma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
mm/cma.c +3 -1
@@ -353,12 +353,14 @@ int __init cma_declare_contiguous(phys_addr_t base, ret =cma_init_reserved_mem (base, size, order_per_bit, name, res_cma);if (ret) - goto err; + goto free_mem;pr_info ("Reserved %ld MiB at %pa\n" , (unsigned long )size /SZ_1M , &base);return 0 ; +free_mem: +memblock_free (base, size); err:pr_err ("Failed to reserve %ld MiB\n" , (unsigned long )size /SZ_1M );return ret;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 32/262 mm/page_ext.c: fix an imbalance with kmemleak
In reply to Sasha LevinFrom: Qian Cai <[email protected]>
[ Upstream commit 0c81585499601acd1d0e1cbf424cabfaee60628c ]
After offlining a memory block, kmemleak scan will trigger a crash, as it encounters a page ext address that has already been freed during memory offlining. At the beginning in alloc_page_ext(), it calls kmemleak_alloc(), but it does not call kmemleak_free() in free_page_ext().
BUG: unable to handle kernel paging request at ffff888453d00000
PGD 128a01067 P4D 128a01067 PUD 128a04067 PMD 47e09e067 PTE 800ffffbac2ff060
Oops: 0000 [#1] SMP DEBUG_PAGEALLOC KASAN PTI
CPU: 1 PID: 1594 Comm: bash Not tainted 5.0.0-rc8+ #15
Hardware name: HP ProLiant DL180 Gen9/ProLiant DL180 Gen9, BIOS U20 10/25/2017
RIP: 0010:scan_block+0xb5/0x290
Code: 85 6e 01 00 00 48 b8 00 00 30 f5 81 88 ff ff 48 39 c3 0f 84 5b 01 00 00 48 89 d8 48 c1 e8 03 42 80 3c 20 00 0f 85 87 01 00 00 <4c> 8b 3b e8 f3 0c fa ff 4c 39 3d 0c 6b 4c 01 0f 87 08 01 00 00 4c
RSP: 0018:ffff8881ec57f8e0 EFLAGS: 00010082
RAX: 0000000000000000 RBX: ffff888453d00000 RCX: ffffffffa61e5a54
RDX: 0000000000000000 RSI: 0000000000000008 RDI: ffff888453d00000
RBP: ffff8881ec57f920 R08: fffffbfff4ed588d R09: fffffbfff4ed588c
R10: fffffbfff4ed588c R11: ffffffffa76ac463 R12: dffffc0000000000
R13: ffff888453d00ff9 R14: ffff8881f80cef48 R15: ffff8881f80cef48
FS: 00007f6c0e3f8740(0000) GS:ffff8881f7680000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: ffff888453d00000 CR3: 00000001c4244003 CR4: 00000000001606a0
Call Trace:
scan_gray_list+0x269/0x430
kmemleak_scan+0x5a8/0x10f0
kmemleak_write+0x541/0x6ca
full_proxy_write+0xf8/0x190
__vfs_write+0xeb/0x980
vfs_write+0x15a/0x4f0
ksys_write+0xd2/0x1b0
__x64_sys_write+0x73/0xb0
do_syscall_64+0xeb/0xaaa
entry_SYSCALL_64_after_hwframe+0x44/0xa9
RIP: 0033:0x7f6c0dad73b8
Code: 89 02 48 c7 c0 ff ff ff ff eb b3 0f 1f 80 00 00 00 00 f3 0f 1e fa 48 8d 05 65 63 2d 00 8b 00 85 c0 75 17 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 58 c3 0f 1f 80 00 00 00 00 41 54 49 89 d4 55
RSP: 002b:00007ffd5b863cb8 EFLAGS: 00000246 ORIG_RAX: 0000000000000001
RAX: ffffffffffffffda RBX: 0000000000000005 RCX: 00007f6c0dad73b8
RDX: 0000000000000005 RSI: 000055a9216e1710 RDI: 0000000000000001
RBP: 000055a9216e1710 R08: 000000000000000a R09: 00007ffd5b863840
R10: 000000000000000a R11: 0000000000000246 R12: 00007f6c0dda9780
R13: 0000000000000005 R14: 00007f6c0dda4740 R15: 0000000000000005
Modules linked in: nls_iso8859_1 nls_cp437 vfat fat kvm_intel kvm irqbypass efivars ip_tables x_tables xfs sd_mod ahci libahci igb i2c_algo_bit libata i2c_core dm_mirror dm_region_hash dm_log dm_mod efivarfs
CR2: ffff888453d00000
---[ end trace ccf646c7456717c5 ]---
Kernel panic - not syncing: Fatal exception
Shutting down cpus with NMI
Kernel Offset: 0x24c00000 from 0xffffffff81000000 (relocation range:
0xffffffff80000000-0xffffffffbfffffff)
---[ end Kernel panic - not syncing: Fatal exception ]------ mm/page_ext.c | 1 + 1 file changed, 1 insertion(+)
mm/page_ext.c +1 -0
@@ -273,6 +273,7 @@ static void free_page_ext(void *addr) table_size =get_entry_size () *PAGES_PER_SECTION ;BUG_ON (PageReserved (page)); +kmemleak_free (addr);free_pages_exact (addr, table_size); } }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 33/262 mm, swap: bounds check swap_info array accesses to avoid NULL derefs
In reply to Sasha LevinFrom: Daniel Jordan <[email protected]>
[ Upstream commit c10d38cc8d3e43f946b6c2bf4602c86791587f30 ]
Dan Carpenter reports a potential NULL dereference in get_swap_page_of_type:
Smatch complains that the NULL checks on "si" aren't consistent. This seems like a real bug because we have not ensured that the type is valid and so "si" can be NULL.
Add the missing check for NULL, taking care to use a read barrier to ensure CPU1 observes CPU0's updates in the correct order:
CPU0 CPU1
alloc_swap_info() if (type >= nr_swapfiles)
swap_info[type] = p /* handle invalid entry */
smp_wmb() smp_rmb()
++nr_swapfiles p = swap_info[type]
Without smp_rmb, CPU1 might observe CPU0's write to nr_swapfiles before CPU0's write to swap_info[type] and read NULL from swap_info[type].
Ying Huang noticed other places in swapfile.c don't order these reads properly. Introduce swap_type_to_swap_info to encourage correct usage.
Use READ_ONCE and WRITE_ONCE to follow the Linux Kernel Memory Model (see tools/memory-model/Documentation/explanation.txt).
This ordering need not be enforced in places where swap_lock is held (e.g. si_swapinfo) because swap_lock serializes updates to nr_swapfiles and the swap_info array.
--- mm/swapfile.c | 51 +++++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 22 deletions(-)
mm/swapfile.c +29 -22
@@ -98,6 +98,15 @@ static atomic_t proc_poll_event = ATOMIC_INIT(0);atomic_t nr_rotate_swap =ATOMIC_INIT (0 ); +static struct swap_info_struct *swap_type_to_swap_info (int type) +{ +if (type >=READ_ONCE (nr_swapfiles)) +return NULL ; + +smp_rmb ();/* Pairs with smp_wmb in alloc_swap_info. */ +return READ_ONCE (swap_info[type]); +} +static inline unsigned char swap_count (unsigned char ent) {return ent & ~SWAP_HAS_CACHE ;/* may include COUNT_CONTINUED flag */
@@ -1044,12 +1053,14 @@ int get_swap_pages(int n_goal, swp_entry_t swp_entries[], int entry_size)/* The only caller of this function is now suspend routine */ swp_entry_t get_swap_page_of_type (int type) { -struct swap_info_struct *si; +struct swap_info_struct *si =swap_type_to_swap_info (type);pgoff_t offset; - si = swap_info[type]; +if (!si) + goto fail; +spin_lock (&si->lock); -if (si && (si->flags &SWP_WRITEOK )) { +if (si->flags &SWP_WRITEOK ) {atomic_long_dec (&nr_swap_pages);/* This is called for allocating swap entry, not cache */ offset =scan_swap_map (si,1 );
@@ -1060,6 +1071,7 @@ swp_entry_t get_swap_page_of_type(int type)atomic_long_inc (&nr_swap_pages); }spin_unlock (&si->lock); +fail:return (swp_entry_t ) {0 }; }
@@ -1071,9 +1083,9 @@ static struct swap_info_struct *__swap_info_get(swp_entry_t entry)if (!entry.val) goto out; type =swp_type (entry); -if (type >= nr_swapfiles) + p =swap_type_to_swap_info (type); +if (!p) goto bad_nofile; - p = swap_info[type];if (!(p->flags &SWP_USED )) goto bad_device; offset =swp_offset (entry);
@@ -1697,10 +1709,9 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p)sector_t swapdev_block (int type,pgoff_t offset) {struct block_device *bdev; +struct swap_info_struct *si =swap_type_to_swap_info (type); -if ((unsigned int )type >= nr_swapfiles) -return 0 ; -if (!(swap_info[type]->flags &SWP_WRITEOK )) +if (!si || !(si->flags &SWP_WRITEOK ))return 0 ;return map_swap_entry (swp_entry (type, offset), &bdev); }
@@ -2258,7 +2269,7 @@ static sector_t map_swap_entry(swp_entry_t entry, struct block_device **bdev)struct swap_extent *se;pgoff_t offset; - sis = swap_info[swp_type (entry)]; + sis =swp_swap_info (entry); *bdev = sis->bdev; offset =swp_offset (entry);
@@ -2700,9 +2711,7 @@ static void *swap_start(struct seq_file *swap, loff_t *pos)if (!l)return SEQ_START_TOKEN ; -for (type =0 ; type < nr_swapfiles; type++) { -smp_rmb ();/* read nr_swapfiles before swap_info[type] */ - si = swap_info[type]; +for (type =0 ; (si =swap_type_to_swap_info (type)); type++) {if (!(si->flags &SWP_USED ) || !si->swap_map)continue ;if (!--l)
@@ -2722,9 +2731,7 @@ static void *swap_next(struct seq_file *swap, void *v, loff_t *pos)else type = si->type +1 ; -for (; type < nr_swapfiles; type++) { -smp_rmb ();/* read nr_swapfiles before swap_info[type] */ - si = swap_info[type]; +for (; (si =swap_type_to_swap_info (type)); type++) {if (!(si->flags &SWP_USED ) || !si->swap_map)continue ; ++*pos;
@@ -2831,14 +2838,14 @@ static struct swap_info_struct *alloc_swap_info(void) }if (type >= nr_swapfiles) { p->type = type; - swap_info[type] = p; +WRITE_ONCE (swap_info[type], p);/* * Write swap_info[type] before nr_swapfiles, in case a * racing procfs swap_start() or swap_next() is reading them. * (We never shrink nr_swapfiles, we never free this entry.) */ smp_wmb (); - nr_swapfiles++; +WRITE_ONCE (nr_swapfiles, nr_swapfiles +1 ); }else {kvfree (p); p = swap_info[type];
@@ -3358,7 +3365,7 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage) {struct swap_info_struct *p;struct swap_cluster_info *ci; -unsigned long offset, type; +unsigned long offset;unsigned char count;unsigned char has_cache;int err = -EINVAL ;
@@ -3366,10 +3373,10 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage)if (non_swap_entry (entry)) goto out; - type =swp_type (entry); -if (type >= nr_swapfiles) + p =swp_swap_info (entry); +if (!p) goto bad_file; - p = swap_info[type]; + offset =swp_offset (entry);if (unlikely (offset >= p->max)) goto out;
@@ -3466,7 +3473,7 @@ int swapcache_prepare(swp_entry_t entry)struct swap_info_struct *swp_swap_info (swp_entry_t entry) { -return swap_info[swp_type (entry)]; +return swap_type_to_swap_info (swp_type (entry)); }struct swap_info_struct *page_swap_info (struct page *page)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 34/262 docs/core-api/mm: fix user memory accessors formatting
In reply to Sasha LevinFrom: Mike Rapoport <[email protected]>
[ Upstream commit bc8ff3ca6589d63c6d10f5ee8bed38f74851b469 ]
The descriptions of userspace memory access functions had minor issues with formatting that made kernel-doc unable to properly detect the function/macro names and the return value sections:
./arch/x86/include/asm/uaccess.h:80: info: Scanning doc for ./arch/x86/include/asm/uaccess.h:139: info: Scanning doc for ./arch/x86/include/asm/uaccess.h:231: info: Scanning doc for ./arch/x86/include/asm/uaccess.h:505: info: Scanning doc for ./arch/x86/include/asm/uaccess.h:530: info: Scanning doc for ./arch/x86/lib/usercopy_32.c:58: info: Scanning doc for ./arch/x86/lib/usercopy_32.c:69: warning: No description found for return value of 'clear_user'./arch/x86/lib/usercopy_32.c:78: info: Scanning doc for ./arch/x86/lib/usercopy_32.c:90: warning: No description found for return value of '__clear_user'
Fix the formatting.
--- arch/x86/include/asm/uaccess.h | 24 ++++++++++++------------ arch/x86/lib/usercopy_32.c | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-)
arch/x86/include/asm/uaccess.h +12 -12
@@ -76,7 +76,7 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un#endif /** -* access_ok: - Checks if a user space pointer is valid +* access_ok - Checks if a user space pointer is valid * @addr: User space pointer to start of block to check * @size: Size of block to check *
@@ -85,12 +85,12 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un* * Checks if a pointer to a block of memory in user space is valid. * -* Returns true (nonzero) if the memory block may be valid, false (zero) -* if it is definitely invalid. -* * Note that, depending on architecture, this function probably just * checks that the pointer is in the user space range - after calling * this function, memory access functions may still return -EFAULT. +* +* Return: true (nonzero) if the memory block may be valid, false (zero) +* if it is definitely invalid. */ #define access_ok (addr, size) \ ({ \
@@ -135,7 +135,7 @@ extern int __get_user_bad(void);__typeof__ (__builtin_choose_expr (sizeof (x) >sizeof (0UL ),0ULL ,0UL ))/** -* get_user: - Get a simple variable from user space. +* get_user - Get a simple variable from user space. * @x: Variable to store result. * @ptr: Source address, in user space. *
@@ -149,7 +149,7 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))* @ptr must have pointer-to-simple-variable type, and the result of * dereferencing @ptr must be assignable to @x without a cast. * -* Returns zero on success, or -EFAULT on error. +* Return: zero on success, or -EFAULT on error. * On error, the variable @x is set to zero. */ /*
@@ -227,7 +227,7 @@ extern void __put_user_4(void);extern void __put_user_8 (void );/** -* put_user: - Write a simple value into user space. +* put_user - Write a simple value into user space. * @x: Value to copy to user space. * @ptr: Destination address, in user space. *
@@ -241,7 +241,7 @@ extern void __put_user_8(void);* @ptr must have pointer-to-simple-variable type, and @x must be assignable * to the result of dereferencing @ptr. * -* Returns zero on success, or -EFAULT on error. +* Return: zero on success, or -EFAULT on error. */ #define put_user (x, ptr) \ ({ \
@@ -503,7 +503,7 @@ struct __large_struct { unsigned long buf[100]; }; }while (0 )/** -* __get_user: - Get a simple variable from user space, with less checking. +* __get_user - Get a simple variable from user space, with less checking. * @x: Variable to store result. * @ptr: Source address, in user space. *
@@ -520,7 +520,7 @@ struct __large_struct { unsigned long buf[100]; };* Caller must check the pointer with access_ok() before calling this * function. * -* Returns zero on success, or -EFAULT on error. +* Return: zero on success, or -EFAULT on error. * On error, the variable @x is set to zero. */
@@ -528,7 +528,7 @@ struct __large_struct { unsigned long buf[100]; };__get_user_nocheck ((x), (ptr),sizeof (*(ptr)))/** -* __put_user: - Write a simple value into user space, with less checking. +* __put_user - Write a simple value into user space, with less checking. * @x: Value to copy to user space. * @ptr: Destination address, in user space. *
@@ -545,7 +545,7 @@ struct __large_struct { unsigned long buf[100]; };* Caller must check the pointer with access_ok() before calling this * function. * -* Returns zero on success, or -EFAULT on error. +* Return: zero on success, or -EFAULT on error. */ #define __put_user (x, ptr) \
arch/x86/lib/usercopy_32.c +4 -4
@@ -54,13 +54,13 @@ do { \ }while (0 )/** -* clear_user: - Zero a block of memory in user space. +* clear_user - Zero a block of memory in user space. * @to: Destination address, in user space. * @n: Number of bytes to zero. * * Zero a block of memory in user space. * -* Returns number of bytes that could not be cleared. +* Return: number of bytes that could not be cleared. * On success, this will be zero. */ unsigned long
@@ -74,14 +74,14 @@ clear_user(void __user *to, unsigned long n)EXPORT_SYMBOL (clear_user);/** -* __clear_user: - Zero a block of memory in user space, with less checking. +* __clear_user - Zero a block of memory in user space, with less checking. * @to: Destination address, in user space. * @n: Number of bytes to zero. * * Zero a block of memory in user space. Caller must check * the specified block with access_ok() before calling this function. * -* Returns number of bytes that could not be cleared. +* Return: number of bytes that could not be cleared. * On success, this will be zero. */ unsigned long
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 35/262 mm,oom: don't kill global init via memory.oom.group
In reply to Sasha LevinFrom: Tetsuo Handa <[email protected]>
[ Upstream commit d342a0b38674867ea67fde47b0e1e60ffe9f17a2 ]
Since setting global init process to some memory cgroup is technically possible, oom_kill_memcg_member() must check it.
Tasks in /test1 are going to be killed due to memory.oom.group set
Memory cgroup out of memory: Killed process 1 (systemd) total-vm:43400kB, anon-rss:1228kB, file-rss:3992kB, shmem-rss:0kB
oom_reaper: reaped process 1 (systemd), now anon-rss:0kB, file-rss:0kB, shmem-rss:0kB
Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000008b
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
int main(int argc, char *argv[])
{
static char buffer[10485760];
static int pipe_fd[2] = { EOF, EOF };
unsigned int i;
int fd;
char buf[64] = { };
if (pipe(pipe_fd))
return 1;
if (chdir("/sys/fs/cgroup/"))
return 1;
fd = open("cgroup.subtree_control", O_WRONLY);
write(fd, "+memory", 7);
close(fd);
mkdir("test1", 0755);
fd = open("test1/memory.oom.group", O_WRONLY);
write(fd, "1", 1);
close(fd);
fd = open("test1/cgroup.procs", O_WRONLY);
write(fd, "1", 1);
snprintf(buf, sizeof(buf) - 1, "%d", getpid());
write(fd, buf, strlen(buf));
close(fd);
snprintf(buf, sizeof(buf) - 1, "%lu", sizeof(buffer) * 5);
fd = open("test1/memory.max", O_WRONLY);
write(fd, buf, strlen(buf));
close(fd);
for (i = 0; i < 10; i++)
if (fork() == 0) {
char c;
close(pipe_fd[1]);
read(pipe_fd[0], &c, 1);
memset(buffer, 0, sizeof(buffer));
sleep(3);
_exit(0);
}
close(pipe_fd[0]);
close(pipe_fd[1]);
sleep(3);
return 0;
}[ 37.052923][ T9185] a.out invoked oom-killer: gfp_mask=0xcc0(GFP_KERNEL), order=0, oom_score_adj=0 [ 37.056169][ T9185] CPU: 4 PID: 9185 Comm: a.out Kdump: loaded Not tainted 5.0.0-rc4-next-20190131 #280 [ 37.059205][ T9185] Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 04/13/2018 [ 37.062954][ T9185] Call Trace: [ 37.063976][ T9185] dump_stack+0x67/0x95 [ 37.065263][ T9185] dump_header+0x51/0x570 [ 37.066619][ T9185] ? trace_hardirqs_on+0x3f/0x110 [ 37.068171][ T9185] ? _raw_spin_unlock_irqrestore+0x3d/0x70 [ 37.069967][ T9185] oom_kill_process+0x18d/0x210 [ 37.071515][ T9185] out_of_memory+0x11b/0x380 [ 37.072936][ T9185] mem_cgroup_out_of_memory+0xb6/0xd0 [ 37.074601][ T9185] try_charge+0x790/0x820 [ 37.076021][ T9185] mem_cgroup_try_charge+0x42/0x1d0 [ 37.077629][ T9185] mem_cgroup_try_charge_delay+0x11/0x30 [ 37.079370][ T9185] do_anonymous_page+0x105/0x5e0 [ 37.080939][ T9185] __handle_mm_fault+0x9cb/0x1070 [ 37.082485][ T9185] handle_mm_fault+0x1b2/0x3a0 [ 37.083819][ T9185] ? handle_mm_fault+0x47/0x3a0 [ 37.085181][ T9185] __do_page_fault+0x255/0x4c0 [ 37.086529][ T9185] do_page_fault+0x28/0x260 [ 37.087788][ T9185] ? page_fault+0x8/0x30 [ 37.088978][ T9185] page_fault+0x1e/0x30 [ 37.090142][ T9185] RIP: 0033:0x7f8b183aefe0 [ 37.091433][ T9185] Code: 20 f3 44 0f 7f 44 17 d0 f3 44 0f 7f 47 30 f3 44 0f 7f 44 17 c0 48 01 fa 48 83 e2 c0 48 39 d1 74 a3 66 0f 1f 84 00 00 00 00 00 <66> 44 0f 7f 01 66 44 0f 7f 41 10 66 44 0f 7f 41 20 66 44 0f 7f 41 [ 37.096917][ T9185] RSP: 002b:00007fffc5d329e8 EFLAGS: 00010206 [ 37.098615][ T9185] RAX: 00000000006010e0 RBX: 0000000000000008 RCX: 0000000000c30000 [ 37.100905][ T9185] RDX: 00000000010010c0 RSI: 0000000000000000 RDI: 00000000006010e0 [ 37.103349][ T9185] RBP: 0000000000000000 R08: 00007f8b188f4740 R09: 0000000000000000 [ 37.105797][ T9185] R10: 00007fffc5d32420 R11: 00007f8b183aef40 R12: 0000000000000005 [ 37.108228][ T9185] R13: 0000000000000000 R14: ffffffffffffffff R15: 0000000000000000 [ 37.110840][ T9185] memory: usage 51200kB, limit 51200kB, failcnt 125 [ 37.113045][ T9185] memory+swap: usage 0kB, limit 9007199254740988kB, failcnt 0 [ 37.115808][ T9185] kmem: usage 0kB, limit 9007199254740988kB, failcnt 0 [ 37.117660][ T9185] Memory cgroup stats for /test1: cache:0KB rss:49484KB rss_huge:30720KB shmem:0KB mapped_file:0KB dirty:0KB writeback:0KB inactive_anon:0KB active_anon:49700KB inactive_file:0KB active_file:0KB unevictable:0KB [ 37.123371][ T9185] oom-kill:constraint=CONSTRAINT_NONE,nodemask=(null),cpuset=/,mems_allowed=0,oom_memcg=/test1,task_memcg=/test1,task=a.out,pid=9188,uid=0 [ 37.128158][ T9185] Memory cgroup out of memory: Killed process 9188 (a.out) total-vm:14456kB, anon-rss:10324kB, file-rss:504kB, shmem-rss:0kB [ 37.132710][ T9185] Tasks in /test1 are going to be killed due to memory.oom.group set [ 37.132833][ T54] oom_reaper: reaped process 9188 (a.out), now anon-rss:0kB, file-rss:0kB, shmem-rss:0kB [ 37.135498][ T9185] Memory cgroup out of memory: Killed process 1 (systemd) total-vm:43400kB, anon-rss:1228kB, file-rss:3992kB, shmem-rss:0kB [ 37.143434][ T9185] Memory cgroup out of memory: Killed process 9182 (a.out) total-vm:14456kB, anon-rss:76kB, file-rss:588kB, shmem-rss:0kB [ 37.144328][ T54] oom_reaper: reaped process 1 (systemd), now anon-rss:0kB, file-rss:0kB, shmem-rss:0kB [ 37.147585][ T9185] Memory cgroup out of memory: Killed process 9183 (a.out) total-vm:14456kB, anon-rss:6228kB, file-rss:512kB, shmem-rss:0kB [ 37.157222][ T9185] Memory cgroup out of memory: Killed process 9184 (a.out) total-vm:14456kB, anon-rss:6228kB, file-rss:508kB, shmem-rss:0kB [ 37.157259][ T9185] Memory cgroup out of memory: Killed process 9185 (a.out) total-vm:14456kB, anon-rss:6228kB, file-rss:512kB, shmem-rss:0kB [ 37.157291][ T9185] Memory cgroup out of memory: Killed process 9186 (a.out) total-vm:14456kB, anon-rss:4180kB, file-rss:508kB, shmem-rss:0kB [ 37.157306][ T54] oom_reaper: reaped process 9183 (a.out), now anon-rss:0kB, file-rss:0kB, shmem-rss:0kB [ 37.157328][ T9185] Memory cgroup out of memory: Killed process 9187 (a.out) total-vm:14456kB, anon-rss:4180kB, file-rss:512kB, shmem-rss:0kB [ 37.157452][ T9185] Memory cgroup out of memory: Killed process 9189 (a.out) total-vm:14456kB, anon-rss:6228kB, file-rss:512kB, shmem-rss:0kB [ 37.158733][ T9185] Memory cgroup out of memory: Killed process 9190 (a.out) total-vm:14456kB, anon-rss:552kB, file-rss:512kB, shmem-rss:0kB [ 37.160083][ T54] oom_reaper: reaped process 9186 (a.out), now anon-rss:0kB, file-rss:0kB, shmem-rss:0kB [ 37.160187][ T54] oom_reaper: reaped process 9189 (a.out), now anon-rss:0kB, file-rss:0kB, shmem-rss:0kB [ 37.206941][ T54] oom_reaper: reaped process 9185 (a.out), now anon-rss:0kB, file-rss:0kB, shmem-rss:0kB [ 37.212300][ T9185] Memory cgroup out of memory: Killed process 9191 (a.out) total-vm:14456kB, anon-rss:4180kB, file-rss:512kB, shmem-rss:0kB [ 37.212317][ T54] oom_reaper: reaped process 9190 (a.out), now anon-rss:0kB, file-rss:0kB, shmem-rss:0kB [ 37.218860][ T9185] Memory cgroup out of memory: Killed process 9192 (a.out) total-vm:14456kB, anon-rss:1080kB, file-rss:512kB, shmem-rss:0kB [ 37.227667][ T54] oom_reaper: reaped process 9192 (a.out), now anon-rss:0kB, file-rss:0kB, shmem-rss:0kB [ 37.292323][ T9193] abrt-hook-ccpp (9193) used greatest stack depth: 10480 bytes left [ 37.351843][ T1] Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000008b [ 37.354833][ T1] CPU: 7 PID: 1 Comm: systemd Kdump: loaded Not tainted 5.0.0-rc4-next-20190131 #280 [ 37.357876][ T1] Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 04/13/2018 [ 37.361685][ T1] Call Trace: [ 37.363239][ T1] dump_stack+0x67/0x95 [ 37.365010][ T1] panic+0xfc/0x2b0 [ 37.366853][ T1] do_exit+0xd55/0xd60 [ 37.368595][ T1] do_group_exit+0x47/0xc0 [ 37.370415][ T1] get_signal+0x32a/0x920 [ 37.372449][ T1] ? _raw_spin_unlock_irqrestore+0x3d/0x70 [ 37.374596][ T1] do_signal+0x32/0x6e0 [ 37.376430][ T1] ? exit_to_usermode_loop+0x26/0x9b [ 37.378418][ T1] ? prepare_exit_to_usermode+0xa8/0xd0 [ 37.380571][ T1] exit_to_usermode_loop+0x3e/0x9b [ 37.382588][ T1] prepare_exit_to_usermode+0xa8/0xd0 [ 37.384594][ T1] ? page_fault+0x8/0x30 [ 37.386453][ T1] retint_user+0x8/0x18 [ 37.388160][ T1] RIP: 0033:0x7f42c06974a8 [ 37.389922][ T1] Code: Bad RIP value. [ 37.391788][ T1] RSP: 002b:00007ffc3effd388 EFLAGS: 00010213 [ 37.394075][ T1] RAX: 000000000000000e RBX: 00007ffc3effd390 RCX: 0000000000000000 [ 37.396963][ T1] RDX: 000000000000002a RSI: 00007ffc3effd390 RDI: 0000000000000004 [ 37.399550][ T1] RBP: 00007ffc3effd680 R08: 0000000000000000 R09: 0000000000000000 [ 37.402334][ T1] R10: 00000000ffffffff R11: 0000000000000246 R12: 0000000000000001 [ 37.404890][ T1] R13: ffffffffffffffff R14: 0000000000000884 R15: 000056460b1ac3b0
--- mm/oom_kill.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
mm/oom_kill.c +2 -1
@@ -928,7 +928,8 @@ static void __oom_kill_process(struct task_struct *victim)*/ static int oom_kill_memcg_member (struct task_struct *task,void *unused) { -if (task->signal->oom_score_adj !=OOM_SCORE_ADJ_MIN ) { +if (task->signal->oom_score_adj !=OOM_SCORE_ADJ_MIN && + !is_global_init (task)) {get_task_struct (task);__oom_kill_process (task); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 36/262 memcg: killed threads should not invoke memcg OOM killer
In reply to Sasha LevinFrom: Tetsuo Handa <[email protected]>
[ Upstream commit 7775face207922ea62a4e96b9cd45abfdc7b9840 ]
If a memory cgroup contains a single process with many threads (including different process group sharing the mm) then it is possible to trigger a race when the oom killer complains that there are no oom elible tasks and complain into the log which is both annoying and confusing because there is no actual problem. The race looks as follows:
P1 oom_reaper P2try_charge try_charge
mem_cgroup_out_of_memory
mutex_lock(oom_lock)
out_of_memory
oom_kill_process(P1,P2)
wake_oom_reaper
mutex_unlock(oom_lock)
oom_reap_task
mutex_lock(oom_lock)
select_bad_process # no victim
The problem is more visible with many threads.
Fix this by checking for fatal_signal_pending from mem_cgroup_out_of_memory when the oom_lock is already held.
The oom bypass is safe because we do the same early in the try_charge path already. The situation migh have changed in the mean time. It should be safe to check for fatal_signal_pending and tsk_is_oom_victim but for a better code readability abstract the current charge bypass condition into should_force_charge and reuse it from that path. "
--- mm/memcontrol.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
mm/memcontrol.c +14 -5
@@ -248,6 +248,12 @@ enum res_type { iter !=NULL ; \ iter = mem_cgroup_iter(NULL, iter, NULL)) +static inline bool should_force_charge (void ) +{ +return tsk_is_oom_victim (current) ||fatal_signal_pending (current) || + (current->flags &PF_EXITING ); +} +/* Some nice accessors for the vmpressure. */ struct vmpressure *memcg_to_vmpressure (struct mem_cgroup *memcg) {
@@ -1389,8 +1395,13 @@ static bool mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask, };bool ret; -mutex_lock (&oom_lock); - ret =out_of_memory (&oc); +if (mutex_lock_killable (&oom_lock)) +return true; +/* +* A few threads which were not waiting at mutex_lock_killable() can +* fail to bail out. Therefore, check again after holding oom_lock. +*/ + ret =should_force_charge () ||out_of_memory (&oc);mutex_unlock (&oom_lock);return ret; }
@@ -2209,9 +2220,7 @@ static int try_charge(struct mem_cgroup *memcg, gfp_t gfp_mask,* bypass the last charges so that they can exit quickly and * free their memory. */ -if (unlikely (tsk_is_oom_victim (current) || -fatal_signal_pending (current) || - current->flags &PF_EXITING )) +if (unlikely (should_force_charge ())) goto force;/*
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 37/262 mm, mempolicy: fix uninit memory access
In reply to Sasha LevinFrom: Vlastimil Babka <[email protected]>
[ Upstream commit 2e25644e8da4ed3a27e7b8315aaae74660be72dc ]
Syzbot with KMSAN reports (excerpt):
==================================================================
BUG: KMSAN: uninit-value in mpol_rebind_policy mm/mempolicy.c:353 [inline] BUG: KMSAN: uninit-value in mpol_rebind_mm+0x249/0x370 mm/mempolicy.c:384 CPU: 1 PID: 17420 Comm: syz-executor4 Not tainted 4.20.0-rc7+ #15 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x173/0x1d0 lib/dump_stack.c:113 kmsan_report+0x12e/0x2a0 mm/kmsan/kmsan.c:613 __msan_warning+0x82/0xf0 mm/kmsan/kmsan_instr.c:295 mpol_rebind_policy mm/mempolicy.c:353 [inline] mpol_rebind_mm+0x249/0x370 mm/mempolicy.c:384 update_tasks_nodemask+0x608/0xca0 kernel/cgroup/cpuset.c:1120 update_nodemasks_hier kernel/cgroup/cpuset.c:1185 [inline] update_nodemask kernel/cgroup/cpuset.c:1253 [inline] cpuset_write_resmask+0x2a98/0x34b0 kernel/cgroup/cpuset.c:1728
...
Uninit was created at:
kmsan_save_stack_with_flags mm/kmsan/kmsan.c:204 [inline] kmsan_internal_poison_shadow+0x92/0x150 mm/kmsan/kmsan.c:158 kmsan_kmalloc+0xa6/0x130 mm/kmsan/kmsan_hooks.c:176 kmem_cache_alloc+0x572/0xb90 mm/slub.c:2777 mpol_new mm/mempolicy.c:276 [inline] do_mbind mm/mempolicy.c:1180 [inline] kernel_mbind+0x8a7/0x31a0 mm/mempolicy.c:1347 __do_sys_mbind mm/mempolicy.c:1354 [inline]
As it's difficult to report where exactly the uninit value resides in the mempolicy object, we have to guess a bit. mm/mempolicy.c:353 contains this part of mpol_rebind_policy():
if (!mpol_store_user_nodemask(pol) &&
nodes_equal(pol->w.cpuset_mems_allowed, *newmask))"mpol_store_user_nodemask(pol)" is testing pol->flags, which I couldn't ever see being uninitialized after leaving mpol_new(). So I'll guess it's actually about accessing pol->w.cpuset_mems_allowed on line 354, but still part of statement starting on line 353.
For w.cpuset_mems_allowed to be not initialized, and the nodes_equal() reachable for a mempolicy where mpol_set_nodemask() is called in do_mbind(), it seems the only possibility is a MPOL_PREFERRED policy with empty set of nodes, i.e. MPOL_LOCAL equivalent, with MPOL_F_LOCAL flag. Let's exclude such policies from the nodes_equal() check. Note the uninit access should be benign anyway, as rebinding this kind of policy is always a no-op. Therefore no actual need for stable inclusion.
--- mm/mempolicy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/mempolicy.c +1 -1
@@ -350,7 +350,7 @@ static void mpol_rebind_policy(struct mempolicy *pol, const nodemask_t *newmask) {if (!pol)return ; -if (!mpol_store_user_nodemask (pol) && +if (!mpol_store_user_nodemask (pol) && !(pol->flags &MPOL_F_LOCAL ) &&nodes_equal (pol->w.cpuset_mems_allowed, *newmask))return ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 38/262 mm/vmalloc.c: fix kernel BUG at mm/vmalloc.c:512!
In reply to Sasha LevinFrom: "Uladzislau Rezki (Sony)" <[email protected]>
[ Upstream commit afd07389d3f4933c7f7817a92fb5e053d59a3182 ]
One of the vmalloc stress test case triggers the kernel BUG():
<snip>
[60.562151] ------------[ cut here ]------------ [60.562154] kernel BUG at mm/vmalloc.c:512! [60.562206] invalid opcode: 0000 [#1] PREEMPT SMP PTI [60.562247] CPU: 0 PID: 430 Comm: vmalloc_test/0 Not tainted 4.20.0+ #161 [60.562293] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1 04/01/2014 [60.562351] RIP: 0010:alloc_vmap_area+0x36f/0x390 <snip>
it can happen due to big align request resulting in overflowing of calculated address, i.e. it becomes 0 after ALIGN()'s fixup.
Fix it by checking if calculated address is within vstart/vend range.
--- mm/vmalloc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
mm/vmalloc.c +5 -1
@@ -498,7 +498,11 @@ static struct vmap_area *alloc_vmap_area(unsigned long size, } found: -if (addr + size > vend) +/* +* Check also calculated address against the vstart, +* because it can be 0 because of big align request. +*/ +if (addr + size > vend || addr < vstart) goto overflow; va->va_start = addr;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 39/262 mm/slab.c: kmemleak no scan alien caches
In reply to Sasha LevinFrom: Qian Cai <[email protected]>
[ Upstream commit 92d1d07daad65c300c7d0b68bbef8867e9895d54 ]
Kmemleak throws endless warnings during boot due to in __alloc_alien_cache(),
alc = kmalloc_node(memsize, gfp, node);
init_arraycache(&alc->ac, entries, batch);
kmemleak_no_scan(ac);Kmemleak does not track the array cache (alc->ac) but the alien cache (alc) instead, so let it track the latter by lifting kmemleak_no_scan() out of init_arraycache().
There is another place that calls init_arraycache(), but alloc_kmem_cache_cpus() uses the percpu allocation where will never be considered as a leak.
kmemleak: Found object by alias at 0xffff8007b9aa7e38
CPU: 190 PID: 1 Comm: swapper/0 Not tainted 5.0.0-rc2+ #2
Call trace:
dump_backtrace+0x0/0x168
show_stack+0x24/0x30
dump_stack+0x88/0xb0
lookup_object+0x84/0xac
find_and_get_object+0x84/0xe4
kmemleak_no_scan+0x74/0xf4
setup_kmem_cache_node+0x2b4/0x35c
__do_tune_cpucache+0x250/0x2d4
do_tune_cpucache+0x4c/0xe4
enable_cpucache+0xc8/0x110
setup_cpu_cache+0x40/0x1b8
__kmem_cache_create+0x240/0x358
create_cache+0xc0/0x198
kmem_cache_create_usercopy+0x158/0x20c
kmem_cache_create+0x50/0x64
fsnotify_init+0x58/0x6c
do_one_initcall+0x194/0x388
kernel_init_freeable+0x668/0x688
kernel_init+0x18/0x124
ret_from_fork+0x10/0x18
kmemleak: Object 0xffff8007b9aa7e00 (size 256):
kmemleak: comm "swapper/0", pid 1, jiffies 4294697137
kmemleak: min_count = 1
kmemleak: count = 0
kmemleak: flags = 0x1
kmemleak: checksum = 0
kmemleak: backtrace:
kmemleak_alloc+0x84/0xb8
kmem_cache_alloc_node_trace+0x31c/0x3a0
__kmalloc_node+0x58/0x78
setup_kmem_cache_node+0x26c/0x35c
__do_tune_cpucache+0x250/0x2d4
do_tune_cpucache+0x4c/0xe4
enable_cpucache+0xc8/0x110
setup_cpu_cache+0x40/0x1b8
__kmem_cache_create+0x240/0x358
create_cache+0xc0/0x198
kmem_cache_create_usercopy+0x158/0x20c
kmem_cache_create+0x50/0x64
fsnotify_init+0x58/0x6c
do_one_initcall+0x194/0x388
kernel_init_freeable+0x668/0x688
kernel_init+0x18/0x124
kmemleak: Not scanning unknown object at 0xffff8007b9aa7e38
CPU: 190 PID: 1 Comm: swapper/0 Not tainted 5.0.0-rc2+ #2
Call trace:
dump_backtrace+0x0/0x168
show_stack+0x24/0x30
dump_stack+0x88/0xb0
kmemleak_no_scan+0x90/0xf4
setup_kmem_cache_node+0x2b4/0x35c
__do_tune_cpucache+0x250/0x2d4
do_tune_cpucache+0x4c/0xe4
enable_cpucache+0xc8/0x110
setup_cpu_cache+0x40/0x1b8
__kmem_cache_create+0x240/0x358
create_cache+0xc0/0x198
kmem_cache_create_usercopy+0x158/0x20c
kmem_cache_create+0x50/0x64
fsnotify_init+0x58/0x6c
do_one_initcall+0x194/0x388
kernel_init_freeable+0x668/0x688
kernel_init+0x18/0x124
ret_from_fork+0x10/0x18--- mm/slab.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
mm/slab.c +9 -8
@@ -550,14 +550,6 @@ static void start_cpu_timer(int cpu)static void init_arraycache (struct array_cache *ac,int limit,int batch) { -/* -* The array_cache structures contain pointers to free object. -* However, when such objects are allocated or transferred to another -* cache the pointers are not cleared and they could be counted as -* valid references during a kmemleak scan. Therefore, kmemleak must -* not scan such objects. -*/ -kmemleak_no_scan (ac);if (ac) { ac->avail =0 ; ac->limit = limit;
@@ -573,6 +565,14 @@ static struct array_cache *alloc_arraycache(int node, int entries,struct array_cache *ac =NULL ; ac =kmalloc_node (memsize, gfp, node); +/* +* The array_cache structures contain pointers to free object. +* However, when such objects are allocated or transferred to another +* cache the pointers are not cleared and they could be counted as +* valid references during a kmemleak scan. Therefore, kmemleak must +* not scan such objects. +*/ +kmemleak_no_scan (ac);init_arraycache (ac, entries, batchcount);return ac; }
@@ -667,6 +667,7 @@ static struct alien_cache *__alloc_alien_cache(int node, int entries, alc =kmalloc_node (memsize, gfp, node);if (alc) { +kmemleak_no_scan (alc);init_arraycache (&alc->ac, entries, batch);spin_lock_init (&alc->lock); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 40/262 ocfs2: fix a panic problem caused by o2cb_ctl
In reply to Sasha LevinFrom: Jia Guo <[email protected]>
[ Upstream commit cc725ef3cb202ef2019a3c67c8913efa05c3cce6 ]
In the process of creating a node, it will cause NULL pointer dereference in kernel if o2cb_ctl failed in the interval (mkdir, o2cb_set_node_attribute(node_num)] in function o2cb_add_node.
The node num is initialized to 0 in function o2nm_node_group_make_item, o2nm_node_group_drop_item will mistake the node number 0 for a valid node number when we delete the node before the node number is set correctly. If the local node number of the current host happens to be 0, cluster->cl_local_node will be set to O2NM_INVALID_NODE_NUM while o2hb_thread still running. The panic stack is generated as follows:
o2hb_thread
\-o2hb_do_disk_heartbeat
\-o2hb_check_own_slot
|-slot = ®->hr_slots[o2nm_this_node()];
//o2nm_this_node() return O2NM_INVALID_NODE_NUMWe need to check whether the node number is set when we delete the node.
--- fs/ocfs2/cluster/nodemanager.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
fs/ocfs2/cluster/nodemanager.c +8 -6
@@ -621,13 +621,15 @@ static void o2nm_node_group_drop_item(struct config_group *group,struct o2nm_node *node =to_o2nm_node (item);struct o2nm_cluster *cluster =to_o2nm_cluster (group->cg_item.ci_parent); -o2net_disconnect_node (node); +if (cluster->cl_nodes[node->nd_num] == node) { +o2net_disconnect_node (node); -if (cluster->cl_has_local && - (cluster->cl_local_node == node->nd_num)) { - cluster->cl_has_local =0 ; - cluster->cl_local_node =O2NM_INVALID_NODE_NUM ; -o2net_stop_listening (node); +if (cluster->cl_has_local && + (cluster->cl_local_node == node->nd_num)) { + cluster->cl_has_local =0 ; + cluster->cl_local_node =O2NM_INVALID_NODE_NUM ; +o2net_stop_listening (node); + } }/* XXX call into net to stop this node from trading messages */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 41/262 f2fs: do not use mutex lock in atomic context
In reply to Sasha LevinFrom: Sahitya Tummala <[email protected]>
[ Upstream commit 9083977dabf3833298ddcd40dee28687f1e6b483 ]
Fix below warning coming because of using mutex lock in atomic context.
BUG: sleeping function called from invalid context at kernel/locking/mutex.c:98 in_atomic(): 1, irqs_disabled(): 0, pid: 585, name: sh Preemption disabled at: __radix_tree_preload+0x28/0x130 Call trace: dump_backtrace+0x0/0x2b4 show_stack+0x20/0x28 dump_stack+0xa8/0xe0 ___might_sleep+0x144/0x194 __might_sleep+0x58/0x8c mutex_lock+0x2c/0x48 f2fs_trace_pid+0x88/0x14c f2fs_set_node_page_dirty+0xd0/0x184
Do not use f2fs_radix_tree_insert() to avoid doing cond_resched() with spin_lock() acquired.
--- fs/f2fs/trace.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
fs/f2fs/trace.c +13 -7
@@ -14,7 +14,7 @@#include "trace.h" static RADIX_TREE(pids, GFP_ATOMIC); -static struct mutex pids_lock; +static spinlock_t pids_lock;static struct last_io_info last_io;static inline void __print_last_io (void )
@@ -58,23 +58,29 @@ void f2fs_trace_pid(struct page *page)set_page_private (page, (unsigned long )pid); +retry:if (radix_tree_preload (GFP_NOFS ))return ; -mutex_lock (&pids_lock); +spin_lock (&pids_lock); p =radix_tree_lookup (&pids, pid);if (p == current) goto out;if (p)radix_tree_delete (&pids, pid); -f2fs_radix_tree_insert (&pids, pid, current); +if (radix_tree_insert (&pids, pid, current)) { +spin_unlock (&pids_lock); +radix_tree_preload_end (); +cond_resched (); + goto retry; + }trace_printk ("%3x:%3x %4x %-16s\n" ,MAJOR (inode->i_sb->s_dev),MINOR (inode->i_sb->s_dev), pid, current->comm); out: -mutex_unlock (&pids_lock); +spin_unlock (&pids_lock);radix_tree_preload_end (); }
@@ -119,7 +125,7 @@ void f2fs_trace_ios(struct f2fs_io_info *fio, int flush)void f2fs_build_trace_ios (void ) { -mutex_init (&pids_lock); +spin_lock_init (&pids_lock); }#define PIDVEC_SIZE 128
@@ -147,7 +153,7 @@ void f2fs_destroy_trace_ios(void)pid_t next_pid =0 ;unsigned int found; -mutex_lock (&pids_lock); +spin_lock (&pids_lock);while ((found =gang_lookup_pids (pid, next_pid,PIDVEC_SIZE ))) {unsigned idx;
@@ -155,5 +161,5 @@ void f2fs_destroy_trace_ios(void)for (idx =0 ; idx < found; idx++)radix_tree_delete (&pids, pid[idx]); } -mutex_unlock (&pids_lock); +spin_unlock (&pids_lock); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 42/262 f2fs: fix to data block override node segment by mistake
In reply to Sasha LevinFrom: zhengliang <[email protected]>
[ Upstream commit a0770e13c8da83bdb64738c0209ab02dd3cfff8b ]
v4: Rearrange the previous three versions.
The following scenario could lead to data block override by mistake.
TASK A | TASK kworker | TASK B | TASK C
| | |
open | | |
write | | |
close | | |
| f2fs_write_data_pages | |
| f2fs_write_cache_pages | |
| f2fs_outplace_write_data | |
| f2fs_allocate_data_block (get block in seg S, | |
| S is full, and only | |
| have this valid data | |
| block) | |
| allocate_segment | |
| locate_dirty_segment (mark S as PRE) | |
| f2fs_submit_page_write (submit but is not | |
| written on dev) | |
unlink | | |
iput_final | | |
f2fs_drop_inode | | |
f2fs_truncate | | |
(not evict) | | |
| | write_checkpoint |
| | flush merged bio but not wait file data writeback |
| | set_prefree_as_free (mark S as FREE) |
| | | update NODE/DATA
| | | allocate_segment (select S)
| writeback done | |So we need to guarantee io complete before truncate inode in f2fs_drop_inode.
--- fs/f2fs/super.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/f2fs/super.c +4 -0
@@ -915,6 +915,10 @@ static int f2fs_drop_inode(struct inode *inode)sb_start_intwrite (inode->i_sb);f2fs_i_size_write (inode,0 ); +f2fs_submit_merged_write_cond (F2FS_I_SB (inode), + inode,NULL ,0 ,DATA ); +truncate_inode_pages_final (inode->i_mapping); +if (F2FS_HAS_BLOCKS (inode))f2fs_truncate (inode);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 43/262 fs/file.c: initialize init_files.resize_wait
In reply to Sasha LevinFrom: Shuriyc Chu <[email protected]>
[ Upstream commit 5704a06810682683355624923547b41540e2801a ]
(Taken from https://bugzilla.kernel.org/show_bug.cgi?id=200647)
'get_unused_fd_flags' in kthread cause kernel crash. It works fine on 4.1, but causes crash after get 64 fds. It also cause crash on ubuntu1404/1604/1804, centos7.5, and the crash messages are almost the same.
The crash message on centos7.5 shows below:
start fd 61
start fd 62
start fd 63
BUG: unable to handle kernel NULL pointer dereference at (null)
IP: __wake_up_common+0x2e/0x90
PGD 0
Oops: 0000 [#1] SMP
Modules linked in: test(OE) xt_CHECKSUM iptable_mangle ipt_MASQUERADE nf_nat_masquerade_ipv4 iptable_nat nf_nat_ipv4 nf_nat nf_conntrack_ipv4 nf_defrag_ipv4 xt_conntrack nf_conntrack ipt_REJECT nf_reject_ipv4 tun bridge stp llc ebtable_filter ebtables ip6table_filter ip6_tables iptable_filter devlink sunrpc kvm_intel kvm irqbypass crc32_pclmul ghash_clmulni_intel aesni_intel lrw gf128mul glue_helper ablk_helper cryptd sg ppdev pcspkr virtio_balloon parport_pc parport i2c_piix4 joydev ip_tables xfs libcrc32c sr_mod cdrom sd_mod crc_t10dif crct10dif_generic ata_generic pata_acpi virtio_scsi virtio_console virtio_net cirrus drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops ttm crct10dif_pclmul crct10dif_common crc32c_intel drm ata_piix serio_raw libata virtio_pci virtio_ring i2c_core
virtio floppy dm_mirror dm_region_hash dm_log dm_mod
CPU: 2 PID: 1820 Comm: test_fd Kdump: loaded Tainted: G OE ------------ 3.10.0-862.3.3.el7.x86_64 #1
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.10.2-0-g5f4c7b1-prebuilt.qemu-project.org 04/01/2014
task: ffff8e92b9431fa0 ti: ffff8e94247a0000 task.ti: ffff8e94247a0000
RIP: 0010:__wake_up_common+0x2e/0x90
RSP: 0018:ffff8e94247a2d18 EFLAGS: 00010086
RAX: 0000000000000000 RBX: ffffffff9d09daa0 RCX: 0000000000000000
RDX: 0000000000000000 RSI: 0000000000000003 RDI: ffffffff9d09daa0
RBP: ffff8e94247a2d50 R08: 0000000000000000 R09: ffff8e92b95dfda8
R10: 0000000000000000 R11: 0000000000000000 R12: ffffffff9d09daa8
R13: 0000000000000003 R14: 0000000000000000 R15: 0000000000000003
FS: 0000000000000000(0000) GS:ffff8e9434e80000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000000000000000 CR3: 000000017c686000 CR4: 00000000000207e0
Call Trace:
__wake_up+0x39/0x50
expand_files+0x131/0x250
__alloc_fd+0x47/0x170
get_unused_fd_flags+0x30/0x40
test_fd+0x12a/0x1c0 [test]
kthread+0xd1/0xe0
ret_from_fork_nospec_begin+0x21/0x21
Code: 66 90 55 48 89 e5 41 57 41 89 f7 41 56 41 89 ce 41 55 41 54 49 89 fc 49 83 c4 08 53 48 83 ec 10 48 8b 47 08 89 55 cc 4c 89 45 d0 <48> 8b 08 49 39 c4 48 8d 78 e8 4c 8d 69 e8 75 08 eb 3b 4c 89 ef
RIP __wake_up_common+0x2e/0x90
RSP <ffff8e94247a2d18>
CR2: 0000000000000000This issue exists since CentOS 7.5 3.10.0-862 and CentOS 7.4 (3.10.0-693.21.1 ) is ok. Root cause: the item 'resize_wait' is not initialized before being used.
--- fs/file.c | 1 + 1 file changed, 1 insertion(+)
fs/file.c +1 -0
@@ -457,6 +457,7 @@ struct files_struct init_files = { .full_fds_bits = init_files.full_fds_bits_init, }, .file_lock = __SPIN_LOCK_UNLOCKED(init_files.file_lock), + .resize_wait = __WAIT_QUEUE_HEAD_INITIALIZER(init_files.resize_wait), };static unsigned int find_next_fd (struct fdtable *fdt,unsigned int start)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 44/262 page_poison: play nicely with KASAN
In reply to Sasha LevinFrom: Qian Cai <[email protected]>
[ Upstream commit 4117992df66a26fa33908b4969e04801534baab1 ]
KASAN does not play well with the page poisoning (CONFIG_PAGE_POISONING). It triggers false positives in the allocation path:
BUG: KASAN: use-after-free in memchr_inv+0x2ea/0x330 Read of size 8 at addr ffff88881f800000 by task swapper/0 CPU: 0 PID: 0 Comm: swapper Not tainted 5.0.0-rc1+ #54 Call Trace: dump_stack+0xe0/0x19a print_address_description.cold.2+0x9/0x28b kasan_report.cold.3+0x7a/0xb5 __asan_report_load8_noabort+0x19/0x20 memchr_inv+0x2ea/0x330 kernel_poison_pages+0x103/0x3d5 get_page_from_freelist+0x15e7/0x4d90
because KASAN has not yet unpoisoned the shadow page for allocation before it checks memchr_inv() but only found a stale poison pattern.
Also, false positives in free path,
BUG: KASAN: slab-out-of-bounds in kernel_poison_pages+0x29e/0x3d5 Write of size 4096 at addr ffff8888112cc000 by task swapper/0/1 CPU: 5 PID: 1 Comm: swapper/0 Not tainted 5.0.0-rc1+ #55 Call Trace: dump_stack+0xe0/0x19a print_address_description.cold.2+0x9/0x28b kasan_report.cold.3+0x7a/0xb5 check_memory_region+0x22d/0x250 memset+0x28/0x40 kernel_poison_pages+0x29e/0x3d5 __free_pages_ok+0x75f/0x13e0
due to KASAN adds poisoned redzones around slab objects, but the page poisoning needs to poison the whole page.
--- mm/page_alloc.c | 2 +- mm/page_poison.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)
mm/page_alloc.c +1 -1
@@ -1945,8 +1945,8 @@ inline void post_alloc_hook(struct page *page, unsigned int order,arch_alloc_page (page, order);kernel_map_pages (page,1 << order,1 ); -kernel_poison_pages (page,1 << order,1 );kasan_alloc_pages (page, order); +kernel_poison_pages (page,1 << order,1 );set_page_owner (page, order, gfp_flags); }
mm/page_poison.c +4 -0
@@ -6,6 +6,7 @@#include <linux/page_ext.h> #include <linux/poison.h> #include <linux/ratelimit.h> +#include <linux/kasan.h> static bool want_page_poisoning__read_mostly ;
@@ -40,7 +41,10 @@ static void poison_page(struct page *page) {void *addr =kmap_atomic (page); +/* KASAN still think the page is in-use, so skip it. */ +kasan_disable_current ();memset (addr,PAGE_POISON ,PAGE_SIZE ); +kasan_enable_current ();kunmap_atomic (addr); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 45/262 kasan: fix kasan_check_read/write definitions
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit bcf6f55a0d05eedd8ebb6ecc60ae3f93205ad833 ]
Building little-endian allmodconfig kernels on arm64 started failing with the generated atomic.h implementation, since we now try to call kasan helpers from the EFI stub:
aarch64-linux-gnu-ld: drivers/firmware/efi/libstub/arm-stub.stub.o: in function `atomic_set':
include/generated/atomic-instrumented.h:44: undefined reference to `__efistub_kasan_check_write'
I suspect that we get similar problems in other files that explicitly disable KASAN for some reason but call atomic_t based helper functions.
We can fix this by checking the predefined __SANITIZE_ADDRESS__ macro that the compiler sets instead of checking CONFIG_KASAN, but this in turn requires a small hack in mm/kasan/common.c so we do see the extern declaration there instead of the inline function.
--- include/linux/kasan-checks.h | 2 +- mm/kasan/common.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
include/linux/kasan-checks.h +1 -1
@@ -2,7 +2,7 @@#ifndef _LINUX_KASAN_CHECKS_H#define _LINUX_KASAN_CHECKS_H -#ifdef CONFIG_KASAN +#if defined(__SANITIZE_ADDRESS__) || defined(__KASAN_INTERNAL)void kasan_check_read (const volatile void *p,unsigned int size);void kasan_check_write (const volatile void *p,unsigned int size);#else
mm/kasan/common.c +2 -0
@@ -14,6 +14,8 @@* */ +#define __KASAN_INTERNAL +#include <linux/export.h> #include <linux/interrupt.h> #include <linux/init.h>
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 46/262 cifs: use correct format characters
In reply to Sasha LevinFrom: Louis Taylor <[email protected]>
[ Upstream commit 259594bea574e515a148171b5cd84ce5cbdc028a ]
When compiling with -Wformat, clang emits the following warnings:
fs/cifs/smb1ops.c:312:20: warning: format specifies type 'unsigned short' but the argument has type 'unsigned int' [-Wformat]
tgt_total_cnt, total_in_tgt);
^~~~~~~~~~~~fs/cifs/cifs_dfs_ref.c:289:4: warning: format specifies type 'short' but the argument has type 'int' [-Wformat]
ref->flags, ref->server_type);
^~~~~~~~~~fs/cifs/cifs_dfs_ref.c:289:16: warning: format specifies type 'short' but the argument has type 'int' [-Wformat]
ref->flags, ref->server_type);
^~~~~~~~~~~~~~~~fs/cifs/cifs_dfs_ref.c:291:4: warning: format specifies type 'short' but the argument has type 'int' [-Wformat]
ref->ref_flag, ref->path_consumed);
^~~~~~~~~~~~~fs/cifs/cifs_dfs_ref.c:291:19: warning: format specifies type 'short' but the argument has type 'int' [-Wformat]
ref->ref_flag, ref->path_consumed);
^~~~~~~~~~~~~~~~~~The types of these arguments are unconditionally defined, so this patch updates the format character to the correct ones for ints and unsigned ints.
--- fs/cifs/cifs_dfs_ref.c | 4 ++-- fs/cifs/smb1ops.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
fs/cifs/cifs_dfs_ref.c +2 -2
@@ -285,9 +285,9 @@ static void dump_referral(const struct dfs_info3_param *ref) {cifs_dbg (FYI ,"DFS: ref path: %s\n" , ref->path_name);cifs_dbg (FYI ,"DFS: node path: %s\n" , ref->node_name); -cifs_dbg (FYI ,"DFS: fl: %hd, srv_type: %hd\n" , +cifs_dbg (FYI ,"DFS: fl: %d, srv_type: %d\n" , ref->flags, ref->server_type); -cifs_dbg (FYI ,"DFS: ref_flags: %hd, path_consumed: %hd\n" , +cifs_dbg (FYI ,"DFS: ref_flags: %d, path_consumed: %d\n" , ref->ref_flag, ref->path_consumed); }
fs/cifs/smb1ops.c +1 -1
@@ -308,7 +308,7 @@ coalesce_t2(char *second_buf, struct smb_hdr *target_hdr) remaining = tgt_total_cnt - total_in_tgt;if (remaining <0 ) { -cifs_dbg (FYI ,"Server sent too much data. tgt_total_cnt=%hu total_in_tgt=%hu\n" , +cifs_dbg (FYI ,"Server sent too much data. tgt_total_cnt=%hu total_in_tgt=%u\n" , tgt_total_cnt, total_in_tgt);return -EPROTO ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 47/262 dm thin: add sanity checks to thin-pool and external snapshot creation
In reply to Sasha LevinFrom: "Jason Cai (Xiang Feng)" <[email protected]>
[ Upstream commit 70de2cbda8a5d788284469e755f8b097d339c240 ]
Invoking dm_get_device() twice on the same device path with different modes is dangerous. Because in that case, upgrade_mode() will alloc a new 'dm_dev' and free the old one, which may be referenced by a previous caller. Dereferencing the dangling pointer will trigger kernel NULL pointer dereference.
The following two cases can reproduce this issue. Actually, they are invalid setups that must be disallowed, e.g.:
1. Creating a thin-pool with read_only mode, and the same device as both metadata and data.
dmsetup create thinp --table \
"0 41943040 thin-pool /dev/vdb /dev/vdb 128 0 1 read_only"BUG: unable to handle kernel NULL pointer dereference at 0000000000000080 ... Call Trace: new_read+0xfb/0x110 [dm_bufio] dm_bm_read_lock+0x43/0x190 [dm_persistent_data] ? kmem_cache_alloc_trace+0x15c/0x1e0 __create_persistent_data_objects+0x65/0x3e0 [dm_thin_pool] dm_pool_metadata_open+0x8c/0xf0 [dm_thin_pool] pool_ctr.cold.79+0x213/0x913 [dm_thin_pool] ? realloc_argv+0x50/0x70 [dm_mod] dm_table_add_target+0x14e/0x330 [dm_mod] table_load+0x122/0x2e0 [dm_mod] ? dev_status+0x40/0x40 [dm_mod] ctl_ioctl+0x1aa/0x3e0 [dm_mod] dm_ctl_ioctl+0xa/0x10 [dm_mod] do_vfs_ioctl+0xa2/0x600 ? handle_mm_fault+0xda/0x200 ? __do_page_fault+0x26c/0x4f0 ksys_ioctl+0x60/0x90 __x64_sys_ioctl+0x16/0x20 do_syscall_64+0x55/0x150 entry_SYSCALL_64_after_hwframe+0x44/0xa9
2. Creating a external snapshot using the same thin-pool device.
dmsetup create thinp --table \
"0 41943040 thin-pool /dev/vdc /dev/vdb 128 0 2 ignore_discard"
dmsetup message /dev/mapper/thinp 0 "create_thin 0"
dmsetup create snap --table \
"0 204800 thin /dev/mapper/thinp 0 /dev/mapper/thinp"BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 ... Call Trace: ? __alloc_pages_nodemask+0x13c/0x2e0 retrieve_status+0xa5/0x1f0 [dm_mod] ? dm_get_live_or_inactive_table.isra.7+0x20/0x20 [dm_mod] table_status+0x61/0xa0 [dm_mod] ctl_ioctl+0x1aa/0x3e0 [dm_mod] dm_ctl_ioctl+0xa/0x10 [dm_mod] do_vfs_ioctl+0xa2/0x600 ksys_ioctl+0x60/0x90 ? ksys_write+0x4f/0xb0 __x64_sys_ioctl+0x16/0x20 do_syscall_64+0x55/0x150 entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- drivers/md/dm-thin.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/md/dm-thin.c +13 -0
@@ -3283,6 +3283,13 @@ static int pool_ctr(struct dm_target *ti, unsigned argc, char **argv) as.argc = argc; as.argv = argv; +/* make sure metadata and data are different devices */ +if (!strcmp (argv[0 ], argv[1 ])) { + ti->error ="Error setting metadata or data device" ; + r = -EINVAL ; + goto out_unlock; + } +/* * Set default pool features. */
@@ -4167,6 +4174,12 @@ static int thin_ctr(struct dm_target *ti, unsigned argc, char **argv) tc->sort_bio_list =RB_ROOT ;if (argc ==3 ) { +if (!strcmp (argv[0 ], argv[2 ])) { + ti->error ="Error setting origin device" ; + r = -EINVAL ; + goto bad_origin_dev; + } + r =dm_get_device (ti, argv[2 ],FMODE_READ , &origin_dev);if (r) { ti->error ="Error opening origin device" ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 48/262 f2fs: fix to check inline_xattr_size boundary correctly
In reply to Sasha LevinFrom: Chao Yu <[email protected]>
[ Upstream commit 500e0b28ecd3c5aade98f3c3a339d18dcb166bb6 ]
We use below condition to check inline_xattr_size boundary:
if (!F2FS_OPTION(sbi).inline_xattr_size || F2FS_OPTION(sbi).inline_xattr_size >= DEF_ADDRS_PER_INODE - F2FS_TOTAL_EXTRA_ATTR_SIZE - DEF_INLINE_RESERVED_SIZE - DEF_MIN_INLINE_SIZE)
There is there problems in that check:
- we should allow inline_xattr_size equaling to min size of inline {data,dentry} area.
- F2FS_TOTAL_EXTRA_ATTR_SIZE and inline_xattr_size are based on different size unit, previous one is 4 bytes, latter one is 1 bytes.
- DEF_MIN_INLINE_SIZE only indicate min size of inline data area, however, we need to consider min size of inline dentry area as well, minimal inline dentry should at least contain two entries: '.' and '..', so that min inline_dentry size is 40 bytes.
.bitmap 1 * 1 = 1
.reserved 1 * 1 = 1
.dentry 11 * 2 = 22
.filename 8 * 2 = 16
total 40
--- fs/f2fs/f2fs.h | 1 - fs/f2fs/super.c | 13 +++++++------ include/linux/f2fs_fs.h | 13 +++++++------ 3 files changed, 14 insertions(+), 13 deletions(-)
fs/f2fs/f2fs.h +0 -1
@@ -456,7 +456,6 @@ struct f2fs_flush_device {/* for inline stuff */ #define DEF_INLINE_RESERVED_SIZE 1 -#define DEF_MIN_INLINE_SIZE 1static inline int get_extra_isize (struct inode *inode);static inline int get_inline_xattr_addrs (struct inode *inode);#define MAX_INLINE_DATA (inode) (sizeof(__le32) * \
fs/f2fs/super.c +7 -6
@@ -834,12 +834,13 @@ static int parse_options(struct super_block *sb, char *options) "set with inline_xattr option");return -EINVAL ; } -if (!F2FS_OPTION (sbi).inline_xattr_size || -F2FS_OPTION (sbi).inline_xattr_size >= -DEF_ADDRS_PER_INODE - -F2FS_TOTAL_EXTRA_ATTR_SIZE - -DEF_INLINE_RESERVED_SIZE - -DEF_MIN_INLINE_SIZE ) { +if (F2FS_OPTION (sbi).inline_xattr_size < +sizeof (struct f2fs_xattr_header ) /sizeof (__le32) || +F2FS_OPTION (sbi).inline_xattr_size > +DEF_ADDRS_PER_INODE - +F2FS_TOTAL_EXTRA_ATTR_SIZE /sizeof (__le32) - +DEF_INLINE_RESERVED_SIZE - +MIN_INLINE_DENTRY_SIZE /sizeof (__le32)) {f2fs_msg (sb,KERN_ERR ,"inline xattr size is out of range" );return -EINVAL ;
include/linux/f2fs_fs.h +7 -6
@@ -489,12 +489,12 @@ typedef __le32 f2fs_hash_t;/* * space utilization of regular dentry and inline dentry (w/o extra reservation) -* regular dentry inline dentry -* bitmap 1 * 27 = 27 1 * 23 = 23 -* reserved 1 * 3 = 3 1 * 7 = 7 -* dentry 11 * 214 = 2354 11 * 182 = 2002 -* filename 8 * 214 = 1712 8 * 182 = 1456 -* total 4096 3488 +* regular dentry inline dentry (def) inline dentry (min) +* bitmap 1 * 27 = 27 1 * 23 = 23 1 * 1 = 1 +* reserved 1 * 3 = 3 1 * 7 = 7 1 * 1 = 1 +* dentry 11 * 214 = 2354 11 * 182 = 2002 11 * 2 = 22 +* filename 8 * 214 = 1712 8 * 182 = 1456 8 * 2 = 16 +* total 4096 3488 40 * * Note: there are more reserved space in inline dentry than in regular * dentry, when converting inline dentry we should handle this carefully.
@@ -506,6 +506,7 @@ typedef __le32 f2fs_hash_t;#define SIZE_OF_RESERVED (PAGE_SIZE - ((SIZE_OF_DIR_ENTRY + \ F2FS_SLOT_LEN) * \ NR_DENTRY_IN_BLOCK + SIZE_OF_DENTRY_BITMAP)) +#define MIN_INLINE_DENTRY_SIZE 40/* just include '.' and '..' entries */ /* One directory entry slot representing F2FS_SLOT_LEN-sized file name */ struct f2fs_dir_entry {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 49/262 cifs: Accept validate negotiate if server return NT_STATUS_NOT_SUPPORTED
In reply to Sasha LevinFrom: Namjae Jeon <[email protected]>
[ Upstream commit 969ae8e8d4ee54c99134d3895f2adf96047f5bee ]
Old windows version or Netapp SMB server will return NT_STATUS_NOT_SUPPORTED since they do not allow or implement FSCTL_VALIDATE_NEGOTIATE_INFO. The client should accept the response provided it's properly signed.
See
https://blogs.msdn.microsoft.com/openspecification/2012/06/28/smb3-secure-dialect-negotiation/
and
MS-SMB2 validate negotiate response processing:
https://msdn.microsoft.com/en-us/library/hh880630.aspx
Samba client had already handled it.
https://bugzilla.samba.org/attachment.cgi?id=13285&action=edit
--- fs/cifs/smb2pdu.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
fs/cifs/smb2pdu.c +8 -2
@@ -986,8 +986,14 @@ int smb3_validate_negotiate(const unsigned int xid, struct cifs_tcon *tcon) rc =SMB2_ioctl (xid, tcon,NO_FILE_ID ,NO_FILE_ID ,FSCTL_VALIDATE_NEGOTIATE_INFO , true/* is_fsctl */ , (char *)pneg_inbuf, inbuflen, (char **)&pneg_rsp, &rsplen); - -if (rc !=0 ) { +if (rc == -EOPNOTSUPP ) { +/* +* Old Windows versions or Netapp SMB server can return +* not supported error. Client should accept it. +*/ +cifs_dbg (VFS ,"Server does not support validate negotiate\n" ); +return 0 ; + }else if (rc !=0 ) {cifs_dbg (VFS ,"validate protocol negotiate failed: %d\n" , rc); rc = -EIO ; goto out_free_inbuf;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 50/262 cifs: Fix NULL pointer dereference of devname
In reply to Sasha LevinFrom: Yao Liu <[email protected]>
[ Upstream commit 68e2672f8fbd1e04982b8d2798dd318bf2515dd2 ]
There is a NULL pointer dereference of devname in strspn()
The oops looks something like:
CIFS: Attempting to mount (null)
BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 ... RIP: 0010:strspn+0x0/0x50 ... Call Trace: ? cifs_parse_mount_options+0x222/0x1710 [cifs] ? cifs_get_volume_info+0x2f/0x80 [cifs] cifs_setup_volume_info+0x20/0x190 [cifs] cifs_get_volume_info+0x50/0x80 [cifs] cifs_smb3_do_mount+0x59/0x630 [cifs] ? ida_alloc_range+0x34b/0x3d0 cifs_do_mount+0x11/0x20 [cifs] mount_fs+0x52/0x170 vfs_kern_mount+0x6b/0x170 do_mount+0x216/0xdc0 ksys_mount+0x83/0xd0 __x64_sys_mount+0x25/0x30 do_syscall_64+0x65/0x220 entry_SYSCALL_64_after_hwframe+0x49/0xbe
Fix this by adding a NULL check on devname in cifs_parse_devname()
--- fs/cifs/connect.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/cifs/connect.c +5 -0
@@ -1487,6 +1487,11 @@ cifs_parse_devname(const char *devname, struct smb_vol *vol)const char *delims ="/\\" ;size_t len; +if (unlikely (!devname || !*devname)) { +cifs_dbg (VFS ,"Device name not specified.\n" ); +return -EINVAL ; + } +/* make sure we have a valid UNC double delimiter prefix */ len =strspn (devname, delims);if (len !=2 )
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 51/262 fs: Make splice() and tee() take into account O_NONBLOCK flag on pipes
In reply to Sasha LevinFrom: Slavomir Kaslev <[email protected]>
[ Upstream commit ee5e001196d1345b8fee25925ff5f1d67936081e ]
The current implementation of splice() and tee() ignores O_NONBLOCK set on pipe file descriptors and checks only the SPLICE_F_NONBLOCK flag for blocking on pipe arguments. This is inconsistent since splice()-ing from/to non-pipe file descriptors does take O_NONBLOCK into consideration.
Fix this by promoting O_NONBLOCK, when set on a pipe, to SPLICE_F_NONBLOCK.
Some context for how the current implementation of splice() leads to inconsistent behavior. In the ongoing work[1] to add VM tracing capability to trace-cmd we stream tracing data over named FIFOs or vsockets from guests back to the host.
When we receive SIGINT from user to stop tracing, we set O_NONBLOCK on the input file descriptor and set SPLICE_F_NONBLOCK for the next call to splice(). If splice() was blocked waiting on data from the input FIFO, after SIGINT splice() restarts with the same arguments (no SPLICE_F_NONBLOCK) and blocks again instead of returning -EAGAIN when no data is available.
This differs from the splice() behavior when reading from a vsocket or when we're doing a traditional read()/write() loop (trace-cmd's --nosplice argument).
With this patch applied we get the same behavior in all situations after setting O_NONBLOCK which also matches the behavior of doing a read()/write() loop instead of splice().
This change does have potential of breaking users who don't expect EAGAIN from splice() when SPLICE_F_NONBLOCK is not set. OTOH programs that set O_NONBLOCK and don't anticipate EAGAIN are arguably buggy[2].
[1] https://github.com/skaslev/trace-cmd/tree/vsock
[2] https://github.com/torvalds/linux/blob/d47e3da1759230e394096fd742aad423c291ba48/fs/read_write.c#L1425
--- fs/splice.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
fs/splice.c +12 -0
@@ -1123,6 +1123,9 @@ static long do_splice(struct file *in, loff_t __user *off_in,if (ipipe == opipe)return -EINVAL ; +if ((in->f_flags | out->f_flags) &O_NONBLOCK ) + flags |=SPLICE_F_NONBLOCK ; +return splice_pipe_to_pipe (ipipe, opipe, len, flags); }
@@ -1148,6 +1151,9 @@ static long do_splice(struct file *in, loff_t __user *off_in,if (unlikely (ret <0 ))return ret; +if (in->f_flags &O_NONBLOCK ) + flags |=SPLICE_F_NONBLOCK ; +file_start_write (out); ret =do_splice_from (ipipe, out, &offset, len, flags);file_end_write (out);
@@ -1172,6 +1178,9 @@ static long do_splice(struct file *in, loff_t __user *off_in, offset = in->f_pos; } +if (out->f_flags &O_NONBLOCK ) + flags |=SPLICE_F_NONBLOCK ; +pipe_lock (opipe); ret =wait_for_space (opipe, flags);if (!ret)
@@ -1721,6 +1730,9 @@ static long do_tee(struct file *in, struct file *out, size_t len,* copying the data. */ if (ipipe && opipe && ipipe != opipe) { +if ((in->f_flags | out->f_flags) &O_NONBLOCK ) + flags |=SPLICE_F_NONBLOCK ; +/* * Keep going, unless we encounter an error. The ipipe/opipe * ordering doesn't really matter.
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 52/262 perf beauty msg_flags: Add missing %s lost when adding prefix suppression logic
In reply to Sasha LevinFrom: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit c3b81a500f35241a4c16febe0a015e572cf2c492 ]
When the prefix suppresion/enabling logic was added, I forgot to add an extra %, which ended up chopping off the strings:
Before:
# perf trace -e *mmsg --map-dump syscalls [299] = 1, [307] = 1, DNS Res~ver #3/14587 sendmmsg(106<socket:[3462393]>, 0x7f252b0fcaf0, 2, MSG_) = 2 chronyd/1053 recvmmsg(4, 0x558542ca5740, 4, MSG_, NULL) = 1 DNS Res~ver #2/14445 sendmmsg(106<socket:[3461475]>, 0x7f252ab09af0, 2, MSG_) = 2 DNS Res~ver #2/14444 sendmmsg(146<socket:[3457863]>, 0x7f2521a7aaf0, 2, MSG_) = 2 DNS Res~ver #2/14445 sendmmsg(106<socket:[3461475]>, 0x7f252ab09af0, 2, MSG_) = 2 DNS Res~ver #3/14587 sendmmsg(148<socket:[3460636]>, 0x7f252b0fcaf0, 2, MSG_) = 2 DNS Res~ver #2/14444 sendmmsg(146<socket:[3457863]>, 0x7f2521a7aaf0, 2, MSG_) = 2 ^C#
After:
# perf trace -e *mmsg --map-dump syscalls [299] = 1, [307] = 1, NetworkManager/17467 sendmmsg(22<socket:[3466493]>, 0x7f28927f9bb0, 2, MSG_NOSIGNAL) = 2 pool/17478 sendmmsg(10<socket:[3466523]>, 0x7f2769f95e90, 2, MSG_NOSIGNAL) = 2 DNS Res~ver #3/14587 sendmmsg(121<socket:[3466132]>, 0x7f252b0fcaf0, 2, MSG_NOSIGNAL) = 2 chronyd/1053 recvmmsg(4, 0x558542ca5740, 4, MSG_DONTWAIT, NULL) = 1 Socket Thread/17433 sendmmsg(121<socket:[3460903]>, 0x7f252668baf0, 2, MSG_NOSIGNAL) = 2 ^C#
--- tools/perf/trace/beauty/msg_flags.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/trace/beauty/msg_flags.c +1 -1
@@ -29,7 +29,7 @@ static size_t syscall_arg__scnprintf_msg_flags(char *bf, size_t size,return scnprintf (bf, size,"NONE" );#define P_MSG_FLAG (n) \ if (flags & MSG_##n) { \ - printed += scnprintf(bf + printed, size - printed, "%s%s", printed ? "|" : "", show_prefix ? prefix : "", #n); \ + printed += scnprintf(bf + printed, size - printed, "%s%s%s", printed ? "|" : "", show_prefix ? prefix : "", #n); \ flags &= ~MSG_##n; \ }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 53/262 netfilter: nf_tables: check the result of dereferencing base_chain->stats
In reply to Sasha LevinFrom: Li RongQing <[email protected]>
[ Upstream commit a9f5e78c403d2d62ade4f4c85040efc85f4049b8 ]
Check the result of dereferencing base_chain->stats, instead of result of this_cpu_ptr with NULL.
base_chain->stats maybe be changed to NULL when a chain is updated and a new NULL counter can be attached.
And we do not need to check returning of this_cpu_ptr since base_chain->stats is from percpu allocator if it is non-NULL, this_cpu_ptr returns a valid value.
And fix two sparse error by replacing rcu_access_pointer and rcu_dereference with READ_ONCE under rcu_read_lock.
Thanks for Eric's help to finish this patch.
--- net/netfilter/nf_tables_core.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
net/netfilter/nf_tables_core.c +8 -6
@@ -98,21 +98,23 @@ static noinline void nft_update_chain_stats(const struct nft_chain *chain, const struct nft_pktinfo *pkt) {struct nft_base_chain *base_chain; +struct nft_stats __percpu *pstats;struct nft_stats *stats; base_chain =nft_base_chain (chain); -if (!rcu_access_pointer (base_chain->stats)) -return ; -local_bh_disable (); - stats =this_cpu_ptr (rcu_dereference (base_chain->stats)); -if (stats) { +rcu_read_lock (); + pstats =READ_ONCE (base_chain->stats); +if (pstats) { +local_bh_disable (); + stats =this_cpu_ptr (pstats);u64_stats_update_begin (&stats->syncp); stats->pkts++; stats->bytes += pkt->skb->len;u64_stats_update_end (&stats->syncp); +local_bh_enable (); } -local_bh_enable (); +rcu_read_unlock (); }struct nft_jumpstack {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 54/262 PCI: mediatek: Fix memory mapped IO range size computation
In reply to Sasha LevinFrom: Honghui Zhang <[email protected]>
[ Upstream commit c61df57343bf05743f8abbb31eec9a6f05820dd1 ]
Mediatek's HW assigns a MMIO address range (typically starts from 0x20000000 to 0x2fffffff for both mt2712 and mt7622) for PCI usage.
This MMIO address space represents the address space that can be allocated to PCI devices through Base Address Registers.
Even though the full MMIO address range is available to be allocated, it should be enabled by the PCIE_AHB_TRANS_BASE register in the host controller and the size that is enabled is determined by AHB2PCIE_SIZE bits in this register.
Owing to a bug in the MMIO window size computation, current code does not enable the full size of the available MMIO address range in the PCI host controller; if the PCI devices BARs requested size exceeds the size enabled through the PCIE_AHB_TRANS_BASE register the requests targeting the disabled address address space will be blocked by the root complex causing a system error.
Existing code has never run into a system error in production because even half of the enabled MMIO range (128MB) is big enough for typical devices BAR requests (4MB) but the full MMIO address range should be enabled regardless.
Fix the MMIO window size computation by using resource_size(mem) instead of mem->end - mem->start.
Since the MMIO window size for both MT2712 and MT7622 is 0x10000000, this change will update the parameter passed to fls() from 0xfffffff to 0x10000000 and calculate the whole memory mapped IO range size correctly.
Detected through coccinelle semantic patch (and related warning):
scripts/coccinelle/api/resource_size.cocci:
pcie-mediatek.c:720:13-16: WARNING: Suspicious code. resource_size is maybe missing with mem
--- drivers/pci/controller/pcie-mediatek.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/pci/controller/pcie-mediatek.c +2 -3
@@ -654,7 +654,6 @@ static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port)struct resource *mem = &pcie->mem;const struct mtk_pcie_soc *soc = port->pcie->soc;u32 val; -size_t size;int err;/* MT7622 platforms need to enable LTSSM and ASPM from PCIe subsys */
@@ -706,8 +705,8 @@ static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port)mtk_pcie_enable_msi (port);/* Set AHB to PCIe translation windows */ - size = mem->end - mem->start; - val =lower_32_bits (mem->start) |AHB2PCIE_SIZE (fls (size)); + val =lower_32_bits (mem->start) | +AHB2PCIE_SIZE (fls (resource_size (mem)));writel (val, port->base +PCIE_AHB_TRANS_BASE0_L ); val =upper_32_bits (mem->start);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 55/262 netfilter: conntrack: tcp: only close if RST matches exact sequence
In reply to Sasha LevinFrom: Florian Westphal <[email protected]>
[ Upstream commit be0502a3f2e94211a8809a09ecbc3a017189b8fb ]
TCP resets cause instant transition from established to closed state provided the reset is in-window. Endpoints that implement RFC 5961 require resets to match the next expected sequence number. RST segments that are in-window (but that do not match RCV.NXT) are ignored, and a "challenge ACK" is sent back.
Main problem for conntrack is that its a middlebox, i.e. whereas an end host might have ACK'd SEQ (and would thus accept an RST with this sequence number), conntrack might not have seen this ACK (yet).
Therefore we can't simply flag RSTs with non-exact match as invalid.
This updates RST processing as follows:
1. If the connection is in a state other than ESTABLISHED, nothing is changed, RST is subject to normal in-window check.
2. If the RSTs sequence number either matches exactly RCV.NXT, connection state moves to CLOSE.
3. The same applies if the RST sequence number aligns with a previous packet in the same direction.
In all other cases, the connection remains in ESTABLISHED state. If the normal-in-window check passes, the timeout will be lowered to that of CLOSE.
If the peer sends a challenge ack, connection timeout will be reset.
If the challenge ACK triggers another RST (RST was valid after all), this 2nd RST will match expected sequence and conntrack state changes to CLOSE.
If no challenge ACK is received, the connection will time out after CLOSE seconds (10 seconds by default), just like without this patch.
Packetdrill test case:
0.000 socket(..., SOCK_STREAM, IPPROTO_TCP) = 3 0.000 setsockopt(3, SOL_SOCKET, SO_REUSEADDR, [1], 4) = 0 0.000 bind(3, ..., ...) = 0
0.000 listen(3, 1) = 0
0.100 < S 0:0(0) win 32792 <mss 1460,sackOK,nop,nop,nop,wscale 7> 0.100 > S. 0:0(0) ack 1 win 64240 <mss 1460,nop,nop,sackOK,nop,wscale 7> 0.200 < . 1:1(0) ack 1 win 257
0.200 accept(3, ..., ...) = 4
// Receive a segment.
0.210 < P. 1:1001(1000) ack 1 win 46
0.210 > . 1:1(0) ack 1001
// Application writes 1000 bytes.
0.250 write(4, ..., 1000) = 1000
0.250 > P. 1:1001(1000) ack 1001
// First reset, old sequence. Conntrack (correctly) considers this // invalid due to failed window validation (regardless of this patch). 0.260 < R 2:2(0) ack 1001 win 260
// 2nd reset, but too far ahead sequence. Same: correctly handled // as invalid.
0.270 < R 99990001:99990001(0) ack 1001 win 260
// in-window, but not exact sequence.
// Current Linux kernels might reply with a challenge ack, and do not // remove connection.
// Without this patch, conntrack state moves to CLOSE.
// With patch, timeout is lowered like CLOSE, but connection stays // in ESTABLISHED state.
0.280 < R 1010:1010(0) ack 1001 win 260
// Expect challenge ACK
0.281 > . 1001:1001(0) ack 1001 win 501
// With or without this patch, RST will cause connection // to move to CLOSE (sequence number matches) // 0.282 < R 1001:1001(0) ack 1001 win 260
// ACK
0.300 < . 1001:1001(0) ack 1001 win 257
// more data could be exchanged here, connection
// is still established
// Client closes the connection.
0.610 < F. 1001:1001(0) ack 1001 win 260
0.650 > . 1001:1001(0) ack 1002
// Close the connection without reading outstanding data 0.700 close(4) = 0
// so one more reset. Will be deemed acceptable with patch as well:
// connection is already closing.
0.701 > R. 1001:1001(0) ack 1002 win 501
// End packetdrill test case.
With patch, this generates following conntrack events:
[NEW] 120 SYN_SENT src=10.0.2.1 dst=10.0.0.1 sport=5437 dport=80 [UNREPLIED]
[UPDATE] 60 SYN_RECV src=10.0.2.1 dst=10.0.0.1 sport=5437 dport=80 [UPDATE] 432000 ESTABLISHED src=10.0.2.1 dst=10.0.0.1 sport=5437 dport=80 [ASSURED] [UPDATE] 120 FIN_WAIT src=10.0.2.1 dst=10.0.0.1 sport=5437 dport=80 [ASSURED] [UPDATE] 60 CLOSE_WAIT src=10.0.2.1 dst=10.0.0.1 sport=5437 dport=80 [ASSURED] [UPDATE] 10 CLOSE src=10.0.2.1 dst=10.0.0.1 sport=5437 dport=80 [ASSURED]
Without patch, first RST moves connection to close, whereas socket state does not change until FIN is received.
[NEW] 120 SYN_SENT src=10.0.2.1 dst=10.0.0.1 sport=5141 dport=80 [UNREPLIED]
[UPDATE] 60 SYN_RECV src=10.0.2.1 dst=10.0.0.1 sport=5141 dport=80 [UPDATE] 432000 ESTABLISHED src=10.0.2.1 dst=10.0.0.1 sport=5141 dport=80 [ASSURED] [UPDATE] 10 CLOSE src=10.0.2.1 dst=10.0.0.1 sport=5141 dport=80 [ASSURED]
--- net/netfilter/nf_conntrack_proto_tcp.c | 50 ++++++++++++++++++++------ 1 file changed, 40 insertions(+), 10 deletions(-)
net/netfilter/nf_conntrack_proto_tcp.c +40 -10
@@ -828,6 +828,12 @@ static noinline bool tcp_new(struct nf_conn *ct, const struct sk_buff *skb,return true; } +static bool nf_conntrack_tcp_established (const struct nf_conn *ct) +{ +return ct->proto.tcp.state ==TCP_CONNTRACK_ESTABLISHED && +test_bit (IPS_ASSURED_BIT , &ct->status); +} +/* Returns verdict for packet, or -1 for invalid. */ static int tcp_packet(struct nf_conn *ct, struct sk_buff *skb,
@@ -1030,16 +1036,38 @@ static int tcp_packet(struct nf_conn *ct, new_state =TCP_CONNTRACK_ESTABLISHED ;break ;case TCP_CONNTRACK_CLOSE : -if (index ==TCP_RST_SET - && (ct->proto.tcp.seen[!dir].flags &IP_CT_TCP_FLAG_MAXACK_SET ) - &&before (ntohl (th->seq), ct->proto.tcp.seen[!dir].td_maxack)) { -/* Invalid RST */ -spin_unlock_bh (&ct->lock); -nf_ct_l4proto_log_invalid (skb, ct,"invalid rst" ); -return -NF_ACCEPT ; +if (index !=TCP_RST_SET ) +break ; + +if (ct->proto.tcp.seen[!dir].flags &IP_CT_TCP_FLAG_MAXACK_SET ) { +u32 seq =ntohl (th->seq); + +if (before (seq, ct->proto.tcp.seen[!dir].td_maxack)) { +/* Invalid RST */ +spin_unlock_bh (&ct->lock); +nf_ct_l4proto_log_invalid (skb, ct,"invalid rst" ); +return -NF_ACCEPT ; + } + +if (!nf_conntrack_tcp_established (ct) || + seq == ct->proto.tcp.seen[!dir].td_maxack) +break ; + +/* Check if rst is part of train, such as +* foo:80 > bar:4379: P, 235946583:235946602(19) ack 42 +* foo:80 > bar:4379: R, 235946602:235946602(0) ack 42 +*/ +if (ct->proto.tcp.last_index ==TCP_ACK_SET && + ct->proto.tcp.last_dir == dir && + seq == ct->proto.tcp.last_end) +break ; + +/* ... RST sequence number doesn't match exactly, keep +* established state to allow a possible challenge ACK. +*/ + new_state = old_state; } -if (index ==TCP_RST_SET - && ((test_bit (IPS_SEEN_REPLY_BIT , &ct->status) +if (((test_bit (IPS_SEEN_REPLY_BIT , &ct->status) && ct->proto.tcp.last_index ==TCP_SYN_SET ) || (!test_bit (IPS_ASSURED_BIT , &ct->status) && ct->proto.tcp.last_index == TCP_ACK_SET))
@@ -1055,7 +1083,7 @@ static int tcp_packet(struct nf_conn *ct,* segments we ignored. */ goto in_window; } -/* Just fall through */ +break ;default :/* Keep compilers happy. */ break ;
@@ -1090,6 +1118,8 @@ static int tcp_packet(struct nf_conn *ct,if (ct->proto.tcp.retrans >= tn->tcp_max_retrans && timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS ]) timeout = timeouts[TCP_CONNTRACK_RETRANS ]; +else if (unlikely (index ==TCP_RST_SET )) + timeout = timeouts[TCP_CONNTRACK_CLOSE ];else if ((ct->proto.tcp.seen[0 ].flags | ct->proto.tcp.seen[1 ].flags) &IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED && timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK ])
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 56/262 iommu/vt-d: Disable ATS support on untrusted devices
In reply to Sasha LevinFrom: Lu Baolu <baolu.lu-VuQAYsv1563Yd54FQh9/[email protected]>
[ Upstream commit d8b8591054575f33237556c32762d54e30774d28 ]
Commit fb58fdcd295b9 ("iommu/vt-d: Do not enable ATS for untrusted devices") disables ATS support on the devices which have been marked as untrusted. Unfortunately this is not enough to fix the DMA attack vulnerabiltiies because IOMMU driver allows translated requests as long as a device advertises the ATS capability. Hence a malicious peripheral device could use this to bypass IOMMU.
This disables the ATS support on untrusted devices by clearing the internal per-device ATS mark. As the result, IOMMU driver will block any translated requests from any device marked as untrusted.
--- drivers/iommu/intel-iommu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iommu/intel-iommu.c +2 -1
@@ -2485,7 +2485,8 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,if (dev &&dev_is_pci (dev)) {struct pci_dev *pdev =to_pci_dev (info->dev); -if (!pci_ats_disabled () && +if (!pdev->untrusted && + !pci_ats_disabled () &&ecap_dev_iotlb_support (iommu->ecap) &&pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_ATS ) &&dmar_find_matched_atsr_unit (pdev))
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 57/262 jbd2: fix invalid descriptor block checksum
In reply to Sasha LevinFrom: luojiajun <[email protected]>
[ Upstream commit 6e876c3dd205d30b0db6850e97a03d75457df007 ]
In jbd2_journal_commit_transaction(), if we are in abort mode, we may flush the buffer without setting descriptor block checksum by goto start_journal_io. Then fs is mounted, jbd2_descriptor_block_csum_verify() failed.
[ 271.379811] EXT4-fs (vdd): shut down requested (2) [ 271.381827] Aborting journal on device vdd-8. [ 271.597136] JBD2: Invalid checksum recovering block 22199 in log [ 271.598023] JBD2: recovery failed [ 271.598484] EXT4-fs (vdd): error loading journal
Fix this problem by keep setting descriptor block checksum if the descriptor buffer is not NULL.
This checksum problem can be reproduced by xfstests generic/388.
--- fs/jbd2/commit.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/jbd2/commit.c +4 -2
@@ -694,9 +694,11 @@ void jbd2_journal_commit_transaction(journal_t *journal)the last tag we set up. */ tag->t_flags |=cpu_to_be16 (JBD2_FLAG_LAST_TAG ); - -jbd2_descriptor_block_csum_set (journal, descriptor); start_journal_io: +if (descriptor) +jbd2_descriptor_block_csum_set (journal, + descriptor); +for (i =0 ; i < bufs; i++) {struct buffer_head *bh = wbuf[i];/*
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 58/262 ext4: fix bigalloc cluster freeing when hole punching under load
In reply to Sasha LevinFrom: Eric Whitney <[email protected]>
[ Upstream commit 7bd75230b43727b258a4f7a59d62114cffe1b6c8 ]
Ext4 may not free clusters correctly when punching holes in bigalloc file systems under high load conditions. If it's not possible to extend and restart the journal in ext4_ext_rm_leaf() when preparing to remove blocks from a punched region, a retry of the entire punch operation is triggered in ext4_ext_remove_space(). This causes a partial cluster to be set to the first cluster in the extent found to the right of the punched region. However, if the punch operation prior to the retry had made enough progress to delete one or more extents and a partial cluster candidate for freeing had already been recorded, the retry would overwrite the partial cluster. The loss of this information makes it impossible to correctly free the original partial cluster in all cases.
This bug can cause generic/476 to fail when run as part of xfstests-bld's bigalloc and bigalloc_1k test cases. The failure is reported when e2fsck detects bad iblocks counts greater than expected in units of whole clusters and also detects a number of negative block bitmap differences equal to the iblocks discrepancy in cluster units.
--- fs/ext4/extents.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
fs/ext4/extents.c +10 -7
@@ -2956,14 +2956,17 @@ int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start,if (err <0 ) goto out; - }else if (sbi->s_cluster_ratio >1 && end >= ex_end) { + }else if (sbi->s_cluster_ratio >1 && end >= ex_end && + partial.state == initial) {/* -* If there's an extent to the right its first cluster -* contains the immediate right boundary of the -* truncated/punched region. Set partial_cluster to -* its negative value so it won't be freed if shared -* with the current extent. The end < ee_block case -* is handled in ext4_ext_rm_leaf(). +* If we're punching, there's an extent to the right. +* If the partial cluster hasn't been set, set it to +* that extent's first cluster and its state to nofree +* so it won't be freed should it contain blocks to be +* removed. If it's already set (tofree/nofree), we're +* retrying and keep the original partial cluster info +* so a cluster marked tofree as a result of earlier +* extent removal is not lost. */ lblk = ex_end +1 ; err = ext4_ext_search_right(inode, path, &lblk, &pblk,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 59/262 fs: fix guard_bio_eod to check for real EOD errors
In reply to Sasha LevinFrom: Carlos Maiolino <[email protected]>
[ Upstream commit dce30ca9e3b676fb288c33c1f4725a0621361185 ]
guard_bio_eod() can truncate a segment in bio to allow it to do IO on odd last sectors of a device.
It already checks if the IO starts past EOD, but it does not consider the possibility of an IO request starting within device boundaries can contain more than one segment past EOD.
In such cases, truncated_bytes can be bigger than PAGE_SIZE, and will underflow bvec->bv_len.
Fix this by checking if truncated_bytes is lower than PAGE_SIZE.
This situation has been found on filesystems such as isofs and vfat, which doesn't check the device size before mount, if the device is smaller than the filesystem itself, a readahead on such filesystem, which spans EOD, can trigger this situation, leading a call to zero_user() with a wrong size possibly corrupting memory.
I didn't see any crash, or didn't let the system run long enough to check if memory corruption will be hit somewhere, but adding instrumentation to guard_bio_end() to check truncated_bytes size, was enough to see the error.
The following script can trigger the error.
MNT=/mnt
IMG=./DISK.img
DEV=/dev/loop0
mkfs.vfat $IMG
mount $IMG $MNT
cp -R /etc $MNT &> /dev/null
umount $MNT
losetup -D
losetup --find --show --sizelimit 16247280 $IMG
mount $DEV $MNT
find $MNT -type f -exec cat {} + >/dev/null
Kudos to Eric Sandeen for coming up with the reproducer above
--- fs/buffer.c | 7 +++++++ 1 file changed, 7 insertions(+)
fs/buffer.c +7 -0
@@ -3027,6 +3027,13 @@ void guard_bio_eod(int op, struct bio *bio)/* Uhhuh. We've got a bio that straddles the device size! */ truncated_bytes = bio->bi_iter.bi_size - (maxsector <<9 ); +/* +* The bio contains more than one segment which spans EOD, just return +* and let IO layer turn it into an EIO +*/ +if (truncated_bytes > bvec->bv_len) +return ; +/* Truncate the bio.. */ bio->bi_iter.bi_size -= truncated_bytes; bvec->bv_len -= truncated_bytes;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 60/262 tools lib traceevent: Fix buffer overflow in arg_eval
In reply to Sasha LevinFrom: Tony Jones <[email protected]>
[ Upstream commit 7c5b019e3a638a5a290b0ec020f6ca83d2ec2aaa ]
Fix buffer overflow observed when running perf test.
The overflow is when trying to evaluate "1ULL << (64 - 1)" which is resulting in -9223372036854775808 which overflows the 20 character buffer.
If is possible this bug has been reported before but I still don't see any fix checked in:
See: https://www.spinics.net/lists/linux-perf-users/msg07714.html
--- tools/lib/traceevent/event-parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/traceevent/event-parse.c +1 -1
@@ -2457,7 +2457,7 @@ static int arg_num_eval(struct tep_print_arg *arg, long long *val)static char *arg_eval (struct tep_print_arg *arg) {long long val; -static char buf[20 ]; +static char buf[24 ];switch (arg->type) {case TEP_PRINT_ATOM :
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 61/262 mm/resource: Return real error codes from walk failures
In reply to Sasha LevinFrom: Dave Hansen <[email protected]>
[ Upstream commit 5cd401ace914dc68556c6d2fcae0c349444d5f86 ]
walk_system_ram_range() can return an error code either becuase *it* failed, or because the 'func' that it calls returned an error. The memory hotplug does the following:
ret = walk_system_ram_range(..., func);
if (ret)
return ret;and 'ret' makes it out to userspace, eventually. The problem s, walk_system_ram_range() failues that result from *it* failing (as opposed to 'func') return -1. That leads to a very odd -EPERM (-1) return code out to userspace.
Make walk_system_ram_range() return -EINVAL for internal failures to keep userspace less confused.
This return code is compatible with all the callers that I audited.
--- kernel/resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/resource.c +2 -2
@@ -382,7 +382,7 @@ static int __walk_iomem_res_desc(resource_size_t start, resource_size_t end, int (*func)(struct resource *, void *)) {struct resource res; -int ret =-1 ; +int ret = -EINVAL ;while (start < end && !find_next_iomem_res (start, end, flags, desc, first_lvl, &res)) {
@@ -462,7 +462,7 @@ int walk_system_ram_range(unsigned long start_pfn, unsigned long nr_pages,unsigned long flags;struct resource res;unsigned long pfn, end_pfn; -int ret =-1 ; +int ret = -EINVAL ; start = (u64 ) start_pfn <<PAGE_SHIFT ; end = ((u64)(start_pfn + nr_pages) <<PAGE_SHIFT ) -1 ;
Signature · 6 lines
2.19.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Sasha Levin
maintainerPATCH 62/262 PCI/PME: Fix hotplug/sysfs remove deadlock in pcie_pme_remove()
In reply to Sasha LevinFrom: "Rafael J. Wysocki" <[email protected]>
[ Upstream commit 95c80bc6952b6a5badc7b702d23e5bf14d251e7c ]
Dongdong reported a deadlock triggered by a hotplug event during a sysfs "remove" operation:
pciehp 0000:00:0c.0:pcie004: Slot(0-1): Link Up
# echo 1 > 0000:00:0c.0/remove
PME and hotplug share an MSI/MSI-X vector. The sysfs "remove" side is:
remove_store
pci_stop_and_remove_bus_device_locked
pci_lock_rescan_remove
pci_stop_and_remove_bus_device
...
pcie_pme_remove
pcie_pme_suspend
synchronize_irq # wait for hotplug IRQ handler
pci_unlock_rescan_remove
The hotplug side is:
pciehp_ist
pciehp_handle_presence_or_link_change
pciehp_configure_device
pci_lock_rescan_remove # wait for pci_unlock_rescan_remove()
INFO: task bash:10913 blocked for more than 120 seconds.
# ps -ax |grep D PID TTY STAT TIME COMMAND 10913 ttyAMA0 Ds+ 0:00 -bash 14022 ? D 0:00 [irq/745-pciehp]
# cat /proc/14022/stack __switch_to+0x94/0xd8 pci_lock_rescan_remove+0x20/0x28 pciehp_configure_device+0x30/0x140 pciehp_handle_presence_or_link_change+0x324/0x458 pciehp_ist+0x1dc/0x1e0
# cat /proc/10913/stack __switch_to+0x94/0xd8 synchronize_irq+0x8c/0xc0 pcie_pme_suspend+0xa4/0x118 pcie_pme_remove+0x20/0x40 pcie_port_remove_service+0x3c/0x58 ... pcie_port_device_remove+0x2c/0x48 pcie_portdrv_remove+0x68/0x78 pci_device_remove+0x48/0x120 ... pci_stop_bus_device+0x84/0xc0 pci_stop_and_remove_bus_device_locked+0x24/0x40 remove_store+0xa4/0xb8 dev_attr_store+0x44/0x60 sysfs_kf_write+0x58/0x80
It is incorrect to call pcie_pme_suspend() from pcie_pme_remove() for two reasons.
First, pcie_pme_suspend() calls synchronize_irq(), which will wait for the native hotplug interrupt handler as well as for the PME one, because they share one IRQ (as per the spec). That may deadlock if hotplug is signaled while pcie_pme_remove() is running and the latter calls pci_lock_rescan_remove() before the former.
Second, if pcie_pme_suspend() figures out that wakeup needs to be enabled for the port, it will return without disabling the interrupt as expected by pcie_pme_remove() which was overlooked by commit c7b5a4e6e8fb ("PCI / PM:
Fix native PME handling during system suspend/resume").
To fix that, rework pcie_pme_remove() to disable the PME interrupt, clear its status and prevent the PME worker function from re-enabling it before calling free_irq() on it, which should be sufficient.
--- drivers/pci/pcie/pme.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)
drivers/pci/pcie/pme.c +15 -7
@@ -363,6 +363,16 @@ static bool pcie_pme_check_wakeup(struct pci_bus *bus)return false; } +static void pcie_pme_disable_interrupt (struct pci_dev *port, +struct pcie_pme_service_data *data) +{ +spin_lock_irq (&data->lock); +pcie_pme_interrupt_enable (port, false); +pcie_clear_root_pme_status (port); + data->noirq = true; +spin_unlock_irq (&data->lock); +} +/** * pcie_pme_suspend - Suspend PCIe PME service device. * @srv: PCIe service device to suspend.
@@ -387,11 +397,7 @@ static int pcie_pme_suspend(struct pcie_device *srv)return 0 ; } -spin_lock_irq (&data->lock); -pcie_pme_interrupt_enable (port, false); -pcie_clear_root_pme_status (port); - data->noirq = true; -spin_unlock_irq (&data->lock); +pcie_pme_disable_interrupt (port, data);synchronize_irq (srv->irq);
@@ -427,9 +433,11 @@ static int pcie_pme_resume(struct pcie_device *srv)*/ static void pcie_pme_remove (struct pcie_device *srv) { -pcie_pme_suspend (srv); +struct pcie_pme_service_data *data =get_service_data (srv); + +pcie_pme_disable_interrupt (srv->port, data);free_irq (srv->irq, srv); -kfree (get_service_data (srv)); +kfree (data); }static struct pcie_port_service_driver pcie_pme_driver = {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 63/262 wil6210: check null pointer in _wil_cfg80211_merge_extra_ies
In reply to Sasha LevinFrom: Alexei Avshalom Lazar <[email protected]>
[ Upstream commit de77a53c2d1e8fb3621e63e8e1f0f0c9a1a99ff7 ]
ies1 or ies2 might be null when code inside _wil_cfg80211_merge_extra_ies access them.
Add explicit check for null and make sure ies1/ies2 are not accessed in such a case.
spos might be null and be accessed inside _wil_cfg80211_merge_extra_ies.
Add explicit check for null in the while condition statement and make sure spos is not accessed in such a case.
--- drivers/net/wireless/ath/wil6210/cfg80211.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/wil6210/cfg80211.c +11 -3
@@ -1580,6 +1580,12 @@ static int _wil_cfg80211_merge_extra_ies(const u8 *ies1, u16 ies1_len,u8 *buf, *dpos;const u8 *spos; +if (!ies1) + ies1_len =0 ; + +if (!ies2) + ies2_len =0 ; +if (ies1_len ==0 && ies2_len ==0 ) { *merged_ies =NULL ; *merged_len =0 ;
@@ -1589,17 +1595,19 @@ static int _wil_cfg80211_merge_extra_ies(const u8 *ies1, u16 ies1_len, buf =kmalloc (ies1_len + ies2_len,GFP_KERNEL );if (!buf)return -ENOMEM ; -memcpy (buf, ies1, ies1_len); +if (ies1) +memcpy (buf, ies1, ies1_len); dpos = buf + ies1_len; spos = ies2; -while (spos +1 < ies2 + ies2_len) { +while (spos && (spos +1 < ies2 + ies2_len)) {/* IE tag at offset 0, length at offset 1 */ u16 ielen =2 + spos[1 ];if (spos + ielen > ies2 + ies2_len)break ;if (spos[0 ] ==WLAN_EID_VENDOR_SPECIFIC && - !_wil_cfg80211_find_ie (ies1, ies1_len, spos, ielen)) { + (!ies1 || !_wil_cfg80211_find_ie (ies1, ies1_len, + spos, ielen))) {memcpy (dpos, spos, ielen); dpos += ielen; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 64/262 mt76: fix a leaked reference by adding a missing of_node_put
In reply to Sasha LevinFrom: Wen Yang <[email protected]>
[ Upstream commit 34e022d8b780a03902d82fb3997ba7c7b1f40c81 ]
The call to of_find_node_by_phandle returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./drivers/net/wireless/mediatek/mt76/eeprom.c:58:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 48, but without a corresponding object release within this function. ./drivers/net/wireless/mediatek/mt76/eeprom.c:61:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 48, but without a corresponding object release within this function. ./drivers/net/wireless/mediatek/mt76/eeprom.c:67:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 48, but without a corresponding object release within this function. ./drivers/net/wireless/mediatek/mt76/eeprom.c:70:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 48, but without a corresponding object release within this function. ./drivers/net/wireless/mediatek/mt76/eeprom.c:72:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 48, but without a corresponding object release within this function.
--- drivers/net/wireless/mediatek/mt76/eeprom.c | 24 ++++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-)
drivers/net/wireless/mediatek/mt76/eeprom.c +16 -8
@@ -54,22 +54,30 @@ mt76_get_of_eeprom(struct mt76_dev *dev, int len) part = np->name; mtd =get_mtd_device_nm (part); -if (IS_ERR (mtd)) -return PTR_ERR (mtd); +if (IS_ERR (mtd)) { + ret =PTR_ERR (mtd); + goto out_put_node; + } -if (size <=sizeof (*list)) -return -EINVAL ; +if (size <=sizeof (*list)) { + ret = -EINVAL ; + goto out_put_node; + } offset =be32_to_cpup (list); ret =mtd_read (mtd, offset, len, &retlen, dev->eeprom.data);put_mtd_device (mtd);if (ret) -return ret; + goto out_put_node; -if (retlen < len) -return -EINVAL ; +if (retlen < len) { + ret = -EINVAL ; + goto out_put_node; + } -return 0 ; +out_put_node: +of_node_put (np); +return ret;#else return -ENOENT ;#endif
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 65/262 ath10k: Fix the wrong updation of BW in tx_stats debugfs entry
In reply to Sasha LevinFrom: Surabhi Vishnoi <[email protected]>
[ Upstream commit ef9051c72ab7bc664e8047c55ac74bdb1c7fa3ee ]
Currently, the bandwidth is updated wrongly in BW table in tx_stats debugfs per sta as there is difference in number of bandwidth type in mac80211 and driver stats table. This leads to bandwidth getting updated at wrong index in bandwidth table in tx_stats.
Fix this index mismatch between mac80211 and driver stats table (BW table) by making the number of bandwidth type in driver compatible with mac80211.
Tested HW: WCN3990
Tested FW: WLAN.HL.3.1-00784-QCAHLSWMTPLZ-1
--- drivers/net/wireless/ath/ath10k/debugfs_sta.c | 7 ++++--- drivers/net/wireless/ath/ath10k/wmi.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath10k/debugfs_sta.c +4 -3
@@ -696,11 +696,12 @@ static ssize_t ath10k_dbg_sta_dump_tx_stats(struct file *file, " %llu ", stats->ht[j][i]); len +=scnprintf (buf + len, size - len,"\n" ); len +=scnprintf (buf + len, size - len, -" BW %s (20,40,80,160 MHz)\n" , str[j]); +" BW %s (20,5,10,40,80,160 MHz)\n" , str[j]); len +=scnprintf (buf + len, size - len, -" %llu %llu %llu %llu\n" , +" %llu %llu %llu %llu %llu %llu\n" , stats->bw[j][0 ], stats->bw[j][1 ], - stats->bw[j][2 ], stats->bw[j][3 ]); + stats->bw[j][2 ], stats->bw[j][3 ], + stats->bw[j][4 ], stats->bw[j][5 ]); len +=scnprintf (buf + len, size - len," NSS %s (1x1,2x2,3x3,4x4)\n" , str[j]); len += scnprintf(buf + len, size - len,
drivers/net/wireless/ath/ath10k/wmi.h +1 -1
@@ -5003,7 +5003,7 @@ enum wmi_rate_preamble {#define ATH10K_FW_SKIPPED_RATE_CTRL (flags) (((flags) >> 6) & 0x1)#define ATH10K_VHT_MCS_NUM 10 -#define ATH10K_BW_NUM 4 +#define ATH10K_BW_NUM 6#define ATH10K_NSS_NUM 4#define ATH10K_LEGACY_NUM 12#define ATH10K_GI_NUM 2
Signature · 7 lines
2.19.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Sasha Levin
maintainerPATCH 66/262 lockdep/lib/tests: Fix run_tests.sh
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit d93ac78bf7b37db36fa00225f8e9a14c7ed1b2ba ]
Apparently the execute bits were set for the tests/*.sh scripts on my test setup but these are not set in the kernel tree. Fix this by adding the interpreter path in front of the script paths.
--- tools/lib/lockdep/run_tests.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/lib/lockdep/run_tests.sh +3 -3
@@ -11,7 +11,7 @@ find tests -name '*.c' | sort | while read -r i; do testname=$(basename "$i" .c) echo -ne "$testname... " if gcc -o "tests/$testname" -pthread "$i" liblockdep.a -Iinclude -D__USE_LIBLOCKDEP && - timeout 1 "tests/$testname" 2>&1 | "tests/${testname}.sh"; then + timeout 1 "tests/$testname" 2>&1 | /bin/bash "tests/${testname}.sh"; then echo "PASSED!" else echo "FAILED!"
@@ -24,7 +24,7 @@ find tests -name '*.c' | sort | while read -r i; do echo -ne "(PRELOAD) $testname... " if gcc -o "tests/$testname" -pthread -Iinclude "$i" && timeout 1 ./lockdep "tests/$testname" 2>&1 | - "tests/${testname}.sh"; then + /bin/bash "tests/${testname}.sh"; then echo "PASSED!" else echo "FAILED!"
@@ -37,7 +37,7 @@ find tests -name '*.c' | sort | while read -r i; do echo -ne "(PRELOAD + Valgrind) $testname... " if gcc -o "tests/$testname" -pthread -Iinclude "$i" && { timeout 10 valgrind --read-var-info=yes ./lockdep "./tests/$testname" >& "tests/${testname}.vg.out"; true; } && - "tests/${testname}.sh" < "tests/${testname}.vg.out" && + /bin/bash "tests/${testname}.sh" < "tests/${testname}.vg.out" && ! grep -Eq '(^==[0-9]*== (Invalid |Uninitialised ))|Mismatched free|Source and destination overlap| UME ' "tests/${testname}.vg.out"; then echo "PASSED!" else
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 67/262 crypto: crypto4xx - add missing of_node_put after of_device_is_available
In reply to Sasha LevinFrom: Julia Lawall <[email protected]>
[ Upstream commit 8c2b43d2d85b48a97d2f8279278a4aac5b45f925 ]
Add an of_node_put when a tested device node is not available.
The semantic patch that fixes this problem is as follows
(http://coccinelle.lip6.fr):
// <smpl>
@@
identifier f;
local idexpression e;
expression x;
@@
e = f(...);
... when != of_node_put(e)
when != x = e
when != e = x
when anyif (<+...of_device_is_available(e)...+>) {
... when != of_node_put(e)
(
return e;
|
+ of_node_put(e);
return ...;
)
}
// </smpl>
--- drivers/crypto/amcc/crypto4xx_trng.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/crypto/amcc/crypto4xx_trng.c +3 -1
@@ -80,8 +80,10 @@ void ppc4xx_trng_probe(struct crypto4xx_core_device *core_dev)/* Find the TRNG device node and map it */ trng =of_find_matching_node (NULL , ppc4xx_trng_match); -if (!trng || !of_device_is_available (trng)) +if (!trng || !of_device_is_available (trng)) { +of_node_put (trng);return ; + } dev->trng_base =of_iomap (trng,0 );of_node_put (trng);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 68/262 crypto: cavium/zip - fix collision with generic cra_driver_name
In reply to Sasha LevinFrom: Eric Biggers <[email protected]>
[ Upstream commit 41798036430015ad45137db2d4c213cd77fd0251 ]
The cavium/zip implementation of the deflate compression algorithm is incorrectly being registered under the generic driver name, which prevents the generic implementation from being registered with the crypto API when CONFIG_CRYPTO_DEV_CAVIUM_ZIP=y. Similarly the lzs algorithm (which does not currently have a generic implementation...) is incorrectly being registered as lzs-generic.
Fix the naming collision by adding a suffix "-cavium" to the cra_driver_name of the cavium/zip algorithms.
--- drivers/crypto/cavium/zip/zip_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/crypto/cavium/zip/zip_main.c +4 -2
@@ -351,6 +351,7 @@ static struct pci_driver zip_driver = {static struct crypto_alg zip_comp_deflate = { .cra_name ="deflate" , + .cra_driver_name ="deflate-cavium" , .cra_flags =CRYPTO_ALG_TYPE_COMPRESS , .cra_ctxsize =sizeof (struct zip_kernel_ctx ), .cra_priority =300 ,
@@ -365,6 +366,7 @@ static struct crypto_alg zip_comp_deflate = {static struct crypto_alg zip_comp_lzs = { .cra_name ="lzs" , + .cra_driver_name ="lzs-cavium" , .cra_flags =CRYPTO_ALG_TYPE_COMPRESS , .cra_ctxsize =sizeof (struct zip_kernel_ctx ), .cra_priority =300 ,
@@ -384,7 +386,7 @@ static struct scomp_alg zip_scomp_deflate = { .decompress = zip_scomp_decompress, .base = { .cra_name = "deflate", - .cra_driver_name = "deflate-scomp", + .cra_driver_name = "deflate-scomp-cavium", .cra_module = THIS_MODULE, .cra_priority = 300, }
@@ -397,7 +399,7 @@ static struct scomp_alg zip_scomp_lzs = { .decompress = zip_scomp_decompress, .base = { .cra_name = "lzs", - .cra_driver_name = "lzs-scomp", + .cra_driver_name = "lzs-scomp-cavium", .cra_module = THIS_MODULE, .cra_priority = 300, }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 69/262 tools/bpf: selftests: add map lookup to test_map_in_map bpf prog
In reply to Sasha LevinFrom: Yonghong Song <[email protected]>
[ Upstream commit 9eca5083757b679b37f210092c871916c2c222d0 ]
The bpf_map_lookup_elem is added in the bpf program. Without previous patch, the test change will trigger the following error:
$ ./test_maps ... ; value_p = bpf_map_lookup_elem(map, &key); 20: (bf) r1 = r7 21: (bf) r2 = r8 22: (85) call bpf_map_lookup_elem#1 ; if (!value_p || *value_p != 123) 23: (15) if r0 == 0x0 goto pc+16 R0=map_value(id=2,off=0,ks=4,vs=4,imm=0) R6=inv1 R7=map_ptr(id=0,off=0,ks=4,vs=4,imm=0) R8=fp-8,call_-1 R10=fp0,call_-1 fp-8=mmmmmmmm ; if (!value_p || *value_p != 123) 24: (61) r1 = *(u32 *)(r0 +0) R0=map_value(id=2,off=0,ks=4,vs=4,imm=0) R6=inv1 R7=map_ptr(id=0,off=0,ks=4,vs=4,imm=0) R8=fp-8,call_-1 R10=fp0,call_-1 fp-8=mmmmmmmm bpf_spin_lock cannot be accessed directly by load/store
With the kernel fix in the previous commit, the error goes away.
--- tools/testing/selftests/bpf/test_map_in_map.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/testing/selftests/bpf/test_map_in_map.c +4 -0
@@ -27,6 +27,7 @@ SEC("xdp_mimtest")int xdp_mimtest0 (struct xdp_md *ctx) {int value =123 ; +int *value_p;int key =0 ;void *map;
@@ -35,6 +36,9 @@ int xdp_mimtest0(struct xdp_md *ctx)return XDP_DROP ;bpf_map_update_elem (map, &key, &value,0 ); + value_p =bpf_map_lookup_elem (map, &key); +if (!value_p || *value_p !=123 ) +return XDP_DROP ; map =bpf_map_lookup_elem (&mim_hash, &key);if (!map)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 70/262 drm/amd/display: Pass app_tf by value rather than by reference
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 672e78cab819ebe31e3b9b8abac367be8a110472 ]
Clang warns when an expression that equals zero is used as a null pointer constant (in lieu of NULL):
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:4435:3:
warning: expression which evaluates to zero treated as a null pointer constant of type 'const enum color_transfer_func *' [-Wnon-literal-null-conversion]
TRANSFER_FUNC_UNKNOWN,
^~~~~~~~~~~~~~~~~~~~~1 warning generated.
This warning is caused by commit bb47de736661 ("drm/amdgpu: Set FreeSync state using drm VRR properties") and it could be solved by using NULL instead of TRANSFER_FUNC_UNKNOWN or casting TRANSFER_FUNC_UNKNOWN as a pointer. However, after looking into it, there doesn't appear to be a good reason to pass app_tf by reference as it is never mutated along the way. This is the only code path in which app_tf is used:
mod_freesync_build_vrr_infopacket ->
build_vrr_infopacket_v2 ->
build_vrr_infopacket_fs2_dataNeither mod_freesync_build_vrr_infopacket or build_vrr_infopacket_v2 modify app_tf's value and build_vrr_infopacket_fs2_data expects just the value so we can avoid dereferencing anything by just passing in app_tf's value to mod_freesync_build_vrr_infopacket and build_vrr_infopacket_v2.
There is no functional change because build_vrr_infopacket_fs2_data doesn't do anything if TRANSFER_FUNC_UNKNOWN is passed to it, the same as not calling build_vrr_infopacket_fs2_data at all like before this change when NULL was used for app_tf.
--- drivers/gpu/drm/amd/display/modules/freesync/freesync.c | 7 +++---- drivers/gpu/drm/amd/display/modules/inc/mod_freesync.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/modules/freesync/freesync.c +3 -4
@@ -656,7 +656,7 @@ static void build_vrr_infopacket_v1(enum signal_type signal,static void build_vrr_infopacket_v2 (enum signal_type signal,const struct mod_vrr_params *vrr, -const enum color_transfer_func *app_tf, +enum color_transfer_func app_tf,struct dc_info_packet *infopacket) {unsigned int payload_size =0 ;
@@ -664,8 +664,7 @@ static void build_vrr_infopacket_v2(enum signal_type signal,build_vrr_infopacket_header_v2 (signal, infopacket, &payload_size);build_vrr_infopacket_data (vrr, infopacket); -if (app_tf !=NULL ) -build_vrr_infopacket_fs2_data (*app_tf, infopacket); +build_vrr_infopacket_fs2_data (app_tf, infopacket);build_vrr_infopacket_checksum (&payload_size, infopacket);
@@ -676,7 +675,7 @@ void mod_freesync_build_vrr_infopacket(struct mod_freesync *mod_freesync,const struct dc_stream_state *stream, const struct mod_vrr_params *vrr, enum vrr_packet_type packet_type, - const enum color_transfer_func *app_tf, + enum color_transfer_func app_tf, struct dc_info_packet *infopacket) {/* SPD info packet for FreeSync */
drivers/gpu/drm/amd/display/modules/inc/mod_freesync.h +1 -1
@@ -145,7 +145,7 @@ void mod_freesync_build_vrr_infopacket(struct mod_freesync *mod_freesync,const struct dc_stream_state *stream, const struct mod_vrr_params *vrr, enum vrr_packet_type packet_type, - const enum color_transfer_func *app_tf, + enum color_transfer_func app_tf, struct dc_info_packet *infopacket); void mod_freesync_build_vrr_params(struct mod_freesync *mod_freesync,
Signature · 6 lines
2.19.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH AUTOSEL 5.0 070/262] drm/amd/display: Pass app_tf by value rather than by reference
Quoted 6 lines
From: Nathan Chancellor <[email protected]>
[ Upstream commit
672e78cab819ebe31e3b9b8abac367be8a110472]Clang warns when an expression that equals zero is used as a null pointer constant (in lieu of NULL):
Fixes warning, with unsupported compiler; not a serious bug. Plus, not a minimal fix.
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Sasha Levin
maintainerPATCH 71/262 usb: chipidea: Grab the (legacy) USB PHY by phandle first
In reply to Sasha LevinFrom: Paul Kocialkowski <[email protected]>
[ Upstream commit 68ef236274793066b9ba3154b16c0acc1c891e5c ]
According to the chipidea driver bindings, the USB PHY is specified via the "phys" phandle node. However, this only takes effect for USB PHYs that use the common PHY framework. For legacy USB PHYs, a simple lookup based on the USB PHY type is done instead.
This does not play out well when more than one USB PHY is registered, since the first registered PHY matching the type will always be returned regardless of what the driver was bound to.
Fix this by looking up the PHY based on the "phys" phandle node. Although generic PHYs are rather matched by their "phys-name" and not the "phys" phandle directly, there is no helper for similar lookup on legacy PHYs and it's probably not worth the effort to add it.
When no legacy USB PHY is found by phandle, fallback to grabbing any registered USB2 PHY. This ensures backward compatibility if some users were actually relying on this mechanism.
--- drivers/usb/chipidea/core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/usb/chipidea/core.c +8 -1
@@ -954,8 +954,15 @@ static int ci_hdrc_probe(struct platform_device *pdev) }else if (ci->platdata->usb_phy) { ci->usb_phy = ci->platdata->usb_phy; }else { + ci->usb_phy =devm_usb_get_phy_by_phandle (dev->parent,"phys" , +0 ); ci->phy =devm_phy_get (dev->parent,"usb-phy" ); - ci->usb_phy =devm_usb_get_phy (dev->parent,USB_PHY_TYPE_USB2 ); + +/* Fallback to grabbing any registered USB2 PHY */ +if (IS_ERR (ci->usb_phy) && +PTR_ERR (ci->usb_phy) != -EPROBE_DEFER ) + ci->usb_phy =devm_usb_get_phy (dev->parent, +USB_PHY_TYPE_USB2 );/* if both generic PHY and USB PHY layers aren't enabled */ if (PTR_ERR(ci->phy) == -ENOSYS &&
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 72/262 powerpc/powernv/ioda: Fix locked_vm counting for memory used by IOMMU tables
In reply to Sasha LevinFrom: Alexey Kardashevskiy <[email protected]>
[ Upstream commit 11f5acce2fa43b015a8120fa7620fa4efd0a2952 ]
We store 2 multilevel tables in iommu_table - one for the hardware and one with the corresponding userspace addresses. Before allocating the tables, the iommu_table_group_ops::get_table_size() hook returns the combined size of the two and VFIO SPAPR TCE IOMMU driver adjusts the locked_vm counter correctly. When the table is actually allocated, the amount of allocated memory is stored in iommu_table::it_allocated_size and used to decrement the locked_vm counter when we release the memory used by the table; .get_table_size() and .create_table() calculate it independently but the result is expected to be the same.
However the allocator does not add the userspace table size to .it_allocated_size so when we destroy the table because of VFIO PCI unplug (i.e. VFIO container is gone but the userspace keeps running), we decrement locked_vm by just a half of size of memory we are releasing.
To make things worse, since we enabled on-demand allocation of indirect levels, it_allocated_size contains only the amount of memory actually allocated at the table creation time which can just be a fraction. It is not a problem with incrementing locked_vm (as get_table_size() value is used) but it is with decrementing.
As the result, we leak locked_vm and may not be able to allocate more IOMMU tables after few iterations of hotplug/unplug.
This sets it_allocated_size in the pnv_pci_ioda2_ops::create_table() hook to what pnv_pci_ioda2_get_table_size() returns so from now on we have a single place which calculates the maximum memory a table can occupy. The original meaning of it_allocated_size is somewhat lost now though.
We do not ditch it_allocated_size whatsoever here and we do not call get_table_size() from vfio_iommu_spapr_tce.c when decrementing locked_vm as we may have multiple IOMMU groups per container and even though they all are supposed to have the same get_table_size() implementation, there is a small chance for failure or confusion.
--- arch/powerpc/platforms/powernv/pci-ioda-tce.c | 1 - arch/powerpc/platforms/powernv/pci-ioda.c | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-)
arch/powerpc/platforms/powernv/pci-ioda-tce.c +0 -1
@@ -313,7 +313,6 @@ long pnv_pci_ioda2_table_alloc_pages(int nid, __u64 bus_offset, page_shift); tbl->it_level_size =1ULL << (level_shift -3 ); tbl->it_indirect_levels = levels -1 ; - tbl->it_allocated_size = total_allocated; tbl->it_userspace = uas; tbl->it_nid = nid;
arch/powerpc/platforms/powernv/pci-ioda.c +6 -1
@@ -2594,8 +2594,13 @@ static long pnv_pci_ioda2_create_table_userspace( int num, __u32 page_shift, __u64 window_size, __u32 levels, struct iommu_table **ptbl) { - return pnv_pci_ioda2_create_table(table_group, + long ret = pnv_pci_ioda2_create_table(table_group, num, page_shift, window_size, levels, true, ptbl); + +if (!ret) + (*ptbl)->it_allocated_size =pnv_pci_ioda2_get_table_size ( + page_shift, window_size, levels); +return ret; }static void pnv_ioda2_take_ownership (struct iommu_table_group *table_group)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 73/262 scsi: core: replace GFP_ATOMIC with GFP_KERNEL in scsi_scan.c
In reply to Sasha LevinFrom: Benjamin Block <[email protected]>
[ Upstream commit 1749ef00f7312679f76d5e9104c5d1e22a829038 ]
We had a test-report where, under memory pressure, adding LUNs to the systems would fail (the tests add LUNs strictly in sequence):
[ 5525.853432] scsi 0:0:1:1088045124: Direct-Access IBM 2107900 .148 PQ: 0 ANSI: 5 [ 5525.853826] scsi 0:0:1:1088045124: alua: supports implicit TPGS [ 5525.853830] scsi 0:0:1:1088045124: alua: device naa.6005076303ffd32700000000000044da port group 0 rel port 43 [ 5525.853931] sd 0:0:1:1088045124: Attached scsi generic sg10 type 0 [ 5525.854075] sd 0:0:1:1088045124: [sdk] Disabling DIF Type 1 protection [ 5525.855495] sd 0:0:1:1088045124: [sdk] 2097152 512-byte logical blocks: (1.07 GB/1.00 GiB) [ 5525.855606] sd 0:0:1:1088045124: [sdk] Write Protect is off [ 5525.855609] sd 0:0:1:1088045124: [sdk] Mode Sense: ed 00 00 08 [ 5525.855795] sd 0:0:1:1088045124: [sdk] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA [ 5525.857838] sdk: sdk1 [ 5525.859468] sd 0:0:1:1088045124: [sdk] Attached SCSI disk [ 5525.865073] sd 0:0:1:1088045124: alua: transition timeout set to 60 seconds [ 5525.865078] sd 0:0:1:1088045124: alua: port group 00 state A preferred supports tolusnA [ 5526.015070] sd 0:0:1:1088045124: alua: port group 00 state A preferred supports tolusnA [ 5526.015213] sd 0:0:1:1088045124: alua: port group 00 state A preferred supports tolusnA [ 5526.587439] scsi_alloc_sdev: Allocation failure during SCSI scanning, some SCSI devices might not be configured [ 5526.588562] scsi_alloc_sdev: Allocation failure during SCSI scanning, some SCSI devices might not be configured
Looking at the code of scsi_alloc_sdev(), and all the calling contexts, there seems to be no reason to use GFP_ATMOIC here. All the different call-contexts use a mutex at some point, and nothing in between that requires no sleeping, as far as I could see. Additionally, the code that later allocates the block queue for the device (scsi_mq_alloc_queue()) already uses GFP_KERNEL.
There are similar allocations in two other functions:scsi_probe_and_add_lun(), and scsi_add_lun(),; that can also be done with GFP_KERNEL.
Here is the contexts for the three functions so far:
scsi_alloc_sdev()
scsi_probe_and_add_lun()
scsi_sequential_lun_scan()
__scsi_scan_target()
scsi_scan_target()
mutex_lock()
scsi_scan_channel()
scsi_scan_host_selected()
mutex_lock()
scsi_report_lun_scan()
__scsi_scan_target()
...
__scsi_add_device()
mutex_lock()
__scsi_scan_target()
...
scsi_report_lun_scan()
...
scsi_get_host_dev()
mutex_lock()
scsi_probe_and_add_lun()
...
scsi_add_lun()
scsi_probe_and_add_lun()
...So replace all these, and give them a bit of a better chance to succeed, with more chances of reclaim.
--- drivers/scsi/scsi_scan.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/scsi_scan.c +3 -3
@@ -220,7 +220,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,struct Scsi_Host *shost =dev_to_shost (starget->dev.parent); sdev =kzalloc (sizeof (*sdev) + shost->transportt->device_size, -GFP_ATOMIC ); +GFP_KERNEL );if (!sdev) goto out;
@@ -788,7 +788,7 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,*/ sdev->inquiry =kmemdup (inq_result,max_t (size_t, sdev->inquiry_len,36 ), -GFP_ATOMIC ); +GFP_KERNEL );if (sdev->inquiry ==NULL )return SCSI_SCAN_NO_RESPONSE ;
@@ -1079,7 +1079,7 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,if (!sdev) goto out; - result =kmalloc (result_len,GFP_ATOMIC | + result =kmalloc (result_len,GFP_KERNEL | ((shost->unchecked_isa_dma) ? __GFP_DMA :0 ));if (!result) goto out_free_sdev;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 74/262 kbuild: invoke syncconfig if include/config/auto.conf.cmd is missing
In reply to Sasha LevinFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 9390dff66a52d1a60c6e517d8fa6cdbdffc83cb1 ]
If include/config/auto.conf.cmd is lost for some reasons, it is not self-healing, so the top Makefile misses to run syncconfig. Move include/config/auto.conf.cmd to the target side.
I used a pattern rule instead of a normal rule here although it is a bit gross.
If the rule were written with a normal rule like this,
include/config/auto.conf \
include/config/auto.conf.cmd \
include/config/tristate.conf: $(KCONFIG_CONFIG)
$(Q)$(MAKE) -f $(srctree)/Makefile syncconfig... syncconfig would be executed per target.
Using a pattern rule makes sure that syncconfig is executed just once because Make assumes the recipe will create all of the targets.
Here is a quote from the GNU Make manual [1]:
"Pattern rules may have more than one target. Unlike normal rules, this does not act as many different rules with the same prerequisites and recipe. If a pattern rule has multiple targets, make knows that the rule's recipe is responsible for making all of the targets. The recipe is executed only once to make all the targets. When searching for a pattern rule to match a target, the target patterns of a rule other than the one that matches the target in need of a rule are
incidental: make worries only about giving a recipe and prerequisites to the file presently in question. However, when this file's recipe is run, the other targets are marked as having been updated themselves."
[1]: https://www.gnu.org/software/make/manual/html_node/Pattern-Intro.html
--- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
Makefile +5 -2
@@ -625,12 +625,15 @@ ifeq ($(may-sync-config),1) -include include/config/auto.conf.cmd # To avoid any implicit rule to kick in, define an empty command -$(KCONFIG_CONFIG) include/config/auto.conf.cmd: ; +$(KCONFIG_CONFIG): ; # The actual configuration files used during the build are stored in # include/generated/ and include/config/. Update them if .config is newer than # include/config/auto.conf (which mirrors .config). -include/config/%.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd +# +# This exploits the 'multi-target pattern rule' trick. +# The syncconfig should be executed only once to make all the targets. +%/auto.conf %/auto.conf.cmd %/tristate.conf: $(KCONFIG_CONFIG) $(Q)$(MAKE) -f $(srctree)/Makefile syncconfig else # External modules and some install targets need include/generated/autoconf.h
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 75/262 kbuild: make -r/-R effective in top Makefile for old Make versions
In reply to Sasha LevinFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 3812b8c5c5d527239ac015f1f2c7654da7fcfbba ]
Adding -rR to MAKEFLAGS is important because we do not want to be bothered by built-in implicit rules or variables.
One problem that used to exist in older GNU Make versions is
MAKEFLAGS += -rR
... does not become effective in the current Makefile. When you are building with O= option, it becomes effective in the top Makefile since it recurses via 'sub-make' target. Otherwise, the top Makefile tries implicit rules. That is why we explicitly add empty rules for Makefiles, but we often miss to do that.
In fact, adding -d option to older GNU Make versions shows it is trying a bunch of implicit pattern rules.
Considering target file `scripts/Makefile.kcov'.
Looking for an implicit rule for scripts/Makefile.kcov'. Trying pattern rule with stem Makefile.kcov'. Trying implicit prerequisite scripts/Makefile.kcov.o'. Trying pattern rule with stem Makefile.kcov'. Trying implicit prerequisite scripts/Makefile.kcov.c'. Trying pattern rule with stem Makefile.kcov'. Trying implicit prerequisite scripts/Makefile.kcov.cc'. Trying pattern rule with stem Makefile.kcov'. Trying implicit prerequisite `scripts/Makefile.kcov.C'.
...
This issue was fixed by GNU Make commit 58dae243526b ("[Savannah #20501] Handle adding -r/-R to MAKEFLAGS in the makefile"). So, it is no longer a problem if you use GNU Make 4.0 or later. However, older versions are still widely used.
So, I decided to patch the kernel Makefile to invoke sub-make regardless of O= option. This will allow further cleanups.
--- Makefile | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-)
Makefile +26 -22
@@ -15,19 +15,6 @@ NAME = Shy Crocodile PHONY := _all _all: -# Do not use make's built-in rules and variables -# (this increases performance and avoids hard-to-debug behaviour) -MAKEFLAGS += -rR - -# Avoid funny character set dependencies -unexport LC_ALL -LC_COLLATE=C -LC_NUMERIC=C -export LC_COLLATE LC_NUMERIC - -# Avoid interference with shell env settings -unexport GREP_OPTIONS - # We are using a recursive build, so we need to do a little thinking # to get the ordering right. #
@@ -44,6 +31,21 @@ unexport GREP_OPTIONS # descending is started. They are now explicitly listed as the # prepare rule. +ifneq ($(sub-make-done),1) + +# Do not use make's built-in rules and variables +# (this increases performance and avoids hard-to-debug behaviour) +MAKEFLAGS += -rR + +# Avoid funny character set dependencies +unexport LC_ALL +LC_COLLATE=C +LC_NUMERIC=C +export LC_COLLATE LC_NUMERIC + +# Avoid interference with shell env settings +unexport GREP_OPTIONS + # Beautify output # --------------------------------------------------------------------------- #
@@ -112,7 +114,6 @@ export quiet Q KBUILD_VERBOSE # KBUILD_SRC is not intended to be used by the regular user (for now), # it is set on invocation of make with KBUILD_OUTPUT or O= specified. -ifeq ($(KBUILD_SRC),) # OK, Make called in directory where kernel src resides # Do we want to locate output files in a separate directory?
@@ -142,6 +143,13 @@ $(if $(KBUILD_OUTPUT),, \ # 'sub-make' below. MAKEFLAGS += --include-dir=$(CURDIR) +else + +# Do not print "Entering directory ..." at all for in-tree build. +MAKEFLAGS += --no-print-directory + +endif # ifneq ($(KBUILD_OUTPUT),) + PHONY += $(MAKECMDGOALS) sub-make $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make
@@ -149,16 +157,12 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make # Invoke a second make in the output directory, passing relevant variables sub-make: - $(Q)$(MAKE) -C $(KBUILD_OUTPUT) KBUILD_SRC=$(CURDIR) \ + $(Q)$(MAKE) sub-make-done=1 \ + $(if $(KBUILD_OUTPUT),-C $(KBUILD_OUTPUT) KBUILD_SRC=$(CURDIR)) \ -f $(CURDIR)/Makefile $(filter-out _all sub-make,$(MAKECMDGOALS)) -# Leave processing to above invocation of make -skip-makefile := 1 -endif # ifneq ($(KBUILD_OUTPUT),) -endif # ifeq ($(KBUILD_SRC),) - +else # sub-make-done # We process the rest of the Makefile if this is the final invocation of make -ifeq ($(skip-makefile),) # Do not print "Entering directory ...", # but we want to display it when entering to the output directory
@@ -1757,7 +1761,7 @@ $(cmd_files): ; # Do not try to update included dependency files endif # ifeq ($(config-targets),1) endif # ifeq ($(mixed-targets),1) -endif # skip-makefile +endif # sub-make-done PHONY += FORCE FORCE:
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 76/262 powerpc/fsl: Fix the flush of branch predictor.
In reply to Sasha LevinFrom: Christophe Leroy <[email protected]>
[ Upstream commit 27da80719ef132cf8c80eb406d5aeb37dddf78cc ]
The commit identified below adds MC_BTB_FLUSH macro only when CONFIG_PPC_FSL_BOOK3E is defined. This results in the following error on some configs (seen several times with kisskb randconfig_defconfig)
arch/powerpc/kernel/exceptions-64e.S:576: Error: Unrecognized opcode: `mc_btb_flush' make[3]: *** [scripts/Makefile.build:367: arch/powerpc/kernel/exceptions-64e.o] Error 1 make[2]: *** [scripts/Makefile.build:492: arch/powerpc/kernel] Error 2 make[1]: *** [Makefile:1043: arch/powerpc] Error 2
make: *** [Makefile:152: sub-make] Error 2
This patch adds a blank definition of MC_BTB_FLUSH for other cases.
--- arch/powerpc/kernel/exceptions-64e.S | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/kernel/exceptions-64e.S +1 -0
@@ -349,6 +349,7 @@ ret_from_mc_except: #define GEN_BTB_FLUSH #define CRIT_BTB_FLUSH #define DBG_BTB_FLUSH +#define MC_BTB_FLUSH #define GDBELL_BTB_FLUSH #endif
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 77/262 btrfs: save drop_progress if we drop refs at all
In reply to Sasha LevinFrom: Josef Bacik <[email protected]>
[ Upstream commit aea6f028d01d629eda2e958ccd1133e805cda159 ]
Previously we only updated the drop_progress key if we were in the DROP_REFERENCE stage of snapshot deletion. This is because the UPDATE_BACKREF stage checks the flags of the blocks it's converting to FULL_BACKREF, so if we go over a block we processed before it doesn't matter, we just don't do anything.
The problem is in do_walk_down() we will go ahead and drop the roots reference to any blocks that we know we won't need to walk into.
Given subvolume A and snapshot B. The root of B points to all of the nodes that belong to A, so all of those nodes have a refcnt > 1. If B did not modify those blocks it'll hit this condition in do_walk_down
if (!wc->update_ref ||
generation <= root->root_key.offset) goto skip;
and in "goto skip" we simply do a btrfs_free_extent() for that bytenr that we point at.
Now assume we modified some data in B, and then took a snapshot of B and call it C. C points to all the nodes in B, making every node the root of B points to have a refcnt > 1. This assumes the root level is 2 or higher.
We delete snapshot B, which does the above work in do_walk_down, free'ing our ref for nodes we share with A that we didn't modify. Now we hit a node we _did_ modify, thus we own. We need to walk down into this node and we set wc->stage == UPDATE_BACKREF. We walk down to level 0 which we also own because we modified data. We can't walk any further down and thus now need to walk up and start the next part of the deletion. Now walk_up_proc is supposed to put us back into DROP_REFERENCE, but there's an exception to this
if (level < wc->shared_level)
goto out;
we are at level == 0, and our shared_level == 1. We skip out of this one and go up to level 1. Since path->slots[1] < nritems we path->slots[1]++ and break out of walk_up_tree to stop our transaction and loop back around. Now in btrfs_drop_snapshot we have this snippet
if (wc->stage == DROP_REFERENCE) {
level = wc->level;
btrfs_node_key(path->nodes[level],
&root_item->drop_progress,
path->slots[level]);
root_item->drop_level = level;
}our stage == UPDATE_BACKREF still, so we don't update the drop_progress key. This is a problem because we would have done btrfs_free_extent() for the nodes leading up to our current position. If we crash or unmount here and go to remount we'll start over where we were before and try to free our ref for blocks we've already freed, and thus abort() out.
Fix this by keeping track of the last place we dropped a reference for our block in do_walk_down. Then if wc->stage == UPDATE_BACKREF we know we'll start over from a place we meant to, and otherwise things continue to work as they did before.
I have a complicated reproducer for this problem, without this patch we'll fail to fsck the fs when replaying the log writes log. With this patch we can replay the whole log without any fsck or mount failures.
The steps to reproduce this easily are sort of tricky, I had to add a couple of debug patches to the kernel in order to make it easy, basically I just needed to make sure we did actually commit the transaction every time we finished a walk_down_tree/walk_up_tree combo.
The reproducer:
1) Creates a base subvolume.
2) Creates 100k files in the subvolume.
3) Snapshots the base subvolume (snap1).
4) Touches files 5000-6000 in snap1.
5) Snapshots snap1 (snap2).
6) Deletes snap1.
I do this with dm-log-writes, and then replay to every FUA in the log and fsck the fs.
--- fs/btrfs/extent-tree.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
fs/btrfs/extent-tree.c +20 -6
@@ -8690,6 +8690,8 @@ struct walk_control {u64 refs[BTRFS_MAX_LEVEL ];u64 flags[BTRFS_MAX_LEVEL ];struct btrfs_key update_progress; +struct btrfs_key drop_progress; +int drop_level;int stage;int level;int shared_level;
@@ -9028,6 +9030,16 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans, ret); } } + +/* +* We need to update the next key in our walk control so we can +* update the drop_progress key accordingly. We don't care if +* find_next_key doesn't find a key because that means we're at +* the end and are going to clean up now. +*/ + wc->drop_level = level; +find_next_key (path, level, &wc->drop_progress); + ret =btrfs_free_extent (trans, root, bytenr, fs_info->nodesize, parent, root->root_key.objectid, level -1 ,0 );
@@ -9378,12 +9390,14 @@ int btrfs_drop_snapshot(struct btrfs_root *root, }if (wc->stage ==DROP_REFERENCE ) { - level = wc->level; -btrfs_node_key (path->nodes[level], - &root_item->drop_progress, - path->slots[level]); - root_item->drop_level = level; - } + wc->drop_level = wc->level; +btrfs_node_key_to_cpu (path->nodes[wc->drop_level], + &wc->drop_progress, + path->slots[wc->drop_level]); + } +btrfs_cpu_key_to_disk (&root_item->drop_progress, + &wc->drop_progress); + root_item->drop_level = wc->drop_level;BUG_ON (wc->level ==0 ); if (btrfs_should_end_transaction(trans) ||
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 78/262 drm/amd/display: Fix reference counting for struct dc_sink.
In reply to Sasha LevinFrom: Mathias Fröhlich <[email protected]>
[ Upstream commit dcd5fb82ffb484124203aa339733663ac0b059f3 ]
Reference counting in amdgpu_dm_connector for amdgpu_dm_connector::dc_sink and amdgpu_dm_connector::dc_em_sink as well as in dc_link::local_sink seems to be out of shape. Thus make reference counting consistent for these members and just plain increment the reference count when the variable gets assigned and decrement when the pointer is set to zero or replaced. Also simplify reference counting in selected function sopes to be sure the reference is released in any case. In some cases add NULL pointer check before dereferencing.
At a hand full of places a comment is placed to stat that the reference increment happened already somewhere else.
This actually fixes the following kernel bug on my system when enabling display core in amdgpu. There are some more similar bug reports around, so it probably helps at more places.
kernel BUG at mm/slub.c:294!
invalid opcode: 0000 [#1] SMP PTI
CPU: 9 PID: 1180 Comm: Xorg Not tainted 5.0.0-rc1+ #2
Hardware name: Supermicro X10DAi/X10DAI, BIOS 3.0a 02/05/2018
RIP: 0010:__slab_free+0x1e2/0x3d0
Code: 8b 54 24 30 48 89 4c 24 28 e8 da fb ff ff 4c 8b 54 24 28 85 c0 0f 85 67 fe ff ff 48 8d 65 d8 5b 41 5c 41 5d 41 5e 41 5f 5d c3 <0f> 0b 49 3b 5c 24 28 75 ab 48 8b 44 24 30 49 89 4c 24 28 49 89 44
RSP: 0018:ffffb0978589fa90 EFLAGS: 00010246
RAX: ffff92f12806c400 RBX: 0000000080200019 RCX: ffff92f12806c400
RDX: ffff92f12806c400 RSI: ffffdd6421a01a00 RDI: ffff92ed2f406e80
RBP: ffffb0978589fb40 R08: 0000000000000001 R09: ffffffffc0ee4748
R10: ffff92f12806c400 R11: 0000000000000001 R12: ffffdd6421a01a00
R13: ffff92f12806c400 R14: ffff92ed2f406e80 R15: ffffdd6421a01a20
FS: 00007f4170be0ac0(0000) GS:ffff92ed2fb40000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000562818aaa000 CR3: 000000045745a002 CR4: 00000000003606e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
? drm_dbg+0x87/0x90 [drm]
dc_stream_release+0x28/0x50 [amdgpu]
amdgpu_dm_connector_mode_valid+0xb4/0x1f0 [amdgpu]
drm_helper_probe_single_connector_modes+0x492/0x6b0 [drm_kms_helper]
drm_mode_getconnector+0x457/0x490 [drm]
? drm_connector_property_set_ioctl+0x60/0x60 [drm]
drm_ioctl_kernel+0xa9/0xf0 [drm]
drm_ioctl+0x201/0x3a0 [drm]
? drm_connector_property_set_ioctl+0x60/0x60 [drm]
amdgpu_drm_ioctl+0x49/0x80 [amdgpu]
do_vfs_ioctl+0xa4/0x630
? __sys_recvmsg+0x83/0xa0
ksys_ioctl+0x60/0x90
__x64_sys_ioctl+0x16/0x20
do_syscall_64+0x5b/0x160
entry_SYSCALL_64_after_hwframe+0x44/0xa9
RIP: 0033:0x7f417110809b
Code: 0f 1e fa 48 8b 05 ed bd 0c 00 64 c7 00 26 00 00 00 48 c7 c0 ff ff ff ff c3 66 0f 1f 44 00 00 f3 0f 1e fa b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d bd bd 0c 00 f7 d8 64 89 01 48
RSP: 002b:00007ffdd8d1c268 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX: 0000562818a8ebc0 RCX: 00007f417110809b
RDX: 00007ffdd8d1c2a0 RSI: 00000000c05064a7 RDI: 0000000000000012
RBP: 00007ffdd8d1c2a0 R08: 0000562819012280 R09: 0000000000000007
R10: 0000000000000000 R11: 0000000000000246 R12: 00000000c05064a7
R13: 0000000000000012 R14: 0000000000000012 R15: 00007ffdd8d1c2a0
Modules linked in: nfsv4 dns_resolver nfs lockd grace fscache fuse vfat fat amdgpu intel_rapl sb_edac x86_pkg_temp_thermal intel_powerclamp coretemp kvm_intel kvm irqbypass crct10dif_pclmul chash gpu_sched crc32_pclmul snd_hda_codec_realtek ghash_clmulni_intel amd_iommu_v2 iTCO_wdt iTCO_vendor_support ttm snd_hda_codec_generic snd_hda_codec_hdmi ledtrig_audio snd_hda_intel drm_kms_helper snd_hda_codec intel_cstate snd_hda_core drm snd_hwdep snd_seq snd_seq_device intel_uncore snd_pcm intel_rapl_perf snd_timer snd soundcore ioatdma pcspkr intel_wmi_thunderbolt mxm_wmi i2c_i801 lpc_ich pcc_cpufreq auth_rpcgss sunrpc igb crc32c_intel i2c_algo_bit dca wmi hid_cherry analog gameport joydevThis patch is based on agd5f/drm-next-5.1-wip. This patch does not require all of that, but agd5f/drm-next-5.1-wip contains at least one more dc_sink counting fix that I could spot.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 43 +++++++++++++++---- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 1 + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 1 + 3 files changed, 37 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +35 -8
@@ -886,6 +886,7 @@ static void emulated_link_detect(struct dc_link *link)return ; } +/* dc_sink_create returns a new reference */ link->local_sink = sink; edid_status = dm_helpers_read_local_edid(
@@ -952,6 +953,8 @@ static int dm_resume(void *handle)if (aconnector->fake_enable && aconnector->dc_link->local_sink) aconnector->fake_enable = false; +if (aconnector->dc_sink) +dc_sink_release (aconnector->dc_sink); aconnector->dc_sink =NULL ;amdgpu_dm_update_connector_after_detect (aconnector);mutex_unlock (&aconnector->hpd_lock);
@@ -1061,6 +1064,8 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector) sink = aconnector->dc_link->local_sink; +if (sink) +dc_sink_retain (sink);/* * Edid mgmt connector gets first update only in mode_valid hook and then
@@ -1085,21 +1090,24 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector)* to it anymore after disconnect, so on next crtc to connector * reshuffle by UMD we will get into unwanted dc_sink release */ -if (aconnector->dc_sink != aconnector->dc_em_sink) -dc_sink_release (aconnector->dc_sink); +dc_sink_release (aconnector->dc_sink); } aconnector->dc_sink = sink; +dc_sink_retain (aconnector->dc_sink);amdgpu_dm_update_freesync_caps (connector, aconnector->edid); }else {amdgpu_dm_update_freesync_caps (connector,NULL ); -if (!aconnector->dc_sink) +if (!aconnector->dc_sink) { aconnector->dc_sink = aconnector->dc_em_sink; -else if (aconnector->dc_sink != aconnector->dc_em_sink)dc_sink_retain (aconnector->dc_sink); + } }mutex_unlock (&dev->mode_config.mutex); + +if (sink) +dc_sink_release (sink);return ; }
@@ -1107,8 +1115,10 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector)* TODO: temporary guard to look for proper fix * if this sink is MST sink, we should not do anything */ -if (sink && sink->sink_signal ==SIGNAL_TYPE_DISPLAY_PORT_MST ) +if (sink && sink->sink_signal ==SIGNAL_TYPE_DISPLAY_PORT_MST ) { +dc_sink_release (sink);return ; + }if (aconnector->dc_sink == sink) {/*
@@ -1117,6 +1127,8 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector)*/ DRM_DEBUG_DRIVER ("DCHPD: connector_id=%d: dc_sink didn't change.\n" , aconnector->connector_id); +if (sink) +dc_sink_release (sink);return ; }
@@ -1138,6 +1150,7 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector)amdgpu_dm_update_freesync_caps (connector,NULL ); aconnector->dc_sink = sink; +dc_sink_retain (aconnector->dc_sink);if (sink->dc_edid.length ==0 ) { aconnector->edid =NULL ;drm_dp_cec_unset_edid (&aconnector->dm_dp_aux.aux);
@@ -1158,11 +1171,15 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector)amdgpu_dm_update_freesync_caps (connector,NULL );drm_connector_update_edid_property (connector,NULL ); aconnector->num_modes =0 ; +dc_sink_release (aconnector->dc_sink); aconnector->dc_sink =NULL ; aconnector->edid =NULL ; }mutex_unlock (&dev->mode_config.mutex); + +if (sink) +dc_sink_release (sink); }static void handle_hpd_irq (void *param)
@@ -2908,6 +2925,7 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector, } }else { sink = aconnector->dc_sink; +dc_sink_retain (sink); } stream =dc_create_stream_for_sink (sink);
@@ -2974,8 +2992,7 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector, stream->ignore_msa_timing_param = true; finish: -if (sink && sink->sink_signal ==SIGNAL_TYPE_VIRTUAL && aconnector->base.force !=DRM_FORCE_ON ) -dc_sink_release (sink); +dc_sink_release (sink);return stream; }
@@ -3233,6 +3250,14 @@ static void amdgpu_dm_connector_destroy(struct drm_connector *connector) dm->backlight_dev = NULL; }#endif + +if (aconnector->dc_em_sink) +dc_sink_release (aconnector->dc_em_sink); + aconnector->dc_em_sink =NULL ; +if (aconnector->dc_sink) +dc_sink_release (aconnector->dc_sink); + aconnector->dc_sink =NULL ; +drm_dp_cec_unregister_connector (&aconnector->dm_dp_aux.aux);drm_connector_unregister (connector);drm_connector_cleanup (connector);
@@ -3330,10 +3355,12 @@ static void create_eml_sink(struct amdgpu_dm_connector *aconnector) (edid->extensions +1 ) *EDID_LENGTH , &init_params); -if (aconnector->base.force ==DRM_FORCE_ON ) +if (aconnector->base.force ==DRM_FORCE_ON ) { aconnector->dc_sink = aconnector->dc_link->local_sink ? aconnector->dc_link->local_sink : aconnector->dc_em_sink; +dc_sink_retain (aconnector->dc_sink); + } }static void handle_edid_mgmt (struct amdgpu_dm_connector *aconnector)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +1 -0
@@ -239,6 +239,7 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector) &init_params); dc_sink->priv = aconnector; +/* dc_link_add_remote_sink returns a new reference */ aconnector->dc_sink = dc_sink;if (aconnector->dc_sink)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +1 -0
@@ -792,6 +792,7 @@ bool dc_link_detect(struct dc_link *link, enum dc_detect_reason reason) sink->dongle_max_pix_clk = sink_caps.max_hdmi_pixel_clock; sink->converter_disable_audio = converter_disable_audio; +/* dc_sink_create returns a new reference */ link->local_sink = sink; edid_status = dm_helpers_read_local_edid(
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 79/262 ath10k: don't report unset rssi values to mac80211
In reply to Sasha LevinFrom: Alagu Sankar <[email protected]>
[ Upstream commit 7d444522303177f3a3c09b9abb104ddeea470a70 ]
The SDIO firmware does not provide RSSI value to the host, it's only set to zero. In that case don't report the value to mac80211. One risk here is that value zero might be a valid value with other firmware, currently there's no way to detect that.
Without the fix, the rssi value indicated by iw changes between the actual value and -95.
Tested with QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00005-QCARMSWP-1.
--- drivers/net/wireless/ath/ath10k/htt_rx.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath10k/htt_rx.c +9 -3
@@ -2130,9 +2130,15 @@ static bool ath10k_htt_rx_proc_rx_ind_hl(struct ath10k_htt *htt, hdr = (struct ieee80211_hdr *)skb->data; rx_status =IEEE80211_SKB_RXCB (skb); rx_status->chains |=BIT (0 ); - rx_status->signal =ATH10K_DEFAULT_NOISE_FLOOR + - rx->ppdu.combined_rssi; - rx_status->flag &= ~RX_FLAG_NO_SIGNAL_VAL ; +if (rx->ppdu.combined_rssi ==0 ) { +/* SDIO firmware does not provide signal */ + rx_status->signal =0 ; + rx_status->flag |=RX_FLAG_NO_SIGNAL_VAL ; + }else { + rx_status->signal =ATH10K_DEFAULT_NOISE_FLOOR + + rx->ppdu.combined_rssi; + rx_status->flag &= ~RX_FLAG_NO_SIGNAL_VAL ; + }spin_lock_bh (&ar->data_lock); ch = ar->scan_channel;
Signature · 7 lines
2.19.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Sasha Levin
maintainerPATCH 80/262 powerpc/xmon: Fix opcode being uninitialized in print_insn_powerpc
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit e7140639b1de65bba435a6bd772d134901141f86 ]
When building with -Wsometimes-uninitialized, Clang warns:
arch/powerpc/xmon/ppc-dis.c:157:7: warning: variable 'opcode' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
if (cpu_has_feature(CPU_FTRS_POWER9))
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/powerpc/xmon/ppc-dis.c:167:7: note: uninitialized use occurs here
if (opcode == NULL)
^~~~~~
arch/powerpc/xmon/ppc-dis.c:157:3: note: remove the 'if' if its
condition is always true
if (cpu_has_feature(CPU_FTRS_POWER9))
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/powerpc/xmon/ppc-dis.c:132:38: note: initialize the variable
'opcode' to silence this warning
const struct powerpc_opcode *opcode;
^
= NULL1 warning generated.
This warning seems to make no sense on the surface because opcode is set to NULL right below this statement. However, there is a comma instead of semicolon to end the dialect assignment, meaning that the opcode assignment only happens in the if statement. Properly terminate that line so that Clang no longer warns.
--- arch/powerpc/xmon/ppc-dis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/xmon/ppc-dis.c +1 -1
@@ -158,7 +158,7 @@ int print_insn_powerpc (unsigned long insn, unsigned long memaddr) dialect |= (PPC_OPCODE_POWER5 |PPC_OPCODE_POWER6 |PPC_OPCODE_POWER7 |PPC_OPCODE_POWER8 |PPC_OPCODE_POWER9 |PPC_OPCODE_HTM |PPC_OPCODE_ALTIVEC |PPC_OPCODE_ALTIVEC2 - |PPC_OPCODE_VSX |PPC_OPCODE_VSX3 ), + |PPC_OPCODE_VSX |PPC_OPCODE_VSX3 );/* Get the major opcode of the insn. */ opcode =NULL ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 81/262 coresight: etm4x: Add support to enable ETMv4.2
In reply to Sasha LevinFrom: Sai Prakash Ranjan <[email protected]>
[ Upstream commit 5666dfd1d8a45a167f0d8b4ef47ea7f780b1f24a ]
SDM845 has ETMv4.2 and can use the existing etm4x driver. But the current etm driver checks only for ETMv4.0 and errors out for other etm4x versions. This patch adds this missing support to enable SoC's with ETMv4x to use same driver by checking only the ETM architecture major version number.
Without this change, we get below error during etm probe:
/ # dmesg | grep etm
[ 6.660093] coresight-etm4x: probe of 7040000.etm failed with error -22 [ 6.666902] coresight-etm4x: probe of 7140000.etm failed with error -22 [ 6.673708] coresight-etm4x: probe of 7240000.etm failed with error -22 [ 6.680511] coresight-etm4x: probe of 7340000.etm failed with error -22 [ 6.687313] coresight-etm4x: probe of 7440000.etm failed with error -22 [ 6.694113] coresight-etm4x: probe of 7540000.etm failed with error -22 [ 6.700914] coresight-etm4x: probe of 7640000.etm failed with error -22 [ 6.707717] coresight-etm4x: probe of 7740000.etm failed with error -22
With this change, etm probe is successful:
/ # dmesg | grep etm
[ 6.659198] coresight-etm4x 7040000.etm: CPU0: ETM v4.2 initialized [ 6.665848] coresight-etm4x 7140000.etm: CPU1: ETM v4.2 initialized [ 6.672493] coresight-etm4x 7240000.etm: CPU2: ETM v4.2 initialized [ 6.679129] coresight-etm4x 7340000.etm: CPU3: ETM v4.2 initialized [ 6.685770] coresight-etm4x 7440000.etm: CPU4: ETM v4.2 initialized [ 6.692403] coresight-etm4x 7540000.etm: CPU5: ETM v4.2 initialized [ 6.699024] coresight-etm4x 7640000.etm: CPU6: ETM v4.2 initialized [ 6.705646] coresight-etm4x 7740000.etm: CPU7: ETM v4.2 initialized
--- drivers/hwtracing/coresight/coresight-etm4x.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/hwtracing/coresight/coresight-etm4x.c +2 -1
@@ -55,7 +55,8 @@ static void etm4_os_unlock(struct etmv4_drvdata *drvdata)static bool etm4_arch_supported (u8 arch) { -switch (arch) { +/* Mask out the minor version number */ +switch (arch &0xf0 ) {case ETM_ARCH_V4 :break ;default :
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 82/262 serial: 8250_pxa: honor the port number from devicetree
In reply to Sasha LevinFrom: Lubomir Rintel <[email protected]>
[ Upstream commit fe9ed6d2483fda55465f32924fb15bce0fac3fac ]
Like the other OF-enabled drivers, use the port number from the firmware if the devicetree specifies an alias:
aliases {
...
serial2 = &uart2; /* Should be ttyS2 */
}This is how the deprecated pxa.c driver behaved, switching to 8250_pxa messes up the numbering.
--- drivers/tty/serial/8250/8250_pxa.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/tty/serial/8250/8250_pxa.c +4 -0
@@ -113,6 +113,10 @@ static int serial_pxa_probe(struct platform_device *pdev)if (ret)return ret; + ret =of_alias_get_id (pdev->dev.of_node,"serial" ); +if (ret >=0 ) + uart.port.line = ret; + uart.port.type =PORT_XSCALE ; uart.port.iotype =UPIO_MEM32 ; uart.port.mapbase = mmres->start;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 83/262 ARM: 8840/1: use a raw_spinlock_t in unwind
In reply to Sasha LevinFrom: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit 74ffe79ae538283bbf7c155e62339f1e5c87b55a ]
Mostly unwind is done with irqs enabled however SLUB may call it with irqs disabled while creating a new SLUB cache.
I had system freeze while loading a module which called kmem_cache_create() on init. That means SLUB's __slab_alloc() disabled interrupts and then
->new_slab_objects()
->new_slab()
->setup_object()
->setup_object_debug()
->init_tracking()
->set_track()
->save_stack_trace()
->save_stack_trace_tsk()
->walk_stackframe()
->unwind_frame()
->unwind_find_idx()
=>spin_lock_irqsave(&unwind_lock);--- arch/arm/kernel/unwind.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
arch/arm/kernel/unwind.c +7 -7
@@ -93,7 +93,7 @@ extern const struct unwind_idx __start_unwind_idx[];static const struct unwind_idx *__origin_unwind_idx;extern const struct unwind_idx __stop_unwind_idx[]; -static DEFINE_SPINLOCK (unwind_lock); +static DEFINE_RAW_SPINLOCK (unwind_lock);static LIST_HEAD (unwind_tables);/* Convert a prel31 symbol to an absolute address */
@@ -201,7 +201,7 @@ static const struct unwind_idx *unwind_find_idx(unsigned long addr)/* module unwind tables */ struct unwind_table *table; -spin_lock_irqsave (&unwind_lock, flags); +raw_spin_lock_irqsave (&unwind_lock, flags);list_for_each_entry (table, &unwind_tables, list) {if (addr >= table->begin_addr && addr < table->end_addr) {
@@ -213,7 +213,7 @@ static const struct unwind_idx *unwind_find_idx(unsigned long addr)break ; } } -spin_unlock_irqrestore (&unwind_lock, flags); +raw_spin_unlock_irqrestore (&unwind_lock, flags); }pr_debug ("%s: idx = %p\n" , __func__, idx);
@@ -529,9 +529,9 @@ struct unwind_table *unwind_table_add(unsigned long start, unsigned long size, tab->begin_addr = text_addr; tab->end_addr = text_addr + text_size; -spin_lock_irqsave (&unwind_lock, flags); +raw_spin_lock_irqsave (&unwind_lock, flags);list_add_tail (&tab->list, &unwind_tables); -spin_unlock_irqrestore (&unwind_lock, flags); +raw_spin_unlock_irqrestore (&unwind_lock, flags);return tab; }
@@ -543,9 +543,9 @@ void unwind_table_del(struct unwind_table *tab)if (!tab)return ; -spin_lock_irqsave (&unwind_lock, flags); +raw_spin_lock_irqsave (&unwind_lock, flags);list_del (&tab->list); -spin_unlock_irqrestore (&unwind_lock, flags); +raw_spin_unlock_irqrestore (&unwind_lock, flags);kfree (tab); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 84/262 ARM: 8845/1: use unified assembler in c files
In reply to Sasha LevinFrom: Stefan Agner <[email protected]>
[ Upstream commit b7e8c9397cd4efe6567d2728f091f1b728025533 ]
Use unified assembler syntax (UAL) in inline assembler. Divided syntax is considered deprecated. This will also allow to build the kernel using LLVM's integrated assembler.
When compiling non-Thumb2 GCC always emits a ".syntax divided" at the beginning of the inline assembly which makes the assembler fail. Since GCC 5 there is the -masm-syntax-unified GCC option which make GCC assume unified syntax asm and hence emits ".syntax unified" even in ARM mode. However, the option is broken since GCC version 6 (see GCC PR88648 [1]). Work around by adding ".syntax unified" as part of the inline assembly.
[0] https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html#index-masm-syntax-unified
[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88648
--- arch/arm/mm/copypage-v4mc.c | 3 ++- arch/arm/mm/copypage-v4wb.c | 3 ++- arch/arm/mm/copypage-v4wt.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-)
arch/arm/mm/copypage-v4mc.c +2 -1
@@ -45,6 +45,7 @@ static void mc_copy_user_page(void *from, void *to)int tmp; asm volatile ("\ + .syntax unified\n\ ldmia %0!, {r2, r3, ip, lr} @ 4\n\ 1: mcr p15, 0, %1, c7, c6, 1 @ 1 invalidate D line\n\ stmia %1!, {r2, r3, ip, lr} @ 4\n\
@@ -56,7 +57,7 @@ static void mc_copy_user_page(void *from, void *to) ldmia %0!, {r2, r3, ip, lr} @ 4\n\ subs %2, %2, #1 @ 1\n\ stmia %1!, {r2, r3, ip, lr} @ 4\n\ - ldmneia %0!, {r2, r3, ip, lr} @ 4\n\ + ldmiane %0!, {r2, r3, ip, lr} @ 4\n\ bne 1b @ " : "+&r" (from), "+&r" (to), "=&r" (tmp) : "2" (PAGE_SIZE / 64)
arch/arm/mm/copypage-v4wb.c +2 -1
@@ -27,6 +27,7 @@ static void v4wb_copy_user_page(void *kto, const void *kfrom)int tmp; asm volatile ("\ + .syntax unified\n\ ldmia %1!, {r3, r4, ip, lr} @ 4\n\ 1: mcr p15, 0, %0, c7, c6, 1 @ 1 invalidate D line\n\ stmia %0!, {r3, r4, ip, lr} @ 4\n\
@@ -38,7 +39,7 @@ static void v4wb_copy_user_page(void *kto, const void *kfrom) ldmia %1!, {r3, r4, ip, lr} @ 4\n\ subs %2, %2, #1 @ 1\n\ stmia %0!, {r3, r4, ip, lr} @ 4\n\ - ldmneia %1!, {r3, r4, ip, lr} @ 4\n\ + ldmiane %1!, {r3, r4, ip, lr} @ 4\n\ bne 1b @ 1\n\ mcr p15, 0, %1, c7, c10, 4 @ 1 drain WB" : "+&r" (kto), "+&r" (kfrom), "=&r" (tmp)
arch/arm/mm/copypage-v4wt.c +2 -1
@@ -25,6 +25,7 @@ static void v4wt_copy_user_page(void *kto, const void *kfrom)int tmp; asm volatile ("\ + .syntax unified\n\ ldmia %1!, {r3, r4, ip, lr} @ 4\n\ 1: stmia %0!, {r3, r4, ip, lr} @ 4\n\ ldmia %1!, {r3, r4, ip, lr} @ 4+1\n\
@@ -34,7 +35,7 @@ static void v4wt_copy_user_page(void *kto, const void *kfrom) ldmia %1!, {r3, r4, ip, lr} @ 4\n\ subs %2, %2, #1 @ 1\n\ stmia %0!, {r3, r4, ip, lr} @ 4\n\ - ldmneia %1!, {r3, r4, ip, lr} @ 4\n\ + ldmiane %1!, {r3, r4, ip, lr} @ 4\n\ bne 1b @ 1\n\ mcr p15, 0, %2, c7, c7, 0 @ flush ID cache" : "+&r" (kto), "+&r" (kfrom), "=&r" (tmp)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 85/262 iommu/io-pgtable-arm-v7s: Only kmemleak_ignore L2 tables
In reply to Sasha LevinFrom: Nicolas Boichat <[email protected]>
[ Upstream commit 032ebd8548c9d05e8d2bdc7a7ec2fe29454b0ad0 ]
L1 tables are allocated with __get_dma_pages, and therefore already ignored by kmemleak.
Without this, the kernel would print this error message on boot, when the first L1 table is allocated:
[ 2.810533] kmemleak: Trying to color unknown object at 0xffffffd652388000 as Black [ 2.818190] CPU: 5 PID: 39 Comm: kworker/5:0 Tainted: G S 4.19.16 #8 [ 2.831227] Workqueue: events deferred_probe_work_func [ 2.836353] Call trace: ... [ 2.852532] paint_ptr+0xa0/0xa8 [ 2.855750] kmemleak_ignore+0x38/0x6c [ 2.859490] __arm_v7s_alloc_table+0x168/0x1f4 [ 2.863922] arm_v7s_alloc_pgtable+0x114/0x17c [ 2.868354] alloc_io_pgtable_ops+0x3c/0x78
...
--- drivers/iommu/io-pgtable-arm-v7s.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iommu/io-pgtable-arm-v7s.c +2 -1
@@ -217,7 +217,8 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp,if (dma != phys) goto out_unmap; } -kmemleak_ignore (table); +if (lvl ==2 ) +kmemleak_ignore (table);return table; out_unmap:
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 86/262 powerpc/hugetlb: Handle mmap_min_addr correctly in get_unmapped_area callback
In reply to Sasha LevinFrom: "Aneesh Kumar K.V" <[email protected]>
[ Upstream commit 5330367fa300742a97e20e953b1f77f48392faae ]
After we ALIGN up the address we need to make sure we didn't overflow and resulted in zero address. In that case, we need to make sure that the returned address is greater than mmap_min_addr.
This fixes selftest va_128TBswitch --run-hugetlb reporting failures when run as non root user for
mmap(-1, MAP_HUGETLB)
The bug is that a non-root user requesting address -1 will be given address 0 which will then fail, whereas they should have been given something else that would have succeeded.
We also avoid the first mmap(-1, MAP_HUGETLB) returning NULL address as mmap address with this change. So we think this is not a security issue, because it only affects whether we choose an address below mmap_min_addr, not whether we actually allow that address to be mapped. ie. there are existing capability checks to prevent a user mapping below mmap_min_addr and those will still be honoured even without this fix.
--- arch/powerpc/mm/hugetlbpage-radix.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/powerpc/mm/hugetlbpage-radix.c +3 -2
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/mm.h> #include <linux/hugetlb.h> +#include <linux/security.h> #include <asm/pgtable.h> #include <asm/pgalloc.h> #include <asm/cacheflush.h>
@@ -73,7 +74,7 @@ radix__hugetlb_get_unmapped_area(struct file *file, unsigned long addr,if (addr) { addr =ALIGN (addr,huge_page_size (h)); vma =find_vma (mm, addr); -if (high_limit - len >= addr && +if (high_limit - len >= addr && addr >= mmap_min_addr && (!vma || addr + len <=vm_start_gap (vma)))return addr; }
@@ -83,7 +84,7 @@ radix__hugetlb_get_unmapped_area(struct file *file, unsigned long addr,*/ info.flags =VM_UNMAPPED_AREA_TOPDOWN ; info.length = len; - info.low_limit =PAGE_SIZE ; + info.low_limit =max (PAGE_SIZE , mmap_min_addr); info.high_limit = mm->mmap_base + (high_limit -DEFAULT_MAP_WINDOW ); info.align_mask =PAGE_MASK & ~huge_page_mask (h); info.align_offset =0 ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 87/262 net: dsa: mv88e6xxx: Default CMODE to 1000BaseX only on 6390X
In reply to Sasha LevinFrom: Marek Behún <[email protected]>
[ Upstream commit 65b034cf5c1766492aa107958149b440889480be ]
Commit 787799a9d555 sets the SERDES interfaces of 6390 and 6390X to 1000BaseX, but this is only needed on 6390X, since there are SERDES interfaces which can be used on lower ports on 6390.
This commit fixes this by returning to previous behaviour on 6390. (Previous behaviour means that CMODE is not set at all if requested mode is NA).
This is needed on Turris MOX, where the 88e6190 is connected to CPU in 2500BaseX mode.
--- drivers/net/dsa/mv88e6xxx/port.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/dsa/mv88e6xxx/port.c +2 -0
@@ -472,6 +472,8 @@ int mv88e6390_port_set_cmode(struct mv88e6xxx_chip *chip, int port, phy_interface_t mode) {switch (mode) { +case PHY_INTERFACE_MODE_NA : +return 0 ;case PHY_INTERFACE_MODE_XGMII :case PHY_INTERFACE_MODE_XAUI :case PHY_INTERFACE_MODE_RXAUI :
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 88/262 ice: fix ice_remove_rule_internal vsi_list handling
In reply to Sasha LevinFrom: Jacob Keller <[email protected]>
[ Upstream commit f9264dd687f8d3f9104c9900f8f3e5e419f27c55 ]
When adding multiple VLANs to the same VSI, the ice_add_vlan code will share the VSI list, so as not to create multiple unnecessary VSI lists.
Consider the following flow
ice_add_vlan(hw, <VSI 0 VID 7, VSI 0 VID 8, VSI 0 VID 9>)
Where we add three VLAN filters for VIDs 7, 8, and 9, all for VSI 0.
The ice_add_vlan will create a single vsi_list and share it among all the filters.
Later, if we try to remove a VLAN,
ice_remove_vlan(hw, <VSI 0 VID 7>)
Then the removal code will update the vsi_list and remove VSI 0 from it. But, since the vsi_list is shared, this breaks the list for the other users who reference it. We actually even free the VSI list memory, and may result in segmentation faults.
This is due to the way that VLAN rule share VSI lists with reference counts, and is caused because we call ice_rem_update_vsi_list even when the ref_cnt is greater than one.
To fix this, handle the case where ref_cnt is greater than one separately. In this case, we need to remove the associated rule without modifying the vsi_list, since it is currently being referenced by another rule. Instead, we just need to decrement the VSI list ref_cnt.
The case for handling sharing of VSI lists with multiple VSIs is not currently supported by this code. No such rules will be created today, and this code will require changes if/when such code is added.
--- drivers/net/ethernet/intel/ice/ice_switch.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_switch.c +13 -2
@@ -1538,9 +1538,20 @@ ice_remove_rule_internal(struct ice_hw *hw, u8 recp_id, }else if (!list_elem->vsi_list_info) { status =ICE_ERR_DOES_NOT_EXIST ; goto exit; + }else if (list_elem->vsi_list_info->ref_cnt >1 ) { +/* a ref_cnt > 1 indicates that the vsi_list is being +* shared by multiple rules. Decrement the ref_cnt and +* remove this rule, but do not modify the list, as it +* is in-use by other rules. +*/ + list_elem->vsi_list_info->ref_cnt--; + remove_rule = true; }else { -if (list_elem->vsi_list_info->ref_cnt >1 ) - list_elem->vsi_list_info->ref_cnt--; +/* a ref_cnt of 1 indicates the vsi_list is only used +* by one rule. However, the original removal request is only +* for a single VSI. Update the vsi_list first, and only +* remove the rule if there are no further VSIs in this list. +*/ vsi_handle = f_entry->fltr_info.vsi_handle; status =ice_rem_update_vsi_list (hw, vsi_handle, list_elem);if (status)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 89/262 perf script: Handle missing fields with -F +..
In reply to Sasha LevinFrom: Andi Kleen <[email protected]>
[ Upstream commit 4b6ac811bce46c83811b83cdf87b41251596b9fc ]
When using -F + syntax to add a field the existing defaults are currently all marked user_set. This can cause errors when some field is missing in the perf.data
This patch tracks the actually user set fields separately, so that we don't error out in this case.
Before:
% perf record true
% perf script -F +metric
Samples for 'cycles:ppp' event do not have CPU attribute set. Cannot print 'cpu' field. %
After:
5 perf record true
% perf script -F +metric
perf 28936 278636.237688: 1 cycles:ppp: ffffffff8117da99 perf_event_exec+0x59 (/lib/modules/4.20.0-odilo/build/vmlinux)
...
%
--- tools/perf/builtin-script.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
tools/perf/builtin-script.c +7 -3
@@ -148,6 +148,7 @@ static struct {unsigned int print_ip_opts;u64 fields;u64 invalid_fields; +u64 user_set_fields; } output[OUTPUT_TYPE_MAX] = { [PERF_TYPE_HARDWARE] = {
@@ -344,7 +345,7 @@ static int perf_evsel__do_check_stype(struct perf_evsel *evsel,if (attr->sample_type & sample_type)return 0 ; -if (output[type].user_set) { +if (output[type].user_set_fields & field) {if (allow_user_set)return 0 ; evname =perf_evsel__name (evsel);
@@ -2627,10 +2628,13 @@ static int parse_output_fields(const struct option *opt __maybe_unused,pr_warning ("\'%s\' not valid for %s events. Ignoring.\n" , all_output_options[i].str,event_type (j)); }else { -if (change ==REMOVE ) +if (change ==REMOVE ) { output[j].fields &= ~all_output_options[i].field; -else + output[j].user_set_fields &= ~all_output_options[i].field; + }else { output[j].fields |= all_output_options[i].field; + output[j].user_set_fields |= all_output_options[i].field; + } output[j].user_set = true; output[j].wildcard_set = true; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 90/262 btrfs: qgroup: Make qgroup async transaction commit more aggressive
In reply to Sasha LevinFrom: Qu Wenruo <[email protected]>
[ Upstream commit f5fef4593653dfa2a865c485bb81415de51d5c99 ]
[BUG]
Btrfs qgroup will still hit EDQUOT under the following case:
$ dev=/dev/test/test $ mnt=/mnt/btrfs $ umount $mnt &> /dev/null $ umount $dev &> /dev/null
$ mkfs.btrfs -f $dev $ mount $dev $mnt -o nospace_cache
$ btrfs subv create $mnt/subv $ btrfs quota enable $mnt $ btrfs quota rescan -w $mnt $ btrfs qgroup limit -e 1G $mnt/subv
$ fallocate -l 900M $mnt/subv/padding $ sync
$ rm $mnt/subv/padding
# Hit EDQUOT
$ xfs_io -f -c "pwrite 0 512M" $mnt/subv/real_file
[CAUSE]
Since commit a514d63882c3 ("btrfs: qgroup: Commit transaction in advance to reduce early EDQUOT"), btrfs is not forced to commit transaction to reclaim more quota space.
Instead, we just check pertrans metadata reservation against some threshold and try to do asynchronously transaction commit.
However in above case, the pertrans metadata reservation is pretty small thus it will never trigger asynchronous transaction commit.
[FIX]
Instead of only accounting pertrans metadata reservation, we calculate how much free space we have, and if there isn't much free space left, commit transaction asynchronously to try to free some space.
This may slow down the fs when we have less than 32M free qgroup space, but should reduce a lot of false EDQUOT, so the cost should be acceptable.
--- fs/btrfs/qgroup.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
fs/btrfs/qgroup.c +14 -14
@@ -2842,16 +2842,15 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid,/* * Two limits to commit transaction in advance. * -* For RATIO, it will be 1/RATIO of the remaining limit -* (excluding data and prealloc meta) as threshold. +* For RATIO, it will be 1/RATIO of the remaining limit as threshold. * For SIZE, it will be in byte unit as threshold. */ -#define QGROUP_PERTRANS_RATIO 32 -#define QGROUP_PERTRANS_SIZE SZ_32M +#define QGROUP_FREE_RATIO 32 +#define QGROUP_FREE_SIZE SZ_32Mstatic bool qgroup_check_limits (struct btrfs_fs_info *fs_info,const struct btrfs_qgroup *qg,u64 num_bytes) { -u64 limit; +u64 free;u64 threshold; if ((qg->lim_flags & BTRFS_QGROUP_LIMIT_MAX_RFER) &&
@@ -2870,20 +2869,21 @@ static bool qgroup_check_limits(struct btrfs_fs_info *fs_info,*/ if ((qg->lim_flags & (BTRFS_QGROUP_LIMIT_MAX_RFER |BTRFS_QGROUP_LIMIT_MAX_EXCL ))) { -if (qg->lim_flags &BTRFS_QGROUP_LIMIT_MAX_EXCL ) - limit = qg->max_excl; -else - limit = qg->max_rfer; - threshold = (limit - qg->rsv.values[BTRFS_QGROUP_RSV_DATA ] - - qg->rsv.values[BTRFS_QGROUP_RSV_META_PREALLOC ]) / -QGROUP_PERTRANS_RATIO ; - threshold =min_t (u64, threshold,QGROUP_PERTRANS_SIZE ); +if (qg->lim_flags &BTRFS_QGROUP_LIMIT_MAX_EXCL ) { + free = qg->max_excl -qgroup_rsv_total (qg) - qg->excl; + threshold =min_t (u64, qg->max_excl /QGROUP_FREE_RATIO , +QGROUP_FREE_SIZE ); + }else { + free = qg->max_rfer -qgroup_rsv_total (qg) - qg->rfer; + threshold =min_t (u64, qg->max_rfer /QGROUP_FREE_RATIO , +QGROUP_FREE_SIZE ); + }/* * Use transaction_kthread to commit transaction, so we no * longer need to bother nested transaction nor lock context. */ -if (qg->rsv.values[BTRFS_QGROUP_RSV_META_PERTRANS ] > threshold) +if (free < threshold)btrfs_commit_transaction_locksafe (fs_info); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 91/262 btrfs: don't enospc all tickets on flush failure
In reply to Sasha LevinFrom: Josef Bacik <[email protected]>
[ Upstream commit f91587e4151e84f798f37839dddd3e4152fb4c76 ]
With the introduction of the per-inode block_rsv it became possible to have really really large reservation requests made because of data fragmentation. Since the ticket stuff assumed that we'd always have relatively small reservation requests it just killed all tickets if we were unable to satisfy the current request.
However, this is generally not the case anymore. So fix this logic to instead see if we had a ticket that we were able to give some reservation to, and if we were continue the flushing loop again.
Likewise we make the tickets use the space_info_add_old_bytes() method of returning what reservation they did receive in hopes that it could satisfy reservations down the line.
--- fs/btrfs/extent-tree.c | 45 +++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 20 deletions(-)
fs/btrfs/extent-tree.c +25 -20
@@ -4808,6 +4808,7 @@ static void shrink_delalloc(struct btrfs_fs_info *fs_info, u64 to_reclaim, }struct reserve_ticket { +u64 orig_bytes;u64 bytes;int error;struct list_head list;
@@ -5030,7 +5031,7 @@ static inline int need_do_async_reclaim(struct btrfs_fs_info *fs_info, !test_bit(BTRFS_FS_STATE_REMOUNTING, &fs_info->fs_state)); } -static void wake_all_tickets (struct list_head *head) +static bool wake_all_tickets (struct list_head *head) {struct reserve_ticket *ticket;
@@ -5039,7 +5040,10 @@ static void wake_all_tickets(struct list_head *head)list_del_init (&ticket->list); ticket->error = -ENOSPC ;wake_up (&ticket->wait); +if (ticket->bytes != ticket->orig_bytes) +return true; } +return false; }/*
@@ -5094,8 +5098,12 @@ static void btrfs_async_reclaim_metadata_space(struct work_struct *work)if (flush_state >COMMIT_TRANS ) { commit_cycles++;if (commit_cycles >2 ) { -wake_all_tickets (&space_info->tickets); - space_info->flush =0 ; +if (wake_all_tickets (&space_info->tickets)) { + flush_state =FLUSH_DELAYED_ITEMS_NR ; + commit_cycles--; + }else { + space_info->flush =0 ; + } }else { flush_state =FLUSH_DELAYED_ITEMS_NR ; }
@@ -5147,10 +5155,11 @@ static void priority_reclaim_metadata_space(struct btrfs_fs_info *fs_info,static int wait_reserve_ticket (struct btrfs_fs_info *fs_info,struct btrfs_space_info *space_info, -struct reserve_ticket *ticket,u64 orig_bytes) +struct reserve_ticket *ticket) {DEFINE_WAIT (wait); +u64 reclaim_bytes =0 ;int ret =0 ;spin_lock (&space_info->lock);
@@ -5171,14 +5180,12 @@ static int wait_reserve_ticket(struct btrfs_fs_info *fs_info, ret = ticket->error;if (!list_empty (&ticket->list))list_del_init (&ticket->list); -if (ticket->bytes && ticket->bytes < orig_bytes) { -u64 num_bytes = orig_bytes - ticket->bytes; -update_bytes_may_use (space_info, -num_bytes); -trace_btrfs_space_reservation (fs_info,"space_info" , - space_info->flags, num_bytes,0 ); - } +if (ticket->bytes && ticket->bytes < ticket->orig_bytes) + reclaim_bytes = ticket->orig_bytes - ticket->bytes;spin_unlock (&space_info->lock); +if (reclaim_bytes) +space_info_add_old_bytes (fs_info, space_info, reclaim_bytes);return ret; }
@@ -5204,6 +5211,7 @@ static int __reserve_metadata_bytes(struct btrfs_fs_info *fs_info, {struct reserve_ticket ticket;u64 used; +u64 reclaim_bytes =0 ;int ret =0 ;ASSERT (orig_bytes);
@@ -5239,6 +5247,7 @@ static int __reserve_metadata_bytes(struct btrfs_fs_info *fs_info,* the list and we will do our own flushing further down. */ if (ret && flush !=BTRFS_RESERVE_NO_FLUSH ) { + ticket.orig_bytes = orig_bytes; ticket.bytes = orig_bytes; ticket.error =0 ;init_waitqueue_head (&ticket.wait);
@@ -5279,25 +5288,21 @@ static int __reserve_metadata_bytes(struct btrfs_fs_info *fs_info,return ret;if (flush ==BTRFS_RESERVE_FLUSH_ALL ) -return wait_reserve_ticket (fs_info, space_info, &ticket, - orig_bytes); +return wait_reserve_ticket (fs_info, space_info, &ticket); ret =0 ;priority_reclaim_metadata_space (fs_info, space_info, &ticket);spin_lock (&space_info->lock);if (ticket.bytes) { -if (ticket.bytes < orig_bytes) { -u64 num_bytes = orig_bytes - ticket.bytes; -update_bytes_may_use (space_info, -num_bytes); -trace_btrfs_space_reservation (fs_info,"space_info" , - space_info->flags, - num_bytes,0 ); - - } +if (ticket.bytes < orig_bytes) + reclaim_bytes = orig_bytes - ticket.bytes;list_del_init (&ticket.list); ret = -ENOSPC ; }spin_unlock (&space_info->lock); + +if (reclaim_bytes) +space_info_add_old_bytes (fs_info, space_info, reclaim_bytes);ASSERT (list_empty (&ticket.list));return ret; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 92/262 mmc: omap: fix the maximum timeout setting
In reply to Sasha LevinFrom: Aaro Koskinen <[email protected]>
[ Upstream commit a6327b5e57fdc679c842588c3be046c0b39cc127 ]
When running OMAP1 kernel on QEMU, MMC access is annoyingly noisy:
MMC: CTO of 0xff and 0xfe cannot be used! MMC: CTO of 0xff and 0xfe cannot be used! MMC: CTO of 0xff and 0xfe cannot be used! [ad inf.]
Emulator warnings appear to be valid. The TI document SPRU680 [1] ("OMAP5910 Dual-Core Processor MultiMedia Card/Secure Data Memory Card (MMC/SD) Reference Guide") page 36 states that the maximum timeout is 253 cycles and "0xff and 0xfe cannot be used".
Fix by using 0xfd as the maximum timeout.
Tested using QEMU 2.5 (Siemens SX1 machine, OMAP310), and also checked on real hardware using Palm TE (OMAP310), Nokia 770 (OMAP1710) and Nokia N810 (OMAP2420) that MMC works as before.
[1] http://www.ti.com/lit/ug/spru680/spru680.pdf
--- drivers/mmc/host/omap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/omap.c +1 -1
@@ -920,7 +920,7 @@ static inline void set_cmd_timeout(struct mmc_omap_host *host, struct mmc_reques reg &= ~(1 <<5 );OMAP_MMC_WRITE (host,SDIO , reg);/* Set maximum timeout */ -OMAP_MMC_WRITE (host,CTO ,0xff ); +OMAP_MMC_WRITE (host,CTO ,0xfd ); }static inline void set_data_timeout (struct mmc_omap_host *host,struct mmc_request *req)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 93/262 net: dsa: mv88e6xxx: Add lockdep classes to fix false positive splat
In reply to Sasha LevinFrom: Andrew Lunn <[email protected]>
[ Upstream commit f6d9758b12660484b6639364cc406da92a918c96 ]
The following false positive lockdep splat has been observed.
======================================================
WARNING: possible circular locking dependency detected 4.20.0+ #302 Not tainted
------------------------------------------------------
systemd-udevd/160 is trying to acquire lock:edea6080 (&chip->reg_lock){+.+.}, at: __setup_irq+0x640/0x704
but task is already holding lock:edff0340 (&desc->request_mutex){+.+.}, at: __setup_irq+0xa0/0x704
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&desc->request_mutex){+.+.}:
mutex_lock_nested+0x1c/0x24
__setup_irq+0xa0/0x704
request_threaded_irq+0xd0/0x150
mv88e6xxx_probe+0x41c/0x694 [mv88e6xxx]
mdio_probe+0x2c/0x54
really_probe+0x200/0x2c4
driver_probe_device+0x5c/0x174
__driver_attach+0xd8/0xdc
bus_for_each_dev+0x58/0x7c
bus_add_driver+0xe4/0x1f0
driver_register+0x7c/0x110
mdio_driver_register+0x24/0x58
do_one_initcall+0x74/0x2e8
do_init_module+0x60/0x1d0
load_module+0x1968/0x1ff4
sys_finit_module+0x8c/0x98
ret_fast_syscall+0x0/0x28
0xbedf2ae8-> #0 (&chip->reg_lock){+.+.}:
__mutex_lock+0x50/0x8b8
mutex_lock_nested+0x1c/0x24
__setup_irq+0x640/0x704
request_threaded_irq+0xd0/0x150
mv88e6xxx_g2_irq_setup+0xcc/0x1b4 [mv88e6xxx]
mv88e6xxx_probe+0x44c/0x694 [mv88e6xxx]
mdio_probe+0x2c/0x54
really_probe+0x200/0x2c4
driver_probe_device+0x5c/0x174
__driver_attach+0xd8/0xdc
bus_for_each_dev+0x58/0x7c
bus_add_driver+0xe4/0x1f0
driver_register+0x7c/0x110
mdio_driver_register+0x24/0x58
do_one_initcall+0x74/0x2e8
do_init_module+0x60/0x1d0
load_module+0x1968/0x1ff4
sys_finit_module+0x8c/0x98
ret_fast_syscall+0x0/0x28
0xbedf2ae8other info that might help us debug this:
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&desc->request_mutex);
lock(&chip->reg_lock);
lock(&desc->request_mutex); lock(&chip->reg_lock);
&desc->request_mutex refer to two different mutex. #1 is the GPIO for the chip interrupt. #2 is the chained interrupt between global 1 and global 2.
Add lockdep classes to the GPIO interrupt to avoid this.
--- drivers/net/dsa/mv88e6xxx/chip.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/dsa/mv88e6xxx/chip.c +8 -0
@@ -442,12 +442,20 @@ static int mv88e6xxx_g1_irq_setup_common(struct mv88e6xxx_chip *chip)static int mv88e6xxx_g1_irq_setup (struct mv88e6xxx_chip *chip) { +static struct lock_class_key lock_key; +static struct lock_class_key request_key;int err; err =mv88e6xxx_g1_irq_setup_common (chip);if (err)return err; +/* These lock classes tells lockdep that global 1 irqs are in +* a different category than their parent GPIO, so it won't +* report false recursion. +*/ +irq_set_lockdep_class (chip->irq, &lock_key, &request_key); + err = request_threaded_irq(chip->irq, NULL, mv88e6xxx_g1_irq_thread_fn, IRQF_ONESHOT | IRQF_SHARED,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 94/262 net: hns3: fix setting of the hns reset_type for rdma hw errors
In reply to Sasha LevinFrom: Shiju Jose <[email protected]>
[ Upstream commit eb4c2ccbad6c688be791e0c08640a40124558c03 ]
Presently the hns reset_type for the roce errors is set in the hclge_log_and_clear_rocee_ras_error function. This function is also called to detect and clear roce errors while enabling the rdma error interrupts. However there is no hns reset requested for this case. This can cause issue of wrong reset_type used with subsequent hns reset as the reset_type set in the above case was not cleared.
This patch moves setting of hns reset_type for the roce errors from hclge_log_and_clear_rocee_ras_error function
to hclge_handle_rocee_ras_error.
--- .../hisilicon/hns3/hns3pf/hclge_err.c | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c +20 -16
@@ -1094,10 +1094,10 @@ static int hclge_log_rocee_ovf_error(struct hclge_dev *hdev)return 0 ; } -static int hclge_log_and_clear_rocee_ras_error (struct hclge_dev *hdev) +static enum hnae3_reset_type +hclge_log_and_clear_rocee_ras_error (struct hclge_dev *hdev) { -enum hnae3_reset_type reset_type =HNAE3_FUNC_RESET ; -struct hnae3_ae_dev *ae_dev = hdev->ae_dev; +enum hnae3_reset_type reset_type =HNAE3_NONE_RESET ;struct device *dev = &hdev->pdev->dev;struct hclge_desc desc[2 ];unsigned int status;
@@ -1110,17 +1110,20 @@ static int hclge_log_and_clear_rocee_ras_error(struct hclge_dev *hdev)if (ret) {dev_err (dev,"failed(%d) to query ROCEE RAS INT SRC\n" , ret);/* reset everything for now */ -HCLGE_SET_DEFAULT_RESET_REQUEST (HNAE3_GLOBAL_RESET ); -return ret; +return HNAE3_GLOBAL_RESET ; } status =le32_to_cpu (desc[0 ].data[0 ]); -if (status &HCLGE_ROCEE_RERR_INT_MASK ) +if (status &HCLGE_ROCEE_RERR_INT_MASK ) {dev_warn (dev,"ROCEE RAS AXI rresp error\n" ); + reset_type =HNAE3_FUNC_RESET ; + } -if (status &HCLGE_ROCEE_BERR_INT_MASK ) +if (status &HCLGE_ROCEE_BERR_INT_MASK ) {dev_warn (dev,"ROCEE RAS AXI bresp error\n" ); + reset_type =HNAE3_FUNC_RESET ; + }if (status &HCLGE_ROCEE_ECC_INT_MASK ) {dev_warn (dev,"ROCEE RAS 2bit ECC error\n" );
@@ -1132,9 +1135,9 @@ static int hclge_log_and_clear_rocee_ras_error(struct hclge_dev *hdev)if (ret) {dev_err (dev,"failed(%d) to process ovf error\n" , ret);/* reset everything for now */ -HCLGE_SET_DEFAULT_RESET_REQUEST (HNAE3_GLOBAL_RESET ); -return ret; +return HNAE3_GLOBAL_RESET ; } + reset_type =HNAE3_FUNC_RESET ; }/* clear error status */
@@ -1143,12 +1146,10 @@ static int hclge_log_and_clear_rocee_ras_error(struct hclge_dev *hdev)if (ret) {dev_err (dev,"failed(%d) to clear ROCEE RAS error\n" , ret);/* reset everything for now */ - reset_type =HNAE3_GLOBAL_RESET ; +return HNAE3_GLOBAL_RESET ; } -HCLGE_SET_DEFAULT_RESET_REQUEST (reset_type); - -return ret; +return reset_type; }static int hclge_config_rocee_ras_interrupt (struct hclge_dev *hdev,bool en)
@@ -1178,15 +1179,18 @@ static int hclge_config_rocee_ras_interrupt(struct hclge_dev *hdev, bool en)return ret; } -static int hclge_handle_rocee_ras_error (struct hnae3_ae_dev *ae_dev) +static void hclge_handle_rocee_ras_error (struct hnae3_ae_dev *ae_dev) { +enum hnae3_reset_type reset_type =HNAE3_NONE_RESET ;struct hclge_dev *hdev = ae_dev->priv;if (test_bit (HCLGE_STATE_RST_HANDLING , &hdev->state) || hdev->pdev->revision <0x21 ) -return HNAE3_NONE_RESET ; +return ; -return hclge_log_and_clear_rocee_ras_error (hdev); + reset_type =hclge_log_and_clear_rocee_ras_error (hdev); +if (reset_type !=HNAE3_NONE_RESET ) +HCLGE_SET_DEFAULT_RESET_REQUEST (reset_type); }static const struct hclge_hw_blk hw_blk[] = {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 95/262 veth: Fix -Wformat-truncation
In reply to Sasha LevinFrom: Florian Fainelli <[email protected]>
[ Upstream commit abdf47aab4123ece48877cab4153db44fe4dc340 ]
Provide a precision hint to snprintf() in order to eliminate a -Wformat-truncation warning provided below. A maximum of 11 characters is allowed to reach a maximum of 32 - 1 characters given a possible maximum value of queues using up to UINT_MAX which occupies 10 characters. Incidentally 11 is the number of characters for "xdp_packets" which is the largest string we append.
drivers/net/veth.c: In function 'veth_get_strings':drivers/net/veth.c:118:47: warning: '%s' directive output may be truncated writing up to 31 bytes into a region of size between 12 and 21 [-Wformat-truncation=]
snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_%s",
^~
drivers/net/veth.c:118:5: note: 'snprintf' output between 12 and 52
bytes into a destination of size 32
snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_%s",
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
i, veth_rq_stats_desc[j].desc);
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--- drivers/net/veth.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/veth.c +2 -1
@@ -115,7 +115,8 @@ static void veth_get_strings(struct net_device *dev, u32 stringset, u8 *buf) p +=sizeof (ethtool_stats_keys);for (i =0 ; i < dev->real_num_rx_queues; i++) {for (j =0 ; j <VETH_RQ_STATS_LEN ; j++) { -snprintf (p,ETH_GSTRING_LEN ,"rx_queue_%u_%s" , +snprintf (p,ETH_GSTRING_LEN , +"rx_queue_%u_%.11s" , i, veth_rq_stats_desc[j].desc); p +=ETH_GSTRING_LEN ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 96/262 e1000e: Fix -Wformat-truncation warnings
In reply to Sasha LevinFrom: Florian Fainelli <[email protected]>
[ Upstream commit 135e7245479addc6b1f5d031e3d7e2ddb3d2b109 ]
Provide precision hints to snprintf() since we know the destination buffer size of the RX/TX ring names are IFNAMSIZ + 5 - 1. This fixes the following warnings:
drivers/net/ethernet/intel/e1000e/netdev.c: In function 'e1000_request_msix':drivers/net/ethernet/intel/e1000e/netdev.c:2109:13: warning: 'snprintf' output may be truncated before the last format character [-Wformat-truncation=]
"%s-rx-0", netdev->name);
^drivers/net/ethernet/intel/e1000e/netdev.c:2107:3: note: 'snprintf' output between 6 and 21 bytes into a destination of size 20
snprintf(adapter->rx_ring->name, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
sizeof(adapter->rx_ring->name) - 1,
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
"%s-rx-0", netdev->name);
~~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/intel/e1000e/netdev.c:2125:13: warning: 'snprintf'
output may be truncated before the last format character
[-Wformat-truncation=]
"%s-tx-0", netdev->name);
^drivers/net/ethernet/intel/e1000e/netdev.c:2123:3: note: 'snprintf' output between 6 and 21 bytes into a destination of size 20
snprintf(adapter->tx_ring->name, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
sizeof(adapter->tx_ring->name) - 1,
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
"%s-tx-0", netdev->name);
~~~~~~~~~~~~~~~~~~~~~~~~--- drivers/net/ethernet/intel/e1000e/netdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/e1000e/netdev.c +2 -2
@@ -2106,7 +2106,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter)if (strlen (netdev->name) < (IFNAMSIZ -5 ))snprintf (adapter->rx_ring->name,sizeof (adapter->rx_ring->name) -1 , -"%s-rx-0" , netdev->name); +"%.14s-rx-0" , netdev->name);else memcpy (adapter->rx_ring->name, netdev->name,IFNAMSIZ ); err = request_irq(adapter->msix_entries[vector].vector,
@@ -2122,7 +2122,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter)if (strlen (netdev->name) < (IFNAMSIZ -5 ))snprintf (adapter->tx_ring->name,sizeof (adapter->tx_ring->name) -1 , -"%s-tx-0" , netdev->name); +"%.14s-tx-0" , netdev->name);else memcpy (adapter->tx_ring->name, netdev->name,IFNAMSIZ ); err = request_irq(adapter->msix_entries[vector].vector,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 97/262 mlxsw: spectrum: Avoid -Wformat-truncation warnings
In reply to Sasha LevinFrom: Florian Fainelli <[email protected]>
[ Upstream commit ab2c4e2581ad32c28627235ff0ae8c5a5ea6899f ]
Give precision identifiers to the two snprintf() formatting the priority and TC strings to avoid producing these two warnings:
drivers/net/ethernet/mellanox/mlxsw/spectrum.c: In function 'mlxsw_sp_port_get_prio_strings':drivers/net/ethernet/mellanox/mlxsw/spectrum.c:2132:37: warning: '%d' directive output may be truncated writing between 1 and 3 bytes into a region of size between 0 and 31 [-Wformat-truncation=]
snprintf(*p, ETH_GSTRING_LEN, "%s_%d",
^~
drivers/net/ethernet/mellanox/mlxsw/spectrum.c:2132:3: note: 'snprintf' output between 3 and 36 bytes into a destination of size 32
snprintf(*p, ETH_GSTRING_LEN, "%s_%d", ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
mlxsw_sp_port_hw_prio_stats[i].str, prio);
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~drivers/net/ethernet/mellanox/mlxsw/spectrum.c: In function 'mlxsw_sp_port_get_tc_strings':drivers/net/ethernet/mellanox/mlxsw/spectrum.c:2143:37: warning: '%d' directive output may be truncated writing between 1 and 11 bytes into a region of size between 0 and 31 [-Wformat-truncation=]
snprintf(*p, ETH_GSTRING_LEN, "%s_%d",
^~
drivers/net/ethernet/mellanox/mlxsw/spectrum.c:2143:3: note: 'snprintf' output between 3 and 44 bytes into a destination of size 32
snprintf(*p, ETH_GSTRING_LEN, "%s_%d", ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
mlxsw_sp_port_hw_tc_stats[i].str, tc);
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +2 -2
@@ -2105,7 +2105,7 @@ static void mlxsw_sp_port_get_prio_strings(u8 **p, int prio)int i;for (i =0 ; i <MLXSW_SP_PORT_HW_PRIO_STATS_LEN ; i++) { -snprintf (*p,ETH_GSTRING_LEN ,"%s_%d" , +snprintf (*p,ETH_GSTRING_LEN ,"%.29s_%.1d" , mlxsw_sp_port_hw_prio_stats[i].str, prio); *p +=ETH_GSTRING_LEN ; }
@@ -2116,7 +2116,7 @@ static void mlxsw_sp_port_get_tc_strings(u8 **p, int tc)int i;for (i =0 ; i <MLXSW_SP_PORT_HW_TC_STATS_LEN ; i++) { -snprintf (*p,ETH_GSTRING_LEN ,"%s_%d" , +snprintf (*p,ETH_GSTRING_LEN ,"%.29s_%.1d" , mlxsw_sp_port_hw_tc_stats[i].str, tc); *p +=ETH_GSTRING_LEN ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 98/262 i2c: Allow recovery of the initial IRQ by an I2C client device.
In reply to Sasha LevinFrom: Jim Broadus <[email protected]>
[ Upstream commit 93b6604c5a669d84e45fe5129294875bf82eb1ff ]
A previous change allowed I2C client devices to discover new IRQs upon reprobe by clearing the IRQ in i2c_device_remove. However, if an IRQ was assigned in i2c_new_device, that information is lost.
For example, the touchscreen and trackpad devices on a Dell Inspiron laptop are I2C devices whose IRQs are defined by ACPI extended IRQ types. The client device structures are initialized during an ACPI walk. After removing the i2c_hid device, modprobe fails.
This change caches the initial IRQ value in i2c_new_device and then resets the client device IRQ to the initial value in i2c_device_remove.
[wsa: this is an easy to backport fix for the regression. We will refactor the code to handle irq assignments better in general.]
--- drivers/i2c/i2c-core-base.c | 9 +++++---- include/linux/i2c.h | 1 + 2 files changed, 6 insertions(+), 4 deletions(-)
drivers/i2c/i2c-core-base.c +5 -4
@@ -430,7 +430,7 @@ static int i2c_device_remove(struct device *dev)dev_pm_clear_wake_irq (&client->dev);device_init_wakeup (&client->dev, false); - client->irq =0 ; + client->irq = client->init_irq;return status; }
@@ -741,10 +741,11 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info) client->flags = info->flags; client->addr = info->addr; - client->irq = info->irq; -if (!client->irq) - client->irq =i2c_dev_irq_from_resources (info->resources, + client->init_irq = info->irq; +if (!client->init_irq) + client->init_irq =i2c_dev_irq_from_resources (info->resources, info->num_resources); + client->irq = client->init_irq;strlcpy (client->name, info->type,sizeof (client->name));
include/linux/i2c.h +1 -0
@@ -333,6 +333,7 @@ struct i2c_client {char name[I2C_NAME_SIZE ];struct i2c_adapter *adapter;/* the adapter we sit on */ struct device dev;/* the device structure */ +int init_irq;/* irq set at initialization */ int irq;/* irq issued by device */ struct list_head detected;#if IS_ENABLED (CONFIG_I2C_SLAVE )
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 99/262 platform/x86: ideapad-laptop: Fix no_hw_rfkill_list for Lenovo RESCUER R720-15IKBN
In reply to Sasha LevinFrom: Yang Fan <[email protected]>
[ Upstream commit 4d9b2864a415fec39150bc13efc730c7eb88711e ]
Commit ae7c8cba3221 ("platform/x86: ideapad-laptop: add lenovo RESCUER R720-15IKBN to no_hw_rfkill_list") added
DMI_MATCH(DMI_BOARD_NAME, "80WW")
for Lenovo RESCUER R720-15IKBN.
But DMI_BOARD_NAME does not match 80WW on Lenovo RESCUER R720-15IKBN, thus cause Wireless LAN still be hard blocked.
On Lenovo RESCUER R720-15IKBN:
~$ cat /sys/class/dmi/id/sys_vendor
LENOVO
~$ cat /sys/class/dmi/id/board_name
Provence-5R3
~$ cat /sys/class/dmi/id/product_name
80WW
~$ cat /sys/class/dmi/id/product_version
Lenovo R720-15IKBN
So on Lenovo RESCUER R720-15IKBN:
DMI_SYS_VENDOR should match "LENOVO", DMI_BOARD_NAME should match "Provence-5R3", DMI_PRODUCT_NAME should match "80WW", DMI_PRODUCT_VERSION should match "Lenovo R720-15IKBN".
Fix it, and in according with other entries in no_hw_rfkill_list, use DMI_PRODUCT_VERSION instead of DMI_BOARD_NAME.
--- drivers/platform/x86/ideapad-laptop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/ideapad-laptop.c +1 -1
@@ -989,7 +989,7 @@ static const struct dmi_system_id no_hw_rfkill_list[] = { .ident = "Lenovo RESCUER R720-15IKBN", .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"LENOVO" ), - DMI_MATCH(DMI_BOARD_NAME, "80WW"), + DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo R720-15IKBN"), }, }, {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 100/262 platform/mellanox: mlxreg-hotplug: Fix KASAN warning
In reply to Sasha LevinFrom: Vadim Pasternak <[email protected]>
[ Upstream commit e4c275f77624961b56cce397814d9d770a45ac59 ]
Fix the following KASAN warning produced when booting a 64-bit kernel:
[ 13.334750] BUG: KASAN: stack-out-of-bounds in find_first_bit+0x19/0x70 [ 13.342166] Read of size 8 at addr ffff880235067178 by task kworker/2:1/42 [ 13.342176] CPU: 2 PID: 42 Comm: kworker/2:1 Not tainted 4.20.0-rc1+ #106 [ 13.342179] Hardware name: Mellanox Technologies Ltd. MSN2740/Mellanox x86 SFF board, BIOS 5.6.5 06/07/2016 [ 13.342190] Workqueue: events deferred_probe_work_func [ 13.342194] Call Trace: [ 13.342206] dump_stack+0xc7/0x15b [ 13.342214] ? show_regs_print_info+0x5/0x5 [ 13.342220] ? kmsg_dump_rewind_nolock+0x59/0x59 [ 13.342234] ? _raw_write_lock_irqsave+0x100/0x100 [ 13.351593] print_address_description+0x73/0x260 [ 13.351603] kasan_report+0x260/0x380 [ 13.351611] ? find_first_bit+0x19/0x70 [ 13.351619] find_first_bit+0x19/0x70 [ 13.351630] mlxreg_hotplug_work_handler+0x73c/0x920 [mlxreg_hotplug] [ 13.351639] ? __lock_text_start+0x8/0x8 [ 13.351646] ? _raw_write_lock_irqsave+0x80/0x100 [ 13.351656] ? mlxreg_hotplug_remove+0x1e0/0x1e0 [mlxreg_hotplug] [ 13.351663] ? regmap_volatile+0x40/0xb0 [ 13.351668] ? regcache_write+0x4c/0x90 [ 13.351676] ? mlxplat_mlxcpld_reg_write+0x24/0x30 [mlx_platform] [ 13.351681] ? _regmap_write+0xea/0x220 [ 13.351688] ? __mutex_lock_slowpath+0x10/0x10 [ 13.351696] ? devm_add_action+0x70/0x70 [ 13.351701] ? mutex_unlock+0x1d/0x40 [ 13.351710] mlxreg_hotplug_probe+0x82e/0x989 [mlxreg_hotplug] [ 13.351723] ? mlxreg_hotplug_work_handler+0x920/0x920 [mlxreg_hotplug] [ 13.351731] ? sysfs_do_create_link_sd.isra.2+0xf4/0x190 [ 13.351737] ? sysfs_rename_link_ns+0xf0/0xf0 [ 13.351743] ? devres_close_group+0x2b0/0x2b0 [ 13.351749] ? pinctrl_put+0x20/0x20 [ 13.351755] ? acpi_dev_pm_attach+0x2c/0xd0 [ 13.351763] platform_drv_probe+0x70/0xd0 [ 13.351771] really_probe+0x480/0x6e0 [ 13.351778] ? device_attach+0x10/0x10 [ 13.351784] ? __lock_text_start+0x8/0x8 [ 13.351790] ? _raw_write_lock_irqsave+0x80/0x100 [ 13.351797] ? _raw_write_lock_irqsave+0x80/0x100 [ 13.351806] ? __driver_attach+0x190/0x190 [ 13.351812] driver_probe_device+0x17d/0x1a0 [ 13.351819] ? __driver_attach+0x190/0x190 [ 13.351825] bus_for_each_drv+0xd6/0x130 [ 13.351831] ? bus_rescan_devices+0x20/0x20 [ 13.351837] ? __mutex_lock_slowpath+0x10/0x10 [ 13.351845] __device_attach+0x18c/0x230 [ 13.351852] ? device_bind_driver+0x70/0x70 [ 13.351859] ? __mutex_lock_slowpath+0x10/0x10 [ 13.351866] bus_probe_device+0xea/0x110 [ 13.351874] deferred_probe_work_func+0x1c9/0x290 [ 13.351882] ? driver_deferred_probe_add+0x1d0/0x1d0 [ 13.351889] ? preempt_notifier_dec+0x20/0x20 [ 13.351897] ? read_word_at_a_time+0xe/0x20 [ 13.351904] ? strscpy+0x151/0x290 [ 13.351912] ? set_work_pool_and_clear_pending+0x9c/0xf0 [ 13.351918] ? __switch_to_asm+0x34/0x70 [ 13.351924] ? __switch_to_asm+0x40/0x70 [ 13.351929] ? __switch_to_asm+0x34/0x70 [ 13.351935] ? __switch_to_asm+0x40/0x70 [ 13.351942] process_one_work+0x5cc/0xa00 [ 13.351952] ? pwq_dec_nr_in_flight+0x1e0/0x1e0 [ 13.351960] ? pci_mmcfg_check_reserved+0x80/0xb8 [ 13.351967] ? run_rebalance_domains+0x250/0x250 [ 13.351980] ? stack_access_ok+0x35/0x80 [ 13.351986] ? deref_stack_reg+0xa1/0xe0 [ 13.351994] ? schedule+0xcd/0x250 [ 13.352000] ? worker_enter_idle+0x2d6/0x330 [ 13.352006] ? __schedule+0xeb0/0xeb0 [ 13.352014] ? fork_usermode_blob+0x130/0x130 [ 13.352019] ? mutex_lock+0xa7/0x100 [ 13.352026] ? _raw_spin_lock_irq+0x98/0xf0 [ 13.352032] ? _raw_read_unlock_irqrestore+0x30/0x30 [ 13.352037] i2c i2c-2: Added multiplexed i2c bus 11 [ 13.352043] worker_thread+0x181/0xa80 [ 13.352052] ? __switch_to_asm+0x34/0x70 [ 13.352058] ? __switch_to_asm+0x40/0x70 [ 13.352064] ? process_one_work+0xa00/0xa00 [ 13.352070] ? __switch_to_asm+0x34/0x70 [ 13.352076] ? __switch_to_asm+0x40/0x70 [ 13.352081] ? __switch_to_asm+0x34/0x70 [ 13.352086] ? __switch_to_asm+0x40/0x70 [ 13.352092] ? __switch_to_asm+0x34/0x70 [ 13.352097] ? __switch_to_asm+0x40/0x70 [ 13.352105] ? __schedule+0x3d6/0xeb0 [ 13.352112] ? migrate_swap_stop+0x470/0x470 [ 13.352119] ? save_stack+0x89/0xb0 [ 13.352127] ? kmem_cache_alloc_trace+0xe5/0x570 [ 13.352132] ? kthread+0x59/0x1d0 [ 13.352138] ? ret_from_fork+0x35/0x40 [ 13.352154] ? __schedule+0xeb0/0xeb0 [ 13.352161] ? remove_wait_queue+0x150/0x150 [ 13.352169] ? _raw_write_lock_irqsave+0x80/0x100 [ 13.352175] ? __lock_text_start+0x8/0x8 [ 13.352183] ? process_one_work+0xa00/0xa00 [ 13.352188] kthread+0x1a4/0x1d0 [ 13.352195] ? kthread_create_worker_on_cpu+0xc0/0xc0 [ 13.352202] ret_from_fork+0x35/0x40
[ 13.353879] The buggy address belongs to the page: [ 13.353885] page:ffffea0008d419c0 count:0 mapcount:0 mapping:0000000000000000 index:0x0 [ 13.353890] flags: 0x2ffff8000000000() [ 13.353897] raw: 02ffff8000000000 ffffea0008d419c8 ffffea0008d419c8 0000000000000000 [ 13.353903] raw: 0000000000000000 0000000000000000 00000000ffffffff 0000000000000000 [ 13.353905] page dumped because: kasan: bad access detected
[ 13.353908] Memory state around the buggy address: [ 13.353912] ffff880235067000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 13.353917] ffff880235067080: 00 00 00 00 00 00 00 00 00 00 00 f1 f1 f1 f1 04 [ 13.353921] >ffff880235067100: f2 f2 f2 f2 f2 f2 f2 04 f2 f2 f2 f2 f2 f2 f2 04 [ 13.353923] ^ [ 13.353927] ffff880235067180: f2 f2 f2 f2 f2 f2 f2 04 f2 f2 f2 00 00 00 00 00 [ 13.353931] ffff880235067200: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 13.353933] ==================================================================
The warning is caused by the below loop:
for_each_set_bit(bit, (unsigned long *)&asserted, 8) {while "asserted" is declared as 'unsigned'.
The casting of 32-bit unsigned integer pointer to a 64-bit unsigned long pointer. There are two problems here.
It causes the access of four extra byte, which can corrupt memory The 32-bit pointer address may not be 64-bit aligned.
The fix changes variable "asserted" to "unsigned long".
--- drivers/platform/mellanox/mlxreg-hotplug.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/platform/mellanox/mlxreg-hotplug.c +3 -2
@@ -248,7 +248,8 @@ mlxreg_hotplug_work_helper(struct mlxreg_hotplug_priv_data *priv, struct mlxreg_core_item *item) {struct mlxreg_core_data *data; -u32 asserted, regval, bit; +unsigned long asserted; +u32 regval, bit;int ret;/*
@@ -281,7 +282,7 @@ mlxreg_hotplug_work_helper(struct mlxreg_hotplug_priv_data *priv, asserted = item->cache ^ regval; item->cache = regval; -for_each_set_bit (bit, (unsigned long *)&asserted,8 ) { +for_each_set_bit (bit, &asserted,8 ) { data = item->data + bit;if (regval &BIT (bit)) {if (item->inversed)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 101/262 loop: set GENHD_FL_NO_PART_SCAN after blkdev_reread_part()
In reply to Sasha LevinFrom: Dongli Zhang <[email protected]>
[ Upstream commit 758a58d0bc67457f1215321a536226654a830eeb ]
Commit 0da03cab87e6
("loop: Fix deadlock when calling blkdev_reread_part()") moves blkdev_reread_part() out of the loop_ctl_mutex. However, GENHD_FL_NO_PART_SCAN is set before __blkdev_reread_part(). As a result, __blkdev_reread_part() will fail the check of GENHD_FL_NO_PART_SCAN and will not rescan the loop device to delete all partitions.
Below are steps to reproduce the issue:
step1 # dd if=/dev/zero of=tmp.raw bs=1M count=100 step2 # losetup -P /dev/loop0 tmp.raw
step3 # parted /dev/loop0 mklabel gpt
step4 # parted -a none -s /dev/loop0 mkpart primary 64s 1 step5 # losetup -d /dev/loop0
Step5 will not be able to delete /dev/loop0p1 (introduced by step4) and there is below kernel warning message:
[ 464.414043] __loop_clr_fd: partition scan of loop0 failed (rc=-22)
This patch sets GENHD_FL_NO_PART_SCAN after blkdev_reread_part().
--- drivers/block/loop.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
drivers/block/loop.c +17 -4
@@ -1089,16 +1089,12 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)kobject_uevent (&disk_to_dev (bdev->bd_disk)->kobj,KOBJ_CHANGE ); }mapping_set_gfp_mask (filp->f_mapping, gfp); - lo->lo_state = Lo_unbound;/* This is safe: open() is still holding a reference. */ module_put (THIS_MODULE );blk_mq_unfreeze_queue (lo->lo_queue); partscan = lo->lo_flags &LO_FLAGS_PARTSCAN && bdev; lo_number = lo->lo_number; - lo->lo_flags =0 ; -if (!part_shift) - lo->lo_disk->flags |=GENHD_FL_NO_PART_SCAN ;loop_unprepare_queue (lo); out_unlock:mutex_unlock (&loop_ctl_mutex);
@@ -1120,6 +1116,23 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)/* Device is gone, no point in returning error */ err =0 ; } + +/* +* lo->lo_state is set to Lo_unbound here after above partscan has +* finished. +* +* There cannot be anybody else entering __loop_clr_fd() as +* lo->lo_backing_file is already cleared and Lo_rundown state +* protects us from all the other places trying to change the 'lo' +* device. +*/ +mutex_lock (&loop_ctl_mutex); + lo->lo_flags =0 ; +if (!part_shift) + lo->lo_disk->flags |=GENHD_FL_NO_PART_SCAN ; + lo->lo_state = Lo_unbound; +mutex_unlock (&loop_ctl_mutex); +/* * Need not hold loop_ctl_mutex to fput backing file. * Calling fput holding loop_ctl_mutex triggers a circular
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 102/262 i2c: designware: Do not allow i2c_dw_xfer() calls while suspended
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 2751541555382dfa7661bcfaac3ee0fac49f505d ]
On most Intel Bay- and Cherry-Trail systems the PMIC is connected over I2C and the PMIC is accessed through various means by the _PS0 and _PS3 ACPI methods (power on / off methods) of various devices.
This leads to suspend/resume ordering problems where a device may be resumed and get its _PS0 method executed before the I2C controller is resumed. On Cherry Trail this leads to errors like these:
i2c_designware 808622C1:06: controller timed out
ACPI Error: AE_ERROR, Returned by Handler for [UserDefinedRegion] ACPI Error: Method parse/execution failed \_SB.P18W._ON, AE_ERROR video LNXVIDEO:00: Failed to change power state to D0
But on Bay Trail this caused I2C reads to seem to succeed, but they end up returning wrong data, which ends up getting written back by the typical read-modify-write cycle done to turn on various power-resources.
Debugging the problems caused by this silent data corruption is quite nasty. This commit adds a check which disallows i2c_dw_xfer() calls to happen until the controller's resume method has completed.
Which turns the silent data corruption into getting these errors in dmesg instead:
i2c_designware 80860F41:04: Error i2c_dw_xfer call while suspended ACPI Error: AE_ERROR, Returned by Handler for [UserDefinedRegion] ACPI Error: Method parse/execution failed \_SB.PCI0.GFX0._PS0, AE_ERROR
Which is much better.
Note the above errors are an example of issues which this patch will help to debug, the actual fix requires fixing the suspend order and this has been fixed by a different commit.
Note the setting / clearing of the suspended flag in the suspend / resume methods is NOT protected by i2c_lock_bus(). This is intentional as these methods get called from i2c_dw_xfer() (through pm_runtime_get/put) a nd i2c_dw_xfer() is called with the i2c_bus_lock held, so otherwise we would deadlock. This means that there is a theoretical race between a non runtime suspend and the suspended check in i2c_dw_xfer(), this is not a problem since normally we should not hit the race and this check is primarily a debugging tool so hitting the check if there are suspend/resume ordering problems does not need to be 100% reliable.
--- drivers/i2c/busses/i2c-designware-core.h | 2 ++ drivers/i2c/busses/i2c-designware-master.c | 6 ++++++ drivers/i2c/busses/i2c-designware-pcidrv.c | 7 ++++++- drivers/i2c/busses/i2c-designware-platdrv.c | 3 +++ 4 files changed, 17 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-designware-core.h +2 -0
@@ -215,6 +215,7 @@* @disable_int: function to disable all interrupts * @init: function to initialize the I2C hardware * @mode: operation mode - DW_IC_MASTER or DW_IC_SLAVE +* @suspended: set to true if the controller is suspended * * HCNT and LCNT parameters can be used if the platform knows more accurate * values than the one computed based only on the input clock frequency.
@@ -270,6 +271,7 @@ struct dw_i2c_dev {int (*set_sda_hold_time)(struct dw_i2c_dev *dev);int mode;struct i2c_bus_recovery_info rinfo; +bool suspended; };#define ACCESS_SWAP 0x00000001
drivers/i2c/busses/i2c-designware-master.c +6 -0
@@ -426,6 +426,12 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)pm_runtime_get_sync (dev->dev); +if (dev->suspended) { +dev_err (dev->dev,"Error %s call while suspended\n" , __func__); + ret = -ESHUTDOWN ; + goto done_nolock; + } +reinit_completion (&dev->cmd_complete); dev->msgs = msgs; dev->msgs_num = num;
drivers/i2c/busses/i2c-designware-pcidrv.c +6 -1
@@ -176,6 +176,7 @@ static int i2c_dw_pci_suspend(struct device *dev)struct pci_dev *pdev =to_pci_dev (dev);struct dw_i2c_dev *i_dev =pci_get_drvdata (pdev); + i_dev->suspended = true; i_dev->disable (i_dev);return 0 ;
@@ -185,8 +186,12 @@ static int i2c_dw_pci_resume(struct device *dev) {struct pci_dev *pdev =to_pci_dev (dev);struct dw_i2c_dev *i_dev =pci_get_drvdata (pdev); +int ret; -return i_dev->init (i_dev); + ret = i_dev->init (i_dev); + i_dev->suspended = false; + +return ret; }#endif
drivers/i2c/busses/i2c-designware-platdrv.c +3 -0
@@ -454,6 +454,8 @@ static int dw_i2c_plat_suspend(struct device *dev) {struct dw_i2c_dev *i_dev =dev_get_drvdata (dev); + i_dev->suspended = true; +if (i_dev->shared_with_punit)return 0 ;
@@ -471,6 +473,7 @@ static int dw_i2c_plat_resume(struct device *dev)i2c_dw_prepare_clk (i_dev, true); i_dev->init (i_dev); + i_dev->suspended = false;return 0 ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 103/262 IB/mlx4: Increase the timeout for CM cache
In reply to Sasha LevinFrom: Håkon Bugge <[email protected]>
[ Upstream commit 2612d723aadcf8281f9bf8305657129bd9f3cd57 ]
Using CX-3 virtual functions, either from a bare-metal machine or pass-through from a VM, MAD packets are proxied through the PF driver.
Since the VF drivers have separate name spaces for MAD Transaction Ids (TIDs), the PF driver has to re-map the TIDs and keep the book keeping in a cache.
Following the RDMA Connection Manager (CM) protocol, it is clear when an entry has to evicted form the cache. But life is not perfect, remote peers may die or be rebooted. Hence, it's a timeout to wipe out a cache entry, when the PF driver assumes the remote peer has gone.
During workloads where a high number of QPs are destroyed concurrently, excessive amount of CM DREQ retries has been observed
The problem can be demonstrated in a bare-metal environment, where two nodes have instantiated 8 VFs each. This using dual ported HCAs, so we have 16 vPorts per physical server.
64 processes are associated with each vPort and creates and destroys one QP for each of the remote 64 processes. That is, 1024 QPs per vPort, all in all 16K QPs. The QPs are created/destroyed using the CM.
When tearing down these 16K QPs, excessive CM DREQ retries (and duplicates) are observed. With some cat/paste/awk wizardry on the infiniband_cm sysfs, we observe as sum of the 16 vPorts on one of the nodes:
cm_rx_duplicates:
dreq 2102
cm_rx_msgs:
drep 1989
dreq 6195
rep 3968
req 4224
rtu 4224
cm_tx_msgs:
drep 4093
dreq 27568
rep 4224
req 3968
rtu 3968
cm_tx_retries:
dreq 23469Note that the active/passive side is equally distributed between the two nodes.
Enabling pr_debug in cm.c gives tons of:
[171778.814239] <mlx4_ib> mlx4_ib_multiplex_cm_handler: id{slave:1,sl_cm_id: 0xd393089f} is NULL!
By increasing the CM_CLEANUP_CACHE_TIMEOUT from 5 to 30 seconds, the tear-down phase of the application is reduced from approximately 90 to 50 seconds. Retries/duplicates are also significantly reduced:
cm_rx_duplicates:
dreq 2460
[]
cm_tx_retries:
dreq 3010
req 47Increasing the timeout further didn't help, as these duplicates and retries stems from a too short CMA timeout, which was 20 (~4 seconds) on the systems. By increasing the CMA timeout to 22 (~17 seconds), the numbers fell down to about 10 for both of them.
Adjustment of the CMA timeout is not part of this commit.
--- drivers/infiniband/hw/mlx4/cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/mlx4/cm.c +1 -1
@@ -39,7 +39,7 @@#include "mlx4_ib.h" -#define CM_CLEANUP_CACHE_TIMEOUT (5 * HZ) +#define CM_CLEANUP_CACHE_TIMEOUT (30 * HZ)struct id_map_entry {struct rb_node node;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 104/262 clk: fractional-divider: check parent rate only if flag is set
In reply to Sasha LevinFrom: Katsuhiro Suzuki <[email protected]>
[ Upstream commit d13501a2bedfbea0983cc868d3f1dc692627f60d ]
Custom approximation of fractional-divider may not need parent clock rate checking. For example Rockchip SoCs work fine using grand parent clock rate even if target rate is greater than parent.
This patch checks parent clock rate only if CLK_SET_RATE_PARENT flag is set.
For detailed example, clock tree of Rockchip I2S audio hardware.
- Clock rate of CPLL is 1.2GHz, GPLL is 491.52MHz.
- i2s1_div is integer divider can divide N (N is 1~128). Input clock is CPLL or GPLL. Initial divider value is N = 1. Ex) PLL = CPLL, N = 10, i2s1_div output rate is CPLL / 10 = 1.2GHz / 10 = 120MHz
- i2s1_frac is fractional divider can divide input to x/y, x and y are 16bit integer.
CPLL --> | selector | ---> i2s1_div -+--> | selector | --> I2S1 MCLK
GPLL --> | | ,--------------' | |
`--> i2s1_frac ---> | |Clock mux system try to choose suitable one from i2s1_div and i2s1_frac for master clock (MCLK) of I2S1.
Bad scenario as follows:
- Try to set MCLK to 8.192MHz (32kHz audio replay) Candidate setting is
- i2s1_div: GPLL / 60 = 8.192MHz
i2s1_div candidate is exactly same as target clock rate, so mux choose this clock source. i2s1_div output rate is changed 491.52MHz -> 8.192MHz
- After that try to set to 11.2896MHz (44.1kHz audio replay) Candidate settings are
- i2s1_div : CPLL / 107 = 11.214945MHz
- i2s1_frac: i2s1_div = 8.192MHz
This is because clk_fd_round_rate() thinks target rate (11.2896MHz) is higher than parent rate (i2s1_div = 8.192MHz) and returns parent clock rate.
Above is current upstreamed behavior. Clock mux system choose i2s1_div, but this clock rate is not acceptable for I2S driver, so users cannot replay audio.
Expected behavior is:
- Try to set master clock to 11.2896MHz (44.1kHz audio replay) Candidate settings are
- i2s1_div : CPLL / 107 = 11.214945MHz
- i2s1_frac: i2s1_div * 147/6400 = 11.2896MHz Change i2s1_div to GPLL / 1 = 491.52MHz at same time.
If apply this commit, clk_fd_round_rate() calls custom approximate function of Rockchip even if target rate is higher than parent. Custom function changes both grand parent (i2s1_div) and parent (i2s_frac) settings at same time. Clock mux system can choose i2s1_frac and audio works fine.
--- drivers/clk/clk-fractional-divider.c | 2 +- include/linux/clk-provider.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/clk/clk-fractional-divider.c +1 -1
@@ -79,7 +79,7 @@ static long clk_fd_round_rate(struct clk_hw *hw, unsigned long rate,unsigned long m, n;u64 ret; -if (!rate || rate >= *parent_rate) +if (!rate || (!clk_hw_can_set_rate_parent (hw) && rate >= *parent_rate))return *parent_rate;if (fd->approximation)
include/linux/clk-provider.h +3 -0
@@ -792,6 +792,9 @@ unsigned int __clk_get_enable_count(struct clk *clk);unsigned long clk_hw_get_rate (const struct clk_hw *hw);unsigned long __clk_get_flags (struct clk *clk);unsigned long clk_hw_get_flags (const struct clk_hw *hw); +#define clk_hw_can_set_rate_parent (hw) \ + (clk_hw_get_flags((hw)) & CLK_SET_RATE_PARENT) +bool clk_hw_is_prepared (const struct clk_hw *hw);bool clk_hw_rate_is_protected (const struct clk_hw *hw);bool clk_hw_is_enabled (const struct clk_hw *hw);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 105/262 perf annotate: Fix getting source line failure
In reply to Sasha LevinFrom: Wei Li <[email protected]>
[ Upstream commit 11db1ad4513d6205d2519e1a30ff4cef746e3243 ]
The output of "perf annotate -l --stdio xxx" changed since commit 425859ff0de33 ("perf annotate: No need to calculate notes->start twice") removed notes->start assignment in symbol__calc_lines(). It will get failed in find_address_in_section() from symbol__tty_annotate() subroutine as the a2l->addr is wrong. So the annotate summary doesn't report the line number of source code correctly.
Before fix:
liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ cat common_while_1.c
void hotspot_1(void)
{
volatile int i;for (i = 0; i < 0x10000000; i++); for (i = 0; i < 0x10000000; i++); for (i = 0; i < 0x10000000; i++);
}
int main(void)
{
hotspot_1();
return 0;
}
liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ gcc common_while_1.c -g -o common_while_1liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ sudo ./perf record ./common_while_1 [ perf record: Woken up 2 times to write data ] [ perf record: Captured and wrote 0.488 MB perf.data (12498 samples) ] liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ sudo ./perf annotate -l -s hotspot_1 --stdio
Sorted summary for file /home/liwei/main_code/hulk_work/hulk/tools/perf/common_while_1
----------------------------------------------
19.30 common_while_1[32]
19.03 common_while_1[4e]
19.01 common_while_1[16]
5.04 common_while_1[13]
4.99 common_while_1[4b]
4.78 common_while_1[2c]
4.77 common_while_1[10]
4.66 common_while_1[2f]
4.59 common_while_1[51]
4.59 common_while_1[35]
4.52 common_while_1[19]
4.20 common_while_1[56]
0.51 common_while_1[48]
Percent | Source code & Disassembly of common_while_1 for cycles:ppp (12480 samples, percent: local period)
-----------------------------------------------------------------------------------------------------------------
:
:
:
: Disassembly of section .text:
:
: 00000000000005fa <hotspot_1>:
: hotspot_1():
: void hotspot_1(void)
: {
0.00 : 5fa: push %rbp
0.00 : 5fb: mov %rsp,%rbp
: volatile int i;
:
: for (i = 0; i < 0x10000000; i++);
0.00 : 5fe: movl $0x0,-0x4(%rbp)
0.00 : 605: jmp 610 <hotspot_1+0x16>
0.00 : 607: mov -0x4(%rbp),%eax
common_while_1[10] 4.77 : 60a: add $0x1,%eax
common_while_1[13] 5.04 : 60d: mov %eax,-0x4(%rbp)
common_while_1[16] 19.01 : 610: mov -0x4(%rbp),%eax
common_while_1[19] 4.52 : 613: cmp $0xfffffff,%eax
0.00 : 618: jle 607 <hotspot_1+0xd>
: for (i = 0; i < 0x10000000; i++);
...After fix:
liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ sudo ./perf record ./common_while_1 [ perf record: Woken up 2 times to write data ] [ perf record: Captured and wrote 0.488 MB perf.data (12500 samples) ] liwei@euler:~/main_code/hulk_work/hulk/tools/perf$ sudo ./perf annotate -l -s hotspot_1 --stdio
Sorted summary for file /home/liwei/main_code/hulk_work/hulk/tools/perf/common_while_1
----------------------------------------------
33.34 common_while_1.c:5
33.34 common_while_1.c:6
33.32 common_while_1.c:7
Percent | Source code & Disassembly of common_while_1 for cycles:ppp (12482 samples, percent: local period)
-----------------------------------------------------------------------------------------------------------------
:
:
:
: Disassembly of section .text:
:
: 00000000000005fa <hotspot_1>:
: hotspot_1():
: void hotspot_1(void)
: {
0.00 : 5fa: push %rbp
0.00 : 5fb: mov %rsp,%rbp
: volatile int i;
:
: for (i = 0; i < 0x10000000; i++);
0.00 : 5fe: movl $0x0,-0x4(%rbp)
0.00 : 605: jmp 610 <hotspot_1+0x16>
0.00 : 607: mov -0x4(%rbp),%eax
common_while_1.c:5 4.70 : 60a: add $0x1,%eax
4.89 : 60d: mov %eax,-0x4(%rbp)
common_while_1.c:5 19.03 : 610: mov -0x4(%rbp),%eax
common_while_1.c:5 4.72 : 613: cmp $0xfffffff,%eax
0.00 : 618: jle 607 <hotspot_1+0xd>
: for (i = 0; i < 0x10000000; i++);
0.00 : 61a: movl $0x0,-0x4(%rbp)
0.00 : 621: jmp 62c <hotspot_1+0x32>
0.00 : 623: mov -0x4(%rbp),%eax
common_while_1.c:6 4.54 : 626: add $0x1,%eax
4.73 : 629: mov %eax,-0x4(%rbp)
common_while_1.c:6 19.54 : 62c: mov -0x4(%rbp),%eax
common_while_1.c:6 4.54 : 62f: cmp $0xfffffff,%eax
...--- tools/perf/util/annotate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/annotate.c +2 -2
@@ -1889,6 +1889,7 @@ int symbol__annotate(struct symbol *sym, struct map *map,struct annotation_options *options, struct arch **parch) { + struct annotation *notes = symbol__annotation(sym); struct annotate_args args = { .privsize = privsize, .evsel = evsel,
@@ -1919,6 +1920,7 @@ int symbol__annotate(struct symbol *sym, struct map *map, args.ms.map = map; args.ms.sym = sym; + notes->start =map__rip_2objdump (map, sym->start);return symbol__disassemble (sym, &args); }
@@ -2794,8 +2796,6 @@ int symbol__annotate2(struct symbol *sym, struct map *map, struct perf_evsel *evsymbol__calc_percent (sym, evsel); - notes->start =map__rip_2objdump (map, sym->start); -annotation__set_offsets (notes, size);annotation__mark_jump_targets (notes, sym);annotation__compute_ipc (notes, size);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 106/262 powerpc/44x: Force PCI on for CURRITUCK
In reply to Sasha LevinFrom: Michael Ellerman <[email protected]>
[ Upstream commit aa7150ba378650d0e9d84b8e4d805946965a5926 ]
The recent rework of PCI kconfig symbols exposed an existing bug in the CURRITUCK kconfig logic.
It selects PPC4xx_PCI_EXPRESS which depends on PCI, but PCI is user selectable and might be disabled, leading to a warning:
WARNING: unmet direct dependencies detected for PPC4xx_PCI_EXPRESS
Depends on [n]: PCI [=n] && 4xx [=y]
Selected by [y]:
- CURRITUCK [=y] && PPC_47x [=y]
Prior to commit eb01d42a7778 ("PCI: consolidate PCI config entry in drivers/pci") PCI was enabled by default for currituck_defconfig so we didn't see the warning. The bad logic was still there, it just required someone disabling PCI in their .config to hit it.
Fix it by forcing PCI on for CURRITUCK, which seems was always the expectation anyway.
--- arch/powerpc/platforms/44x/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/platforms/44x/Kconfig +1 -0
@@ -180,6 +180,7 @@ config CURRITUCK depends on PPC_47x select SWIOTLB select 476FPE + select FORCE_PCI select PPC4xx_PCI_EXPRESS help This option enables support for the IBM Currituck (476fpe) evaluation board
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 107/262 ASoC: qcom: Fix of-node refcount unbalance in apq8016_sbc_parse_of()
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit 8d1667200850f8753c0265fa4bd25c9a6e5f94ce ]
The apq8016 driver leaves the of-node refcount at aborting from the loop of for_each_child_of_node() in the error path. Not only the iterator node of for_each_child_of_node(), the children nodes referred from it for codec and cpu have to be properly unreferenced.
--- sound/soc/qcom/apq8016_sbc.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
sound/soc/qcom/apq8016_sbc.c +16 -5
@@ -164,41 +164,52 @@ static struct apq8016_sbc_data *apq8016_sbc_parse_of(struct snd_soc_card *card)if (!cpu || !codec) {dev_err (dev,"Can't find cpu/codec DT node\n" ); -return ERR_PTR (-EINVAL ); + ret = -EINVAL ; + goto error; } link->cpu_of_node =of_parse_phandle (cpu,"sound-dai" ,0 );if (!link->cpu_of_node) {dev_err (card->dev,"error getting cpu phandle\n" ); -return ERR_PTR (-EINVAL ); + ret = -EINVAL ; + goto error; } ret =snd_soc_of_get_dai_name (cpu, &link->cpu_dai_name);if (ret) {dev_err (card->dev,"error getting cpu dai name\n" ); -return ERR_PTR (ret); + goto error; } ret =snd_soc_of_get_dai_link_codecs (dev, codec, link);if (ret <0 ) {dev_err (card->dev,"error getting codec dai name\n" ); -return ERR_PTR (ret); + goto error; } link->platform_of_node = link->cpu_of_node; ret =of_property_read_string (np,"link-name" , &link->name);if (ret) {dev_err (card->dev,"error getting codec dai_link name\n" ); -return ERR_PTR (ret); + goto error; } link->stream_name = link->name; link->init = apq8016_sbc_dai_init; link++; + +of_node_put (cpu); +of_node_put (codec); }return data; + + error: +of_node_put (np); +of_node_put (cpu); +of_node_put (codec); +return ERR_PTR (ret); }static const struct snd_soc_dapm_widget apq8016_sbc_dapm_widgets[] = {
Signature · 1 line
2.19.1
Re: [PATCH AUTOSEL 5.0 107/262] ASoC: qcom: Fix of-node refcount unbalance in apq8016_sbc_parse_of()
Quoted 8 lines · Sasha Levin
From: Takashi Iwai <[email protected]>
[ Upstream commit
8d1667200850f8753c0265fa4bd25c9a6e5f94ce]The apq8016 driver leaves the of-node refcount at aborting from the loop of
for_each_child_of_node()in the error path. Not only the iterator node offor_each_child_of_node(), the children nodes referred from it for codec and cpu have to be properly unreferenced.
Given that the device tree is entirely static on all platforms using FDT I'm not convinced that it is sensible to backport any of the fixes for references not being dropped that are more than one liners, realistically nothing is ever going to notice the extra references but there are things that will notice if we underflow references so there's some risk we could break things somehow. Seems like it's all risk for zero benefit.
Sasha Levin
maintainerRe: [PATCH AUTOSEL 5.0 107/262] ASoC: qcom: Fix of-node refcount unbalance in apq8016_sbc_parse_of()
Quoted 10 lines · Mark Brown
Quoted 8 lines · Sasha Levin
From: Takashi Iwai <[email protected]>
[ Upstream commit
8d1667200850f8753c0265fa4bd25c9a6e5f94ce]The apq8016 driver leaves the of-node refcount at aborting from the loop of
for_each_child_of_node()in the error path. Not only the iterator node offor_each_child_of_node(), the children nodes referred from it for codec and cpu have to be properly unreferenced.
Quoted 7 lines
Given that the device tree is entirely static on all platforms using FDT I'm not convinced that it is sensible to backport any of the fixes for references not being dropped that are more than one liners, realistically nothing is ever going to notice the extra references but there are things that will notice if we underflow references so there's some risk we could break things somehow. Seems like it's all risk for zero benefit.
Fair enough, I'll drop it. Thanks!
--
Thanks,
Sasha
Sasha Levin
maintainerPATCH 108/262 ASoC: qcom: Fix of-node refcount unbalance in qcom_snd_parse_of()
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit 70b773219a32c7b8f3e53e041bc023ad99fd81f4 ]
Although qcom_snd_parse_of() tries to manage the of-node refcount, there are still a few places that lead to the unblanced refcount in the error code path. Namely,
- for_each_child_of_node() needs to unreference the iterator node if aborting the loop in the middle,
- cpu, codec and platform node objects have to be unreferenced at each iteration,
- platform and codec node objects have to be referred before jumping to the error handling code that unreference them unconditionally.
This patch tries to address these by moving the assignment of platform and codec node objects to the beginning of the loop and adding the of_node_put() calls adequately.
--- sound/soc/qcom/common.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
sound/soc/qcom/common.c +8 -2
@@ -42,6 +42,9 @@ int qcom_snd_parse_of(struct snd_soc_card *card) link = card->dai_link;for_each_child_of_node (dev->of_node, np) { cpu =of_get_child_by_name (np,"cpu" ); + platform =of_get_child_by_name (np,"platform" ); + codec =of_get_child_by_name (np,"codec" ); +if (!cpu) {dev_err (dev,"Can't find cpu DT node\n" ); ret = -EINVAL ;
@@ -63,8 +66,6 @@ int qcom_snd_parse_of(struct snd_soc_card *card) goto err; } - platform =of_get_child_by_name (np,"platform" ); - codec =of_get_child_by_name (np,"codec" );if (codec && platform) { link->platform_of_node = of_parse_phandle(platform, "sound-dai",
@@ -100,10 +101,15 @@ int qcom_snd_parse_of(struct snd_soc_card *card) link->dpcm_capture =1 ; link->stream_name = link->name; link++; + +of_node_put (cpu); +of_node_put (codec); +of_node_put (platform); }return 0 ; err: +of_node_put (np);of_node_put (cpu);of_node_put (codec);of_node_put (platform);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 109/262 cpufreq: acpi-cpufreq: Report if CPU doesn't support boost technologies
In reply to Sasha LevinFrom: Erwan Velu <[email protected]>
[ Upstream commit 1222d527f314c86a3b59a522115d62facc5a7965 ]
There is some rare cases where CPB (and possibly IDA) are missing on processors.
This is the case fixed by commit f7f3dc00f612 ("x86/cpu/AMD: Fix erratum 1076 (CPB bit)") and following.
In such context, the boost status isn't reported by /sys/devices/system/cpu/cpufreq/boost.
This commit is about printing a message to report that the CPU doesn't expose the boost capabilities.
This message could help debugging platforms hit by this phenomena.
--- drivers/cpufreq/acpi-cpufreq.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/cpufreq/acpi-cpufreq.c +3 -1
@@ -916,8 +916,10 @@ static void __init acpi_cpufreq_boost_init(void) {int ret; -if (!(boot_cpu_has (X86_FEATURE_CPB ) ||boot_cpu_has (X86_FEATURE_IDA ))) +if (!(boot_cpu_has (X86_FEATURE_CPB ) ||boot_cpu_has (X86_FEATURE_IDA ))) { +pr_debug ("Boost capabilities not present in the processor\n" );return ; + } acpi_cpufreq_driver.set_boost = set_boost; acpi_cpufreq_driver.boost_enabled =boost_state (0 );
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 110/262 efi: cper: Fix possible out-of-bounds access
In reply to Sasha LevinFrom: Ross Lagerwall <[email protected]>
[ Upstream commit 45b14a4ffcc1e0b5caa246638f942cbe7eaea7ad ]
When checking a generic status block, we iterate over all the generic data blocks. The loop condition only checks that the start of the generic data block is valid (within estatus->data_length) but not the whole block. Because the size of data blocks (excluding error data) may vary depending on the revision and the revision is contained within the data block, ensure that enough of the current data block is valid before dereferencing any members otherwise an out-of-bounds access may occur if estatus->data_length is invalid.
This relies on the fact that struct acpi_hest_generic_data_v300 is a superset of the earlier version. Also rework the other checks to avoid potential underflow.
--- drivers/firmware/efi/cper.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/firmware/efi/cper.c +9 -4
@@ -546,19 +546,24 @@ EXPORT_SYMBOL_GPL(cper_estatus_check_header);int cper_estatus_check (const struct acpi_hest_generic_status *estatus) {struct acpi_hest_generic_data *gdata; -unsigned int data_len, gedata_len; +unsigned int data_len, record_size;int rc; rc =cper_estatus_check_header (estatus);if (rc)return rc; + data_len = estatus->data_length;apei_estatus_for_each_section (estatus, gdata) { - gedata_len =acpi_hest_get_error_length (gdata); -if (gedata_len > data_len -acpi_hest_get_size (gdata)) +if (sizeof (struct acpi_hest_generic_data ) > data_len) +return -EINVAL ; + + record_size =acpi_hest_get_record_size (gdata); +if (record_size > data_len)return -EINVAL ; - data_len -=acpi_hest_get_record_size (gdata); + + data_len -= record_size; }if (data_len)return -EINVAL ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 111/262 s390/ism: ignore some errors during deregistration
In reply to Sasha LevinFrom: Sebastian Ott <[email protected]>
[ Upstream commit 0ff06c44efeede4acd068847d3bf8cf894b6c664 ]
Prior to dma unmap/free operations the ism driver tries to ensure that the memory is no longer accessed by the HW. When errors during deregistration of memory regions from the HW occur the ism driver will not unmap/free this memory.
When we receive notification from the hypervisor that a PCI function has been detached we can no longer access the device and would never unmap/free these memory regions which led to complaints by the DMA debug API.
Treat this kind of errors during the deregistration of memory regions from the HW as success since it is already ensured that the memory is no longer accessed by HW.
--- drivers/s390/net/ism_drv.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/s390/net/ism_drv.c +9 -3
@@ -141,10 +141,13 @@ static int register_ieq(struct ism_dev *ism)static int unregister_sba (struct ism_dev *ism) { +int ret; +if (!ism->sba)return 0 ; -if (ism_cmd_simple (ism,ISM_UNREG_SBA )) + ret =ism_cmd_simple (ism,ISM_UNREG_SBA ); +if (ret && ret !=ISM_ERROR )return -EIO ; dma_free_coherent(&ism->pdev->dev, PAGE_SIZE,
@@ -158,10 +161,13 @@ static int unregister_sba(struct ism_dev *ism)static int unregister_ieq (struct ism_dev *ism) { +int ret; +if (!ism->ieq)return 0 ; -if (ism_cmd_simple (ism,ISM_UNREG_IEQ )) + ret =ism_cmd_simple (ism,ISM_UNREG_IEQ ); +if (ret && ret !=ISM_ERROR )return -EIO ; dma_free_coherent(&ism->pdev->dev, PAGE_SIZE,
@@ -287,7 +293,7 @@ static int ism_unregister_dmb(struct smcd_dev *smcd, struct smcd_dmb *dmb) cmd.request.dmb_tok = dmb->dmb_tok; ret =ism_cmd (ism, &cmd); -if (ret) +if (ret && ret !=ISM_ERROR ) goto out;ism_free_dmb (ism, dmb);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 112/262 scsi: megaraid_sas: return error when create DMA pool failed
In reply to Sasha LevinFrom: Jason Yan <[email protected]>
[ Upstream commit bcf3b67d16a4c8ffae0aa79de5853435e683945c ]
when create DMA pool for cmd frames failed, we should return -ENOMEM, instead of 0.
In some case in:
megasas_init_adapter_fusion()
-->megasas_alloc_cmds()
-->megasas_create_frame_pool
create DMA pool failed,
--> megasas_free_cmds() [1]
-->megasas_alloc_cmds_fusion()
failed, then goto fail_alloc_cmds.
-->megasas_free_cmds() [2]we will call megasas_free_cmds twice, [1] will kfree cmd_list,
[2] will use cmd_list.it will cause a problem:
Unable to handle kernel NULL pointer dereference at virtual address
00000000
pgd = ffffffc000f70000
[00000000] *pgd=0000001fbf893003, *pud=0000001fbf893003, *pmd=0000001fbf894003, *pte=006000006d000707
Internal error: Oops: 96000005 [#1] SMP Modules linked in: CPU: 18 PID: 1 Comm: swapper/0 Not tainted task: ffffffdfb9290000 ti: ffffffdfb923c000 task.ti: ffffffdfb923c000 PC is at megasas_free_cmds+0x30/0x70 LR is at megasas_free_cmds+0x24/0x70 ... Call trace: [<ffffffc0005b779c>] megasas_free_cmds+0x30/0x70 [<ffffffc0005bca74>] megasas_init_adapter_fusion+0x2f4/0x4d8 [<ffffffc0005b926c>] megasas_init_fw+0x2dc/0x760 [<ffffffc0005b9ab0>] megasas_probe_one+0x3c0/0xcd8 [<ffffffc0004a5abc>] local_pci_probe+0x4c/0xb4 [<ffffffc0004a5c40>] pci_device_probe+0x11c/0x14c [<ffffffc00053a5e4>] driver_probe_device+0x1ec/0x430 [<ffffffc00053a92c>] __driver_attach+0xa8/0xb0 [<ffffffc000538178>] bus_for_each_dev+0x74/0xc8 [<ffffffc000539e88>] driver_attach+0x28/0x34 [<ffffffc000539a18>] bus_add_driver+0x16c/0x248 [<ffffffc00053b234>] driver_register+0x6c/0x138 [<ffffffc0004a5350>] __pci_register_driver+0x5c/0x6c [<ffffffc000ce3868>] megasas_init+0xc0/0x1a8 [<ffffffc000082a58>] do_one_initcall+0xe8/0x1ec [<ffffffc000ca7be8>] kernel_init_freeable+0x1c8/0x284 [<ffffffc0008d90b8>] kernel_init+0x1c/0xe4
--- drivers/scsi/megaraid/megaraid_sas_base.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/megaraid/megaraid_sas_base.c +1 -0
@@ -4188,6 +4188,7 @@ int megasas_alloc_cmds(struct megasas_instance *instance)if (megasas_create_frame_pool (instance)) {dev_printk (KERN_DEBUG , &instance->pdev->dev,"Error creating frame DMA pool\n" );megasas_free_cmds (instance); +return -ENOMEM ; }return 0 ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 113/262 scsi: fcoe: make use of fip_mode enum complete
In reply to Sasha LevinFrom: Sedat Dilek <[email protected]>
[ Upstream commit 8beb90aaf334a6efa3e924339926b5f93a234dbb ]
commit 1917d42d14b7 ("fcoe: use enum for fip_mode") introduces a separate enum for the fip_mode that shall be used during initialisation handling until it is passed to fcoe_ctrl_link_up to set the initial fip_state. That change was incomplete and gcc quietly converted in various places between the fip_mode and the fip_state enum values with implicit enum conversions, which fortunately cannot cause any issues in the actual code's execution.
clang however warns about these implicit enum conversions in the scsi drivers. This commit consolidates the use of the two enums, guided by clang's enum-conversion warnings.
This commit now completes the use of the fip_mode: It expects and uses fip_mode in {bnx2fc,fcoe}_interface_create and fcoe_ctlr_init, and it calls fcoe_ctrl_set_set() with the correct values in fcoe_ctlr_link_up(). It also breaks the association between FIP_MODE_AUTO and FIP_ST_AUTO to indicate these two enums are distinct.
--- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +- drivers/scsi/fcoe/fcoe.c | 2 +- drivers/scsi/fcoe/fcoe_ctlr.c | 7 +++++-- drivers/scsi/fcoe/fcoe_transport.c | 2 +- drivers/scsi/qedf/qedf_main.c | 2 +- include/scsi/libfcoe.h | 4 ++-- 6 files changed, 11 insertions(+), 8 deletions(-)
drivers/scsi/bnx2fc/bnx2fc_fcoe.c +1 -1
@@ -1438,7 +1438,7 @@ static struct bnx2fc_hba *bnx2fc_hba_create(struct cnic_dev *cnic)static struct bnx2fc_interface *bnx2fc_interface_create (struct bnx2fc_hba *hba,struct net_device *netdev, -enum fip_state fip_mode) +enum fip_mode fip_mode) {struct fcoe_ctlr_device *ctlr_dev;struct bnx2fc_interface *interface;
drivers/scsi/fcoe/fcoe.c +1 -1
@@ -389,7 +389,7 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe,* Returns: pointer to a struct fcoe_interface or NULL on error */ static struct fcoe_interface *fcoe_interface_create (struct net_device *netdev, -enum fip_state fip_mode) +enum fip_mode fip_mode) {struct fcoe_ctlr_device *ctlr_dev;struct fcoe_ctlr *ctlr;
drivers/scsi/fcoe/fcoe_ctlr.c +5 -2
@@ -147,7 +147,7 @@ static void fcoe_ctlr_map_dest(struct fcoe_ctlr *fip)* fcoe_ctlr_init() - Initialize the FCoE Controller instance * @fip: The FCoE controller to initialize */ -void fcoe_ctlr_init (struct fcoe_ctlr *fip,enum fip_state mode) +void fcoe_ctlr_init (struct fcoe_ctlr *fip,enum fip_mode mode) {fcoe_ctlr_set_state (fip,FIP_ST_LINK_WAIT ); fip->mode = mode;
@@ -454,7 +454,10 @@ void fcoe_ctlr_link_up(struct fcoe_ctlr *fip)mutex_unlock (&fip->ctlr_mutex);fc_linkup (fip->lp); }else if (fip->state ==FIP_ST_LINK_WAIT ) { -fcoe_ctlr_set_state (fip, fip->mode); +if (fip->mode ==FIP_MODE_NON_FIP ) +fcoe_ctlr_set_state (fip,FIP_ST_NON_FIP ); +else +fcoe_ctlr_set_state (fip,FIP_ST_AUTO );switch (fip->mode) {default :LIBFCOE_FIP_DBG (fip,"invalid mode %d\n" , fip->mode);
drivers/scsi/fcoe/fcoe_transport.c +1 -1
@@ -873,7 +873,7 @@ static int fcoe_transport_create(const char *buffer,int rc = -ENODEV ;struct net_device *netdev =NULL ;struct fcoe_transport *ft =NULL ; -enum fip_state fip_mode = (enum fip_state )(long )kp->arg; +enum fip_mode fip_mode = (enum fip_mode )kp->arg;mutex_lock (&ft_mutex);
drivers/scsi/qedf/qedf_main.c +1 -1
@@ -1418,7 +1418,7 @@ static struct libfc_function_template qedf_lport_template = {static void qedf_fcoe_ctlr_setup (struct qedf_ctx *qedf) { -fcoe_ctlr_init (&qedf->ctlr,FIP_ST_AUTO ); +fcoe_ctlr_init (&qedf->ctlr,FIP_MODE_AUTO ); qedf->ctlr.send = qedf_fip_send; qedf->ctlr.get_src_addr = qedf_get_src_mac;
include/scsi/libfcoe.h +2 -2
@@ -79,7 +79,7 @@ enum fip_state {* It must not change after fcoe_ctlr_init() sets it. */ enum fip_mode { -FIP_MODE_AUTO =FIP_ST_AUTO , +FIP_MODE_AUTO ,FIP_MODE_NON_FIP ,FIP_MODE_FABRIC ,FIP_MODE_VN2VN ,
@@ -250,7 +250,7 @@ struct fcoe_rport { };/* FIP API functions */ -void fcoe_ctlr_init (struct fcoe_ctlr *,enum fip_state ); +void fcoe_ctlr_init (struct fcoe_ctlr *,enum fip_mode );void fcoe_ctlr_destroy (struct fcoe_ctlr *);void fcoe_ctlr_link_up (struct fcoe_ctlr *);int fcoe_ctlr_link_down (struct fcoe_ctlr *);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 114/262 drm/amd/display: Clear stream->mode_changed after commit
In reply to Sasha LevinFrom: Nicholas Kazlauskas <[email protected]>
[ Upstream commit d8d2f174bcc2c26c3485c70e0c6fe22b27bce739 ]
[Why]
The stream->mode_changed flag can persist in the following sequence of atomic commits:
Commit 1:
Enable CRTC0 (mode_changed = true), Enable CRTC1 (mode_changed = true)
Commit 2:
Disable CRTC1 (mode_changed = false)
In this sequence we want to keep the exiting CRTC0 but it's not in the atomic state for the commit since it hasn't been modified. In this case the stream->mode_changed flag persists as true and we don't re-program the planes for the existing stream.
[How]
The flag needs to be cleared and it makes the most sense to do it within DC after the state has been committed. Nothing following dc_commit_state should think that the stream's mode has changed.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc.c +3 -0
@@ -1078,6 +1078,9 @@ static enum dc_status dc_commit_state_no_check(struct dc *dc, struct dc_state *c/* pplib is notified if disp_num changed */ dc->hwss.optimize_bandwidth (dc, context); +for (i =0 ; i < context->stream_count; i++) + context->streams[i]->mode_changed = false; +dc_release_state (dc->current_state); dc->current_state = context;
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 115/262 perf test: Fix failure of 'evsel-tp-sched' test on s390
In reply to Sasha LevinFrom: Thomas Richter <[email protected]>
[ Upstream commit 03d309711d687460d1345de8a0363f45b1c8cd11 ]
Commit 489338a717a0 ("perf tests evsel-tp-sched: Fix bitwise operator") causes test case 14 "Parse sched tracepoints fields" to fail on s390.
This test succeeds on x86.
In fact this test now fails on all architectures with type char treated as type unsigned char.
The root cause is the signed-ness of character arrays in the tracepoints sched_switch for structure members prev_comm and next_comm.
On s390 the output of:
[root@m35lp76 perf]# cat /sys/kernel/debug/tracing/events/sched/sched_switch/format
name: sched_switch
ID: 287
format:
field:unsigned short common_type; offset:0; size:2; signed:0;
...
field:char prev_comm[16]; offset:8; size:16; signed:0;
...
field:char next_comm[16]; offset:40; size:16; signed:0;
reveals the character arrays prev_comm and next_comm are per default unsigned char and have values in the range of 0..255.
On x86 both fields are signed as this output shows:
[root@f29]# cat /sys/kernel/debug/tracing/events/sched/sched_switch/format name: sched_switch ID: 287 format: field:unsigned short common_type; offset:0; size:2; signed:0; ... field:char prev_comm[16]; offset:8; size:16; signed:1; ... field:char next_comm[16]; offset:40; size:16; signed:1;
and the character arrays prev_comm and next_comm are per default signed char and have values in the range of -1..127. The implementation of type char is architecture specific.
Since the character arrays in both tracepoints sched_switch and sched_wakeup should contain ascii characters, simply omit the check for signedness in the test case.
Output before:
[root@m35lp76 perf]# ./perf test -F 14
14: Parse sched tracepoints fields :
--- start ---
sched:sched_switch: "prev_comm" signedness(0) is wrong, should be 1 sched:sched_switch: "next_comm" signedness(0) is wrong, should be 1 sched:sched_wakeup: "comm" signedness(0) is wrong, should be 1 ---- end ----
14: Parse sched tracepoints fields : FAILED!
[root@m35lp76 perf]#
Output after:
[root@m35lp76 perf]# ./perf test -Fv 14
14: Parse sched tracepoints fields :
--- start ---
---- end ----
Parse sched tracepoints fields: Ok
[root@m35lp76 perf]#
--- tools/perf/tests/evsel-tp-sched.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/perf/tests/evsel-tp-sched.c +3 -3
@@ -43,7 +43,7 @@ int test__perf_evsel__tp_sched_test(struct test *test __maybe_unused, int subtesreturn -1 ; } -if (perf_evsel__test_field (evsel,"prev_comm" ,16 , true)) +if (perf_evsel__test_field (evsel,"prev_comm" ,16 , false)) ret =-1 ;if (perf_evsel__test_field (evsel,"prev_pid" ,4 , true))
@@ -55,7 +55,7 @@ int test__perf_evsel__tp_sched_test(struct test *test __maybe_unused, int subtesif (perf_evsel__test_field (evsel,"prev_state" ,sizeof (long ), true)) ret =-1 ; -if (perf_evsel__test_field (evsel,"next_comm" ,16 , true)) +if (perf_evsel__test_field (evsel,"next_comm" ,16 , false)) ret =-1 ;if (perf_evsel__test_field (evsel,"next_pid" ,4 , true))
@@ -73,7 +73,7 @@ int test__perf_evsel__tp_sched_test(struct test *test __maybe_unused, int subtesreturn -1 ; } -if (perf_evsel__test_field (evsel,"comm" ,16 , true)) +if (perf_evsel__test_field (evsel,"comm" ,16 , false)) ret =-1 ;if (perf_evsel__test_field (evsel,"pid" ,4 , true))
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 116/262 mwifiex: don't advertise IBSS features without FW support
In reply to Sasha LevinFrom: Brian Norris <[email protected]>
[ Upstream commit 6f21ab30469d670de620f758330aca9f3433f693 ]
As it is, doing something like
# iw phy phy0 interface add foobar type ibss
on a firmware that doesn't have ad-hoc support just yields failures of HostCmd_CMD_SET_BSS_MODE, which happened to return a '-1' error code (-EPERM? not really right...) and sometimes may even crash the firmware along the way.
Let's parse the firmware capability flag while registering the wiphy, so we don't allow attempting IBSS at all, and we get a proper -EOPNOTSUPP from nl80211 instead.
--- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/net/wireless/marvell/mwifiex/cfg80211.c +7 -3
@@ -4310,11 +4310,13 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter) wiphy->mgmt_stypes = mwifiex_mgmt_stypes; wiphy->max_remain_on_channel_duration =5000 ; wiphy->interface_modes =BIT (NL80211_IFTYPE_STATION ) | -BIT (NL80211_IFTYPE_ADHOC ) |BIT (NL80211_IFTYPE_P2P_CLIENT ) |BIT (NL80211_IFTYPE_P2P_GO ) |BIT (NL80211_IFTYPE_AP ); +if (ISSUPP_ADHOC_ENABLED (adapter->fw_cap_info)) + wiphy->interface_modes |=BIT (NL80211_IFTYPE_ADHOC ); + wiphy->bands[NL80211_BAND_2GHZ ] = &mwifiex_band_2ghz;if (adapter->config_bands &BAND_A ) wiphy->bands[NL80211_BAND_5GHZ ] = &mwifiex_band_5ghz;
@@ -4374,11 +4376,13 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter) wiphy->available_antennas_tx =BIT (adapter->number_of_antenna) -1 ; wiphy->available_antennas_rx =BIT (adapter->number_of_antenna) -1 ; - wiphy->features |=NL80211_FEATURE_HT_IBSS | -NL80211_FEATURE_INACTIVITY_TIMER | + wiphy->features |=NL80211_FEATURE_INACTIVITY_TIMER |NL80211_FEATURE_LOW_PRIORITY_SCAN |NL80211_FEATURE_NEED_OBSS_SCAN ; +if (ISSUPP_ADHOC_ENABLED (adapter->fw_cap_info)) + wiphy->features |=NL80211_FEATURE_HT_IBSS ; +if (ISSUPP_RANDOM_MAC (adapter->fw_cap_info)) wiphy->features |=NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR | NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR |
Signature · 1 line
2.19.1
Re: [PATCH AUTOSEL 5.0 116/262] mwifiex: don't advertise IBSS features without FW support
Quoted 14 lines · Sasha Levin
From: Brian Norris <[email protected]>
[ Upstream commit
6f21ab30469d670de620f758330aca9f3433f693]As it is, doing something like
# iw phy phy0 interface add foobar type ibsson a firmware that doesn't have ad-hoc support just yields failures of
HostCmd_CMD_SET_BSS_MODE, which happened to return a '-1' error code (-EPERM? not really right...) and sometimes may even crash the firmware along the way.
Quoted 8 lines
Let's parse the firmware capability flag while registering the wiphy, so we don't allow attempting IBSS at all, and we get a proper
-EOPNOTSUPPfrom nl80211 instead.Fixes e267e71e68ae ("mwifiex: Disable adhoc feature based on firmware capability")Signed-off-by Brian Norris <[email protected]>Signed-off-by Kalle Valo <[email protected]>Signed-off-by Sasha Levin <[email protected]>
The backport seems valid and useful:
Sasha Levin
maintainerPATCH 117/262 perf report: Don't shadow inlined symbol with different addr range
In reply to Sasha LevinFrom: He Kuang <[email protected]>
[ Upstream commit 7346195e8643482968f547483e0d823ec1982fab ]
We can't assume inlined symbols with the same name are equal, because their address range may be different. This will cause the symbols with different addresses be shadowed when adding to the hist entry, and lead to ERANGE error when checking the symbol address during sample parse, the addr should be within the range of [sym.start, sym.end].
The error message is like: "0x36aea60 [0x8]: failed to process type: 68".
The second parameter of symbol__new() is the length of the fake symbol for the inline frame, which is the subtraction of the end and start address of base_sym.
--- tools/perf/util/sort.c | 10 ++++++++-- tools/perf/util/srcline.c | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-)
tools/perf/util/sort.c +8 -2
@@ -230,8 +230,14 @@ static int64_t _sort__sym_cmp(struct symbol *sym_l, struct symbol *sym_r)if (sym_l == sym_r)return 0 ; -if (sym_l->inlined || sym_r->inlined) -return strcmp (sym_l->name, sym_r->name); +if (sym_l->inlined || sym_r->inlined) { +int ret =strcmp (sym_l->name, sym_r->name); + +if (ret) +return ret; +if ((sym_l->start <= sym_r->end) && (sym_l->end >= sym_r->start)) +return 0 ; + }if (sym_l->start != sym_r->start)return (int64_t )(sym_r->start - sym_l->start);
tools/perf/util/srcline.c +1 -1
@@ -104,7 +104,7 @@ static struct symbol *new_inline_sym(struct dso *dso, }else {/* create a fake symbol for the inline frame */ inline_sym =symbol__new (base_sym ? base_sym->start :0 , - base_sym ? base_sym->end :0 , + base_sym ? (base_sym->end - base_sym->start) :0 , base_sym ? base_sym->binding :0 , base_sym ? base_sym->type :0 , funcname);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 118/262 SoC: imx-sgtl5000: add missing put_device()
In reply to Sasha LevinFrom: Wen Yang <[email protected]>
[ Upstream commit 8fa857da9744f513036df1c43ab57f338941ae7d ]
The of_find_device_by_node() takes a reference to the underlying device structure, we should release that reference.
Detected by coccinelle with the following warnings:
./sound/soc/fsl/imx-sgtl5000.c:169:1-7: ERROR: missing put_device; call of_find_device_by_node on line 105, but without a corresponding object release within this function. ./sound/soc/fsl/imx-sgtl5000.c:177:1-7: ERROR: missing put_device; call of_find_device_by_node on line 105, but without a corresponding object release within this function.
--- sound/soc/fsl/imx-sgtl5000.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/fsl/imx-sgtl5000.c +1 -0
@@ -108,6 +108,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) ret = -EPROBE_DEFER ; goto fail; } +put_device (&ssi_pdev->dev); codec_dev =of_find_i2c_device_by_node (codec_np);if (!codec_dev) {dev_err (&pdev->dev,"failed to find codec platform device\n" );
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 119/262 media: ov7740: fix runtime pm initialization
In reply to Sasha LevinFrom: Akinobu Mita <[email protected]>
[ Upstream commit 12aceee1f412c3ddc7750155fec06c906f14ab51 ]
The runtime PM of this device is enabled after v4l2_ctrl_handler_setup(), and this makes this device's runtime PM usage count a negative value.
The ov7740_set_ctrl() tries to do something only if the device's runtime PM usage counter is nonzero.
ov7740_set_ctrl()
{
if (!pm_runtime_get_if_in_use(&client->dev))
return 0;
<do something>;
pm_runtime_put(&client->dev);
return ret;
}However, the ov7740_set_ctrl() is called by v4l2_ctrl_handler_setup() while the runtime PM of this device is not yet enabled. In this case, the pm_runtime_get_if_in_use() returns -EINVAL (!= 0).
Therefore we can't bail out of this function and the usage count is decreased by pm_runtime_put() without increment.
This fixes this problem by enabling the runtime PM of this device before v4l2_ctrl_handler_setup() so that the ov7740_set_ctrl() is always called when the runtime PM is enabled.
--- drivers/media/i2c/ov7740.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/media/i2c/ov7740.c +5 -2
@@ -1101,6 +1101,9 @@ static int ov7740_probe(struct i2c_client *client,if (ret)return ret; +pm_runtime_set_active (&client->dev); +pm_runtime_enable (&client->dev); + ret =ov7740_detect (ov7740);if (ret) goto error_detect;
@@ -1123,8 +1126,6 @@ static int ov7740_probe(struct i2c_client *client,if (ret) goto error_async_register; -pm_runtime_set_active (&client->dev); -pm_runtime_enable (&client->dev);pm_runtime_idle (&client->dev);return 0 ;
@@ -1134,6 +1135,8 @@ static int ov7740_probe(struct i2c_client *client, error_init_controls:ov7740_free_controls (ov7740); error_detect: +pm_runtime_disable (&client->dev); +pm_runtime_set_suspended (&client->dev);ov7740_set_power (ov7740,0 );media_entity_cleanup (&ov7740->subdev.entity);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 120/262 media: sh_veu: Correct return type for mem2mem buffer helpers
In reply to Sasha LevinFrom: Ezequiel Garcia <[email protected]>
[ Upstream commit 43c145195c7fc3025ee7ecfc67112ac1c82af7c2 ]
Fix the assigned type of mem2mem buffer handling API. Namely, these functions:
v4l2_m2m_next_buf
v4l2_m2m_last_buf
v4l2_m2m_buf_remove
v4l2_m2m_next_src_buf
v4l2_m2m_next_dst_buf
v4l2_m2m_last_src_buf
v4l2_m2m_last_dst_buf
v4l2_m2m_src_buf_remove
v4l2_m2m_dst_buf_remove
return a struct vb2_v4l2_buffer, and not a struct vb2_buffer.
Fixing this is necessary to fix the mem2mem buffer handling API, changing the return to the correct struct vb2_v4l2_buffer instead of a void pointer.
--- drivers/media/platform/sh_veu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/sh_veu.c +2 -2
@@ -273,13 +273,13 @@ static void sh_veu_process(struct sh_veu_dev *veu,static void sh_veu_device_run (void *priv) {struct sh_veu_dev *veu = priv; -struct vb2_buffer *src_buf, *dst_buf; +struct vb2_v4l2_buffer *src_buf, *dst_buf; src_buf =v4l2_m2m_next_src_buf (veu->m2m_ctx); dst_buf =v4l2_m2m_next_dst_buf (veu->m2m_ctx);if (src_buf && dst_buf) -sh_veu_process (veu, src_buf, dst_buf); +sh_veu_process (veu, &src_buf->vb2_buf, &dst_buf->vb2_buf); }/* ========== video ioctls ========== */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 121/262 media: s5p-jpeg: Correct return type for mem2mem buffer helpers
In reply to Sasha LevinFrom: Ezequiel Garcia <[email protected]>
[ Upstream commit 4a88f89885c7cf65c62793f385261a6e3315178a ]
Fix the assigned type of mem2mem buffer handling API. Namely, these functions:
v4l2_m2m_next_buf
v4l2_m2m_last_buf
v4l2_m2m_buf_remove
v4l2_m2m_next_src_buf
v4l2_m2m_next_dst_buf
v4l2_m2m_last_src_buf
v4l2_m2m_last_dst_buf
v4l2_m2m_src_buf_remove
v4l2_m2m_dst_buf_remove
return a struct vb2_v4l2_buffer, and not a struct vb2_buffer.
Fixing this is necessary to fix the mem2mem buffer handling API, changing the return to the correct struct vb2_v4l2_buffer instead of a void pointer.
--- drivers/media/platform/s5p-jpeg/jpeg-core.c | 38 ++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-)
drivers/media/platform/s5p-jpeg/jpeg-core.c +19 -19
@@ -793,14 +793,14 @@ static void skip(struct s5p_jpeg_buffer *buf, long len);static void exynos4_jpeg_parse_decode_h_tbl (struct s5p_jpeg_ctx *ctx) {struct s5p_jpeg *jpeg = ctx->jpeg; -struct vb2_buffer *vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); +struct vb2_v4l2_buffer *vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx);struct s5p_jpeg_buffer jpeg_buffer;unsigned int word;int c, x, components; jpeg_buffer.size =2 ;/* Ls */ jpeg_buffer.data = - (unsigned long )vb2_plane_vaddr (vb,0 ) + ctx->out_q.sos +2 ; + (unsigned long )vb2_plane_vaddr (&vb->vb2_buf,0 ) + ctx->out_q.sos +2 ; jpeg_buffer.curr =0 ; word =0 ;
@@ -830,14 +830,14 @@ static void exynos4_jpeg_parse_decode_h_tbl(struct s5p_jpeg_ctx *ctx)static void exynos4_jpeg_parse_huff_tbl (struct s5p_jpeg_ctx *ctx) {struct s5p_jpeg *jpeg = ctx->jpeg; -struct vb2_buffer *vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); +struct vb2_v4l2_buffer *vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx);struct s5p_jpeg_buffer jpeg_buffer;unsigned int word;int c, i, n, j;for (j =0 ; j < ctx->out_q.dht.n; ++j) { jpeg_buffer.size = ctx->out_q.dht.len[j]; - jpeg_buffer.data = (unsigned long )vb2_plane_vaddr (vb,0 ) + + jpeg_buffer.data = (unsigned long )vb2_plane_vaddr (&vb->vb2_buf,0 ) + ctx->out_q.dht.marker[j]; jpeg_buffer.curr =0 ;
@@ -889,13 +889,13 @@ static void exynos4_jpeg_parse_huff_tbl(struct s5p_jpeg_ctx *ctx)static void exynos4_jpeg_parse_decode_q_tbl (struct s5p_jpeg_ctx *ctx) {struct s5p_jpeg *jpeg = ctx->jpeg; -struct vb2_buffer *vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); +struct vb2_v4l2_buffer *vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx);struct s5p_jpeg_buffer jpeg_buffer;int c, x, components; jpeg_buffer.size = ctx->out_q.sof_len; jpeg_buffer.data = - (unsigned long )vb2_plane_vaddr (vb,0 ) + ctx->out_q.sof; + (unsigned long )vb2_plane_vaddr (&vb->vb2_buf,0 ) + ctx->out_q.sof; jpeg_buffer.curr =0 ;skip (&jpeg_buffer,5 );/* P, Y, X */
@@ -920,14 +920,14 @@ static void exynos4_jpeg_parse_decode_q_tbl(struct s5p_jpeg_ctx *ctx)static void exynos4_jpeg_parse_q_tbl (struct s5p_jpeg_ctx *ctx) {struct s5p_jpeg *jpeg = ctx->jpeg; -struct vb2_buffer *vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); +struct vb2_v4l2_buffer *vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx);struct s5p_jpeg_buffer jpeg_buffer;unsigned int word;int c, i, j;for (j =0 ; j < ctx->out_q.dqt.n; ++j) { jpeg_buffer.size = ctx->out_q.dqt.len[j]; - jpeg_buffer.data = (unsigned long )vb2_plane_vaddr (vb,0 ) + + jpeg_buffer.data = (unsigned long )vb2_plane_vaddr (&vb->vb2_buf,0 ) + ctx->out_q.dqt.marker[j]; jpeg_buffer.curr =0 ;
@@ -2072,15 +2072,15 @@ static void s5p_jpeg_device_run(void *priv) {struct s5p_jpeg_ctx *ctx = priv;struct s5p_jpeg *jpeg = ctx->jpeg; -struct vb2_buffer *src_buf, *dst_buf; +struct vb2_v4l2_buffer *src_buf, *dst_buf;unsigned long src_addr, dst_addr, flags;spin_lock_irqsave (&ctx->jpeg->slock, flags); src_buf =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); dst_buf =v4l2_m2m_next_dst_buf (ctx->fh.m2m_ctx); - src_addr =vb2_dma_contig_plane_dma_addr (src_buf,0 ); - dst_addr =vb2_dma_contig_plane_dma_addr (dst_buf,0 ); + src_addr =vb2_dma_contig_plane_dma_addr (&src_buf->vb2_buf,0 ); + dst_addr =vb2_dma_contig_plane_dma_addr (&dst_buf->vb2_buf,0 );s5p_jpeg_reset (jpeg->regs);s5p_jpeg_poweron (jpeg->regs);
@@ -2153,7 +2153,7 @@ static void exynos4_jpeg_set_img_addr(struct s5p_jpeg_ctx *ctx) {struct s5p_jpeg *jpeg = ctx->jpeg;struct s5p_jpeg_fmt *fmt; -struct vb2_buffer *vb; +struct vb2_v4l2_buffer *vb;struct s5p_jpeg_addr jpeg_addr = {};u32 pix_size, padding_bytes =0 ;
@@ -2172,7 +2172,7 @@ static void exynos4_jpeg_set_img_addr(struct s5p_jpeg_ctx *ctx) vb =v4l2_m2m_next_dst_buf (ctx->fh.m2m_ctx); } - jpeg_addr.y =vb2_dma_contig_plane_dma_addr (vb,0 ); + jpeg_addr.y =vb2_dma_contig_plane_dma_addr (&vb->vb2_buf,0 );if (fmt->colplanes ==2 ) { jpeg_addr.cb = jpeg_addr.y + pix_size - padding_bytes;
@@ -2190,7 +2190,7 @@ static void exynos4_jpeg_set_img_addr(struct s5p_jpeg_ctx *ctx)static void exynos4_jpeg_set_jpeg_addr (struct s5p_jpeg_ctx *ctx) {struct s5p_jpeg *jpeg = ctx->jpeg; -struct vb2_buffer *vb; +struct vb2_v4l2_buffer *vb;unsigned int jpeg_addr =0 ;if (ctx->mode ==S5P_JPEG_ENCODE )
@@ -2198,7 +2198,7 @@ static void exynos4_jpeg_set_jpeg_addr(struct s5p_jpeg_ctx *ctx)else vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); - jpeg_addr =vb2_dma_contig_plane_dma_addr (vb,0 ); + jpeg_addr =vb2_dma_contig_plane_dma_addr (&vb->vb2_buf,0 );if (jpeg->variant->version ==SJPEG_EXYNOS5433 && ctx->mode ==S5P_JPEG_DECODE ) jpeg_addr += ctx->out_q.sos;
@@ -2314,7 +2314,7 @@ static void exynos3250_jpeg_set_img_addr(struct s5p_jpeg_ctx *ctx) {struct s5p_jpeg *jpeg = ctx->jpeg;struct s5p_jpeg_fmt *fmt; -struct vb2_buffer *vb; +struct vb2_v4l2_buffer *vb;struct s5p_jpeg_addr jpeg_addr = {};u32 pix_size;
@@ -2328,7 +2328,7 @@ static void exynos3250_jpeg_set_img_addr(struct s5p_jpeg_ctx *ctx) fmt = ctx->cap_q.fmt; } - jpeg_addr.y =vb2_dma_contig_plane_dma_addr (vb,0 ); + jpeg_addr.y =vb2_dma_contig_plane_dma_addr (&vb->vb2_buf,0 );if (fmt->colplanes ==2 ) { jpeg_addr.cb = jpeg_addr.y + pix_size;
@@ -2346,7 +2346,7 @@ static void exynos3250_jpeg_set_img_addr(struct s5p_jpeg_ctx *ctx)static void exynos3250_jpeg_set_jpeg_addr (struct s5p_jpeg_ctx *ctx) {struct s5p_jpeg *jpeg = ctx->jpeg; -struct vb2_buffer *vb; +struct vb2_v4l2_buffer *vb;unsigned int jpeg_addr =0 ;if (ctx->mode ==S5P_JPEG_ENCODE )
@@ -2354,7 +2354,7 @@ static void exynos3250_jpeg_set_jpeg_addr(struct s5p_jpeg_ctx *ctx)else vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); - jpeg_addr =vb2_dma_contig_plane_dma_addr (vb,0 ); + jpeg_addr =vb2_dma_contig_plane_dma_addr (&vb->vb2_buf,0 );exynos3250_jpeg_jpgadr (jpeg->regs, jpeg_addr); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 122/262 media: rockchip/rga: Correct return type for mem2mem buffer helpers
In reply to Sasha LevinFrom: Ezequiel Garcia <ezequiel-ZGY8ohtN/[email protected]>
[ Upstream commit da2d3a4e4adabc6ccfb100bc9abd58ee9cd6c4b7 ]
Fix the assigned type of mem2mem buffer handling API. Namely, these functions:
v4l2_m2m_next_buf
v4l2_m2m_last_buf
v4l2_m2m_buf_remove
v4l2_m2m_next_src_buf
v4l2_m2m_next_dst_buf
v4l2_m2m_last_src_buf
v4l2_m2m_last_dst_buf
v4l2_m2m_src_buf_remove
v4l2_m2m_dst_buf_remove
return a struct vb2_v4l2_buffer, and not a struct vb2_buffer.
Fixing this is necessary to fix the mem2mem buffer handling API, changing the return to the correct struct vb2_v4l2_buffer instead of a void pointer.
--- drivers/media/platform/rockchip/rga/rga.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/media/platform/rockchip/rga/rga.c +3 -3
@@ -43,7 +43,7 @@ static void device_run(void *prv) {struct rga_ctx *ctx = prv;struct rockchip_rga *rga = ctx->rga; -struct vb2_buffer *src, *dst; +struct vb2_v4l2_buffer *src, *dst;unsigned long flags;spin_lock_irqsave (&rga->ctrl_lock, flags);
@@ -53,8 +53,8 @@ static void device_run(void *prv) src =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); dst =v4l2_m2m_next_dst_buf (ctx->fh.m2m_ctx); -rga_buf_map (src); -rga_buf_map (dst); +rga_buf_map (&src->vb2_buf); +rga_buf_map (&dst->vb2_buf);rga_hw_start (rga);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 123/262 media: s5p-g2d: Correct return type for mem2mem buffer helpers
In reply to Sasha LevinFrom: Ezequiel Garcia <[email protected]>
[ Upstream commit 30fa627b32230737bc3f678067e2adfecf956987 ]
Fix the assigned type of mem2mem buffer handling API. Namely, these functions:
v4l2_m2m_next_buf
v4l2_m2m_last_buf
v4l2_m2m_buf_remove
v4l2_m2m_next_src_buf
v4l2_m2m_next_dst_buf
v4l2_m2m_last_src_buf
v4l2_m2m_last_dst_buf
v4l2_m2m_src_buf_remove
v4l2_m2m_dst_buf_remove
return a struct vb2_v4l2_buffer, and not a struct vb2_buffer.
Fixing this is necessary to fix the mem2mem buffer handling API, changing the return to the correct struct vb2_v4l2_buffer instead of a void pointer.
--- drivers/media/platform/s5p-g2d/g2d.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/media/platform/s5p-g2d/g2d.c +3 -3
@@ -513,7 +513,7 @@ static void device_run(void *prv) {struct g2d_ctx *ctx = prv;struct g2d_dev *dev = ctx->dev; -struct vb2_buffer *src, *dst; +struct vb2_v4l2_buffer *src, *dst;unsigned long flags;u32 cmd =0 ;
@@ -528,10 +528,10 @@ static void device_run(void *prv)spin_lock_irqsave (&dev->ctrl_lock, flags);g2d_set_src_size (dev, &ctx->in); -g2d_set_src_addr (dev,vb2_dma_contig_plane_dma_addr (src,0 )); +g2d_set_src_addr (dev,vb2_dma_contig_plane_dma_addr (&src->vb2_buf,0 ));g2d_set_dst_size (dev, &ctx->out); -g2d_set_dst_addr (dev,vb2_dma_contig_plane_dma_addr (dst,0 )); +g2d_set_dst_addr (dev,vb2_dma_contig_plane_dma_addr (&dst->vb2_buf,0 ));g2d_set_rop4 (dev, ctx->rop);g2d_set_flip (dev, ctx->flip);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 124/262 media: mx2_emmaprp: Correct return type for mem2mem buffer helpers
In reply to Sasha LevinFrom: Ezequiel Garcia <[email protected]>
[ Upstream commit 8d20dcefe471763f23ad538369ec65b51993ffff ]
Fix the assigned type of mem2mem buffer handling API. Namely, these functions:
v4l2_m2m_next_buf
v4l2_m2m_last_buf
v4l2_m2m_buf_remove
v4l2_m2m_next_src_buf
v4l2_m2m_next_dst_buf
v4l2_m2m_last_src_buf
v4l2_m2m_last_dst_buf
v4l2_m2m_src_buf_remove
v4l2_m2m_dst_buf_remove
return a struct vb2_v4l2_buffer, and not a struct vb2_buffer.
Fixing this is necessary to fix the mem2mem buffer handling API, changing the return to the correct struct vb2_v4l2_buffer instead of a void pointer.
--- drivers/media/platform/mx2_emmaprp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/media/platform/mx2_emmaprp.c +3 -3
@@ -274,7 +274,7 @@ static void emmaprp_device_run(void *priv) {struct emmaprp_ctx *ctx = priv;struct emmaprp_q_data *s_q_data, *d_q_data; -struct vb2_buffer *src_buf, *dst_buf; +struct vb2_v4l2_buffer *src_buf, *dst_buf;struct emmaprp_dev *pcdev = ctx->dev;unsigned int s_width, s_height;unsigned int d_width, d_height;
@@ -294,8 +294,8 @@ static void emmaprp_device_run(void *priv) d_height = d_q_data->height; d_size = d_width * d_height; - p_in =vb2_dma_contig_plane_dma_addr (src_buf,0 ); - p_out =vb2_dma_contig_plane_dma_addr (dst_buf,0 ); + p_in =vb2_dma_contig_plane_dma_addr (&src_buf->vb2_buf,0 ); + p_out =vb2_dma_contig_plane_dma_addr (&dst_buf->vb2_buf,0 );if (!p_in || !p_out) {v4l2_err (&pcdev->v4l2_dev,"Acquiring kernel pointers to buffers failed\n" );
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 125/262 media: mtk-jpeg: Correct return type for mem2mem buffer helpers
In reply to Sasha LevinFrom: Ezequiel Garcia <[email protected]>
[ Upstream commit 1b275e4e8b70dbff9850874b30831c1bd8d3c504 ]
Fix the assigned type of mem2mem buffer handling API. Namely, these functions:
v4l2_m2m_next_buf
v4l2_m2m_last_buf
v4l2_m2m_buf_remove
v4l2_m2m_next_src_buf
v4l2_m2m_next_dst_buf
v4l2_m2m_last_src_buf
v4l2_m2m_last_dst_buf
v4l2_m2m_src_buf_remove
v4l2_m2m_dst_buf_remove
return a struct vb2_v4l2_buffer, and not a struct vb2_buffer.
Fixing this is necessary to fix the mem2mem buffer handling API, changing the return to the correct struct vb2_v4l2_buffer instead of a void pointer.
--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +20 -20
@@ -702,7 +702,7 @@ static void mtk_jpeg_buf_queue(struct vb2_buffer *vb)v4l2_m2m_buf_queue (ctx->fh.m2m_ctx,to_vb2_v4l2_buffer (vb)); } -static void *mtk_jpeg_buf_remove (struct mtk_jpeg_ctx *ctx, +static struct vb2_v4l2_buffer *mtk_jpeg_buf_remove (struct mtk_jpeg_ctx *ctx,enum v4l2_buf_type type) {if (V4L2_TYPE_IS_OUTPUT (type))
@@ -714,7 +714,7 @@ static void *mtk_jpeg_buf_remove(struct mtk_jpeg_ctx *ctx,static int mtk_jpeg_start_streaming (struct vb2_queue *q,unsigned int count) {struct mtk_jpeg_ctx *ctx =vb2_get_drv_priv (q); -struct vb2_buffer *vb; +struct vb2_v4l2_buffer *vb;int ret =0 ; ret =pm_runtime_get_sync (ctx->jpeg->dev);
@@ -724,14 +724,14 @@ static int mtk_jpeg_start_streaming(struct vb2_queue *q, unsigned int count)return 0 ; err:while ((vb =mtk_jpeg_buf_remove (ctx, q->type))) -v4l2_m2m_buf_done (to_vb2_v4l2_buffer (vb),VB2_BUF_STATE_QUEUED ); +v4l2_m2m_buf_done (vb,VB2_BUF_STATE_QUEUED );return ret; }static void mtk_jpeg_stop_streaming (struct vb2_queue *q) {struct mtk_jpeg_ctx *ctx =vb2_get_drv_priv (q); -struct vb2_buffer *vb; +struct vb2_v4l2_buffer *vb;/* * STREAMOFF is an acknowledgment for source change event.
@@ -743,7 +743,7 @@ static void mtk_jpeg_stop_streaming(struct vb2_queue *q)struct mtk_jpeg_src_buf *src_buf; vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); - src_buf =mtk_jpeg_vb2_to_srcbuf (vb); + src_buf =mtk_jpeg_vb2_to_srcbuf (&vb->vb2_buf);mtk_jpeg_set_queue_data (ctx, &src_buf->dec_param); ctx->state =MTK_JPEG_RUNNING ; }else if (V4L2_TYPE_IS_OUTPUT (q->type)) {
@@ -751,7 +751,7 @@ static void mtk_jpeg_stop_streaming(struct vb2_queue *q) }while ((vb =mtk_jpeg_buf_remove (ctx, q->type))) -v4l2_m2m_buf_done (to_vb2_v4l2_buffer (vb),VB2_BUF_STATE_ERROR ); +v4l2_m2m_buf_done (vb,VB2_BUF_STATE_ERROR );pm_runtime_put_sync (ctx->jpeg->dev); }
@@ -807,7 +807,7 @@ static void mtk_jpeg_device_run(void *priv) {struct mtk_jpeg_ctx *ctx = priv;struct mtk_jpeg_dev *jpeg = ctx->jpeg; -struct vb2_buffer *src_buf, *dst_buf; +struct vb2_v4l2_buffer *src_buf, *dst_buf;enum vb2_buffer_state buf_state =VB2_BUF_STATE_ERROR ;unsigned long flags;struct mtk_jpeg_src_buf *jpeg_src_buf;
@@ -817,11 +817,11 @@ static void mtk_jpeg_device_run(void *priv) src_buf =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); dst_buf =v4l2_m2m_next_dst_buf (ctx->fh.m2m_ctx); - jpeg_src_buf =mtk_jpeg_vb2_to_srcbuf (src_buf); + jpeg_src_buf =mtk_jpeg_vb2_to_srcbuf (&src_buf->vb2_buf);if (jpeg_src_buf->flags &MTK_JPEG_BUF_FLAGS_LAST_FRAME ) { -for (i =0 ; i < dst_buf->num_planes; i++) -vb2_set_plane_payload (dst_buf, i,0 ); +for (i =0 ; i < dst_buf->vb2_buf.num_planes; i++) +vb2_set_plane_payload (&dst_buf->vb2_buf, i,0 ); buf_state =VB2_BUF_STATE_DONE ; goto dec_end; }
@@ -833,8 +833,8 @@ static void mtk_jpeg_device_run(void *priv)return ; } -mtk_jpeg_set_dec_src (ctx, src_buf, &bs); -if (mtk_jpeg_set_dec_dst (ctx, &jpeg_src_buf->dec_param, dst_buf, &fb)) +mtk_jpeg_set_dec_src (ctx, &src_buf->vb2_buf, &bs); +if (mtk_jpeg_set_dec_dst (ctx, &jpeg_src_buf->dec_param, &dst_buf->vb2_buf, &fb)) goto dec_end;spin_lock_irqsave (&jpeg->hw_lock, flags);
@@ -849,8 +849,8 @@ static void mtk_jpeg_device_run(void *priv) dec_end:v4l2_m2m_src_buf_remove (ctx->fh.m2m_ctx);v4l2_m2m_dst_buf_remove (ctx->fh.m2m_ctx); -v4l2_m2m_buf_done (to_vb2_v4l2_buffer (src_buf), buf_state); -v4l2_m2m_buf_done (to_vb2_v4l2_buffer (dst_buf), buf_state); +v4l2_m2m_buf_done (src_buf, buf_state); +v4l2_m2m_buf_done (dst_buf, buf_state);v4l2_m2m_job_finish (jpeg->m2m_dev, ctx->fh.m2m_ctx); }
@@ -921,7 +921,7 @@ static irqreturn_t mtk_jpeg_dec_irq(int irq, void *priv) {struct mtk_jpeg_dev *jpeg = priv;struct mtk_jpeg_ctx *ctx; -struct vb2_buffer *src_buf, *dst_buf; +struct vb2_v4l2_buffer *src_buf, *dst_buf;struct mtk_jpeg_src_buf *jpeg_src_buf;enum vb2_buffer_state buf_state =VB2_BUF_STATE_ERROR ;u32 dec_irq_ret;
@@ -938,7 +938,7 @@ static irqreturn_t mtk_jpeg_dec_irq(int irq, void *priv) src_buf =v4l2_m2m_src_buf_remove (ctx->fh.m2m_ctx); dst_buf =v4l2_m2m_dst_buf_remove (ctx->fh.m2m_ctx); - jpeg_src_buf =mtk_jpeg_vb2_to_srcbuf (src_buf); + jpeg_src_buf =mtk_jpeg_vb2_to_srcbuf (&src_buf->vb2_buf);if (dec_irq_ret >=MTK_JPEG_DEC_RESULT_UNDERFLOW )mtk_jpeg_dec_reset (jpeg->dec_reg_base);
@@ -948,15 +948,15 @@ static irqreturn_t mtk_jpeg_dec_irq(int irq, void *priv) goto dec_end; } -for (i =0 ; i < dst_buf->num_planes; i++) -vb2_set_plane_payload (dst_buf, i, +for (i =0 ; i < dst_buf->vb2_buf.num_planes; i++) +vb2_set_plane_payload (&dst_buf->vb2_buf, i, jpeg_src_buf->dec_param.comp_size[i]); buf_state =VB2_BUF_STATE_DONE ; dec_end: -v4l2_m2m_buf_done (to_vb2_v4l2_buffer (src_buf), buf_state); -v4l2_m2m_buf_done (to_vb2_v4l2_buffer (dst_buf), buf_state); +v4l2_m2m_buf_done (src_buf, buf_state); +v4l2_m2m_buf_done (dst_buf, buf_state);v4l2_m2m_job_finish (jpeg->m2m_dev, ctx->fh.m2m_ctx);return IRQ_HANDLED ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 126/262 media: rockchip/vpu: Correct return type for mem2mem buffer helpers
In reply to Sasha LevinFrom: Ezequiel Garcia <[email protected]>
[ Upstream commit 29701c3612fa025d5e8dc64c7a4ae8dc4763912e ]
Fix the assigned type of mem2mem buffer handling API. Namely, these functions:
v4l2_m2m_next_buf
v4l2_m2m_last_buf
v4l2_m2m_buf_remove
v4l2_m2m_next_src_buf
v4l2_m2m_next_dst_buf
v4l2_m2m_last_src_buf
v4l2_m2m_last_dst_buf
v4l2_m2m_src_buf_remove
v4l2_m2m_dst_buf_remove
return a struct vb2_v4l2_buffer, and not a struct vb2_buffer.
Fixing this is necessary to fix the mem2mem buffer handling API, changing the return to the correct struct vb2_v4l2_buffer instead of a void pointer.
--- drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c | 6 +++--- drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c +3 -3
@@ -80,7 +80,7 @@ rk3288_vpu_jpeg_enc_set_qtable(struct rockchip_vpu_dev *vpu,void rk3288_vpu_jpeg_enc_run (struct rockchip_vpu_ctx *ctx) {struct rockchip_vpu_dev *vpu = ctx->dev; -struct vb2_buffer *src_buf, *dst_buf; +struct vb2_v4l2_buffer *src_buf, *dst_buf;struct rockchip_vpu_jpeg_ctx jpeg_ctx;u32 reg;
@@ -88,7 +88,7 @@ void rk3288_vpu_jpeg_enc_run(struct rockchip_vpu_ctx *ctx) dst_buf =v4l2_m2m_next_dst_buf (ctx->fh.m2m_ctx);memset (&jpeg_ctx,0 ,sizeof (jpeg_ctx)); - jpeg_ctx.buffer =vb2_plane_vaddr (dst_buf,0 ); + jpeg_ctx.buffer =vb2_plane_vaddr (&dst_buf->vb2_buf,0 ); jpeg_ctx.width = ctx->dst_fmt.width; jpeg_ctx.height = ctx->dst_fmt.height; jpeg_ctx.quality = ctx->jpeg_quality;
@@ -99,7 +99,7 @@ void rk3288_vpu_jpeg_enc_run(struct rockchip_vpu_ctx *ctx) VEPU_REG_ENC_CTRL);rk3288_vpu_set_src_img_ctrl (vpu, ctx); -rk3288_vpu_jpeg_enc_set_buffers (vpu, ctx, src_buf); +rk3288_vpu_jpeg_enc_set_buffers (vpu, ctx, &src_buf->vb2_buf);rk3288_vpu_jpeg_enc_set_qtable (vpu,rockchip_vpu_jpeg_get_qtable (&jpeg_ctx,0 ),rockchip_vpu_jpeg_get_qtable (&jpeg_ctx,1 ));
drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c +3 -3
@@ -111,7 +111,7 @@ rk3399_vpu_jpeg_enc_set_qtable(struct rockchip_vpu_dev *vpu,void rk3399_vpu_jpeg_enc_run (struct rockchip_vpu_ctx *ctx) {struct rockchip_vpu_dev *vpu = ctx->dev; -struct vb2_buffer *src_buf, *dst_buf; +struct vb2_v4l2_buffer *src_buf, *dst_buf;struct rockchip_vpu_jpeg_ctx jpeg_ctx;u32 reg;
@@ -119,7 +119,7 @@ void rk3399_vpu_jpeg_enc_run(struct rockchip_vpu_ctx *ctx) dst_buf =v4l2_m2m_next_dst_buf (ctx->fh.m2m_ctx);memset (&jpeg_ctx,0 ,sizeof (jpeg_ctx)); - jpeg_ctx.buffer =vb2_plane_vaddr (dst_buf,0 ); + jpeg_ctx.buffer =vb2_plane_vaddr (&dst_buf->vb2_buf,0 ); jpeg_ctx.width = ctx->dst_fmt.width; jpeg_ctx.height = ctx->dst_fmt.height; jpeg_ctx.quality = ctx->jpeg_quality;
@@ -130,7 +130,7 @@ void rk3399_vpu_jpeg_enc_run(struct rockchip_vpu_ctx *ctx) VEPU_REG_ENCODE_START);rk3399_vpu_set_src_img_ctrl (vpu, ctx); -rk3399_vpu_jpeg_enc_set_buffers (vpu, ctx, src_buf); +rk3399_vpu_jpeg_enc_set_buffers (vpu, ctx, &src_buf->vb2_buf);rk3399_vpu_jpeg_enc_set_qtable (vpu,rockchip_vpu_jpeg_get_qtable (&jpeg_ctx,0 ),rockchip_vpu_jpeg_get_qtable (&jpeg_ctx,1 ));
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 127/262 mt76: usb: do not run mt76u_queues_deinit twice
In reply to Sasha LevinFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit b3098121c42caaf3aea239b8655cf52d45be116f ]
Do not call mt76u_queues_deinit routine in mt76u_alloc_queues error path since it will be run in mt76x0u_register_device or mt76x2u_register_device error path. Current implementation triggers the following kernel warning:
[ 67.005516] WARNING: CPU: 2 PID: 761 at lib/refcount.c:187 refcount_sub_and_test_checked+0xa4/0xb8 [ 67.019513] refcount_t: underflow; use-after-free. [ 67.099872] Hardware name: BCM2835 [ 67.106268] Backtrace: [ 67.111584] [<8010c91c>] (dump_backtrace) from [<8010cc00>] (show_stack+0x20/0x24) [ 67.124974] r6:60000013 r5:ffffffff r4:00000000 r3:a50bade6 [ 67.132226] [<8010cbe0>] (show_stack) from [<807ca5f4>] (dump_stack+0xc8/0x114) [ 67.141225] [<807ca52c>] (dump_stack) from [<8011e65c>] (__warn+0xf4/0x120) [ 67.149849] r9:000000bb r8:804d0138 r7:00000009 r6:8099dc84 r5:00000000 r4:b66c7b58 [ 67.160767] [<8011e568>] (__warn) from [<8011e6d0>] (warn_slowpath_fmt+0x48/0x50) [ 67.171436] r9:7f65e128 r8:80d1419c r7:80c0bac4 r6:b97b3044 r5:b7368e00 r4:00000000 [ 67.182433] [<8011e68c>] (warn_slowpath_fmt) from [<804d0138>] (refcount_sub_and_test_checked+0xa4/0xb8) [ 67.195221] r3:80c91c25 r2:8099dc94 [ 67.200370] r4:00000000 [ 67.204397] [<804d0094>] (refcount_sub_and_test_checked) from [<804d0164>] (refcount_dec_and_test_checked+0x18/0x1c) [ 67.218046] r4:b7368e00 r3:00000001 [ 67.223125] [<804d014c>] (refcount_dec_and_test_checked) from [<805db49c>] (usb_free_urb+0x20/0x4c) [ 67.235358] [<805db47c>] (usb_free_urb) from [<7f639804>] (mt76u_buf_free+0x98/0xac [mt76_usb]) [ 67.247302] r4:00000001 r3:00000001 [ 67.252468] [<7f63976c>] (mt76u_buf_free [mt76_usb]) from [<7f639ef8>] (mt76u_queues_deinit+0x44/0x100 [mt76_usb]) [ 67.266102] r8:b8fe8600 r7:b5dac480 r6:b5dace20 r5:00000001 r4:00000000 r3:00000080 [ 67.277132] [<7f639eb4>] (mt76u_queues_deinit [mt76_usb]) from [<7f65c040>] (mt76x0u_cleanup+0x40/0x4c [mt76x0u]) [ 67.290737] r7:b5dac480 r6:b8fe8600 r5:ffffffea r4:b5dace20 [ 67.298069] [<7f65c000>] (mt76x0u_cleanup [mt76x0u]) from [<7f65c564>] (mt76x0u_probe+0x1f0/0x354 [mt76x0u]) [ 67.311174] r4:b5dace20 r3:00000000 [ 67.316312] [<7f65c374>] (mt76x0u_probe [mt76x0u]) from [<805e0b6c>] (usb_probe_interface+0x104/0x240) [ 67.328915] r7:00000000 r6:7f65e034 r5:b6634800 r4:b8fe8620 [ 67.336276] [<805e0a68>] (usb_probe_interface) from [<8056a8bc>] (really_probe+0x224/0x2f8) [ 67.347965] r10:b65f0a00 r9:00000019 r8:7f65e034 r7:80d3e124 r6:00000000 r5:80d3e120 [ 67.359175] r4:b8fe8620 r3:805e0a68 [ 67.364384] [<8056a698>] (really_probe) from [<8056ab60>] (driver_probe_device+0x6c/0x180) [ 67.375974] r10:b65f0a00 r9:7f65e2c0 r8:b8fe8620 r7:00000000 r6:7f65e034 r5:7f65e034 [ 67.387170] r4:b8fe8620 r3:00000000 [ 67.392378] [<8056aaf4>] (driver_probe_device) from [<8056ad54>] (__driver_attach+0xe0/0xe4) [ 67.404097] r9:7f65e2c0 r8:7f65d22c r7:00000000 r6:b8fe8654 r5:7f65e034 r4:b8fe8620 [ 67.415122] [<8056ac74>] (__driver_attach) from [<8056880c>] (bus_for_each_dev+0x68/0xa0) [ 67.426628] r6:8056ac74 r5:7f65e034 r4:00000000 r3:00000027 [ 67.434017] [<805687a4>] (bus_for_each_dev) from [<8056a1cc>] (driver_attach+0x28/0x30) [ 67.445394] r6:80c6ddc8 r5:b7368f80 r4:7f65e034 [ 67.451703] [<8056a1a4>] (driver_attach) from [<80569c24>] (bus_add_driver+0x194/0x21c) [ 67.463081] [<80569a90>] (bus_add_driver) from [<8056b504>] (driver_register+0x8c/0x124) [ 67.474560] r7:80c6ddc8 r6:7f65e034 r5:00000000 r4:7f65e034 [ 67.481964] [<8056b478>] (driver_register) from [<805df510>] (usb_register_driver+0x74/0x140) [ 67.493901] r5:00000000 r4:7f65e000 [ 67.499131] [<805df49c>] (usb_register_driver) from [<7f661024>] (mt76x0_driver_init+0x24/0x1000 [mt76x0u]) [ 67.512258] r9:00000001 r8:7f65e308 r7:00000000 r6:80c08d48 r5:7f661000 r4:7f65e2c0 [ 67.523404] [<7f661000>] (mt76x0_driver_init [mt76x0u]) from [<80102f6c>] (do_one_initcall+0x4c/0x210) [ 67.536142] [<80102f20>] (do_one_initcall) from [<801ae63c>] (do_init_module+0x6c/0x21c) [ 67.547639] r8:7f65e308 r7:80c08d48 r6:b65f0ac0 r5:7f65e2c0 r4:7f65e2c0 [ 67.556129] [<801ae5d0>] (do_init_module) from [<801ad68c>] (load_module+0x1d10/0x2304)
--- drivers/net/wireless/mediatek/mt76/usb.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/net/wireless/mediatek/mt76/usb.c +2 -9
@@ -838,16 +838,9 @@ int mt76u_alloc_queues(struct mt76_dev *dev) err =mt76u_alloc_rx (dev);if (err <0 ) - goto err; - - err =mt76u_alloc_tx (dev); -if (err <0 ) - goto err; +return err; -return 0 ; -err: -mt76u_queues_deinit (dev); -return err; +return mt76u_alloc_tx (dev); }EXPORT_SYMBOL_GPL (mt76u_alloc_queues);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 128/262 Bluetooth: hci_ldisc: Initialize hci_dev before open()
In reply to Sasha LevinFrom: Jeremy Cline <[email protected]>
[ Upstream commit 32a7b4cbe93b0a0ef7e63d31ca69ce54736c4412 ]
The hci_dev struct hdev is referenced in work queues and timers started by open() in some protocols. This creates a race between the initialization function and the work or timer which can result hdev being dereferenced while it is still null.
The syzbot report contains a reliable reproducer which causes a null pointer dereference of hdev in hci_uart_write_work() by making the memory allocation for hdev fail.
To fix this, ensure hdev is valid from before calling a protocol's open() until after calling a protocol's close().
--- drivers/bluetooth/hci_ldisc.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
drivers/bluetooth/hci_ldisc.c +14 -7
@@ -207,11 +207,11 @@ void hci_uart_init_work(struct work_struct *work) err =hci_register_dev (hu->hdev);if (err <0 ) {BT_ERR ("Can't register HCI device" ); +clear_bit (HCI_UART_PROTO_READY , &hu->flags); + hu->proto->close (hu); hdev = hu->hdev; hu->hdev =NULL ;hci_free_dev (hdev); -clear_bit (HCI_UART_PROTO_READY , &hu->flags); - hu->proto->close (hu);return ; }
@@ -616,6 +616,7 @@ static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data,static int hci_uart_register_dev (struct hci_uart *hu) {struct hci_dev *hdev; +int err;BT_DBG ("" );
@@ -659,11 +660,22 @@ static int hci_uart_register_dev(struct hci_uart *hu)else hdev->dev_type =HCI_PRIMARY ; +/* Only call open() for the protocol after hdev is fully initialized as +* open() (or a timer/workqueue it starts) may attempt to reference it. +*/ + err = hu->proto->open (hu); +if (err) { + hu->hdev =NULL ; +hci_free_dev (hdev); +return err; + } +if (test_bit (HCI_UART_INIT_PENDING , &hu->hdev_flags))return 0 ;if (hci_register_dev (hdev) <0 ) {BT_ERR ("Can't register HCI device" ); + hu->proto->close (hu); hu->hdev =NULL ;hci_free_dev (hdev);return -ENODEV ;
@@ -683,17 +695,12 @@ static int hci_uart_set_proto(struct hci_uart *hu, int id)if (!p)return -EPROTONOSUPPORT ; - err = p->open (hu); -if (err) -return err; - hu->proto = p;set_bit (HCI_UART_PROTO_READY , &hu->flags); err =hci_uart_register_dev (hu);if (err) {clear_bit (HCI_UART_PROTO_READY , &hu->flags); - p->close (hu);return err; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 129/262 gpio: of: Apply regulator-gpio quirk only to enable-gpios
In reply to Sasha LevinFrom: Marek Vasut <[email protected]>
[ Upstream commit 0e7d6f94016407fd7e1ae472e254d64d4454e9c8 ]
Since commit d6cd33ad7102 ("regulator: gpio: Convert to use descriptors") the GPIO regulator had inverted the polarity of the control GPIO. This problem manifested itself on systems with DT containing the following description (snippet from salvator-common.dtsi):
gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; gpios-states = <1>; states = <3300000 1 1800000 0>;
Prior to the aforementioned commit, the gpio-regulator code used gpio_request_array() to claim the GPIO(s) specified in the "gpios" DT node, while the commit changed that to devm_gpiod_get_index().
The legacy gpio_request_array() calls gpio_request_one() and then gpiod_request(), which parses the DT flags of the "gpios" node and populates the GPIO descriptor flags field accordingly.
The new devm_gpiod_get_index() calls gpiod_get_index(), then of_find_gpio(), of_get_named_gpiod_flags() with flags != NULL, and then of_gpio_flags_quirks(). Since commit a603a2b8d86e ("gpio: of: Add special quirk to parse regulator flags"), of_gpio_flags_quirks() contains a quirk for regulator-gpio which was never triggered by the legacy gpio_request_array() code path, but is triggered by devm_gpiod_get_index() code path.
This quirk checks whether a GPIO is associated with a fixed or gpio-regulator and if so, checks two additional conditions. First, whether such GPIO is active-low, and if so, ignores the active-low flag. Second, whether the regulator DT node does have an "enable-active-high" property and if the property is NOT present, sets the GPIO flags as active-low.
The second check triggers a problem, since it is applied to all GPIOs associated with a gpio-regulator, rather than only on the "enable" GPIOs, as the old code did. This changes the way the gpio-regulator interprets the DT description of the control GPIOs.
The old code using gpio_request_array() explicitly parsed the "enable-active-high" DT property and only applied it to the GPIOs described in the "enable-gpios" DT node, and only if those were present.
This patch fixes the quirk code by only applying the quirk to "enable-gpios", thus restoring the old behavior.
--- drivers/gpio/gpiolib-of.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpio/gpiolib-of.c +1 -0
@@ -84,6 +84,7 @@ static void of_gpio_flags_quirks(struct device_node *np,* Note that active low is the default. */ if (IS_ENABLED (CONFIG_REGULATOR ) && + !strcmp (propname,"enable-gpio" ) && (of_device_is_compatible (np,"regulator-fixed" ) ||of_device_is_compatible (np,"reg-fixed-voltage" ) ||of_device_is_compatible (np,"regulator-gpio" ))) {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 130/262 xen/gntdev: Do not destroy context while dma-bufs are in use
In reply to Sasha LevinFrom: Oleksandr Andrushchenko <[email protected]>
[ Upstream commit fa13e665e02874c0a5f4d06d6967ae34a6cb3d6a ]
If there are exported DMA buffers which are still in use and grant device is closed by either normal user-space close or by a signal this leads to the grant device context to be destroyed, thus making it not possible to correctly destroy those exported buffers when they are returned back to gntdev and makes the module crash:
[ 339.617540] [<ffff00000854c0d8>] dmabuf_exp_ops_release+0x40/0xa8 [ 339.617560] [<ffff00000867a6e8>] dma_buf_release+0x60/0x190 [ 339.617577] [<ffff0000082211f0>] __fput+0x88/0x1d0 [ 339.617589] [<ffff000008221394>] ____fput+0xc/0x18 [ 339.617607] [<ffff0000080ed4e4>] task_work_run+0x9c/0xc0 [ 339.617622] [<ffff000008089714>] do_notify_resume+0xfc/0x108
Fix this by referencing gntdev on each DMA buffer export and unreferencing on buffer release.
--- drivers/xen/gntdev-dmabuf.c | 12 +++++++++++- drivers/xen/gntdev-dmabuf.h | 2 +- drivers/xen/gntdev.c | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-)
drivers/xen/gntdev-dmabuf.c +11 -1
@@ -80,6 +80,12 @@ struct gntdev_dmabuf_priv {struct list_head imp_list;/* This is the lock which protects dma_buf_xxx lists. */ struct mutex lock; +/* +* We reference this file while exporting dma-bufs, so +* the grant device context is not destroyed while there are +* external users alive. +*/ +struct file *filp; };/* DMA buffer export support. */
@@ -311,6 +317,7 @@ static void dmabuf_exp_release(struct kref *kref)dmabuf_exp_wait_obj_signal (gntdev_dmabuf->priv, gntdev_dmabuf);list_del (&gntdev_dmabuf->next); +fput (gntdev_dmabuf->priv->filp);kfree (gntdev_dmabuf); }
@@ -423,6 +430,7 @@ static int dmabuf_exp_from_pages(struct gntdev_dmabuf_export_args *args)mutex_lock (&args->dmabuf_priv->lock);list_add (&gntdev_dmabuf->next, &args->dmabuf_priv->exp_list);mutex_unlock (&args->dmabuf_priv->lock); +get_file (gntdev_dmabuf->priv->filp);return 0 ; fail:
@@ -834,7 +842,7 @@ long gntdev_ioctl_dmabuf_imp_release(struct gntdev_priv *priv,return dmabuf_imp_release (priv->dmabuf_priv, op.fd); } -struct gntdev_dmabuf_priv *gntdev_dmabuf_init (void ) +struct gntdev_dmabuf_priv *gntdev_dmabuf_init (struct file *filp) {struct gntdev_dmabuf_priv *priv;
@@ -847,6 +855,8 @@ struct gntdev_dmabuf_priv *gntdev_dmabuf_init(void)INIT_LIST_HEAD (&priv->exp_wait_list);INIT_LIST_HEAD (&priv->imp_list); + priv->filp = filp; +return priv; }
drivers/xen/gntdev-dmabuf.h +1 -1
@@ -14,7 +14,7 @@struct gntdev_dmabuf_priv ;struct gntdev_priv ; -struct gntdev_dmabuf_priv *gntdev_dmabuf_init (void ); +struct gntdev_dmabuf_priv *gntdev_dmabuf_init (struct file *filp);void gntdev_dmabuf_fini (struct gntdev_dmabuf_priv *priv);
drivers/xen/gntdev.c +1 -1
@@ -600,7 +600,7 @@ static int gntdev_open(struct inode *inode, struct file *flip)mutex_init (&priv->lock);#ifdef CONFIG_XEN_GNTDEV_DMABUF - priv->dmabuf_priv =gntdev_dmabuf_init (); + priv->dmabuf_priv =gntdev_dmabuf_init (flip);if (IS_ERR (priv->dmabuf_priv)) { ret =PTR_ERR (priv->dmabuf_priv);kfree (priv);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 131/262 vfs: fix preadv64v2 and pwritev64v2 compat syscalls with offset == -1
In reply to Sasha LevinFrom: Aurelien Jarno <[email protected]>
[ Upstream commit cc4b1242d7e3b42eed73881fc749944146493e4f ]
The preadv2 and pwritev2 syscalls are supposed to emulate the readv and writev syscalls when offset == -1. Therefore the compat code should check for offset before calling do_compat_preadv64 and do_compat_pwritev64. This is the case for the preadv2 and pwritev2 syscalls, but handling of offset == -1 is missing in their 64-bit equivalent.
This patch fixes that, calling do_compat_readv and do_compat_writev when offset == -1. This fixes the following glibc tests on x32:
- misc/tst-preadvwritev2
- misc/tst-preadvwritev64v2
--- fs/read_write.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/read_write.c +6 -0
@@ -1238,6 +1238,9 @@ COMPAT_SYSCALL_DEFINE5(preadv64v2, unsigned long, fd, const struct compat_iovec __user *,vec, unsigned long, vlen, loff_t, pos, rwf_t, flags) { + if (pos == -1) + return do_compat_readv(fd, vec, vlen, flags); +return do_compat_preadv64 (fd, vec, vlen, pos, flags); }#endif
@@ -1344,6 +1347,9 @@ COMPAT_SYSCALL_DEFINE5(pwritev64v2, unsigned long, fd, const struct compat_iovec __user *,vec, unsigned long, vlen, loff_t, pos, rwf_t, flags) { + if (pos == -1) + return do_compat_writev(fd, vec, vlen, flags); +return do_compat_pwritev64 (fd, vec, vlen, pos, flags); }#endif
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 132/262 HID: intel-ish-hid: avoid binding wrong ishtp_cl_device
In reply to Sasha LevinFrom: Hong Liu <[email protected]>
[ Upstream commit 0d28f49412405d87d3aae83da255070a46e67627 ]
When performing a warm reset in ishtp bus driver, the ishtp_cl_device will not be removed, its fw_client still points to the already freed ishtp_device.fw_clients array.
Later after driver finishing ishtp client enumeration, this dangling pointer may cause driver to bind the wrong ishtp_cl_device to the new client, causing wrong callback to be called for messages intended for the new client.
This helps in development of firmware where frequent switching of firmwares is required without Linux reboot.
--- drivers/hid/intel-ish-hid/ishtp/bus.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/hid/intel-ish-hid/ishtp/bus.c +3 -1
@@ -675,7 +675,8 @@ int ishtp_cl_device_bind(struct ishtp_cl *cl)spin_lock_irqsave (&cl->dev->device_list_lock, flags);list_for_each_entry (cl_device, &cl->dev->device_list, device_link) { -if (cl_device->fw_client->client_id == cl->fw_client_id) { +if (cl_device->fw_client && + cl_device->fw_client->client_id == cl->fw_client_id) { cl->device = cl_device; rv =0 ;break ;
@@ -735,6 +736,7 @@ void ishtp_bus_remove_all_clients(struct ishtp_device *ishtp_dev,spin_lock_irqsave (&ishtp_dev->device_list_lock, flags);list_for_each_entry_safe (cl_device, n, &ishtp_dev->device_list, device_link) { + cl_device->fw_client =NULL ;if (warm_reset && cl_device->reference_count)continue ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 133/262 cgroup, rstat: Don't flush subtree root unless necessary
In reply to Sasha LevinFrom: Tejun Heo <[email protected]>
[ Upstream commit b4ff1b44bcd384d22fcbac6ebaf9cc0d33debe50 ]
cgroup_rstat_cpu_pop_updated() is used to traverse the updated cgroups on flush. While it was only visiting updated ones in the subtree, it was visiting @root unconditionally. We can easily check whether @root is updated or not by looking at its ->updated_next just as with the cgroups in the subtree.
* Remove the unnecessary cgroup_parent() test. The system root cgroup is never updated and thus its ->updated_next is always NULL. No need to test whether cgroup_parent() exists in addition to ->updated_next.
* Terminate traverse if ->updated_next is NULL. This can only happen for subtree @root and there's no reason to visit it if it's not marked updated.
This reduces cpu consumption when reading a lot of rstat backed files. In a micro benchmark reading stat from ~1600 cgroups, the sys time was lowered by >40%.
--- kernel/cgroup/rstat.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
kernel/cgroup/rstat.c +6 -4
@@ -87,7 +87,6 @@ static struct cgroup *cgroup_rstat_cpu_pop_updated(struct cgroup *pos, struct cgroup *root, int cpu) {struct cgroup_rstat_cpu *rstatc; -struct cgroup *parent;if (pos == root)return NULL ;
@@ -115,8 +114,8 @@ static struct cgroup *cgroup_rstat_cpu_pop_updated(struct cgroup *pos,* However, due to the way we traverse, @pos will be the first * child in most cases. The only exception is @root. */ - parent =cgroup_parent (pos); -if (parent && rstatc->updated_next) { +if (rstatc->updated_next) { +struct cgroup *parent =cgroup_parent (pos);struct cgroup_rstat_cpu *prstatc =cgroup_rstat_cpu (parent, cpu);struct cgroup_rstat_cpu *nrstatc;struct cgroup **nextp;
@@ -140,9 +139,12 @@ static struct cgroup *cgroup_rstat_cpu_pop_updated(struct cgroup *pos,* updated stat. */ smp_mb (); + +return pos; } -return pos; +/* only happens for @root */ +return NULL ; }/* see cgroup_rstat_flush() */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 134/262 efi: Fix build error due to enum collision between efi.h and ima.h
In reply to Sasha LevinFrom: Anders Roxell <[email protected]>
[ Upstream commit 5c418dc789a3898717ebf2caa5716ba91a7150b2 ]
The following commit:
a893ea15d764 ("tpm: move tpm_chip definition to include/linux/tpm.h")
introduced a build error when both IMA and EFI are enabled:
In file included from ../security/integrity/ima/ima_fs.c:30:
../security/integrity/ima/ima.h:176:7: error: redeclaration of enumerator "NONE"
What happens is that both headers (ima.h and efi.h) defines the same 'NONE' constant, and it broke when they started getting included from the same file:
Rework to prefix the EFI enum with 'EFI_*'.
--- arch/x86/platform/efi/quirks.c | 4 +-- drivers/firmware/efi/runtime-wrappers.c | 48 ++++++++++++------------- include/linux/efi.h | 26 +++++++------- 3 files changed, 39 insertions(+), 39 deletions(-)
arch/x86/platform/efi/quirks.c +2 -2
@@ -717,7 +717,7 @@ void efi_recover_from_page_fault(unsigned long phys_addr)* "efi_mm" cannot be used to check if the page fault had occurred * in the firmware context because efi=old_map doesn't use efi_pgd. */ -if (efi_rts_work.efi_rts_id ==NONE ) +if (efi_rts_work.efi_rts_id ==EFI_NONE )return ;/*
@@ -742,7 +742,7 @@ void efi_recover_from_page_fault(unsigned long phys_addr)* because this case occurs *very* rarely and hence could be improved * on a need by basis. */ -if (efi_rts_work.efi_rts_id ==RESET_SYSTEM ) { +if (efi_rts_work.efi_rts_id ==EFI_RESET_SYSTEM ) {pr_info ("efi_reset_system() buggy! Reboot through BIOS\n" );machine_real_restart (MRR_BIOS );return ;
drivers/firmware/efi/runtime-wrappers.c +24 -24
165 lines not on this page · raw message
include/linux/efi.h +13 -13
@@ -1699,19 +1699,19 @@ extern int efi_tpm_eventlog_init(void);* fault happened while executing an efi runtime service. */ enum efi_rts_ids { -NONE , -GET_TIME , -SET_TIME , -GET_WAKEUP_TIME , -SET_WAKEUP_TIME , -GET_VARIABLE , -GET_NEXT_VARIABLE , -SET_VARIABLE , -QUERY_VARIABLE_INFO , -GET_NEXT_HIGH_MONO_COUNT , -RESET_SYSTEM , -UPDATE_CAPSULE , -QUERY_CAPSULE_CAPS , +EFI_NONE , +EFI_GET_TIME , +EFI_SET_TIME , +EFI_GET_WAKEUP_TIME , +EFI_SET_WAKEUP_TIME , +EFI_GET_VARIABLE , +EFI_GET_NEXT_VARIABLE , +EFI_SET_VARIABLE , +EFI_QUERY_VARIABLE_INFO , +EFI_GET_NEXT_HIGH_MONO_COUNT , +EFI_RESET_SYSTEM , +EFI_UPDATE_CAPSULE , +EFI_QUERY_CAPSULE_CAPS , };/*
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 135/262 drm/sched: Fix entities with 0 rqs.
In reply to Sasha LevinFrom: Bas Nieuwenhuizen <[email protected]>
[ Upstream commit 1decbf6bb0b4dc56c9da6c5e57b994ebfc2be3aa ]
Some blocks in amdgpu can have 0 rqs.
Job creation already fails with -ENOENT when entity->rq is NULL, so jobs cannot be pushed. Without a rq there is no scheduler to pop jobs, and rq selection already does the right thing with a list of length 0.
So the operations we need to fix are:
- Creation, do not set rq to rq_list[0] if the list can have length 0.
- Do not flush any jobs when there is no rq.
- On entity destruction handle the rq = NULL case.
- on set_priority, do not try to change the rq if it is NULL.
--- drivers/gpu/drm/scheduler/sched_entity.c | 39 ++++++++++++++++-------- 1 file changed, 26 insertions(+), 13 deletions(-)
drivers/gpu/drm/scheduler/sched_entity.c +26 -13
@@ -52,12 +52,12 @@ int drm_sched_entity_init(struct drm_sched_entity *entity, {int i; -if (!(entity && rq_list && num_rq_list >0 && rq_list[0 ])) +if (!(entity && rq_list && (num_rq_list ==0 || rq_list[0 ])))return -EINVAL ;memset (entity,0 ,sizeof (struct drm_sched_entity ));INIT_LIST_HEAD (&entity->list); - entity->rq = rq_list[0 ]; + entity->rq =NULL ; entity->guilty = guilty; entity->num_rq_list = num_rq_list; entity->rq_list = kcalloc(num_rq_list, sizeof(struct drm_sched_rq *),
@@ -67,6 +67,10 @@ int drm_sched_entity_init(struct drm_sched_entity *entity,for (i =0 ; i < num_rq_list; ++i) entity->rq_list[i] = rq_list[i]; + +if (num_rq_list) + entity->rq = rq_list[0 ]; + entity->last_scheduled =NULL ;spin_lock_init (&entity->rq_lock);
@@ -165,6 +169,9 @@ long drm_sched_entity_flush(struct drm_sched_entity *entity, long timeout)struct task_struct *last_user;long ret = timeout; +if (!entity->rq) +return 0 ; + sched = entity->rq->sched;/** * The client will not queue more IBs during this fini, consume existing
@@ -264,20 +271,24 @@ static void drm_sched_entity_kill_jobs(struct drm_sched_entity *entity)*/ void drm_sched_entity_fini (struct drm_sched_entity *entity) { -struct drm_gpu_scheduler *sched; +struct drm_gpu_scheduler *sched =NULL ; - sched = entity->rq->sched; -drm_sched_rq_remove_entity (entity->rq, entity); +if (entity->rq) { + sched = entity->rq->sched; +drm_sched_rq_remove_entity (entity->rq, entity); + }/* Consumption of existing IBs wasn't completed. Forcefully * remove them here. */ if (spsc_queue_peek (&entity->job_queue)) { -/* Park the kernel for a moment to make sure it isn't processing -* our enity. -*/ -kthread_park (sched->thread); -kthread_unpark (sched->thread); +if (sched) { +/* Park the kernel for a moment to make sure it isn't processing +* our enity. +*/ +kthread_park (sched->thread); +kthread_unpark (sched->thread); + }if (entity->dependency) {dma_fence_remove_callback (entity->dependency, &entity->cb);
@@ -362,9 +373,11 @@ void drm_sched_entity_set_priority(struct drm_sched_entity *entity,for (i =0 ; i < entity->num_rq_list; ++i)drm_sched_entity_set_rq_priority (&entity->rq_list[i], priority); -drm_sched_rq_remove_entity (entity->rq, entity); -drm_sched_entity_set_rq_priority (&entity->rq, priority); -drm_sched_rq_add_entity (entity->rq, entity); +if (entity->rq) { +drm_sched_rq_remove_entity (entity->rq, entity); +drm_sched_entity_set_rq_priority (&entity->rq, priority); +drm_sched_rq_add_entity (entity->rq, entity); + }spin_unlock (&entity->rq_lock); }
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel