5.8.6-rc1 review
Subsystems (6)
Greg Kroah-Hartman
maintainerPATCH 248/255 mm/page_counter: fix various data races at memsw
In reply to Greg Kroah-HartmanFrom: Qian Cai <[email protected]>
commit 6e4bd50f3888fa8fea8bc66a0ad4ad5f1c862961 upstream.
Commit 3e32cb2e0a12 ("mm: memcontrol: lockless page counters") could had memcg->memsw->watermark and memcg->memsw->failcnt been accessed concurrently as reported by KCSAN,
BUG: KCSAN: data-race in page_counter_try_charge / page_counter_try_charge
read to 0xffff8fb18c4cd190 of 8 bytes by task 1081 on cpu 59:
page_counter_try_charge+0x4d/0x150 mm/page_counter.c:138 try_charge+0x131/0xd50 mm/memcontrol.c:2405 __memcg_kmem_charge_memcg+0x58/0x140 __memcg_kmem_charge+0xcc/0x280 __alloc_pages_nodemask+0x1e1/0x450 alloc_pages_current+0xa6/0x120 pte_alloc_one+0x17/0xd0 __pte_alloc+0x3a/0x1f0 copy_p4d_range+0xc36/0x1990 copy_page_range+0x21d/0x360 dup_mmap+0x5f5/0x7a0 dup_mm+0xa2/0x240 copy_process+0x1b3f/0x3460 _do_fork+0xaa/0xa20 __x64_sys_clone+0x13b/0x170 do_syscall_64+0x91/0xb47 entry_SYSCALL_64_after_hwframe+0x49/0xbe
write to 0xffff8fb18c4cd190 of 8 bytes by task 1153 on cpu 120:
page_counter_try_charge+0x5b/0x150 mm/page_counter.c:139 try_charge+0x131/0xd50 mm/memcontrol.c:2405 mem_cgroup_try_charge+0x159/0x460 mem_cgroup_try_charge_delay+0x3d/0xa0 wp_page_copy+0x14d/0x930 do_wp_page+0x107/0x7b0 __handle_mm_fault+0xce6/0xd40 handle_mm_fault+0xfc/0x2f0 do_page_fault+0x263/0x6f9 page_fault+0x34/0x40 BUG: KCSAN: data-race in page_counter_try_charge / page_counter_try_charge
write to 0xffff88809bbf2158 of 8 bytes by task 11782 on cpu 0:
page_counter_try_charge+0x100/0x170 mm/page_counter.c:129 try_charge+0x185/0xbf0 mm/memcontrol.c:2405 __memcg_kmem_charge_memcg+0x4a/0xe0 mm/memcontrol.c:2837 __memcg_kmem_charge+0xcf/0x1b0 mm/memcontrol.c:2877 __alloc_pages_nodemask+0x26c/0x310 mm/page_alloc.c:4780
read to 0xffff88809bbf2158 of 8 bytes by task 11814 on cpu 1:
page_counter_try_charge+0xef/0x170 mm/page_counter.c:129 try_charge+0x185/0xbf0 mm/memcontrol.c:2405 __memcg_kmem_charge_memcg+0x4a/0xe0 mm/memcontrol.c:2837 __memcg_kmem_charge+0xcf/0x1b0 mm/memcontrol.c:2877 __alloc_pages_nodemask+0x26c/0x310 mm/page_alloc.c:4780
Since watermark could be compared or set to garbage due to a data race which would change the code logic, fix it by adding a pair of READ_ONCE() and WRITE_ONCE() in those places.
The "failcnt" counter is tolerant of some degree of inaccuracy and is only used to report stats, a data race will not be harmful, thus mark it as an intentional data race using the data_race() macro.
--- mm/page_counter.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
mm/page_counter.c +7 -6
@@ -77,8 +77,8 @@ void page_counter_charge(struct page_cou* This is indeed racy, but we can live with some * inaccuracy in the watermark. */ -if (new > c->watermark) - c->watermark = new; +if (new >READ_ONCE (c->watermark)) +WRITE_ONCE (c->watermark, new); } }
@@ -119,9 +119,10 @@ bool page_counter_try_charge(struct pagepropagate_protected_usage (c, new);/* * This is racy, but we can live with some -* inaccuracy in the failcnt. +* inaccuracy in the failcnt which is only used +* to report stats. */ - c->failcnt++; +data_race (c->failcnt++); *fail = c; goto failed; }
@@ -130,8 +131,8 @@ bool page_counter_try_charge(struct page* Just like with failcnt, we can live with some * inaccuracy in the watermark. */ -if (new > c->watermark) - c->watermark = new; +if (new >READ_ONCE (c->watermark)) +WRITE_ONCE (c->watermark, new); }return true;
Greg Kroah-Hartman
maintainerPATCH 228/255 USB: gadget: u_f: add overflow checks to VLA macros
In reply to Greg Kroah-HartmanFrom: Brooke Basile <[email protected]>
commit b1cd1b65afba95971fa457dfdb2c941c60d38c5b upstream.
size can potentially hold an overflowed value if its assigned expression is left unchecked, leading to a smaller than needed allocation when vla_group_size() is used by callers to allocate memory.
To fix this, add a test for saturation before declaring variables and an overflow check to (n) * sizeof(type).
If the expression results in overflow, vla_group_size() will return SIZE_MAX.
--- drivers/usb/gadget/u_f.h | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-)
drivers/usb/gadget/u_f.h +27 -11
@@ -14,6 +14,7 @@#define __U_F_H__#include <linux/usb/gadget.h> +#include <linux/overflow.h> /* Variable Length Array Macros **********************************************/ #define vla_group (groupname) size_t groupname##__next = 0
@@ -21,21 +22,36 @@#define vla_item (groupname, type, name, n) \ size_t groupname##_##name##__offset = ({ \ - size_t align_mask = __alignof__(type) - 1; \ - size_t offset = (groupname##__next + align_mask) & ~align_mask;\ - size_t size = (n) * sizeof(type); \ - groupname##__next = offset + size; \ + size_t offset = 0; \ + if (groupname##__next != SIZE_MAX) { \ + size_t align_mask = __alignof__(type) - 1; \ + size_t offset = (groupname##__next + align_mask) \ + & ~align_mask; \ + size_t size = array_size(n, sizeof(type)); \ + if (check_add_overflow(offset, size, \ + &groupname##__next)) { \ + groupname##__next = SIZE_MAX; \ + offset = 0; \ + } \ + } \ offset; \ })#define vla_item_with_sz (groupname, type, name, n) \ - size_t groupname##_##name##__sz = (n) * sizeof(type); \ - size_t groupname##_##name##__offset = ({ \ - size_t align_mask = __alignof__(type) - 1; \ - size_t offset = (groupname##__next + align_mask) & ~align_mask;\ - size_t size = groupname##_##name##__sz; \ - groupname##__next = offset + size; \ - offset; \ + size_t groupname##_##name##__sz = array_size(n, sizeof(type)); \ + size_t groupname##_##name##__offset = ({ \ + size_t offset = 0; \ + if (groupname##__next != SIZE_MAX) { \ + size_t align_mask = __alignof__(type) - 1; \ + size_t offset = (groupname##__next + align_mask) \ + & ~align_mask; \ + if (check_add_overflow(offset, groupname##_##name##__sz,\ + &groupname##__next)) { \ + groupname##__next = SIZE_MAX; \ + offset = 0; \ + } \ + } \ + offset; \ })#define vla_ptr (ptr, groupname, name) \
Greg Kroah-Hartman
maintainerPATCH 189/255 writeback: Fix sync livelock due to b_dirty_time processing
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit f9cae926f35e8230330f28c7b743ad088611a8de upstream.
When we are processing writeback for sync(2), move_expired_inodes() didn't set any inode expiry value (older_than_this). This can result in writeback never completing if there's steady stream of inodes added to b_dirty_time list as writeback rechecks dirty lists after each writeback round whether there's more work to be done. Fix the problem by using sync(2) start time is inode expiry value when processing b_dirty_time list similarly as for ordinarily dirtied inodes. This requires some refactoring of older_than_this handling which simplifies the code noticeably as a bonus.
--- fs/fs-writeback.c | 44 +++++++++++++++------------------------ include/trace/events/writeback.h | 13 +++++------ 2 files changed, 23 insertions(+), 34 deletions(-)
fs/fs-writeback.c +17 -27
@@ -42,7 +42,6 @@struct wb_writeback_work {long nr_pages;struct super_block *sb; -unsigned long *older_than_this;enum writeback_sync_modes sync_mode;unsigned int tagged_writepages:1 ;unsigned int for_kupdate:1 ;
@@ -1234,16 +1233,13 @@ static bool inode_dirtied_after(struct i#define EXPIRE_DIRTY_ATIME 0x0001/* -* Move expired (dirtied before work->older_than_this) dirty inodes from +* Move expired (dirtied before dirtied_before) dirty inodes from * @delaying_queue to @dispatch_queue. */ static int move_expired_inodes (struct list_head *delaying_queue,struct list_head *dispatch_queue, -int flags, -struct wb_writeback_work *work) +int flags,unsigned long dirtied_before) { -unsigned long *older_than_this =NULL ; -unsigned long expire_time;LIST_HEAD (tmp);struct list_head *pos, *node;struct super_block *sb =NULL ;
@@ -1251,16 +1247,9 @@ static int move_expired_inodes(struct liint do_sb_sort =0 ;int moved =0 ; -if ((flags &EXPIRE_DIRTY_ATIME ) ==0 ) - older_than_this = work->older_than_this; -else if (!work->for_sync) { - expire_time = jiffies - (dirtytime_expire_interval *HZ ); - older_than_this = &expire_time; - }while (!list_empty (delaying_queue)) { inode =wb_inode (delaying_queue->prev); -if (older_than_this && -inode_dirtied_after (inode, *older_than_this)) +if (inode_dirtied_after (inode, dirtied_before))break ;list_move (&inode->i_io_list, &tmp); moved++;
@@ -1306,18 +1295,22 @@ out:* | * +--> dequeue for IO */ -static void queue_io (struct bdi_writeback *wb,struct wb_writeback_work *work) +static void queue_io (struct bdi_writeback *wb,struct wb_writeback_work *work, +unsigned long dirtied_before) {int moved; +unsigned long time_expire_jif = dirtied_before;assert_spin_locked (&wb->list_lock);list_splice_init (&wb->b_more_io, &wb->b_io); - moved =move_expired_inodes (&wb->b_dirty, &wb->b_io,0 , work); + moved =move_expired_inodes (&wb->b_dirty, &wb->b_io,0 , dirtied_before); +if (!work->for_sync) + time_expire_jif = jiffies - dirtytime_expire_interval *HZ ; moved +=move_expired_inodes (&wb->b_dirty_time, &wb->b_io, -EXPIRE_DIRTY_ATIME , work); +EXPIRE_DIRTY_ATIME , time_expire_jif);if (moved)wb_io_lists_populated (wb); -trace_writeback_queue_io (wb, work, moved); +trace_writeback_queue_io (wb, work, dirtied_before, moved); }static int write_inode (struct inode *inode,struct writeback_control *wbc)
@@ -1829,7 +1822,7 @@ static long writeback_inodes_wb(struct bblk_start_plug (&plug);spin_lock (&wb->list_lock);if (list_empty (&wb->b_io)) -queue_io (wb, &work); +queue_io (wb, &work, jiffies);__writeback_inodes_wb (wb, &work);spin_unlock (&wb->list_lock);blk_finish_plug (&plug);
@@ -1849,7 +1842,7 @@ static long writeback_inodes_wb(struct b* takes longer than a dirty_writeback_interval interval, then leave a * one-second gap. * -* older_than_this takes precedence over nr_to_write. So we'll only write back +* dirtied_before takes precedence over nr_to_write. So we'll only write back * all dirty pages if they are all attached to "old" mappings. */ static long wb_writeback(struct bdi_writeback *wb,
@@ -1857,14 +1850,11 @@ static long wb_writeback(struct bdi_writ {unsigned long wb_start = jiffies;long nr_pages = work->nr_pages; -unsigned long oldest_jif; +unsigned long dirtied_before = jiffies;struct inode *inode;long progress;struct blk_plug plug; - oldest_jif = jiffies; - work->older_than_this = &oldest_jif; -blk_start_plug (&plug);spin_lock (&wb->list_lock);for (;;) {
@@ -1898,14 +1888,14 @@ static long wb_writeback(struct bdi_writ* safe. */ if (work->for_kupdate) { - oldest_jif = jiffies - + dirtied_before = jiffies -msecs_to_jiffies (dirty_expire_interval *10 ); }else if (work->for_background) - oldest_jif = jiffies; + dirtied_before = jiffies;trace_writeback_start (wb, work);if (list_empty (&wb->b_io)) -queue_io (wb, work); +queue_io (wb, work, dirtied_before);if (work->sb) progress =writeback_sb_inodes (work->sb, wb, work);else
include/trace/events/writeback.h +6 -7
@@ -498,8 +498,9 @@ DEFINE_WBC_EVENT(wbc_writepage); TRACE_EVENT(writeback_queue_io, TP_PROTO(struct bdi_writeback *wb, struct wb_writeback_work *work, + unsigned long dirtied_before, int moved), - TP_ARGS(wb, work, moved), + TP_ARGS(wb, work, dirtied_before, moved), TP_STRUCT__entry( __array(char, name, 32) __field(unsigned long, older)
@@ -509,19 +510,17 @@ TRACE_EVENT(writeback_queue_io,__field (ino_t, cgroup_ino) ),TP_fast_assign ( - unsigned long *older_than_this = work->older_than_this; strscpy_pad(__entry->name, bdi_dev_name(wb->bdi), 32); - __entry->older = older_than_this ? *older_than_this :0 ; - __entry->age = older_than_this ? - (jiffies - *older_than_this) *1000 /HZ :-1 ; + __entry->older = dirtied_before; + __entry->age = (jiffies - dirtied_before) *1000 /HZ ; __entry->moved = moved; __entry->reason = work->reason; __entry->cgroup_ino =__trace_wb_assign_cgroup (wb); ),TP_printk ("bdi %s: older=%lu age=%ld enqueue=%d reason=%s cgroup_ino=%lu" , __entry->name, - __entry->older,/* older_than_this in jiffies */ - __entry->age,/* older_than_this in relative milliseconds */ + __entry->older,/* dirtied_before in jiffies */ + __entry->age,/* dirtied_before in relative milliseconds */ __entry->moved,__print_symbolic (__entry->reason,WB_WORK_REASON ), (unsigned long)__entry->cgroup_ino
Greg Kroah-Hartman
maintainerPATCH 252/255 drm/vmwgfx/ldu: Use drm_mode_config_reset
In reply to Greg Kroah-HartmanFrom: Roland Scheidegger <[email protected]>
commit 981243371a5d832af5bc572071172e955d02fe88 upstream.
Same problem as in stdu, same fix.
--- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +2 -6
@@ -387,8 +387,6 @@ static int vmw_ldu_init(struct vmw_priva ldu->base.is_implicit = true;/* Initialize primary plane */ -vmw_du_plane_reset (primary); - ret = drm_universal_plane_init(dev, &ldu->base.primary, 0, &vmw_ldu_plane_funcs, vmw_primary_plane_formats,
@@ -402,8 +400,6 @@ static int vmw_ldu_init(struct vmw_privadrm_plane_helper_add (primary, &vmw_ldu_primary_plane_helper_funcs);/* Initialize cursor plane */ -vmw_du_plane_reset (cursor); - ret = drm_universal_plane_init(dev, &ldu->base.cursor, 0, &vmw_ldu_cursor_funcs, vmw_cursor_plane_formats,
@@ -417,7 +413,6 @@ static int vmw_ldu_init(struct vmw_privadrm_plane_helper_add (cursor, &vmw_ldu_cursor_plane_helper_funcs); -vmw_du_connector_reset (connector); ret =drm_connector_init (dev, connector, &vmw_legacy_connector_funcs,DRM_MODE_CONNECTOR_VIRTUAL );if (ret) {
@@ -445,7 +440,6 @@ static int vmw_ldu_init(struct vmw_priva goto err_free_encoder; } -vmw_du_crtc_reset (crtc); ret =drm_crtc_init_with_planes (dev, crtc, &ldu->base.primary, &ldu->base.cursor, &vmw_legacy_crtc_funcs,NULL );
@@ -520,6 +514,8 @@ int vmw_kms_ldu_init_display(struct vmw_ dev_priv->active_display_unit = vmw_du_legacy; +drm_mode_config_reset (dev); +DRM_INFO ("Legacy Display Unit initialized\n" );return 0 ;
Greg Kroah-Hartman
maintainerPATCH 255/255 ALSA: usb-audio: Update documentation comment for MS2109 quirk
In reply to Greg Kroah-HartmanFrom: Hector Martin <[email protected]>
commit 74a2a7de81a2ef20732ec02087314e92692a7a1b upstream.
As the recent fix addressed the channel swap problem more properly, update the comment as well.
--- sound/usb/quirks-table.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/usb/quirks-table.h +2 -2
@@ -3727,8 +3727,8 @@ ALC1220_VB_DESKTOP(0x26ce, 0x0a01), /* A* they pretend to be 96kHz mono as a workaround for stereo being broken * by that... * -* They also have swapped L-R channels, but that's for userspace to deal -* with. +* They also have an issue with initial stream alignment that causes the +* channels to be swapped and out of phase, which is dealt with in quirks.c. */ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
Greg Kroah-Hartman
maintainerPATCH 253/255 libbpf: Fix build on ppc64le architecture
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
commit 3fb1a96a91120877488071a167d26d76be4be977 upstream.
On ppc64le we get the following warning:
In file included from btf_dump.c:16:0:
btf_dump.c: In function ‘btf_dump_emit_struct_def’:
../include/linux/kernel.h:20:17: error: comparison of distinct pointer types lacks a cast [-Werror]
(void) (&_max1 == &_max2); \
^
btf_dump.c:882:11: note: in expansion of macro ‘max’
m_sz = max(0LL, btf__resolve_size(d->btf, m->type));
^~~Fix by explicitly casting to __s64, which is a return type from btf__resolve_size().
--- tools/lib/bpf/btf_dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/btf_dump.c +1 -1
@@ -876,7 +876,7 @@ static void btf_dump_emit_struct_def(strbtf_dump_printf (d,": %d" , m_sz); off = m_off + m_sz; }else { - m_sz =max (0LL ,btf__resolve_size (d->btf, m->type)); + m_sz =max ((__s64 )0 ,btf__resolve_size (d->btf, m->type)); off = m_off + m_sz *8 ; }btf_dump_printf (d,";" );
Greg Kroah-Hartman
maintainerPATCH 254/255 dma-pool: Fix an uninitialized variable bug in atomic_pool_expand()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit 892fc9f6835ecf075efac20789b012c5c9997fcc upstream.
The "page" pointer can be used with out being initialized.
--- kernel/dma/pool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/dma/pool.c +1 -1
@@ -84,7 +84,7 @@ static int atomic_pool_expand(struct gen gfp_t gfp) {unsigned int order; -struct page *page; +struct page *page =NULL ;void *addr;int ret = -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 251/255 drm/vmwgfx/sou: Use drm_mode_config_reset
In reply to Greg Kroah-HartmanFrom: Roland Scheidegger <[email protected]>
commit 1338441cf166e2ef789af5915b961d4e13a4ec31 upstream.
Same problem as in stdu, same fix.
--- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +2 -7
@@ -859,8 +859,6 @@ static int vmw_sou_init(struct vmw_priva sou->base.is_implicit = false;/* Initialize primary plane */ -vmw_du_plane_reset (primary); - ret = drm_universal_plane_init(dev, &sou->base.primary, 0, &vmw_sou_plane_funcs, vmw_primary_plane_formats,
@@ -875,8 +873,6 @@ static int vmw_sou_init(struct vmw_privadrm_plane_enable_fb_damage_clips (primary);/* Initialize cursor plane */ -vmw_du_plane_reset (cursor); - ret = drm_universal_plane_init(dev, &sou->base.cursor, 0, &vmw_sou_cursor_funcs, vmw_cursor_plane_formats,
@@ -890,7 +886,6 @@ static int vmw_sou_init(struct vmw_privadrm_plane_helper_add (cursor, &vmw_sou_cursor_plane_helper_funcs); -vmw_du_connector_reset (connector); ret =drm_connector_init (dev, connector, &vmw_sou_connector_funcs,DRM_MODE_CONNECTOR_VIRTUAL );if (ret) {
@@ -918,8 +913,6 @@ static int vmw_sou_init(struct vmw_priva goto err_free_encoder; } - -vmw_du_crtc_reset (crtc); ret =drm_crtc_init_with_planes (dev, crtc, &sou->base.primary, &sou->base.cursor, &vmw_screen_object_crtc_funcs,NULL );
@@ -973,6 +966,8 @@ int vmw_kms_sou_init_display(struct vmw_ dev_priv->active_display_unit = vmw_du_screen_object; +drm_mode_config_reset (dev); +DRM_INFO ("Screen Objects Display Unit initialized\n" );return 0 ;
Greg Kroah-Hartman
maintainerPATCH 250/255 drm/vmwgfx/stdu: Use drm_mode_config_reset
In reply to Greg Kroah-HartmanFrom: Daniel Vetter <[email protected]>
commit 68745d1edf1700a668c15ecbed466d18f14c7e9b upstream.
When converting to atomic the state reset was done by directly calling the functions, and before the modeset object was fully initialized. This means the various ->dev pointers weren't set up.
After
commit 51f644b40b4b794b28b982fdd5d0dd8ee63f9272
Author: Daniel Vetter <[email protected]> Date: Fri Jun 12 18:00:49 2020 +0200
drm/atomic-helper: reset vblank on crtc reset
this started to oops because now we're trying to derefence drm_crtc->dev. Fix this up by entirely switching over to drm_mode_config_reset, called once everything is set up.
--- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +2 -7
@@ -1738,8 +1738,6 @@ static int vmw_stdu_init(struct vmw_priv stdu->base.is_implicit = false;/* Initialize primary plane */ -vmw_du_plane_reset (primary); - ret = drm_universal_plane_init(dev, primary, 0, &vmw_stdu_plane_funcs, vmw_primary_plane_formats,
@@ -1754,8 +1752,6 @@ static int vmw_stdu_init(struct vmw_privdrm_plane_enable_fb_damage_clips (primary);/* Initialize cursor plane */ -vmw_du_plane_reset (cursor); - ret = drm_universal_plane_init(dev, cursor, 0, &vmw_stdu_cursor_funcs, vmw_cursor_plane_formats,
@@ -1769,8 +1765,6 @@ static int vmw_stdu_init(struct vmw_privdrm_plane_helper_add (cursor, &vmw_stdu_cursor_plane_helper_funcs); -vmw_du_connector_reset (connector); - ret =drm_connector_init (dev, connector, &vmw_stdu_connector_funcs,DRM_MODE_CONNECTOR_VIRTUAL );if (ret) {
@@ -1798,7 +1792,6 @@ static int vmw_stdu_init(struct vmw_priv goto err_free_encoder; } -vmw_du_crtc_reset (crtc); ret =drm_crtc_init_with_planes (dev, crtc, &stdu->base.primary, &stdu->base.cursor, &vmw_stdu_crtc_funcs,NULL );
@@ -1894,6 +1887,8 @@ int vmw_kms_stdu_init_display(struct vmw } } +drm_mode_config_reset (dev); +DRM_INFO ("Screen Target Display device initialized\n" );return 0 ;
Greg Kroah-Hartman
maintainerPATCH 247/255 fbmem: pull fbcon_update_vcs() out of fb_set_var()
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
[ Upstream commit d88ca7e1a27eb2df056bbf37ddef62e1c73d37ea ]
syzbot is reporting OOB read bug in vc_do_resize() [1] caused by memcpy() based on outdated old_{rows,row_size} values, for resize_screen() can recurse into vc_do_resize() which changes vc->vc_{cols,rows} that outdates old_{rows,row_size} values which were saved before calling resize_screen().
Daniel Vetter explained that resize_screen() should not recurse into fbcon_update_vcs() path due to FBINFO_MISC_USEREVENT being still set when calling resize_screen().
Instead of masking FBINFO_MISC_USEREVENT before calling fbcon_update_vcs(), we can remove FBINFO_MISC_USEREVENT by calling fbcon_update_vcs() only if fb_set_var() returned 0. This change assumes that it is harmless to call fbcon_update_vcs() when fb_set_var() returned 0 without reaching fb_notifier_call_chain().
[1] https://syzkaller.appspot.com/bug?id=c70c88cfd16dcf6e1d3c7f0ab8648b3144b5b25e
--- drivers/video/fbdev/core/fbmem.c | 8 ++------ drivers/video/fbdev/core/fbsysfs.c | 4 ++-- drivers/video/fbdev/ps3fb.c | 5 +++-- include/linux/fb.h | 2 -- 4 files changed, 7 insertions(+), 12 deletions(-)
drivers/video/fbdev/core/fbmem.c +2 -6
@@ -957,7 +957,6 @@ static int fb_check_caps(struct fb_info *info, struct fb_var_screeninfo *var,int fb_set_var (struct fb_info *info,struct fb_var_screeninfo *var) { -int flags = info->flags;int ret =0 ;u32 activate;struct fb_var_screeninfo old_var;
@@ -1052,9 +1051,6 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) event.data = &mode;fb_notifier_call_chain (FB_EVENT_MODE_CHANGE , &event); -if (flags &FBINFO_MISC_USEREVENT ) -fbcon_update_vcs (info, activate &FB_ACTIVATE_ALL ); -return 0 ; }EXPORT_SYMBOL (fb_set_var);
@@ -1105,9 +1101,9 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,return -EFAULT ;console_lock ();lock_fb_info (info); - info->flags |=FBINFO_MISC_USEREVENT ; ret =fb_set_var (info, &var); - info->flags &= ~FBINFO_MISC_USEREVENT ; +if (!ret) +fbcon_update_vcs (info, var.activate &FB_ACTIVATE_ALL );unlock_fb_info (info);console_unlock ();if (!ret &©_to_user (argp, &var,sizeof (var)))
drivers/video/fbdev/core/fbsysfs.c +2 -2
@@ -91,9 +91,9 @@ static int activate(struct fb_info *fb_info, struct fb_var_screeninfo *var) var->activate |=FB_ACTIVATE_FORCE ;console_lock (); - fb_info->flags |=FBINFO_MISC_USEREVENT ; err =fb_set_var (fb_info, var); - fb_info->flags &= ~FBINFO_MISC_USEREVENT ; +if (!err) +fbcon_update_vcs (fb_info, var->activate &FB_ACTIVATE_ALL );console_unlock ();if (err)return err;
drivers/video/fbdev/ps3fb.c +3 -2
@@ -29,6 +29,7 @@#include <linux/freezer.h> #include <linux/uaccess.h> #include <linux/fb.h> +#include <linux/fbcon.h> #include <linux/init.h> #include <asm/cell-regs.h>
@@ -824,12 +825,12 @@ static int ps3fb_ioctl(struct fb_info *info, unsigned int cmd, var = info->var;fb_videomode_to_var (&var, vmode);console_lock (); - info->flags |=FBINFO_MISC_USEREVENT ;/* Force, in case only special bits changed */ var.activate |=FB_ACTIVATE_FORCE ; par->new_mode_id = val; retval =fb_set_var (info, &var); - info->flags &= ~FBINFO_MISC_USEREVENT ; +if (!retval) +fbcon_update_vcs (info, var.activate &FB_ACTIVATE_ALL );console_unlock (); }break ;
include/linux/fb.h +0 -2
@@ -400,8 +400,6 @@ struct fb_tile_ops {#define FBINFO_HWACCEL_YPAN 0x2000/* optional */ #define FBINFO_HWACCEL_YWRAP 0x4000/* optional */ -#define FBINFO_MISC_USEREVENT 0x10000/* event request -from userspace */ #define FBINFO_MISC_TILEBLITTING 0x20000/* use tile blitting */ /* A driver may set this flag to indicate that it does want a set_par to be
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 222/255 USB: yurex: Fix bad gfp argument
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit f176ede3a3bde5b398a6777a7f9ff091baa2d3ff upstream.
The syzbot fuzzer identified a bug in the yurex driver: It passes GFP_KERNEL as a memory-allocation flag to usb_submit_urb() at a time when its state is TASK_INTERRUPTIBLE, not TASK_RUNNING:
do not call blocking ops when !TASK_RUNNING; state=1 set at [<00000000370c7c68>] prepare_to_wait+0xb1/0x2a0 kernel/sched/wait.c:247
WARNING: CPU: 1 PID: 340 at kernel/sched/core.c:7253 __might_sleep+0x135/0x190 kernel/sched/core.c:7253 Kernel panic - not syncing: panic_on_warn set ... CPU: 1 PID: 340 Comm: syz-executor677 Not tainted 5.8.0-syzkaller #0 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+0xf6/0x16e lib/dump_stack.c:118 panic+0x2aa/0x6e1 kernel/panic.c:231 __warn.cold+0x20/0x50 kernel/panic.c:600 report_bug+0x1bd/0x210 lib/bug.c:198 handle_bug+0x41/0x80 arch/x86/kernel/traps.c:234 exc_invalid_op+0x14/0x40 arch/x86/kernel/traps.c:254 asm_exc_invalid_op+0x12/0x20 arch/x86/include/asm/idtentry.h:536 RIP: 0010:__might_sleep+0x135/0x190 kernel/sched/core.c:7253 Code: 65 48 8b 1c 25 40 ef 01 00 48 8d 7b 10 48 89 fe 48 c1 ee 03 80 3c 06 00 75
2b 48 8b 73 10 48 c7 c7 e0 9e 06 86 e8 ed 12 f6 ff <0f> 0b e9 46 ff ff ff e8 1f b2 4b 00 e9 29 ff ff ff e8 15 b2 4b 00
RSP: 0018:ffff8881cdb77a28 EFLAGS: 00010282
RAX: 0000000000000000 RBX: ffff8881c6458000 RCX: 0000000000000000
RDX: ffff8881c6458000 RSI: ffffffff8129ec93 RDI: ffffed1039b6ef37
RBP: ffffffff86fdade2 R08: 0000000000000001 R09: ffff8881db32f54f
R10: 0000000000000000 R11: 0000000030343354 R12: 00000000000001f2
R13: 0000000000000000 R14: 0000000000000068 R15: ffffffff83c1b1aa
slab_pre_alloc_hook.constprop.0+0xea/0x200 mm/slab.h:498 slab_alloc_node mm/slub.c:2816 [inline] slab_alloc mm/slub.c:2900 [inline] kmem_cache_alloc_trace+0x46/0x220 mm/slub.c:2917 kmalloc include/linux/slab.h:554 [inline] dummy_urb_enqueue+0x7a/0x880 drivers/usb/gadget/udc/dummy_hcd.c:1251 usb_hcd_submit_urb+0x2b2/0x22d0 drivers/usb/core/hcd.c:1547 usb_submit_urb+0xb4e/0x13e0 drivers/usb/core/urb.c:570 yurex_write+0x3ea/0x820 drivers/usb/misc/yurex.c:495
This patch changes the call to use GFP_ATOMIC instead of GFP_KERNEL.
--- drivers/usb/misc/yurex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/misc/yurex.c +1 -1
@@ -492,7 +492,7 @@ static ssize_t yurex_write(struct file *prepare_to_wait (&dev->waitq, &wait,TASK_INTERRUPTIBLE );dev_dbg (&dev->interface->dev,"%s - submit %c\n" , __func__, dev->cntl_buffer[0 ]); - retval =usb_submit_urb (dev->cntl_urb,GFP_KERNEL ); + retval =usb_submit_urb (dev->cntl_urb,GFP_ATOMIC );if (retval >=0 ) timeout =schedule_timeout (YUREX_WRITE_TIMEOUT );finish_wait (&dev->waitq, &wait);
Greg Kroah-Hartman
maintainerPATCH 217/255 drm/amd/powerplay: Fix hardmins not being sent to SMU for RV
In reply to Greg Kroah-HartmanFrom: Nicholas Kazlauskas <[email protected]>
commit e2bf3723db563457c0abe4eaeedac25bbbbd1d76 upstream.
[Why]
DC uses these to raise the voltage as needed for higher dispclk/dppclk and to ensure that we have enough bandwidth to drive the displays.
There's a bug preventing these from actuially sending messages since it's checking the actual clock (which is 0) instead of the incoming clock (which shouldn't be 0) when deciding to send the hardmin.
[How]
Check the clocks != 0 instead of the actual clocks.
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c +3 -6
@@ -204,8 +204,7 @@ static int smu10_set_min_deep_sleep_dcef {struct smu10_hwmgr *smu10_data = (struct smu10_hwmgr *)(hwmgr->backend); -if (smu10_data->need_min_deep_sleep_dcefclk && - smu10_data->deep_sleep_dcefclk != clock) { +if (clock && smu10_data->deep_sleep_dcefclk != clock) { smu10_data->deep_sleep_dcefclk = clock; smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetMinDeepSleepDcefclk,
@@ -219,8 +218,7 @@ static int smu10_set_hard_min_dcefclk_by {struct smu10_hwmgr *smu10_data = (struct smu10_hwmgr *)(hwmgr->backend); -if (smu10_data->dcf_actual_hard_min_freq && - smu10_data->dcf_actual_hard_min_freq != clock) { +if (clock && smu10_data->dcf_actual_hard_min_freq != clock) { smu10_data->dcf_actual_hard_min_freq = clock; smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetHardMinDcefclkByFreq,
@@ -234,8 +232,7 @@ static int smu10_set_hard_min_fclk_by_fr {struct smu10_hwmgr *smu10_data = (struct smu10_hwmgr *)(hwmgr->backend); -if (smu10_data->f_actual_hard_min_freq && - smu10_data->f_actual_hard_min_freq != clock) { +if (clock && smu10_data->f_actual_hard_min_freq != clock) { smu10_data->f_actual_hard_min_freq = clock; smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetHardMinFclkByFreq,
Greg Kroah-Hartman
maintainerPATCH 219/255 drm/amd/pm: correct Vega12 swctf limit setting
In reply to Greg Kroah-HartmanFrom: Evan Quan <[email protected]>
commit e0ffd340249699ad27a6c91abdfa3e89f7823941 upstream.
Correct the Vega12 thermal swctf limit.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega12_thermal.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega12_thermal.c +4 -2
@@ -170,6 +170,8 @@ int vega12_thermal_get_temperature(strucstatic int vega12_thermal_set_temperature_range (struct pp_hwmgr *hwmgr,struct PP_TemperatureRange *range) { +struct phm_ppt_v3_information *pptable_information = + (struct phm_ppt_v3_information *)hwmgr->pptable;struct amdgpu_device *adev = hwmgr->adev;int low =VEGA12_THERMAL_MINIMUM_ALERT_TEMP *PP_TEMPERATURE_UNITS_PER_CENTIGRADES ;
@@ -179,8 +181,8 @@ static int vega12_thermal_set_temperaturif (low < range->min) low = range->min; -if (high > range->max) - high = range->max; +if (high > pptable_information->us_software_shutdown_temp) + high = pptable_information->us_software_shutdown_temp;if (low > high)return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 245/255 io_uring: make offset == -1 consistent with preadv2/pwritev2
In reply to Greg Kroah-HartmanFrom: Jens Axboe <[email protected]>
[ Upstream commit 0fef948363f62494d779cf9dc3c0a86ea1e5f7cd ]
The man page for io_uring generally claims were consistent with what preadv2 and pwritev2 accept, but turns out there's a slight discrepancy in how offset == -1 is handled for pipes/streams. preadv doesn't allow it, but preadv2 does. This currently causes io_uring to return -EINVAL if that is attempted, but we should allow that as documented.
This change makes us consistent with preadv2/pwritev2 for just passing in a NULL ppos for streams if the offset is -1.
--- fs/io_uring.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
fs/io_uring.c +9 -4
@@ -2518,6 +2518,11 @@ static ssize_t io_import_iovec(int rw, struct io_kiocb *req,return import_iovec (rw, buf, sqe_len,UIO_FASTIOV , iovec, iter); } +static inline loff_t *io_kiocb_ppos (struct kiocb *kiocb) +{ +return kiocb->ki_filp->f_mode &FMODE_STREAM ?NULL : &kiocb->ki_pos; +} +/* * For files that don't have ->read_iter() and ->write_iter(), handle them * by looping over ->read() or ->write() manually.
@@ -2553,10 +2558,10 @@ static ssize_t loop_rw_iter(int rw, struct file *file, struct kiocb *kiocb,if (rw ==READ ) { nr = file->f_op->read (file, iovec.iov_base, - iovec.iov_len, &kiocb->ki_pos); + iovec.iov_len,io_kiocb_ppos (kiocb)); }else { nr = file->f_op->write (file, iovec.iov_base, - iovec.iov_len, &kiocb->ki_pos); + iovec.iov_len,io_kiocb_ppos (kiocb)); }if (iov_iter_is_bvec (iter))
@@ -2681,7 +2686,7 @@ static int io_read(struct io_kiocb *req, bool force_nonblock) goto copy_iov; iov_count =iov_iter_count (&iter); - ret =rw_verify_area (READ , req->file, &kiocb->ki_pos, iov_count); + ret =rw_verify_area (READ , req->file,io_kiocb_ppos (kiocb), iov_count);if (!ret) {ssize_t ret2;
@@ -2780,7 +2785,7 @@ static int io_write(struct io_kiocb *req, bool force_nonblock) goto copy_iov; iov_count =iov_iter_count (&iter); - ret =rw_verify_area (WRITE , req->file, &kiocb->ki_pos, iov_count); + ret =rw_verify_area (WRITE , req->file,io_kiocb_ppos (kiocb), iov_count);if (!ret) {ssize_t ret2;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 173/255 btrfs: check the right error variable in btrfs_del_dir_entries_in_log
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit fb2fecbad50964b9f27a3b182e74e437b40753ef upstream.
With my new locking code dbench is so much faster that I tripped over a transaction abort from ENOSPC. This turned out to be because btrfs_del_dir_entries_in_log was checking for ret == -ENOSPC, but this function sets err on error, and returns err. So instead of properly marking the inode as needing a full commit, we were returning -ENOSPC and aborting in __btrfs_unlink_inode. Fix this by checking the proper variable so that we return the correct thing in the case of ENOSPC.
The ENOENT needs to be checked, because btrfs_lookup_dir_item_index() can return -ENOENT if the dir item isn't in the tree log (which would happen if we hadn't fsync'ed this guy). We actually handle that case in __btrfs_unlink_inode, so it's an expected error to get back.
--- fs/btrfs/tree-log.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
fs/btrfs/tree-log.c +6 -4
@@ -3449,11 +3449,13 @@ fail:btrfs_free_path (path); out_unlock:mutex_unlock (&dir->log_mutex); -if (ret == -ENOSPC ) { +if (err == -ENOSPC ) {btrfs_set_log_full_commit (trans); - ret =0 ; - }else if (ret <0 ) -btrfs_abort_transaction (trans, ret); + err =0 ; + }else if (err <0 && err != -ENOENT ) { +/* ENOENT can be returned if the entry hasn't been fsynced yet */ +btrfs_abort_transaction (trans, err); + }btrfs_end_log_trans (root);
Greg Kroah-Hartman
maintainerPATCH 216/255 drm/amdgpu/gfx10: refine mgcg setting
In reply to Greg Kroah-HartmanFrom: Jiansong Chen <[email protected]>
commit de7a1b0b8753e1b0000084f0e339ffab295d27ef upstream.
1. enable ENABLE_CGTS_LEGACY to fix specviewperf11 random hang.
2. remove obsolete RLC_CGTT_SCLK_OVERRIDE workaround.
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +2 -4
@@ -6854,10 +6854,8 @@ static void gfx_v10_0_update_medium_grai def = data =RREG32_SOC15 (GC ,0 , mmRLC_CGTT_MGCG_OVERRIDE); data &= ~(RLC_CGTT_MGCG_OVERRIDE__GRBM_CGTT_SCLK_OVERRIDE_MASK |RLC_CGTT_MGCG_OVERRIDE__GFXIP_MGCG_OVERRIDE_MASK | -RLC_CGTT_MGCG_OVERRIDE__GFXIP_MGLS_OVERRIDE_MASK ); - -/* only for Vega10 & Raven1 */ - data |=RLC_CGTT_MGCG_OVERRIDE__RLC_CGTT_SCLK_OVERRIDE_MASK ; +RLC_CGTT_MGCG_OVERRIDE__GFXIP_MGLS_OVERRIDE_MASK | +RLC_CGTT_MGCG_OVERRIDE__ENABLE_CGTS_LEGACY_MASK );if (def != data)WREG32_SOC15 (GC ,0 , mmRLC_CGTT_MGCG_OVERRIDE, data);
Greg Kroah-Hartman
maintainerPATCH 242/255 usb: typec: tcpm: Fix Fix source hard reset response for TDA 2.3.1.1 and TDA 2.3.1.2 failures
In reply to Greg Kroah-HartmanFrom: Badhri Jagan Sridharan <[email protected]>
commit 23e26d0577535f5ffe4ff8ed6d06e009553c0bca upstream.
The patch addresses the compliance test failures while running TDA 2.3.1.1 and TDA 2.3.1.2 of the "PD Communications Engine USB PD Compliance MOI" test plan published in https://www.usb.org/usbc.
For a product to be Type-C compliant, it's expected that these tests are run on usb.org certified Type-C compliance tester as mentioned in
https://www.usb.org/usbc.
While the purpose of TDA 2.3.1.1 and TDA 2.3.1.2 is to verify that the static and dynamic electrical capabilities of a Source meet the requirements for each PDO offered, while doing so, the tests also monitor that the timing of the VBUS waveform versus the messages meets the requirements for Hard Reset defined in PROT-PROC-HR-TSTR as mentioned in step 11 of TDA.2.3.1.1 and step 15 of TDA.2.3.1.2.
TDB.2.2.13.1: PROT-PROC-HR-TSTR Procedure and Checks for Tester Originated Hard Reset
Purpose: To perform the appropriate protocol checks relating to any circumstance in which the Hard Reset signal is sent by the Tester.
UUT is behaving as source:
The Tester sends a Hard Reset signal.
1. Check VBUS stays within present valid voltage range for tPSHardReset min (25ms) after last bit of Hard Reset signal. [PROT_PROC_HR_TSTR_1]
2. Check that VBUS starts to fall below present valid voltage range by tPSHardReset max (35ms). [PROT_PROC_HR_TSTR_2]
3. Check that VBUS reaches vSafe0V within tSafe0v max (650 ms). [PROT_PROC_HR_TSTR_3]
4. Check that VBUS starts rising to vSafe5V after a delay of tSrcRecover (0.66s - 1s) from reaching vSafe0V. [PROT_PROC_HR_TSTR_4]
5. Check that VBUS reaches vSafe5V within tSrcTurnOn max (275ms) of rising above vSafe0v max (0.8V). [PROT_PROC_HR_TSTR_5] Power Delivery Compliance Plan 139 6. Check that Source Capabilities are finished sending within tFirstSourceCap max (250ms) of VBUS reaching vSafe5v min. [PROT_PROC_HR_TSTR_6].
This is in line with 7.1.5 Response to Hard Resets of the USB Power Delivery Specification Revision 3.0, Version 1.2,
"Hard Reset Signaling indicates a communication failure has occurred and the Source Shall stop driving VCONN, Shall remove Rp from the VCONN pin and Shall drive VBUS to vSafe0V as shown in Figure 7-9. The USB connection May reset during a Hard Reset since the VBUS voltage will be less than vSafe5V for an extended period of time. After establishing the vSafe0V voltage condition on VBUS, the Source Shall wait tSrcRecover before re-applying VCONN and restoring VBUS to vSafe5V. A Source Shall conform to the VCONN timing as specified in [USB Type-C 1.3]."
With the above guidelines from the spec in mind, TCPM does not turn off VCONN while entering SRC_HARD_RESET_VBUS_OFF. The patch makes TCPM turn off VCONN while entering SRC_HARD_RESET_VBUS_OFF and turn it back on while entering SRC_HARD_RESET_VBUS_ON along with vbus instead of having VCONN on through hardreset.
Also, the spec clearly states that "After establishing the vSafe0V voltage condition on VBUS", the Source Shall wait tSrcRecover before re-applying VCONN and restoring VBUS to vSafe5V.
TCPM does not conform to this requirement. If the TCPC driver calls tcpm_vbus_change with vbus off signal, TCPM right away enters SRC_HARD_RESET_VBUS_ON without waiting for tSrcRecover.
For TCPC's which are buggy/does not call tcpm_vbus_change, TCPM assumes that the vsafe0v is instantaneous as TCPM only waits tSrcRecover instead of waiting for tSafe0v + tSrcRecover. This patch also fixes this behavior by making sure that TCPM waits for tSrcRecover before transitioning into SRC_HARD_RESET_VBUS_ON when tcpm_vbus_change is called by TCPC.
When TCPC does not call tcpm_vbus_change, TCPM assumes the worst case i.e. tSafe0v + tSrcRecover before transitioning into SRC_HARD_RESET_VBUS_ON.
--- drivers/usb/typec/tcpm/tcpm.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-)
drivers/usb/typec/tcpm/tcpm.c +25 -3
@@ -3321,13 +3321,31 @@ static void run_state_machine(struct tcptcpm_set_state (port,SNK_HARD_RESET_SINK_OFF ,0 );break ;case SRC_HARD_RESET_VBUS_OFF : -tcpm_set_vconn (port, true); +/* +* 7.1.5 Response to Hard Resets +* Hard Reset Signaling indicates a communication failure has occurred and the +* Source Shall stop driving VCONN, Shall remove Rp from the VCONN pin and Shall +* drive VBUS to vSafe0V as shown in Figure 7-9. +*/ +tcpm_set_vconn (port, false);tcpm_set_vbus (port, false);tcpm_set_roles (port, port->self_powered,TYPEC_SOURCE ,tcpm_data_role_for_source (port)); -tcpm_set_state (port,SRC_HARD_RESET_VBUS_ON ,PD_T_SRC_RECOVER ); +/* +* If tcpc fails to notify vbus off, TCPM will wait for PD_T_SAFE_0V + +* PD_T_SRC_RECOVER before turning vbus back on. +* From Table 7-12 Sequence Description for a Source Initiated Hard Reset: +* 4. Policy Engine waits tPSHardReset after sending Hard Reset Signaling and then +* tells the Device Policy Manager to instruct the power supply to perform a +* Hard Reset. The transition to vSafe0V Shall occur within tSafe0V (t2). +* 5. After tSrcRecover the Source applies power to VBUS in an attempt to +* re-establish communication with the Sink and resume USB Default Operation. +* The transition to vSafe5V Shall occur within tSrcTurnOn(t4). +*/ +tcpm_set_state (port,SRC_HARD_RESET_VBUS_ON ,PD_T_SAFE_0V +PD_T_SRC_RECOVER );break ;case SRC_HARD_RESET_VBUS_ON : +tcpm_set_vconn (port, true);tcpm_set_vbus (port, true); port->tcpc->set_pd_rx (port->tcpc, true);tcpm_set_attached_state (port, true);
@@ -3887,7 +3905,11 @@ static void _tcpm_pd_vbus_off(struct tcptcpm_set_state (port,SNK_HARD_RESET_WAIT_VBUS ,0 );break ;case SRC_HARD_RESET_VBUS_OFF : -tcpm_set_state (port,SRC_HARD_RESET_VBUS_ON ,0 ); +/* +* After establishing the vSafe0V voltage condition on VBUS, the Source Shall wait +* tSrcRecover before re-applying VCONN and restoring VBUS to vSafe5V. +*/ +tcpm_set_state (port,SRC_HARD_RESET_VBUS_ON ,PD_T_SRC_RECOVER );break ;case HARD_RESET_SEND :break ;
Greg Kroah-Hartman
maintainerPATCH 236/255 USB: Also match device drivers using the ->match vfunc
In reply to Greg Kroah-HartmanFrom: Bastien Nocera <[email protected]>
commit adb6e6ac20eedcf1dce19dc75b224e63c0828ea1 upstream.
We only ever used the ID table matching before, but we should also support open-coded match functions.
--- drivers/usb/core/generic.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/core/generic.c +3 -2
@@ -207,8 +207,9 @@ static int __check_usb_generic(struct dereturn 0 ;if (!udrv->id_table)return 0 ; - -return usb_device_match_id (udev, udrv->id_table) !=NULL ; +if (usb_device_match_id (udev, udrv->id_table) !=NULL ) +return 1 ; +return (udrv->match && udrv->match (udev)); }static bool usb_generic_driver_match (struct usb_device *udev)
Greg Kroah-Hartman
maintainerPATCH 237/255 USB: Fix device driver race
In reply to Greg Kroah-HartmanFrom: Bastien Nocera <[email protected]>
commit d5643d2249b279077427b2c2b2ffae9b70c95b0b upstream.
When a new device with a specialised device driver is plugged in, the new driver will be modprobe()'d but the driver core will attach the "generic" driver to the device.
After that, nothing will trigger a reprobe when the modprobe()'d device driver has finished initialising, as the device has the "generic" driver attached to it.
Trigger a reprobe ourselves when new specialised drivers get registered.
--- drivers/usb/core/driver.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-)
drivers/usb/core/driver.c +38 -2
@@ -905,6 +905,35 @@ static int usb_uevent(struct device *devreturn 0 ; } +static bool is_dev_usb_generic_driver (struct device *dev) +{ +struct usb_device_driver *udd = dev->driver ? +to_usb_device_driver (dev->driver) :NULL ; + +return udd == &usb_generic_driver; +} + +static int __usb_bus_reprobe_drivers (struct device *dev,void *data) +{ +struct usb_device_driver *new_udriver = data; +struct usb_device *udev; +int ret; + +if (!is_dev_usb_generic_driver (dev)) +return 0 ; + + udev =to_usb_device (dev); +if (usb_device_match_id (udev, new_udriver->id_table) ==NULL && + (!new_udriver->match || new_udriver->match (udev) !=0 )) +return 0 ; + + ret =device_reprobe (dev); +if (ret && ret != -EPROBE_DEFER ) +dev_err (dev,"Failed to reprobe device (error %d)\n" , ret); + +return 0 ; +} +/** * usb_register_device_driver - register a USB device (not interface) driver * @new_udriver: USB operations for the device driver
@@ -934,13 +963,20 @@ int usb_register_device_driver(struct us retval =driver_register (&new_udriver->drvwrap.driver); -if (!retval) +if (!retval) {pr_info ("%s: registered new device driver %s\n" , usbcore_name, new_udriver->name); -else +/* +* Check whether any device could be better served with +* this new driver +*/ +bus_for_each_dev (&usb_bus_type,NULL , new_udriver, + __usb_bus_reprobe_drivers); + }else {printk (KERN_ERR "%s: error %d registering device " " driver %s\n" , usbcore_name, retval, new_udriver->name); + }return retval; }
Greg Kroah-Hartman
maintainerPATCH 230/255 USB: gadget: u_f: Unbreak offset calculation in VLAs
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
commit bfd08d06d978d0304eb6f7855b548aa2cd1c5486 upstream.
Inadvertently the commit b1cd1b65afba ("USB: gadget: u_f: add overflow checks to VLA macros") makes VLA macros to always return 0 due to different scope of two variables of the same name. Obviously we need to have only one.
--- drivers/usb/gadget/u_f.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/usb/gadget/u_f.h +4 -4
@@ -25,9 +25,9 @@size_t offset =0 ; \ if (groupname##__next != SIZE_MAX) { \size_t align_mask = __alignof__(type ) -1 ; \ - size_t offset = (groupname##__next + align_mask) \ - & ~align_mask; \size_t size =array_size (n,sizeof (type)); \ + offset = (groupname##__next + align_mask) & \ + ~align_mask; \if (check_add_overflow (offset, size, \ &groupname##__next)) { \ groupname##__next = SIZE_MAX; \
@@ -43,8 +43,8 @@size_t offset =0 ; \ if (groupname##__next != SIZE_MAX) { \size_t align_mask = __alignof__(type ) -1 ; \ - size_t offset = (groupname##__next + align_mask) \ - & ~align_mask; \ + offset = (groupname##__next + align_mask) & \ + ~align_mask; \ if (check_add_overflow(offset, groupname##_##name##__sz,\ &groupname##__next)) { \ groupname##__next = SIZE_MAX; \
Greg Kroah-Hartman
maintainerPATCH 227/255 usb: host: ohci-exynos: Fix error handling in exynos_ohci_probe()
In reply to Greg Kroah-HartmanFrom: Tang Bin <[email protected]>
commit 1d4169834628d18b2392a2da92b7fbf5e8e2ce89 upstream.
If the function platform_get_irq() failed, the negative value returned will not be detected here. So fix error handling in exynos_ohci_probe(). And when get irq failed, the function platform_get_irq() logs an error message, so remove redundant message here.
--- drivers/usb/host/ohci-exynos.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/usb/host/ohci-exynos.c +2 -3
@@ -171,9 +171,8 @@ static int exynos_ohci_probe(struct plat hcd->rsrc_len =resource_size (res); irq =platform_get_irq (pdev,0 ); -if (!irq) { -dev_err (&pdev->dev,"Failed to get IRQ\n" ); - err = -ENODEV ; +if (irq <0 ) { + err = irq; goto fail_io; }
Greg Kroah-Hartman
maintainerPATCH 225/255 USB: quirks: Ignore duplicate endpoint on Sound Devices MixPre-D
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit 068834a2773b6a12805105cfadbb3d4229fc6e0a upstream.
The Sound Devices MixPre-D audio card suffers from the same defect as the Sound Devices USBPre2: an endpoint shared between a normal audio interface and a vendor-specific interface, in violation of the USB spec. Since the USB core now treats duplicated endpoints as bugs and ignores them, the audio endpoint isn't available and the card can't be used for audio capture.
Along the same lines as commit bdd1b147b802 ("USB: quirks: blacklist duplicate ep on Sound Devices USBPre2"), this patch adds a quirks entry saying to ignore ep5in for interface 1, leaving it available for use with standard audio interface 2.
--- drivers/usb/core/quirks.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/usb/core/quirks.c +5 -0
@@ -370,6 +370,10 @@ static const struct usb_device_id usb_qu { USB_DEVICE(0x0926, 0x0202), .driver_info = USB_QUIRK_ENDPOINT_BLACKLIST }, + /* Sound Devices MixPre-D */ + { USB_DEVICE(0x0926, 0x0208), .driver_info = + USB_QUIRK_ENDPOINT_BLACKLIST }, + /* Keytouch QWERTY Panel keyboard */ { USB_DEVICE(0x0926, 0x3333), .driver_info = USB_QUIRK_CONFIG_INTF_STRINGS },
@@ -511,6 +515,7 @@ static const struct usb_device_id usb_am*/ static const struct usb_device_id usb_endpoint_blacklist[] = { {USB_DEVICE_INTERFACE_NUMBER (0x0926 ,0x0202 ,1 ), .driver_info =0x85 }, + {USB_DEVICE_INTERFACE_NUMBER (0x0926 ,0x0208 ,1 ), .driver_info =0x85 }, { } };
Greg Kroah-Hartman
maintainerPATCH 223/255 usb: uas: Add quirk for PNY Pro Elite
In reply to Greg Kroah-HartmanFrom: Thinh Nguyen <[email protected]>
commit 9a469bc9f32dd33c7aac5744669d21a023a719cd upstream.
PNY Pro Elite USB 3.1 Gen 2 device (SSD) doesn't respond to ATA_12 pass-through command (i.e. it just hangs). If it doesn't support this command, it should respond properly to the host. Let's just add a quirk to be able to move forward with other operations.
--- drivers/usb/storage/unusual_uas.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/storage/unusual_uas.h +7 -0
@@ -80,6 +80,13 @@ UNUSUAL_DEV(0x152d, 0x0578, 0x0000, 0x99 USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_BROKEN_FUA), +/* Reported-by: Thinh Nguyen <[email protected]> */ +UNUSUAL_DEV (0x154b ,0xf00d ,0x0000 ,0x9999 , +"PNY" , +"Pro Elite SSD" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , +US_FL_NO_ATA_1X ), +/* Reported-by: Hans de Goede <[email protected]> */ UNUSUAL_DEV(0x2109, 0x0711, 0x0000, 0x9999, "VIA",
Greg Kroah-Hartman
maintainerPATCH 214/255 drm/amdgpu: Fix buffer overflow in INFO ioctl
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
commit b5b97cab55eb71daba3283c8b1d2cce456d511a1 upstream.
The values for "se_num" and "sh_num" come from the user in the ioctl. They can be in the 0-255 range but if they're more than AMDGPU_GFX_MAX_SE (4) or AMDGPU_GFX_MAX_SH_PER_SE (2) then it results in an out of bounds read.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +4 -0
@@ -663,8 +663,12 @@ static int amdgpu_info_ioctl(struct drm_* in the bitfields */ if (se_num ==AMDGPU_INFO_MMR_SE_INDEX_MASK ) se_num =0xffffffff ; +else if (se_num >=AMDGPU_GFX_MAX_SE ) +return -EINVAL ;if (sh_num ==AMDGPU_INFO_MMR_SH_INDEX_MASK ) sh_num =0xffffffff ; +else if (sh_num >=AMDGPU_GFX_MAX_SH_PER_SE ) +return -EINVAL ;if (info->read_mmr_reg.count >128 )return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 180/255 serial: samsung: Removes the IRQ not found warning
In reply to Greg Kroah-HartmanFrom: Tamseel Shams <[email protected]>
commit 8c6c378b0cbe0c9f1390986b5f8ffb5f6ff7593b upstream.
In few older Samsung SoCs like s3c2410, s3c2412 and s3c2440, UART IP is having 2 interrupt lines. However, in other SoCs like s3c6400, s5pv210, exynos5433, and exynos4210 UART is having only 1 interrupt line. Due to this, "platform_get_irq(platdev, 1)" call in the driver gives the following false-positive error:
"IRQ index 1 not found" on newer SoC's.
This patch adds the condition to check for Tx interrupt only for the those SoC's which have 2 interrupt lines.
--- drivers/tty/serial/samsung_tty.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/tty/serial/samsung_tty.c +5 -3
@@ -1911,9 +1911,11 @@ static int s3c24xx_serial_init_port(stru ourport->tx_irq = ret +1 ; } - ret =platform_get_irq (platdev,1 ); -if (ret >0 ) - ourport->tx_irq = ret; +if (!s3c24xx_serial_has_interrupt_mask (port)) { + ret =platform_get_irq (platdev,1 ); +if (ret >0 ) + ourport->tx_irq = ret; + }/* * DMA is currently supported only on DT platforms, if DMA properties * are specified.
Greg Kroah-Hartman
maintainerPATCH 122/255 drm/amd/powerplay: correct Vega20 cached smu feature state
In reply to Greg Kroah-HartmanFrom: Evan Quan <[email protected]>
[ Upstream commit 266d81d9eed30f4994d76a2b237c63ece062eefe ]
Correct the cached smu feature state on pp_features sysfs setting.
--- .../drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +19 -19
@@ -979,10 +979,7 @@ static int vega20_disable_all_smu_features(struct pp_hwmgr *hwmgr) { struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend); - uint64_t features_enabled; - int i; - bool enabled; - int ret = 0; + int i, ret = 0; PP_ASSERT_WITH_CODE((ret = smum_send_msg_to_smc(hwmgr, PPSMC_MSG_DisableAllSmuFeatures,
@@ -990,17 +987,8 @@ static int vega20_disable_all_smu_features(struct pp_hwmgr *hwmgr)"[DisableAllSMUFeatures] Failed to disable all smu features!" , return ret); - ret =vega20_get_enabled_smc_features (hwmgr, &features_enabled); -PP_ASSERT_WITH_CODE (!ret, -"[DisableAllSMUFeatures] Failed to get enabled smc features!" , - return ret); - -for (i =0 ; i <GNLD_FEATURES_MAX ; i++) { - enabled = (features_enabled & data->smu_features[i].smu_feature_bitmap) ? - true : false; - data->smu_features[i].enabled = enabled; - data->smu_features[i].supported = enabled; - } +for (i =0 ; i <GNLD_FEATURES_MAX ; i++) + data->smu_features[i].enabled =0 ;return 0 ; }
@@ -3230,10 +3218,11 @@ static int vega20_get_ppfeature_status(struct pp_hwmgr *hwmgr, char *buf)static int vega20_set_ppfeature_status (struct pp_hwmgr *hwmgr,uint64_t new_ppfeature_masks) { -uint64_t features_enabled; -uint64_t features_to_enable; -uint64_t features_to_disable; -int ret =0 ; +struct vega20_hwmgr *data = + (struct vega20_hwmgr *)(hwmgr->backend); +uint64_t features_enabled, features_to_enable, features_to_disable; +int i, ret =0 ; +bool enabled;if (new_ppfeature_masks >= (1ULL <<GNLD_FEATURES_MAX ))return -EINVAL ;
@@ -3262,6 +3251,17 @@ static int vega20_set_ppfeature_status(struct pp_hwmgr *hwmgr, uint64_t new_ppfereturn ret; } +/* Update the cached feature enablement state */ + ret =vega20_get_enabled_smc_features (hwmgr, &features_enabled); +if (ret) +return ret; + +for (i =0 ; i <GNLD_FEATURES_MAX ; i++) { + enabled = (features_enabled & data->smu_features[i].smu_feature_bitmap) ? + true : false; + data->smu_features[i].enabled = enabled; + } +return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 184/255 serial: 8250_exar: Fix number of ports for Commtech PCIe cards
In reply to Greg Kroah-HartmanFrom: Valmer Huhn <[email protected]>
commit c6b9e95dde7b54e6a53c47241201ab5a4035c320 upstream.
The following in 8250_exar.c line 589 is used to determine the number of ports for each Exar board:
nr_ports = board->num_ports ? board->num_ports : pcidev->device & 0x0f;
If the number of ports a card has is not explicitly specified, it defaults to the rightmost 4 bits of the PCI device ID. This is prone to error since not all PCI device IDs contain a number which corresponds to the number of ports that card provides.
This particular case involves COMMTECH_4222PCIE, COMMTECH_4224PCIE and COMMTECH_4228PCIE cards with device IDs 0x0022, 0x0020 and 0x0021. Currently the multiport cards receive 2, 0 and 1 port instead of 2, 4 and 8 ports respectively.
To fix this, each Commtech Fastcom PCIe card is given a struct where the number of ports is explicitly specified. This ensures 'board->num_ports' is used instead of the default 'pcidev->device & 0x0f'.
--- drivers/tty/serial/8250/8250_exar.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)
drivers/tty/serial/8250/8250_exar.c +21 -3
@@ -744,6 +744,24 @@ static const struct exar8250_board pbn_e .exit = pci_xr17v35x_exit, }; +static const struct exar8250_board pbn_fastcom35x_2 = { + .num_ports =2 , + .setup = pci_xr17v35x_setup, + .exit = pci_xr17v35x_exit, +}; + +static const struct exar8250_board pbn_fastcom35x_4 = { + .num_ports =4 , + .setup = pci_xr17v35x_setup, + .exit = pci_xr17v35x_exit, +}; + +static const struct exar8250_board pbn_fastcom35x_8 = { + .num_ports =8 , + .setup = pci_xr17v35x_setup, + .exit = pci_xr17v35x_exit, +}; +static const struct exar8250_board pbn_exar_XR17V4358 = { .num_ports =12 , .setup = pci_xr17v35x_setup,
@@ -811,9 +829,9 @@ static const struct pci_device_id exar_pEXAR_DEVICE (EXAR ,XR17V358 , pbn_exar_XR17V35x),EXAR_DEVICE (EXAR ,XR17V4358 , pbn_exar_XR17V4358),EXAR_DEVICE (EXAR ,XR17V8358 , pbn_exar_XR17V8358), - EXAR_DEVICE(COMMTECH, 4222PCIE, pbn_exar_XR17V35x), - EXAR_DEVICE(COMMTECH, 4224PCIE, pbn_exar_XR17V35x), - EXAR_DEVICE(COMMTECH, 4228PCIE, pbn_exar_XR17V35x), + EXAR_DEVICE(COMMTECH, 4222PCIE, pbn_fastcom35x_2), + EXAR_DEVICE(COMMTECH, 4224PCIE, pbn_fastcom35x_4), + EXAR_DEVICE(COMMTECH, 4228PCIE, pbn_fastcom35x_8), EXAR_DEVICE(COMMTECH, 4222PCI335, pbn_fastcom335_2), EXAR_DEVICE(COMMTECH, 4224PCI335, pbn_fastcom335_4),
Greg Kroah-Hartman
maintainerPATCH 185/255 serial: 8250: change lock order in serial8250_do_startup()
In reply to Greg Kroah-HartmanFrom: Sergey Senozhatsky <[email protected]>
commit 205d300aea75623e1ae4aa43e0d265ab9cf195fd upstream.
We have a number of "uart.port->desc.lock vs desc.lock->uart.port" lockdep reports coming from 8250 driver; this causes a bit of trouble to people, so let's fix it.
The problem is reverse lock order in two different call paths:
chain #1:
serial8250_do_startup()
spin_lock_irqsave(&port->lock);
disable_irq_nosync(port->irq);
raw_spin_lock_irqsave(&desc->lock)chain #2:
__report_bad_irq()
raw_spin_lock_irqsave(&desc->lock)
for_each_action_of_desc()
printk()
spin_lock_irqsave(&port->lock);Fix this by changing the order of locks in serial8250_do_startup():
do disable_irq_nosync() first, which grabs desc->lock, and grab uart->port after that, so that chain #1 and chain #2 have same lock order.
Full lockdep splat:
======================================================
WARNING: possible circular locking dependency detected 5.4.39 #55 Not tainted
======================================================
swapper/0/0 is trying to acquire lock:
ffffffffab65b6c0 (console_owner){-...}, at: console_lock_spinning_enable+0x31/0x57
but task is already holding lock:
ffff88810a8e34c0 (&irq_desc_lock_class){-.-.}, at: __report_bad_irq+0x5b/0xba
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #2 (&irq_desc_lock_class){-.-.}:
_raw_spin_lock_irqsave+0x61/0x8d
__irq_get_desc_lock+0x65/0x89
__disable_irq_nosync+0x3b/0x93
serial8250_do_startup+0x451/0x75c
uart_startup+0x1b4/0x2ff
uart_port_activate+0x73/0xa0
tty_port_open+0xae/0x10a
uart_open+0x1b/0x26
tty_open+0x24d/0x3a0
chrdev_open+0xd5/0x1cc
do_dentry_open+0x299/0x3c8
path_openat+0x434/0x1100
do_filp_open+0x9b/0x10a
do_sys_open+0x15f/0x3d7
kernel_init_freeable+0x157/0x1dd
kernel_init+0xe/0x105
ret_from_fork+0x27/0x50-> #1 (&port_lock_key){-.-.}:
_raw_spin_lock_irqsave+0x61/0x8d
serial8250_console_write+0xa7/0x2a0
console_unlock+0x3b7/0x528
vprintk_emit+0x111/0x17f
printk+0x59/0x73
register_console+0x336/0x3a4
uart_add_one_port+0x51b/0x5be
serial8250_register_8250_port+0x454/0x55e
dw8250_probe+0x4dc/0x5b9
platform_drv_probe+0x67/0x8b
really_probe+0x14a/0x422
driver_probe_device+0x66/0x130
device_driver_attach+0x42/0x5b
__driver_attach+0xca/0x139
bus_for_each_dev+0x97/0xc9
bus_add_driver+0x12b/0x228
driver_register+0x64/0xed
do_one_initcall+0x20c/0x4a6
do_initcall_level+0xb5/0xc5
do_basic_setup+0x4c/0x58
kernel_init_freeable+0x13f/0x1dd
kernel_init+0xe/0x105
ret_from_fork+0x27/0x50-> #0 (console_owner){-...}:
__lock_acquire+0x118d/0x2714
lock_acquire+0x203/0x258
console_lock_spinning_enable+0x51/0x57
console_unlock+0x25d/0x528
vprintk_emit+0x111/0x17f
printk+0x59/0x73
__report_bad_irq+0xa3/0xba
note_interrupt+0x19a/0x1d6
handle_irq_event_percpu+0x57/0x79
handle_irq_event+0x36/0x55
handle_fasteoi_irq+0xc2/0x18a
do_IRQ+0xb3/0x157
ret_from_intr+0x0/0x1d
cpuidle_enter_state+0x12f/0x1fd
cpuidle_enter+0x2e/0x3d
do_idle+0x1ce/0x2ce
cpu_startup_entry+0x1d/0x1f
start_kernel+0x406/0x46a
secondary_startup_64+0xa4/0xb0other info that might help us debug this:
Chain exists of: console_owner --> &port_lock_key --> &irq_desc_lock_class Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&irq_desc_lock_class);
lock(&port_lock_key);
lock(&irq_desc_lock_class); lock(console_owner);
*** DEADLOCK ***
2 locks held by swapper/0/0:
#0: ffff88810a8e34c0 (&irq_desc_lock_class){-.-.}, at: __report_bad_irq+0x5b/0xba #1: ffffffffab65b5c0 (console_lock){+.+.}, at: console_trylock_spinning+0x20/0x181
stack backtrace: CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.4.39 #55 Hardware name: XXXXXX Call Trace: <IRQ> dump_stack+0xbf/0x133 ? print_circular_bug+0xd6/0xe9 check_noncircular+0x1b9/0x1c3 __lock_acquire+0x118d/0x2714 lock_acquire+0x203/0x258 ? console_lock_spinning_enable+0x31/0x57 console_lock_spinning_enable+0x51/0x57 ? console_lock_spinning_enable+0x31/0x57 console_unlock+0x25d/0x528 ? console_trylock+0x18/0x4e vprintk_emit+0x111/0x17f ? lock_acquire+0x203/0x258 printk+0x59/0x73 __report_bad_irq+0xa3/0xba note_interrupt+0x19a/0x1d6 handle_irq_event_percpu+0x57/0x79 handle_irq_event+0x36/0x55 handle_fasteoi_irq+0xc2/0x18a do_IRQ+0xb3/0x157 common_interrupt+0xf/0xf </IRQ>
--- drivers/tty/serial/8250/8250_port.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/tty/serial/8250/8250_port.c +6 -3
@@ -2274,6 +2274,10 @@ int serial8250_do_startup(struct uart_poif (port->irq && !(up->port.flags &UPF_NO_THRE_TEST )) {unsigned char iir1; + +if (port->irqflags &IRQF_SHARED ) +disable_irq_nosync (port->irq); +/* * Test for UARTs that do not reassert THRE when the * transmitter is idle and the interrupt has already
@@ -2283,8 +2287,6 @@ int serial8250_do_startup(struct uart_po* allow register changes to become visible. */ spin_lock_irqsave (&port->lock, flags); -if (up->port.irqflags &IRQF_SHARED ) -disable_irq_nosync (port->irq);wait_for_xmitr (up,UART_LSR_THRE );serial_port_out_sync (port,UART_IER ,UART_IER_THRI );
@@ -2296,9 +2298,10 @@ int serial8250_do_startup(struct uart_po iir =serial_port_in (port,UART_IIR );serial_port_out (port,UART_IER ,0 ); +spin_unlock_irqrestore (&port->lock, flags); +if (port->irqflags &IRQF_SHARED )enable_irq (port->irq); -spin_unlock_irqrestore (&port->lock, flags);/* * If the interrupt is not reasserted, or we otherwise
Greg Kroah-Hartman
maintainerPATCH 188/255 writeback: Avoid skipping inode writeback
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit 5afced3bf28100d81fb2fe7e98918632a08feaf5 upstream.
Inode's i_io_list list head is used to attach inode to several different lists - wb->{b_dirty, b_dirty_time, b_io, b_more_io}. When flush worker prepares a list of inodes to writeback e.g. for sync(2), it moves inodes to b_io list. Thus it is critical for sync(2) data integrity guarantees that inode is not requeued to any other writeback list when inode is queued for processing by flush worker. That's the reason why writeback_single_inode() does not touch i_io_list (unless the inode is completely clean) and why __mark_inode_dirty() does not touch i_io_list if I_SYNC flag is set.
However there are two flaws in the current logic:
1) When inode has only I_DIRTY_TIME set but it is already queued in b_io list due to sync(2), concurrent __mark_inode_dirty(inode, I_DIRTY_SYNC) can still move inode back to b_dirty list resulting in skipping writeback of inode time stamps during sync(2).
2) When inode is on b_dirty_time list and writeback_single_inode() races with __mark_inode_dirty() like:
writeback_single_inode() __mark_inode_dirty(inode, I_DIRTY_PAGES)
inode->i_state |= I_SYNC
__writeback_single_inode()
inode->i_state |= I_DIRTY_PAGES; if (inode->i_state & I_SYNC) bail
if (!(inode->i_state & I_DIRTY_ALL))
- not true so nothing done
We end up with I_DIRTY_PAGES inode on b_dirty_time list and thus standard background writeback will not writeback this inode leading to possible dirty throttling stalls etc. (thanks to Martijn Coenen for this analysis).
Fix these problems by tracking whether inode is queued in b_io or b_more_io lists in a new I_SYNC_QUEUED flag. When this flag is set, we know flush worker has queued inode and we should not touch i_io_list. On the other hand we also know that once flush worker is done with the inode it will requeue the inode to appropriate dirty list. When I_SYNC_QUEUED is not set, __mark_inode_dirty() can (and must) move inode to appropriate dirty list.
--- fs/fs-writeback.c | 17 ++++++++++++----- include/linux/fs.h | 8 ++++++-- 2 files changed, 18 insertions(+), 7 deletions(-)
fs/fs-writeback.c +12 -5
@@ -146,6 +146,7 @@ static void inode_io_list_del_locked(strassert_spin_locked (&wb->list_lock);assert_spin_locked (&inode->i_lock); + inode->i_state &= ~I_SYNC_QUEUED ;list_del_init (&inode->i_io_list);wb_io_lists_depopulated (wb); }
@@ -1187,6 +1188,7 @@ static void redirty_tail_locked(struct i inode->dirtied_when = jiffies; }inode_io_list_move_locked (inode, wb, &wb->b_dirty); + inode->i_state &= ~I_SYNC_QUEUED ; }static void redirty_tail (struct inode *inode,struct bdi_writeback *wb)
@@ -1262,8 +1264,11 @@ static int move_expired_inodes(struct libreak ;list_move (&inode->i_io_list, &tmp); moved++; +spin_lock (&inode->i_lock);if (flags &EXPIRE_DIRTY_ATIME ) -set_bit (__I_DIRTY_TIME_EXPIRED, &inode->i_state); + inode->i_state |=I_DIRTY_TIME_EXPIRED ; + inode->i_state |=I_SYNC_QUEUED ; +spin_unlock (&inode->i_lock);if (sb_is_blkdev_sb (inode->i_sb))continue ;if (sb && sb != inode->i_sb)
@@ -1438,6 +1443,7 @@ static void requeue_inode(struct inode * }else if (inode->i_state &I_DIRTY_TIME ) { inode->dirtied_when = jiffies;inode_io_list_move_locked (inode, wb, &wb->b_dirty_time); + inode->i_state &= ~I_SYNC_QUEUED ; }else {/* The inode is clean. Remove from writeback lists. */ inode_io_list_del_locked (inode, wb);
@@ -2301,11 +2307,12 @@ void __mark_inode_dirty(struct inode *in inode->i_state |= flags;/* -* If the inode is being synced, just update its dirty state. -* The unlocker will place the inode on the appropriate -* superblock list, based upon its state. +* If the inode is queued for writeback by flush worker, just +* update its dirty state. Once the flush worker is done with +* the inode it will place it on the appropriate superblock +* list, based upon its state. */ -if (inode->i_state &I_SYNC ) +if (inode->i_state &I_SYNC_QUEUED ) goto out_unlock_inode;/*
include/linux/fs.h +6 -2
@@ -2168,6 +2168,10 @@ static inline void kiocb_clone(struct ki* * I_DONTCACHE Evict inode as soon as it is not used anymore. * +* I_SYNC_QUEUED Inode is queued in b_io or b_more_io writeback lists. +* Used to detect that mark_inode_dirty() should not move +* inode between dirty lists. +* * Q: What is the difference between I_WILL_FREE and I_FREEING? */ #define I_DIRTY_SYNC (1 << 0)
@@ -2185,12 +2189,12 @@ static inline void kiocb_clone(struct ki#define I_DIO_WAKEUP (1 << __I_DIO_WAKEUP)#define I_LINKABLE (1 << 10)#define I_DIRTY_TIME (1 << 11) -#define __I_DIRTY_TIME_EXPIRED 12 -#define I_DIRTY_TIME_EXPIRED (1 << __I_DIRTY_TIME_EXPIRED) +#define I_DIRTY_TIME_EXPIRED (1 << 12)#define I_WB_SWITCH (1 << 13)#define I_OVL_INUSE (1 << 14)#define I_CREATING (1 << 15)#define I_DONTCACHE (1 << 16) +#define I_SYNC_QUEUED (1 << 17)#define I_DIRTY_INODE (I_DIRTY_SYNC | I_DIRTY_DATASYNC)#define I_DIRTY (I_DIRTY_INODE | I_DIRTY_PAGES)
Greg Kroah-Hartman
maintainerPATCH 121/255 spi: stm32: always perform registers configuration prior to transfer
In reply to Greg Kroah-HartmanFrom: Alain Volmat <[email protected]>
[ Upstream commit 60ccb3515fc61a0124c70aa37317f75b67560024 ]
SPI registers content may have been lost upon suspend/resume sequence. So, always compute and apply the necessary configuration in stm32_spi_transfer_one_setup routine.
--- drivers/spi/spi-stm32.c | 42 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 25 deletions(-)
drivers/spi/spi-stm32.c +17 -25
@@ -1597,41 +1597,33 @@ static int stm32_spi_transfer_one_setup(struct stm32_spi *spi,unsigned long flags;unsigned int comm_type;int nb_words, ret =0 ; +int mbr;spin_lock_irqsave (&spi->lock, flags); spi->cur_xferlen = transfer->len; -if (spi->cur_bpw != transfer->bits_per_word) { - spi->cur_bpw = transfer->bits_per_word; - spi->cfg->set_bpw (spi); - } - -if (spi->cur_speed != transfer->speed_hz) { -int mbr; - -/* Update spi->cur_speed with real clock speed */ - mbr =stm32_spi_prepare_mbr (spi, transfer->speed_hz, - spi->cfg->baud_rate_div_min, - spi->cfg->baud_rate_div_max); -if (mbr <0 ) { - ret = mbr; - goto out; - } + spi->cur_bpw = transfer->bits_per_word; + spi->cfg->set_bpw (spi); - transfer->speed_hz = spi->cur_speed; -stm32_spi_set_mbr (spi, mbr); +/* Update spi->cur_speed with real clock speed */ + mbr =stm32_spi_prepare_mbr (spi, transfer->speed_hz, + spi->cfg->baud_rate_div_min, + spi->cfg->baud_rate_div_max); +if (mbr <0 ) { + ret = mbr; + goto out; } - comm_type =stm32_spi_communication_type (spi_dev, transfer); -if (spi->cur_comm != comm_type) { - ret = spi->cfg->set_mode (spi, comm_type); + transfer->speed_hz = spi->cur_speed; +stm32_spi_set_mbr (spi, mbr); -if (ret <0 ) - goto out; + comm_type =stm32_spi_communication_type (spi_dev, transfer); + ret = spi->cfg->set_mode (spi, comm_type); +if (ret <0 ) + goto out; - spi->cur_comm = comm_type; - } + spi->cur_comm = comm_type;if (spi->cfg->set_data_idleness) spi->cfg->set_data_idleness (spi, transfer->len);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 212/255 drm/dp_mst: Dont return error code when crtc is null
In reply to Greg Kroah-HartmanFrom: Bhawanpreet Lakha <[email protected]>
commit 88fee1c9007a38c19f2c558dc0ab1ddb4c323dc5 upstream.
[Why]
In certain cases the crtc can be NULL and returning -EINVAL causes atomic check to fail when it shouln't. This leads to valid configurations failing because atomic check fails.
[How]
Don't early return if crtc is null
--- drivers/gpu/drm/drm_dp_mst_topology.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_dp_mst_topology.c +2 -2
@@ -4993,8 +4993,8 @@ int drm_dp_mst_add_affected_dsc_crtcs(st crtc = conn_state->crtc; -if (WARN_ON (!crtc)) -return -EINVAL ; +if (!crtc) +continue ;if (!drm_dp_mst_dsc_aux_for_port (pos->port))continue ;
Greg Kroah-Hartman
maintainerPATCH 204/255 crypto: af_alg - Work around empty control messages without MSG_MORE
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
commit c195d66a8a75c60515819b101975f38b7ec6577f upstream.
The iwd daemon uses libell which sets up the skcipher operation with two separate control messages. As the first control message is sent without MSG_MORE, it is interpreted as an empty request.
While libell should be fixed to use MSG_MORE where appropriate, this patch works around the bug in the kernel so that existing binaries continue to work.
We will print a warning however.
A separate issue is that the new kernel code no longer allows the control message to be sent twice within the same request. This restriction is obviously incompatible with what iwd was doing (first setting an IV and then sending the real control message). This patch changes the kernel so that this is explicitly allowed.
--- crypto/af_alg.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
crypto/af_alg.c +10 -3
@@ -16,6 +16,7 @@#include <linux/module.h> #include <linux/net.h> #include <linux/rwsem.h> +#include <linux/sched.h> #include <linux/sched/signal.h> #include <linux/security.h>
@@ -847,9 +848,15 @@ int af_alg_sendmsg(struct socket *sock, }lock_sock (sk); -if (ctx->init && (init || !ctx->more)) { - err = -EINVAL ; - goto unlock; +if (ctx->init && !ctx->more) { +if (ctx->used) { + err = -EINVAL ; + goto unlock; + } + +pr_info_once ( +"%s sent an empty control message without MSG_MORE.\n" , + current->comm); } ctx->init = true;
Greg Kroah-Hartman
maintainerPATCH 209/255 x86/hotplug: Silence APIC only after all interrupts are migrated
In reply to Greg Kroah-HartmanFrom: Ashok Raj <[email protected]>
commit 52d6b926aabc47643cd910c85edb262b7f44c168 upstream.
There is a race when taking a CPU offline. Current code looks like this:
native_cpu_disable()
{
...
apic_soft_disable();
/*
* Any existing set bits for pending interrupt to
* this CPU are preserved and will be sent via IPI
* to another CPU by fixup_irqs().
*/
cpu_disable_common();
{
....
/*
* Race window happens here. Once local APIC has been
* disabled any new interrupts from the device to
* the old CPU are lost
*/
fixup_irqs(); // Too late to capture anything in IRR.
...
}
}The fix is to disable the APIC *after* cpu_disable_common().
Testing was done with a USB NIC that provided a source of frequent interrupts. A script migrated interrupts to a specific CPU and then took that CPU offline.
--- arch/x86/kernel/smpboot.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
arch/x86/kernel/smpboot.c +20 -6
@@ -1604,14 +1604,28 @@ int native_cpu_disable(void)if (ret)return ret; -/* -* Disable the local APIC. Otherwise IPI broadcasts will reach -* it. It still responds normally to INIT, NMI, SMI, and SIPI -* messages. -*/ -apic_soft_disable ();cpu_disable_common (); +/* +* Disable the local APIC. Otherwise IPI broadcasts will reach +* it. It still responds normally to INIT, NMI, SMI, and SIPI +* messages. +* +* Disabling the APIC must happen after cpu_disable_common() +* which invokes fixup_irqs(). +* +* Disabling the APIC preserves already set bits in IRR, but +* an interrupt arriving after disabling the local APIC does not +* set the corresponding IRR bit. +* +* fixup_irqs() scans IRR for set bits so it can raise a not +* yet handled interrupt on the new destination CPU via an IPI +* but obviously it can't do so for IRR bits which are not set. +* IOW, interrupts arriving after disabling the local APIC will +* be lost. +*/ +apic_soft_disable (); +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 205/255 usbip: Implement a match function to fix usbip
In reply to Greg Kroah-HartmanFrom: M. Vefa Bicakci <[email protected]>
commit 7a2f2974f26542b4e7b9b4321edb3cbbf3eeb91a upstream.
Commit 88b7381a939d ("USB: Select better matching USB drivers when available") introduced the use of a "match" function to select a non-generic/better driver for a particular USB device. This unfortunately breaks the operation of usbip in general, as reported in the kernel bugzilla with bug 208267 (linked below).
Upon inspecting the aforementioned commit, one can observe that the original code in the usb_device_match function used to return 1 unconditionally, but the aforementioned commit makes the usb_device_match function use identifier tables and "match" virtual functions, if either of them are available.
Hence, this commit implements a match function for usbip that unconditionally returns true to ensure that usbip is functional again.
This change has been verified to restore usbip functionality, with a v5.7.y kernel on an up-to-date version of Qubes OS 4.0, which uses usbip to redirect USB devices between VMs.
Thanks to Jonathan Dieter for the effort in bisecting this issue down to the aforementioned commit.
--- drivers/usb/usbip/stub_dev.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/usb/usbip/stub_dev.c +6 -0
@@ -461,6 +461,11 @@ static void stub_disconnect(struct usb_dreturn ; } +static bool usbip_match (struct usb_device *udev) +{ +return true; +} +#ifdef CONFIG_PM /* These functions need usb_port_suspend and usb_port_resume,
@@ -486,6 +491,7 @@ struct usb_device_driver stub_driver = { .name = "usbip-host", .probe = stub_probe, .disconnect = stub_disconnect, + .match = usbip_match, #ifdef CONFIG_PM .suspend = stub_suspend, .resume = stub_resume,
Greg Kroah-Hartman
maintainerPATCH 203/255 device property: Fix the secondary firmware node handling in set_primary_fwnode()
In reply to Greg Kroah-HartmanFrom: Heikki Krogerus <[email protected]>
commit c15e1bdda4365a5f17cdadf22bf1c1df13884a9e upstream.
When the primary firmware node pointer is removed from a device (set to NULL) the secondary firmware node pointer, when it exists, is made the primary node for the device. However, the secondary firmware node pointer of the original primary firmware node is never cleared (set to NULL).
To avoid situation where the secondary firmware node pointer is pointing to a non-existing object, clearing it properly when the primary node is removed from a device in set_primary_fwnode().
--- drivers/base/core.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/base/core.c +8 -4
@@ -3988,9 +3988,9 @@ static inline bool fwnode_is_primary(str*/ void set_primary_fwnode (struct device *dev,struct fwnode_handle *fwnode) { -if (fwnode) { -struct fwnode_handle *fn = dev->fwnode; +struct fwnode_handle *fn = dev->fwnode; +if (fwnode) {if (fwnode_is_primary (fn)) fn = fn->secondary;
@@ -4000,8 +4000,12 @@ void set_primary_fwnode(struct device *d } dev->fwnode = fwnode; }else { - dev->fwnode =fwnode_is_primary (dev->fwnode) ? - dev->fwnode->secondary :NULL ; +if (fwnode_is_primary (fn)) { + dev->fwnode = fn->secondary; + fn->secondary =NULL ; + }else { + dev->fwnode =NULL ; + } } }EXPORT_SYMBOL_GPL (set_primary_fwnode);
Greg Kroah-Hartman
maintainerPATCH 202/255 powerpc/perf: Fix crashes with generic_compat_pmu & BHRB
In reply to Greg Kroah-HartmanFrom: Alexey Kardashevskiy <[email protected]>
commit b460b512417ae9c8b51a3bdcc09020cd6c60ff69 upstream.
The bhrb_filter_map ("The Branch History Rolling Buffer") callback is only defined in raw CPUs' power_pmu structs. The "architected" CPUs use generic_compat_pmu, which does not have this callback, and crashes occur if a user tries to enable branch stack for an event.
This add a NULL pointer check for bhrb_filter_map() which behaves as if the callback returned an error.
This does not add the same check for config_bhrb() as the only caller checks for cpuhw->bhrb_users which remains zero if bhrb_filter_map==0.
--- arch/powerpc/perf/core-book3s.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
arch/powerpc/perf/core-book3s.c +14 -5
@@ -1517,9 +1517,16 @@ nocheck: ret =0 ; out:if (has_branch_stack (event)) { -power_pmu_bhrb_enable (event); - cpuhw->bhrb_filter = ppmu->bhrb_filter_map ( - event->attr.branch_sample_type); +u64 bhrb_filter =-1 ; + +if (ppmu->bhrb_filter_map) + bhrb_filter = ppmu->bhrb_filter_map ( + event->attr.branch_sample_type); + +if (bhrb_filter !=-1 ) { + cpuhw->bhrb_filter = bhrb_filter; +power_pmu_bhrb_enable (event); + } }perf_pmu_enable (event->pmu);
@@ -1841,7 +1848,6 @@ static int power_pmu_event_init(struct pint n;int err;struct cpu_hw_events *cpuhw; -u64 bhrb_filter;if (!ppmu)return -ENOENT ;
@@ -1947,7 +1953,10 @@ static int power_pmu_event_init(struct p err =power_check_constraints (cpuhw, events, cflags, n +1 );if (has_branch_stack (event)) { - bhrb_filter = ppmu->bhrb_filter_map ( +u64 bhrb_filter =-1 ; + +if (ppmu->bhrb_filter_map) + bhrb_filter = ppmu->bhrb_filter_map ( event->attr.branch_sample_type);if (bhrb_filter ==-1 ) {
Greg Kroah-Hartman
maintainerPATCH 198/255 KVM: arm64: Set HCR_EL2.PTW to prevent AT taking synchronous exception
In reply to Greg Kroah-HartmanFrom: James Morse <[email protected]>
commit 71a7f8cb1ca4ca7214a700b1243626759b6c11d4 upstream.
AT instructions do a translation table walk and return the result, or the fault in PAR_EL1. KVM uses these to find the IPA when the value is not provided by the CPU in HPFAR_EL1.
If a translation table walk causes an external abort it is taken as an exception, even if it was due to an AT instruction. (DDI0487F.a's D5.2.11 "Synchronous faults generated by address translation instructions")
While we previously made KVM resilient to exceptions taken due to AT instructions, the device access causes mismatched attributes, and may occur speculatively. Prevent this, by forbidding a walk through memory described as device at stage2. Now such AT instructions will report a stage2 fault.
Such a fault will cause KVM to restart the guest. If the AT instructions always walk the page tables, but guest execution uses the translation cached in the TLB, the guest can't make forward progress until the TLB entry is evicted. This isn't a problem, as since commit 5dcd0fdbb492 ("KVM: arm64:
Defer guest entry when an asynchronous exception is pending"), KVM will return to the host to process IRQs allowing the rest of the system to keep running.
--- arch/arm64/include/asm/kvm_arm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/include/asm/kvm_arm.h +2 -1
@@ -71,11 +71,12 @@* IMO: Override CPSR.I and enable signaling with VI * FMO: Override CPSR.F and enable signaling with VF * SWIO: Turn set/way invalidates into set/way clean+invalidate +* PTW: Take a stage2 fault if a stage1 walk steps in device memory */ #define HCR_GUEST_FLAGS (HCR_TSC | HCR_TSW | HCR_TWE | HCR_TWI | HCR_VM | \ HCR_BSU_IS | HCR_FB | HCR_TAC | \ HCR_AMO | HCR_SWIO | HCR_TIDCP | HCR_RW | HCR_TLOR | \ - HCR_FMO | HCR_IMO) + HCR_FMO | HCR_IMO | HCR_PTW )#define HCR_VIRT_EXCP_MASK (HCR_VSE | HCR_VI | HCR_VF)#define HCR_HOST_NVHE_FLAGS (HCR_RW | HCR_API | HCR_APK)#define HCR_HOST_VHE_FLAGS (HCR_RW | HCR_TGE | HCR_E2H)
Greg Kroah-Hartman
maintainerPATCH 136/255 dma-pool: Only allocate from CMA when in same memory zone
In reply to Greg Kroah-HartmanFrom: Nicolas Saenz Julienne <[email protected]>
[ Upstream commit d7e673ec2c8e0ea39c4c70fc490d67d7fbda869d ]
There is no guarantee to CMA's placement, so allocating a zone specific atomic pool from CMA might return memory from a completely different memory zone. To get around this double check CMA's placement before allocating from it.
--- kernel/dma/pool.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-)
kernel/dma/pool.c +30 -1
@@ -3,7 +3,9 @@* Copyright (C) 2012 ARM Ltd. * Copyright (C) 2020 Google LLC */ +#include <linux/cma.h> #include <linux/debugfs.h> +#include <linux/dma-contiguous.h> #include <linux/dma-direct.h> #include <linux/dma-noncoherent.h> #include <linux/init.h>
@@ -55,6 +57,29 @@ static void dma_atomic_pool_size_add(gfp_t gfp, size_t size) pool_size_kernel += size; } +static bool cma_in_zone (gfp_t gfp) +{ +unsigned long size; +phys_addr_t end; +struct cma *cma; + + cma =dev_get_cma_area (NULL ); +if (!cma) +return false; + + size =cma_get_size (cma); +if (!size) +return false; + +/* CMA can't cross zone boundaries, see cma_activate_area() */ + end =cma_get_base (cma) + size -1 ; +if (IS_ENABLED (CONFIG_ZONE_DMA ) && (gfp &GFP_DMA )) +return end <=DMA_BIT_MASK (zone_dma_bits); +if (IS_ENABLED (CONFIG_ZONE_DMA32 ) && (gfp &GFP_DMA32 )) +return end <=DMA_BIT_MASK (32 ); +return true; +} +static int atomic_pool_expand (struct gen_pool *pool,size_t pool_size,gfp_t gfp) {
@@ -68,7 +93,11 @@ static int atomic_pool_expand(struct gen_pool *pool, size_t pool_size,do { pool_size =1 << (PAGE_SHIFT + order); - page =alloc_pages (gfp, order); +if (cma_in_zone (gfp)) + page =dma_alloc_from_contiguous (NULL ,1 << order, + order, false); +if (!page) + page =alloc_pages (gfp, order); }while (!page && order-- >0 );if (!page) goto out;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 194/255 usb: host: xhci: fix ep context print mismatch in debugfs
In reply to Greg Kroah-HartmanFrom: Li Jun <[email protected]>
commit 0077b1b2c8d9ad5f7a08b62fb8524cdb9938388f upstream.
dci is 0 based and xhci_get_ep_ctx() will do ep index increment to get the ep context.
--- drivers/usb/host/xhci-debugfs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/usb/host/xhci-debugfs.c +4 -4
@@ -273,7 +273,7 @@ static int xhci_slot_context_show(structstatic int xhci_endpoint_context_show (struct seq_file *s,void *unused) { -int dci; +int ep_index;dma_addr_t dma;struct xhci_hcd *xhci;struct xhci_ep_ctx *ep_ctx;
@@ -282,9 +282,9 @@ static int xhci_endpoint_context_show(st xhci =hcd_to_xhci (bus_to_hcd (dev->udev->bus)); -for (dci =1 ; dci <32 ; dci++) { - ep_ctx =xhci_get_ep_ctx (xhci, dev->out_ctx, dci); - dma = dev->out_ctx->dma + dci *CTX_SIZE (xhci->hcc_params); +for (ep_index =0 ; ep_index <31 ; ep_index++) { + ep_ctx =xhci_get_ep_ctx (xhci, dev->out_ctx, ep_index); + dma = dev->out_ctx->dma + (ep_index +1 ) *CTX_SIZE (xhci->hcc_params); seq_printf(s, "%pad: %s\n", &dma, xhci_decode_ep_context(le32_to_cpu(ep_ctx->ep_info), le32_to_cpu(ep_ctx->ep_info2),
Greg Kroah-Hartman
maintainerPATCH 147/255 scsi: scsi_debug: Fix scp is NULL errors
In reply to Greg Kroah-HartmanFrom: Douglas Gilbert <[email protected]>
[ Upstream commit 223f91b48079227f914657f07d2d686f7b60aa26 ]
John Garry reported 'sdebug_q_cmd_complete: scp is NULL' failures that were mainly seen on aarch64 machines (e.g. RPi 4 with four A72 CPUs). The problem was tracked down to a missing critical section on a "short circuit" path. Namely, the time to process the current command so far has already exceeded the requested command duration (i.e. the number of nanoseconds in the ndelay parameter).
The random=1 parameter setting was pivotal in finding this error. The failure scenario involved first taking that "short circuit" path (due to a very short command duration) and then taking the more likely hrtimer_start() path (due to a longer command duration). With random=1 each command's duration is taken from the uniformly distributed [0..ndelay) interval. The fio utility also helped by reliably generating the error scenario at about once per minute on a RPi 4 (64 bit OS).
--- drivers/scsi/scsi_debug.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/scsi_debug.c +2 -0
@@ -5486,9 +5486,11 @@ static int schedule_resp(struct scsi_cmnd *cmnd, struct sdebug_dev_info *devip,u64 d =ktime_get_boottime_ns () - ns_from_boot;if (kt <= d) {/* elapsed duration >= kt */ +spin_lock_irqsave (&sqp->qc_lock, iflags); sqcp->a_cmnd =NULL ;atomic_dec (&devip->num_in_q);clear_bit (k, sqp->in_use_bm); +spin_unlock_irqrestore (&sqp->qc_lock, iflags);if (new_sd_dp)kfree (sd_dp);/* call scsi_done() from this thread */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 193/255 usb: host: xhci-tegra: fix tegra_xusb_get_phy()
In reply to Greg Kroah-HartmanFrom: JC Kuo <[email protected]>
commit d54343a87732726b04ac5af873916b5ed4f52932 upstream.
tegra_xusb_get_phy() should take input argument "name".
--- drivers/usb/host/xhci-tegra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci-tegra.c +1 -1
@@ -1136,7 +1136,7 @@ static struct phy *tegra_xusb_get_phy(stunsigned int i, phy_count =0 ;for (i =0 ; i < tegra->soc->num_types; i++) { -if (!strncmp (tegra->soc->phy_types[i].name,"usb2" , +if (!strncmp (tegra->soc->phy_types[i].name, name,strlen (name)))return tegra->phys[phy_count+port];
Greg Kroah-Hartman
maintainerPATCH 84/255 ALSA: usb-audio: Add capture support for Saffire 6 (USB 1.1)
In reply to Greg Kroah-HartmanFrom: Alexander Tsoy <[email protected]>
[ Upstream commit 470757f5b3a46bd85741bb0d8c1fd3f21048a2af ]
Capture and playback endpoints on Saffire 6 (USB 1.1) resides on the same interface. This was not supported by the composite quirk back in the day when initial support for this device was added, thus only playback was enabled until now.
--- sound/usb/quirks-table.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
sound/usb/quirks-table.h +30 -0
@@ -2678,6 +2678,10 @@ YAMAHA_DEVICE(0x7010, "UB99"), .ifnum = QUIRK_ANY_INTERFACE, .type = QUIRK_COMPOSITE, .data = (const struct snd_usb_audio_quirk []) { + { + .ifnum =0 , + .type =QUIRK_AUDIO_STANDARD_MIXER , + }, { .ifnum =0 , .type =QUIRK_AUDIO_FIXED_ENDPOINT ,
@@ -2690,6 +2694,32 @@ YAMAHA_DEVICE(0x7010, "UB99"), .attributes = UAC_EP_CS_ATTR_SAMPLE_RATE, .endpoint = 0x01, .ep_attr = USB_ENDPOINT_XFER_ISOC, + .datainterval = 1, + .maxpacksize = 0x024c, + .rates =SNDRV_PCM_RATE_44100 | + SNDRV_PCM_RATE_48000, + .rate_min = 44100, + .rate_max = 48000, + .nr_rates = 2, + .rate_table = (unsigned int []) { +44100 ,48000 + } + } + }, + { + .ifnum = 0, + .type = QUIRK_AUDIO_FIXED_ENDPOINT, + .data = &(const struct audioformat ) { + .formats =SNDRV_PCM_FMTBIT_S24_3LE , + .channels =2 , + .iface =0 , + .altsetting =1 , + .altset_idx =1 , + .attributes =0 , + .endpoint =0x82 , + .ep_attr =USB_ENDPOINT_XFER_ISOC , + .datainterval =1 , + .maxpacksize =0x0126 , .rates =SNDRV_PCM_RATE_44100 |SNDRV_PCM_RATE_48000 , .rate_min =44100 ,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 102/255 vdpa: ifcvf: return err when fail to request config irq
In reply to Greg Kroah-HartmanFrom: Jason Wang <[email protected]>
[ Upstream commit 9f4ce5d72b8e7a1f750598407c99f9e39dfb12fc ]
We ignore the err of requesting config interrupt, fix this.
--- drivers/vdpa/ifcvf/ifcvf_main.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/vdpa/ifcvf/ifcvf_main.c +4 -0
@@ -76,6 +76,10 @@ static int ifcvf_request_irq(struct ifcvf_adapter *adapter) ret =devm_request_irq (&pdev->dev, irq, ifcvf_config_changed,0 , vf->config_msix_name, vf); +if (ret) { +IFCVF_ERR (pdev,"Failed to request config irq\n" ); +return ret; + }for (i =0 ; i <IFCVF_MAX_QUEUE_PAIRS *2 ; i++) { snprintf(vf->vring[i].msix_name, 256, "ifcvf[%s]-%d\n",
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 103/255 vdpa: ifcvf: free config irq in ifcvf_free_irq()
In reply to Greg Kroah-HartmanFrom: Jason Wang <[email protected]>
[ Upstream commit 2b9f28d5e8efad34f472542315911c5ee9a65b6c ]
We don't free config irq in ifcvf_free_irq() which will trigger a BUG() in pci core since we try to free the vectors that has an action. Fixing this by recording the config irq in ifcvf_hw structure and free it in ifcvf_free_irq().
--- drivers/vdpa/ifcvf/ifcvf_base.h | 2 +- drivers/vdpa/ifcvf/ifcvf_main.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/vdpa/ifcvf/ifcvf_base.h +1 -1
@@ -84,7 +84,7 @@ struct ifcvf_hw {void __iomem *const *base;char config_msix_name[256 ];struct vdpa_callback config_cb; - +unsigned int config_irq; };struct ifcvf_adapter {
drivers/vdpa/ifcvf/ifcvf_main.c +3 -2
@@ -53,6 +53,7 @@ static void ifcvf_free_irq(struct ifcvf_adapter *adapter, int queues)for (i =0 ; i < queues; i++)devm_free_irq (&pdev->dev, vf->vring[i].irq, &vf->vring[i]); +devm_free_irq (&pdev->dev, vf->config_irq, vf);ifcvf_free_irq_vectors (pdev); }
@@ -72,8 +73,8 @@ static int ifcvf_request_irq(struct ifcvf_adapter *adapter)snprintf (vf->config_msix_name,256 ,"ifcvf[%s]-config\n" ,pci_name (pdev)); vector =0 ; - irq =pci_irq_vector (pdev, vector); - ret =devm_request_irq (&pdev->dev, irq, + vf->config_irq =pci_irq_vector (pdev, vector); + ret =devm_request_irq (&pdev->dev, vf->config_irq, ifcvf_config_changed,0 , vf->config_msix_name, vf);if (ret) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 130/255 tools/bpftool: Fix compilation warnings in 32-bit mode
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 09f44b753a7d120becc80213c3459183c8acd26b ]
Fix few compilation warnings in bpftool when compiling in 32-bit mode. Abstract away u64 to pointer conversion into a helper function.
--- tools/bpf/bpftool/btf_dumper.c | 2 +- tools/bpf/bpftool/link.c | 4 ++-- tools/bpf/bpftool/main.h | 10 +++++++++- tools/bpf/bpftool/prog.c | 16 ++++++++-------- 4 files changed, 20 insertions(+), 12 deletions(-)
tools/bpf/bpftool/btf_dumper.c +1 -1
@@ -67,7 +67,7 @@ static int dump_prog_id_as_func_ptr(const struct btf_dumper *d,if (!info->btf_id || !info->nr_func_info ||btf__get_from_id (info->btf_id, &prog_btf)) goto print; - finfo = (struct bpf_func_info *)info->func_info; + finfo =u64_to_ptr (info->func_info); func_type =btf__type_by_id (prog_btf, finfo->type_id);if (!func_type || !btf_is_func (func_type)) goto print;
tools/bpf/bpftool/link.c +2 -2
@@ -101,7 +101,7 @@ static int show_link_close_json(int fd, struct bpf_link_info *info)switch (info->type) {case BPF_LINK_TYPE_RAW_TRACEPOINT :jsonw_string_field (json_wtr,"tp_name" , - (const char *)info->raw_tracepoint.tp_name); +u64_to_ptr (info->raw_tracepoint.tp_name));break ;case BPF_LINK_TYPE_TRACING : err =get_prog_info (info->prog_id, &prog_info);
@@ -177,7 +177,7 @@ static int show_link_close_plain(int fd, struct bpf_link_info *info)switch (info->type) {case BPF_LINK_TYPE_RAW_TRACEPOINT :printf ("\n\ttp '%s' " , - (const char *)info->raw_tracepoint.tp_name); + (const char *)u64_to_ptr (info->raw_tracepoint.tp_name));break ;case BPF_LINK_TYPE_TRACING : err =get_prog_info (info->prog_id, &prog_info);
tools/bpf/bpftool/main.h +9 -1
@@ -21,7 +21,15 @@/* Make sure we do not use kernel-only integer typedefs */ #pragma GCC poison u8 u16 u32 u64 s8 s16 s32 s64 -#define ptr_to_u64 (ptr) ((__u64)(unsigned long)(ptr)) +static inline __u64 ptr_to_u64 (const void *ptr) +{ +return (__u64 )(unsigned long )ptr; +} + +static inline void *u64_to_ptr (__u64 ptr) +{ +return (void *)(unsigned long )ptr; +}#define NEXT_ARG () ({ argc--; argv++; if (argc < 0) usage(); })#define NEXT_ARGP () ({ (*argc)--; (*argv)++; if (*argc < 0) usage(); })
tools/bpf/bpftool/prog.c +8 -8
@@ -537,14 +537,14 @@ prog_dump(struct bpf_prog_info *info, enum dump_mode mode,p_info ("no instructions returned" );return -1 ; } - buf = (unsigned char *)(info->jited_prog_insns); + buf =u64_to_ptr (info->jited_prog_insns); member_len = info->jited_prog_len; }else {/* DUMP_XLATED */ if (info->xlated_prog_len ==0 || !info->xlated_prog_insns) {p_err ("error retrieving insn dump: kernel.kptr_restrict set?" );return -1 ; } - buf = (unsigned char *)info->xlated_prog_insns; + buf =u64_to_ptr (info->xlated_prog_insns); member_len = info->xlated_prog_len; }
@@ -553,7 +553,7 @@ prog_dump(struct bpf_prog_info *info, enum dump_mode mode,return -1 ; } - func_info = (void *)info->func_info; + func_info =u64_to_ptr (info->func_info);if (info->nr_line_info) { prog_linfo =bpf_prog_linfo__new (info);
@@ -571,7 +571,7 @@ prog_dump(struct bpf_prog_info *info, enum dump_mode mode, n =write (fd, buf, member_len);close (fd); -if (n != member_len) { +if (n != (ssize_t )member_len) {p_err ("error writing output file: %s" , n <0 ?strerror (errno) :"short write" );return -1 ;
@@ -601,13 +601,13 @@ prog_dump(struct bpf_prog_info *info, enum dump_mode mode,__u32 i;if (info->nr_jited_ksyms) {kernel_syms_load (&dd); - ksyms = (__u64 *) info->jited_ksyms; + ksyms =u64_to_ptr (info->jited_ksyms); }if (json_output)jsonw_start_array (json_wtr); - lens = (__u32 *) info->jited_func_lens; + lens =u64_to_ptr (info->jited_func_lens);for (i =0 ; i < info->nr_jited_func_lens; i++) {if (ksyms) { sym =kernel_syms_search (&dd, ksyms[i]);
@@ -668,7 +668,7 @@ prog_dump(struct bpf_prog_info *info, enum dump_mode mode, }else {kernel_syms_load (&dd); dd.nr_jited_ksyms = info->nr_jited_ksyms; - dd.jited_ksyms = (__u64 *) info->jited_ksyms; + dd.jited_ksyms =u64_to_ptr (info->jited_ksyms); dd.btf = btf; dd.func_info = func_info; dd.finfo_rec_size = info->func_info_rec_size;
@@ -1790,7 +1790,7 @@ static char *profile_target_name(int tgt_fd) goto out; } - func_info = (struct bpf_func_info *)(info_linear->info.func_info); + func_info =u64_to_ptr (info_linear->info.func_info); t =btf__type_by_id (btf, func_info[0 ].type_id);if (!t) { p_err("btf %d doesn't have type %d",
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 154/255 Revert "scsi: qla2xxx: Fix crash on qla2x00_mailbox_command"
In reply to Greg Kroah-HartmanFrom: Saurav Kashyap <[email protected]>
[ Upstream commit de7e6194301ad31c4ce95395eb678e51a1b907e5 ]
FCoE adapter initialization failed for ISP8021 with the following patch applied. In addition, reproduction of the issue the patch originally tried to address has been unsuccessful.
This reverts commit 3cb182b3fa8b7a61f05c671525494697cba39c6a.
--- drivers/scsi/qla2xxx/qla_mbx.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/scsi/qla2xxx/qla_mbx.c +0 -8
@@ -333,14 +333,6 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)if (time_after (jiffies, wait_time))break ; -/* -* Check if it's UNLOADING, cause we cannot poll in -* this case, or else a NULL pointer dereference -* is triggered. -*/ -if (unlikely (test_bit (UNLOADING , &base_vha->dpc_flags))) -return QLA_FUNCTION_TIMEOUT ; -/* Check for pending interrupts. */ qla2x00_poll (ha->rsp_q_map[0 ]);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 153/255 scsi: qla2xxx: Fix null pointer access during disconnect from subsystem
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit 83949613fac61e8e37eadf8275bf072342302f4e ]
NVMEAsync command is being submitted to QLA while the same NVMe controller is in the middle of reset. The reset path has deleted the association and freed aen_op->fcp_req.private. Add a check for this private pointer before issuing the command.
...
6 [ffffb656ca11fce0] page_fault at ffffffff8c00114e
[exception RIP: qla_nvme_post_cmd+394]
RIP: ffffffffc0d012ba RSP: ffffb656ca11fd98 RFLAGS: 00010206
RAX: ffff8fb039eda228 RBX: ffff8fb039eda200 RCX: 00000000000da161
RDX: ffffffffc0d4d0f0 RSI: ffffffffc0d26c9b RDI: ffff8fb039eda220
RBP: 0000000000000013 R8: ffff8fb47ff6aa80 R9: 0000000000000002
R10: 0000000000000000 R11: ffffb656ca11fdc8 R12: ffff8fb27d04a3b0
R13: ffff8fc46dd98a58 R14: 0000000000000000 R15: ffff8fc4540f0000
ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018 7 [ffffb656ca11fe08] nvme_fc_start_fcp_op at ffffffffc0241568 [nvme_fc] 8 [ffffb656ca11fe50] nvme_fc_submit_async_event at ffffffffc0241901 [nvme_fc] 9 [ffffb656ca11fe68] nvme_async_event_work at ffffffffc014543d [nvme_core]
10 [ffffb656ca11fe98] process_one_work at ffffffff8b6cd437
11 [ffffb656ca11fed8] worker_thread at ffffffff8b6cdcef
12 [ffffb656ca11ff10] kthread at ffffffff8b6d3402
13 [ffffb656ca11ff50] ret_from_fork at ffffffff8c000255
--
PID: 37824 TASK: ffff8fb033063d80 CPU: 20 COMMAND: "kworker/u97:451"
0 [ffffb656ce1abc28] __schedule at ffffffff8be629e3
1 [ffffb656ce1abcc8] schedule at ffffffff8be62fe8
2 [ffffb656ce1abcd0] schedule_timeout at ffffffff8be671ed
3 [ffffb656ce1abd70] wait_for_completion at ffffffff8be639cf
4 [ffffb656ce1abdd0] flush_work at ffffffff8b6ce2d5
5 [ffffb656ce1abe70] nvme_stop_ctrl at ffffffffc0144900 [nvme_core] 6 [ffffb656ce1abe80] nvme_fc_reset_ctrl_work at ffffffffc0243445 [nvme_fc] 7 [ffffb656ce1abe98] process_one_work at ffffffff8b6cd437
8 [ffffb656ce1abed8] worker_thread at ffffffff8b6cdb50
9 [ffffb656ce1abf10] kthread at ffffffff8b6d3402
10 [ffffb656ce1abf50] ret_from_fork at ffffffff8c000255
--- drivers/scsi/qla2xxx/qla_nvme.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/scsi/qla2xxx/qla_nvme.c +5 -0
@@ -536,6 +536,11 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport,struct nvme_private *priv = fd->private;struct qla_nvme_rport *qla_rport = rport->private; +if (!priv) { +/* nvme association has been torn down */ +return rval; + } + fcport = qla_rport->fcport; if (!qpair || !fcport || (qpair && !qpair->fw_started) ||
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 152/255 scsi: qla2xxx: Check if FW supports MQ before enabling
In reply to Greg Kroah-HartmanFrom: Saurav Kashyap <[email protected]>
[ Upstream commit dffa11453313a115157b19021cc2e27ea98e624c ]
OS boot during Boot from SAN was stuck at dracut emergency shell after enabling NVMe driver parameter. For non-MQ support the driver was enabling MQ. Add a check to confirm if FW supports MQ.
--- drivers/scsi/qla2xxx/qla_os.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/scsi/qla2xxx/qla_os.c +5 -0
@@ -2017,6 +2017,11 @@ skip_pio:/* Determine queue resources */ ha->max_req_queues = ha->max_rsp_queues =1 ; ha->msix_count =QLA_BASE_VECTORS ; + +/* Check if FW supports MQ or not */ +if (!(ha->fw_attributes &BIT_6 )) + goto mqiobase_exit; +if (!ql2xmqsupport || !ql2xnvmeenable || (!IS_QLA25XX (ha) && !IS_QLA81XX (ha))) goto mqiobase_exit;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 151/255 scsi: qla2xxx: Fix login timeout
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit abb31aeaa9b20680b0620b23fea5475ea4591e31 ]
Multipath errors were seen during failback due to login timeout. The remote device sent LOGO, the local host tore down the session and did relogin. The RSCN arrived indicates remote device is going through failover after which the relogin is in a 20s timeout phase. At this point the driver is stuck in the relogin process. Add a fix to delete the session as part of abort/flush the login.
--- drivers/scsi/qla2xxx/qla_gs.c | 18 +++++++++++++++--- drivers/scsi/qla2xxx/qla_target.c | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-)
drivers/scsi/qla2xxx/qla_gs.c +15 -3
@@ -3538,10 +3538,22 @@ login_logout: }if (fcport->scan_state !=QLA_FCPORT_FOUND ) { +bool do_delete = false; + +if (fcport->scan_needed && + fcport->disc_state ==DSC_LOGIN_PEND ) { +/* Cable got disconnected after we sent +* a login. Do delete to prevent timeout. +*/ + fcport->logout_on_delete =1 ; + do_delete = true; + } + fcport->scan_needed =0 ; -if ((qla_dual_mode_enabled (vha) || -qla_ini_mode_enabled (vha)) && -atomic_read (&fcport->state) ==FCS_ONLINE ) { +if (((qla_dual_mode_enabled (vha) || +qla_ini_mode_enabled (vha)) && +atomic_read (&fcport->state) ==FCS_ONLINE ) || + do_delete) {if (fcport->loop_id !=FC_NO_LOOP_ID ) {if (fcport->flags &FCF_FCP2_DEVICE ) fcport->logout_on_delete =0 ;
drivers/scsi/qla2xxx/qla_target.c +1 -1
@@ -1270,7 +1270,7 @@ void qlt_schedule_sess_for_deletion(struct fc_port *sess)qla24xx_chk_fcp_state (sess); -ql_dbg (ql_dbg_tgt, sess->vha,0xe001 , +ql_dbg (ql_dbg_disc, sess->vha,0xe001 ,"Scheduling sess %p for deletion %8phC\n" , sess, sess->port_name);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 169/255 block: loop: set discard granularity and alignment for block device backed loop
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
commit bcb21c8cc9947286211327d663ace69f07d37a76 upstream.
In case of block device backend, if the backend supports write zeros, the loop device will set queue flag of QUEUE_FLAG_DISCARD. However, limits.discard_granularity isn't setup, and this way is wrong, see the following description in Documentation/ABI/testing/sysfs-block:
A discard_granularity of 0 means that the device does not support discard functionality.
Especially 9b15d109a6b2 ("block: improve discard bio alignment in __blkdev_issue_discard()") starts to take q->limits.discard_granularity for computing max discard sectors. And zero discard granularity may cause kernel oops, or fail discard request even though the loop queue claims discard support via QUEUE_FLAG_DISCARD.
Fix the issue by setup discard granularity and alignment.
--- drivers/block/loop.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-)
drivers/block/loop.c +18 -15
@@ -877,6 +877,7 @@ static void loop_config_discard(struct lstruct file *file = lo->lo_backing_file;struct inode *inode = file->f_mapping->host;struct request_queue *q = lo->lo_queue; +u32 granularity, max_discard_sectors;/* * If the backing device is a block device, mirror its zeroing
@@ -889,11 +890,10 @@ static void loop_config_discard(struct lstruct request_queue *backingq; backingq =bdev_get_queue (inode->i_bdev); -blk_queue_max_discard_sectors (q, - backingq->limits.max_write_zeroes_sectors); -blk_queue_max_write_zeroes_sectors (q, - backingq->limits.max_write_zeroes_sectors); + max_discard_sectors = backingq->limits.max_write_zeroes_sectors; + granularity = backingq->limits.discard_granularity ?: +queue_physical_block_size (backingq);/* * We use punch hole to reclaim the free space used by the
@@ -902,23 +902,26 @@ static void loop_config_discard(struct l* useful information. */ }else if (!file->f_op->fallocate || lo->lo_encrypt_key_size) { - q->limits.discard_granularity =0 ; - q->limits.discard_alignment =0 ; -blk_queue_max_discard_sectors (q,0 ); -blk_queue_max_write_zeroes_sectors (q,0 ); + max_discard_sectors =0 ; + granularity =0 ; }else { - q->limits.discard_granularity = inode->i_sb->s_blocksize; - q->limits.discard_alignment =0 ; - -blk_queue_max_discard_sectors (q,UINT_MAX >>9 ); -blk_queue_max_write_zeroes_sectors (q,UINT_MAX >>9 ); + max_discard_sectors =UINT_MAX >>9 ; + granularity = inode->i_sb->s_blocksize; } -if (q->limits.max_write_zeroes_sectors) +if (max_discard_sectors) { + q->limits.discard_granularity = granularity; +blk_queue_max_discard_sectors (q, max_discard_sectors); +blk_queue_max_write_zeroes_sectors (q, max_discard_sectors);blk_queue_flag_set (QUEUE_FLAG_DISCARD , q); -else + }else { + q->limits.discard_granularity =0 ; +blk_queue_max_discard_sectors (q,0 ); +blk_queue_max_write_zeroes_sectors (q,0 );blk_queue_flag_clear (QUEUE_FLAG_DISCARD , q); + } + q->limits.discard_alignment =0 ; }static void loop_unprepare_queue (struct loop_device *lo)
Greg Kroah-Hartman
maintainerPATCH 167/255 hwmon: (gsc-hwmon) Scale temperature to millidegrees
In reply to Greg Kroah-HartmanFrom: Tim Harvey <[email protected]>
commit c1ae18d313e24bc7833e1749dd36dba5d47f259c upstream.
The GSC registers report temperature in decidegrees celcius so we need to scale it to represent the hwmon sysfs API of millidegrees.
--- drivers/hwmon/gsc-hwmon.c | 1 + 1 file changed, 1 insertion(+)
drivers/hwmon/gsc-hwmon.c +1 -0
@@ -172,6 +172,7 @@ gsc_hwmon_read(struct device *dev, enumcase mode_temperature:if (tmp >0x8000 ) tmp -=0xffff ; + tmp *=100 ;/* convert to millidegrees celsius */ break ;case mode_voltage_raw: tmp =clamp_val (tmp,0 ,BIT (GSC_HWMON_RESOLUTION ));
Greg Kroah-Hartman
maintainerPATCH 164/255 bpf: selftests: global_funcs: Check err_str before strstr
In reply to Greg Kroah-HartmanFrom: Yauheni Kaliuta <[email protected]>
[ Upstream commit c210773d6c6f595f5922d56b7391fe343bc7310e ]
The error path in libbpf.c:load_program() has calls to pr_warn() which ends up for global_funcs tests to test_global_funcs.c:libbpf_debug_print().
For the tests with no struct test_def::err_str initialized with a string, it causes call of strstr() with NULL as the second argument and it segfaults.
Fix it by calling strstr() only for non-NULL err_str.
--- tools/testing/selftests/bpf/prog_tests/test_global_funcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/test_global_funcs.c +1 -1
@@ -19,7 +19,7 @@ static int libbpf_debug_print(enum libbpf_print_level level, log_buf = va_arg(args, char *);if (!log_buf) goto out; -if (strstr (log_buf, err_str) ==0 ) +if (err_str &&strstr (log_buf, err_str) ==0 ) found = true; out:printf (format, log_buf);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 163/255 libbpf: Fix map index used in error message
In reply to Greg Kroah-HartmanFrom: Toke Høiland-Jørgensen <[email protected]>
[ Upstream commit 1e891e513e16c145cc9b45b1fdb8bf4a4f2f9557 ]
The error message emitted by bpf_object__init_user_btf_maps() was using the wrong section ID.
--- tools/lib/bpf/libbpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/libbpf.c +1 -1
@@ -2237,7 +2237,7 @@ static int bpf_object__init_user_btf_maps(struct bpf_object *obj, bool strict, data =elf_getdata (scn,NULL );if (!scn || !data) {pr_warn ("failed to get Elf_Data from map section %d (%s)\n" , - obj->efile.maps_shndx,MAPS_ELF_SEC ); + obj->efile.btf_maps_shndx,MAPS_ELF_SEC );return -EINVAL ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 104/255 usb: gadget: f_tcm: Fix some resource leaks in some error paths
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 07c8434150f4eb0b65cae288721c8af1080fde17 ]
If a memory allocation fails within a 'usb_ep_alloc_request()' call, the already allocated memory must be released.
Fix a mix-up in the code and free the correct requests.
--- drivers/usb/gadget/function/f_tcm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/usb/gadget/function/f_tcm.c +4 -3
@@ -753,12 +753,13 @@ static int uasp_alloc_stream_res(struct f_uas *fu, struct uas_stream *stream) goto err_sts;return 0 ; + err_sts: -usb_ep_free_request (fu->ep_status, stream->req_status); - stream->req_status =NULL ; -err_out:usb_ep_free_request (fu->ep_out, stream->req_out); stream->req_out =NULL ; +err_out: +usb_ep_free_request (fu->ep_in, stream->req_in); + stream->req_in =NULL ; out:return -ENOMEM ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 157/255 drm/amdgpu: fix NULL pointer access issue when unloading driver
In reply to Greg Kroah-HartmanFrom: Guchun Chen <[email protected]>
[ Upstream commit 1a68d96f81b8e7eb2a121fbf9abf9e5974e58832 ]
When unloading driver by "modprobe -r amdgpu", one NULL pointer dereference bug occurs in ras debugfs releasing. The cause is the duplicated debugfs_remove, as drm debugfs_root dir has been cleaned up already by drm_minor_unregister.
BUG: kernel NULL pointer dereference, address: 00000000000000a0 PGD 0 P4D 0 Oops: 0002 [#1] SMP PTI CPU: 11 PID: 1526 Comm: modprobe Tainted: G OE 5.6.0-guchchen #1 Hardware name: System manufacturer System Product Name/TUF Z370-PLUS GAMING II, BIOS 0411 09/21/2018 RIP: 0010:down_write+0x15/0x40 Code: eb de e8 7e 17 72 ff cc cc cc cc cc cc cc cc cc cc cc cc cc cc 0f 1f 44 00 00 53 48 89 fb e8 92 d8 ff ff 31 c0 ba 01 00 00 00 <f0> 48 0f b1 13 75 0f 65 48 8b 04 25 c0 8b 01 00 48 89 43 08 5b c3 RSP: 0018:ffffb1590386fcd0 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 00000000000000a0 RCX: 0000000000000000 RDX: 0000000000000001 RSI: ffffffff85b2fcc2 RDI: 00000000000000a0 RBP: ffffb1590386fd30 R08: ffffffff85b2fcc2 R09: 000000000002b3c0 R10: ffff97a330618c40 R11: 00000000000005f6 R12: ffff97a3481beb40 R13: 00000000000000a0 R14: ffff97a3481beb40 R15: 0000000000000000 FS: 00007fb11a717540(0000) GS:ffff97a376cc0000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00000000000000a0 CR3: 00000004066d6006 CR4: 00000000003606e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: simple_recursive_removal+0x63/0x370 ? debugfs_remove+0x60/0x60 debugfs_remove+0x40/0x60 amdgpu_ras_fini+0x82/0x230 [amdgpu] ? __kernfs_remove.part.17+0x101/0x1f0 ? kernfs_name_hash+0x12/0x80 amdgpu_device_fini+0x1c0/0x580 [amdgpu] amdgpu_driver_unload_kms+0x3e/0x70 [amdgpu] amdgpu_pci_remove+0x36/0x60 [amdgpu] pci_device_remove+0x3b/0xb0 device_release_driver_internal+0xe5/0x1c0 driver_detach+0x46/0x90 bus_remove_driver+0x58/0xd0 pci_unregister_driver+0x29/0x90 amdgpu_exit+0x11/0x25 [amdgpu] __x64_sys_delete_module+0x13d/0x210 do_syscall_64+0x5f/0x250 entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0 -2
@@ -1240,7 +1240,6 @@ void amdgpu_ras_debugfs_remove(struct amdgpu_device *adev,if (!obj || !obj->ent)return ; -debugfs_remove (obj->ent); obj->ent =NULL ;put_obj (obj); }
@@ -1254,7 +1253,6 @@ static void amdgpu_ras_debugfs_remove_all(struct amdgpu_device *adev)amdgpu_ras_debugfs_remove (adev, &obj->head); } -debugfs_remove_recursive (con->dir); con->dir =NULL ; }/* debugfs end */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 124/255 drm/amd/display: Fix LFC multiplier changing erratically
In reply to Greg Kroah-HartmanFrom: Anthony Koo <[email protected]>
[ Upstream commit e4ed4dbbc8383d42a197da8fe7ca6434b0f14def ]
[Why]
1. There is a calculation that is using frame_time_in_us instead of last_render_time_in_us to calculate whether choosing an LFC multiplier would cause the inserted frame duration to be outside of range.
2. We do not handle unsigned integer subtraction correctly and it underflows to a really large value, which causes some logic errors.
[How]
1. Fix logic to calculate 'within range' using last_render_time_in_us
2. Split out delta_from_mid_point_delta_in_us calculation to ensure we don't underflow and wrap around
--- .../amd/display/modules/freesync/freesync.c | 36 +++++++++++++++---- 1 file changed, 29 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/modules/freesync/freesync.c +29 -7
@@ -324,22 +324,44 @@ static void apply_below_the_range(struct core_freesync *core_freesync,/* Choose number of frames to insert based on how close it * can get to the mid point of the variable range. +* - Delta for CEIL: delta_from_mid_point_in_us_1 +* - Delta for FLOOR: delta_from_mid_point_in_us_2 */ -if ((frame_time_in_us / mid_point_frames_ceil) > in_out_vrr->min_duration_in_us && - (delta_from_mid_point_in_us_1 < delta_from_mid_point_in_us_2 || - mid_point_frames_floor <2 )) { +if ((last_render_time_in_us / mid_point_frames_ceil) < in_out_vrr->min_duration_in_us) { +/* Check for out of range. +* If using CEIL produces a value that is out of range, +* then we are forced to use FLOOR. +*/ + frames_to_insert = mid_point_frames_floor; + }else if (mid_point_frames_floor <2 ) { +/* Check if FLOOR would result in non-LFC. In this case +* choose to use CEIL +*/ + frames_to_insert = mid_point_frames_ceil; + }else if (delta_from_mid_point_in_us_1 < delta_from_mid_point_in_us_2) { +/* If choosing CEIL results in a frame duration that is +* closer to the mid point of the range. +* Choose CEIL +*/ frames_to_insert = mid_point_frames_ceil; - delta_from_mid_point_delta_in_us = delta_from_mid_point_in_us_2 - - delta_from_mid_point_in_us_1; }else { +/* If choosing FLOOR results in a frame duration that is +* closer to the mid point of the range. +* Choose FLOOR +*/ frames_to_insert = mid_point_frames_floor; - delta_from_mid_point_delta_in_us = delta_from_mid_point_in_us_1 - - delta_from_mid_point_in_us_2; }/* Prefer current frame multiplier when BTR is enabled unless it drifts * too far from the midpoint */ +if (delta_from_mid_point_in_us_1 < delta_from_mid_point_in_us_2) { + delta_from_mid_point_delta_in_us = delta_from_mid_point_in_us_2 - + delta_from_mid_point_in_us_1; + }else { + delta_from_mid_point_delta_in_us = delta_from_mid_point_in_us_1 - + delta_from_mid_point_in_us_2; + }if (in_out_vrr->btr.frames_to_insert !=0 && delta_from_mid_point_delta_in_us <BTR_DRIFT_MARGIN ) { if (((last_render_time_in_us / in_out_vrr->btr.frames_to_insert) <
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 120/255 spi: stm32: fix stm32_spi_prepare_mbr in case of odd clk_rate
In reply to Greg Kroah-HartmanFrom: Amelie Delaunay <[email protected]>
[ Upstream commit 9cc61973bf9385b19ff5dda4a2a7e265fcba85e4 ]
Fix spi->clk_rate when it is odd to the nearest lowest even value because minimum SPI divider is 2.
--- drivers/spi/spi-stm32.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/spi/spi-stm32.c +2 -1
@@ -442,7 +442,8 @@ static int stm32_spi_prepare_mbr(struct stm32_spi *spi, u32 speed_hz, {u32 div, mbrdiv; - div =DIV_ROUND_UP (spi->clk_rate, speed_hz); +/* Ensure spi->clk_rate is even */ + div =DIV_ROUND_UP (spi->clk_rate & ~0x1 , speed_hz);/* * SPI framework set xfer->speed_hz to master->max_speed_hz if
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 146/255 scsi: ufs: Clean up completed request without interrupt notification
In reply to Greg Kroah-HartmanFrom: Stanley Chu <[email protected]>
[ Upstream commit b10178ee7fa88b68a9e8adc06534d2605cb0ec23 ]
If somehow no interrupt notification is raised for a completed request and its doorbell bit is cleared by host, UFS driver needs to cleanup its outstanding bit in ufshcd_abort(). Otherwise, system may behave abnormally in the following scenario:
After ufshcd_abort() returns, this request will be requeued by SCSI layer with its outstanding bit set. Any future completed request will trigger ufshcd_transfer_req_compl() to handle all "completed outstanding bits". At this time the "abnormal outstanding bit" will be detected and the "requeued request" will be chosen to execute request post-processing flow. This is wrong because this request is still "alive".
--- drivers/scsi/ufs/ufshcd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/ufs/ufshcd.c +2 -1
@@ -6541,7 +6541,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd)/* command completed already */ dev_err (hba->dev,"%s: cmd at tag %d successfully cleared from DB.\n" , __func__, tag); - goto out; + goto cleanup; }else { dev_err(hba->dev, "%s: no response from device. tag = %d, err %d\n",
@@ -6575,6 +6575,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) goto out; } +cleanup:scsi_dma_unmap (cmd);spin_lock_irqsave (host->host_lock, flags);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 118/255 spi: stm32h7: fix race condition at end of transfer
In reply to Greg Kroah-HartmanFrom: Antonio Borneo <[email protected]>
[ Upstream commit 135dd873d3c76d812ae64c668adef3f2c59ed27f ]
The caller of stm32_spi_transfer_one(), spi_transfer_one_message(), is waiting for us to call spi_finalize_current_transfer() and will eventually schedule a new transfer, if available.
We should guarantee that the spi controller is really available before calling spi_finalize_current_transfer().
Move the call to spi_finalize_current_transfer() _after_ the call to stm32_spi_disable().
--- drivers/spi/spi-stm32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-stm32.c +1 -1
@@ -972,8 +972,8 @@ static irqreturn_t stm32h7_spi_irq_thread(int irq, void *dev_id)spin_unlock_irqrestore (&spi->lock, flags);if (end) { -spi_finalize_current_transfer (master);stm32h7_spi_disable (spi); +spi_finalize_current_transfer (master); }return IRQ_HANDLED ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 144/255 scsi: ufs: Fix possible infinite loop in ufshcd_hold
In reply to Greg Kroah-HartmanFrom: Stanley Chu <[email protected]>
[ Upstream commit 93b6c5db06028a3b55122bbb74d0715dd8ca4ae0 ]
In ufshcd_suspend(), after clk-gating is suspended and link is set as Hibern8 state, ufshcd_hold() is still possibly invoked before ufshcd_suspend() returns. For example, MediaTek's suspend vops may issue UIC commands which would call ufshcd_hold() during the command issuing flow.
Now if UFSHCD_CAP_HIBERN8_WITH_CLK_GATING capability is enabled, then ufshcd_hold() may enter infinite loops because there is no clk-ungating work scheduled or pending. In this case, ufshcd_hold() shall just bypass, and keep the link as Hibern8 state.
--- drivers/scsi/ufs/ufshcd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/scsi/ufs/ufshcd.c +4 -1
@@ -1566,6 +1566,7 @@ unblock_reqs:int ufshcd_hold (struct ufs_hba *hba,bool async) {int rc =0 ; +bool flush_result;unsigned long flags;if (!ufshcd_is_clkgating_allowed (hba))
@@ -1597,7 +1598,9 @@ start:break ; }spin_unlock_irqrestore (hba->host->host_lock, flags); -flush_work (&hba->clk_gating.ungate_work); + flush_result =flush_work (&hba->clk_gating.ungate_work); +if (hba->clk_gating.is_suspended && !flush_result) + goto out;spin_lock_irqsave (hba->host->host_lock, flags); goto start; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 138/255 ALSA: hda/realtek: Add model alc298-samsung-headphone
In reply to Greg Kroah-HartmanFrom: Mike Pozulp <[email protected]>
[ Upstream commit 23dc958689449be85e39351a8c809c3d344b155b ]
The very quiet and distorted headphone output bug that afflicted my Samsung Notebook 9 is appearing in many other Samsung laptops. Expose the quirk which fixed my laptop as a model so other users can try it.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -7969,6 +7969,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = { {.id = ALC299_FIXUP_PREDATOR_SPK, .name = "predator-spk"}, {.id = ALC298_FIXUP_HUAWEI_MBX_STEREO, .name = "huawei-mbx-stereo"}, {.id = ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE, .name = "alc256-medion-headset"}, + {.id = ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET, .name = "alc298-samsung-headphone"}, {} };#define ALC225_STANDARD_PINS \
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 140/255 ASoC: wm8994: Avoid attempts to read unreadable registers
In reply to Greg Kroah-HartmanFrom: Sylwester Nawrocki <[email protected]>
[ Upstream commit f082bb59b72039a2326ec1a44496899fb8aa6d0e ]
The driver supports WM1811, WM8994, WM8958 devices but according to documentation and the regmap definitions the WM8958_DSP2_* registers are only available on WM8958. In current code these registers are being accessed as if they were available on all the three chips.
When starting playback on WM1811 CODEC multiple errors like:
"wm8994-codec wm8994-codec: ASoC: error at soc_component_read_no_lock on wm8994-codec: -5" can be seen, which is caused by attempts to read an unavailable WM8958_DSP2_PROGRAM register. The issue has been uncovered by recent
commit "e2329ee ASoC: soc-component: add soc_component_err()".
This patch adds a check in wm8958_aif_ev() callback so the DSP2 handling is only done for WM8958.
--- sound/soc/codecs/wm8958-dsp2.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/soc/codecs/wm8958-dsp2.c +4 -0
@@ -412,8 +412,12 @@ int wm8958_aif_ev(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) {struct snd_soc_component *component =snd_soc_dapm_to_component (w->dapm); +struct wm8994 *control =dev_get_drvdata (component->dev->parent);int i; +if (control->type !=WM8958 ) +return 0 ; +switch (event) {case SND_SOC_DAPM_POST_PMU :case SND_SOC_DAPM_PRE_PMU :
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 141/255 ALSA: usb-audio: ignore broken processing/extension unit
In reply to Greg Kroah-HartmanFrom: Tom Yan <[email protected]>
[ Upstream commit d8d0db7bb358ef65d60726a61bfcd08eccff0bc0 ]
Some devices have broken extension unit where getting current value doesn't work. Attempt that once when creating mixer control for it. If it fails, just ignore it, so that it won't cripple the device entirely (and/or make the error floods).
--- sound/usb/mixer.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
sound/usb/mixer.c +7 -1
@@ -2367,7 +2367,7 @@ static int build_audio_procunit(struct mixer_build *state, int unitid,int num_ins;struct usb_mixer_elem_info *cval;struct snd_kcontrol *kctl; -int i, err, nameid, type, len; +int i, err, nameid, type, len, val;const struct procunit_info *info;const struct procunit_value_info *valinfo;const struct usbmix_name_map *map;
@@ -2470,6 +2470,12 @@ static int build_audio_procunit(struct mixer_build *state, int unitid,break ; } + err =get_cur_ctl_value (cval, cval->control <<8 , &val); +if (err <0 ) { +usb_mixer_elem_info_free (cval); +return -EINVAL ; + } + kctl =snd_ctl_new1 (&mixer_procunit_ctl, cval);if (!kctl) {usb_mixer_elem_info_free (cval);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 148/255 scsi: qla2xxx: Flush all sessions on zone disable
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit 10ae30ba664822f62de169a61628e31c999c7cc8 ]
On Zone Disable, certain switches would ignore all commands. This causes timeout for both switch scan command and abort of that command. On detection of this condition, all sessions will be shutdown.
--- drivers/scsi/qla2xxx/qla_gs.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/scsi/qla2xxx/qla_gs.c +12 -0
@@ -3736,6 +3736,18 @@ static void qla2x00_async_gpnft_gnnft_sp_done(srb_t *sp, int res)unsigned long flags;const char *name = sp->name; +if (res ==QLA_OS_TIMER_EXPIRED ) { +/* switch is ignoring all commands. +* This might be a zone disable behavior. +* This means we hit 64s timeout. +* 22s GPNFT + 44s Abort = 64s +*/ +ql_dbg (ql_dbg_disc, vha,0xffff , +"%s: Switch Zone check please .\n" , + name); +qla2x00_mark_all_devices_lost (vha); + } +/* * We are in an Interrupt context, queue up this * sp for GNNFT_DONE work. This will allow all
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 134/255 can: j1939: transport: j1939_xtp_rx_dat_one(): compare own packets to detect corruptions
In reply to Greg Kroah-HartmanFrom: Oleksij Rempel <[email protected]>
[ Upstream commit e052d0540298bfe0f6cbbecdc7e2ea9b859575b2 ]
Since the stack relays on receiving own packets, it was overwriting own transmit buffer from received packets.
At least theoretically, the received echo buffer can be corrupt or changed and the session partner can request to resend previous data. In this case we will re-send bad data.
With this patch we will stop to overwrite own TX buffer and use it for sanity checking.
--- net/can/j1939/transport.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
net/can/j1939/transport.c +14 -1
@@ -1803,7 +1803,20 @@ static void j1939_xtp_rx_dat_one(struct j1939_session *session, } tpdat = se_skb->data; -memcpy (&tpdat[offset], &dat[1 ], nbytes); +if (!session->transmission) { +memcpy (&tpdat[offset], &dat[1 ], nbytes); + }else { +int err; + + err =memcmp (&tpdat[offset], &dat[1 ], nbytes); +if (err) +netdev_err_once (priv->ndev, +"%s: 0x%p: Data of RX-looped back packet (%*ph) doesn't match TX data (%*ph)!\n" , + __func__, session, + nbytes, &dat[1 ], + nbytes, &tpdat[offset]); + } +if (packet == session->pkt.rx) session->pkt.rx++;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 135/255 dma-pool: fix coherent pool allocations for IOMMU mappings
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 9420139f516d7fbc248ce17f35275cb005ed98ea ]
When allocating coherent pool memory for an IOMMU mapping we don't care about the DMA mask. Move the guess for the initial GFP mask into the dma_direct_alloc_pages and pass dma_coherent_ok as a function pointer argument so that it doesn't get applied to the IOMMU case.
--- drivers/iommu/dma-iommu.c | 4 +- include/linux/dma-direct.h | 3 - include/linux/dma-mapping.h | 5 +- kernel/dma/direct.c | 13 ++-- kernel/dma/pool.c | 114 +++++++++++++++--------------------- 5 files changed, 62 insertions(+), 77 deletions(-)
drivers/iommu/dma-iommu.c +2 -2
@@ -1035,8 +1035,8 @@ static void *iommu_dma_alloc(struct device *dev, size_t size,if (IS_ENABLED (CONFIG_DMA_DIRECT_REMAP ) && !gfpflags_allow_blocking (gfp) && !coherent) - cpu_addr =dma_alloc_from_pool (dev,PAGE_ALIGN (size), &page, - gfp); + page =dma_alloc_from_pool (dev,PAGE_ALIGN (size), &cpu_addr, + gfp,NULL );else cpu_addr =iommu_dma_alloc_pages (dev, size, &page, gfp, attrs);if (!cpu_addr)
include/linux/dma-direct.h +0 -3
@@ -67,9 +67,6 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size, }u64 dma_direct_get_required_mask (struct device *dev); -gfp_t dma_direct_optimal_gfp_mask (struct device *dev,u64 dma_mask, -u64 *phys_mask); -bool dma_coherent_ok (struct device *dev,phys_addr_t phys,size_t size);void *dma_direct_alloc (struct device *dev,size_t size,dma_addr_t *dma_handle,gfp_t gfp,unsigned long attrs); void dma_direct_free(struct device *dev, size_t size, void *cpu_addr,
include/linux/dma-mapping.h +3 -2
@@ -715,8 +715,9 @@ void *dma_common_pages_remap(struct page **pages, size_t size, pgprot_t prot, const void *caller);void dma_common_free_remap (void *cpu_addr,size_t size); -void *dma_alloc_from_pool (struct device *dev,size_t size, -struct page **ret_page,gfp_t flags); +struct page *dma_alloc_from_pool (struct device *dev,size_t size, +void **cpu_addr,gfp_t flags, +bool (*phys_addr_ok)(struct device *,phys_addr_t ,size_t ));bool dma_free_from_pool (struct device *dev,void *start,size_t size);int
kernel/dma/direct.c +9 -4
@@ -45,7 +45,7 @@ u64 dma_direct_get_required_mask(struct device *dev)return (1ULL << (fls64 (max_dma) -1 )) *2 -1 ; } -gfp_t dma_direct_optimal_gfp_mask (struct device *dev,u64 dma_mask, +static gfp_t dma_direct_optimal_gfp_mask (struct device *dev,u64 dma_mask,u64 *phys_limit) {u64 dma_limit =min_not_zero (dma_mask, dev->bus_dma_limit);
@@ -70,7 +70,7 @@ gfp_t dma_direct_optimal_gfp_mask(struct device *dev, u64 dma_mask,return 0 ; } -bool dma_coherent_ok (struct device *dev,phys_addr_t phys,size_t size) +static bool dma_coherent_ok (struct device *dev,phys_addr_t phys,size_t size) {return phys_to_dma_direct (dev, phys) + size -1 <=min_not_zero (dev->coherent_dma_mask, dev->bus_dma_limit);
@@ -163,8 +163,13 @@ void *dma_direct_alloc_pages(struct device *dev, size_t size, size =PAGE_ALIGN (size);if (dma_should_alloc_from_pool (dev, gfp, attrs)) { - ret =dma_alloc_from_pool (dev, size, &page, gfp); -if (!ret) +u64 phys_mask; + + gfp |=dma_direct_optimal_gfp_mask (dev, dev->coherent_dma_mask, + &phys_mask); + page =dma_alloc_from_pool (dev, size, &ret, gfp, + dma_coherent_ok); +if (!page)return NULL ; goto done; }
kernel/dma/pool.c +48 -66
141 lines not on this page · raw message
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 128/255 netfilter: avoid ipv6 -> nf_defrag_ipv6 module dependency
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit 2404b73c3f1a5f15726c6ecd226b56f6f992767f ]
nf_ct_frag6_gather is part of nf_defrag_ipv6.ko, not ipv6 core.
The current use of the netfilter ipv6 stub indirections causes a module dependency between ipv6 and nf_defrag_ipv6.
This prevents nf_defrag_ipv6 module from being removed because ipv6 can't be unloaded.
Remove the indirection and always use a direct call. This creates a depency from nf_conntrack_bridge to nf_defrag_ipv6 instead:
modinfo nf_conntrack
depends: nf_conntrack,nf_defrag_ipv6,bridge
.. and nf_conntrack already depends on nf_defrag_ipv6 anyway.
--- include/linux/netfilter_ipv6.h | 18 ------------------ net/bridge/netfilter/nf_conntrack_bridge.c | 8 ++++++-- net/ipv6/netfilter.c | 3 --- 3 files changed, 6 insertions(+), 23 deletions(-)
include/linux/netfilter_ipv6.h +0 -18
@@ -58,7 +58,6 @@ struct nf_ipv6_ops { int (*output)(struct net *, struct sock *, struct sk_buff *));int (*reroute)(struct sk_buff *skb,const struct nf_queue_entry *entry);#if IS_MODULE (CONFIG_IPV6 ) -int (*br_defrag)(struct net *net,struct sk_buff *skb,u32 user); int (*br_fragment)(struct net *net, struct sock *sk, struct sk_buff *skb, struct nf_bridge_frag_data *data,
@@ -117,23 +116,6 @@ static inline int nf_ip6_route(struct net *net, struct dst_entry **dst,#include <net/netfilter/ipv6/nf_defrag_ipv6.h> -static inline int nf_ipv6_br_defrag (struct net *net,struct sk_buff *skb, -u32 user) -{ -#if IS_MODULE (CONFIG_IPV6 ) -const struct nf_ipv6_ops *v6_ops =nf_get_ipv6_ops (); - -if (!v6_ops) -return 1 ; - -return v6_ops->br_defrag (net, skb, user); -#elif IS_BUILTIN (CONFIG_IPV6 ) -return nf_ct_frag6_gather (net, skb, user); -#else -return 1 ; -#endif -} - int br_ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, struct nf_bridge_frag_data *data, int (*output)(struct net *, struct sock *sk,
net/bridge/netfilter/nf_conntrack_bridge.c +6 -2
@@ -168,6 +168,7 @@ static unsigned int nf_ct_br_defrag4(struct sk_buff *skb,static unsigned int nf_ct_br_defrag6 (struct sk_buff *skb,const struct nf_hook_state *state) { +#if IS_ENABLED (CONFIG_NF_DEFRAG_IPV6 )u16 zone_id =NF_CT_DEFAULT_ZONE_ID ;enum ip_conntrack_info ctinfo;struct br_input_skb_cb cb;
@@ -180,14 +181,17 @@ static unsigned int nf_ct_br_defrag6(struct sk_buff *skb,br_skb_cb_save (skb, &cb,sizeof (struct inet6_skb_parm )); - err =nf_ipv6_br_defrag (state->net, skb, -IP_DEFRAG_CONNTRACK_BRIDGE_IN + zone_id); + err =nf_ct_frag6_gather (state->net, skb, +IP_DEFRAG_CONNTRACK_BRIDGE_IN + zone_id);/* queued */ if (err == -EINPROGRESS )return NF_STOLEN ;br_skb_cb_restore (skb, &cb,IP6CB (skb)->frag_max_size);return err ==0 ?NF_ACCEPT :NF_DROP ; +#else +return NF_ACCEPT ; +#endif }static int nf_ct_br_ip_check (const struct sk_buff *skb)
net/ipv6/netfilter.c +0 -3
@@ -245,9 +245,6 @@ static const struct nf_ipv6_ops ipv6ops = { .route_input = ip6_route_input, .fragment = ip6_fragment, .reroute = nf_ip6_reroute, -#if IS_MODULE (CONFIG_IPV6 ) &&IS_ENABLED (CONFIG_NF_DEFRAG_IPV6 ) - .br_defrag = nf_ct_frag6_gather, -#endif #if IS_MODULE (CONFIG_IPV6 ) .br_fragment = br_ip6_fragment,#endif
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 125/255 drm/amd/display: Switch to immediate mode for updating infopackets
In reply to Greg Kroah-HartmanFrom: Anthony Koo <[email protected]>
[ Upstream commit abba907c7a20032c2d504fd5afe3af7d440a09d0 ]
[Why]
Using FRAME_UPDATE will result in infopacket to be potentially updated one frame late.
In commit stream scenarios for previously active stream, some stale infopacket data from previous config might be erroneously sent out on initial frame after stream is re-enabled.
[How]
Switch to using IMMEDIATE_UPDATE mode
--- .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 16 ++++++++-------- .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c +8 -8
@@ -121,35 +121,35 @@ void enc1_update_generic_info_packet(switch (packet_index) {case 0 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC0_FRAME_UPDATE ,1 ); +AFMT_GENERIC0_IMMEDIATE_UPDATE ,1 );break ;case 1 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC1_FRAME_UPDATE ,1 ); +AFMT_GENERIC1_IMMEDIATE_UPDATE ,1 );break ;case 2 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC2_FRAME_UPDATE ,1 ); +AFMT_GENERIC2_IMMEDIATE_UPDATE ,1 );break ;case 3 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC3_FRAME_UPDATE ,1 ); +AFMT_GENERIC3_IMMEDIATE_UPDATE ,1 );break ;case 4 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC4_FRAME_UPDATE ,1 ); +AFMT_GENERIC4_IMMEDIATE_UPDATE ,1 );break ;case 5 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC5_FRAME_UPDATE ,1 ); +AFMT_GENERIC5_IMMEDIATE_UPDATE ,1 );break ;case 6 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC6_FRAME_UPDATE ,1 ); +AFMT_GENERIC6_IMMEDIATE_UPDATE ,1 );break ;case 7 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC7_FRAME_UPDATE ,1 ); +AFMT_GENERIC7_IMMEDIATE_UPDATE ,1 );break ;default :break ;
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.h +14 -0
@@ -273,7 +273,14 @@ struct dcn10_stream_enc_registers {SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC2_FRAME_UPDATE , mask_sh),\SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC3_FRAME_UPDATE , mask_sh),\SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC4_FRAME_UPDATE , mask_sh),\ +SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC0_IMMEDIATE_UPDATE , mask_sh),\ +SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC1_IMMEDIATE_UPDATE , mask_sh),\ +SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC2_IMMEDIATE_UPDATE , mask_sh),\ +SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC3_IMMEDIATE_UPDATE , mask_sh),\SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC4_IMMEDIATE_UPDATE , mask_sh),\ +SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC5_IMMEDIATE_UPDATE , mask_sh),\ +SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC6_IMMEDIATE_UPDATE , mask_sh),\ +SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC7_IMMEDIATE_UPDATE , mask_sh),\SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC5_FRAME_UPDATE , mask_sh),\SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC6_FRAME_UPDATE , mask_sh),\ SE_SF(DIG0_AFMT_VBI_PACKET_CONTROL1, AFMT_GENERIC7_FRAME_UPDATE, mask_sh),\
@@ -337,7 +344,14 @@ struct dcn10_stream_enc_registers {type AFMT_GENERIC2_FRAME_UPDATE ;\type AFMT_GENERIC3_FRAME_UPDATE ;\type AFMT_GENERIC4_FRAME_UPDATE ;\ +type AFMT_GENERIC0_IMMEDIATE_UPDATE ;\ +type AFMT_GENERIC1_IMMEDIATE_UPDATE ;\ +type AFMT_GENERIC2_IMMEDIATE_UPDATE ;\ +type AFMT_GENERIC3_IMMEDIATE_UPDATE ;\type AFMT_GENERIC4_IMMEDIATE_UPDATE ;\ +type AFMT_GENERIC5_IMMEDIATE_UPDATE ;\ +type AFMT_GENERIC6_IMMEDIATE_UPDATE ;\ +type AFMT_GENERIC7_IMMEDIATE_UPDATE ;\type AFMT_GENERIC5_FRAME_UPDATE ;\type AFMT_GENERIC6_FRAME_UPDATE ;\type AFMT_GENERIC7_FRAME_UPDATE ;\
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 82/255 PM / devfreq: Fix the wrong end with semicolon
In reply to Greg Kroah-HartmanFrom: Chanwoo Choi <[email protected]>
[ Upstream commit 27a69714450f5c9288cec2b20f1ae4f7ad34dacf ]
Fix the wrong grammar at the end of code line by using semicolon.
--- drivers/devfreq/devfreq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/devfreq/devfreq.c +2 -2
@@ -1690,9 +1690,9 @@ static int devfreq_summary_show(struct seq_file *s, void *data)#endif mutex_lock (&devfreq->lock); - cur_freq = devfreq->previous_freq, + cur_freq = devfreq->previous_freq;get_freq_range (devfreq, &min_freq, &max_freq); - polling_ms = devfreq->profile->polling_ms, + polling_ms = devfreq->profile->polling_ms;mutex_unlock (&devfreq->lock); seq_printf(s,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 90/255 bfq: fix blkio cgroup leakage v4
In reply to Greg Kroah-HartmanFrom: Dmitry Monakhov <[email protected]>
[ Upstream commit 2de791ab4918969d8108f15238a701968375f235 ]
Changes from v1:
- update commit description with proper ref-accounting justification
commit db37a34c563b ("block, bfq: get a ref to a group when adding it to a service tree") introduce leak forbfq_group and blkcg_gq objects because of get/put imbalance.
In fact whole idea of original commit is wrong because bfq_group entity
can not dissapear under us because it is referenced by child bfq_queue's entities from here:
-> bfq_init_entity()
->bfqg_and_blkg_get(bfqg);
->entity->parent = bfqg->my_entity -> bfq_put_queue(bfqq)
FINAL_PUT
->bfqg_and_blkg_put(bfqq_group(bfqq))
->kmem_cache_free(bfq_pool, bfqq);So parent entity can not disappear while child entity is in tree,
and child entities already has proper protection.
This patch revert commit db37a34c563b ("block, bfq: get a ref to a group when adding it to a service tree")
bfq_group leak trace caused by bad commit:
-> blkg_alloc
-> bfq_pq_alloc
-> bfqg_get (+1)
->bfq_activate_bfqq
->bfq_activate_requeue_entity
-> __bfq_activate_entity
->bfq_get_entity
->bfqg_and_blkg_get (+1) <==== : Note1
->bfq_del_bfqq_busy
->bfq_deactivate_entity+0x53/0xc0 [bfq]
->__bfq_deactivate_entity+0x1b8/0x210 [bfq]
-> bfq_forget_entity(is_in_service = true)
entity->on_st_or_in_serv = false <=== :Note2
if (is_in_service)
return; ==> do not touch reference-> blkcg_css_offline
-> blkcg_destroy_blkgs
-> blkg_destroy
-> bfq_pd_offline
-> __bfq_deactivate_entity
if (!entity->on_st_or_in_serv) /* true, because (Note2)
return false;
-> bfq_pd_free
-> bfqg_put() (-1, byt bfqg->ref == 2) because of (Note2)So bfq_group and blkcg_gq will leak forever, see test-case below.
##TESTCASE_BEGIN:
#!/bin/bash
max_iters=${1:-100}
#prep cgroup mounts
mount -t tmpfs cgroup_root /sys/fs/cgroup mkdir /sys/fs/cgroup/blkio
mount -t cgroup -o blkio none /sys/fs/cgroup/blkio
# Prepare blkdev
grep blkio /proc/cgroups
truncate -s 1M img
losetup /dev/loop0 img
echo bfq > /sys/block/loop0/queue/scheduler
grep blkio /proc/cgroups
for ((i=0;i<max_iters;i++))
do
mkdir -p /sys/fs/cgroup/blkio/a
echo 0 > /sys/fs/cgroup/blkio/a/cgroup.procs
dd if=/dev/loop0 bs=4k count=1 of=/dev/null iflag=direct 2> /dev/null echo 0 > /sys/fs/cgroup/blkio/cgroup.procs
rmdir /sys/fs/cgroup/blkio/a
grep blkio /proc/cgroups
done
##TESTCASE_END:
--- block/bfq-cgroup.c | 2 +- block/bfq-iosched.h | 1 - block/bfq-wf2q.c | 12 ++---------- 3 files changed, 3 insertions(+), 12 deletions(-)
block/bfq-cgroup.c +1 -1
@@ -332,7 +332,7 @@ static void bfqg_put(struct bfq_group *bfqg)kfree (bfqg); } -void bfqg_and_blkg_get (struct bfq_group *bfqg) +static void bfqg_and_blkg_get (struct bfq_group *bfqg) {/* see comments in bfq_bic_update_cgroup for why refcounting bfqg */ bfqg_get (bfqg);
block/bfq-iosched.h +0 -1
@@ -986,7 +986,6 @@ struct bfq_group *bfq_find_set_group(struct bfq_data *bfqd,struct blkcg_gq *bfqg_to_blkg (struct bfq_group *bfqg);struct bfq_group *bfqq_group (struct bfq_queue *bfqq);struct bfq_group *bfq_create_group_hierarchy (struct bfq_data *bfqd,int node); -void bfqg_and_blkg_get (struct bfq_group *bfqg);void bfqg_and_blkg_put (struct bfq_group *bfqg);#ifdef CONFIG_BFQ_GROUP_IOSCHED
block/bfq-wf2q.c +2 -10
@@ -533,9 +533,7 @@ static void bfq_get_entity(struct bfq_entity *entity) bfqq->ref++;bfq_log_bfqq (bfqq->bfqd, bfqq,"get_entity: %p %d" , bfqq, bfqq->ref); - } else -bfqg_and_blkg_get (container_of (entity ,struct bfq_group , -entity )); + } }/**
@@ -649,14 +647,8 @@ static void bfq_forget_entity(struct bfq_service_tree *st, entity->on_st_or_in_serv = false; st->wsum -= entity->weight; -if (is_in_service) -return ; - -if (bfqq) +if (bfqq && !is_in_service)bfq_put_queue (bfqq); -else - bfqg_and_blkg_put(container_of(entity, struct bfq_group, - entity)); }/**
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 88/255 drm/msm/adreno: fix updating ring fence
In reply to Greg Kroah-HartmanFrom: Rob Clark <[email protected]>
[ Upstream commit f228af11dfa1d1616bc67f3a4119ab77c36181f1 ]
We need to set it to the most recent completed fence, not the most recent submitted. Otherwise we have races where we think we can retire submits that the GPU is not finished with, if the GPU doesn't manage to overwrite the seqno before we look at it.
This can show up with hang recovery if one of the submits after the crashing submit also hangs after it is replayed.
--- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/adreno_gpu.c +1 -1
@@ -396,7 +396,7 @@ int adreno_hw_init(struct msm_gpu *gpu) ring->next = ring->start;/* reset completed fence seqno: */ - ring->memptrs->fence = ring->seqno; + ring->memptrs->fence = ring->fctx->completed_fence; ring->memptrs->rptr =0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 89/255 block: Fix page_is_mergeable() for compound pages
In reply to Greg Kroah-HartmanFrom: Matthew Wilcox (Oracle) <[email protected]>
[ Upstream commit d81665198b83e55a28339d1f3e4890ed8a434556 ]
If we pass in an offset which is larger than PAGE_SIZE, then page_is_mergeable() thinks it's not mergeable with the previous bio_vec, leading to a large number of bio_vecs being used. Use a slightly more obvious test that the two pages are compatible with each other.
--- block/bio.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
block/bio.c +5 -5
@@ -738,8 +738,8 @@ static inline bool page_is_mergeable(const struct bio_vec *bv, struct page *page, unsigned int len, unsigned int off, bool *same_page) { - phys_addr_t vec_end_addr = page_to_phys(bv->bv_page) + - bv->bv_offset + bv->bv_len -1 ; + size_t bv_end = bv->bv_offset + bv->bv_len; +phys_addr_t vec_end_addr =page_to_phys (bv->bv_page) + bv_end -1 ;phys_addr_t page_addr =page_to_phys (page);if (vec_end_addr +1 != page_addr + off)
@@ -748,9 +748,9 @@ static inline bool page_is_mergeable(const struct bio_vec *bv,return false; *same_page = ((vec_end_addr &PAGE_MASK ) == page_addr); -if (!*same_page &&pfn_to_page (PFN_DOWN (vec_end_addr)) +1 != page) -return false; -return true; +if (*same_page) +return true; +return (bv->bv_page + bv_end /PAGE_SIZE ) == (page + off /PAGE_SIZE ); }/*
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 86/255 block: respect queue limit of max discard segment
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
[ Upstream commit 943b40c832beb71115e38a1c4d99b640b5342738 ]
When queue_max_discard_segments(q) is 1, blk_discard_mergable() will return false for discard request, then normal request merge is applied. However, only queue_max_segments() is checked, so max discard segment limit isn't respected.
Check max discard segment limit in the request merge code for fixing the issue.
Discard request failure of virtio_blk is fixed.
--- block/blk-merge.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
block/blk-merge.c +9 -2
@@ -534,10 +534,17 @@ int __blk_rq_map_sg(struct request_queue *q, struct request *rq, }EXPORT_SYMBOL (__blk_rq_map_sg); +static inline unsigned int blk_rq_get_max_segments (struct request *rq) +{ +if (req_op (rq) ==REQ_OP_DISCARD ) +return queue_max_discard_segments (rq->q); +return queue_max_segments (rq->q); +} +static inline int ll_new_hw_segment (struct request *req,struct bio *bio,unsigned int nr_phys_segs) { -if (req->nr_phys_segments + nr_phys_segs >queue_max_segments (req->q)) +if (req->nr_phys_segments + nr_phys_segs >blk_rq_get_max_segments (req)) goto no_merge;if (blk_integrity_merge_bio (req->q, req, bio) == false)
@@ -625,7 +632,7 @@ static int ll_merge_requests_fn(struct request_queue *q, struct request *req,return 0 ; total_phys_segments = req->nr_phys_segments + next->nr_phys_segments; -if (total_phys_segments >queue_max_segments (q)) +if (total_phys_segments >blk_rq_get_max_segments (req))return 0 ;if (blk_integrity_merge_rq (q, req, next) == false)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 110/255 ext4: skip non-loaded groups at cr=0/1 when scanning for good groups
In reply to Greg Kroah-HartmanFrom: Alex Zhuravlev <[email protected]>
[ Upstream commit c1d2c7d47e15482bb23cda83a5021e60f624a09c ]
cr=0 is supposed to be an optimization to save CPU cycles, but if buddy data (in memory) is not initialized then all this makes no sense as we have to do sync IO taking a lot of cycles. Also, at cr=0 mballoc doesn't choose any available chunk. cr=1 also skips groups using heuristic based on avg. fragment size. It's more useful to skip such groups and switch to cr=2 where groups will be scanned for available chunks. However, we always read the first block group in a flex_bg so metadata blocks will get read into the first flex_bg if possible.
Using sparse image and dm-slow virtual device of 120TB was simulated, then the image was formatted and filled using debugfs to mark ~85% of available space as busy. mount process w/o the patch couldn't complete in half an hour (according to vmstat it would take ~10-11 hours). With the patch applied mount took ~20 seconds.
Lustre-bug-id: https://jira.whamcloud.com/browse/LU-12988
--- fs/ext4/mballoc.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)
fs/ext4/mballoc.c +20 -1
@@ -2177,6 +2177,7 @@ static int ext4_mb_good_group_nolock(struct ext4_allocation_context *ac, {struct ext4_group_info *grp =ext4_get_group_info (ac->ac_sb, group);struct super_block *sb = ac->ac_sb; +struct ext4_sb_info *sbi =EXT4_SB (sb);bool should_lock = ac->ac_flags &EXT4_MB_STRICT_CHECK ;ext4_grpblk_t free;int ret =0 ;
@@ -2195,7 +2196,25 @@ static int ext4_mb_good_group_nolock(struct ext4_allocation_context *ac,/* We only do this if the grp has never been initialized */ if (unlikely (EXT4_MB_GRP_NEED_INIT (grp))) { - ret =ext4_mb_init_group (ac->ac_sb, group,GFP_NOFS ); +struct ext4_group_desc *gdp = +ext4_get_group_desc (sb, group,NULL ); +int ret; + +/* cr=0/1 is a very optimistic search to find large +* good chunks almost for free. If buddy data is not +* ready, then this optimization makes no sense. But +* we never skip the first block group in a flex_bg, +* since this gets used for metadata block allocation, +* and we want to make sure we locate metadata blocks +* in the first block group in the flex_bg if possible. +*/ +if (cr <2 && + (!sbi->s_log_groups_per_flex || + ((group & ((1 << sbi->s_log_groups_per_flex) -1 )) !=0 )) && + !(ext4_has_group_desc_csum (sb) && + (gdp->bg_flags &cpu_to_le16 (EXT4_BG_BLOCK_UNINIT )))) +return 0 ; + ret =ext4_mb_init_group (sb, group,GFP_NOFS );if (ret)return ret; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 111/255 drm/virtio: fix memory leak in virtio_gpu_cleanup_object()
In reply to Greg Kroah-HartmanFrom: Xin He <[email protected]>
[ Upstream commit 836b194d65782aaec4485a07d2aab52d3f698505 ]
Before setting shmem->pages to NULL, kfree() should be called.
--- drivers/gpu/drm/virtio/virtgpu_object.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/virtio/virtgpu_object.c +1 -0
@@ -79,6 +79,7 @@ void virtio_gpu_cleanup_object(struct virtio_gpu_object *bo) }sg_free_table (shmem->pages); +kfree (shmem->pages); shmem->pages =NULL ;drm_gem_shmem_unpin (&bo->base.base); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 101/255 i2c: rcar: in slave mode, clear NACK earlier
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit 914a7b3563b8fb92f976619bbd0fa3a4a708baae ]
Currently, a NACK in slave mode is set/cleared when SCL is held low by the IP core right before the bit is about to be pushed out. This is too late for clearing and then a NACK from the previous byte is still used for the current one. Now, let's clear the NACK right after we detected the STOP condition following the NACK.
--- drivers/i2c/busses/i2c-rcar.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-rcar.c +1 -0
@@ -590,6 +590,7 @@ static bool rcar_i2c_slave_irq(struct rcar_i2c_priv *priv)/* master sent stop */ if (ssr_filtered &SSR ) {i2c_slave_event (priv->slave,I2C_SLAVE_STOP , &value); +rcar_i2c_write (priv,ICSCR ,SIE |SDBS );/* clear our NACK */ rcar_i2c_write (priv,ICSIER ,SAR );rcar_i2c_write (priv,ICSSR , ~SSR &0xff ); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 97/255 null_blk: fix passing of REQ_FUA flag in null_handle_rq
In reply to Greg Kroah-HartmanFrom: Hou Pu <[email protected]>
[ Upstream commit 2d62e6b038e729c3e4bfbfcfbd44800ef0883680 ]
REQ_FUA should be checked using rq->cmd_flags instead of req_op().
--- drivers/block/null_blk_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/null_blk_main.c +1 -1
@@ -1139,7 +1139,7 @@ static int null_handle_rq(struct nullb_cmd *cmd) len = bvec.bv_len; err =null_transfer (nullb, bvec.bv_page, len, bvec.bv_offset,op_is_write (req_op (rq)), sector, -req_op (rq) &REQ_FUA ); + rq->cmd_flags &REQ_FUA );if (err) {spin_unlock_irq (&nullb->lock);return err;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 98/255 habanalabs: Fix memory corruption in debugfs
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit eeec23cd325ad4d83927b8ee162693579cf3813f ]
This has to be a long instead of a u32 because we write a long value. On 64 bit systems, this will cause memory corruption.
--- drivers/misc/habanalabs/debugfs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/misc/habanalabs/debugfs.c +4 -4
@@ -19,7 +19,7 @@static struct dentry *hl_debug_root;static int hl_debugfs_i2c_read (struct hl_device *hdev,u8 i2c_bus,u8 i2c_addr, -u8 i2c_reg,u32 *val) +u8 i2c_reg,long *val) {struct armcp_packet pkt;int rc;
@@ -36,7 +36,7 @@ static int hl_debugfs_i2c_read(struct hl_device *hdev, u8 i2c_bus, u8 i2c_addr, pkt.i2c_reg = i2c_reg; rc = hdev->asic_funcs->send_cpu_message (hdev, (u32 *) &pkt,sizeof (pkt), -0 , (long *) val); +0 , val);if (rc)dev_err (hdev->dev,"Failed to read from I2C, error %d\n" , rc);
@@ -827,7 +827,7 @@ static ssize_t hl_i2c_data_read(struct file *f, char __user *buf,struct hl_dbg_device_entry *entry =file_inode (f)->i_private;struct hl_device *hdev = entry->hdev;char tmp_buf[32 ]; -u32 val; +long val;ssize_t rc;if (*ppos)
@@ -842,7 +842,7 @@ static ssize_t hl_i2c_data_read(struct file *f, char __user *buf,return rc; } -sprintf (tmp_buf,"0x%02x\n" , val); +sprintf (tmp_buf,"0x%02lx\n" , val); rc =simple_read_from_buffer (buf, count, ppos, tmp_buf,strlen (tmp_buf));
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 94/255 nvmet: fix a memory leak
In reply to Greg Kroah-HartmanFrom: Sagi Grimberg <[email protected]>
[ Upstream commit 382fee1a8b623e2546a3e15e80517389e0e0673e ]
We forgot to free new_model_number
--- drivers/nvme/target/configfs.c | 1 + 1 file changed, 1 insertion(+)
drivers/nvme/target/configfs.c +1 -0
@@ -1035,6 +1035,7 @@ static ssize_t nvmet_subsys_attr_model_store(struct config_item *item,up_write (&nvmet_config_sem);kfree_rcu (new_model, rcuhead); +kfree (new_model_number);return count; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 58/255 ceph: fix potential mdsc use-after-free crash
In reply to Greg Kroah-HartmanFrom: Xiubo Li <[email protected]>
[ Upstream commit fa9967734227b44acb1b6918033f9122dc7825b9 ]
Make sure the delayed work stopped before releasing the resources.
cancel_delayed_work_sync() will only guarantee that the work finishes executing if the work is already in the ->worklist. That means after the cancel_delayed_work_sync() returns, it will leave the work requeued if it was rearmed at the end. That can lead to a use after free once the work struct is freed.
Fix it by flushing the delayed work instead of trying to cancel it, and ensure that the work doesn't rearm if the mdsc is stopping.
URL: https://tracker.ceph.com/issues/46293
--- fs/ceph/mds_client.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
fs/ceph/mds_client.c +13 -1
@@ -4285,6 +4285,9 @@ static void delayed_work(struct work_struct *work)dout ("mdsc delayed_work\n" ); +if (mdsc->stopping) +return ; +mutex_lock (&mdsc->mutex); renew_interval = mdsc->mdsmap->m_session_timeout >>2 ; renew_caps = time_after_eq(jiffies, HZ*renew_interval +
@@ -4660,7 +4663,16 @@ void ceph_mdsc_force_umount(struct ceph_mds_client *mdsc)static void ceph_mdsc_stop (struct ceph_mds_client *mdsc) {dout ("stop\n" ); -cancel_delayed_work_sync (&mdsc->delayed_work);/* cancel timer */ +/* +* Make sure the delayed work stopped before releasing +* the resources. +* +* Because the cancel_delayed_work_sync() will only +* guarantee that the work finishes executing. But the +* delayed work will re-arm itself again after that. +*/ +flush_delayed_work (&mdsc->delayed_work); +if (mdsc->mdsmap)ceph_mdsmap_destroy (mdsc->mdsmap);kfree (mdsc->sessions);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 56/255 scsi: iscsi: Do not put host in iscsi_set_flashnode_param()
In reply to Greg Kroah-HartmanFrom: Jing Xiangfeng <[email protected]>
[ Upstream commit 68e12e5f61354eb42cfffbc20a693153fc39738e ]
If scsi_host_lookup() fails we will jump to put_host which may cause a panic. Jump to exit_set_fnode instead.
--- drivers/scsi/scsi_transport_iscsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/scsi_transport_iscsi.c +1 -1
@@ -3291,7 +3291,7 @@ static int iscsi_set_flashnode_param(struct iscsi_transport *transport,pr_err ("%s could not find host no %u\n" , __func__, ev->u.set_flashnode.host_no); err = -ENODEV ; - goto put_host; + goto exit_set_fnode; } idx = ev->u.set_flashnode.flashnode_idx;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 53/255 locking/lockdep: Fix overflow in presentation of average lock-time
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
[ Upstream commit a7ef9b28aa8d72a1656fa6f0a01bbd1493886317 ]
Though the number of lock-acquisitions is tracked as unsigned long, this is passed as the divisor to div_s64() which interprets it as a s32, giving nonsense values with more than 2 billion acquisitons. E.g.
acquisitions holdtime-min holdtime-max holdtime-total holdtime-avg
-------------------------------------------------------------------------
2350439395 0.07 353.38 649647067.36 0.-32
--- kernel/locking/lockdep_proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/locking/lockdep_proc.c +1 -1
@@ -423,7 +423,7 @@ static void seq_lock_time(struct seq_file *m, struct lock_time *lt)seq_time (m, lt->min);seq_time (m, lt->max);seq_time (m, lt->total); -seq_time (m, lt->nr ?div_s64 (lt->total, lt->nr) :0 ); +seq_time (m, lt->nr ?div64_u64 (lt->total, lt->nr) :0 ); }static void seq_stats (struct seq_file *m,struct lock_stat_data *data)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 80/255 PCI: qcom: Change duplicate PCI reset to phy reset
In reply to Greg Kroah-HartmanFrom: Abhishek Sahu <[email protected]>
[ Upstream commit dd58318c019f10bc94db36df66af6c55d4c0cbba ]
The deinit issues reset_control_assert for PCI twice and does not contain phy reset.
--- drivers/pci/controller/dwc/pcie-qcom.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
drivers/pci/controller/dwc/pcie-qcom.c +8 -10
@@ -298,14 +298,14 @@ static void qcom_pcie_deinit_2_1_0(struct qcom_pcie *pcie) {struct qcom_pcie_resources_2_1_0 *res = &pcie->res.v2_1_0; +clk_disable_unprepare (res->phy_clk);reset_control_assert (res->pci_reset);reset_control_assert (res->axi_reset);reset_control_assert (res->ahb_reset);reset_control_assert (res->por_reset); -reset_control_assert (res->pci_reset); +reset_control_assert (res->phy_reset);clk_disable_unprepare (res->iface_clk);clk_disable_unprepare (res->core_clk); -clk_disable_unprepare (res->phy_clk);clk_disable_unprepare (res->aux_clk);clk_disable_unprepare (res->ref_clk);regulator_bulk_disable (ARRAY_SIZE (res->supplies), res->supplies);
@@ -344,12 +344,6 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie) goto err_clk_core; } - ret =clk_prepare_enable (res->phy_clk); -if (ret) { -dev_err (dev,"cannot prepare/enable phy clock\n" ); - goto err_clk_phy; - } - ret =clk_prepare_enable (res->aux_clk);if (ret) {dev_err (dev,"cannot prepare/enable aux clock\n" );
@@ -422,6 +416,12 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie)return ret; } + ret =clk_prepare_enable (res->phy_clk); +if (ret) { +dev_err (dev,"cannot prepare/enable phy clock\n" ); + goto err_deassert_ahb; + } +/* wait for clock acquisition */ usleep_range (1000 ,1500 );
@@ -439,8 +439,6 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie) err_clk_ref:clk_disable_unprepare (res->aux_clk); err_clk_aux: -clk_disable_unprepare (res->phy_clk); -err_clk_phy:clk_disable_unprepare (res->core_clk); err_clk_core:clk_disable_unprepare (res->iface_clk);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 78/255 net: openvswitch: introduce common code for flushing flows
In reply to Greg Kroah-HartmanFrom: Tonghao Zhang <[email protected]>
[ Upstream commit 1f3a090b9033f69de380c03db3ea1a1015c850cf ]
To avoid some issues, for example RCU usage warning and double free, we should flush the flows under ovs_lock. This patch refactors table_instance_destroy and introduces table_instance_flow_flush which can be invoked by __dp_destroy or ovs_flow_tbl_flush.
Reported-at: https://mail.openvswitch.org/pipermail/ovs-discuss/2020-August/050489.html
--- net/openvswitch/datapath.c | 10 +++++++++- net/openvswitch/flow_table.c | 35 +++++++++++++++-------------------- net/openvswitch/flow_table.h | 3 +++ 3 files changed, 27 insertions(+), 21 deletions(-)
net/openvswitch/datapath.c +9 -1
@@ -1736,6 +1736,7 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info)/* Called with ovs_mutex. */ static void __dp_destroy (struct datapath *dp) { +struct flow_table *table = &dp->table;int i;for (i =0 ; i <DP_VPORT_HASH_BUCKETS ; i++) {
@@ -1754,7 +1755,14 @@ static void __dp_destroy(struct datapath *dp)*/ ovs_dp_detach_port (ovs_vport_ovsl (dp,OVSP_LOCAL )); -/* RCU destroy the flow table */ +/* Flush sw_flow in the tables. RCU cb only releases resource +* such as dp, ports and tables. That may avoid some issues +* such as RCU usage warning. +*/ +table_instance_flow_flush (table,ovsl_dereference (table->ti), +ovsl_dereference (table->ufid_ti)); + +/* RCU destroy the ports, meters and flow tables. */ call_rcu (&dp->rcu, destroy_dp_rcu); }
net/openvswitch/flow_table.c +15 -20
@@ -345,19 +345,15 @@ static void table_instance_flow_free(struct flow_table *table,flow_mask_remove (table, flow->mask); } -static void table_instance_destroy (struct flow_table *table, -struct table_instance *ti, -struct table_instance *ufid_ti, -bool deferred) +/* Must be called with OVS mutex held. */ +void table_instance_flow_flush (struct flow_table *table, +struct table_instance *ti, +struct table_instance *ufid_ti) {int i; -if (!ti) -return ; - -BUG_ON (!ufid_ti);if (ti->keep_flows) - goto skip_flows; +return ;for (i =0 ; i < ti->n_buckets; i++) {struct sw_flow *flow;
@@ -369,18 +365,16 @@ static void table_instance_destroy(struct flow_table *table,table_instance_flow_free (table, ti, ufid_ti, flow, false); -ovs_flow_free (flow, deferred); +ovs_flow_free (flow, true); } } +} -skip_flows: -if (deferred) { -call_rcu (&ti->rcu, flow_tbl_destroy_rcu_cb); -call_rcu (&ufid_ti->rcu, flow_tbl_destroy_rcu_cb); - }else { -__table_instance_destroy (ti); -__table_instance_destroy (ufid_ti); - } +static void table_instance_destroy (struct table_instance *ti, +struct table_instance *ufid_ti) +{ +call_rcu (&ti->rcu, flow_tbl_destroy_rcu_cb); +call_rcu (&ufid_ti->rcu, flow_tbl_destroy_rcu_cb); }/* No need for locking this function is called from RCU callback or
@@ -393,7 +387,7 @@ void ovs_flow_tbl_destroy(struct flow_table *table)free_percpu (table->mask_cache);kfree_rcu (rcu_dereference_raw (table->mask_array), rcu); -table_instance_destroy (table, ti, ufid_ti, false); +table_instance_destroy (ti, ufid_ti); } struct sw_flow *ovs_flow_tbl_dump_next(struct table_instance *ti,
@@ -511,7 +505,8 @@ int ovs_flow_tbl_flush(struct flow_table *flow_table) flow_table->count =0 ; flow_table->ufid_count =0 ; -table_instance_destroy (flow_table, old_ti, old_ufid_ti, true); +table_instance_flow_flush (flow_table, old_ti, old_ufid_ti); +table_instance_destroy (old_ti, old_ufid_ti);return 0 ; err_free_ti:
net/openvswitch/flow_table.h +3 -0
@@ -86,4 +86,7 @@ bool ovs_flow_cmp(const struct sw_flow *, const struct sw_flow_match *);void ovs_flow_mask_key (struct sw_flow_key *dst,const struct sw_flow_key *src,bool full,const struct sw_flow_mask *mask); +void table_instance_flow_flush (struct flow_table *table, +struct table_instance *ti, +struct table_instance *ufid_ti);#endif /* flow_table.h */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 52/255 drm/nouveau: Fix reference count leak in nouveau_connector_detect
In reply to Greg Kroah-HartmanFrom: Aditya Pakki <[email protected]>
[ Upstream commit 990a1162986e8eff7ca18cc5a0e03b4304392ae2 ]
nouveau_connector_detect() calls pm_runtime_get_sync and in turn increments the reference count. In case of failure, decrement the ref count before returning the error.
--- drivers/gpu/drm/nouveau/nouveau_connector.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nouveau_connector.c +3 -1
@@ -572,8 +572,10 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)pm_runtime_get_noresume (dev->dev); }else { ret =pm_runtime_get_sync (dev->dev); -if (ret <0 && ret != -EACCES ) +if (ret <0 && ret != -EACCES ) { +pm_runtime_put_autosuspend (dev->dev);return conn_status; + } } nv_encoder =nouveau_connector_ddc_detect (connector);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 41/255 ARM: dts: ls1021a: output PPS signal on FIPER2
In reply to Greg Kroah-HartmanFrom: Yangbo Lu <[email protected]>
[ Upstream commit 5656bb3857c4904d1dec6e1b8f876c1c0337274e ]
The timer fixed interval period pulse generator register is used to generate periodic pulses. The down count register loads the value programmed in the fixed period interval (FIPER). At every tick of the timer accumulator overflow, the counter decrements by the value of TMR_CTRL[TCLK_PERIOD]. It generates a pulse when the down counter value reaches zero. It reloads the down counter in the cycle following a pulse.
To use the TMR_FIPER register to generate desired periodic pulses. The value should programmed is, desired_period - tclk_period
Current tmr-fiper2 value is to generate 100us periodic pulses. (But the value should have been 99995, not 99990. The tclk_period is 5.) This patch is to generate 1 second periodic pulses with value 999999995 programmed which is more desired by user.
--- arch/arm/boot/dts/ls1021a.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/ls1021a.dtsi +1 -1
@@ -772,7 +772,7 @@ fsl,tmr-prsc = <2>; fsl,tmr-add = <0xaaaaaaab>; fsl,tmr-fiper1 = <999999995>; - fsl,tmr-fiper2 = <99990>; + fsl,tmr-fiper2 = <999999995>; fsl,max-adj = <499999999>; fsl,extts-fifo; };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 72/255 mmc: sdhci-of-arasan: fix timings allocation code
In reply to Greg Kroah-HartmanFrom: Manish Narani <[email protected]>
[ Upstream commit 88e1d0b175ec0bfa775c8629eae2a728726e2c6a ]
The initial code that was adding delays was doing a cast over undefined memory. This meant that the delays would be all gibberish.
This change, allocates all delays on the stack, and assigns them from the ZynqMP & Versal macros/phase-list. And then finally copies them over the common iclk_phase & oclk_phase variables.
--- drivers/mmc/host/sdhci-of-arasan.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)
drivers/mmc/host/sdhci-of-arasan.c +14 -11
@@ -1025,7 +1025,6 @@ static void arasan_dt_read_clk_phase(struct device *dev,static void arasan_dt_parse_clk_phases (struct device *dev,struct sdhci_arasan_clk_data *clk_data) { -int *iclk_phase, *oclk_phase;u32 mio_bank =0 ;int i;
@@ -1037,28 +1036,32 @@ static void arasan_dt_parse_clk_phases(struct device *dev, clk_data->set_clk_delays = sdhci_arasan_set_clk_delays;if (of_device_is_compatible (dev->of_node,"xlnx,zynqmp-8.9a" )) { - iclk_phase = (int [MMC_TIMING_MMC_HS400 +1 ])ZYNQMP_ICLK_PHASE ; - oclk_phase = (int [MMC_TIMING_MMC_HS400 +1 ])ZYNQMP_OCLK_PHASE ; +u32 zynqmp_iclk_phase[MMC_TIMING_MMC_HS400 +1 ] = +ZYNQMP_ICLK_PHASE ; +u32 zynqmp_oclk_phase[MMC_TIMING_MMC_HS400 +1 ] = +ZYNQMP_OCLK_PHASE ;of_property_read_u32 (dev->of_node,"xlnx,mio-bank" , &mio_bank);if (mio_bank ==2 ) { - oclk_phase[MMC_TIMING_UHS_SDR104 ] =90 ; - oclk_phase[MMC_TIMING_MMC_HS200 ] =90 ; + zynqmp_oclk_phase[MMC_TIMING_UHS_SDR104 ] =90 ; + zynqmp_oclk_phase[MMC_TIMING_MMC_HS200 ] =90 ; }for (i =0 ; i <=MMC_TIMING_MMC_HS400 ; i++) { - clk_data->clk_phase_in[i] = iclk_phase[i]; - clk_data->clk_phase_out[i] = oclk_phase[i]; + clk_data->clk_phase_in[i] = zynqmp_iclk_phase[i]; + clk_data->clk_phase_out[i] = zynqmp_oclk_phase[i]; } }if (of_device_is_compatible (dev->of_node,"xlnx,versal-8.9a" )) { - iclk_phase = (int [MMC_TIMING_MMC_HS400 +1 ])VERSAL_ICLK_PHASE ; - oclk_phase = (int [MMC_TIMING_MMC_HS400 +1 ])VERSAL_OCLK_PHASE ; +u32 versal_iclk_phase[MMC_TIMING_MMC_HS400 +1 ] = +VERSAL_ICLK_PHASE ; +u32 versal_oclk_phase[MMC_TIMING_MMC_HS400 +1 ] = +VERSAL_OCLK_PHASE ;for (i =0 ; i <=MMC_TIMING_MMC_HS400 ; i++) { - clk_data->clk_phase_in[i] = iclk_phase[i]; - clk_data->clk_phase_out[i] = oclk_phase[i]; + clk_data->clk_phase_in[i] = versal_iclk_phase[i]; + clk_data->clk_phase_out[i] = versal_oclk_phase[i]; } }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 30/255 drm/amdkfd: fix ref count leak when pm_runtime_get_sync fails
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
[ Upstream commit 1c1ada37af6ee6fb9cfc8da6a56cc83208cd8d6f ]
The call to pm_runtime_get_sync increments the counter even in case of failure, leading to incorrect ref count.
In case of failure, decrement the ref count before returning.
--- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_process.c +3 -1
@@ -1003,8 +1003,10 @@ struct kfd_process_device *kfd_bind_process_to_device(struct kfd_dev *dev,*/ if (!pdd->runtime_inuse) { err =pm_runtime_get_sync (dev->ddev->dev); -if (err <0 ) +if (err <0 ) { +pm_runtime_put_autosuspend (dev->ddev->dev);return ERR_PTR (err); + } } err =kfd_iommu_bind_process_to_device (pdd);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 70/255 dmaengine: idxd: fix PCI_MSI build errors
In reply to Greg Kroah-Hartman[ Upstream commit d6a7bb869dd8a516901591136a9a895fd829d6c6 ]
Fix build errors when CONFIG_PCI_MSI is not enabled by making the driver depend on PCI_MSI:
ld: drivers/dma/idxd/device.o: in function `idxd_mask_msix_vector':
device.c:(.text+0x26f): undefined reference to `pci_msi_mask_irq'
ld: drivers/dma/idxd/device.o: in function `idxd_unmask_msix_vector':
device.c:(.text+0x2af): undefined reference to `pci_msi_unmask_irq'
--- drivers/dma/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/dma/Kconfig +1 -0
@@ -285,6 +285,7 @@ config INTEL_IDMA64 config INTEL_IDXD tristate "Intel Data Accelerators support" depends on PCI && X86_64 + depends on PCI_MSI select DMA_ENGINE select SBITMAP help
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 51/255 drm/nouveau: fix reference count leak in nv50_disp_atomic_commit
In reply to Greg Kroah-HartmanFrom: Aditya Pakki <[email protected]>
[ Upstream commit a2cdf39536b0d21fb06113f5e16692513d7bcb9c ]
nv50_disp_atomic_commit() calls calls pm_runtime_get_sync and in turn increments the reference count. In case of failure, decrement the ref count before returning the error.
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/dispnv50/disp.c +3 -1
@@ -2160,8 +2160,10 @@ nv50_disp_atomic_commit(struct drm_device *dev,int ret, i; ret =pm_runtime_get_sync (dev->dev); -if (ret <0 && ret != -EACCES ) +if (ret <0 && ret != -EACCES ) { +pm_runtime_put_autosuspend (dev->dev);return ret; + } ret =drm_atomic_helper_setup_commit (state, nonblock);if (ret)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 67/255 drm/amd/display: fix compilation error on allmodconfig
In reply to Greg Kroah-HartmanFrom: Qingqing Zhuo <[email protected]>
[ Upstream commit 8c823e4ff67c78659ab403d63d071103416f49eb ]
when compiled with allmodconfig option, there are error messages as below:
ERROR: modpost:
"mod_color_is_table_init"
[drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
ERROR: modpost:
"mod_color_get_table"
[drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
ERROR: modpost:
"mod_color_set_table_init_state"
[drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
To fix the issue, this commits removesCONFIG_DRM_AMD_DC_DCN guard in color/makefile.
--- drivers/gpu/drm/amd/display/modules/color/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/amd/display/modules/color/Makefile +1 -5
@@ -23,11 +23,7 @@ # Makefile for the color sub-module of DAL. # -MOD_COLOR = color_gamma.o - -ifdef CONFIG_DRM_AMD_DC_DCN -MOD_COLOR += color_table.o -endif +MOD_COLOR = color_gamma.o color_table.o AMD_DAL_MOD_COLOR = $(addprefix $(AMDDALPATH)/modules/color/,$(MOD_COLOR)) #$(info ************ DAL COLOR MODULE MAKEFILE ************)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 66/255 drm/amd/display: change global buffer to local buffer
In reply to Greg Kroah-HartmanFrom: Lewis Huang <[email protected]>
[ Upstream commit 8ae5b155928c9183c2f37b5c4eec21037d958699 ]
[Why]
Multi-adapter calculate regamma table at the same time. Two thread used the same global variable cause race condition.
[How]
Change global buffer to local buffer
--- .../amd/display/amdgpu_dm/amdgpu_dm_color.c | 10 +- .../drm/amd/display/modules/color/Makefile | 4 + .../amd/display/modules/color/color_gamma.c | 115 ++++++++++-------- .../amd/display/modules/color/color_gamma.h | 18 ++- .../amd/display/modules/color/color_table.c | 48 ++++++++ .../amd/display/modules/color/color_table.h | 47 +++++++ 6 files changed, 183 insertions(+), 59 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/modules/color/color_table.c create mode 100644 drivers/gpu/drm/amd/display/modules/color/color_table.h
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c +8 -2
@@ -195,10 +195,13 @@ static int __set_legacy_tf(struct dc_transfer_func *func, bool has_rom) {struct dc_gamma *gamma =NULL ; +struct calculate_buffer cal_buffer = {0 };bool res;ASSERT (lut && lut_size ==MAX_COLOR_LEGACY_LUT_ENTRIES ); + cal_buffer.buffer_index =-1 ; + gamma =dc_create_gamma ();if (!gamma)return -ENOMEM ;
@@ -208,7 +211,7 @@ static int __set_legacy_tf(struct dc_transfer_func *func,__drm_lut_to_dc_gamma (lut, gamma, true); res =mod_color_calculate_regamma_params (func, gamma, true, has_rom, -NULL ); +NULL , &cal_buffer);dc_gamma_release (&gamma);
@@ -221,10 +224,13 @@ static int __set_output_tf(struct dc_transfer_func *func, bool has_rom) {struct dc_gamma *gamma =NULL ; +struct calculate_buffer cal_buffer = {0 };bool res;ASSERT (lut && lut_size ==MAX_COLOR_LUT_ENTRIES ); + cal_buffer.buffer_index =-1 ; + gamma =dc_create_gamma ();if (!gamma)return -ENOMEM ;
@@ -248,7 +254,7 @@ static int __set_output_tf(struct dc_transfer_func *func,*/ gamma->type =GAMMA_CS_TFM_1D ; res =mod_color_calculate_regamma_params (func, gamma, false, - has_rom,NULL ); + has_rom,NULL , &cal_buffer); }dc_gamma_release (&gamma);
drivers/gpu/drm/amd/display/modules/color/Makefile +4 -0
@@ -25,6 +25,10 @@ MOD_COLOR = color_gamma.o +ifdef CONFIG_DRM_AMD_DC_DCN +MOD_COLOR += color_table.o +endif + AMD_DAL_MOD_COLOR = $(addprefix $(AMDDALPATH)/modules/color/,$(MOD_COLOR)) #$(info ************ DAL COLOR MODULE MAKEFILE ************)
drivers/gpu/drm/amd/display/modules/color/color_gamma.c +61 -54
326 lines not on this page · raw message
drivers/gpu/drm/amd/display/modules/color/color_gamma.h +15 -3
@@ -26,6 +26,8 @@#ifndef COLOR_MOD_COLOR_GAMMA_H_ #define COLOR_MOD_COLOR_GAMMA_H_ +#include "color_table.h" +struct dc_transfer_func ;struct dc_gamma ;struct dc_transfer_func_distributed_points ;
@@ -83,6 +85,12 @@ struct freesync_hdr_tf_params {unsigned int skip_tm;// skip tm }; +struct calculate_buffer { +int buffer_index; +struct fixed31_32 buffer[NUM_PTS_IN_REGION ]; +struct fixed31_32 gamma_of_2; +}; +struct translate_from_linear_space_args {struct fixed31_32 arg;struct fixed31_32 a0;
@@ -90,6 +98,7 @@ struct translate_from_linear_space_args {struct fixed31_32 a2;struct fixed31_32 a3;struct fixed31_32 gamma; +struct calculate_buffer *cal_buffer; };void setup_x_points_distribution (void );
@@ -99,7 +108,8 @@ void precompute_de_pq(void);bool mod_color_calculate_regamma_params (struct dc_transfer_func *output_tf,const struct dc_gamma *ramp,bool mapUserRamp,bool canRomBeUsed, -const struct freesync_hdr_tf_params *fs_params); +const struct freesync_hdr_tf_params *fs_params, +struct calculate_buffer *cal_buffer); bool mod_color_calculate_degamma_params(struct dc_color_caps *dc_caps, struct dc_transfer_func *output_tf,
@@ -109,10 +119,12 @@ bool mod_color_calculate_degamma_curve(enum dc_transfer_func_predefined trans, struct dc_transfer_func_distributed_points *points);bool calculate_user_regamma_coeff (struct dc_transfer_func *output_tf, -const struct regamma_lut *regamma); +const struct regamma_lut *regamma, +struct calculate_buffer *cal_buffer);bool calculate_user_regamma_ramp (struct dc_transfer_func *output_tf, -const struct regamma_lut *regamma); +const struct regamma_lut *regamma, +struct calculate_buffer *cal_buffer);#endif /* COLOR_MOD_COLOR_GAMMA_H_ */
drivers/gpu/drm/amd/display/modules/color/color_table.c new file +48 -0
48 lines not on this page · raw message
drivers/gpu/drm/amd/display/modules/color/color_table.h new file +47 -0
47 lines not on this page · raw message
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 65/255 media: i2c: imx290: fix reset GPIO pin handling
In reply to Greg Kroah-HartmanFrom: Andrey Konovalov <[email protected]>
[ Upstream commit 3909a92d7df622b41b9ceeeea694e641cad7667b ]
According to https://www.kernel.org/doc/Documentation/gpio/consumer.txt,
- all of the gpiod_set_value_xxx() functions operate with the *logical* value. So in imx290_power_on() the reset signal should be cleared (de-asserted) with gpiod_set_value_cansleep(imx290->rst_gpio, 0), and in imx290_power_off() the value of 1 must be used to apply/assert the reset to the sensor. In the device tree the reset pin is described as GPIO_ACTIVE_LOW, and gpiod_set_value_xxx() functions take this into account,
- when devm_gpiod_get_optional() is called with GPIOD_ASIS, the GPIO is not initialized, and the direction must be set later; using a GPIO without setting its direction first is illegal and will result in undefined behavior. Fix this by using GPIOD_OUT_HIGH instead of GPIOD_ASIS (this asserts the reset signal to the sensor initially).
--- drivers/media/i2c/imx290.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/media/i2c/imx290.c +4 -3
@@ -628,7 +628,7 @@ static int imx290_power_on(struct device *dev) }usleep_range (1 ,2 ); -gpiod_set_value_cansleep (imx290->rst_gpio,1 ); +gpiod_set_value_cansleep (imx290->rst_gpio,0 );usleep_range (30000 ,31000 );return 0 ;
@@ -641,7 +641,7 @@ static int imx290_power_off(struct device *dev)struct imx290 *imx290 =to_imx290 (sd);clk_disable_unprepare (imx290->xclk); -gpiod_set_value_cansleep (imx290->rst_gpio,0 ); +gpiod_set_value_cansleep (imx290->rst_gpio,1 );regulator_bulk_disable (IMX290_NUM_SUPPLIES , imx290->supplies);return 0 ;
@@ -760,7 +760,8 @@ static int imx290_probe(struct i2c_client *client) goto free_err; } - imx290->rst_gpio =devm_gpiod_get_optional (dev,"reset" ,GPIOD_ASIS ); + imx290->rst_gpio =devm_gpiod_get_optional (dev,"reset" , +GPIOD_OUT_HIGH );if (IS_ERR (imx290->rst_gpio)) {dev_err (dev,"Cannot get reset gpio\n" ); ret =PTR_ERR (imx290->rst_gpio);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 59/255 ceph: do not access the kiocb after aio requests
In reply to Greg Kroah-HartmanFrom: Xiubo Li <[email protected]>
[ Upstream commit d1d9655052606fd9078e896668ec90191372d513 ]
In aio case, if the completion comes very fast just before the ceph_read_iter() returns to fs/aio.c, the kiocb will be freed in the completion callback, then if ceph_read_iter() access again we will potentially hit the use-after-free bug.
[ jlayton: initialize direct_lock early, and use it everywhere ]
URL: https://tracker.ceph.com/issues/45649
--- fs/ceph/file.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/ceph/file.c +3 -2
@@ -1538,6 +1538,7 @@ static ssize_t ceph_read_iter(struct kiocb *iocb, struct iov_iter *to)struct inode *inode =file_inode (filp);struct ceph_inode_info *ci =ceph_inode (inode);struct page *pinned_page =NULL ; +bool direct_lock = iocb->ki_flags &IOCB_DIRECT ;ssize_t ret;int want, got =0 ;int retry_op =0 , read =0 ;
@@ -1546,7 +1547,7 @@ again:dout ("aio_read %p %llx.%llx %llu~%u trying to get caps on %p\n" , inode,ceph_vinop (inode), iocb->ki_pos, (unsigned )len, inode); -if (iocb->ki_flags &IOCB_DIRECT ) +if (direct_lock)ceph_start_io_direct (inode);else ceph_start_io_read (inode);
@@ -1603,7 +1604,7 @@ again: }ceph_put_cap_refs (ci, got); -if (iocb->ki_flags &IOCB_DIRECT ) +if (direct_lock)ceph_end_io_direct (inode);else ceph_end_io_read (inode);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 63/255 hugetlbfs: prevent filesystem stacking of hugetlbfs
In reply to Greg Kroah-HartmanFrom: Mike Kravetz <[email protected]>
[ Upstream commit 15568299b7d9988063afce60731df605ab236e2a ]
syzbot found issues with having hugetlbfs on a union/overlay as reported in [1]. Due to the limitations (no write) and special functionality of hugetlbfs, it does not work well in filesystem stacking. There are no know use cases for hugetlbfs stacking. Rather than making modifications to get hugetlbfs working in such environments, simply prevent stacking.
[1] https://lore.kernel.org/linux-mm/[email protected]/
--- fs/hugetlbfs/inode.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/hugetlbfs/inode.c +6 -0
@@ -1364,6 +1364,12 @@ hugetlbfs_fill_super(struct super_block *sb, struct fs_context *fc) sb->s_magic =HUGETLBFS_MAGIC ; sb->s_op = &hugetlbfs_ops; sb->s_time_gran =1 ; + +/* +* Due to the special and limited functionality of hugetlbfs, it does +* not work well as a stacking filesystem. +*/ + sb->s_stack_depth =FILESYSTEM_MAX_STACK_DEPTH ; sb->s_root =d_make_root (hugetlbfs_get_root (sb, ctx));if (!sb->s_root) goto out_free;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 64/255 media: davinci: vpif_capture: fix potential double free
In reply to Greg Kroah-HartmanFrom: Evgeny Novikov <[email protected]>
[ Upstream commit 602649eadaa0c977e362e641f51ec306bc1d365d ]
In case of errors vpif_probe_complete() releases memory for vpif_obj.sd and unregisters the V4L2 device. But then this is done again by vpif_probe() itself. The patch removes the cleaning from vpif_probe_complete().
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/media/platform/davinci/vpif_capture.c | 2 -- 1 file changed, 2 deletions(-)
drivers/media/platform/davinci/vpif_capture.c +0 -2
@@ -1482,8 +1482,6 @@ probe_out:/* Unregister video device */ video_unregister_device (&ch->video_dev); } -kfree (vpif_obj.sd); -v4l2_device_unregister (&vpif_obj.v4l2_dev);return err; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 16/255 gcc-plugins/stackleak: Dont instrument itself
In reply to Greg Kroah-HartmanFrom: Alexander Popov <[email protected]>
[ Upstream commit 005e696df65d0ff90468ecf38a50aa584dc82421 ]
There is no need to try instrumenting functions in kernel/stackleak.c. Otherwise that can cause issues if the cleanup pass of stackleak gcc plugin is disabled.
--- kernel/Makefile | 1 + 1 file changed, 1 insertion(+)
kernel/Makefile +1 -0
@@ -125,6 +125,7 @@ obj-$(CONFIG_WATCH_QUEUE) += watch_queue.o obj-$(CONFIG_SYSCTL_KUNIT_TEST) += sysctl-test.o +CFLAGS_stackleak.o += $(DISABLE_STACKLEAK_PLUGIN) obj-$(CONFIG_GCC_PLUGIN_STACKLEAK) += stackleak.o KASAN_SANITIZE_stackleak.o := n KCSAN_SANITIZE_stackleak.o := n
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 25/255 drm/amdgpu: fix ref count leak in amdgpu_driver_open_kms
In reply to Greg Kroah-HartmanFrom: Navid Emamdoost <[email protected]>
[ Upstream commit 9ba8923cbbe11564dd1bf9f3602add9a9cfbb5c6 ]
in amdgpu_driver_open_kms the call to pm_runtime_get_sync increments the counter even in case of failure, leading to incorrect
ref count. In case of failure, decrement the ref count before returning.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +2 -1
@@ -992,7 +992,7 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) r =pm_runtime_get_sync (dev->dev);if (r <0 ) -return r; + goto pm_put; fpriv =kzalloc (sizeof (*fpriv),GFP_KERNEL );if (unlikely (!fpriv)) {
@@ -1043,6 +1043,7 @@ error_pasid: out_suspend:pm_runtime_mark_last_busy (dev->dev); +pm_put:pm_runtime_put_autosuspend (dev->dev);return r;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 21/255 iommu/iova: Dont BUG on invalid PFNs
In reply to Greg Kroah-HartmanFrom: Robin Murphy <[email protected]>
[ Upstream commit d3e3d2be688b4b5864538de61e750721a311e4fc ]
Unlike the other instances which represent a complete loss of consistency within the rcache mechanism itself, or a fundamental and obvious misconfiguration by an IOMMU driver, the BUG_ON() in iova_magazine_free_pfns() can be provoked at more or less any time in a "spooky action-at-a-distance" manner by any old device driver passing nonsense to dma_unmap_*() which then propagates through to queue_iova().
Not only is this well outside the IOVA layer's control, it's also nowhere near fatal enough to justify panicking anyway - all that really achieves is to make debugging the offending driver more difficult. Let's simply WARN and otherwise ignore bogus PFNs.
--- drivers/iommu/iova.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iommu/iova.c +3 -1
@@ -811,7 +811,9 @@ iova_magazine_free_pfns(struct iova_magazine *mag, struct iova_domain *iovad)for (i =0 ; i < mag->size; ++i) {struct iova *iova =private_find_iova (iovad, mag->pfns[i]); -BUG_ON (!iova); +if (WARN_ON (!iova)) +continue ; +private_free_iova (iovad, iova); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 20/255 mfd: intel-lpss: Add Intel Tiger Lake PCH-H PCI IDs
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit bb7fcad48d3804d814b97c785514e2d1657e157f ]
Intel Tiger Lake PCH-H has the same LPSS than Intel Broxton. Add the new IDs to the list of supported devices.
--- drivers/mfd/intel-lpss-pci.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/mfd/intel-lpss-pci.c +16 -0
@@ -233,6 +233,22 @@ static const struct pci_device_id intel_lpss_pci_ids[] = { { PCI_VDEVICE(INTEL, 0x34ea), (kernel_ulong_t)&bxt_i2c_info }, { PCI_VDEVICE(INTEL, 0x34eb), (kernel_ulong_t)&bxt_i2c_info }, { PCI_VDEVICE(INTEL, 0x34fb), (kernel_ulong_t)&spt_info }, +/* TGL-H */ + { PCI_VDEVICE(INTEL, 0x43a7), (kernel_ulong_t)&bxt_uart_info }, + { PCI_VDEVICE(INTEL, 0x43a8), (kernel_ulong_t)&bxt_uart_info }, + { PCI_VDEVICE(INTEL, 0x43a9), (kernel_ulong_t)&bxt_uart_info }, + { PCI_VDEVICE(INTEL, 0x43aa), (kernel_ulong_t)&bxt_info }, + { PCI_VDEVICE(INTEL, 0x43ab), (kernel_ulong_t)&bxt_info }, + { PCI_VDEVICE(INTEL, 0x43ad), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x43ae), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x43d8), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x43da), (kernel_ulong_t)&bxt_uart_info }, + { PCI_VDEVICE(INTEL, 0x43e8), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x43e9), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x43ea), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x43eb), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x43fb), (kernel_ulong_t)&bxt_info }, + { PCI_VDEVICE(INTEL, 0x43fd), (kernel_ulong_t)&bxt_info },/* EHL */ { PCI_VDEVICE(INTEL, 0x4b28), (kernel_ulong_t)&bxt_uart_info }, { PCI_VDEVICE(INTEL, 0x4b29), (kernel_ulong_t)&bxt_uart_info },
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 48/255 HID: quirks: add NOGET quirk for Logitech GROUP
In reply to Greg Kroah-HartmanFrom: Ikjoon Jang <[email protected]>
[ Upstream commit 68f775ddd2a6f513e225f9a565b054ab48fef142 ]
Add HID_QUIRK_NOGET for Logitech GROUP device.
Logitech GROUP is a compound with camera and audio. When the HID interface in an audio device is requested to get specific report id, all following control transfers are stalled and never be restored back.
--- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-quirks.c | 1 + 2 files changed, 2 insertions(+)
drivers/hid/hid-ids.h +1 -0
@@ -773,6 +773,7 @@#define USB_DEVICE_ID_LOGITECH_G27_WHEEL 0xc29b#define USB_DEVICE_ID_LOGITECH_WII_WHEEL 0xc29c#define USB_DEVICE_ID_LOGITECH_ELITE_KBD 0xc30a +#define USB_DEVICE_ID_LOGITECH_GROUP_AUDIO 0x0882#define USB_DEVICE_ID_S510_RECEIVER 0xc50c#define USB_DEVICE_ID_S510_RECEIVER_2 0xc517#define USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500 0xc512
drivers/hid/hid-quirks.c +1 -0
@@ -179,6 +179,7 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD2, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT }, + { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET }, { 0 } };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 43/255 mips/vdso: Fix resource leaks in genvdso.c
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit a859647b4e6bfeb192284d27d24b6a0c914cae1d ]
Close "fd" before the return of map_vdso() and close "out_file" in main().
--- arch/mips/vdso/genvdso.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/mips/vdso/genvdso.c +10 -0
@@ -122,6 +122,7 @@ static void *map_vdso(const char *path, size_t *_size)if (fstat (fd, &stat) !=0 ) {fprintf (stderr,"%s: Failed to stat '%s': %s\n" , program_name, path,strerror (errno)); +close (fd);return NULL ; }
@@ -130,6 +131,7 @@ static void *map_vdso(const char *path, size_t *_size)if (addr ==MAP_FAILED ) {fprintf (stderr,"%s: Failed to map '%s': %s\n" , program_name, path,strerror (errno)); +close (fd);return NULL ; }
@@ -139,6 +141,7 @@ static void *map_vdso(const char *path, size_t *_size)if (memcmp (ehdr->e_ident,ELFMAG ,SELFMAG ) !=0 ) {fprintf (stderr,"%s: '%s' is not an ELF file\n" , program_name, path); +close (fd);return NULL ; }
@@ -150,6 +153,7 @@ static void *map_vdso(const char *path, size_t *_size)default :fprintf (stderr,"%s: '%s' has invalid ELF class\n" , program_name, path); +close (fd);return NULL ; }
@@ -161,6 +165,7 @@ static void *map_vdso(const char *path, size_t *_size)default :fprintf (stderr,"%s: '%s' has invalid ELF data order\n" , program_name, path); +close (fd);return NULL ; }
@@ -168,15 +173,18 @@ static void *map_vdso(const char *path, size_t *_size)fprintf (stderr,"%s: '%s' has invalid ELF machine (expected EM_MIPS)\n" , program_name, path); +close (fd);return NULL ; }else if (swap_uint16 (ehdr->e_type) !=ET_DYN ) {fprintf (stderr,"%s: '%s' has invalid ELF type (expected ET_DYN)\n" , program_name, path); +close (fd);return NULL ; } *_size = stat.st_size; +close (fd);return addr; }
@@ -293,10 +301,12 @@ int main(int argc, char **argv)/* Calculate and write symbol offsets to <output file> */ if (!get_symbols (dbg_vdso_path, dbg_vdso)) {unlink (out_path); +fclose (out_file);return EXIT_FAILURE ; }fprintf (out_file,"};\n" ); +fclose (out_file);return EXIT_SUCCESS ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 40/255 PCI: Fix pci_create_slot() reference count leak
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
[ Upstream commit 8a94644b440eef5a7b9c104ac8aa7a7f413e35e5 ]
kobject_init_and_add() takes a reference even when it fails. If it returns an error, kobject_put() must be called to clean up the memory associated with the object.
When kobject_init_and_add() fails, call kobject_put() instead of kfree().
b8eb718348b8 ("net-sysfs: Fix reference count leak in rx|netdev_queue_add_kobject") fixed a similar problem.
--- drivers/pci/slot.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/pci/slot.c +4 -2
@@ -268,13 +268,16 @@ placeholder: slot_name =make_slot_name (name);if (!slot_name) { err = -ENOMEM ; +kfree (slot); goto err; } err =kobject_init_and_add (&slot->kobj, &pci_slot_ktype,NULL ,"%s" , slot_name); -if (err) +if (err) { +kobject_put (&slot->kobj); goto err; + }INIT_LIST_HEAD (&slot->list);list_add (&slot->list, &parent->slots);
@@ -293,7 +296,6 @@ out:mutex_unlock (&pci_slot_mutex);return slot; err: -kfree (slot); slot =ERR_PTR (err); goto out; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 36/255 f2fs: remove write attribute of main_blkaddr sysfs node
In reply to Greg Kroah-HartmanFrom: Dehe Gu <[email protected]>
[ Upstream commit ffcde4b29a5f20ddca6fe559b48f345818bf1d91 ]
Fuzzing main_blkaddr sysfs node will corrupt this field's value, causing kernel panic, remove its write attribute to avoid potential security risk.
[Chao Yu: add description]
--- fs/f2fs/sysfs.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
fs/f2fs/sysfs.c +8 -1
@@ -223,6 +223,13 @@ static ssize_t avg_vblocks_show(struct f2fs_attr *a, }#endif +static ssize_t main_blkaddr_show (struct f2fs_attr *a, +struct f2fs_sb_info *sbi,char *buf) +{ +return snprintf (buf,PAGE_SIZE ,"%llu\n" , + (unsigned long long )MAIN_BLKADDR (sbi)); +} +static ssize_t f2fs_sbi_show (struct f2fs_attr *a,struct f2fs_sb_info *sbi,char *buf) {
@@ -522,7 +529,6 @@ F2FS_RW_ATTR(GC_THREAD, f2fs_gc_kthread, gc_no_gc_sleep_time, no_gc_sleep_time);F2FS_RW_ATTR (F2FS_SBI , f2fs_sb_info, gc_idle, gc_mode);F2FS_RW_ATTR (F2FS_SBI , f2fs_sb_info, gc_urgent, gc_mode);F2FS_RW_ATTR (SM_INFO , f2fs_sm_info, reclaim_segments, rec_prefree_segments); -F2FS_RW_ATTR (SM_INFO , f2fs_sm_info, main_blkaddr, main_blkaddr);F2FS_RW_ATTR (DCC_INFO , discard_cmd_control, max_small_discards, max_discards);F2FS_RW_ATTR (DCC_INFO , discard_cmd_control, discard_granularity, discard_granularity);F2FS_RW_ATTR (RESERVED_BLOCKS , f2fs_sb_info, reserved_blocks, reserved_blocks);
@@ -565,6 +571,7 @@ F2FS_GENERAL_RO_ATTR(current_reserved_blocks);F2FS_GENERAL_RO_ATTR (unusable);F2FS_GENERAL_RO_ATTR (encoding);F2FS_GENERAL_RO_ATTR (mounted_time_sec); +F2FS_GENERAL_RO_ATTR (main_blkaddr);#ifdef CONFIG_F2FS_STAT_FS F2FS_STAT_ATTR (STAT_INFO , f2fs_stat_info, cp_foreground_calls, cp_count);F2FS_STAT_ATTR (STAT_INFO , f2fs_stat_info, cp_background_calls, bg_cp_count);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 35/255 selftests/powerpc: Purge extra count_pmc() calls of ebb selftests
In reply to Greg Kroah-HartmanFrom: Desnes A. Nunes do Rosario <[email protected]>
[ Upstream commit 3337bf41e0dd70b4064cdf60acdfcdc2d050066c ]
An extra count on ebb_state.stats.pmc_count[PMC_INDEX(pmc)] is being per- formed when count_pmc() is used to reset PMCs on a few selftests. This extra pmc_count can occasionally invalidate results, such as the ones from cycles_test shown hereafter. The ebb_check_count() failed with an above the upper limit error due to the extra value on ebb_state.stats.pmc_count.
Furthermore, this extra count is also indicated by extra PMC1 trace_log on the output of the cycle test (as well as on pmc56_overflow_test):
==========
...
[21]: counter = 8
[22]: register SPRN_MMCR0 = 0x0000000080000080
[23]: register SPRN_PMC1 = 0x0000000080000004
[24]: counter = 9
[25]: register SPRN_MMCR0 = 0x0000000080000080
[26]: register SPRN_PMC1 = 0x0000000080000004
[27]: counter = 10
[28]: register SPRN_MMCR0 = 0x0000000080000080
[29]: register SPRN_PMC1 = 0x0000000080000004
Quoted 1 line
Quoted 1 line
[30]: register
SPRN_PMC1=0x000000004000051e
PMC1 count (0x280000546) above upper limit 0x2800003e8 (+0x15e) [FAIL] Test FAILED on line 52
failure: cycles
==========
--- .../selftests/powerpc/pmu/ebb/back_to_back_ebbs_test.c | 2 -- tools/testing/selftests/powerpc/pmu/ebb/cycles_test.c | 2 -- .../selftests/powerpc/pmu/ebb/cycles_with_freeze_test.c | 2 -- .../selftests/powerpc/pmu/ebb/cycles_with_mmcr2_test.c | 2 -- tools/testing/selftests/powerpc/pmu/ebb/ebb.c | 2 -- .../selftests/powerpc/pmu/ebb/ebb_on_willing_child_test.c | 2 -- .../selftests/powerpc/pmu/ebb/lost_exception_test.c | 1 - .../testing/selftests/powerpc/pmu/ebb/multi_counter_test.c | 7 ------- .../selftests/powerpc/pmu/ebb/multi_ebb_procs_test.c | 2 -- .../testing/selftests/powerpc/pmu/ebb/pmae_handling_test.c | 2 -- .../selftests/powerpc/pmu/ebb/pmc56_overflow_test.c | 2 -- 11 files changed, 26 deletions(-)
tools/testing/selftests/powerpc/pmu/ebb/back_to_back_ebbs_test.c +0 -2
@@ -91,8 +91,6 @@ int back_to_back_ebbs(void)ebb_global_disable ();ebb_freeze_pmcs (); -count_pmc (1 , sample_period); -dump_ebb_state ();event_close (&event);
tools/testing/selftests/powerpc/pmu/ebb/cycles_test.c +0 -2
@@ -42,8 +42,6 @@ int cycles(void)ebb_global_disable ();ebb_freeze_pmcs (); -count_pmc (1 , sample_period); -dump_ebb_state ();event_close (&event);
tools/testing/selftests/powerpc/pmu/ebb/cycles_with_freeze_test.c +0 -2
@@ -99,8 +99,6 @@ int cycles_with_freeze(void)ebb_global_disable ();ebb_freeze_pmcs (); -count_pmc (1 , sample_period); -dump_ebb_state ();printf ("EBBs while frozen %d\n" , ebbs_while_frozen);
tools/testing/selftests/powerpc/pmu/ebb/cycles_with_mmcr2_test.c +0 -2
@@ -71,8 +71,6 @@ int cycles_with_mmcr2(void)ebb_global_disable ();ebb_freeze_pmcs (); -count_pmc (1 , sample_period); -dump_ebb_state ();event_close (&event);
tools/testing/selftests/powerpc/pmu/ebb/ebb.c +0 -2
@@ -396,8 +396,6 @@ int ebb_child(union pipe read_pipe, union pipe write_pipe)ebb_global_disable ();ebb_freeze_pmcs (); -count_pmc (1 , sample_period); -dump_ebb_state ();event_close (&event);
tools/testing/selftests/powerpc/pmu/ebb/ebb_on_willing_child_test.c +0 -2
@@ -38,8 +38,6 @@ static int victim_child(union pipe read_pipe, union pipe write_pipe)ebb_global_disable ();ebb_freeze_pmcs (); -count_pmc (1 , sample_period); -dump_ebb_state ();FAIL_IF (ebb_state.stats.ebb_count ==0 );
tools/testing/selftests/powerpc/pmu/ebb/lost_exception_test.c +0 -1
@@ -75,7 +75,6 @@ static int test_body(void)ebb_freeze_pmcs ();ebb_global_disable (); -count_pmc (4 , sample_period);mtspr (SPRN_PMC4 ,0xdead );dump_summary_ebb_state ();
tools/testing/selftests/powerpc/pmu/ebb/multi_counter_test.c +0 -7
@@ -70,13 +70,6 @@ int multi_counter(void)ebb_global_disable ();ebb_freeze_pmcs (); -count_pmc (1 , sample_period); -count_pmc (2 , sample_period); -count_pmc (3 , sample_period); -count_pmc (4 , sample_period); -count_pmc (5 , sample_period); -count_pmc (6 , sample_period); -dump_ebb_state ();for (i =0 ; i <6 ; i++)
tools/testing/selftests/powerpc/pmu/ebb/multi_ebb_procs_test.c +0 -2
@@ -61,8 +61,6 @@ static int cycles_child(void)ebb_global_disable ();ebb_freeze_pmcs (); -count_pmc (1 , sample_period); -dump_summary_ebb_state ();event_close (&event);
tools/testing/selftests/powerpc/pmu/ebb/pmae_handling_test.c +0 -2
@@ -82,8 +82,6 @@ static int test_body(void)ebb_global_disable ();ebb_freeze_pmcs (); -count_pmc (1 , sample_period); -dump_ebb_state ();if (mmcr0_mismatch)
tools/testing/selftests/powerpc/pmu/ebb/pmc56_overflow_test.c +0 -2
@@ -76,8 +76,6 @@ int pmc56_overflow(void)ebb_global_disable ();ebb_freeze_pmcs (); -count_pmc (2 , sample_period); -dump_ebb_state ();printf ("PMC5/6 overflow %d\n" , pmc56_overflowed);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 34/255 scsi: target: Fix xcopy sess release leak
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit 3c006c7d23aac928279f7cbe83bbac4361255d53 ]
transport_init_session can allocate memory via percpu_ref_init, and target_xcopy_release_pt never frees it. This adds a transport_uninit_session function to handle cleanup of resources allocated in the init function.
--- drivers/target/target_core_internal.h | 1 + drivers/target/target_core_transport.c | 7 ++++++- drivers/target/target_core_xcopy.c | 11 +++++++++-- 3 files changed, 16 insertions(+), 3 deletions(-)
drivers/target/target_core_internal.h +1 -0
@@ -138,6 +138,7 @@ int init_se_kmem_caches(void);void release_se_kmem_caches (void );u32 scsi_get_new_index (scsi_index_t );void transport_subsystem_check_init (void ); +void transport_uninit_session (struct se_session *);unsigned char *transport_dump_cmd_direction (struct se_cmd *);void transport_dump_dev_state (struct se_device *,char *,int *); void transport_dump_dev_info(struct se_device *, struct se_lun *,
drivers/target/target_core_transport.c +6 -1
@@ -236,6 +236,11 @@ int transport_init_session(struct se_session *se_sess) }EXPORT_SYMBOL (transport_init_session); +void transport_uninit_session (struct se_session *se_sess) +{ +percpu_ref_exit (&se_sess->cmd_count); +} +/** * transport_alloc_session - allocate a session object and initialize it * @sup_prot_ops: bitmask that defines which T10-PI modes are supported.
@@ -579,7 +584,7 @@ void transport_free_session(struct se_session *se_sess)sbitmap_queue_free (&se_sess->sess_tag_pool);kvfree (se_sess->sess_cmd_map); } -percpu_ref_exit (&se_sess->cmd_count); +transport_uninit_session (se_sess);kmem_cache_free (se_sess_cache, se_sess); }EXPORT_SYMBOL (transport_free_session);
drivers/target/target_core_xcopy.c +9 -2
@@ -474,7 +474,7 @@ int target_xcopy_setup_pt(void)memset (&xcopy_pt_sess,0 ,sizeof (struct se_session )); ret =transport_init_session (&xcopy_pt_sess);if (ret <0 ) -return ret; + goto destroy_wq; xcopy_pt_nacl.se_tpg = &xcopy_pt_tpg; xcopy_pt_nacl.nacl_sess = &xcopy_pt_sess;
@@ -483,12 +483,19 @@ int target_xcopy_setup_pt(void) xcopy_pt_sess.se_node_acl = &xcopy_pt_nacl;return 0 ; + +destroy_wq: +destroy_workqueue (xcopy_wq); + xcopy_wq =NULL ; +return ret; }void target_xcopy_release_pt (void ) { -if (xcopy_wq) +if (xcopy_wq) {destroy_workqueue (xcopy_wq); +transport_uninit_session (&xcopy_pt_sess); + } }/*
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 32/255 scsi: lpfc: Fix shost refcount mismatch when deleting vport
In reply to Greg Kroah-HartmanFrom: Dick Kennedy <[email protected]>
[ Upstream commit 03dbfe0668e6692917ac278883e0586cd7f7d753 ]
When vports are deleted, it is observed that there is memory/kthread leakage as the vport isn't fully being released.
There is a shost reference taken in scsi_add_host_dma that is not released during scsi_remove_host. It was noticed that other drivers resolve this by doing a scsi_host_put after calling scsi_remove_host.
The vport_delete routine is taking two references one that corresponds to an access to the scsi_host in the vport_delete routine and another that is released after the adapter mailbox command completes that destroys the VPI that corresponds to the vport.
Remove one of the references taken such that the second reference that is put will complete the missing scsi_add_host_dma reference and the shost will be terminated.
--- drivers/scsi/lpfc/lpfc_vport.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-)
drivers/scsi/lpfc/lpfc_vport.c +8 -18
@@ -642,27 +642,16 @@ lpfc_vport_delete(struct fc_vport *fc_vport) vport->port_state < LPFC_VPORT_READY)return -EAGAIN ; } +/* -* This is a bit of a mess. We want to ensure the shost doesn't get -* torn down until we're done with the embedded lpfc_vport structure. -* -* Beyond holding a reference for this function, we also need a -* reference for outstanding I/O requests we schedule during delete -* processing. But once we scsi_remove_host() we can no longer obtain -* a reference through scsi_host_get(). -* -* So we take two references here. We release one reference at the -* bottom of the function -- after delinking the vport. And we -* release the other at the completion of the unreg_vpi that get's -* initiated after we've disposed of all other resources associated -* with the port. +* Take early refcount for outstanding I/O requests we schedule during +* delete processing for unreg_vpi. Always keep this before +* scsi_remove_host() as we can no longer obtain a reference through +* scsi_host_get() after scsi_host_remove as shost is set to SHOST_DEL. */ if (!scsi_host_get (shost))return VPORT_INVAL ; -if (!scsi_host_get (shost)) { -scsi_host_put (shost); -return VPORT_INVAL ; - } +lpfc_free_sysfs_attr (vport);lpfc_debugfs_terminate (vport);
@@ -809,8 +798,9 @@ skip_logo:if (!(vport->vpi_state &LPFC_VPI_REGISTERED ) ||lpfc_mbx_unreg_vpi (vport))scsi_host_put (shost); - }else + }else {scsi_host_put (shost); + }lpfc_free_vpi (phba, vport->vpi); vport->work_port_events =0 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 33/255 xfs: Dont allow logging of XFS_ISTALE inodes
In reply to Greg Kroah-HartmanFrom: Dave Chinner <[email protected]>
[ Upstream commit 96355d5a1f0ee6dcc182c37db4894ec0c29f1692 ]
In tracking down a problem in this patchset, I discovered we are reclaiming dirty stale inodes. This wasn't discovered until inodes were always attached to the cluster buffer and then the rcu callback that freed inodes was assert failing because the inode still had an active pointer to the cluster buffer after it had been reclaimed.
Debugging the issue indicated that this was a pre-existing issue resulting from the way the inodes are handled in xfs_inactive_ifree. When we free a cluster buffer from xfs_ifree_cluster, all the inodes in cache are marked XFS_ISTALE. Those that are clean have nothing else done to them and so eventually get cleaned up by background reclaim. i.e. it is assumed we'll never dirty/relog an inode marked XFS_ISTALE.
On journal commit dirty stale inodes as are handled by both buffer and inode log items to run though xfs_istale_done() and removed from the AIL (buffer log item commit) or the log item will simply unpin it because the buffer log item will clean it. What happens to any specific inode is entirely dependent on which log item wins the commit race, but the result is the same - stale inodes are clean, not attached to the cluster buffer, and not in the AIL. Hence inode reclaim can just free these inodes without further care.
However, if the stale inode is relogged, it gets dirtied again and relogged into the CIL. Most of the time this isn't an issue, because relogging simply changes the inode's location in the current checkpoint. Problems arise, however, when the CIL checkpoints between two transactions in the xfs_inactive_ifree() deferops processing. This results in the XFS_ISTALE inode being redirtied and inserted into the CIL without any of the other stale cluster buffer infrastructure being in place.
Hence on journal commit, it simply gets unpinned, so it remains dirty in memory. Everything in inode writeback avoids XFS_ISTALE inodes so it can't be written back, and it is not tracked in the AIL so there's not even a trigger to attempt to clean the inode. Hence the inode just sits dirty in memory until inode reclaim comes along, sees that it is XFS_ISTALE, and goes to reclaim it. This reclaiming of a dirty inode caused use after free, list corruptions and other nasty issues later in this patchset.
Hence this patch addresses a violation of the "never log XFS_ISTALE inodes" caused by the deferops processing rolling a transaction and relogging a stale inode in xfs_inactive_free. It also adds a bunch of asserts to catch this problem in debug kernels so that we don't reintroduce this problem in future.
Reproducer for this issue was generic/558 on a v4 filesystem.
--- fs/xfs/libxfs/xfs_trans_inode.c | 2 ++ fs/xfs/xfs_icache.c | 3 ++- fs/xfs/xfs_inode.c | 25 ++++++++++++++++++++++--- 3 files changed, 26 insertions(+), 4 deletions(-)
fs/xfs/libxfs/xfs_trans_inode.c +2 -0
@@ -36,6 +36,7 @@ xfs_trans_ijoin(ASSERT (iip->ili_lock_flags ==0 ); iip->ili_lock_flags = lock_flags; +ASSERT (!xfs_iflags_test (ip,XFS_ISTALE ));/* * Get a log_item_desc to point at the new item.
@@ -89,6 +90,7 @@ xfs_trans_log_inode(ASSERT (ip->i_itemp !=NULL );ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL )); +ASSERT (!xfs_iflags_test (ip,XFS_ISTALE ));/* * Don't bother with i_lock for the I_DIRTY_TIME check here, as races
fs/xfs/xfs_icache.c +2 -1
@@ -1141,7 +1141,7 @@ restart: goto out_ifunlock;xfs_iunpin_wait (ip); } -if (xfs_iflags_test (ip,XFS_ISTALE ) ||xfs_inode_clean (ip)) { +if (xfs_inode_clean (ip)) {xfs_ifunlock (ip); goto reclaim; }
@@ -1228,6 +1228,7 @@ reclaim:xfs_ilock (ip,XFS_ILOCK_EXCL );xfs_qm_dqdetach (ip);xfs_iunlock (ip,XFS_ILOCK_EXCL ); +ASSERT (xfs_inode_clean (ip));__xfs_inode_free (ip);return error;
fs/xfs/xfs_inode.c +22 -3
@@ -1740,10 +1740,31 @@ xfs_inactive_ifree(return error; } +/* +* We do not hold the inode locked across the entire rolling transaction +* here. We only need to hold it for the first transaction that +* xfs_ifree() builds, which may mark the inode XFS_ISTALE if the +* underlying cluster buffer is freed. Relogging an XFS_ISTALE inode +* here breaks the relationship between cluster buffer invalidation and +* stale inode invalidation on cluster buffer item journal commit +* completion, and can result in leaving dirty stale inodes hanging +* around in memory. +* +* We have no need for serialising this inode operation against other +* operations - we freed the inode and hence reallocation is required +* and that will serialise on reallocating the space the deferops need +* to free. Hence we can unlock the inode on the first commit of +* the transaction rather than roll it right through the deferops. This +* avoids relogging the XFS_ISTALE inode. +* +* We check that xfs_ifree() hasn't grown an internal transaction roll +* by asserting that the inode is still locked when it returns. +*/ xfs_ilock (ip,XFS_ILOCK_EXCL ); -xfs_trans_ijoin (tp, ip,0 ); +xfs_trans_ijoin (tp, ip,XFS_ILOCK_EXCL ); error =xfs_ifree (tp, ip); +ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL ));if (error) {/* * If we fail to free the inode, shut down. The cancel
@@ -1756,7 +1777,6 @@ xfs_inactive_ifree(xfs_force_shutdown (mp,SHUTDOWN_META_IO_ERROR ); }xfs_trans_cancel (tp); -xfs_iunlock (ip,XFS_ILOCK_EXCL );return error; }
@@ -1774,7 +1794,6 @@ xfs_inactive_ifree(xfs_notice (mp,"%s: xfs_trans_commit returned error %d" , __func__, error); -xfs_iunlock (ip,XFS_ILOCK_EXCL );return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 31/255 drm/amdgpu/pm: fix ref count leak when pm_runtime_get_sync fails
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
[ Upstream commit 66429300e1bd9cdfbe96cfc475e4964db2a36921 ]
The call to pm_runtime_get_sync increments the counter even in case of failure, leading to incorrect ref count.
In case of failure, decrement the ref count before returning.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 220 ++++++++++++++++++------- 1 file changed, 165 insertions(+), 55 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +165 -55
@@ -167,8 +167,10 @@ static ssize_t amdgpu_get_power_dpm_state(struct device *dev,return -EPERM ; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) {if (adev->smu.ppt_funcs->get_current_power_state)
@@ -212,8 +214,10 @@ static ssize_t amdgpu_set_power_dpm_state(struct device *dev,return -EINVAL ; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) {mutex_lock (&adev->pm.mutex);
@@ -307,8 +311,10 @@ static ssize_t amdgpu_get_power_dpm_force_performance_level(struct device *dev,return -EPERM ; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) level =smu_get_performance_level (&adev->smu);
@@ -369,8 +375,10 @@ static ssize_t amdgpu_set_power_dpm_force_performance_level(struct device *dev, } ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) current_level =smu_get_performance_level (&adev->smu);
@@ -449,8 +457,10 @@ static ssize_t amdgpu_get_pp_num_states(struct device *dev,return -EPERM ; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) { ret =smu_get_power_num_states (&adev->smu, &data);
@@ -491,8 +501,10 @@ static ssize_t amdgpu_get_pp_cur_state(struct device *dev,return -EPERM ; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) { pm =smu_get_current_power_state (smu);
@@ -567,8 +579,10 @@ static ssize_t amdgpu_set_pp_force_state(struct device *dev, state = data.states[idx]; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }/* only set user selected power states */ if (state != POWER_STATE_TYPE_INTERNAL_BOOT &&
@@ -608,8 +622,10 @@ static ssize_t amdgpu_get_pp_table(struct device *dev,return -EPERM ; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) { size =smu_sys_get_pp_table (&adev->smu, (void **)&table);
@@ -650,8 +666,10 @@ static ssize_t amdgpu_set_pp_table(struct device *dev,return -EPERM ; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) { ret =smu_sys_set_pp_table (&adev->smu, (void *)buf, count);
@@ -790,8 +808,10 @@ static ssize_t amdgpu_set_pp_od_clk_voltage(struct device *dev, } ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) { ret = smu_od_edit_dpm_table(&adev->smu, type,
@@ -847,8 +867,10 @@ static ssize_t amdgpu_get_pp_od_clk_voltage(struct device *dev,return -EPERM ; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) { size =smu_print_clk_levels (&adev->smu,SMU_OD_SCLK , buf);
@@ -905,8 +927,10 @@ static ssize_t amdgpu_set_pp_features(struct device *dev,pr_debug ("featuremask = 0x%llx\n" , featuremask); ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) { ret =smu_sys_set_pp_feature_mask (&adev->smu, featuremask);
@@ -942,8 +966,10 @@ static ssize_t amdgpu_get_pp_features(struct device *dev,return -EPERM ; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) size =smu_sys_get_pp_feature_mask (&adev->smu, buf);
@@ -1001,8 +1027,10 @@ static ssize_t amdgpu_get_pp_dpm_sclk(struct device *dev,return -EPERM ; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) size =smu_print_clk_levels (&adev->smu,SMU_SCLK , buf);
@@ -1071,8 +1099,10 @@ static ssize_t amdgpu_set_pp_dpm_sclk(struct device *dev,return ret; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) ret =smu_force_clk_levels (&adev->smu,SMU_SCLK , mask, true);
@@ -1101,8 +1131,10 @@ static ssize_t amdgpu_get_pp_dpm_mclk(struct device *dev,return -EPERM ; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) size =smu_print_clk_levels (&adev->smu,SMU_MCLK , buf);
@@ -1135,8 +1167,10 @@ static ssize_t amdgpu_set_pp_dpm_mclk(struct device *dev,return ret; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) ret =smu_force_clk_levels (&adev->smu,SMU_MCLK , mask, true);
@@ -1165,8 +1199,10 @@ static ssize_t amdgpu_get_pp_dpm_socclk(struct device *dev,return -EPERM ; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) size =smu_print_clk_levels (&adev->smu,SMU_SOCCLK , buf);
@@ -1199,8 +1235,10 @@ static ssize_t amdgpu_set_pp_dpm_socclk(struct device *dev,return ret; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) ret =smu_force_clk_levels (&adev->smu,SMU_SOCCLK , mask, true);
@@ -1231,8 +1269,10 @@ static ssize_t amdgpu_get_pp_dpm_fclk(struct device *dev,return -EPERM ; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) size =smu_print_clk_levels (&adev->smu,SMU_FCLK , buf);
@@ -1265,8 +1305,10 @@ static ssize_t amdgpu_set_pp_dpm_fclk(struct device *dev,return ret; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) ret =smu_force_clk_levels (&adev->smu,SMU_FCLK , mask, true);
@@ -1297,8 +1339,10 @@ static ssize_t amdgpu_get_pp_dpm_dcefclk(struct device *dev,return -EPERM ; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) size =smu_print_clk_levels (&adev->smu,SMU_DCEFCLK , buf);
@@ -1331,8 +1375,10 @@ static ssize_t amdgpu_set_pp_dpm_dcefclk(struct device *dev,return ret; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) ret =smu_force_clk_levels (&adev->smu,SMU_DCEFCLK , mask, true);
@@ -1363,8 +1409,10 @@ static ssize_t amdgpu_get_pp_dpm_pcie(struct device *dev,return -EPERM ; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) size =smu_print_clk_levels (&adev->smu,SMU_PCIE , buf);
@@ -1397,8 +1445,10 @@ static ssize_t amdgpu_set_pp_dpm_pcie(struct device *dev,return ret; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) ret =smu_force_clk_levels (&adev->smu,SMU_PCIE , mask, true);
@@ -1429,8 +1479,10 @@ static ssize_t amdgpu_get_pp_sclk_od(struct device *dev,return -EPERM ; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) value =smu_get_od_percentage (&(adev->smu),SMU_OD_SCLK );
@@ -1462,8 +1514,10 @@ static ssize_t amdgpu_set_pp_sclk_od(struct device *dev,return -EINVAL ; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) { value =smu_set_od_percentage (&(adev->smu),SMU_OD_SCLK , (uint32_t )value);
@@ -1498,8 +1552,10 @@ static ssize_t amdgpu_get_pp_mclk_od(struct device *dev,return -EPERM ; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) value =smu_get_od_percentage (&(adev->smu),SMU_OD_MCLK );
@@ -1531,8 +1587,10 @@ static ssize_t amdgpu_set_pp_mclk_od(struct device *dev,return -EINVAL ; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) { value =smu_set_od_percentage (&(adev->smu),SMU_OD_MCLK , (uint32_t )value);
@@ -1587,8 +1645,10 @@ static ssize_t amdgpu_get_pp_power_profile_mode(struct device *dev,return -EPERM ; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) size =smu_get_power_profile_mode (&adev->smu, buf);
@@ -1650,8 +1710,10 @@ static ssize_t amdgpu_set_pp_power_profile_mode(struct device *dev, parameter[parameter_size] = profile_mode; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }if (is_support_sw_smu (adev)) ret =smu_set_power_profile_mode (&adev->smu, parameter, parameter_size, true);
@@ -1687,8 +1749,10 @@ static ssize_t amdgpu_get_gpu_busy_percent(struct device *dev,return -EPERM ; r =pm_runtime_get_sync (ddev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return r; + }/* read the IP busy sensor */ r = amdgpu_dpm_read_sensor(adev, AMDGPU_PP_SENSOR_GPU_LOAD,
@@ -1723,8 +1787,10 @@ static ssize_t amdgpu_get_mem_busy_percent(struct device *dev,return -EPERM ; r =pm_runtime_get_sync (ddev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return r; + }/* read the IP busy sensor */ r = amdgpu_dpm_read_sensor(adev, AMDGPU_PP_SENSOR_MEM_LOAD,
@@ -1770,8 +1836,10 @@ static ssize_t amdgpu_get_pcie_bw(struct device *dev,return -ENODATA ; ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (ddev->dev);return ret; + }amdgpu_asic_get_pcie_usage (adev, &count0, &count1);
@@ -2003,8 +2071,10 @@ static ssize_t amdgpu_hwmon_show_temp(struct device *dev,return -EINVAL ; r =pm_runtime_get_sync (adev->ddev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (adev->ddev->dev);return r; + }switch (channel) {case PP_TEMP_JUNCTION :
@@ -2134,8 +2204,10 @@ static ssize_t amdgpu_hwmon_get_pwm1_enable(struct device *dev,return -EPERM ; ret =pm_runtime_get_sync (adev->ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (adev->ddev->dev);return ret; + }if (is_support_sw_smu (adev)) { pwm_mode =smu_get_fan_control_mode (&adev->smu);
@@ -2172,8 +2244,10 @@ static ssize_t amdgpu_hwmon_set_pwm1_enable(struct device *dev,return err; ret =pm_runtime_get_sync (adev->ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (adev->ddev->dev);return ret; + }if (is_support_sw_smu (adev)) {smu_set_fan_control_mode (&adev->smu, value);
@@ -2220,8 +2294,10 @@ static ssize_t amdgpu_hwmon_set_pwm1(struct device *dev,return -EPERM ; err =pm_runtime_get_sync (adev->ddev->dev); -if (err <0 ) +if (err <0 ) { +pm_runtime_put_autosuspend (adev->ddev->dev);return err; + }if (is_support_sw_smu (adev)) pwm_mode =smu_get_fan_control_mode (&adev->smu);
@@ -2272,8 +2348,10 @@ static ssize_t amdgpu_hwmon_get_pwm1(struct device *dev,return -EPERM ; err =pm_runtime_get_sync (adev->ddev->dev); -if (err <0 ) +if (err <0 ) { +pm_runtime_put_autosuspend (adev->ddev->dev);return err; + }if (is_support_sw_smu (adev)) err =smu_get_fan_speed_percent (&adev->smu, &speed);
@@ -2305,8 +2383,10 @@ static ssize_t amdgpu_hwmon_get_fan1_input(struct device *dev,return -EPERM ; err =pm_runtime_get_sync (adev->ddev->dev); -if (err <0 ) +if (err <0 ) { +pm_runtime_put_autosuspend (adev->ddev->dev);return err; + }if (is_support_sw_smu (adev)) err =smu_get_fan_speed_rpm (&adev->smu, &speed);
@@ -2337,8 +2417,10 @@ static ssize_t amdgpu_hwmon_get_fan1_min(struct device *dev,return -EPERM ; r =pm_runtime_get_sync (adev->ddev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (adev->ddev->dev);return r; + } r =amdgpu_dpm_read_sensor (adev,AMDGPU_PP_SENSOR_MIN_FAN_RPM , (void *)&min_rpm, &size);
@@ -2365,8 +2447,10 @@ static ssize_t amdgpu_hwmon_get_fan1_max(struct device *dev,return -EPERM ; r =pm_runtime_get_sync (adev->ddev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (adev->ddev->dev);return r; + } r =amdgpu_dpm_read_sensor (adev,AMDGPU_PP_SENSOR_MAX_FAN_RPM , (void *)&max_rpm, &size);
@@ -2392,8 +2476,10 @@ static ssize_t amdgpu_hwmon_get_fan1_target(struct device *dev,return -EPERM ; err =pm_runtime_get_sync (adev->ddev->dev); -if (err <0 ) +if (err <0 ) { +pm_runtime_put_autosuspend (adev->ddev->dev);return err; + }if (is_support_sw_smu (adev)) err =smu_get_fan_speed_rpm (&adev->smu, &rpm);
@@ -2424,8 +2510,10 @@ static ssize_t amdgpu_hwmon_set_fan1_target(struct device *dev,return -EPERM ; err =pm_runtime_get_sync (adev->ddev->dev); -if (err <0 ) +if (err <0 ) { +pm_runtime_put_autosuspend (adev->ddev->dev);return err; + }if (is_support_sw_smu (adev)) pwm_mode =smu_get_fan_control_mode (&adev->smu);
@@ -2473,8 +2561,10 @@ static ssize_t amdgpu_hwmon_get_fan1_enable(struct device *dev,return -EPERM ; ret =pm_runtime_get_sync (adev->ddev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (adev->ddev->dev);return ret; + }if (is_support_sw_smu (adev)) { pwm_mode =smu_get_fan_control_mode (&adev->smu);
@@ -2519,8 +2609,10 @@ static ssize_t amdgpu_hwmon_set_fan1_enable(struct device *dev,return -EINVAL ; err =pm_runtime_get_sync (adev->ddev->dev); -if (err <0 ) +if (err <0 ) { +pm_runtime_put_autosuspend (adev->ddev->dev);return err; + }if (is_support_sw_smu (adev)) {smu_set_fan_control_mode (&adev->smu, pwm_mode);
@@ -2551,8 +2643,10 @@ static ssize_t amdgpu_hwmon_show_vddgfx(struct device *dev,return -EPERM ; r =pm_runtime_get_sync (adev->ddev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (adev->ddev->dev);return r; + }/* get the voltage */ r = amdgpu_dpm_read_sensor(adev, AMDGPU_PP_SENSOR_VDDGFX,
@@ -2590,8 +2684,10 @@ static ssize_t amdgpu_hwmon_show_vddnb(struct device *dev,return -EINVAL ; r =pm_runtime_get_sync (adev->ddev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (adev->ddev->dev);return r; + }/* get the voltage */ r = amdgpu_dpm_read_sensor(adev, AMDGPU_PP_SENSOR_VDDNB,
@@ -2626,8 +2722,10 @@ static ssize_t amdgpu_hwmon_show_power_avg(struct device *dev,return -EPERM ; r =pm_runtime_get_sync (adev->ddev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (adev->ddev->dev);return r; + }/* get the voltage */ r = amdgpu_dpm_read_sensor(adev, AMDGPU_PP_SENSOR_GPU_POWER,
@@ -2665,8 +2763,10 @@ static ssize_t amdgpu_hwmon_show_power_cap_max(struct device *dev,return -EPERM ; r =pm_runtime_get_sync (adev->ddev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (adev->ddev->dev);return r; + }if (is_support_sw_smu (adev)) {smu_get_power_limit (&adev->smu, &limit, true, true);
@@ -2697,8 +2797,10 @@ static ssize_t amdgpu_hwmon_show_power_cap(struct device *dev,return -EPERM ; r =pm_runtime_get_sync (adev->ddev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (adev->ddev->dev);return r; + }if (is_support_sw_smu (adev)) {smu_get_power_limit (&adev->smu, &limit, false, true);
@@ -2740,8 +2842,10 @@ static ssize_t amdgpu_hwmon_set_power_cap(struct device *dev, err =pm_runtime_get_sync (adev->ddev->dev); -if (err <0 ) +if (err <0 ) { +pm_runtime_put_autosuspend (adev->ddev->dev);return err; + }if (is_support_sw_smu (adev)) err =smu_set_power_limit (&adev->smu, value);
@@ -2771,8 +2875,10 @@ static ssize_t amdgpu_hwmon_show_sclk(struct device *dev,return -EPERM ; r =pm_runtime_get_sync (adev->ddev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (adev->ddev->dev);return r; + }/* get the sclk */ r = amdgpu_dpm_read_sensor(adev, AMDGPU_PP_SENSOR_GFX_SCLK,
@@ -2806,8 +2912,10 @@ static ssize_t amdgpu_hwmon_show_mclk(struct device *dev,return -EPERM ; r =pm_runtime_get_sync (adev->ddev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (adev->ddev->dev);return r; + }/* get the sclk */ r = amdgpu_dpm_read_sensor(adev, AMDGPU_PP_SENSOR_GFX_MCLK,
@@ -3669,8 +3777,10 @@ static int amdgpu_debugfs_pm_info(struct seq_file *m, void *data)return -EPERM ; r =pm_runtime_get_sync (dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (dev->dev);return r; + }amdgpu_device_ip_get_clockgating_state (adev, &flags);seq_printf (m,"Clock Gating Flags Mask: 0x%x\n" , flags);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 29/255 drm/amdgpu/fence: fix ref count leak when pm_runtime_get_sync fails
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
[ Upstream commit e520d3e0d2818aafcdf9d8b60916754d8fedc366 ]
The call to pm_runtime_get_sync increments the counter even in case of failure, leading to incorrect ref count.
In case of failure, decrement the ref count before returning.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +3 -1
@@ -754,8 +754,10 @@ static int amdgpu_debugfs_gpu_recover(struct seq_file *m, void *data)int r; r =pm_runtime_get_sync (dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (dev->dev);return 0 ; + }seq_printf (m,"gpu recover\n" );amdgpu_device_gpu_recover (adev,NULL );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 9/255 ASoC: img: Fix a reference count leak in img_i2s_in_set_fmt
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
[ Upstream commit c4c59b95b7f7d4cef5071b151be2dadb33f3287b ]
pm_runtime_get_sync() increments the runtime PM usage counter even when it returns an error code, causing incorrect ref count if pm_runtime_put_noidle() is not called in error handling paths. Thus call pm_runtime_put_noidle() if pm_runtime_get_sync() fails.
--- sound/soc/img/img-i2s-in.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/img/img-i2s-in.c +3 -1
@@ -343,8 +343,10 @@ static int img_i2s_in_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) chan_control_mask =IMG_I2S_IN_CH_CTL_CLK_TRANS_MASK ; ret =pm_runtime_get_sync (i2s->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_noidle (i2s->dev);return ret; + }for (i =0 ; i < i2s->active_channels; i++)img_i2s_in_ch_disable (i2s, i);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 8/255 EDAC/mc: Call edac_inc_ue_error() before panic
In reply to Greg Kroah-HartmanFrom: Zhenzhong Duan <[email protected]>
[ Upstream commit e9ff6636d3f97a764487999754c0bfee9d2c231e ]
By calling edac_inc_ue_error() before panic, we get a correct UE error count for core dump analysis.
--- drivers/edac/edac_mc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/edac/edac_mc.c +2 -2
@@ -950,6 +950,8 @@ static void edac_ue_error(struct edac_raw_error_desc *e) e->other_detail); } +edac_inc_ue_error (e); +if (edac_mc_get_panic_on_ue ()) { panic("UE %s%son %s (%s page:0x%lx offset:0x%lx grain:%ld%s%s)\n", e->msg,
@@ -959,8 +961,6 @@ static void edac_ue_error(struct edac_raw_error_desc *e) *e->other_detail ?" - " :"" , e->other_detail); } - -edac_inc_ue_error (e); }static void edac_inc_csrow (struct edac_raw_error_desc *e,int row,int chan)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 5/255 ALSA: hda/realtek: Fix pin default on Intel NUC 8 Rugged
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit e2d2fded6bdf3f7bb40718a208140dba8b4ec574 ]
The jack on Intel NUC 8 Rugged rear panel doesn't work.
The spec [1] states that the jack supports both headphone and microphone, so override a Pin Complex which has both Amp-In and Amp-Out to make the jack work.
Node 0x1b fits the requirement, and user confirmed the jack now works with new pin config.
[1] https://www.intel.com/content/dam/support/us/en/documents/mini-pcs/NUC8CCH_TechProdSpec.pdf
--- sound/pci/hda/patch_realtek.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
sound/pci/hda/patch_realtek.c +11 -0
@@ -6167,6 +6167,7 @@ enum {ALC269_FIXUP_CZC_L101 ,ALC269_FIXUP_LEMOTE_A1802 ,ALC269_FIXUP_LEMOTE_A190X , + ALC256_FIXUP_INTEL_NUC8_RUGGED, }; static const struct hda_fixup alc269_fixups[] = {
@@ -7488,6 +7489,15 @@ static const struct hda_fixup alc269_fixups[] = { }, .chain_id = ALC269_FIXUP_DMIC, }, + [ALC256_FIXUP_INTEL_NUC8_RUGGED] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl []) { + {0x1b ,0x01a1913c },/* use as headset mic, without its own jack detect */ + { } + }, + .chained = true, + .chain_id =ALC269_FIXUP_HEADSET_MODE + }, };static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -7787,6 +7797,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x10ec ,0x118c ,"Medion EE4254 MD62100" ,ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE ),SND_PCI_QUIRK (0x1c06 ,0x2013 ,"Lemote A1802" ,ALC269_FIXUP_LEMOTE_A1802 ),SND_PCI_QUIRK (0x1c06 ,0x2015 ,"Lemote A190X" ,ALC269_FIXUP_LEMOTE_A190X ), +SND_PCI_QUIRK (0x8086 ,0x2080 ,"Intel NUC 8 Rugged" ,ALC256_FIXUP_INTEL_NUC8_RUGGED ), #if 0/* Below is a quirk table taken from the old code.
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 6/255 ALSA: hda/hdmi: Use force connectivity quirk on another HP desktop
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit d96f27c80b65437a7b572647ecb4717ec9a50c98 ]
There's another HP desktop has buggy BIOS which flags the Port Connectivity bit as no connection.
Apply force connectivity quirk to enable DP/HDMI audio.
--- sound/pci/hda/patch_hdmi.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_hdmi.c +1 -0
@@ -1806,6 +1806,7 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid) }static const struct snd_pci_quirk force_connect_list[] = { +SND_PCI_QUIRK (0x103c ,0x870f ,"HP" ,1 ),SND_PCI_QUIRK (0x103c ,0x871a ,"HP" ,1 ), {} };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 14/255 powerpc/xive: Ignore kmemleak false positives
In reply to Greg Kroah-HartmanFrom: Alexey Kardashevskiy <[email protected]>
[ Upstream commit f0993c839e95dd6c7f054a1015e693c87e33e4fb ]
xive_native_provision_pages() allocates memory and passes the pointer to OPAL so kmemleak cannot find the pointer usage in the kernel memory and produces a false positive report (below) (even if the kernel did scan OPAL memory, it is unable to deal with __pa() addresses anyway).
This silences the warning.
unreferenced object 0xc000200350c40000 (size 65536):
comm "qemu-system-ppc", pid 2725, jiffies 4294946414 (age 70776.530s) hex dump (first 32 bytes):
02 00 00 00 50 00 00 00 00 00 00 00 00 00 00 00 ....P...........
01 00 08 07 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<0000000081ff046c>] xive_native_alloc_vp_block+0x120/0x250
[<00000000d555d524>] kvmppc_xive_compute_vp_id+0x248/0x350 [kvm]
[<00000000d69b9c9f>] kvmppc_xive_connect_vcpu+0xc0/0x520 [kvm]
[<000000006acbc81c>] kvm_arch_vcpu_ioctl+0x308/0x580 [kvm]
[<0000000089c69580>] kvm_vcpu_ioctl+0x19c/0xae0 [kvm]
[<00000000902ae91e>] ksys_ioctl+0x184/0x1b0
[<00000000f3e68bd7>] sys_ioctl+0x48/0xb0
[<0000000001b2c127>] system_call_exception+0x124/0x1f0
[<00000000d2b2ee40>] system_call_common+0xe8/0x214--- arch/powerpc/sysdev/xive/native.c | 2 ++ 1 file changed, 2 insertions(+)
arch/powerpc/sysdev/xive/native.c +2 -0
@@ -18,6 +18,7 @@#include <linux/delay.h> #include <linux/cpumask.h> #include <linux/mm.h> +#include <linux/kmemleak.h> #include <asm/machdep.h> #include <asm/prom.h>
@@ -647,6 +648,7 @@ static bool xive_native_provision_pages(void)pr_err ("Failed to allocate provisioning page\n" );return false; } +kmemleak_ignore (p);opal_xive_donate_page (chip,__pa (p)); }return true;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 13/255 arm64: dts: qcom: msm8916: Pull down PDM GPIOs during sleep
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit e2ee9edc282961783d519c760bbaa20fed4dec38 ]
The original qcom kernel changed the PDM GPIOs to be pull-down during sleep at some point. Reportedly this was done because there was some "leakage at PDM outputs during sleep":
I cannot say how effective this is, but everything seems to work fine with this change so let's apply the same to mainline just to be sure.
--- arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8916-pins.dtsi +1 -1
@@ -569,7 +569,7 @@ pins = "gpio63", "gpio64", "gpio65", "gpio66", "gpio67", "gpio68"; drive-strength = <2>; - bias-disable; + bias-pull-down; }; }; };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 12/255 mfd: intel-lpss: Add Intel Emmitsburg PCH PCI IDs
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 3ea2e4eab64cefa06055bb0541fcdedad4b48565 ]
Intel Emmitsburg PCH has the same LPSS than Intel Ice Lake. Add the new IDs to the list of supported devices.
--- drivers/mfd/intel-lpss-pci.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mfd/intel-lpss-pci.c +3 -0
@@ -201,6 +201,9 @@ static const struct pci_device_id intel_lpss_pci_ids[] = { { PCI_VDEVICE(INTEL, 0x1ac4), (kernel_ulong_t)&bxt_info }, { PCI_VDEVICE(INTEL, 0x1ac6), (kernel_ulong_t)&bxt_info }, { PCI_VDEVICE(INTEL, 0x1aee), (kernel_ulong_t)&bxt_uart_info }, +/* EBG */ + { PCI_VDEVICE(INTEL, 0x1bad), (kernel_ulong_t)&bxt_uart_info }, + { PCI_VDEVICE(INTEL, 0x1bae), (kernel_ulong_t)&bxt_uart_info },/* GLK */ { PCI_VDEVICE(INTEL, 0x31ac), (kernel_ulong_t)&glk_i2c_info }, { PCI_VDEVICE(INTEL, 0x31ae), (kernel_ulong_t)&glk_i2c_info },
Signature · 1 line
2.25.1
Re: [PATCH 5.8 070/255] dmaengine: idxd: fix PCI_MSI build errors
In reply to Greg Kroah-HartmanQuoted 10 lines · Greg Kroah-Hartman
[ Upstream commit
d6a7bb869dd8a516901591136a9a895fd829d6c6]Fix build errors when
CONFIG_PCI_MSIis not enabled by making the driver depend onPCI_MSI:ld:
drivers/dma/idxd/device.o: in function `idxd_mask_msix_vector':
device.c:(.text+0x26f): undefined reference to `pci_msi_mask_irq'
ld:drivers/dma/idxd/device.o: in function `idxd_unmask_msix_vector':
device.c:(.text+0x2af): undefined reference to `pci_msi_unmask_irq'
Quoted 7 lines
Signed-off-by Randy Dunlap <[email protected]>Cc Dave Jiang <[email protected]>Cc Vinod Koul <[email protected]>Signed-off-by Vinod Koul <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 17 lines
--- drivers/dma/Kconfig | 1 + 1 file changed, 1 insertion(+)drivers/dma/Kconfig +1
-0@@ -285,6 +285,7 @@ config INTEL_IDMA64 config INTEL_IDXD tristate "Intel Data Accelerators support" depends on PCI && X86_64 + depends on PCI_MSI select DMA_ENGINE select SBITMAP help
Quoted 1 line · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.8.6 release.
This one has a bunch of things I care about, so I gave it a try on both my server & desktop (Gentoo, x86_64). Applies & builds cleanly, everything working fine: no spontaneous fires or unexpected screams from the underworld.
Cheers!
Holger
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.8.6 release. There are 255 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 03 Sep 2020 15:09:01 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.8.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.8.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.8.6 release. There are 255 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 03 Sep 2020 15:09:01 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.8.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.8.y
and the diffstat can be found below.thanks,
greg k-h
While running LTP CVE test suite on i386 this BUG triggered after the known warning. Please find below full test log link [1]. This was reported on the mailing list on next-20200811 but did not get any reply [2].
[ 138.177043] ------------[ cut here ]------------ [ 138.181675] WARNING: CPU: 1 PID: 8301 at mm/mremap.c:230 move_page_tables+0x6ef/0x720 [ 138.189515] Modules linked in: x86_pkg_temp_thermal [ 138.194436] CPU: 1 PID: 8301 Comm: true Not tainted 5.8.6-rc1 #1 [ 138.194437] Hardware name: Supermicro SYS-5019S-ML/X11SSH-F, BIOS 2.2 05/23/2018 [ 138.194439] EIP: move_page_tables+0x6ef/0x720
<>
[ 802.156512] BUG: unable to handle page fault for address: fe402000 [ 802.162703] #PF: supervisor write access in kernel mode [ 802.167927] #PF: error_code(0x0002) - not-present page [ 802.173064] *pde = 23e61067 *pte = 64b32163 [ 802.177329] Oops: 0002 [#1] SMP [ 802.180469] CPU: 1 PID: 13118 Comm: cve-2017-17053 Tainted: G W 5.8.6-rc1 #1 [ 802.188811] Hardware name: Supermicro SYS-5019S-ML/X11SSH-F, BIOS 2.2 05/23/2018 [ 802.196199] EIP: memcpy+0x14/0x30 [ 802.199517] Code: e8 a1 72 c5 ff 0f 31 31 c3 59 58 eb 85 cc cc cc cc cc cc cc cc cc 3e 8d 74 26 00 55 89 e5 57 89 c7 56 89 d6 53 89 cb c1 e9 02 <f3> a5 89 d9 83 e1 03 74 02 f3 a4 5b 5e 5f 5d c3 8d b4 26 00 00 00 [ 802.218259] EAX: fe402000 EBX: 00010000 ECX: 00004000 EDX: fb3dd000 [ 802.224518] ESI: fb3dd000 EDI: fe402000 EBP: ea799ddc ESP: ea799dd0 [ 802.230773] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 EFLAGS: 00010206 [ 802.237551] CR0: 80050033 CR2: fe402000 CR3: 1eee9000 CR4: 003406d0 [ 802.243809] DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000 [ 802.250065] DR6: fffe0ff0 DR7: 00000400 [ 802.253897] Call Trace: [ 802.256345] ldt_dup_context+0x6b/0x90 [ 802.260093] dup_mm+0x2b3/0x480 [ 802.263230] copy_process+0x13d6/0x1650 [ 802.267062] _do_fork+0x7b/0x3b0 [ 802.270284] ? set_next_entity+0xa9/0x250 [ 802.274290] __ia32_sys_clone+0x77/0xa0 [ 802.278119] do_syscall_32_irqs_on+0x3d/0x250 [ 802.282472] ? do_fast_syscall_32+0x2d/0xc0 [ 802.286656] ? trace_hardirqs_on+0x30/0xf0 [ 802.290746] ? trace_hardirqs_off_finish+0x32/0xa0 [ 802.295533] ? do_SYSENTER_32+0x15/0x20 [ 802.299371] do_fast_syscall_32+0x49/0xc0 [ 802.303374] do_SYSENTER_32+0x15/0x20 [ 802.307032] entry_SYSENTER_32+0x9f/0xf2 [ 802.310956] EIP: 0xb7fbb549 [ 802.313747] Code: 03 74 c0 01 10 05 03 74 b8 01 10 06 03 74 b4 01 10 07 03 74 b0 01 10 08 03 74 d8 01 00 00 00 00 00 51 52 55 89 e5 0f 34 cd 80 <5d> 5a 59 c3 90 90 90 90 8d 76 00 58 b8 77 00 00 00 cd 80 90 8d 76 [ 802.332483] EAX: ffffffda EBX: 01200011 ECX: 00000000 EDX: 00000000 [ 802.338742] ESI: 00000000 EDI: b7dbdba8 EBP: b7dbd348 ESP: b7dbd2f0 [ 802.344998] DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 007b EFLAGS: 00000246 [ 802.351776] Modules linked in: algif_hash x86_pkg_temp_thermal [ 802.357608] CR2: 00000000fe402000 [ 802.360920] ---[ end trace ea48459ba50c2a87 ]--- [ 802.365542] EIP: memcpy+0x14/0x30 [ 802.368858] Code: e8 a1 72 c5 ff 0f 31 31 c3 59 58 eb 85 cc cc cc cc cc cc cc cc cc 3e 8d 74 26 00 55 89 e5 57 89 c7 56 89 d6 53 89 cb c1 e9 02 <f3> a5 89 d9 83 e1 03 74 02 f3 a4 5b 5e 5f 5d c3 8d b4 26 00 00 00 [ 802.387593] EAX: fe402000 EBX: 00010000 ECX: 00004000 EDX: fb3dd000 [ 802.393852] ESI: fb3dd000 EDI: fe402000 EBP: ea799ddc ESP: ea799dd0 [ 802.400107] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 EFLAGS: 00010206 [ 802.406887] CR0: 80050033 CR2: fe402000 CR3: 1eee9000 CR4: 003406d0 [ 802.413143] DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000 [ 802.419400] DR6: fffe0ff0 DR7: 00000400
full test log,
[1] https://qa-reports.linaro.org/lkft/linux-stable-rc-5.8-oe/build/v5.8.5-256-gad57c5b5e64d/testrun/3148295/suite/linux-log-parser/test/check-kernel-bug-1727425/log
[2] https://lore.kernel.org/linux-mm/CA+G9fYsiNgoh09h0paf1+UTKhPnn490QCoLB2dRFhMT+Cjh9RA@mail.gmail.com/
--
Linaro LKFT
https://lkft.linaro.org
Greg Kroah-Hartman
maintainerQuoted 96 lines · Naresh Kamboju
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.8.6 release. There are 255 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 03 Sep 2020 15:09:01 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.8.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.8.y
and the diffstat can be found below.thanks,
greg k-h
While running LTP CVE test suite on i386 this BUG triggered after the known warning. Please find below full test log link [1]. This was reported on the mailing list on next-20200811 but did not get any reply [2].
[ 138.177043] ------------[ cut here ]------------ [ 138.181675] WARNING: CPU: 1 PID: 8301 at mm/mremap.c:230 move_page_tables+0x6ef/0x720 [ 138.189515] Modules linked in: x86_pkg_temp_thermal [ 138.194436] CPU: 1 PID: 8301 Comm: true Not tainted 5.8.6-rc1 #1 [ 138.194437] Hardware name: Supermicro SYS-5019S-ML/X11SSH-F, BIOS 2.2 05/23/2018 [ 138.194439] EIP: move_page_tables+0x6ef/0x720<>
[ 802.156512] BUG: unable to handle page fault for address: fe402000 [ 802.162703] #PF: supervisor write access in kernel mode [ 802.167927] #PF: error_code(0x0002) - not-present page [ 802.173064] *pde = 23e61067 *pte = 64b32163 [ 802.177329] Oops: 0002 [#1] SMP [ 802.180469] CPU: 1 PID: 13118 Comm: cve-2017-17053 Tainted: G W 5.8.6-rc1 #1 [ 802.188811] Hardware name: Supermicro SYS-5019S-ML/X11SSH-F, BIOS 2.2 05/23/2018 [ 802.196199] EIP: memcpy+0x14/0x30 [ 802.199517] Code: e8 a1 72 c5 ff 0f 31 31 c3 59 58 eb 85 cc cc cc cc cc cc cc cc cc 3e 8d 74 26 00 55 89 e5 57 89 c7 56 89 d6 53 89 cb c1 e9 02 <f3> a5 89 d9 83 e1 03 74 02 f3 a4 5b 5e 5f 5d c3 8d b4 26 00 00 00 [ 802.218259] EAX: fe402000 EBX: 00010000 ECX: 00004000 EDX: fb3dd000 [ 802.224518] ESI: fb3dd000 EDI: fe402000 EBP: ea799ddc ESP: ea799dd0 [ 802.230773] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 EFLAGS: 00010206 [ 802.237551] CR0: 80050033 CR2: fe402000 CR3: 1eee9000 CR4: 003406d0 [ 802.243809] DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000 [ 802.250065] DR6: fffe0ff0 DR7: 00000400 [ 802.253897] Call Trace: [ 802.256345] ldt_dup_context+0x6b/0x90 [ 802.260093] dup_mm+0x2b3/0x480 [ 802.263230] copy_process+0x13d6/0x1650 [ 802.267062] _do_fork+0x7b/0x3b0 [ 802.270284] ? set_next_entity+0xa9/0x250 [ 802.274290] __ia32_sys_clone+0x77/0xa0 [ 802.278119] do_syscall_32_irqs_on+0x3d/0x250 [ 802.282472] ? do_fast_syscall_32+0x2d/0xc0 [ 802.286656] ? trace_hardirqs_on+0x30/0xf0 [ 802.290746] ? trace_hardirqs_off_finish+0x32/0xa0 [ 802.295533] ? do_SYSENTER_32+0x15/0x20 [ 802.299371] do_fast_syscall_32+0x49/0xc0 [ 802.303374] do_SYSENTER_32+0x15/0x20 [ 802.307032] entry_SYSENTER_32+0x9f/0xf2 [ 802.310956] EIP: 0xb7fbb549 [ 802.313747] Code: 03 74 c0 01 10 05 03 74 b8 01 10 06 03 74 b4 01 10 07 03 74 b0 01 10 08 03 74 d8 01 00 00 00 00 00 51 52 55 89 e5 0f 34 cd 80 <5d> 5a 59 c3 90 90 90 90 8d 76 00 58 b8 77 00 00 00 cd 80 90 8d 76 [ 802.332483] EAX: ffffffda EBX: 01200011 ECX: 00000000 EDX: 00000000 [ 802.338742] ESI: 00000000 EDI: b7dbdba8 EBP: b7dbd348 ESP: b7dbd2f0 [ 802.344998] DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 007b EFLAGS: 00000246 [ 802.351776] Modules linked in: algif_hash x86_pkg_temp_thermal [ 802.357608] CR2: 00000000fe402000 [ 802.360920] ---[ end trace ea48459ba50c2a87 ]--- [ 802.365542] EIP: memcpy+0x14/0x30 [ 802.368858] Code: e8 a1 72 c5 ff 0f 31 31 c3 59 58 eb 85 cc cc cc cc cc cc cc cc cc 3e 8d 74 26 00 55 89 e5 57 89 c7 56 89 d6 53 89 cb c1 e9 02 <f3> a5 89 d9 83 e1 03 74 02 f3 a4 5b 5e 5f 5d c3 8d b4 26 00 00 00 [ 802.387593] EAX: fe402000 EBX: 00010000 ECX: 00004000 EDX: fb3dd000 [ 802.393852] ESI: fb3dd000 EDI: fe402000 EBP: ea799ddc ESP: ea799dd0 [ 802.400107] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 EFLAGS: 00010206 [ 802.406887] CR0: 80050033 CR2: fe402000 CR3: 1eee9000 CR4: 003406d0 [ 802.413143] DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000 [ 802.419400] DR6: fffe0ff0 DR7: 00000400
Quoted 4 lines
full test log,
[1] https://qa-reports.linaro.org/lkft/linux-stable-rc-5.8-oe/build/v5.8.5-256-gad57c5b5e64d/testrun/3148295/suite/linux-log-parser/test/check-kernel-bug-1727425/log[2] https://lore.kernel.org/linux-mm/CA+G9fYsiNgoh09h0paf1+UTKhPnn490QCoLB2dRFhMT+Cjh9RA@mail.gmail.com/
As this also triggers on mainline/Linus's tree, I'll just let it be for now, thanks!
greg k-h
Greg Kroah-Hartman
maintainerQuoted 7 lines · Holger Hoffstätte
Quoted 1 line · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.8.6 release.
This one has a bunch of things I care about, so I gave it a try on both my server & desktop (Gentoo,
x86_64). Applies & builds cleanly, everything working fine: no spontaneous fires or unexpected screams from the underworld.
Wonderful, glad the underworld is happy with this release :)
Thanks for testing,
greg k-h
Greg Kroah-Hartman
maintainerQuoted 15 lines · Shuah Khan
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.8.6 release. There are 255 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 03 Sep 2020 15:09:01 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.8.6-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.8.y
and the diffstat can be found below.
Quoted 8 lines
Quoted 4 lines
thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
Tested-by Shuah Khan <[email protected]>
Thanks for testing all of these and letting me know.
greg k-h