From dcf0c1bf719c4ac39449aa79395a8068740dd582 Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Wed, 12 Jun 2013 10:25:37 -0700 Subject: [PATCH] LU-3461 kernel: Kernel update [RHEL6.4 2.6.32-358.11.1.el6] Update RHEL6.4 kernel to 2.6.32-358.11.1.el6 Signed-off-by: Bob Glossman Change-Id: I08cbc8ab56f41e6de68ab7cfb8dec65ec56c398e Reviewed-on: http://review.whamcloud.com/6615 Tested-by: Hudson Reviewed-by: James Simmons Tested-by: Maloo Reviewed-by: Lai Siyao Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 4 +-- .../kernel_patches/patches/ipoib-locking-fix.patch | 40 ---------------------- lustre/kernel_patches/series/2.6-rhel6.series | 1 - lustre/kernel_patches/targets/2.6-rhel6.target.in | 2 +- lustre/kernel_patches/which_patch | 4 +-- 5 files changed, 5 insertions(+), 46 deletions(-) delete mode 100644 lustre/kernel_patches/patches/ipoib-locking-fix.patch diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 23fdb46..2046607 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -2,9 +2,9 @@ TBD Intel Corporation * version 2.5.0 * See http://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix * Server support for kernels: - 2.6.32-358.6.2.el6 (RHEL6) + 2.6.32-358.11.1.el6 (RHEL6) * Client support for unpatched kernels: - 2.6.32-358.6.2.el6 (RHEL6) + 2.6.32-358.11.1.el6 (RHEL6) 2.6.27.19-5 (SLES11) 2.6.18-348.3.1.el5 (RHEL5) 2.6.16.60-0.69.1 (SLES10) diff --git a/lustre/kernel_patches/patches/ipoib-locking-fix.patch b/lustre/kernel_patches/patches/ipoib-locking-fix.patch deleted file mode 100644 index 891ce56..0000000 --- a/lustre/kernel_patches/patches/ipoib-locking-fix.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit fa16ebed31f336e41970f3f0ea9e8279f6be2d27 -Author: Shlomo Pongratz -Date: Mon Aug 13 14:39:49 2012 +0000 - - IB/ipoib: Add missing locking when CM object is deleted - - Commit b63b70d87741 ("IPoIB: Use a private hash table for path lookup - in xmit path") introduced a bug where in ipoib_cm_destroy_tx() a CM - object is moved between lists without any supported locking. Under a - stress test, this eventually leads to list corruption and a crash. - - Previously when this routine was called, callers were taking the - device priv lock. Currently this function is called from the RCU - callback associated with neighbour deletion. Fix the race by taking - the same lock we used to before. - - Signed-off-by: Shlomo Pongratz - Signed-off-by: Or Gerlitz - Signed-off-by: Roland Dreier - -diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c -index 95ecf4e..24683fd 100644 ---- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c -+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c -@@ -1271,12 +1271,15 @@ struct ipoib_cm_tx *ipoib_cm_create_tx(struct net_device *dev, struct ipoib_path - void ipoib_cm_destroy_tx(struct ipoib_cm_tx *tx) - { - struct ipoib_dev_priv *priv = netdev_priv(tx->dev); -+ unsigned long flags; - if (test_and_clear_bit(IPOIB_FLAG_INITIALIZED, &tx->flags)) { -+ spin_lock_irqsave(&priv->lock, flags); - list_move(&tx->list, &priv->cm.reap_list); - queue_work(ipoib_workqueue, &priv->cm.reap_task); - ipoib_dbg(priv, "Reap connection for gid %pI6\n", - tx->neigh->daddr + 4); - tx->neigh = NULL; -+ spin_unlock_irqrestore(&priv->lock, flags); - } - } - diff --git a/lustre/kernel_patches/series/2.6-rhel6.series b/lustre/kernel_patches/series/2.6-rhel6.series index 66a39f4..41ed3af 100644 --- a/lustre/kernel_patches/series/2.6-rhel6.series +++ b/lustre/kernel_patches/series/2.6-rhel6.series @@ -7,4 +7,3 @@ export-2.6.32-vanilla.patch jbd2-jcberr-2.6-rhel6.patch bh_lru_size_config.patch replace_dqptr_sem.patch -ipoib-locking-fix.patch diff --git a/lustre/kernel_patches/targets/2.6-rhel6.target.in b/lustre/kernel_patches/targets/2.6-rhel6.target.in index e5e25cd..ad5297c 100644 --- a/lustre/kernel_patches/targets/2.6-rhel6.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel6.target.in @@ -1,5 +1,5 @@ lnxmaj="2.6.32" -lnxrel="358.6.2.el6" +lnxrel="358.11.1.el6" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm SERIES=2.6-rhel6.series diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index a74814e..3691d69 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -1,10 +1,10 @@ SERIES VERSION COMMENT SUPPORTED KERNELS: -2.6-rhel6 RHEL6: 2.6.32-358.6.2.el6 +2.6-rhel6 RHEL6: 2.6.32-358.11.1.el6 CLIENT SUPPORT FOR UNPATCHED KERNELS: 2.6.18-348.3.1.el5 (RHEL5) - 2.6.32-358.6.2.el6 (RHEL6) + 2.6.32-358.11.1.el6 (RHEL6) 2.6.16.60-0.69.1 (SLES10) 2.6.27.19-5 (SLES11) -- 1.8.3.1