Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2019-09-06 21:02:30 -07:00
4 changed files with 10 additions and 90 deletions

View File

@@ -3,26 +3,26 @@
ABT_DETAILS="x86_64"
ABT_JOBS=5
ABT_KERNELS=" \
5.2.9 \
5.2.13 \
5.1.21-nc \
5.0.21-nc \
4.20.17-nc \
4.19.68-nc \
4.19.71-nc \
4.18.20-nc \
4.17.19-nc \
4.16.18-nc \
4.15.18-nc \
4.14.140-nc \
4.14.142-nc \
4.13.16-nc \
4.12.14-nc \
4.11.12-nc \
4.10.17-nc \
4.9.190-nc \
4.9.191-nc \
4.8.17-nc \
4.7.10-nc \
4.6.7-nc \
4.5.7-nc \
4.4.190-nc \
4.4.191-nc \
4.3.6-nc \
4.2.8-nc \
4.1.52-nc \

View File

@@ -19,86 +19,4 @@ the previous version of the SCST QLogic target driver are:
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2281) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2089) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2289) },
- Works in combination with Linux kernel v2.6.32 and later.
Known Bugs
----------
When using the RHEL 6 debug kernel, a recursive locking complaint is reported
when loading this driver with qlini_mode=dual:
=============================================
[ INFO: possible recursive locking detected ]
2.6.32-754.11.1.el6.x86_64.debug #1
---------------------------------------------
qla2xxx_wq/0/3557 is trying to acquire lock:
((fmt)){+.+.+.}, at: [<ffffffff810ab9ed>] flush_work+0x3d/0x120
but task is already holding lock:
((fmt)){+.+.+.}, at: [<ffffffff810ab29b>] worker_thread+0x1cb/0x3f0
other info that might help us debug this:
2 locks held by qla2xxx_wq/0/3557:
#0: ((fmt)){+.+.+.}, at: [<ffffffff810ab29b>] worker_thread+0x1cb/0x3f0
#1: (&base_vha->iocb_work){+.+.+.}, at: [<ffffffff810ab29b>] worker_thread+0x1cb/0x3f0
stack backtrace:
Pid: 3557, comm: qla2xxx_wq/0 Not tainted 2.6.32-754.11.1.el6.x86_64.debug #1
Call Trace:
[<ffffffff810ce620>] ? __lock_acquire+0x11b0/0x1560
[<ffffffff810145e9>] ? sched_clock+0x9/0x10
[<ffffffff810145e9>] ? sched_clock+0x9/0x10
[<ffffffff810cea74>] ? lock_acquire+0xa4/0x130
[<ffffffff810ab9ed>] ? flush_work+0x3d/0x120
[<ffffffff8106b753>] ? __wake_up+0x53/0x70
[<ffffffff810aba19>] ? flush_work+0x69/0x120
[<ffffffff810ab9ed>] ? flush_work+0x3d/0x120
[<ffffffff810ba468>] ? sched_clock_cpu+0xb8/0x110
[<ffffffff810cc963>] ? mark_held_locks+0x73/0xa0
[<ffffffff81593640>] ? _spin_unlock_irqrestore+0x40/0x80
[<ffffffff810ccc6d>] ? trace_hardirqs_on_caller+0x14d/0x190
[<ffffffff810cccbd>] ? trace_hardirqs_on+0xd/0x10
[<ffffffffa0712708>] ? qla24xx_do_nack_work+0x68/0x120 [qla2xxx_scst]
[<ffffffffa0696f5b>] ? qla2x00_do_work+0x53b/0xba0 [qla2xxx_scst]
[<ffffffff810145e9>] ? sched_clock+0x9/0x10
[<ffffffff810ba345>] ? sched_clock_local+0x25/0x90
[<ffffffffa0697614>] ? qla2x00_iocb_work_fn+0x54/0xa0 [qla2xxx_scst]
[<ffffffffa06975c0>] ? qla2x00_iocb_work_fn+0x0/0xa0 [qla2xxx_scst]
[<ffffffff810ab2ee>] ? worker_thread+0x21e/0x3f0
[<ffffffff810ab29b>] ? worker_thread+0x1cb/0x3f0
[<ffffffff810b29b0>] ? autoremove_wake_function+0x0/0x40
[<ffffffff810ab0d0>] ? worker_thread+0x0/0x3f0
[<ffffffff810b2520>] ? kthread+0xa0/0xc0
[<ffffffff8159cc60>] ? child_rip+0x20/0x30
[<ffffffff8159c459>] ? retint_restore_args+0x13/0x43
[<ffffffff810b2480>] ? kthread+0x0/0xc0
[<ffffffff8159cc40>] ? child_rip+0x0/0x30
When using RHEL 6 unloading this driver triggers a deadlock:
INFO: task events/0:35 blocked for more than 120 seconds.
Not tainted 2.6.32-754.11.1.el6.x86_64.debug #1
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
events/0 D ffff880077e24408 12408 35 2 0x00000000
ffff88007e02fa60 0000000000000046 0000000000000000 7fffffffffffffff
7fffffffffffffff 00000365a5588f80 ffff88007e028a80 ffff88000d7d93d8
0000000100346a5e 00000000000003c8 ffff88007e029040 ffff88007e02ffd8
Call Trace:
[<ffffffff8158f775>] schedule_timeout+0x265/0x330
[<ffffffff8158f29f>] ? wait_for_common+0x4f/0x180
[<ffffffff8158f29f>] ? wait_for_common+0x4f/0x180
[<ffffffff810737a0>] ? default_wake_function+0x0/0x20
[<ffffffff8158f37b>] wait_for_common+0x12b/0x180
[<ffffffff810737a0>] ? default_wake_function+0x0/0x20
[<ffffffff8158f4ad>] wait_for_completion+0x1d/0x20
[<ffffffffa0714946>] ? qlt_free_session_done+0x1d6/0x930 [qla2xxx_scst]
[<ffffffffa0714770>] ? qlt_free_session_done+0x0/0x930 [qla2xxx_scst]
[<ffffffff810ab2ee>] ? worker_thread+0x21e/0x3f0
[<ffffffff810ab29b>] ? worker_thread+0x1cb/0x3f0
[<ffffffff810b29b0>] ? autoremove_wake_function+0x0/0x40
[<ffffffff810ab0d0>] ? worker_thread+0x0/0x3f0
[<ffffffff810b2520>] ? kthread+0xa0/0xc0
[<ffffffff8159cc60>] ? child_rip+0x20/0x30
[<ffffffff8159c459>] ? retint_restore_args+0x13/0x43
[<ffffffff810b2480>] ? kthread+0x0/0xc0
[<ffffffff8159cc40>] ? child_rip+0x0/0x30
- Works in combination with Linux kernel v3.15 and later.

View File

@@ -848,7 +848,9 @@ static inline void mempool_destroy_backport(mempool_t *pool)
/* <linux/mm.h> */
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) && \
(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 7)
(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 7 || \
(RHEL_MAJOR -0 == 7 && RHEL_MINOR -0 < 5)) && \
!defined(_COMPAT_LINUX_MM_H)
/* See also commit a7c3e901a46f ("mm: introduce kv[mz]alloc helpers") # v4.12 */
static inline void *kvmalloc_node(size_t size, gfp_t flags, int node)
{

View File

@@ -5972,7 +5972,7 @@ defined(CONFIG_SUSE_KERNEL) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) || \
defined(CONFIG_SUSE_KERNEL) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
bio->bi_opf |= REQ_META;
bio->bi_opf |= REQ_PRIO;
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) || \
(defined(RHEL_MAJOR) && \
(RHEL_MAJOR -0 > 6 || RHEL_MAJOR -0 == 6 && RHEL_MINOR -0 > 0))