From: Greg Kroah-Hartman Date: Thu, 18 May 2017 05:20:04 +0000 (+0200) Subject: delete a bunch of broken IB patches X-Git-Tag: v3.18.54~21 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fbe1106ed50b55fce67b1404d53030526a57f1d;p=thirdparty%2Fkernel%2Fstable-queue.git delete a bunch of broken IB patches --- diff --git a/queue-3.18/ib-core-for-multicast-functions-verify-that-lids-are-multicast-lids.patch b/queue-3.18/ib-core-for-multicast-functions-verify-that-lids-are-multicast-lids.patch deleted file mode 100644 index 6fea1bbb999..00000000000 --- a/queue-3.18/ib-core-for-multicast-functions-verify-that-lids-are-multicast-lids.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 8561eae60ff9417a50fa1fb2b83ae950dc5c1e21 Mon Sep 17 00:00:00 2001 -From: "Michael J. Ruhl" -Date: Sun, 9 Apr 2017 10:15:51 -0700 -Subject: IB/core: For multicast functions, verify that LIDs are multicast LIDs - -From: Michael J. Ruhl - -commit 8561eae60ff9417a50fa1fb2b83ae950dc5c1e21 upstream. - -The Infiniband spec defines "A multicast address is defined by a -MGID and a MLID" (section 10.5). Currently the MLID value is not -validated. - -Add check to verify that the MLID value is in the correct address -range. - -Fixes: 0c33aeedb2cf ("[IB] Add checks to multicast attach and detach") -Reviewed-by: Ira Weiny -Reviewed-by: Dasaratharaman Chandramouli -Signed-off-by: Michael J. Ruhl -Signed-off-by: Dennis Dalessandro -Reviewed-by: Leon Romanovsky -Signed-off-by: Doug Ledford -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/infiniband/core/verbs.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - ---- a/drivers/infiniband/core/verbs.c -+++ b/drivers/infiniband/core/verbs.c -@@ -1346,7 +1346,9 @@ int ib_attach_mcast(struct ib_qp *qp, un - - if (!qp->device->attach_mcast) - return -ENOSYS; -- if (gid->raw[0] != 0xff || qp->qp_type != IB_QPT_UD) -+ if (gid->raw[0] != 0xff || qp->qp_type != IB_QPT_UD || -+ lid < be16_to_cpu(IB_MULTICAST_LID_BASE) || -+ lid == be16_to_cpu(IB_LID_PERMISSIVE)) - return -EINVAL; - - ret = qp->device->attach_mcast(qp, gid, lid); -@@ -1362,7 +1364,9 @@ int ib_detach_mcast(struct ib_qp *qp, un - - if (!qp->device->detach_mcast) - return -ENOSYS; -- if (gid->raw[0] != 0xff || qp->qp_type != IB_QPT_UD) -+ if (gid->raw[0] != 0xff || qp->qp_type != IB_QPT_UD || -+ lid < be16_to_cpu(IB_MULTICAST_LID_BASE) || -+ lid == be16_to_cpu(IB_LID_PERMISSIVE)) - return -EINVAL; - - ret = qp->device->detach_mcast(qp, gid, lid); diff --git a/queue-3.18/ib-mlx4-reduce-sriov-multicast-cleanup-warning-message-to-debug-level.patch b/queue-3.18/ib-mlx4-reduce-sriov-multicast-cleanup-warning-message-to-debug-level.patch deleted file mode 100644 index 4a87f229a56..00000000000 --- a/queue-3.18/ib-mlx4-reduce-sriov-multicast-cleanup-warning-message-to-debug-level.patch +++ /dev/null @@ -1,97 +0,0 @@ -From fb7a91746af18b2ebf596778b38a709cdbc488d3 Mon Sep 17 00:00:00 2001 -From: Jack Morgenstein -Date: Tue, 21 Mar 2017 12:57:06 +0200 -Subject: IB/mlx4: Reduce SRIOV multicast cleanup warning message to debug level - -From: Jack Morgenstein - -commit fb7a91746af18b2ebf596778b38a709cdbc488d3 upstream. - -A warning message during SRIOV multicast cleanup should have actually been -a debug level message. The condition generating the warning does no harm -and can fill the message log. - -In some cases, during testing, some tests were so intense as to swamp the -message log with these warning messages, causing a stall in the console -message log output task. This stall caused an NMI to be sent to all CPUs -(so that they all dumped their stacks into the message log). -Aside from the message flood causing an NMI, the tests all passed. - -Once the message flood which caused the NMI is removed (by reducing the -warning message to debug level), the NMI no longer occurs. - -Sample message log (console log) output illustrating the flood and -resultant NMI (snippets with comments and modified with ... instead -of hex digits, to satisfy checkpatch.pl): - - _mlx4_ib_mcg_port_cleanup: ... WARNING: group refcount 1!!!... - *** About 4000 almost identical lines in less than one second *** - _mlx4_ib_mcg_port_cleanup: ... WARNING: group refcount 1!!!... - INFO: rcu_sched detected stalls on CPUs/tasks: { 17} (...) - *** { 17} above indicates that CPU 17 was the one that stalled *** - sending NMI to all CPUs: - ... - NMI backtrace for cpu 17 - CPU: 17 PID: 45909 Comm: kworker/17:2 - Hardware name: HP ProLiant DL360p Gen8, BIOS P71 09/08/2013 - Workqueue: events fb_flashcursor - task: ffff880478...... ti: ffff88064e...... task.ti: ffff88064e...... - RIP: 0010:[ffffffff81......] [ffffffff81......] io_serial_in+0x15/0x20 - RSP: 0018:ffff88064e257cb0 EFLAGS: 00000002 - RAX: 0000000000...... RBX: ffffffff81...... RCX: 0000000000...... - RDX: 0000000000...... RSI: 0000000000...... RDI: ffffffff81...... - RBP: ffff88064e...... R08: ffffffff81...... R09: 0000000000...... - R10: 0000000000...... R11: ffff88064e...... R12: 0000000000...... - R13: 0000000000...... R14: ffffffff81...... R15: 0000000000...... - FS: 0000000000......(0000) GS:ffff8804af......(0000) knlGS:000000000000 - CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080...... - CR2: 00007f2a2f...... CR3: 0000000001...... CR4: 0000000000...... - DR0: 0000000000...... DR1: 0000000000...... DR2: 0000000000...... - DR3: 0000000000...... DR6: 00000000ff...... DR7: 0000000000...... - Stack: - ffff88064e...... ffffffff81...... ffffffff81...... 0000000000...... - ffffffff81...... ffff88064e...... ffffffff81...... ffffffff81...... - ffffffff81...... ffff88064e...... ffffffff81...... 0000000000...... - Call Trace: -[] wait_for_xmitr+0x3b/0xa0 -[] serial8250_console_putchar+0x1c/0x30 -[] ? serial8250_console_write+0x140/0x140 -[] uart_console_write+0x3a/0x80 -[] serial8250_console_write+0xae/0x140 -[] call_console_drivers.constprop.15+0x91/0xf0 -[] console_unlock+0x3bf/0x400 -[] fb_flashcursor+0x5d/0x140 -[] ? bit_clear+0x120/0x120 -[] process_one_work+0x17b/0x470 -[] worker_thread+0x11b/0x400 -[] ? rescuer_thread+0x400/0x400 -[] kthread+0xcf/0xe0 -[] ? kthread_create_on_node+0x140/0x140 -[] ret_from_fork+0x58/0x90 -[] ? kthread_create_on_node+0x140/0x140 -Code: 48 89 e5 d3 e6 48 63 f6 48 03 77 10 8b 06 5d c3 66 0f 1f 44 00 00 66 66 66 6 - -As indicated in the stack trace above, the console output task got swamped. - -Fixes: b9c5d6a64358 ("IB/mlx4: Add multicast group (MCG) paravirtualization for SR-IOV") -Signed-off-by: Jack Morgenstein -Signed-off-by: Leon Romanovsky -Signed-off-by: Doug Ledford -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/infiniband/hw/mlx4/mcg.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/infiniband/hw/mlx4/mcg.c -+++ b/drivers/infiniband/hw/mlx4/mcg.c -@@ -1100,7 +1100,8 @@ static void _mlx4_ib_mcg_port_cleanup(st - while ((p = rb_first(&ctx->mcg_table)) != NULL) { - group = rb_entry(p, struct mcast_group, node); - if (atomic_read(&group->refcount)) -- mcg_warn_group(group, "group refcount %d!!! (pointer %p)\n", atomic_read(&group->refcount), group); -+ mcg_debug_group(group, "group refcount %d!!! (pointer %p)\n", -+ atomic_read(&group->refcount), group); - - force_clean_group(group); - } diff --git a/queue-3.18/series b/queue-3.18/series index 5b2c9e8feba..bfdd0e58717 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -13,10 +13,8 @@ usb-misc-legousbtower-fix-buffers-on-stack.patch x86-boot-fix-bss-corruption-overwrite-bug-in-early-x86-kernel-startup.patch um-fix-ptrace_pokeuser-on-x86_64.patch dm-era-save-spacemap-metadata-root-after-the-pre-commit.patch -ib-core-for-multicast-functions-verify-that-lids-are-multicast-lids.patch ib-ipoib-ibx-failed-to-create-mcg-debug-file.patch ib-mlx4-fix-ib-device-initialization-error-flow.patch -ib-mlx4-reduce-sriov-multicast-cleanup-warning-message-to-debug-level.patch fs-xattr.c-zero-out-memory-copied-to-userspace-in-getxattr.patch ceph-fix-memory-leak-in-__ceph_setxattr.patch fs-block_dev-always-invalidate-cleancache-in-invalidate_bdev.patch diff --git a/queue-4.4/ib-core-for-multicast-functions-verify-that-lids-are-multicast-lids.patch b/queue-4.4/ib-core-for-multicast-functions-verify-that-lids-are-multicast-lids.patch deleted file mode 100644 index 7acb028be3d..00000000000 --- a/queue-4.4/ib-core-for-multicast-functions-verify-that-lids-are-multicast-lids.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 8561eae60ff9417a50fa1fb2b83ae950dc5c1e21 Mon Sep 17 00:00:00 2001 -From: "Michael J. Ruhl" -Date: Sun, 9 Apr 2017 10:15:51 -0700 -Subject: IB/core: For multicast functions, verify that LIDs are multicast LIDs - -From: Michael J. Ruhl - -commit 8561eae60ff9417a50fa1fb2b83ae950dc5c1e21 upstream. - -The Infiniband spec defines "A multicast address is defined by a -MGID and a MLID" (section 10.5). Currently the MLID value is not -validated. - -Add check to verify that the MLID value is in the correct address -range. - -Fixes: 0c33aeedb2cf ("[IB] Add checks to multicast attach and detach") -Reviewed-by: Ira Weiny -Reviewed-by: Dasaratharaman Chandramouli -Signed-off-by: Michael J. Ruhl -Signed-off-by: Dennis Dalessandro -Reviewed-by: Leon Romanovsky -Signed-off-by: Doug Ledford -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/infiniband/core/verbs.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - ---- a/drivers/infiniband/core/verbs.c -+++ b/drivers/infiniband/core/verbs.c -@@ -1372,7 +1372,9 @@ int ib_attach_mcast(struct ib_qp *qp, un - - if (!qp->device->attach_mcast) - return -ENOSYS; -- if (gid->raw[0] != 0xff || qp->qp_type != IB_QPT_UD) -+ if (gid->raw[0] != 0xff || qp->qp_type != IB_QPT_UD || -+ lid < be16_to_cpu(IB_MULTICAST_LID_BASE) || -+ lid == be16_to_cpu(IB_LID_PERMISSIVE)) - return -EINVAL; - - ret = qp->device->attach_mcast(qp, gid, lid); -@@ -1388,7 +1390,9 @@ int ib_detach_mcast(struct ib_qp *qp, un - - if (!qp->device->detach_mcast) - return -ENOSYS; -- if (gid->raw[0] != 0xff || qp->qp_type != IB_QPT_UD) -+ if (gid->raw[0] != 0xff || qp->qp_type != IB_QPT_UD || -+ lid < be16_to_cpu(IB_MULTICAST_LID_BASE) || -+ lid == be16_to_cpu(IB_LID_PERMISSIVE)) - return -EINVAL; - - ret = qp->device->detach_mcast(qp, gid, lid); diff --git a/queue-4.4/series b/queue-4.4/series index 9640eda0fdf..97ab1edf7c1 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -27,7 +27,6 @@ crypto-algif_aead-require-setkey-before-accept-2.patch dm-era-save-spacemap-metadata-root-after-the-pre-commit.patch vfio-type1-remove-locked-page-accounting-workqueue.patch ib-core-fix-sysfs-registration-error-flow.patch -ib-core-for-multicast-functions-verify-that-lids-are-multicast-lids.patch ib-ipoib-ibx-failed-to-create-mcg-debug-file.patch ib-mlx4-fix-ib-device-initialization-error-flow.patch ib-mlx4-reduce-sriov-multicast-cleanup-warning-message-to-debug-level.patch