Hi Vladimir,
I sent the patches to the list with git-send-email but I just checked
the mail logs and I'm
getting a timeout from lists.openfabrics.org for those messages.
So here they are directly :).
Sorry for the delay.
David
Vladimir Sokolovsky wrote:
git://git.openfabrics.org/ofed_1_2/linux-2.6.git
- its my git tree,
David can't commit his patches to this tree (he does not have
permissions)...
So, probably he have a clone of my tree somewhere.
Regards,
Vladimir
Moshe Kazir wrote:
He wrote ->
commit 3db835ee0edb792b120ba10c8066e3d4409de2d7
git://git.openfabrics.org/ofed_1_2/linux-2.6.git
Moshe
____________________________________________________________
Moshe Katzir | +972-9971-8639 (o) | +972-52-860-6042 (m)
Voltaire - The Grid Backbone
www.voltaire.com
-----Original Message-----
From: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED] On Behalf Of Vladimir
Sokolovsky
Sent: Sunday, December 30, 2007 9:37 AM
To: David B. Anderson
Cc: [email protected]
Subject: Re: [ofa-general] [PATCH] LNXI Fixed ofed_scripts configure to
selectsp4 patches for SLES9 kernel with minor versions equalor greater
than 305
Hi David,
Where can I get your patches?
Regards,
Vladimir
David B. Anderson wrote:
Hi Vladimir,
The four patches named below are what I'm using to get the OFED
1.2.5 kernel to build for SLES9 SP4.
commit 3db835ee0edb792b120ba10c8066e3d4409de2d7
git://git.openfabrics.org/ofed_1_2/linux-2.6.git
The patches are:
[PATCH 1/4] LNXI changed ofed_scripts configure to select sp4 patches
[PATCH 2/4] LNXI created backport patch addr_8802_to_2_6_5-7_308
[PATCH 3/4] LNXI fixed backport/2.6.5_sles9_sp4/rds_to_2_6_9.patch
[PATCH 4/4] LNXI fixed backport/2.6.5_sles9_sp4/cxg3_to_2_6_20.patch
I've tested these on my cluster.
Note: I changed your patch to the ofed_scripts/configure script, so
that even if the SLES9
kernel is greater than 309 it will not revert to using SP3 patches.
David
Vladimir Sokolovsky wrote:
David B. Anderson wrote:
I've all of these patches plus the following patch
kernel_patches/backport/2.6.5_sles9_sp4/cxgb3_remove_eeh.patch
My current git repo is
git://git.openfabrics.org/ofed_1_2/linux-2.6.git
commit: 6974c285e6fb06264f570f9cf919865bab66c9e6
My patch that I posted before fixes the kernel configure script so
that it applies 2.6.5_sles9_sp4 patches for the SP4 release kernel of
2.6.5-7.308 and above. The configure patch from
FED_1.2.5_sles9_sp4_configure.diff has 2.6.5-7.305* as the only valid
SP4 kernel which is incorrect. I get the same compiler error as
before.
Moshe Kazir wrote:
See patches in the attached message.
It was applied by Vlad.
Moshe
____________________________________________________________
Moshe Katzir | +972-9971-8639 (o) | +972-52-860-6042 (m)
Voltaire - The Grid Backbone
www.voltaire.com
-----Original Message-----
From: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED] On Behalf Of David
B.
Anderson
Sent: Saturday, December 15, 2007 3:31 AM
To: [email protected]; [EMAIL PROTECTED]
Subject: [ofa-general] [PATCH] LNXI Fixed ofed_scripts configure to
select sp4 patches for SLES9 kernel with minor versions equal or
greater than 305
Hi,
I've created the following patch for OFED 1.2.5.4 to have the
kernel for
SLES9 SP4 recognized (2.6.5-7.308).
Even with the patch I then had two back port patches not apply
cleanly (cxg3_to_2_6_20.patch, rds_to_2_6_9.patch). I hand
patched them but now I'm getting the following compiler errors:
In file included from
/usr/src/linux-2.6.5-7.308/include/linux/module.h:10,
from
/home/danderson/rpmbuild/BUILD/ofa_kernel/obj/default/kernel_addons
/back
port/2.6.5_sles9_sp4/include/linux/module.h:4,
from
/usr/src/linux-2.6.5-7.308/include/linux/device.h:21,
from
/home/danderson/rpmbuild/BUILD/ofa_kernel/obj/default/kernel_addons
/back
port/2.6.5_sles9_sp4/include/linux/device.h:4,
from
/usr/src/linux-2.6.5-7.308/include/linux/netdevice.h:38,
from
/home/danderson/rpmbuild/BUILD/ofa_kernel/obj/default/kernel_addons
/back
port/2.6.5_sles9_sp4/include/linux/netdevice.h:4,
from
/home/danderson/rpmbuild/BUILD/ofa_kernel/obj/default/drivers/infin
iband
/core/addr.c:32:
/home/danderson/rpmbuild/BUILD/ofa_kernel/obj/default/kernel_addons
/back
port/2.6.5_sles9_sp4/include/linux/sched.h:8: warning: static
declaration for `wait_for_completion_timeout' follows non-static
/home/danderson/rpmbuild/BUILD/ofa_kernel/obj/default/drivers/infin
iband
/core/addr.c:67: warning: initialization from incompatible
pointer type
/home/danderson/rpmbuild/BUILD/ofa_kernel/obj/default/drivers/infin
iband
/core/addr.c: In function `addr_resolve_remote':
/home/danderson/rpmbuild/BUILD/ofa_kernel/obj/default/drivers/infin
iband
/core/addr.c:192: error: structure has no member named `idev'
/home/danderson/rpmbuild/BUILD/ofa_kernel/obj/default/drivers/infin
iband
/core/addr.c:193: error: structure has no member named `idev'
/home/danderson/rpmbuild/BUILD/ofa_kernel/obj/default/drivers/infin
iband
/core/addr.c:197: error: structure has no member named `idev'
/home/danderson/rpmbuild/BUILD/ofa_kernel/obj/default/drivers/infin
iband
/core/addr.c: At top level:
/home/danderson/rpmbuild/BUILD/ofa_kernel/obj/default/kernel_addons
/back
port/2.6.5_sles9_sp4/include/linux/device.h:48: warning:
`class_create' defined but not used
/home/danderson/rpmbuild/BUILD/ofa_kernel/obj/default/kernel_addons
/back
port/2.6.5_sles9_sp4/include/linux/device.h:82: warning:
`class_destroy' defined but not used
/home/danderson/rpmbuild/BUILD/ofa_kernel/obj/default/kernel_addons
/back
port/2.6.5_sles9_sp4/include/linux/device.h:108: warning:
`class_device_create' defined but not used
make[6]: ***
[/home/danderson/rpmbuild/BUILD/ofa_kernel/obj/default/drivers/infi
niban
d/core/addr.o] Error 1
make[5]: ***
[/home/danderson/rpmbuild/BUILD/ofa_kernel/obj/default/drivers/infi
niban
d/core] Error 2
make[4]: ***
[/home/danderson/rpmbuild/BUILD/ofa_kernel/obj/default/drivers/infi
niban
d] Error 2
make[3]: ***
[_module_/home/danderson/rpmbuild/BUILD/ofa_kernel/obj/default]
Error 2
make[2]: *** [modules] Error 2
make[1]: *** [modules] Error 2
make[1]: Leaving directory
`/usr/src/linux-2.6.5-7.308-obj/x86_64/default'
make: *** [kernel] Error 2
Does anyone have OFED 1.2.5.4 building for SLES 9 SP4?
Thanks
-------------------------------------------------------------------
-----
Subject:
[ofa-general] OFED-1.2.5 backport patches for SLES9 SP4
From:
"Moshe Kazir" <[EMAIL PROTECTED]>
Date:
Sun, 25 Nov 2007 09:59:26 +0200
To:
"Vladimir Sokolovsky" <[EMAIL PROTECTED]>,
<[email protected]>
To:
"Vladimir Sokolovsky" <[EMAIL PROTECTED]>,
<[email protected]>
The attached files do the work.
OFED_1.2.5_sles9_sp4_configure.diff include the changes in the
configure file.
OFED_1.2.5_sles9_sp4_backport.diff include the canges requiered in
the kernel_patche and kernel_addons directories.
Moshe
____________________________________________________________
Moshe Katzir | +972-9971-8639 (o) | +972-52-860-6042 (m)
Voltaire - The Grid Backbone
www.voltaire.com
Hi David,
Please try the latest OFED-1.2.5.4-20071219-0824.tgz build on your
SLES9SP4.
http://www.openfabrics.org/builds/connectx/OFED-1.2.5.4-20071219-0824
.tgz
Thanks,
Vladimir
_______________________________________________
general mailing list
[email protected]
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/general
To unsubscribe, please visit
http://openib.org/mailman/listinfo/openib-general
--
David B. Anderson
Linux Networx
Sr. Software Engineer
Email: [EMAIL PROTECTED]
Phone: (801) 649-1311
>From 63c71b9f841f8b2c796d4fcfd79073b8c87f9e34 Mon Sep 17 00:00:00 2001
From: David B. Anderson <[EMAIL PROTECTED]>
Date: Thu, 20 Dec 2007 15:51:29 -0700
Subject: [PATCH 1/4] LNXI changed ofed_scripts configure to select sp4 patches
LNXI:
Changed ofed_scripts/configure to select sp4 patches for SLES9 kernel with
minor versions equal or greater than 305. This prevents reversion to sp3
patches if kernel is greater that 309.
---
ofed_scripts/configure | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ofed_scripts/configure b/ofed_scripts/configure
index 7efc88d..40efec6 100755
--- a/ofed_scripts/configure
+++ b/ofed_scripts/configure
@@ -171,11 +171,13 @@ ex()
get_backport_dir()
{
case ${KVERSION} in
- 2.6.5-7.30[5-9]*)
- echo 2.6.5_sles9_sp4
- ;;
2.6.5-7.*)
- echo 2.6.5_sles9_sp3
+ minor=$(echo $KVERSION | cut -d"." -f4 | cut -d"-" -f1)
+ if [ "${minor}" -ge "305" ]; then
+ echo 2.6.5_sles9_sp4
+ else
+ echo 2.6.5_sles9_sp3
+ fi
;;
2.6.9-22*)
echo 2.6.9_U2
--
1.5.4.rc1
>From 04cf5ee1d658b03b8d4cb5457cce5edc416674e0 Mon Sep 17 00:00:00 2001
From: David B. Anderson <[EMAIL PROTECTED]>
Date: Thu, 20 Dec 2007 15:58:20 -0700
Subject: [PATCH 2/4] LNXI created backport patch addr_8802_to_2_6_5-7_308
LNXI:
Created backport patch
kernel_patches/backport/2.6.5_sles9_sp4/addr_8802_to_2_6_5-7_308
base off of addr_8802_to_2_6_5-7_244.patch and removed
addr_8802_to_2_6_5-7_244.patch from the SLES9 SP4 patches tree.
---
.../2.6.5_sles9_sp4/addr_8802_to_2_6_5-7_244.patch | 29 --------------------
.../2.6.5_sles9_sp4/addr_8802_to_2_6_5-7_308.patch | 20 +++++++++++++
2 files changed, 20 insertions(+), 29 deletions(-)
delete mode 100644 kernel_patches/backport/2.6.5_sles9_sp4/addr_8802_to_2_6_5-7_244.patch
create mode 100644 kernel_patches/backport/2.6.5_sles9_sp4/addr_8802_to_2_6_5-7_308.patch
diff --git a/kernel_patches/backport/2.6.5_sles9_sp4/addr_8802_to_2_6_5-7_244.patch b/kernel_patches/backport/2.6.5_sles9_sp4/addr_8802_to_2_6_5-7_244.patch
deleted file mode 100644
index 9d1246d..0000000
--- a/kernel_patches/backport/2.6.5_sles9_sp4/addr_8802_to_2_6_5-7_244.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- gen2_devel_kernel-20061130-1554_check/drivers/infiniband/core/addr.c.old 2006-11-30 15:43:07.776283704 +0200
-+++ gen2_devel_kernel-20061130-1554_check/drivers/infiniband/core/addr.c 2006-11-30 15:43:46.803350688 +0200
-@@ -147,8 +145,8 @@ static void addr_send_arp(struct sockadd
- if (ip_route_output_key(&rt, &fl))
- return;
-
-- arp_send(ARPOP_REQUEST, ETH_P_ARP, rt->rt_gateway, rt->idev->dev,
-- rt->rt_src, NULL, rt->idev->dev->dev_addr, NULL);
-+ arp_send(ARPOP_REQUEST, ETH_P_ARP, rt->rt_gateway, rt->u.dst.dev,
-+ rt->rt_src, NULL, rt->u.dst.dev->dev_addr, NULL);
- ip_rt_put(rt);
- }
-
-@@ -171,12 +169,12 @@ static int addr_resolve_remote(struct so
- goto out;
-
- /* If the device does ARP internally, return 'done' */
-- if (rt->idev->dev->flags & IFF_NOARP) {
-- rdma_copy_addr(addr, rt->idev->dev, NULL);
-+ if (rt->u.dst.dev->flags & IFF_NOARP) {
-+ rdma_copy_addr(addr, rt->u.dst.dev, NULL);
- goto put;
- }
-
-- neigh = neigh_lookup(&arp_tbl, &rt->rt_gateway, rt->idev->dev);
-+ neigh = neigh_lookup(&arp_tbl, &rt->rt_gateway, rt->u.dst.dev);
- if (!neigh) {
- ret = -ENODATA;
- goto put;
diff --git a/kernel_patches/backport/2.6.5_sles9_sp4/addr_8802_to_2_6_5-7_308.patch b/kernel_patches/backport/2.6.5_sles9_sp4/addr_8802_to_2_6_5-7_308.patch
new file mode 100644
index 0000000..4fdce94
--- /dev/null
+++ b/kernel_patches/backport/2.6.5_sles9_sp4/addr_8802_to_2_6_5-7_308.patch
@@ -0,0 +1,20 @@
+Created by David B. Anderson ([EMAIL PROTECTED]) based off of
+addr_8802_to_2_6_5-7_244.patch
+--- ofed_kernel-2.6.5-7.308-default/drivers/infiniband/core/addr.c 2007-12-17 15:27:12.046801000 -0700
++++ default/drivers/infiniband/core/addr.c 2007-12-17 17:14:11.476429956 -0700
+@@ -189,12 +189,12 @@
+ goto out;
+
+ /* If the device does ARP internally, return 'done' */
+- if (rt->idev->dev->flags & IFF_NOARP) {
+- rdma_copy_addr(addr, rt->idev->dev, NULL);
++ if (rt->u.dst.dev->flags & IFF_NOARP) {
++ rdma_copy_addr(addr, rt->u.dst.dev, NULL);
+ goto put;
+ }
+
+- neigh = neigh_lookup(&arp_tbl, &rt->rt_gateway, rt->idev->dev);
++ neigh = neigh_lookup(&arp_tbl, &rt->rt_gateway, rt->u.dst.dev);
+ if (!neigh) {
+ ret = -ENODATA;
+ goto put;
--
1.5.4.rc1
>From f75f68e43d609d48702d6b362398e49513eef57b Mon Sep 17 00:00:00 2001
From: David B. Anderson <[EMAIL PROTECTED]>
Date: Thu, 20 Dec 2007 15:59:37 -0700
Subject: [PATCH 3/4] LNXI fixed backport/2.6.5_sles9_sp4/rds_to_2_6_9.patch
LNXI:
Changed kernel_patches/backport/2.6.5_sles9_sp4/rds_to_2_6_9.patch
so it applies to SLES9 SP4 kernel (2.6.5-7.308)
---
.../backport/2.6.5_sles9_sp4/rds_to_2_6_9.patch | 23 +++++++++----------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/kernel_patches/backport/2.6.5_sles9_sp4/rds_to_2_6_9.patch b/kernel_patches/backport/2.6.5_sles9_sp4/rds_to_2_6_9.patch
index cca6ee8..9d200c8 100644
--- a/kernel_patches/backport/2.6.5_sles9_sp4/rds_to_2_6_9.patch
+++ b/kernel_patches/backport/2.6.5_sles9_sp4/rds_to_2_6_9.patch
@@ -1,8 +1,7 @@
-Index: kernel/net/rds/af_rds.c
-===================================================================
---- kernel.orig/net/rds/af_rds.c
-+++ kernel/net/rds/af_rds.c
-@@ -277,8 +277,7 @@ out:
+diff -Nuar ofa_kernel.org/net/rds/af_rds.c ofa_kernel/net/rds/af_rds.c
+--- ofa_kernel.org/net/rds/af_rds.c 2007-12-06 12:51:52.000000000 -0700
++++ ofa_kernel/net/rds/af_rds.c 2007-12-14 17:27:06.657116656 -0700
+@@ -275,8 +275,7 @@
#ifdef KERNEL_HAS_PROTO_REGISTER
static struct proto rds_proto = {
.name = "RDS",
@@ -12,11 +11,11 @@ Index: kernel/net/rds/af_rds.c
};
#endif /* KERNEL_HAS_PROTO_REGISTER */
-Index: kernel/net/rds/rds.h
-===================================================================
---- kernel.orig/net/rds/rds.h
-+++ kernel/net/rds/rds.h
-@@ -18,8 +18,8 @@
+diff -Nuar ofa_kernel.org/net/rds/rds.h ofa_kernel/net/rds/rds.h
+--- ofa_kernel.org/net/rds/rds.h 2007-12-06 12:51:52.000000000 -0700
++++ ofa_kernel/net/rds/rds.h 2007-12-14 17:30:36.602893784 -0700
+@@ -31,8 +31,8 @@
+ #endif
#define KERNEL_HAS_PROTO_REGISTER 1
-#define KERNEL_HAS_INET_SK_RETURNING_INET_SOCK 1
@@ -24,5 +23,5 @@ Index: kernel/net/rds/rds.h
+#undef KERNEL_HAS_INET_SK_RETURNING_INET_SOCK
+#undef KERNEL_HAS_CORE_CALLING_DEV_IOCTL
- /* x86-64 doesn't include kmap_types.h from anywhere */
- #include <asm/kmap_types.h>
+ #ifdef ATOMIC64_INIT
+ #define KERNEL_HAS_ATOMIC64
--
1.5.4.rc1
>From fe0d9a2439078368aee52c8115d8c6e49207c4b8 Mon Sep 17 00:00:00 2001
From: David B. Anderson <[EMAIL PROTECTED]>
Date: Thu, 20 Dec 2007 16:00:50 -0700
Subject: [PATCH 4/4] LNXI fixed backport/2.6.5_sles9_sp4/cxg3_to_2_6_20.patch
LNXI:
Changed kernel_patches/backport/2.6.5_sles9_sp4/cxg3_to_2_6_20.patch
so it applies to SLES9 SP4 kernel (2.6.5-7.308)
---
.../backport/2.6.5_sles9_sp4/cxg3_to_2_6_20.patch | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/kernel_patches/backport/2.6.5_sles9_sp4/cxg3_to_2_6_20.patch b/kernel_patches/backport/2.6.5_sles9_sp4/cxg3_to_2_6_20.patch
index 9cc1dfa..155812b 100644
--- a/kernel_patches/backport/2.6.5_sles9_sp4/cxg3_to_2_6_20.patch
+++ b/kernel_patches/backport/2.6.5_sles9_sp4/cxg3_to_2_6_20.patch
@@ -1,3 +1,6 @@
+Modified by David B. Anderson ([EMAIL PROTECTED]) to apply to
+SLES9 SP4 (2.6.5-7.308)
+
Revert the following with minor modifications:
commit 0ee8d33c64df9a719fd61ba693203e3b33b9e10a
@@ -24,8 +27,8 @@ Index: ofed_kernel/drivers/net/cxgb3/cxgb3_main.c
+#define to_net_dev(class) container_of(class, struct net_device, class_dev)
+
- #define CH_DEVICE(devid, ssid, idx) \
- { PCI_VENDOR_ID_CHELSIO, devid, PCI_ANY_ID, ssid, 0, 0, idx }
+ #define CH_DEVICE(devid, idx) \
+ { PCI_VENDOR_ID_CHELSIO, devid, PCI_ANY_ID, PCI_ANY_ID, 0, 0, idx }
@@ -441,8 +443,7 @@ static int setup_sge_qsets(struct adapte
return 0;
@@ -186,7 +189,7 @@ Index: ofed_kernel/drivers/net/cxgb3/cxgb3_main.c
NULL
};
-@@ -882,7 +879,7 @@ static int offload_open(struct net_devic
+@@ -961,7 +958,7 @@ static int offload_open(struct net_devic
init_smt(adapter);
/* Never mind if the next step fails */
@@ -195,7 +198,7 @@ Index: ofed_kernel/drivers/net/cxgb3/cxgb3_main.c
/* Call back all registered clients */
cxgb3_add_clients(tdev);
-@@ -907,7 +904,7 @@ static int offload_close(struct t3cdev *
+@@ -986,7 +983,7 @@ static int offload_close(struct t3cdev *
/* Call back all registered clients */
cxgb3_remove_clients(tdev);
@@ -204,7 +207,7 @@ Index: ofed_kernel/drivers/net/cxgb3/cxgb3_main.c
tdev->lldev = NULL;
cxgb3_set_dummy_ops(tdev);
-@@ -2475,7 +2472,7 @@ static int __devinit init_one(struct pci
+@@ -2672,7 +2669,7 @@ static int __devinit init_one(struct pci
else if (msi > 0 && pci_enable_msi(pdev) == 0)
adapter->flags |= USING_MSI;
@@ -213,7 +216,7 @@ Index: ofed_kernel/drivers/net/cxgb3/cxgb3_main.c
&cxgb3_attr_group);
print_port_info(adapter, ai);
-@@ -2507,7 +2504,7 @@ static void __devexit remove_one(struct
+@@ -2704,7 +2701,7 @@ static void __devexit remove_one(struct
struct adapter *adapter = dev->priv;
t3_sge_stop(adapter);
@@ -221,7 +224,8 @@ Index: ofed_kernel/drivers/net/cxgb3/cxgb3_main.c
+ sysfs_remove_group(&adapter->port[0]->class_dev.kobj,
&cxgb3_attr_group);
- for_each_port(adapter, i)
+ if (is_offload(adapter)) {
+
Index: ofed_kernel/drivers/net/cxgb3/cxgb3_offload.c
===================================================================
--- ofed_kernel.orig/drivers/net/cxgb3/cxgb3_offload.c 2007-05-29 17:50:02.000000000 +0300
--
1.5.4.rc1
_______________________________________________
general mailing list
[email protected]
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
