From a896601ee0664acf5fd8aa9b9557b4e995607817 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Tue, 2 Oct 2012 16:05:14 +0200 Subject: [PATCH] Add SRP backport and refresh all patches This patch has been tested on RHEL 6.0, RHEL 6.1, RHEL 6.2, RHEL 6.3 and Ubuntu 10.04. Signed-off-by: Bart Van Assche Signed-off-by: Vladimir Sokolovsky --- ...erent-fix-for-ucma-context-uid-0-cau.patch | 9 +- ...TSO-low-nic-throughput-linux-next-p.patch} | 6 +- ...oopback-clean-up-linux-next-pending.patch} | 4 +- ...B-qib-MADs-with-misset-M_Keys-shoul.patch} | 17 +- ...eak-exists-when-handling-UC-RDMA-wr.patch} | 16 +- ...n-occur-where-qib_mr_dereg-can-retu.patch} | 22 ++- .../0001-ib_core-backport-dst_fetch_ha.patch | 8 +- ...2-ib-core-Backport-flowi4-and-flowi6.patch | 8 +- ...ACKPORT-core-netlink-for-kernels-3.4.patch | 8 +- ...e-Backport-pinned_vm-for-kernels-3.2.patch | 8 +- ...ckport-CLASS_ATTR-for-kernels-2.6.34.patch | 8 +- patches/0006-Backport-mlx4_ib.patch | 8 +- ...ORT-ucma-Revert-sysctl-registrations.patch | 8 +- ...A-nes-Backports-for-RHEL-6.2-and-6.3.patch | 6 +- ...4-Enable-header-file-inclusion-with-.patch | 7 +- ...-qib-backport-qib_fs.c-before-2.6.35.patch | 8 +- ...s-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch | 8 +- ...qib-backport-3.2-for-pinned_vm-field.patch | 8 +- ...-for-RHEL6.2-RHEL-6.3-and-SLES11-SP2.patch | 8 +- ...path-backport-qib_fs.c-before-2.6.35.patch | 8 +- ...ath-backport-3.2-for-pinned_vm-field.patch | 8 +- ...ts-for-RHEL6.2-RHEL-6.3-and-SLES11-S.patch | 9 +- ...ts-for-RHEL6.2-RHEL6.3-and-SLES11-SP.patch | 14 +- ...s-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch | 8 +- ...s-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch | 8 +- ...RDMA-RHEL6.3-and-SLES11-SP2-backport.patch | 8 +- patches/0021-RDMA-nes-Updated-backports.patch | 10 +- ..._cxgb4-Fix-bug-2369-in-OFED-bugzilla.patch | 8 +- ...-loopback-MAC-address-Backport-chang.patch | 5 +- ...enabled-again-for-linux-3.5-Backport.patch | 10 +- ...025-ib_srp-Backport-to-older-kernels.patch | 186 ++++++++++++++++++ 31 files changed, 327 insertions(+), 130 deletions(-) rename linux-next-pending/{0002-RDMA-nes-Fix-for-TSO-low-nic-throughput-linux-next-p.patch => 0001-RDMA-nes-Fix-for-TSO-low-nic-throughput-linux-next-p.patch} (94%) rename linux-next-pending/{0003-RDMA-nes-Loopback-clean-up-linux-next-pending.patch => 0002-RDMA-nes-Loopback-clean-up-linux-next-pending.patch} (96%) rename linux-next-pending/{0005-IB-qib-portinfo-compliance.patch => 0003-Commit-3236b2d4-IB-qib-MADs-with-misset-M_Keys-shoul.patch} (65%) rename linux-next-pending/{0006-IB-qib-mr-ebusy.patch => 0004-An-MR-reference-leak-exists-when-handling-UC-RDMA-wr.patch} (81%) rename linux-next-pending/{0007-IB-qib-uc-refcount-leak.patch => 0005-A-timing-issue-can-occur-where-qib_mr_dereg-can-retu.patch} (98%) rename linux-next-pending/0001-RDMA-nes-Fix-for-loopback-MAC-address-Backport-chang.patch => patches/0023-RDMA-nes-Fix-for-loopback-MAC-address-Backport-chang.patch (87%) rename linux-next-pending/0004-RDMA-nes-TSO-is-enabled-again-for-linux-3.5-Backport.patch => patches/0024-RDMA-nes-TSO-is-enabled-again-for-linux-3.5-Backport.patch (80%) create mode 100644 patches/0025-ib_srp-Backport-to-older-kernels.patch diff --git a/linux-next-cherry-picks/0001-RDMA-ucma.c-Different-fix-for-ucma-context-uid-0-cau.patch b/linux-next-cherry-picks/0001-RDMA-ucma.c-Different-fix-for-ucma-context-uid-0-cau.patch index 965b48c..afd793a 100644 --- a/linux-next-cherry-picks/0001-RDMA-ucma.c-Different-fix-for-ucma-context-uid-0-cau.patch +++ b/linux-next-cherry-picks/0001-RDMA-ucma.c-Different-fix-for-ucma-context-uid-0-cau.patch @@ -1,7 +1,8 @@ -From 63e0d2fdb051ee6beb0990cb4722c9cf6816d80b Mon Sep 17 00:00:00 2001 +From 35d307dfdb251ebfd997fe8d9cdd0a4c64b90595 Mon Sep 17 00:00:00 2001 From: Tatyana Nikolova Date: Tue, 7 Aug 2012 17:46:42 -0500 -Subject: [PATCH] RDMA/ucma.c: Different fix for ucma context uid=0, causing iWarp RDMA applications to fail in connection establishment +Subject: [PATCH] RDMA/ucma.c: Different fix for ucma context uid=0, causing + iWarp RDMA applications to fail in connection establishment Fix for ucma context uid=0, causing iWarp RDMA applications to fail in connection establishment. @@ -12,7 +13,7 @@ Signed-off-by: Tatyana Nikolova Signed-off-by: Sean Hefty --- drivers/infiniband/core/ucma.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c index 5861cdb..28bf514 100644 @@ -35,5 +36,5 @@ index 5861cdb..28bf514 100644 if (!ctx->backlog) { ret = -ENOMEM; -- -1.7.0.4 +1.7.9.5 diff --git a/linux-next-pending/0002-RDMA-nes-Fix-for-TSO-low-nic-throughput-linux-next-p.patch b/linux-next-pending/0001-RDMA-nes-Fix-for-TSO-low-nic-throughput-linux-next-p.patch similarity index 94% rename from linux-next-pending/0002-RDMA-nes-Fix-for-TSO-low-nic-throughput-linux-next-p.patch rename to linux-next-pending/0001-RDMA-nes-Fix-for-TSO-low-nic-throughput-linux-next-p.patch index 781c750..81a08c2 100644 --- a/linux-next-pending/0002-RDMA-nes-Fix-for-TSO-low-nic-throughput-linux-next-p.patch +++ b/linux-next-pending/0001-RDMA-nes-Fix-for-TSO-low-nic-throughput-linux-next-p.patch @@ -1,7 +1,7 @@ -From a2eb1d38ce10c7ce8070194b21fabe36fdd40ffd Mon Sep 17 00:00:00 2001 +From 669b99baeb7c8d2a887241aa761fe5ee1d144f4f Mon Sep 17 00:00:00 2001 From: Tatyana Nikolova Date: Fri, 7 Sep 2012 19:37:55 -0500 -Subject: [PATCH 2/4] RDMA/nes: Fix for TSO low nic throughput - +Subject: [PATCH 1/5] RDMA/nes: Fix for TSO low nic throughput - linux-next-pending Fix for TSO low nic throughput with linux-3.5 @@ -16,7 +16,7 @@ Signed-off-by: Tatyana Nikolova 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c -index 696b80e..5242294 100644 +index 7674358..4f73965 100644 --- a/drivers/infiniband/hw/nes/nes_nic.c +++ b/drivers/infiniband/hw/nes/nes_nic.c @@ -388,18 +388,16 @@ static int nes_nic_send(struct sk_buff *skb, struct net_device *netdev) diff --git a/linux-next-pending/0003-RDMA-nes-Loopback-clean-up-linux-next-pending.patch b/linux-next-pending/0002-RDMA-nes-Loopback-clean-up-linux-next-pending.patch similarity index 96% rename from linux-next-pending/0003-RDMA-nes-Loopback-clean-up-linux-next-pending.patch rename to linux-next-pending/0002-RDMA-nes-Loopback-clean-up-linux-next-pending.patch index a76a1b0..70c0960 100644 --- a/linux-next-pending/0003-RDMA-nes-Loopback-clean-up-linux-next-pending.patch +++ b/linux-next-pending/0002-RDMA-nes-Loopback-clean-up-linux-next-pending.patch @@ -1,7 +1,7 @@ -From 5061a057e8d166edd67d28d9531c0b1b4b8a8724 Mon Sep 17 00:00:00 2001 +From b52ebe158b3bb1b21b488f18683a17259d4b5b74 Mon Sep 17 00:00:00 2001 From: Tatyana Nikolova Date: Fri, 7 Sep 2012 19:34:28 -0500 -Subject: [PATCH 3/4] RDMA/nes: Loopback clean up - linux-next-pending +Subject: [PATCH 2/5] RDMA/nes: Loopback clean up - linux-next-pending Necessary clean up for the loopback code diff --git a/linux-next-pending/0005-IB-qib-portinfo-compliance.patch b/linux-next-pending/0003-Commit-3236b2d4-IB-qib-MADs-with-misset-M_Keys-shoul.patch similarity index 65% rename from linux-next-pending/0005-IB-qib-portinfo-compliance.patch rename to linux-next-pending/0003-Commit-3236b2d4-IB-qib-MADs-with-misset-M_Keys-shoul.patch index 5da8689..ff31e56 100644 --- a/linux-next-pending/0005-IB-qib-portinfo-compliance.patch +++ b/linux-next-pending/0003-Commit-3236b2d4-IB-qib-MADs-with-misset-M_Keys-shoul.patch @@ -1,10 +1,10 @@ -IB/qib: fix compliance test failure C14-024#06_LocalPortNum - +From f04e4bef8305cb265398672a574e56276a85b28f Mon Sep 17 00:00:00 2001 From: Mike Marciniszyn - -Commit 3236b2d4 ("IB/qib: MADs with misset M_Keys should return failure") -introduced a return code assignment that unfortunately introduced -an unconditional exit for the routine due to the lack of braces. +Date: Tue, 2 Oct 2012 15:53:02 +0200 +Subject: [PATCH 3/5] Commit 3236b2d4 ("IB/qib: MADs with misset M_Keys should + return failure") introduced a return code assignment + that unfortunately introduced an unconditional exit for + the routine due to the lack of braces. This patch adds the braces to correct the original patch. @@ -12,7 +12,7 @@ Reviewed-by: Dean Luick Signed-off-by: Mike Marciniszyn --- drivers/infiniband/hw/qib/qib_mad.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/qib/qib_mad.c b/drivers/infiniband/hw/qib/qib_mad.c index 4339021..3e55415 100644 @@ -30,3 +30,6 @@ index 4339021..3e55415 100644 } } +-- +1.7.9.5 + diff --git a/linux-next-pending/0006-IB-qib-mr-ebusy.patch b/linux-next-pending/0004-An-MR-reference-leak-exists-when-handling-UC-RDMA-wr.patch similarity index 81% rename from linux-next-pending/0006-IB-qib-mr-ebusy.patch rename to linux-next-pending/0004-An-MR-reference-leak-exists-when-handling-UC-RDMA-wr.patch index 8251564..913b339 100644 --- a/linux-next-pending/0006-IB-qib-mr-ebusy.patch +++ b/linux-next-pending/0004-An-MR-reference-leak-exists-when-handling-UC-RDMA-wr.patch @@ -1,10 +1,9 @@ -IB/qib: Fix UC MR refs for immediate operations - +From 984a66a622f5a0c4aaceaa48ddb265de5a454392 Mon Sep 17 00:00:00 2001 From: Mike Marciniszyn - -An MR reference leak exists when handling UC RDMA writes with -immediate data because we manipulate the reference counts as if the -operation had been a send. +Date: Tue, 2 Oct 2012 15:53:02 +0200 +Subject: [PATCH 4/5] An MR reference leak exists when handling UC RDMA writes + with immediate data because we manipulate the reference + counts as if the operation had been a send. This patch moves the last_imm label so that the RDMA write operations with immediate data converge at the cq building code. The copy/mr @@ -15,7 +14,7 @@ Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier --- drivers/infiniband/hw/qib/qib_uc.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) + 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/qib/qib_uc.c b/drivers/infiniband/hw/qib/qib_uc.c index ce7387f..70b4cb7 100644 @@ -50,3 +49,6 @@ index ce7387f..70b4cb7 100644 goto last_imm; case OP(RDMA_WRITE_LAST): +-- +1.7.9.5 + diff --git a/linux-next-pending/0007-IB-qib-uc-refcount-leak.patch b/linux-next-pending/0005-A-timing-issue-can-occur-where-qib_mr_dereg-can-retu.patch similarity index 98% rename from linux-next-pending/0007-IB-qib-uc-refcount-leak.patch rename to linux-next-pending/0005-A-timing-issue-can-occur-where-qib_mr_dereg-can-retu.patch index a9248e5..3576c79 100644 --- a/linux-next-pending/0007-IB-qib-uc-refcount-leak.patch +++ b/linux-next-pending/0005-A-timing-issue-can-occur-where-qib_mr_dereg-can-retu.patch @@ -1,9 +1,8 @@ -IB/qib: Avoid returning EBUSY from MR deregister - +From f96007a6bc75a3644489b159050fce06d1f19655 Mon Sep 17 00:00:00 2001 From: Mike Marciniszyn - -A timing issue can occur where qib_mr_dereg can return -EBUSY if the -MR use count is not zero. +Date: Tue, 2 Oct 2012 15:53:02 +0200 +Subject: [PATCH 5/5] A timing issue can occur where qib_mr_dereg can return + -EBUSY if the MR use count is not zero. This can occur if the MR is de-registered while RDMA read response packets are being progressed from the SDMA ring. The suspicion is @@ -34,15 +33,15 @@ Reviewed-by: Ramkrishna Vepa Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier --- - drivers/infiniband/hw/qib/qib_keys.c | 84 +++++++---- + drivers/infiniband/hw/qib/qib_keys.c | 84 +++++++----- drivers/infiniband/hw/qib/qib_mr.c | 242 ++++++++++++++++++--------------- drivers/infiniband/hw/qib/qib_qp.c | 21 +-- - drivers/infiniband/hw/qib/qib_rc.c | 24 +-- + drivers/infiniband/hw/qib/qib_rc.c | 24 ++-- drivers/infiniband/hw/qib/qib_ruc.c | 14 +- drivers/infiniband/hw/qib/qib_uc.c | 33 +---- - drivers/infiniband/hw/qib/qib_ud.c | 12 -- - drivers/infiniband/hw/qib/qib_verbs.c | 10 + - drivers/infiniband/hw/qib/qib_verbs.h | 28 ++++ + drivers/infiniband/hw/qib/qib_ud.c | 12 +- + drivers/infiniband/hw/qib/qib_verbs.c | 10 +- + drivers/infiniband/hw/qib/qib_verbs.h | 28 +++- 9 files changed, 244 insertions(+), 224 deletions(-) diff --git a/drivers/infiniband/hw/qib/qib_keys.c b/drivers/infiniband/hw/qib/qib_keys.c @@ -1033,3 +1032,6 @@ index 4876060..4a2277b 100644 void qib_release_mmap_info(struct kref *ref); struct qib_mmap_info *qib_create_mmap_info(struct qib_ibdev *dev, u32 size, +-- +1.7.9.5 + diff --git a/patches/0001-ib_core-backport-dst_fetch_ha.patch b/patches/0001-ib_core-backport-dst_fetch_ha.patch index a7703dc..5dc29b9 100644 --- a/patches/0001-ib_core-backport-dst_fetch_ha.patch +++ b/patches/0001-ib_core-backport-dst_fetch_ha.patch @@ -1,12 +1,12 @@ -From aab849d519467be361c92ecaf2c1c46df1d6466e Mon Sep 17 00:00:00 2001 +From b109b6da8557ef527abaf9c013bba5c636c552e9 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Tue, 10 Jul 2012 15:57:24 +0300 -Subject: [PATCH 01/21] ib_core: backport dst_fetch_ha +Subject: [PATCH 01/25] ib_core: backport dst_fetch_ha Signed-off-by: Vladimir Sokolovsky --- drivers/infiniband/core/addr.c | 58 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 58 insertions(+), 0 deletions(-) + 1 file changed, 58 insertions(+) diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c index 6ef660c..984f61c 100644 @@ -121,5 +121,5 @@ index 6ef660c..984f61c 100644 dst_release(dst); return ret; -- -1.7.0.4 +1.7.9.5 diff --git a/patches/0002-ib-core-Backport-flowi4-and-flowi6.patch b/patches/0002-ib-core-Backport-flowi4-and-flowi6.patch index 780dc87..c33d282 100644 --- a/patches/0002-ib-core-Backport-flowi4-and-flowi6.patch +++ b/patches/0002-ib-core-Backport-flowi4-and-flowi6.patch @@ -1,12 +1,12 @@ -From 026cb35caae800ec4823fd05fa4d5fd4b41b5153 Mon Sep 17 00:00:00 2001 +From b42650b2873504c84250c5876e684f8fc12b0d6b Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Tue, 10 Jul 2012 17:21:25 +0300 -Subject: [PATCH 02/21] ib/core: Backport flowi4 and flowi6 +Subject: [PATCH 02/25] ib/core: Backport flowi4 and flowi6 Signed-off-by: Vladimir Sokolovsky --- drivers/infiniband/core/addr.c | 45 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 45 insertions(+), 0 deletions(-) + 1 file changed, 45 insertions(+) diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c index 984f61c..089b076 100644 @@ -99,5 +99,5 @@ index 984f61c..089b076 100644 if (dst->dev->flags & IFF_LOOPBACK) { ret = rdma_translate_ip((struct sockaddr *) dst_in, addr); -- -1.7.0.4 +1.7.9.5 diff --git a/patches/0003-BACKPORT-core-netlink-for-kernels-3.4.patch b/patches/0003-BACKPORT-core-netlink-for-kernels-3.4.patch index 92647db..21e8e28 100644 --- a/patches/0003-BACKPORT-core-netlink-for-kernels-3.4.patch +++ b/patches/0003-BACKPORT-core-netlink-for-kernels-3.4.patch @@ -1,12 +1,12 @@ -From 5fd491b49a69f933b529aa5d8f7e0a37c06799bb Mon Sep 17 00:00:00 2001 +From 92ea29718f50d89695ed46cf409f789097b82d03 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Mon, 25 Jun 2012 22:28:24 +0300 -Subject: [PATCH 03/21] BACKPORT: core/netlink for kernels <= 3.4 +Subject: [PATCH 03/25] BACKPORT: core/netlink for kernels <= 3.4 Signed-off-by: Vladimir Sokolovsky --- drivers/infiniband/core/netlink.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + 1 file changed, 6 insertions(+) diff --git a/drivers/infiniband/core/netlink.c b/drivers/infiniband/core/netlink.c index e497dfb..2ac867a 100644 @@ -32,5 +32,5 @@ index e497dfb..2ac867a 100644 } -- -1.7.0.4 +1.7.9.5 diff --git a/patches/0004-ib-core-Backport-pinned_vm-for-kernels-3.2.patch b/patches/0004-ib-core-Backport-pinned_vm-for-kernels-3.2.patch index 9fb4895..b7ad394 100644 --- a/patches/0004-ib-core-Backport-pinned_vm-for-kernels-3.2.patch +++ b/patches/0004-ib-core-Backport-pinned_vm-for-kernels-3.2.patch @@ -1,12 +1,12 @@ -From b4ba8b62569098b2d80a8bdf007a13d762dbd66e Mon Sep 17 00:00:00 2001 +From 0fd581905c953e5c0b3543d70fdd64dc6b7c681a Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Tue, 10 Jul 2012 17:41:31 +0300 -Subject: [PATCH 04/21] ib/core: Backport pinned_vm for kernels <= 3.2 +Subject: [PATCH 04/25] ib/core: Backport pinned_vm for kernels <= 3.2 Signed-off-by: Vladimir Sokolovsky --- drivers/infiniband/core/umem.c | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) + 1 file changed, 16 insertions(+) diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c index a841123..3b6cb84 100644 @@ -61,5 +61,5 @@ index a841123..3b6cb84 100644 mmput(mm); kfree(umem); -- -1.7.0.4 +1.7.9.5 diff --git a/patches/0005-ib-core-Backport-CLASS_ATTR-for-kernels-2.6.34.patch b/patches/0005-ib-core-Backport-CLASS_ATTR-for-kernels-2.6.34.patch index 8d0e045..245484d 100644 --- a/patches/0005-ib-core-Backport-CLASS_ATTR-for-kernels-2.6.34.patch +++ b/patches/0005-ib-core-Backport-CLASS_ATTR-for-kernels-2.6.34.patch @@ -1,14 +1,14 @@ -From 114683737901661ad394d2eee81d500f702c4c36 Mon Sep 17 00:00:00 2001 +From c8179b3bb60fe0560f4b5558aca5e523df749f67 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Tue, 10 Jul 2012 18:06:16 +0300 -Subject: [PATCH 05/21] ib/core: Backport CLASS_ATTR for kernels < 2.6.34 +Subject: [PATCH 05/25] ib/core: Backport CLASS_ATTR for kernels < 2.6.34 Signed-off-by: Vladimir Sokolovsky --- drivers/infiniband/core/ucm.c | 20 ++++++++++++++++++++ drivers/infiniband/core/user_mad.c | 12 ++++++++++++ drivers/infiniband/core/uverbs_main.c | 12 ++++++++++++ - 3 files changed, 44 insertions(+), 0 deletions(-) + 3 files changed, 44 insertions(+) diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c index 06f0871..d74c8b3 100644 @@ -134,5 +134,5 @@ index 604556d..4b0d8f3 100644 printk(KERN_ERR "user_verbs: couldn't create abi_version attribute\n"); goto out_class; -- -1.7.0.4 +1.7.9.5 diff --git a/patches/0006-Backport-mlx4_ib.patch b/patches/0006-Backport-mlx4_ib.patch index b44a534..84575b3 100644 --- a/patches/0006-Backport-mlx4_ib.patch +++ b/patches/0006-Backport-mlx4_ib.patch @@ -1,12 +1,12 @@ -From 8d863bb705600583bf70868bb5ab0ee41bfb4542 Mon Sep 17 00:00:00 2001 +From c41d75cc97ecf58160b708f328cae6765d933532 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Thu, 12 Jul 2012 22:31:24 +0300 -Subject: [PATCH 06/21] Backport mlx4_ib +Subject: [PATCH 06/25] Backport mlx4_ib Signed-off-by: Vladimir Sokolovsky --- drivers/infiniband/hw/mlx4/main.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + 1 file changed, 8 insertions(+) diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c index 3530c41..765bf3b 100644 @@ -37,5 +37,5 @@ index 3530c41..765bf3b 100644 dev_put(ndev); } -- -1.7.0.4 +1.7.9.5 diff --git a/patches/0007-BACKPORT-ucma-Revert-sysctl-registrations.patch b/patches/0007-BACKPORT-ucma-Revert-sysctl-registrations.patch index 37dcb1b..2dd972a 100644 --- a/patches/0007-BACKPORT-ucma-Revert-sysctl-registrations.patch +++ b/patches/0007-BACKPORT-ucma-Revert-sysctl-registrations.patch @@ -1,12 +1,12 @@ -From 1473b7194e0bce6d1dd06b17bf006a7fae99c448 Mon Sep 17 00:00:00 2001 +From 74445f348a5d44dd172f3da3794ad08ecd8dda47 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Fri, 13 Jul 2012 00:24:56 +0300 -Subject: [PATCH 07/21] BACKPORT ucma: Revert sysctl registrations +Subject: [PATCH 07/25] BACKPORT ucma: Revert sysctl registrations Signed-off-by: Vladimir Sokolovsky --- drivers/infiniband/core/ucma.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) + 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c index 8002ae6..5861cdb 100644 @@ -44,5 +44,5 @@ index 8002ae6..5861cdb 100644 misc_deregister(&ucma_misc); idr_destroy(&ctx_idr); -- -1.7.0.4 +1.7.9.5 diff --git a/patches/0008-RDMA-nes-Backports-for-RHEL-6.2-and-6.3.patch b/patches/0008-RDMA-nes-Backports-for-RHEL-6.2-and-6.3.patch index 1bdda5b..c890fa3 100644 --- a/patches/0008-RDMA-nes-Backports-for-RHEL-6.2-and-6.3.patch +++ b/patches/0008-RDMA-nes-Backports-for-RHEL-6.2-and-6.3.patch @@ -1,7 +1,7 @@ -From a0b4e02814afe69cd050cda0c51fd52fd4e96cb6 Mon Sep 17 00:00:00 2001 +From 62e36abf5a81320929ecdfd96ec15ae7762843f3 Mon Sep 17 00:00:00 2001 From: Tatyana Nikolova Date: Mon, 16 Jul 2012 17:14:31 +0300 -Subject: [PATCH 08/21] RDMA/nes: Backports for RHEL 6.2 and 6.3 +Subject: [PATCH 08/25] RDMA/nes: Backports for RHEL 6.2 and 6.3 Backports for linux-3.5 nes to RHEL-6.2 and RHEL-6.3 @@ -127,5 +127,5 @@ index f3a3ecf..d54776f 100644 nes_debug(NES_DBG_INIT, "nesvnic = %p, reported features = 0x%lX, QPid = %d," " nic_index = %d, logical_port = %d, mac_index = %d.\n", -- -1.7.0.4 +1.7.9.5 diff --git a/patches/0009-iw_cxgb3-iw_cxgb4-Enable-header-file-inclusion-with-.patch b/patches/0009-iw_cxgb3-iw_cxgb4-Enable-header-file-inclusion-with-.patch index 9eb638c..82449ab 100644 --- a/patches/0009-iw_cxgb3-iw_cxgb4-Enable-header-file-inclusion-with-.patch +++ b/patches/0009-iw_cxgb3-iw_cxgb4-Enable-header-file-inclusion-with-.patch @@ -1,7 +1,8 @@ -From 0ea5b57fe57f435ea4ff638c9054d90564842a0e Mon Sep 17 00:00:00 2001 +From 049c8ba147e556fc1f1ad66a1e070aced80386e9 Mon Sep 17 00:00:00 2001 From: Vipul Pandya Date: Mon, 7 May 2012 12:43:41 +0530 -Subject: [PATCH 09/21] iw_cxgb3/iw_cxgb4: Enable header file inclusion with absolute path +Subject: [PATCH 09/25] iw_cxgb3/iw_cxgb4: Enable header file inclusion with + absolute path iw_cxgb3/iw_cxgb4 driver includes header files of cxgb3/cxgb4 drivers respectively. OFED build environment is not able to find the header files @@ -34,5 +35,5 @@ index e11cf72..2f9fbf3 100644 obj-$(CONFIG_INFINIBAND_CXGB4) += iw_cxgb4.o -- -1.7.0.4 +1.7.9.5 diff --git a/patches/0010-IB-qib-backport-qib_fs.c-before-2.6.35.patch b/patches/0010-IB-qib-backport-qib_fs.c-before-2.6.35.patch index f2a38fe..a587000 100644 --- a/patches/0010-IB-qib-backport-qib_fs.c-before-2.6.35.patch +++ b/patches/0010-IB-qib-backport-qib_fs.c-before-2.6.35.patch @@ -1,12 +1,12 @@ -From 4a1c370f23ed0c15fa8a15b7cdd72fc4b8e9590b Mon Sep 17 00:00:00 2001 +From a7e9289daf473d3bcddfea383e9d8f8aef90cf58 Mon Sep 17 00:00:00 2001 From: Mike Marciniszyn Date: Thu, 2 Aug 2012 18:11:27 +0300 -Subject: [PATCH 10/21] IB/qib: backport qib_fs.c before 2.6.35 +Subject: [PATCH 10/25] IB/qib: backport qib_fs.c before 2.6.35 Signed-off-by: Mike Marciniszyn --- drivers/infiniband/hw/qib/qib_fs.c | 29 +++++++++++++++++++++++++++++ - 1 files changed, 29 insertions(+), 0 deletions(-) + 1 file changed, 29 insertions(+) diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c index 05e0f17..4ea3926 100644 @@ -87,5 +87,5 @@ index 05e0f17..4ea3926 100644 }; -- -1.7.0.4 +1.7.9.5 diff --git a/patches/0011-cxgb3-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch b/patches/0011-cxgb3-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch index 3961945..500ff4b 100644 --- a/patches/0011-cxgb3-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch +++ b/patches/0011-cxgb3-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch @@ -1,7 +1,7 @@ -From 434d4d19533137c6936b9733743a934fd4946b63 Mon Sep 17 00:00:00 2001 +From d505c64dcda186c1cf7248bf261567284284ffd9 Mon Sep 17 00:00:00 2001 From: Vipul Pandya Date: Mon, 30 Jul 2012 19:08:37 +0530 -Subject: [PATCH 11/21] cxgb3: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2 +Subject: [PATCH 11/25] cxgb3: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2 Signed-off-by: Vipul Pandya --- @@ -11,7 +11,7 @@ Signed-off-by: Vipul Pandya drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 25 +++ drivers/net/ethernet/chelsio/cxgb3/l2t.c | 4 + drivers/net/ethernet/chelsio/cxgb3/sge.c | 49 ++++++ - drivers/net/ethernet/chelsio/cxgb3/xgmac.c | 17 ++- + drivers/net/ethernet/chelsio/cxgb3/xgmac.c | 17 +- 7 files changed, 280 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb3/adapter.h b/drivers/net/ethernet/chelsio/cxgb3/adapter.h @@ -632,5 +632,5 @@ index 3af19a5..b3c99fd 100644 hash_lo |= (1 << hash); else -- -1.7.0.4 +1.7.9.5 diff --git a/patches/0012-IB-qib-backport-3.2-for-pinned_vm-field.patch b/patches/0012-IB-qib-backport-3.2-for-pinned_vm-field.patch index e63b31d..282b038 100644 --- a/patches/0012-IB-qib-backport-3.2-for-pinned_vm-field.patch +++ b/patches/0012-IB-qib-backport-3.2-for-pinned_vm-field.patch @@ -1,12 +1,12 @@ -From 3987484a97b9ab36fc841a3109aebb875dba5c8f Mon Sep 17 00:00:00 2001 +From e95d29e72e1da4a34fe9a99c111755ff7ae46eb9 Mon Sep 17 00:00:00 2001 From: Mike Marciniszyn Date: Thu, 2 Aug 2012 18:11:27 +0300 -Subject: [PATCH 12/21] IB/qib: backport < 3.2 for pinned_vm field +Subject: [PATCH 12/25] IB/qib: backport < 3.2 for pinned_vm field Signed-off-by: Mike Marciniszyn --- drivers/infiniband/hw/qib/qib_user_pages.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + 1 file changed, 8 insertions(+) diff --git a/drivers/infiniband/hw/qib/qib_user_pages.c b/drivers/infiniband/hw/qib/qib_user_pages.c index 2bc1d2b..80d6ea5 100644 @@ -37,5 +37,5 @@ index 2bc1d2b..80d6ea5 100644 } } -- -1.7.0.4 +1.7.9.5 diff --git a/patches/0013-cxgb4-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-SP2.patch b/patches/0013-cxgb4-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-SP2.patch index dea45c7..2fdcebb 100644 --- a/patches/0013-cxgb4-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-SP2.patch +++ b/patches/0013-cxgb4-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-SP2.patch @@ -1,13 +1,13 @@ -From 7498293c8d344b70376649277926d72b4250c674 Mon Sep 17 00:00:00 2001 +From 67fc061694dfa829043570007ccec9ff1d655ee3 Mon Sep 17 00:00:00 2001 From: Vipul Pandya Date: Mon, 30 Jul 2012 12:06:12 +0530 -Subject: [PATCH 13/21] cxgb4: Backports for RHEL6.2 RHEL 6.3 and SLES11 SP2 +Subject: [PATCH 13/25] cxgb4: Backports for RHEL6.2 RHEL 6.3 and SLES11 SP2 Signed-off-by: Vipul Pandya --- drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 13 ++ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 190 ++++++++++++++++++++++- - drivers/net/ethernet/chelsio/cxgb4/sge.c | 72 +++++++++- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 72 ++++++++- 3 files changed, 273 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h @@ -594,5 +594,5 @@ index e111d97..b97bea7 100644 restore_rx_bufs(&si, &rxq->fl, frags); } else if (likely(rsp_type == RSP_TYPE_CPL)) { -- -1.7.0.4 +1.7.9.5 diff --git a/patches/0014-IB-ipath-backport-qib_fs.c-before-2.6.35.patch b/patches/0014-IB-ipath-backport-qib_fs.c-before-2.6.35.patch index cef25eb..d3d4a5c 100644 --- a/patches/0014-IB-ipath-backport-qib_fs.c-before-2.6.35.patch +++ b/patches/0014-IB-ipath-backport-qib_fs.c-before-2.6.35.patch @@ -1,12 +1,12 @@ -From 52bf86dbd619044e40448eeb2edfaafbbeb71acd Mon Sep 17 00:00:00 2001 +From 9c65408d4d69a2cbfd1e1c1ea34c35cf7414e89a Mon Sep 17 00:00:00 2001 From: Mike Marciniszyn Date: Thu, 2 Aug 2012 18:11:27 +0300 -Subject: [PATCH 14/21] IB/ipath: backport qib_fs.c before 2.6.35 +Subject: [PATCH 14/25] IB/ipath: backport qib_fs.c before 2.6.35 Signed-off-by: Mike Marciniszyn --- drivers/infiniband/hw/ipath/ipath_fs.c | 26 ++++++++++++++++++++++++++ - 1 files changed, 26 insertions(+), 0 deletions(-) + 1 file changed, 26 insertions(+) diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c index a4de9d5..5ec9c66 100644 @@ -81,5 +81,5 @@ index a4de9d5..5ec9c66 100644 }; -- -1.7.0.4 +1.7.9.5 diff --git a/patches/0015-IB-ipath-backport-3.2-for-pinned_vm-field.patch b/patches/0015-IB-ipath-backport-3.2-for-pinned_vm-field.patch index d4a01fd..2a499b6 100644 --- a/patches/0015-IB-ipath-backport-3.2-for-pinned_vm-field.patch +++ b/patches/0015-IB-ipath-backport-3.2-for-pinned_vm-field.patch @@ -1,12 +1,12 @@ -From cbf29472b92bdc58e2c2fdb6d971ad843fe4bad5 Mon Sep 17 00:00:00 2001 +From 1cec339ba2a68302d41192df5103f5d95a33364b Mon Sep 17 00:00:00 2001 From: Mike Marciniszyn Date: Thu, 2 Aug 2012 18:11:27 +0300 -Subject: [PATCH 15/21] IB/ipath: backport < 3.2 for pinned_vm field +Subject: [PATCH 15/25] IB/ipath: backport < 3.2 for pinned_vm field Signed-off-by: Mike Marciniszyn --- drivers/infiniband/hw/ipath/ipath_user_pages.c | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) + 1 file changed, 12 insertions(+) diff --git a/drivers/infiniband/hw/ipath/ipath_user_pages.c b/drivers/infiniband/hw/ipath/ipath_user_pages.c index dc66c45..f2858e6 100644 @@ -49,5 +49,5 @@ index dc66c45..f2858e6 100644 mmput(work->mm); kfree(work); -- -1.7.0.4 +1.7.9.5 diff --git a/patches/0016-iw_cxgb3-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-S.patch b/patches/0016-iw_cxgb3-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-S.patch index b54f5bb..22d1e64 100644 --- a/patches/0016-iw_cxgb3-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-S.patch +++ b/patches/0016-iw_cxgb3-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-S.patch @@ -1,12 +1,13 @@ -From 32509a879b4662c90805662b055521a8b2541cd3 Mon Sep 17 00:00:00 2001 +From b596dfe6f1296cb96361f7f95e49ddc641095be9 Mon Sep 17 00:00:00 2001 From: Vipul Pandya Date: Mon, 30 Jul 2012 12:38:36 +0530 -Subject: [PATCH 16/21] iw_cxgb3: Backports for RHEL6.2 RHEL 6.3 and SLES11 SP2 +Subject: [PATCH 16/25] iw_cxgb3: Backports for RHEL6.2 RHEL 6.3 and SLES11 + SP2 Signed-off-by: Vipul Pandya --- drivers/infiniband/hw/cxgb3/iwch_cm.c | 29 +++++++++++++++++++++++++++++ - 1 files changed, 29 insertions(+), 0 deletions(-) + 1 file changed, 29 insertions(+) diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c index 740dcc0..c0b492f 100644 @@ -71,5 +72,5 @@ index 740dcc0..c0b492f 100644 if (!ep->l2t) { printk(KERN_ERR MOD "%s - cannot alloc l2e.\n", __func__); -- -1.7.0.4 +1.7.9.5 diff --git a/patches/0017-iw_cxgb4-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP.patch b/patches/0017-iw_cxgb4-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP.patch index 5b84ff0..f06d32a 100644 --- a/patches/0017-iw_cxgb4-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP.patch +++ b/patches/0017-iw_cxgb4-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP.patch @@ -1,17 +1,17 @@ -From a31706eefdd5fa6cbcfd5e9a85ccdef74dba374e Mon Sep 17 00:00:00 2001 +From e5eec669a7c0b85a2a4eae05684b61ade26b077a Mon Sep 17 00:00:00 2001 From: Vipul Pandya Date: Mon, 30 Jul 2012 16:59:42 +0530 -Subject: [PATCH 17/21] iw_cxgb4: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2 +Subject: [PATCH 17/25] iw_cxgb4: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2 Signed-off-by: Vipul Pandya --- drivers/infiniband/hw/cxgb4/cm.c | 45 ++++++++++++++++++++++++++++++++ - drivers/infiniband/hw/cxgb4/cq.c | 12 ++++++++ + drivers/infiniband/hw/cxgb4/cq.c | 12 +++++++++ drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 4 +++ - drivers/infiniband/hw/cxgb4/mem.c | 8 +++++ + drivers/infiniband/hw/cxgb4/mem.c | 8 ++++++ drivers/infiniband/hw/cxgb4/qp.c | 17 +++++++++++- - drivers/infiniband/hw/cxgb4/t4.h | 12 ++++++++ - 6 files changed, 97 insertions(+), 1 deletions(-) + drivers/infiniband/hw/cxgb4/t4.h | 12 +++++++++ + 6 files changed, 97 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c index b18870c..c1805bd 100644 @@ -289,5 +289,5 @@ index 16f26ab..cafdb7c 100644 void __iomem *gts; struct c4iw_rdev *rdev; -- -1.7.0.4 +1.7.9.5 diff --git a/patches/0018-IPoIB-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch b/patches/0018-IPoIB-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch index b5354ab..0193ffd 100644 --- a/patches/0018-IPoIB-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch +++ b/patches/0018-IPoIB-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch @@ -1,7 +1,7 @@ -From a5eccddfb48b63a8cddec33b39544136aa3378ee Mon Sep 17 00:00:00 2001 +From 23506f2107b334607305e2d34b760f2af6515186 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Thu, 2 Aug 2012 16:12:39 +0300 -Subject: [PATCH 18/21] IPoIB: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2 +Subject: [PATCH 18/25] IPoIB: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2 Signed-off-by: Vladimir Sokolovsky --- @@ -9,7 +9,7 @@ Signed-off-by: Vladimir Sokolovsky drivers/infiniband/ulp/ipoib/ipoib_cm.c | 21 +++++++++++++++++++++ drivers/infiniband/ulp/ipoib/ipoib_main.c | 18 ++++++++++++++++++ drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 19 +++++++++++++++++++ - 4 files changed, 61 insertions(+), 0 deletions(-) + 4 files changed, 61 insertions(+) diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h index 86df632..a876f24 100644 @@ -202,5 +202,5 @@ index 20ebc6f..4a4c64a 100644 mcast = __ipoib_mcast_find(dev, &mgid); if (!mcast || test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) { -- -1.7.0.4 +1.7.9.5 diff --git a/patches/0019-mlx4_en-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch b/patches/0019-mlx4_en-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch index 1e64d20..3763c8a 100644 --- a/patches/0019-mlx4_en-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch +++ b/patches/0019-mlx4_en-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch @@ -1,7 +1,7 @@ -From 4c1b99148b5eeb1cdb2e251919a083b03aca35a4 Mon Sep 17 00:00:00 2001 +From 1625ace4f5f1fa23ac03766ad4a201684fc998a6 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Sun, 5 Aug 2012 22:00:42 +0300 -Subject: [PATCH 19/21] mlx4_en: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2 +Subject: [PATCH 19/25] mlx4_en: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2 Signed-off-by: Vladimir Sokolovsky --- @@ -9,7 +9,7 @@ Signed-off-by: Vladimir Sokolovsky drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 29 ++++++++++++ drivers/net/ethernet/mellanox/mlx4/en_rx.c | 56 +++++++++++++++++++++++ drivers/net/ethernet/mellanox/mlx4/en_tx.c | 4 ++ - 4 files changed, 93 insertions(+), 0 deletions(-) + 4 files changed, 93 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c index 72901ce..332e851 100644 @@ -325,5 +325,5 @@ index 019d856..5a2bddd 100644 if (vlan_tx_tag_present(skb)) -- -1.7.0.4 +1.7.9.5 diff --git a/patches/0020-NFSRDMA-RHEL6.3-and-SLES11-SP2-backport.patch b/patches/0020-NFSRDMA-RHEL6.3-and-SLES11-SP2-backport.patch index ea23b5a..1e542da 100644 --- a/patches/0020-NFSRDMA-RHEL6.3-and-SLES11-SP2-backport.patch +++ b/patches/0020-NFSRDMA-RHEL6.3-and-SLES11-SP2-backport.patch @@ -1,14 +1,14 @@ -From 281fbad725657ca5c8593a849010529fd78f3988 Mon Sep 17 00:00:00 2001 +From b824c830e756c1466a7a84109b9954d2772586b9 Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Fri, 24 Aug 2012 11:18:23 -0700 -Subject: [PATCH 20/21] NFSRDMA: RHEL6.3 and SLES11 SP2 backport +Subject: [PATCH 20/25] NFSRDMA: RHEL6.3 and SLES11 SP2 backport Signed-off-by: Jeff Becker --- net/sunrpc/xprtrdma/rpc_rdma.c | 16 ++++++++++++++++ net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 ++++ net/sunrpc/xprtrdma/transport.c | 12 ++++++++++++ - 3 files changed, 32 insertions(+), 0 deletions(-) + 3 files changed, 32 insertions(+) diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c index 558fbab..0a6c1db 100644 @@ -109,5 +109,5 @@ index b446e10..9419f34 100644 /* -- -1.7.0.4 +1.7.9.5 diff --git a/patches/0021-RDMA-nes-Updated-backports.patch b/patches/0021-RDMA-nes-Updated-backports.patch index ca0bbbc..f47d3ad 100644 --- a/patches/0021-RDMA-nes-Updated-backports.patch +++ b/patches/0021-RDMA-nes-Updated-backports.patch @@ -1,15 +1,15 @@ -From abd0f3494cc9ac2653dc3b451429cddd7c25def9 Mon Sep 17 00:00:00 2001 +From 40378c271c9fbbb445c7c1233444c795004d6232 Mon Sep 17 00:00:00 2001 From: Tatyana Nikolova Date: Sat, 25 Aug 2012 20:39:12 -0500 -Subject: [PATCH 21/21] RDMA/nes: Updated backports +Subject: [PATCH 21/25] RDMA/nes: Updated backports OFED-3.5/NES: Updated backports to be applied on top of the previously submitted backport patch. Signed-off-by: Tatyana Nikolova --- drivers/infiniband/hw/nes/nes_hw.c | 11 ++++++++ - drivers/infiniband/hw/nes/nes_hw.h | 3 ++ - drivers/infiniband/hw/nes/nes_nic.c | 49 ++++++++++++++++++++++++++++------ + drivers/infiniband/hw/nes/nes_hw.h | 3 +++ + drivers/infiniband/hw/nes/nes_nic.c | 49 ++++++++++++++++++++++++++++------- 3 files changed, 54 insertions(+), 9 deletions(-) diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c @@ -157,5 +157,5 @@ index d54776f..696b80e 100644 } -- -1.7.0.4 +1.7.9.5 diff --git a/patches/0022-iw_cxgb4-Fix-bug-2369-in-OFED-bugzilla.patch b/patches/0022-iw_cxgb4-Fix-bug-2369-in-OFED-bugzilla.patch index 3be89ba..0995e24 100644 --- a/patches/0022-iw_cxgb4-Fix-bug-2369-in-OFED-bugzilla.patch +++ b/patches/0022-iw_cxgb4-Fix-bug-2369-in-OFED-bugzilla.patch @@ -1,7 +1,7 @@ -From 6086904c02bba993fc4c8da95e2c6ca115469fac Mon Sep 17 00:00:00 2001 +From 9a2a5815ae4484d558d115380256a092ee08554e Mon Sep 17 00:00:00 2001 From: Vipul Pandya Date: Fri, 21 Sep 2012 04:53:36 -0700 -Subject: [PATCH] iw_cxgb4: Fix bug 2369 in OFED bugzilla +Subject: [PATCH 22/25] iw_cxgb4: Fix bug 2369 in OFED bugzilla Bug 2369 - [OFED-3.5] Trace observed in dmesg while running IMB-MPI1 using openmpi-1.6 @@ -15,7 +15,7 @@ which was resulting in the trace. Signed-off-by: Vipul Pandya --- drivers/infiniband/hw/cxgb4/cm.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c index c1805bd..d6fea23 100644 @@ -32,5 +32,5 @@ index c1805bd..d6fea23 100644 return err; } -- -1.7.0.4 +1.7.9.5 diff --git a/linux-next-pending/0001-RDMA-nes-Fix-for-loopback-MAC-address-Backport-chang.patch b/patches/0023-RDMA-nes-Fix-for-loopback-MAC-address-Backport-chang.patch similarity index 87% rename from linux-next-pending/0001-RDMA-nes-Fix-for-loopback-MAC-address-Backport-chang.patch rename to patches/0023-RDMA-nes-Fix-for-loopback-MAC-address-Backport-chang.patch index 22ae56a..31a4aa9 100644 --- a/linux-next-pending/0001-RDMA-nes-Fix-for-loopback-MAC-address-Backport-chang.patch +++ b/patches/0023-RDMA-nes-Fix-for-loopback-MAC-address-Backport-chang.patch @@ -1,7 +1,8 @@ -From 536c7cc5997776dc9e65d9ab8869d535505506a2 Mon Sep 17 00:00:00 2001 +From 5ebf4547e291d3f94ae4e13956a7c3635896520a Mon Sep 17 00:00:00 2001 From: Tatyana Nikolova Date: Fri, 7 Sep 2012 19:41:29 -0500 -Subject: [PATCH 1/4] RDMA/nes: Fix for loopback MAC address - Backport change +Subject: [PATCH 23/25] RDMA/nes: Fix for loopback MAC address - Backport + change RDMA/nes: Fix for resolving correctly the MAC address for loopback connection (the patch should be applied on top of previous backports) diff --git a/linux-next-pending/0004-RDMA-nes-TSO-is-enabled-again-for-linux-3.5-Backport.patch b/patches/0024-RDMA-nes-TSO-is-enabled-again-for-linux-3.5-Backport.patch similarity index 80% rename from linux-next-pending/0004-RDMA-nes-TSO-is-enabled-again-for-linux-3.5-Backport.patch rename to patches/0024-RDMA-nes-TSO-is-enabled-again-for-linux-3.5-Backport.patch index b2cbbef..3f6ef4e 100644 --- a/linux-next-pending/0004-RDMA-nes-TSO-is-enabled-again-for-linux-3.5-Backport.patch +++ b/patches/0024-RDMA-nes-TSO-is-enabled-again-for-linux-3.5-Backport.patch @@ -1,8 +1,8 @@ -From 927a677bdc854f1a8cbd766560486c5ffdea0ab7 Mon Sep 17 00:00:00 2001 +From 7bbcd56628309225e630e511e612cd3b82762294 Mon Sep 17 00:00:00 2001 From: Tatyana Nikolova Date: Fri, 7 Sep 2012 19:45:21 -0500 -Subject: [PATCH 4/4] RDMA/nes: TSO is enabled again for linux-3.5 - Backport - change +Subject: [PATCH 24/25] RDMA/nes: TSO is enabled again for linux-3.5 - + Backport change RDMA/nes: TSO is enabled again for linux-3.5 (the patch should be applied on top of previous backports) @@ -13,10 +13,10 @@ Signed-off-by: Tatyana Nikolova 1 file changed, 2 deletions(-) diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c -index 5242294..4f73965 100644 +index 696b80e..7674358 100644 --- a/drivers/infiniband/hw/nes/nes_nic.c +++ b/drivers/infiniband/hw/nes/nes_nic.c -@@ -1758,12 +1758,10 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev, +@@ -1760,12 +1760,10 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev, netdev->features |= NETIF_F_HIGHDMA | NETIF_F_HW_VLAN_TX; if ((nesvnic->logical_port < 2) || (nesdev->nesadapter->hw_rev != NE020_REV)) { diff --git a/patches/0025-ib_srp-Backport-to-older-kernels.patch b/patches/0025-ib_srp-Backport-to-older-kernels.patch new file mode 100644 index 0000000..eb1945a --- /dev/null +++ b/patches/0025-ib_srp-Backport-to-older-kernels.patch @@ -0,0 +1,186 @@ +From a9832b255f02b99997a13e2d25698f1228292cf4 Mon Sep 17 00:00:00 2001 +From: Bart Van Assche +Date: Wed, 12 Sep 2012 14:31:04 +0200 +Subject: [PATCH 25/25] ib_srp: Backport to older kernels + +This patch has been tested on RHEL 6.0, RHEL 6.1, RHEL 6.2, RHEL 6.3 +and Ubuntu 10.04. + +Signed-off-by: Bart Van Assche +--- + drivers/infiniband/ulp/srp/ib_srp.c | 111 ++++++++++++++++++++++++++++++++++- + 1 file changed, 108 insertions(+), 3 deletions(-) + +diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c +index bcbf22e..fab74e0 100644 +--- a/drivers/infiniband/ulp/srp/ib_srp.c ++++ b/drivers/infiniband/ulp/srp/ib_srp.c +@@ -32,6 +32,10 @@ + + #define pr_fmt(fmt) PFX fmt + ++#define DRV_NAME "ib_srp" ++#define PFX DRV_NAME ": " ++ ++#include + #include + #include + #include +@@ -41,7 +45,11 @@ + #include + #include + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) + #include ++#else ++#include ++#endif + + #include + #include +@@ -51,11 +59,54 @@ + + #include "ib_srp.h" + +-#define DRV_NAME "ib_srp" +-#define PFX DRV_NAME ": " + #define DRV_VERSION "0.2" + #define DRV_RELDATE "November 1, 2005" + ++#ifndef pr_warn ++#define pr_warn pr_warning ++#endif ++ ++#if !defined(RHEL_MAJOR) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37) || \ ++ RHEL_MAJOR -0 < 6 || RHEL_MAJOR -0 == 6 && RHEL_MINOR -0 == 0 ++struct srp_cred_req { ++ u8 opcode; ++ u8 sol_not; ++ u8 reserved[2]; ++ __be32 req_lim_delta; ++ u64 tag; ++}; ++ ++struct srp_cred_rsp { ++ u8 opcode; ++ u8 reserved[7]; ++ u64 tag; ++}; ++ ++/* ++ * The SRP spec defines the fixed portion of the AER_REQ structure to be ++ * 36 bytes, so it needs to be packed to avoid having it padded to 40 bytes ++ * on 64-bit architectures. ++ */ ++struct srp_aer_req { ++ u8 opcode; ++ u8 sol_not; ++ u8 reserved[2]; ++ __be32 req_lim_delta; ++ u64 tag; ++ u32 reserved2; ++ __be64 lun; ++ __be32 sense_data_len; ++ u32 reserved3; ++ u8 sense_data[0]; ++} __attribute__((packed)); ++ ++struct srp_aer_rsp { ++ u8 opcode; ++ u8 reserved[7]; ++ u64 tag; ++}; ++#endif ++ + MODULE_AUTHOR("Roland Dreier"); + MODULE_DESCRIPTION("InfiniBand SCSI RDMA Protocol initiator " + "v" DRV_VERSION " (" DRV_RELDATE ")"); +@@ -675,7 +726,11 @@ err: + if (target->state == SRP_TARGET_CONNECTING) { + target->state = SRP_TARGET_DEAD; + INIT_WORK(&target->work, srp_remove_work); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) + queue_work(ib_wq, &target->work); ++#else ++ schedule_work(&target->work); ++#endif + } + spin_unlock_irq(&target->lock); + +@@ -1254,7 +1309,50 @@ static void srp_send_completion(struct ib_cq *cq, void *target_ptr) + } + } + +-static int srp_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scmnd) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) ++/* ++ * Kernel with host lock push-down patch. See also upstream commit ++ * f281233d3eba15fb225d21ae2e228fd4553d824a. ++ */ ++#define SRP_QUEUECOMMAND srp_queuecommand ++#elif defined(RHEL_MAJOR) && RHEL_MAJOR -0 == 6 && RHEL_MINOR -0 >= 2 ++/* ++ * Kernel with lockless SCSI command dispatching enabled. ++ * See also the RHEL 6.2 release notes (http://access.redhat.com/knowledge/docs/en-US/Red_Hat_Enterprise_Linux/6/html-single/6.2_Release_Notes/index.html). ++ */ ++static int srp_queuecommand_wrk(struct Scsi_Host *shost, ++ struct scsi_cmnd *scmnd); ++static int srp_queuecommand(struct scsi_cmnd *scmnd, ++ void (*done)(struct scsi_cmnd *)) ++{ ++ scmnd->scsi_done = done; ++ return srp_queuecommand_wrk(scmnd->device->host, scmnd); ++} ++#define SRP_QUEUECOMMAND srp_queuecommand_wrk ++#else ++/* ++ * Kernel that invokes srp_queuecommand with the SCSI host lock held. ++ */ ++static int srp_queuecommand_wrk(struct Scsi_Host *shost, ++ struct scsi_cmnd *scmnd); ++static int srp_queuecommand(struct scsi_cmnd *scmnd, ++ void (*done)(struct scsi_cmnd *)) ++{ ++ struct Scsi_Host *shost = scmnd->device->host; ++ int res; ++ ++ spin_unlock_irq(shost->host_lock); ++ ++ scmnd->scsi_done = done; ++ res = srp_queuecommand_wrk(shost, scmnd); ++ ++ spin_lock_irq(shost->host_lock); ++ return res; ++} ++#define SRP_QUEUECOMMAND srp_queuecommand_wrk ++#endif ++ ++static int SRP_QUEUECOMMAND(struct Scsi_Host *shost, struct scsi_cmnd *scmnd) + { + struct srp_target_port *target = host_to_target(shost); + struct srp_request *req; +@@ -1822,6 +1920,9 @@ static struct scsi_host_template srp_template = { + .name = "InfiniBand SRP initiator", + .proc_name = DRV_NAME, + .info = srp_target_info, ++#if defined(RHEL_MAJOR) && RHEL_MAJOR -0 == 6 && RHEL_MINOR -0 >= 2 ++ .lockless = true, ++#endif + .queuecommand = srp_queuecommand, + .eh_abort_handler = srp_abort, + .eh_device_reset_handler = srp_reset_device, +@@ -2412,7 +2513,11 @@ static void srp_remove_one(struct ib_device *device) + * started before we marked our target ports as + * removed, and any target port removal tasks. + */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) + flush_workqueue(ib_wq); ++#else ++ flush_scheduled_work(); ++#endif + + list_for_each_entry_safe(target, tmp_target, + &host->target_list, list) { +-- +1.7.9.5 + -- 2.46.0