From owner-freebsd-current@FreeBSD.ORG Mon Mar 21 20:56:16 2011 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 890C7106564A for ; Mon, 21 Mar 2011 20:56:16 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id DDD178FC1A for ; Mon, 21 Mar 2011 20:56:15 +0000 (UTC) Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id p2LKuBpT086444 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 21 Mar 2011 22:56:11 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4) with ESMTP id p2LKuBVG012535; Mon, 21 Mar 2011 22:56:11 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4/Submit) id p2LKuB31012534; Mon, 21 Mar 2011 22:56:11 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Mon, 21 Mar 2011 22:56:11 +0200 From: Kostik Belousov To: jeff@freebsd.org Message-ID: <20110321205611.GQ78089@deviant.kiev.zoral.com.ua> References: <201103212003.p2LK3qwU015306@freebsd-current.sentex.ca> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="u8GK5qt9ozrD+ZhJ" Content-Disposition: inline In-Reply-To: <201103212003.p2LK3qwU015306@freebsd-current.sentex.ca> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: clamav-milter 0.95.2 at skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-3.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: current@freebsd.org Subject: Re: [head tinderbox] failure on i386/i386 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Mar 2011 20:56:16 -0000 --u8GK5qt9ozrD+ZhJ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Mar 21, 2011 at 08:03:52PM +0000, FreeBSD Tinderbox wrote: > TB --- 2011-03-21 17:50:00 - tinderbox 2.6 running on freebsd-current.sen= tex.ca > TB --- 2011-03-21 17:50:00 - starting HEAD tinderbox run for i386/i386 > TB --- 2011-03-21 17:50:00 - cleaning the object tree > TB --- 2011-03-21 17:50:13 - cvsupping the source tree > TB --- 2011-03-21 17:50:13 - /usr/bin/csup -z -r 3 -g -L 1 -h cvsup.sente= x.ca /tinderbox/HEAD/i386/i386/supfile > TB --- 2011-03-21 17:50:55 - building world > TB --- 2011-03-21 17:50:55 - MAKEOBJDIRPREFIX=3D/obj > TB --- 2011-03-21 17:50:55 - PATH=3D/usr/bin:/usr/sbin:/bin:/sbin > TB --- 2011-03-21 17:50:55 - TARGET=3Di386 > TB --- 2011-03-21 17:50:55 - TARGET_ARCH=3Di386 > TB --- 2011-03-21 17:50:55 - TZ=3DUTC > TB --- 2011-03-21 17:50:55 - __MAKE_CONF=3D/dev/null > TB --- 2011-03-21 17:50:55 - cd /src > TB --- 2011-03-21 17:50:55 - /usr/bin/make -B buildworld > >>> World build started on Mon Mar 21 17:50:55 UTC 2011 > >>> Rebuilding the temporary build tree > >>> stage 1.1: legacy release compatibility shims > >>> stage 1.2: bootstrap tools > >>> stage 2.1: cleaning up the object tree > >>> stage 2.2: rebuilding the object tree > >>> stage 2.3: build tools > >>> stage 3: cross tools > >>> stage 4.1: building includes > >>> stage 4.2: building libraries > >>> stage 4.3: make dependencies > >>> stage 4.4: building everything > >>> World build completed on Mon Mar 21 19:42:02 UTC 2011 > TB --- 2011-03-21 19:42:02 - generating LINT kernel config > TB --- 2011-03-21 19:42:02 - cd /src/sys/i386/conf > TB --- 2011-03-21 19:42:02 - /usr/bin/make -B LINT > TB --- 2011-03-21 19:42:02 - building LINT kernel > TB --- 2011-03-21 19:42:02 - MAKEOBJDIRPREFIX=3D/obj > TB --- 2011-03-21 19:42:02 - PATH=3D/usr/bin:/usr/sbin:/bin:/sbin > TB --- 2011-03-21 19:42:02 - TARGET=3Di386 > TB --- 2011-03-21 19:42:02 - TARGET_ARCH=3Di386 > TB --- 2011-03-21 19:42:02 - TZ=3DUTC > TB --- 2011-03-21 19:42:02 - __MAKE_CONF=3D/dev/null > TB --- 2011-03-21 19:42:02 - cd /src > TB --- 2011-03-21 19:42:02 - /usr/bin/make -B buildkernel KERNCONF=3DLINT > >>> Kernel build for LINT started on Mon Mar 21 19:42:02 UTC 2011 > >>> stage 1: configuring the kernel > >>> stage 2.1: cleaning up the object tree > >>> stage 2.2: rebuilding the object tree > >>> stage 2.3: build tools > >>> stage 3.1: making dependencies > >>> stage 3.2: building everything > [...] > objcopy --strip-debug mlx.ko > =3D=3D=3D> mlx4 (all) > cc -O2 -pipe -DINET6 -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE = -nostdinc -I/src/sys/modules/mlx4/../../ofed/drivers/net/mlx4 -I/src/sys/m= odules/mlx4/../../ofed/include/ -DHAVE_KERNEL_OPTION_HEADERS -include /obj/= i386.i386/src/sys/LINT/opt_global.h -I. -I@ -I@/contrib/altq -finline-limit= =3D8000 --param inline-unit-growth=3D100 --param large-function-growth=3D10= 00 -fno-common -I/obj/i386.i386/src/sys/LINT -fno-builtin -mno-align-long-= strings -mpreferred-stack-boundary=3D2 -mno-mmx -mno-3dnow -mno-sse -mno-ss= e2 -mno-sse3 -msoft-float -ffreestanding -fstack-protector -std=3Diso9899:1= 999 -fstack-protector -Wall -Wredundant-decls -Wnested-externs -Wstrict-pro= totypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef= -Wno-pointer-sign -fformat-extensions -Wno-cast-qual -Wno-pointer-arith -f= ms-extensions -c /src/sys/modules/mlx4/../../ofed/drivers/net/mlx4/alloc.c > cc1: warnings being treated as errors > In file included from /src/sys/modules/mlx4/../../ofed/include/linux/slab= .h:37, > from /src/sys/modules/mlx4/../../ofed/drivers/net/mlx4/a= lloc.c:35: > /src/sys/modules/mlx4/../../ofed/include/linux/gfp.h: In function 'page_a= ddress': > /src/sys/modules/mlx4/../../ofed/include/linux/gfp.h:59: warning: cast to= pointer from integer of different size > *** Error code 1 >=20 > Stop in /src/sys/modules/mlx4. > *** Error code 1 >=20 > Stop in /src/sys/modules. > *** Error code 1 >=20 > Stop in /obj/i386.i386/src/sys/LINT. > *** Error code 1 >=20 > Stop in /src. > *** Error code 1 >=20 > Stop in /src. > TB --- 2011-03-21 20:03:52 - WARNING: /usr/bin/make returned exit code 1= =20 > TB --- 2011-03-21 20:03:52 - ERROR: failed to build lint kernel > TB --- 2011-03-21 20:03:52 - 6470.66 user 1063.61 system 8031.83 real >=20 The patch below allows me to finish the kernel compilation on i386, as well as on amd64. I do not have better idea for the ib_addr.h chunk. This leaves the ia64 failure unhandled. diff --git a/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c b/sys/ofed/d= rivers/infiniband/hw/mthca/mthca_main.c index 772cf8c..5401364 100644 --- a/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c +++ b/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c @@ -1228,8 +1228,8 @@ static int __devinit mthca_init_one(struct pci_dev *p= dev, } =20 if (id->driver_data >=3D ARRAY_SIZE(mthca_hca_table)) { - printk(KERN_ERR PFX "%s has invalid driver data %lx\n", - pci_name(pdev), id->driver_data); + printk(KERN_ERR PFX "%s has invalid driver data %jx\n", + pci_name(pdev), (uintmax_t)id->driver_data); mutex_unlock(&mthca_device_mutex); return -ENODEV; } diff --git a/sys/ofed/include/linux/gfp.h b/sys/ofed/include/linux/gfp.h index 7f8a24f..661ff41 100644 --- a/sys/ofed/include/linux/gfp.h +++ b/sys/ofed/include/linux/gfp.h @@ -56,7 +56,8 @@ page_address(struct page *page) =20 if (page->object !=3D kmem_object && page->object !=3D kernel_object) return (NULL); - return (void *)(VM_MIN_KERNEL_ADDRESS + IDX_TO_OFF(page->pindex)); + return ((void *)(uintptr_t)(VM_MIN_KERNEL_ADDRESS + + IDX_TO_OFF(page->pindex))); } =20 static inline unsigned long diff --git a/sys/ofed/include/linux/scatterlist.h b/sys/ofed/include/linux/= scatterlist.h index 611ad56..49dc31d 100644 --- a/sys/ofed/include/linux/scatterlist.h +++ b/sys/ofed/include/linux/scatterlist.h @@ -36,7 +36,7 @@ struct scatterlist { struct page *page; struct scatterlist *sg; } sl_un; - unsigned long address; + dma_addr_t address; unsigned long offset; uint32_t length; uint32_t flags; diff --git a/sys/ofed/include/rdma/ib_addr.h b/sys/ofed/include/rdma/ib_add= r.h index 61b0a7c..0783abe 100644 --- a/sys/ofed/include/rdma/ib_addr.h +++ b/sys/ofed/include/rdma/ib_addr.h @@ -247,6 +247,7 @@ static inline int iboe_get_rate(struct net_device *dev) #else static inline int iboe_get_rate(struct net_device *dev) { +#ifdef __amd64__ if (dev->if_baudrate >=3D IF_Gbps(40ULL)) return IB_RATE_40_GBPS; else if (dev->if_baudrate >=3D IF_Gbps(30ULL)) @@ -256,6 +257,7 @@ static inline int iboe_get_rate(struct net_device *dev) else if (dev->if_baudrate >=3D IF_Gbps(10ULL)) return IB_RATE_10_GBPS; else +#endif return IB_RATE_PORT_CURRENT; } #endif --u8GK5qt9ozrD+ZhJ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iEYEARECAAYFAk2Hu2sACgkQC3+MBN1Mb4gUFQCdFqs4nDeGHKdLUOdLBmiSTmi0 u3gAnRqTmOZz9q3k0UbnwIGxZh8j471H =Yz6G -----END PGP SIGNATURE----- --u8GK5qt9ozrD+ZhJ--