4.9.23-stable review
Subsystems (4)
Greg Kroah-Hartman
maintainerPATCH 6/31 drm/i915: Stop using RP_DOWN_EI on Baytrail
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Wilson <[email protected]>
commit 8f68d591d4765b2e1ce9d916ac7bc5583285c4ad upstream.
On Baytrail, we manually calculate busyness over the evaluation interval to avoid issues with miscaluations with RC6 enabled. However, it turns out that the DOWN_EI interrupt generator is completely bust - it operates in two modes, continuous or never. Neither of which are conducive to good behaviour. Stop unmask the DOWN_EI interrupt and just compute everything from the UP_EI which does seem to correspond to the desired interval.
v2: Fixup gen6_rps_pm_mask() as well
v3: Inline vlv_c0_above() to combine the now identical elapsed calculation for up/down and simplify the threshold testing
--- drivers/gpu/drm/i915/i915_drv.h | 2 - drivers/gpu/drm/i915/i915_irq.c | 73 +++++++++++++++------------------------- drivers/gpu/drm/i915/intel_pm.c | 5 +- 3 files changed, 32 insertions(+), 48 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -1225,7 +1225,7 @@ struct intel_gen6_power_mgmt {unsigned boosts;/* manual wa residency calculations */ -struct intel_rps_ei up_ei, down_ei; +struct intel_rps_ei ei;/* * Protects RPS/RC6 register access and PCU communication.
drivers/gpu/drm/i915/i915_irq.c +28 -45
103 lines not on this page · raw message
drivers/gpu/drm/i915/intel_pm.c +3 -2
@@ -4940,8 +4940,9 @@ static u32 gen6_rps_pm_mask(struct drm_i {u32 mask =0 ; +/* We use UP_EI_EXPIRED interupts for both up/down in manual mode */ if (val > dev_priv->rps.min_freq_softlimit) - mask |=GEN6_PM_RP_DOWN_EI_EXPIRED |GEN6_PM_RP_DOWN_THRESHOLD |GEN6_PM_RP_DOWN_TIMEOUT ; + mask |=GEN6_PM_RP_UP_EI_EXPIRED |GEN6_PM_RP_DOWN_THRESHOLD |GEN6_PM_RP_DOWN_TIMEOUT ;if (val < dev_priv->rps.max_freq_softlimit) mask |=GEN6_PM_RP_UP_EI_EXPIRED |GEN6_PM_RP_UP_THRESHOLD ;
@@ -5041,7 +5042,7 @@ void gen6_rps_busy(struct drm_i915_priva {mutex_lock (&dev_priv->rps.hw_lock);if (dev_priv->rps.enabled) { -if (dev_priv->pm_rps_events & (GEN6_PM_RP_DOWN_EI_EXPIRED |GEN6_PM_RP_UP_EI_EXPIRED )) +if (dev_priv->pm_rps_events &GEN6_PM_RP_UP_EI_EXPIRED )gen6_rps_reset_ei (dev_priv);I915_WRITE (GEN6_PMINTRMSK ,gen6_rps_pm_mask (dev_priv, dev_priv->rps.cur_freq));
Greg Kroah-Hartman
maintainerPATCH 7/31 drm/i915: Avoid rcu_barrier() from reclaim paths (shrinker)
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Wilson <[email protected]>
commit 3d3d18f086cdda72ee18a454db70ca72c6e3246c upstream.
The rcu_barrier() takes the cpu_hotplug mutex which itself is not reclaim-safe, and so rcu_barrier() is illegal from inside the shrinker.
[ 309.661373] =========================================================
[ 309.661376] [ INFO: possible irq lock inversion dependency detected ]
[ 309.661380] 4.11.0-rc1-CI-CI_DRM_2333+ #1 Tainted: G W
[ 309.661383] ---------------------------------------------------------
[ 309.661386] gem_exec_gttfil/6435 just changed the state of lock:
[ 309.661389] (rcu_preempt_state.barrier_mutex){+.+.-.}, at: [<ffffffff81100731>] _rcu_barrier+0x31/0x160
[ 309.661399] but this lock took another, RECLAIM_FS-unsafe lock in the past:
[ 309.661402] (cpu_hotplug.lock){+.+.+.}
[ 309.661404]and interrupts could create inverse lock ordering between them.
[ 309.661410]
other info that might help us debug this:
[ 309.661414] Possible interrupt unsafe locking scenario:[ 309.661417] CPU0 CPU1
[ 309.661419] ---- ----
[ 309.661421] lock(cpu_hotplug.lock);
[ 309.661425] local_irq_disable();
[ 309.661432] lock(rcu_preempt_state.barrier_mutex);
[ 309.661441] lock(cpu_hotplug.lock);
[ 309.661446] <Interrupt>
[ 309.661448] lock(rcu_preempt_state.barrier_mutex);
[ 309.661453]
*** DEADLOCK ***[ 309.661460] 4 locks held by gem_exec_gttfil/6435:
[ 309.661464] #0: (sb_writers#10){.+.+.+}, at: [<ffffffff8120d83d>] vfs_write+0x17d/0x1f0
[ 309.661475] #1: (debugfs_srcu){......}, at: [<ffffffff81320491>] debugfs_use_file_start+0x41/0xa0
[ 309.661486] #2: (&attr->mutex){+.+.+.}, at: [<ffffffff8123a3e7>] simple_attr_write+0x37/0xe0
[ 309.661495] #3: (&dev->struct_mutex){+.+.+.}, at: [<ffffffffa0091b4a>] i915_drop_caches_set+0x3a/0x150 [i915]
[ 309.661540]
the shortest dependencies between 2nd lock and 1st lock:
[ 309.661547] -> (cpu_hotplug.lock){+.+.+.} ops: 829 {
[ 309.661553] HARDIRQ-ON-W at:
[ 309.661560] __lock_acquire+0x5e5/0x1b50
[ 309.661565] lock_acquire+0xc9/0x220
[ 309.661572] __mutex_lock+0x6e/0x990
[ 309.661576] mutex_lock_nested+0x16/0x20
[ 309.661583] get_online_cpus+0x61/0x80
[ 309.661590] kmem_cache_create+0x25/0x1d0
[ 309.661596] debug_objects_mem_init+0x30/0x249
[ 309.661602] start_kernel+0x341/0x3fe
[ 309.661607] x86_64_start_reservations+0x2a/0x2c
[ 309.661612] x86_64_start_kernel+0x173/0x186
[ 309.661619] verify_cpu+0x0/0xfc
[ 309.661622] SOFTIRQ-ON-W at:
[ 309.661627] __lock_acquire+0x611/0x1b50
[ 309.661632] lock_acquire+0xc9/0x220
[ 309.661636] __mutex_lock+0x6e/0x990
[ 309.661641] mutex_lock_nested+0x16/0x20
[ 309.661646] get_online_cpus+0x61/0x80
[ 309.661650] kmem_cache_create+0x25/0x1d0
[ 309.661655] debug_objects_mem_init+0x30/0x249
[ 309.661660] start_kernel+0x341/0x3fe
[ 309.661664] x86_64_start_reservations+0x2a/0x2c
[ 309.661669] x86_64_start_kernel+0x173/0x186
[ 309.661674] verify_cpu+0x0/0xfc
[ 309.661677] RECLAIM_FS-ON-W at:
[ 309.661682] mark_held_locks+0x6f/0xa0
[ 309.661687] lockdep_trace_alloc+0xb3/0x100
[ 309.661693] kmem_cache_alloc_trace+0x31/0x2e0
[ 309.661699] __smpboot_create_thread.part.1+0x27/0xe0
[ 309.661704] smpboot_create_threads+0x61/0x90
[ 309.661709] cpuhp_invoke_callback+0x9c/0x8a0
[ 309.661713] cpuhp_up_callbacks+0x31/0xb0
[ 309.661718] _cpu_up+0x7a/0xc0
[ 309.661723] do_cpu_up+0x5f/0x80
[ 309.661727] cpu_up+0xe/0x10
[ 309.661734] smp_init+0x71/0xb3
[ 309.661738] kernel_init_freeable+0x94/0x19e
[ 309.661743] kernel_init+0x9/0xf0
[ 309.661748] ret_from_fork+0x2e/0x40
[ 309.661752] INITIAL USE at:
[ 309.661757] __lock_acquire+0x234/0x1b50
[ 309.661761] lock_acquire+0xc9/0x220
[ 309.661766] __mutex_lock+0x6e/0x990
[ 309.661771] mutex_lock_nested+0x16/0x20
[ 309.661775] get_online_cpus+0x61/0x80
[ 309.661780] __cpuhp_setup_state+0x44/0x170
[ 309.661785] page_alloc_init+0x23/0x3a
[ 309.661790] start_kernel+0x124/0x3fe
[ 309.661794] x86_64_start_reservations+0x2a/0x2c
[ 309.661799] x86_64_start_kernel+0x173/0x186
[ 309.661804] verify_cpu+0x0/0xfc
[ 309.661807] }
[ 309.661813] ... key at: [<ffffffff81e37690>] cpu_hotplug+0xb0/0x100
[ 309.661817] ... acquired at:
[ 309.661821] lock_acquire+0xc9/0x220
[ 309.661825] __mutex_lock+0x6e/0x990
[ 309.661829] mutex_lock_nested+0x16/0x20
[ 309.661833] get_online_cpus+0x61/0x80
[ 309.661837] _rcu_barrier+0x9f/0x160
[ 309.661841] rcu_barrier+0x10/0x20
[ 309.661847] netdev_run_todo+0x5f/0x310
[ 309.661852] rtnl_unlock+0x9/0x10
[ 309.661856] default_device_exit_batch+0x133/0x150
[ 309.661862] ops_exit_list.isra.0+0x4d/0x60
[ 309.661866] cleanup_net+0x1d8/0x2c0
[ 309.661872] process_one_work+0x1f4/0x6d0
[ 309.661876] worker_thread+0x49/0x4a0
[ 309.661881] kthread+0x107/0x140
[ 309.661884] ret_from_fork+0x2e/0x40[ 309.661890] -> (rcu_preempt_state.barrier_mutex){+.+.-.} ops: 179 {
[ 309.661896] HARDIRQ-ON-W at:
[ 309.661901] __lock_acquire+0x5e5/0x1b50
[ 309.661905] lock_acquire+0xc9/0x220
[ 309.661910] __mutex_lock+0x6e/0x990
[ 309.661914] mutex_lock_nested+0x16/0x20
[ 309.661919] _rcu_barrier+0x31/0x160
[ 309.661923] rcu_barrier+0x10/0x20
[ 309.661928] netdev_run_todo+0x5f/0x310
[ 309.661932] rtnl_unlock+0x9/0x10
[ 309.661936] default_device_exit_batch+0x133/0x150
[ 309.661941] ops_exit_list.isra.0+0x4d/0x60
[ 309.661946] cleanup_net+0x1d8/0x2c0
[ 309.661951] process_one_work+0x1f4/0x6d0
[ 309.661955] worker_thread+0x49/0x4a0
[ 309.661960] kthread+0x107/0x140
[ 309.661964] ret_from_fork+0x2e/0x40
[ 309.661968] SOFTIRQ-ON-W at:
[ 309.661972] __lock_acquire+0x611/0x1b50
[ 309.661977] lock_acquire+0xc9/0x220
[ 309.661981] __mutex_lock+0x6e/0x990
[ 309.661986] mutex_lock_nested+0x16/0x20
[ 309.661990] _rcu_barrier+0x31/0x160
[ 309.661995] rcu_barrier+0x10/0x20
[ 309.661999] netdev_run_todo+0x5f/0x310
[ 309.662003] rtnl_unlock+0x9/0x10
[ 309.662008] default_device_exit_batch+0x133/0x150
[ 309.662013] ops_exit_list.isra.0+0x4d/0x60
[ 309.662017] cleanup_net+0x1d8/0x2c0
[ 309.662022] process_one_work+0x1f4/0x6d0
[ 309.662027] worker_thread+0x49/0x4a0
[ 309.662031] kthread+0x107/0x140
[ 309.662035] ret_from_fork+0x2e/0x40
[ 309.662039] IN-RECLAIM_FS-W at:
[ 309.662043] __lock_acquire+0x638/0x1b50
[ 309.662048] lock_acquire+0xc9/0x220
[ 309.662053] __mutex_lock+0x6e/0x990
[ 309.662058] mutex_lock_nested+0x16/0x20
[ 309.662062] _rcu_barrier+0x31/0x160
[ 309.662067] rcu_barrier+0x10/0x20
[ 309.662089] i915_gem_shrink_all+0x33/0x40 [i915]
[ 309.662109] i915_drop_caches_set+0x141/0x150 [i915]
[ 309.662114] simple_attr_write+0xc7/0xe0
[ 309.662119] full_proxy_write+0x4f/0x70
[ 309.662124] __vfs_write+0x23/0x120
[ 309.662128] vfs_write+0xc6/0x1f0
[ 309.662133] SyS_write+0x44/0xb0
[ 309.662138] entry_SYSCALL_64_fastpath+0x1c/0xb1
[ 309.662142] INITIAL USE at:
[ 309.662147] __lock_acquire+0x234/0x1b50
[ 309.662151] lock_acquire+0xc9/0x220
[ 309.662156] __mutex_lock+0x6e/0x990
[ 309.662160] mutex_lock_nested+0x16/0x20
[ 309.662165] _rcu_barrier+0x31/0x160
[ 309.662169] rcu_barrier+0x10/0x20
[ 309.662174] netdev_run_todo+0x5f/0x310
[ 309.662178] rtnl_unlock+0x9/0x10
[ 309.662183] default_device_exit_batch+0x133/0x150
[ 309.662188] ops_exit_list.isra.0+0x4d/0x60
[ 309.662192] cleanup_net+0x1d8/0x2c0
[ 309.662197] process_one_work+0x1f4/0x6d0
[ 309.662202] worker_thread+0x49/0x4a0
[ 309.662206] kthread+0x107/0x140
[ 309.662210] ret_from_fork+0x2e/0x40
[ 309.662214] }
[ 309.662220] ... key at: [<ffffffff81e4e1c8>] rcu_preempt_state+0x508/0x780
[ 309.662225] ... acquired at:
[ 309.662229] check_usage_forwards+0x12b/0x130
[ 309.662233] mark_lock+0x360/0x6f0
[ 309.662237] __lock_acquire+0x638/0x1b50
[ 309.662241] lock_acquire+0xc9/0x220
[ 309.662245] __mutex_lock+0x6e/0x990
[ 309.662249] mutex_lock_nested+0x16/0x20
[ 309.662253] _rcu_barrier+0x31/0x160
[ 309.662257] rcu_barrier+0x10/0x20
[ 309.662279] i915_gem_shrink_all+0x33/0x40 [i915]
[ 309.662298] i915_drop_caches_set+0x141/0x150 [i915]
[ 309.662303] simple_attr_write+0xc7/0xe0
[ 309.662307] full_proxy_write+0x4f/0x70
[ 309.662311] __vfs_write+0x23/0x120
[ 309.662315] vfs_write+0xc6/0x1f0
[ 309.662319] SyS_write+0x44/0xb0
[ 309.662323] entry_SYSCALL_64_fastpath+0x1c/0xb1[ 309.662329]
stack backtrace:
[ 309.662335] CPU: 1 PID: 6435 Comm: gem_exec_gttfil Tainted: G W 4.11.0-rc1-CI-CI_DRM_2333+ #1
[ 309.662342] Hardware name: Hewlett-Packard HP Compaq 8100 Elite SFF PC/304Ah, BIOS 786H1 v01.13 07/14/2011
[ 309.662348] Call Trace:
[ 309.662354] dump_stack+0x67/0x92
[ 309.662359] print_irq_inversion_bug.part.19+0x1a4/0x1b0
[ 309.662365] check_usage_forwards+0x12b/0x130
[ 309.662369] mark_lock+0x360/0x6f0
[ 309.662374] ? print_shortest_lock_dependencies+0x1a0/0x1a0
[ 309.662379] __lock_acquire+0x638/0x1b50
[ 309.662383] ? __mutex_unlock_slowpath+0x3e/0x2e0
[ 309.662388] ? trace_hardirqs_on+0xd/0x10
[ 309.662392] ? _rcu_barrier+0x31/0x160
[ 309.662396] lock_acquire+0xc9/0x220
[ 309.662400] ? _rcu_barrier+0x31/0x160
[ 309.662404] ? _rcu_barrier+0x31/0x160
[ 309.662409] __mutex_lock+0x6e/0x990
[ 309.662412] ? _rcu_barrier+0x31/0x160
[ 309.662416] ? _rcu_barrier+0x31/0x160
[ 309.662421] ? synchronize_rcu_expedited+0x35/0xb0
[ 309.662426] ? _raw_spin_unlock_irqrestore+0x52/0x60
[ 309.662434] mutex_lock_nested+0x16/0x20
[ 309.662438] _rcu_barrier+0x31/0x160
[ 309.662442] rcu_barrier+0x10/0x20
[ 309.662464] i915_gem_shrink_all+0x33/0x40 [i915]
[ 309.662484] i915_drop_caches_set+0x141/0x150 [i915]
[ 309.662489] simple_attr_write+0xc7/0xe0
[ 309.662494] full_proxy_write+0x4f/0x70
[ 309.662498] __vfs_write+0x23/0x120
[ 309.662503] ? rcu_read_lock_sched_held+0x75/0x80
[ 309.662507] ? rcu_sync_lockdep_assert+0x2a/0x50
[ 309.662512] ? __sb_start_write+0x102/0x210
[ 309.662516] ? vfs_write+0x17d/0x1f0
[ 309.662520] vfs_write+0xc6/0x1f0
[ 309.662524] ? trace_hardirqs_on_caller+0xe7/0x200
[ 309.662529] SyS_write+0x44/0xb0
[ 309.662533] entry_SYSCALL_64_fastpath+0x1c/0xb1
[ 309.662537] RIP: 0033:0x7f507eac24a0
[ 309.662541] RSP: 002b:00007fffda8720e8 EFLAGS: 00000246 ORIG_RAX: 0000000000000001
[ 309.662548] RAX: ffffffffffffffda RBX: ffffffff81482bd3 RCX: 00007f507eac24a0
[ 309.662552] RDX: 0000000000000005 RSI: 00007fffda8720f0 RDI: 0000000000000005
[ 309.662557] RBP: ffffc9000048bf88 R08: 0000000000000000 R09: 000000000000002c
[ 309.662561] R10: 0000000000000014 R11: 0000000000000246 R12: 00007fffda872230
[ 309.662566] R13: 00007fffda872228 R14: 0000000000000201 R15: 00007fffda8720f0
[ 309.662572] ? __this_cpu_preempt_check+0x13/0x20Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100192
--- drivers/gpu/drm/i915/i915_gem_shrinker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem_shrinker.c +1 -1
@@ -233,7 +233,7 @@ unsigned long i915_gem_shrink_all(structI915_SHRINK_BOUND |I915_SHRINK_UNBOUND | I915_SHRINK_ACTIVE); -rcu_barrier ();/* wait until our RCU delayed slab frees are completed */ +synchronize_rcu ();/* wait for our earlier RCU delayed slab frees */ return freed; }
Greg Kroah-Hartman
maintainerPATCH 13/31 rt2x00usb: do not anchor rx and tx urbs
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanislaw Gruszka <[email protected]>
commit 93c7018ec16bb83399dd4db61c361a6d6aba0d5a upstream.
We might kill TX or RX urb during rt2x00usb_flush_entry(), what can cause anchor list corruption like shown below:
[ 2074.035633] WARNING: CPU: 2 PID: 14480 at lib/list_debug.c:33 __list_add+0xac/0xc0 [ 2074.035634] list_add corruption. prev->next should be next (ffff88020f362c28), but was dead000000000100. (prev=ffff8801d161bb70). <snip> [ 2074.035670] Call Trace: [ 2074.035672] [<ffffffff813bde47>] dump_stack+0x63/0x8c [ 2074.035674] [<ffffffff810a2231>] __warn+0xd1/0xf0 [ 2074.035676] [<ffffffff810a22af>] warn_slowpath_fmt+0x5f/0x80 [ 2074.035678] [<ffffffffa073855d>] ? rt2x00usb_register_write_lock+0x3d/0x60 [rt2800usb] [ 2074.035679] [<ffffffff813dbe4c>] __list_add+0xac/0xc0 [ 2074.035681] [<ffffffff81591c6c>] usb_anchor_urb+0x4c/0xa0 [ 2074.035683] [<ffffffffa07322af>] rt2x00usb_kick_rx_entry+0xaf/0x100 [rt2x00usb] [ 2074.035684] [<ffffffffa0732322>] rt2x00usb_clear_entry+0x22/0x30 [rt2x00usb]
To fix do not anchor TX and RX urb's, it is not needed as during shutdown we kill those urbs in rt2x00usb_free_entries().
--- drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/net/wireless/ralink/rt2x00/rt2x00usb.c +0 -4
@@ -319,10 +319,8 @@ static bool rt2x00usb_kick_tx_entry(stru entry->skb->data, length, rt2x00usb_interrupt_txdone, entry); -usb_anchor_urb (entry_priv->urb, rt2x00dev->anchor); status =usb_submit_urb (entry_priv->urb,GFP_ATOMIC );if (status) { -usb_unanchor_urb (entry_priv->urb);if (status == -ENODEV )clear_bit (DEVICE_STATE_PRESENT , &rt2x00dev->flags);set_bit (ENTRY_DATA_IO_FAILED , &entry->flags);
@@ -410,10 +408,8 @@ static bool rt2x00usb_kick_rx_entry(stru entry->skb->data, entry->skb->len, rt2x00usb_interrupt_rxdone, entry); -usb_anchor_urb (entry_priv->urb, rt2x00dev->anchor); status =usb_submit_urb (entry_priv->urb,GFP_ATOMIC );if (status) { -usb_unanchor_urb (entry_priv->urb);if (status == -ENODEV )clear_bit (DEVICE_STATE_PRESENT , &rt2x00dev->flags);set_bit (ENTRY_DATA_IO_FAILED , &entry->flags);
Greg Kroah-Hartman
maintainerPATCH 14/31 rt2x00: Fix incorrect usage of CONFIG_RT2X00_LIB_USB
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vishal Thanki <[email protected]>
commit a083c8fd277b4122c804f18ec8c84165f345c71c upstream.
In device removal routine, usage of "#ifdef CONFIG_RT2X00_LIB_USB" will not cover the case when it is configured as module. This will omit the entire if-block which does cleanup of URBs and cancellation of pending work. Changing the #ifdef to #if IS_ENABLED() to fix it.
--- drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +1 -1
@@ -1422,7 +1422,7 @@ void rt2x00lib_remove_dev(struct rt2x00_cancel_work_sync (&rt2x00dev->intf_work);cancel_delayed_work_sync (&rt2x00dev->autowakeup_work);cancel_work_sync (&rt2x00dev->sleep_work); -#ifdef CONFIG_RT2X00_LIB_USB +#if IS_ENABLED (CONFIG_RT2X00_LIB_USB )if (rt2x00_is_usb (rt2x00dev)) {usb_kill_anchored_urbs (rt2x00dev->anchor);hrtimer_cancel (&rt2x00dev->txstatus_timer);
Greg Kroah-Hartman
maintainerPATCH 19/31 MIPS: Switch to the irq_stack in interrupts
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matt Redfearn <[email protected]>
commit dda45f701c9d7ad4ac0bb446e3a96f6df9a468d9 upstream.
When enterring interrupt context via handle_int or except_vec_vi, switch to the irq_stack of the current CPU if it is not already in use.
The current stack pointer is masked with the thread size and compared to the base or the irq stack. If it does not match then the stack pointer is set to the top of that stack, otherwise this is a nested irq being handled on the irq stack so the stack pointer should be left as it was.
The in-use stack pointer is placed in the callee saved register s1. It will be saved to the stack when plat_irq_dispatch is invoked and can be restored once control returns here.
Patchwork: https://patchwork.linux-mips.org/patch/14743/
--- arch/mips/kernel/genex.S | 81 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 76 insertions(+), 5 deletions(-)
arch/mips/kernel/genex.S +76 -5
@@ -187,9 +187,44 @@ NESTED(handle_int, PT_SIZE, sp) LONG_L s0, TI_REGS($28) LONG_S sp, TI_REGS($28) - PTR_LA ra, ret_from_irq - PTR_LA v0, plat_irq_dispatch - jr v0 + + /* + * SAVE_ALL ensures we are using a valid kernel stack for the thread. + * Check if we are already using the IRQ stack. + */ + move s1, sp # Preserve the sp + + /* Get IRQ stack for this CPU */ + ASM_CPUID_MFC0 k0, ASM_SMP_CPUID_REG +#if defined(CONFIG_32BIT) || defined(KBUILD_64BIT_SYM32) + lui k1, %hi(irq_stack) +#else + lui k1, %highest(irq_stack) + daddiu k1, %higher(irq_stack) + dsll k1, 16 + daddiu k1, %hi(irq_stack) + dsll k1, 16 +#endif + LONG_SRL k0, SMP_CPUID_PTRSHIFT + LONG_ADDU k1, k0 + LONG_L t0, %lo(irq_stack)(k1) + + # Check if already on IRQ stack + PTR_LI t1, ~(_THREAD_SIZE-1) + and t1, t1, sp + beq t0, t1, 2f + + /* Switch to IRQ stack */ + li t1, _IRQ_STACK_SIZE + PTR_ADD sp, t0, t1 + +2: + jal plat_irq_dispatch + + /* Restore sp */ + move sp, s1 + + j ret_from_irq #ifdef CONFIG_CPU_MICROMIPS nop #endif
@@ -262,8 +297,44 @@ NESTED(except_vec_vi_handler, 0, sp) LONG_L s0, TI_REGS($28) LONG_S sp, TI_REGS($28) - PTR_LA ra, ret_from_irq - jr v0 + + /* + * SAVE_ALL ensures we are using a valid kernel stack for the thread. + * Check if we are already using the IRQ stack. + */ + move s1, sp # Preserve the sp + + /* Get IRQ stack for this CPU */ + ASM_CPUID_MFC0 k0, ASM_SMP_CPUID_REG +#if defined(CONFIG_32BIT) || defined(KBUILD_64BIT_SYM32) + lui k1, %hi(irq_stack) +#else + lui k1, %highest(irq_stack) + daddiu k1, %higher(irq_stack) + dsll k1, 16 + daddiu k1, %hi(irq_stack) + dsll k1, 16 +#endif + LONG_SRL k0, SMP_CPUID_PTRSHIFT + LONG_ADDU k1, k0 + LONG_L t0, %lo(irq_stack)(k1) + + # Check if already on IRQ stack + PTR_LI t1, ~(_THREAD_SIZE-1) + and t1, t1, sp + beq t0, t1, 2f + + /* Switch to IRQ stack */ + li t1, _IRQ_STACK_SIZE + PTR_ADD sp, t0, t1 + +2: + jal plat_irq_dispatch + + /* Restore sp */ + move sp, s1 + + j ret_from_irq END(except_vec_vi_handler) /*
Greg Kroah-Hartman
maintainerPATCH 20/31 MIPS: Select HAVE_IRQ_EXIT_ON_IRQ_STACK
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matt Redfearn <[email protected]>
commit 3cc3434fd6307d06b53b98ce83e76bf9807689b9 upstream.
Since do_IRQ is now invoked on a separate IRQ stack, we select HAVE_IRQ_EXIT_ON_IRQ_STACK so that softirq's may be invoked directly from irq_exit(), rather than requiring do_softirq_own_stack.
Patchwork: https://patchwork.linux-mips.org/patch/14744/
--- arch/mips/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/mips/Kconfig +1 -0
@@ -9,6 +9,7 @@ config MIPS select HAVE_CONTEXT_TRACKING select HAVE_GENERIC_DMA_COHERENT select HAVE_IDE + select HAVE_IRQ_EXIT_ON_IRQ_STACK select HAVE_OPROFILE select HAVE_PERF_EVENTS select PERF_USE_VMALLOC
Greg Kroah-Hartman
maintainerPATCH 21/31 MIPS: IRQ Stack: Fix erroneous jal to plat_irq_dispatch
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matt Redfearn <[email protected]>
commit c25f8064c1d5731a2ce5664def890140dcdd3e5c upstream.
Commit dda45f701c9d ("MIPS: Switch to the irq_stack in interrupts") changed both the normal and vectored interrupt handlers. Unfortunately the vectored version, "except_vec_vi_handler", was incorrectly modified to unconditionally jal to plat_irq_dispatch, rather than doing a jalr to the vectored handler that has been set up. This is ok for many platforms which set the vectored handler to plat_irq_dispatch anyway, but will cause problems with platforms that use other handlers.
Patchwork: https://patchwork.linux-mips.org/patch/15110/
--- arch/mips/kernel/genex.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/kernel/genex.S +1 -1
@@ -329,7 +329,7 @@ NESTED(except_vec_vi_handler, 0, sp) PTR_ADD sp, t0, t1 2: - jal plat_irq_dispatch + jalr v0 /* Restore sp */ move sp, s1
Greg Kroah-Hartman
maintainerPATCH 24/31 Revert "drm/i915/execlists: Reset RING registers upon resume"
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
This reverts commit f2a0409a08502d64fbe3990354dff5902b08d2fb which is commit bafb2f7d4755bf1571bd5e9a03b97f3fc4fe69ae upstream.
It was reported to have problems.
--- drivers/gpu/drm/i915/intel_lrc.c | 58 +++++++++++++++------------------------ 1 file changed, 23 insertions(+), 35 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +23 -35
@@ -2152,42 +2152,30 @@ error_deref_obj:void intel_lr_context_resume (struct drm_i915_private *dev_priv) { +struct i915_gem_context *ctx = dev_priv->kernel_context;struct intel_engine_cs *engine; -struct i915_gem_context *ctx; -/* Because we emit WA_TAIL_DWORDS there may be a disparity -* between our bookkeeping in ce->ring->head and ce->ring->tail and -* that stored in context. As we only write new commands from -* ce->ring->tail onwards, everything before that is junk. If the GPU -* starts reading from its RING_HEAD from the context, it may try to -* execute that junk and die. -* -* So to avoid that we reset the context images upon resume. For -* simplicity, we just zero everything out. -*/ -list_for_each_entry (ctx, &dev_priv->context_list, link) { -for_each_engine (engine, dev_priv) { -struct intel_context *ce = &ctx->engine[engine->id]; -u32 *reg; - -if (!ce->state) -continue ; - - reg =i915_gem_object_pin_map (ce->state->obj, -I915_MAP_WB ); -if (WARN_ON (IS_ERR (reg))) -continue ; - - reg +=LRC_STATE_PN *PAGE_SIZE /sizeof (*reg); - reg[CTX_RING_HEAD +1 ] =0 ; - reg[CTX_RING_TAIL +1 ] =0 ; - - ce->state->obj->dirty = true; -i915_gem_object_unpin_map (ce->state->obj); - - ce->ring->head = ce->ring->tail =0 ; - ce->ring->last_retired_head =-1 ; -intel_ring_update_space (ce->ring); - } +for_each_engine (engine, dev_priv) { +struct intel_context *ce = &ctx->engine[engine->id]; +void *vaddr; +uint32_t *reg_state; + +if (!ce->state) +continue ; + + vaddr =i915_gem_object_pin_map (ce->state->obj,I915_MAP_WB ); +if (WARN_ON (IS_ERR (vaddr))) +continue ; + + reg_state = vaddr +LRC_STATE_PN *PAGE_SIZE ; + + reg_state[CTX_RING_HEAD +1 ] =0 ; + reg_state[CTX_RING_TAIL +1 ] =0 ; + + ce->state->obj->dirty = true; +i915_gem_object_unpin_map (ce->state->obj); + + ce->ring->head =0 ; + ce->ring->tail =0 ; } }
Greg Kroah-Hartman
maintainerPATCH 26/31 blk-mq: Avoid memory reclaim when remapping queues
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabriel Krisman Bertazi <[email protected]>
commit 36e1f3d107867b25c616c2fd294f5a1c9d4e5d09 upstream.
While stressing memory and IO at the same time we changed SMT settings, we were able to consistently trigger deadlocks in the mm system, which froze the entire machine.
I think that under memory stress conditions, the large allocations performed by blk_mq_init_rq_map may trigger a reclaim, which stalls waiting on the block layer remmaping completion, thus deadlocking the system. The trace below was collected after the machine stalled, waiting for the hotplug event completion.
The simplest fix for this is to make allocations in this path non-reclaimable, with GFP_NOIO. With this patch, We couldn't hit the issue anymore.
This should apply on top of Jens's for-next branch cleanly.
Changes since v1:
- Use GFP_NOIO instead of GFP_NOWAIT.
Call Trace:
[c000000f0160aaf0] [c000000f0160ab50] 0xc000000f0160ab50 (unreliable) [c000000f0160acc0] [c000000000016624] __switch_to+0x2e4/0x430 [c000000f0160ad20] [c000000000b1a880] __schedule+0x310/0x9b0 [c000000f0160ae00] [c000000000b1af68] schedule+0x48/0xc0 [c000000f0160ae30] [c000000000b1b4b0] schedule_preempt_disabled+0x20/0x30 [c000000f0160ae50] [c000000000b1d4fc] __mutex_lock_slowpath+0xec/0x1f0 [c000000f0160aed0] [c000000000b1d678] mutex_lock+0x78/0xa0 [c000000f0160af00] [d000000019413cac] xfs_reclaim_inodes_ag+0x33c/0x380 [xfs] [c000000f0160b0b0] [d000000019415164] xfs_reclaim_inodes_nr+0x54/0x70 [xfs] [c000000f0160b0f0] [d0000000194297f8] xfs_fs_free_cached_objects+0x38/0x60 [xfs] [c000000f0160b120] [c0000000003172c8] super_cache_scan+0x1f8/0x210 [c000000f0160b190] [c00000000026301c] shrink_slab.part.13+0x21c/0x4c0 [c000000f0160b2d0] [c000000000268088] shrink_zone+0x2d8/0x3c0 [c000000f0160b380] [c00000000026834c] do_try_to_free_pages+0x1dc/0x520 [c000000f0160b450] [c00000000026876c] try_to_free_pages+0xdc/0x250 [c000000f0160b4e0] [c000000000251978] __alloc_pages_nodemask+0x868/0x10d0 [c000000f0160b6f0] [c000000000567030] blk_mq_init_rq_map+0x160/0x380 [c000000f0160b7a0] [c00000000056758c] blk_mq_map_swqueue+0x33c/0x360 [c000000f0160b820] [c000000000567904] blk_mq_queue_reinit+0x64/0xb0 [c000000f0160b850] [c00000000056a16c] blk_mq_queue_reinit_notify+0x19c/0x250 [c000000f0160b8a0] [c0000000000f5d38] notifier_call_chain+0x98/0x100 [c000000f0160b8f0] [c0000000000c5fb0] __cpu_notify+0x70/0xe0 [c000000f0160b930] [c0000000000c63c4] notify_prepare+0x44/0xb0 [c000000f0160b9b0] [c0000000000c52f4] cpuhp_invoke_callback+0x84/0x250 [c000000f0160ba10] [c0000000000c570c] cpuhp_up_callbacks+0x5c/0x120 [c000000f0160ba60] [c0000000000c7cb8] _cpu_up+0xf8/0x1d0 [c000000f0160bac0] [c0000000000c7eb0] do_cpu_up+0x120/0x150 [c000000f0160bb40] [c0000000006fe024] cpu_subsys_online+0x64/0xe0 [c000000f0160bb90] [c0000000006f5124] device_online+0xb4/0x120 [c000000f0160bbd0] [c0000000006f5244] online_store+0xb4/0xc0 [c000000f0160bc20] [c0000000006f0a68] dev_attr_store+0x68/0xa0 [c000000f0160bc60] [c0000000003ccc30] sysfs_kf_write+0x80/0xb0 [c000000f0160bca0] [c0000000003cbabc] kernfs_fop_write+0x17c/0x250 [c000000f0160bcf0] [c00000000030fe6c] __vfs_write+0x6c/0x1e0 [c000000f0160bd90] [c000000000311490] vfs_write+0xd0/0x270 [c000000f0160bde0] [c0000000003131fc] SyS_write+0x6c/0x110 [c000000f0160be30] [c000000000009204] system_call+0x38/0xec
--- block/blk-mq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
block/blk-mq.c +3 -3
@@ -1474,7 +1474,7 @@ static struct blk_mq_tags *blk_mq_init_rINIT_LIST_HEAD (&tags->page_list); tags->rqs =kzalloc_node (set->queue_depth *sizeof (struct request *), -GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY, +GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY, set->numa_node);if (!tags->rqs) {blk_mq_free_tags (tags);
@@ -1500,7 +1500,7 @@ static struct blk_mq_tags *blk_mq_init_r do { page = alloc_pages_node(set->numa_node, - GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY | __GFP_ZERO, + GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY | __GFP_ZERO, this_order); if (page) break;
@@ -1521,7 +1521,7 @@ static struct blk_mq_tags *blk_mq_init_r* Allow kmemleak to scan these pages as they contain pointers * to additional allocations like via ops->init_request(). */ -kmemleak_alloc (p,order_to_size (this_order),1 ,GFP_KERNEL ); +kmemleak_alloc (p,order_to_size (this_order),1 ,GFP_NOIO ); entries_per_page =order_to_size (this_order) / rq_size; to_do =min (entries_per_page, set->queue_depth - i); left -= to_do * rq_size;
Greg Kroah-Hartman
maintainercover 4.9.23-stable review
This is the start of the stable review cycle for the 4.9.23 release. There are 31 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 Tue Apr 18 08:02:08 UTC 2017. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.23-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.9.23-rc1
Marek Szyprowski <[email protected]>
dma-buf: add support for compat ioctl
Jack Morgenstein <[email protected]>
net/mlx4_core: Fix when to save some qp context flags for dynamic VST to VGT transitions
Jack Morgenstein <[email protected]>
net/mlx4_core: Fix racy CQ (Completion Queue) free
Eugenia Emantayev <[email protected]>
net/mlx4_en: Fix bad WQE issue
Guenter Roeck <[email protected]>
usb: hub: Wait for connection to be reestablished after port reset
Gabriel Krisman Bertazi <[email protected]>
blk-mq: Avoid memory reclaim when remapping queues
Andrey Konovalov <[email protected]>
net/packet: fix overflow in check for priv area size
Greg Kroah-Hartman <[email protected]>
Revert "drm/i915/execlists: Reset RING registers upon resume"
Horia Geantă <[email protected]>
crypto: caam - fix invalid dereference in caam_rsa_init_tfm()
Horia Geantă <[email protected]>
crypto: caam - fix RNG deinstantiation error checking
Matt Redfearn <[email protected]>
MIPS: IRQ Stack: Fix erroneous jal to plat_irq_dispatch
Matt Redfearn <[email protected]>
MIPS: Select HAVE_IRQ_EXIT_ON_IRQ_STACK
Matt Redfearn <[email protected]>
MIPS: Switch to the irq_stack in interrupts
Matt Redfearn <[email protected]>
MIPS: Only change $28 to thread_info if coming from user mode
Matt Redfearn <[email protected]>
MIPS: Stack unwinding while on IRQ stack
Matt Redfearn <[email protected]>
MIPS: Introduce irq_stack
Rafał Miłecki <[email protected]>
mtd: bcm47xxpart: fix parsing first block after aligned TRX
Vishal Thanki <[email protected]>
rt2x00: Fix incorrect usage of CONFIG_RT2X00_LIB_USB
Stanislaw Gruszka <[email protected]>
rt2x00usb: do not anchor rx and tx urb's
Stanislaw Gruszka <[email protected]>
rt2x00usb: fix anchor initialization
Noralf Trønnes <[email protected]>
i2c: bcm2835: Fix hang for writing messages larger than 16 bytes
Mike Marshall <[email protected]>
orangefs: fix buffer size mis-match between kernel space and user space.
Mike Marshall <[email protected]>
orangefs: Dan Carpenter influenced cleanups...
Colin Ian King <[email protected]>
orangefs: fix memory leak of string 'new' on exit path
Chris Wilson <[email protected]>
drm/i915: Avoid rcu_barrier() from reclaim paths (shrinker)
Chris Wilson <[email protected]>
drm/i915: Stop using RP_DOWN_EI on Baytrail
Kenneth Graunke <[email protected]>
drm/i915: Drop support for I915_EXEC_CONSTANTS_* execbuf parameters.
Chris Wilson <[email protected]>
drm/i915: Only enable hotplug interrupts if the display interrupts are enabled
Mika Kuoppala <[email protected]>
drm/i915: Avoid tweaking evaluation thresholds on Baytrail v3
Ville Syrjälä <[email protected]>
drm/i915: Nuke debug messages from the pipe update critical section
Imre Deak <[email protected]>
drm/i915/gen9: Increase PCODE request timeout to 50ms
-------------
Diffstat:
Makefile | 4 +- arch/mips/Kconfig | 1 + arch/mips/include/asm/irq.h | 12 ++++ arch/mips/include/asm/stackframe.h | 7 ++ arch/mips/kernel/asm-offsets.c | 1 + arch/mips/kernel/genex.S | 81 +++++++++++++++++++-- arch/mips/kernel/irq.c | 11 +++ arch/mips/kernel/process.c | 15 +++- block/blk-mq.c | 6 +- drivers/crypto/caam/caampkc.c | 2 +- drivers/crypto/caam/ctrl.c | 3 +- drivers/dma-buf/dma-buf.c | 3 + drivers/gpu/drm/i915/i915_drv.c | 4 +- drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/i915_gem.c | 2 - drivers/gpu/drm/i915/i915_gem_execbuffer.c | 52 +------------- drivers/gpu/drm/i915/i915_gem_shrinker.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 83 ++++++++++------------ drivers/gpu/drm/i915/intel_display.c | 12 +--- drivers/gpu/drm/i915/intel_hotplug.c | 14 ++-- drivers/gpu/drm/i915/intel_lrc.c | 50 +++++-------- drivers/gpu/drm/i915/intel_pm.c | 23 ++++-- drivers/i2c/busses/i2c-bcm2835.c | 22 +++--- drivers/mtd/bcm47xxpart.c | 10 ++- drivers/net/ethernet/mellanox/mlx4/cq.c | 38 +++++----- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 8 ++- .../net/ethernet/mellanox/mlx4/resource_tracker.c | 5 +- drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 2 +- drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 17 +++-- drivers/usb/core/hub.c | 11 ++- fs/orangefs/devorangefs-req.c | 5 +- fs/orangefs/orangefs-debugfs.c | 19 ++--- fs/orangefs/orangefs-dev-proto.h | 3 +- net/packet/af_packet.c | 4 +- 34 files changed, 303 insertions(+), 233 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 10/31 orangefs: fix buffer size mis-match between kernel space and user space.
4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Marshall <[email protected]>
commit eb68d0324dc4d88ab0d6159bdcd98c247a3a8954 upstream.
The deamon through which the kernel module communicates with the userspace part of Orangefs, the "client-core", sends initialization data to the kernel module with ioctl. The initialization data was built by the client-core in a 2k buffer and copy_from_user'd into a 1k buffer in the kernel module. When more than 1k of initialization data needed to be sent, some was lost, reducing the usability of the control by which debug levels are set. This patch sets the kernel side buffer to 2K to match the userspace side...
--- fs/orangefs/orangefs-dev-proto.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/orangefs/orangefs-dev-proto.h +1 -2
@@ -50,8 +50,7 @@* Misc constants. Please retain them as multiples of 8! * Otherwise 32-64 bit interactions will be messed up :) */ -#define ORANGEFS_MAX_DEBUG_STRING_LEN 0x00000400 -#define ORANGEFS_MAX_DEBUG_ARRAY_LEN 0x00000800 +#define ORANGEFS_MAX_DEBUG_STRING_LEN 0x00000800/* * The maximum number of directory entries in a single request is 96.
Greg Kroah-Hartman
maintainerPATCH 12/31 rt2x00usb: fix anchor initialization
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanislaw Gruszka <[email protected]>
commit 0488a6121dfe6cbd44de15ea3627913b7549a1e9 upstream.
If device fail to initialize we can OOPS in rt2x00lib_remove_dev(), due to using uninitialized usb_anchor structure:
[ 855.435820] ieee80211 phy3: rt2x00usb_vendor_request: Error - Vendor Request 0x07 failed for offset 0x1000 with error -19 [ 855.435826] ieee80211 phy3: rt2800_probe_rt: Error - Invalid RT chipset 0x0000, rev 0000 detected [ 855.435829] ieee80211 phy3: rt2x00lib_probe_dev: Error - Failed to allocate device [ 855.435845] BUG: unable to handle kernel NULL pointer dereference at 0000000000000028 [ 855.435900] IP: _raw_spin_lock_irq+0xd/0x30 [ 855.435926] PGD 0 [ 855.435953] Oops: 0002 [#1] SMP <snip> [ 855.437011] Call Trace: [ 855.437029] ? usb_kill_anchored_urbs+0x27/0xc0 [ 855.437061] rt2x00lib_remove_dev+0x190/0x1c0 [rt2x00lib] [ 855.437097] rt2x00lib_probe_dev+0x246/0x7a0 [rt2x00lib] [ 855.437149] ? ieee80211_roc_setup+0x9e/0xd0 [mac80211] [ 855.437183] ? __kmalloc+0x1af/0x1f0 [ 855.437207] ? rt2x00usb_probe+0x13d/0xc50 [rt2x00usb] [ 855.437240] rt2x00usb_probe+0x155/0xc50 [rt2x00usb] [ 855.437273] rt2800usb_probe+0x15/0x20 [rt2800usb] [ 855.437304] usb_probe_interface+0x159/0x2d0 [ 855.437333] driver_probe_device+0x2bb/0x460
Patch changes initialization sequence to fix the problem.
--- drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/net/wireless/ralink/rt2x00/rt2x00usb.c +8 -5
@@ -824,10 +824,6 @@ int rt2x00usb_probe(struct usb_interfaceif (retval) goto exit_free_device; - retval =rt2x00lib_probe_dev (rt2x00dev); -if (retval) - goto exit_free_reg; - rt2x00dev->anchor =devm_kmalloc (&usb_dev->dev,sizeof (struct usb_anchor ),GFP_KERNEL );
@@ -835,10 +831,17 @@ int rt2x00usb_probe(struct usb_interface retval = -ENOMEM ; goto exit_free_reg; } -init_usb_anchor (rt2x00dev->anchor); + + retval =rt2x00lib_probe_dev (rt2x00dev); +if (retval) + goto exit_free_anchor; +return 0 ; +exit_free_anchor: +usb_kill_anchored_urbs (rt2x00dev->anchor); + exit_free_reg:rt2x00usb_free_reg (rt2x00dev);
Greg Kroah-Hartman
maintainerPATCH 16/31 MIPS: Introduce irq_stack
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matt Redfearn <[email protected]>
commit fe8bd18ffea5327344d4ec2bf11f47951212abd0 upstream.
Allocate a per-cpu irq stack for use within interrupt handlers.
Also add a utility function on_irq_stack to determine if a given stack pointer is within the irq stack for that cpu.
Patchwork: https://patchwork.linux-mips.org/patch/14740/
--- arch/mips/include/asm/irq.h | 12 ++++++++++++ arch/mips/kernel/asm-offsets.c | 1 + arch/mips/kernel/irq.c | 11 +++++++++++ 3 files changed, 24 insertions(+)
arch/mips/include/asm/irq.h +12 -0
@@ -17,6 +17,18 @@#include <irq.h> +#define IRQ_STACK_SIZE THREAD_SIZE + +extern void *irq_stack[NR_CPUS ]; + +static inline bool on_irq_stack (int cpu,unsigned long sp) +{ +unsigned long low = (unsigned long )irq_stack[cpu]; +unsigned long high = low +IRQ_STACK_SIZE ; + +return (low <= sp && sp <= high); +} +#ifdef CONFIG_I8259 static inline int irq_canonicalize (int irq) {
arch/mips/kernel/asm-offsets.c +1 -0
@@ -102,6 +102,7 @@ void output_thread_info_defines(void)OFFSET (TI_REGS , thread_info, regs);DEFINE (_THREAD_SIZE,THREAD_SIZE );DEFINE (_THREAD_MASK,THREAD_MASK ); +DEFINE (_IRQ_STACK_SIZE,IRQ_STACK_SIZE );BLANK (); }
arch/mips/kernel/irq.c +11 -0
@@ -25,6 +25,8 @@#include <linux/atomic.h> #include <asm/uaccess.h> +void *irq_stack[NR_CPUS ]; +/* * 'what should we do if we get a hw irq event on an illegal vector'. * each architecture has to answer this themselves.
@@ -58,6 +60,15 @@ void __init init_IRQ(void)clear_c0_status (ST0_IM );arch_init_irq (); + +for_each_possible_cpu (i) { +int irq_pages =IRQ_STACK_SIZE /PAGE_SIZE ; +void *s = (void *)__get_free_pages (GFP_KERNEL , irq_pages); + + irq_stack[i] = s; +pr_debug ("CPU%d IRQ stack at 0x%p - 0x%p\n" , i, + irq_stack[i], irq_stack[i] +IRQ_STACK_SIZE ); + } }#ifdef CONFIG_DEBUG_STACKOVERFLOW
Greg Kroah-Hartman
maintainerPATCH 18/31 MIPS: Only change $28 to thread_info if coming from user mode
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matt Redfearn <[email protected]>
commit 510d86362a27577f5ee23f46cfb354ad49731e61 upstream.
The SAVE_SOME macro is used to save the execution context on all exceptions.
If an exception occurs while executing user code, the stack is switched to the kernel's stack for the current task, and register $28 is switched to point to the current_thread_info, which is at the bottom of the stack region.
If the exception occurs while executing kernel code, the stack is left, and this change ensures that register $28 is not updated. This is the correct behaviour when the kernel can be executing on the separate irq stack, because the thread_info will not be at the base of it.
With this change, register $28 is only switched to it's kernel conventional usage of the currrent thread info pointer at the point at which execution enters kernel space. Doing it on every exception was redundant, but OK without an IRQ stack, but will be erroneous once that is introduced.
Patchwork: https://patchwork.linux-mips.org/patch/14742/
--- arch/mips/include/asm/stackframe.h | 7 +++++++ 1 file changed, 7 insertions(+)
arch/mips/include/asm/stackframe.h +7 -0
@@ -216,12 +216,19 @@ LONG_S $25, PT_R25(sp) LONG_S $28, PT_R28(sp) LONG_S $31, PT_R31(sp) + + /* Set thread_info if we're coming from user mode */ + mfc0 k0, CP0_STATUS + sll k0, 3 /* extract cu0 bit */ + bltz k0, 9f + ori $28, sp, _THREAD_MASK xori $28, _THREAD_MASK #ifdef CONFIG_CPU_CAVIUM_OCTEON .set mips64 pref 0, 0($28) /* Prefetch the current pointer */ #endif +9: .set pop .endm
Greg Kroah-Hartman
maintainerPATCH 17/31 MIPS: Stack unwinding while on IRQ stack
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matt Redfearn <[email protected]>
commit d42d8d106b0275b027c1e8992c42aecf933436ea upstream.
Within unwind stack, check if the stack pointer being unwound is within the CPU's irq_stack and if so use that page rather than the task's stack page.
Patchwork: https://patchwork.linux-mips.org/patch/14741/
--- arch/mips/kernel/process.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
arch/mips/kernel/process.c +14 -1
@@ -33,6 +33,7 @@#include <asm/dsemul.h> #include <asm/dsp.h> #include <asm/fpu.h> +#include <asm/irq.h> #include <asm/msa.h> #include <asm/pgtable.h> #include <asm/mipsregs.h>
@@ -556,7 +557,19 @@ EXPORT_SYMBOL(unwind_stack_by_address);unsigned long unwind_stack (struct task_struct *task,unsigned long *sp,unsigned long pc,unsigned long *ra) { -unsigned long stack_page = (unsigned long )task_stack_page (task); +unsigned long stack_page =0 ; +int cpu; + +for_each_possible_cpu (cpu) { +if (on_irq_stack (cpu, *sp)) { + stack_page = (unsigned long )irq_stack[cpu]; +break ; + } + } + +if (!stack_page) + stack_page = (unsigned long )task_stack_page (task); +return unwind_stack_by_address (stack_page, sp, pc, ra); }#endif
Greg Kroah-Hartman
maintainerPATCH 25/31 net/packet: fix overflow in check for priv area size
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrey Konovalov <[email protected]>
commit 2b6867c2ce76c596676bec7d2d525af525fdc6e2 upstream.
Subtracting tp_sizeof_priv from tp_block_size and casting to int to check whether one is less then the other doesn't always work (both of them are unsigned ints).
Compare them as is instead.
Also cast tp_sizeof_priv to u64 before using BLK_PLUS_PRIV, as it can overflow inside BLK_PLUS_PRIV otherwise.
--- net/packet/af_packet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/packet/af_packet.c +2 -2
@@ -4235,8 +4235,8 @@ static int packet_set_ring(struct sock *if (unlikely (!PAGE_ALIGNED (req->tp_block_size))) goto out;if (po->tp_version >=TPACKET_V3 && - (int )(req->tp_block_size - -BLK_PLUS_PRIV (req_u->req3.tp_sizeof_priv)) <=0 ) + req->tp_block_size <= +BLK_PLUS_PRIV ((u64 )req_u->req3.tp_sizeof_priv)) goto out;if (unlikely (req->tp_frame_size < po->tp_hdrlen + po->tp_reserve))
Greg Kroah-Hartman
maintainerPATCH 27/31 usb: hub: Wait for connection to be reestablished after port reset
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
commit 22547c4cc4fe20698a6a85a55b8788859134b8e4 upstream.
On a system with a defective USB device connected to an USB hub, an endless sequence of port connect events was observed. The sequence of events as observed is as follows:
- Port reports connected event (port status=USB_PORT_STAT_CONNECTION).
- Event handler debounces port and resets it by calling hub_port_reset().
- hub_port_reset() calls hub_port_wait_reset() to wait for the reset to complete.
- The reset completes, but USB_PORT_STAT_CONNECTION is not immediately set in the port status register.
- hub_port_wait_reset() returns -ENOTCONN.
- Port initialization sequence is aborted.
- A few milliseconds later, the port again reports a connected event, and the sequence repeats.
This continues either forever or, randomly, stops if the connection is already re-established when the port status is read. It results in a high rate of udev events. This in turn destabilizes userspace since the above sequence holds the device mutex pretty much continuously and prevents userspace from actually reading the device status.
To prevent the problem from happening, let's wait for the connection to be re-established after a port reset. If the device was actually disconnected, the code will still return an error, but it will do so only after the long reset timeout.
--- drivers/usb/core/hub.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/usb/core/hub.c +9 -2
@@ -2650,8 +2650,15 @@ static int hub_port_wait_reset(struct usif (ret <0 )return ret; -/* The port state is unknown until the reset completes. */ -if (!(portstatus &USB_PORT_STAT_RESET )) +/* +* The port state is unknown until the reset completes. +* +* On top of that, some chips may require additional time +* to re-establish a connection after the reset is complete, +* so also wait for the connection to be re-established. +*/ +if (!(portstatus &USB_PORT_STAT_RESET ) && + (portstatus &USB_PORT_STAT_CONNECTION ))break ;/* switch to the long delay after two short delay failures */
Greg Kroah-Hartman
maintainerPATCH 28/31 net/mlx4_en: Fix bad WQE issue
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eugenia Emantayev <[email protected]>
commit 6496bbf0ec481966ef9ffe5b6660d8d1b55c60cc upstream.
Single send WQE in RX buffer should be stamped with software ownership in order to prevent the flow of QP in error in FW once UPDATE_QP is called.
--- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx4/en_rx.c +7 -1
@@ -444,8 +444,14 @@ int mlx4_en_activate_rx_rings(struct mlx ring->cqn = priv->rx_cq[ring_ind]->mcq.cqn; ring->stride = stride; -if (ring->stride <=TXBB_SIZE ) +if (ring->stride <=TXBB_SIZE ) { +/* Stamp first unused send wqe */ +__be32 *ptr = (__be32 *)ring->buf; +__be32 stamp =cpu_to_be32 (1 <<STAMP_SHIFT ); + *ptr = stamp; +/* Move pointer to start of rx section */ ring->buf +=TXBB_SIZE ; + } ring->log_stride =ffs (ring->stride) -1 ; ring->buf_size = ring->size * ring->stride;
Greg Kroah-Hartman
maintainerPATCH 29/31 net/mlx4_core: Fix racy CQ (Completion Queue) free
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jack Morgenstein <[email protected]>
commit 291c566a28910614ce42d0ffe82196eddd6346f4 upstream.
In function mlx4_cq_completion() and mlx4_cq_event(), the radix_tree_lookup requires a rcu_read_lock.
This is mandatory: if another core frees the CQ, it could run the radix_tree_node_rcu_free() call_rcu() callback while its being used by the radix tree lookup function.
Additionally, in function mlx4_cq_event(), since we are adding the rcu lock around the radix-tree lookup, we no longer need to take the spinlock. Also, the synchronize_irq() call for the async event eliminates the need for incrementing the cq reference count in mlx4_cq_event().
Other changes:
1. In function mlx4_cq_free(), replace spin_lock_irq with spin_lock:
we no longer take this spinlock in the interrupt context. The spinlock here, therefore, simply protects against different threads simultaneously invoking mlx4_cq_free() for different cq's.
2. In function mlx4_cq_free(), we move the radix tree delete to before the synchronize_irq() calls. This guarantees that we will not access this cq during any subsequent interrupts, and therefore can safely free the CQ after the synchronize_irq calls. The rcu_read_lock in the interrupt handlers only needs to protect against corrupting the radix tree; the interrupt handlers may access the cq outside the rcu_read_lock due to the synchronize_irq calls which protect against premature freeing of the cq.
3. In function mlx4_cq_event(), we change the mlx_warn message to mlx4_dbg.
4. We leave the cq reference count mechanism in place, because it is still needed for the cq completion tasklet mechanism.
--- drivers/net/ethernet/mellanox/mlx4/cq.c | 38 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 18 deletions(-)
drivers/net/ethernet/mellanox/mlx4/cq.c +20 -18
@@ -101,13 +101,19 @@ void mlx4_cq_completion(struct mlx4_dev {struct mlx4_cq *cq; +rcu_read_lock (); cq =radix_tree_lookup (&mlx4_priv (dev)->cq_table.tree, cqn & (dev->caps.num_cqs -1 )); +rcu_read_unlock (); +if (!cq) {mlx4_dbg (dev,"Completion event for bogus CQ %08x\n" , cqn);return ; } +/* Acessing the CQ outside of rcu_read_lock is safe, because +* the CQ is freed only after interrupt handling is completed. +*/ ++cq->arm_sn; cq->comp (cq);
@@ -118,23 +124,19 @@ void mlx4_cq_event(struct mlx4_dev *dev,struct mlx4_cq_table *cq_table = &mlx4_priv (dev)->cq_table;struct mlx4_cq *cq; -spin_lock (&cq_table->lock); - +rcu_read_lock (); cq =radix_tree_lookup (&cq_table->tree, cqn & (dev->caps.num_cqs -1 )); -if (cq) -atomic_inc (&cq->refcount); - -spin_unlock (&cq_table->lock); +rcu_read_unlock ();if (!cq) { -mlx4_warn (dev,"Async event for bogus CQ %08x\n" , cqn); +mlx4_dbg (dev,"Async event for bogus CQ %08x\n" , cqn);return ; } +/* Acessing the CQ outside of rcu_read_lock is safe, because +* the CQ is freed only after interrupt handling is completed. +*/ cq->event (cq, event_type); - -if (atomic_dec_and_test (&cq->refcount)) -complete (&cq->free); } static int mlx4_SW2HW_CQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
@@ -301,9 +303,9 @@ int mlx4_cq_alloc(struct mlx4_dev *dev,if (err)return err; -spin_lock_irq (&cq_table->lock); +spin_lock (&cq_table->lock); err =radix_tree_insert (&cq_table->tree, cq->cqn, cq); -spin_unlock_irq (&cq_table->lock); +spin_unlock (&cq_table->lock);if (err) goto err_icm;
@@ -349,9 +351,9 @@ int mlx4_cq_alloc(struct mlx4_dev *dev,return 0 ; err_radix: -spin_lock_irq (&cq_table->lock); +spin_lock (&cq_table->lock);radix_tree_delete (&cq_table->tree, cq->cqn); -spin_unlock_irq (&cq_table->lock); +spin_unlock (&cq_table->lock); err_icm:mlx4_cq_free_icm (dev, cq->cqn);
@@ -370,15 +372,15 @@ void mlx4_cq_free(struct mlx4_dev *dev,if (err)mlx4_warn (dev,"HW2SW_CQ failed (%d) for CQN %06x\n" , err, cq->cqn); +spin_lock (&cq_table->lock); +radix_tree_delete (&cq_table->tree, cq->cqn); +spin_unlock (&cq_table->lock); +synchronize_irq (priv->eq_table.eq[MLX4_CQ_TO_EQ_VECTOR (cq->vector)].irq);if (priv->eq_table.eq[MLX4_CQ_TO_EQ_VECTOR (cq->vector)].irq != priv->eq_table.eq[MLX4_EQ_ASYNC ].irq)synchronize_irq (priv->eq_table.eq[MLX4_EQ_ASYNC ].irq); -spin_lock_irq (&cq_table->lock); -radix_tree_delete (&cq_table->tree, cq->cqn); -spin_unlock_irq (&cq_table->lock); -if (atomic_dec_and_test (&cq->refcount))complete (&cq->free);wait_for_completion (&cq->free);
Greg Kroah-Hartman
maintainerPATCH 30/31 net/mlx4_core: Fix when to save some qp context flags for dynamic VST to VGT transitions
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jack Morgenstein <[email protected]>
commit 7c3945bc2073554bb2ecf983e073dee686679c53 upstream.
Save the qp context flags byte containing the flag disabling vlan stripping in the RESET to INIT qp transition, rather than in the INIT to RTR transition. Per the firmware spec, the flags in this byte are active in the RESET to INIT transition.
As a result of saving the flags in the incorrect qp transition, when switching dynamically from VGT to VST and back to VGT, the vlan remained stripped (as is required for VST) and did not return to not-stripped (as is required for VGT).
--- drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +3 -2
@@ -2980,6 +2980,9 @@ int mlx4_RST2INIT_QP_wrapper(struct mlx4put_res (dev, slave, srqn,RES_SRQ ); qp->srq = srq; } + +/* Save param3 for dynamic changes from VST back to VGT */ + qp->param3 = qpc->param3;put_res (dev, slave, rcqn,RES_CQ );put_res (dev, slave, mtt_base,RES_MTT );res_end_move (dev, slave,RES_QP , qpn);
@@ -3772,7 +3775,6 @@ int mlx4_INIT2RTR_QP_wrapper(struct mlx4int qpn = vhcr->in_modifier &0x7fffff ;struct res_qp *qp;u8 orig_sched_queue; -__be32 orig_param3 = qpc->param3;u8 orig_vlan_control = qpc->pri_path.vlan_control;u8 orig_fvl_rx = qpc->pri_path.fvl_rx;u8 orig_pri_path_fl = qpc->pri_path.fl;
@@ -3814,7 +3816,6 @@ out:*/ if (!err) { qp->sched_queue = orig_sched_queue; - qp->param3 = orig_param3; qp->vlan_control = orig_vlan_control; qp->fvl_rx = orig_fvl_rx; qp->pri_path_fl = orig_pri_path_fl;
Greg Kroah-Hartman
maintainerPATCH 5/31 drm/i915: Drop support for I915_EXEC_CONSTANTS_* execbuf parameters.
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kenneth Graunke <[email protected]>
commit 0f5418e564ac6452b9086295646e602a9addc4bf upstream.
This patch makes the I915_PARAM_HAS_EXEC_CONSTANTS getparam return 0 (indicating the optional feature is not supported), and makes execbuf always return -EINVAL if the flags are used.
Apparently, no userspace ever shipped which used this optional feature:
I checked the git history of Mesa, xf86-video-intel, libva, and Beignet, and there were zero commits showing a use of these flags. Kernel commit 72bfa19c8deb4 apparently introduced the feature prematurely. According to Chris, the intention was to use this in cairo-drm, but "the use was broken for gen6", so I don't think it ever happened.
'relative_constants_mode' has always been tracked per-device, but this has actually been wrong ever since hardware contexts were introduced, as the INSTPM register is saved (and automatically restored) as part of the render ring context. The software per-device value could therefore get out of sync with the hardware per-context value. This meant that using them is actually unsafe: a client which tried to use them could damage the state of other clients, causing the GPU to interpret their BO offsets as absolute pointers, leading to bogus memory reads.
These flags were also never ported to execlist mode, making them no-ops on Gen9+ (which requires execlists), and Gen8 in the default mode.
On Gen8+, userspace can write these registers directly, achieving the same effect. On Gen6-7.5, it likely makes sense to extend the command parser to support them. I don't think anyone wants this on Gen4-5.
Based on a patch by Dave Gordon.
v3: Return -ENODEV for the getparam, as this is what we do for other
obsolete features. Suggested by Chris Wilson.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92448
--- drivers/gpu/drm/i915/i915_drv.c | 4 -- drivers/gpu/drm/i915/i915_drv.h | 2 - drivers/gpu/drm/i915/i915_gem.c | 2 - drivers/gpu/drm/i915/i915_gem_execbuffer.c | 52 +---------------------------- 4 files changed, 3 insertions(+), 57 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +1 -3
@@ -240,6 +240,7 @@ static int i915_getparam(struct drm_devicase I915_PARAM_IRQ_ACTIVE :case I915_PARAM_ALLOW_BATCHBUFFER :case I915_PARAM_LAST_DISPATCH : +case I915_PARAM_HAS_EXEC_CONSTANTS :/* Reject all old ums/dri params. */ return -ENODEV ;case I915_PARAM_CHIPSET_ID :
@@ -266,9 +267,6 @@ static int i915_getparam(struct drm_devicase I915_PARAM_HAS_BSD2 : value =intel_engine_initialized (&dev_priv->engine[VCS2 ]);break ; -case I915_PARAM_HAS_EXEC_CONSTANTS : - value =INTEL_GEN (dev_priv) >=4 ; -break ;case I915_PARAM_HAS_LLC : value =HAS_LLC (dev_priv);break ;
drivers/gpu/drm/i915/i915_drv.h +0 -2
@@ -1751,8 +1751,6 @@ struct drm_i915_private {const struct intel_device_info info; -int relative_constants_mode; -void __iomem *regs;struct intel_uncore uncore;
drivers/gpu/drm/i915/i915_gem.c +0 -2
@@ -4587,8 +4587,6 @@ i915_gem_load_init(struct drm_device *deinit_waitqueue_head (&dev_priv->gpu_error.wait_queue);init_waitqueue_head (&dev_priv->gpu_error.reset_queue); - dev_priv->relative_constants_mode =I915_EXEC_CONSTANTS_REL_GENERAL ; -init_waitqueue_head (&dev_priv->pending_flip_queue); dev_priv->mm.interruptible = true;
drivers/gpu/drm/i915/i915_gem_execbuffer.c +2 -50
68 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 8/31 orangefs: fix memory leak of string new on exit path
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Colin Ian King <[email protected]>
commit 4defb5f912a0ba60e07e91a4b62634814cd99b7f upstream.
allocates string 'new' is not free'd on the exit path when cdm_element_count <= 0. Fix this by kfree'ing it.
Fixes CoverityScan CID#1375923 "Resource Leak"
--- fs/orangefs/orangefs-debugfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/orangefs/orangefs-debugfs.c +3 -1
@@ -671,8 +671,10 @@ int orangefs_prepare_debugfs_help_string*/ cdm_element_count =orangefs_prepare_cdm_array (client_debug_array_string); -if (cdm_element_count <=0 ) +if (cdm_element_count <=0 ) { +kfree (new); goto out; + }for (i =0 ; i < cdm_element_count; i++) {strlcat (new,"\t" , string_size);
Greg Kroah-Hartman
maintainerPATCH 9/31 orangefs: Dan Carpenter influenced cleanups...
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Marshall <[email protected]>
commit 05973c2efb40122f2a9ecde2d065f7ea5068d024 upstream.
This patch is simlar to one Dan Carpenter sent me, cleans up some return codes and whitespace errors. There was one place where he thought inserting an error message into the ring buffer might be too chatty, I hope I convinced him othewise. As a consolation <g> I changed a truly chatty error message in another location into a debug message, system-admins had already yelled at me about that one...
--- fs/orangefs/devorangefs-req.c | 5 +++-- fs/orangefs/orangefs-debugfs.c | 15 ++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-)
fs/orangefs/devorangefs-req.c +3 -2
@@ -402,8 +402,9 @@ static ssize_t orangefs_devreq_write_ite/* remove the op from the in progress hash table */ op =orangefs_devreq_remove_op (head.tag);if (!op) { -gossip_err ("WARNING: No one's waiting for tag %llu\n" , -llu (head.tag)); +gossip_debug (GOSSIP_DEV_DEBUG , +"%s: No one's waiting for tag %llu\n" , + __func__,llu (head.tag));return ret; }
fs/orangefs/orangefs-debugfs.c +8 -7
@@ -965,13 +965,13 @@ int orangefs_debugfs_new_client_string(vint ret; ret =copy_from_user (&client_debug_array_string, - (void __user *)arg, -ORANGEFS_MAX_DEBUG_STRING_LEN ); + (void __user *)arg, +ORANGEFS_MAX_DEBUG_STRING_LEN );if (ret !=0 ) {pr_info ("%s: CLIENT_STRING: copy_from_user failed\n" , __func__); -return -EIO ; +return -EFAULT ; }/*
@@ -986,17 +986,18 @@ int orangefs_debugfs_new_client_string(v*/ client_debug_array_string[ORANGEFS_MAX_DEBUG_STRING_LEN -1 ] ='\0' ; - +pr_info ("%s: client debug array string has been received.\n" , __func__);if (!help_string_initialized) {/* Build a proper debug help string. */ -if (orangefs_prepare_debugfs_help_string (0 )) { + ret =orangefs_prepare_debugfs_help_string (0 ); +if (ret) {gossip_err ("%s: no debug help string \n" , __func__); -return -EIO ; +return ret; } }
@@ -1009,7 +1010,7 @@ int orangefs_debugfs_new_client_string(v help_string_initialized++; -return ret; +return 0 ; }int orangefs_debugfs_new_debug (void __user *arg)
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.23 release. There are 31 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 Tue Apr 18 08:02:08 UTC 2017. Anything received after that time might be too late.
Build results:
total: 149 pass: 149 fail: 0 Qemu test results: total: 122 pass: 122 fail: 0
Details are available at http://kerneltests.org/builders.
Guenter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.23 release. There are 31 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 Tue Apr 18 08:02:08 UTC 2017. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.23-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.9.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah