From owner-freebsd-current@FreeBSD.ORG Wed Jun 3 09:54:35 2009 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 02CA51065678; Wed, 3 Jun 2009 09:54:35 +0000 (UTC) (envelope-from rea-fbsd@codelabs.ru) Received: from 0.mx.codelabs.ru (0.mx.codelabs.ru [144.206.177.45]) by mx1.freebsd.org (Postfix) with ESMTP id 9C25B8FC1B; Wed, 3 Jun 2009 09:54:34 +0000 (UTC) (envelope-from rea-fbsd@codelabs.ru) DomainKey-Signature: a=rsa-sha1; q=dns; c=simple; s=one; d=codelabs.ru; h=Received:Date:From:To:Cc:Subject:Message-ID:Reply-To:References:MIME-Version:Content-Type:Content-Disposition:In-Reply-To:Sender; b=CeONk6T3gWwMvRUQZ9MNgIeeyWfoQz+0AqRe3TgcTHHbK3kbevFembeXcdBjRemZ1lL2BmlMShOi9q8zH8ZDcptjSlR77LrV2j7VpuxmgnLahFcd7Kr1BjvCD0vr3BKMyvOQAFvj4IQKs1TZWsTP1wwpSckRueQ2ihDgMpcKQGc=; Received: from void.codelabs.ru (void.codelabs.ru [144.206.177.25]) by 0.mx.codelabs.ru with esmtpsa (TLSv1:AES256-SHA:256) id 1MBnB2-000Lfc-SZ; Wed, 03 Jun 2009 13:54:33 +0400 Date: Wed, 3 Jun 2009 13:54:30 +0400 From: Eygene Ryabinkin To: FreeBSD Tinderbox Message-ID: References: <20090602222445.2F6017302F@freebsd-current.sentex.ca> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="1X+6QtwRodzgDPAC" Content-Disposition: inline In-Reply-To: Sender: rea-fbsd@codelabs.ru Cc: marius@freebsd.org, sparc64@freebsd.org, rwatson@freebsd.org, kmacy@freebsd.org, current@freebsd.org Subject: Re: [head tinderbox] failure on sparc64/sun4v X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: rea-fbsd@codelabs.ru List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2009 09:54:36 -0000 --1X+6QtwRodzgDPAC Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Wed, Jun 03, 2009 at 09:25:38AM +0400, Eygene Ryabinkin wrote: > Tue, Jun 02, 2009 at 06:24:45PM -0400, FreeBSD Tinderbox wrote: > > cc -c -O2 -pipe -fno-strict-aliasing -std=c99 -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -nostdinc -I. -I/src/sys -I/src/sys/contrib/altq -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common -finline-limit=15000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-builtin -mcmodel=medany -msoft-float -ffreestanding -fstack-protector -Werror /src/sys/sun4v/sun4v/machdep.c > > /src/sys/sun4v/sun4v/machdep.c:192: error: size of array '__assert192' is negative > > *** Error code 1 > > > > Stop in /obj/sun4v/src/sys/LINT. > > This seems to be related to the recent NETISR changes, namely, the > addition of the pc_netisr member to the struct pcpu: > http://svn.freebsd.org/viewvc/base/head/sys/sys/pcpu.h?r1=187679&r2=193219&diff_format=u > > I am not sure how large (void *) is on sun4v, but it seems to me > that it is 4 bytes long, so PCPU_MD_FIELDS_PAD inside sun4v/include/pcpu.h ^^^^^^^^^^^^ Sorry, eight bytes long: wrote 4, but really meant 8 ;)) > should be compensated for this change. Something like > ----- > #ifdef KTR > #define PCPU_MD_FIELDS_PAD (3 - (PCPU_NAME_LEN + 7) / 8) > #else > #define PCPU_MD_FIELDS_PAD 3 > #endif > ----- > though I am not very sure about KTR's case. KTR's case seems to be wrong for PCPU_NAME_LEN larger than 24 bytes. Just now we won't be able to reach this with the current definition for PCPU_NAME_LEN, but some day (N - (PCPU_NAME_LEN + 7)/8) can become negative and that's bad. The attached patch should fix this (although I have no sun4v to test on, so take it with a grain of salt). By the way, having looked at sys/sys/pcpu.h, I see that there are parts of 'struct pcpu' that depend on the KTR_PERCPU being defined and they are never compensated with padding in PCPU_MD_FIELDS for sun4v. Is KTR_PERCPU constant for sun4v (inexisting or defined everytime) or I am missing something? Thanks. -- Eygene _ ___ _.--. # \`.|\..----...-'` `-._.-'_.-'` # Remember that it is hard / ' ` , __.--' # to read the on-line manual )/' _/ \ `-_, / # while single-stepping the kernel. `-'" `"\_ ,_.-;_.-\_ ', fsc/as # _.-'_./ {_.' ; / # -- FreeBSD Developers handbook {_.-``-' {_/ # --1X+6QtwRodzgDPAC Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=p diff --git a/sys/sun4v/include/pcpu.h b/sys/sun4v/include/pcpu.h index 434f1cd..12eddf2 100644 --- a/sys/sun4v/include/pcpu.h +++ b/sys/sun4v/include/pcpu.h @@ -38,11 +38,20 @@ struct pmap; -#ifdef KTR -#define PCPU_MD_FIELDS_PAD (4 - (PCPU_NAME_LEN + 7) / 8) -#else -#define PCPU_MD_FIELDS_PAD 4 -#endif +/* Alignment requirements for 'struct pcpu', must be power of two. */ +#define PCPU_ALIGN (1<<6) +/* Bytes per one pad entry */ +#define PCPU_BPP 8 +/* Maximal size of padding */ +#define PCPU_MAXPAD (PCPU_ALIGN / PCPU_BPP) + +#if defined(KTR) +#define _KTR_PAD (PCPU_MAXPAD - ((PCPU_NAME_LEN + PCPU_BPP - 1)/PCPU_BPP) % PCPU_MAXPAD) +#else /* defined(KTR) */ +#define _KTR_PAD 0 +#endif /* defined(KTR) */ + +#define PCPU_MD_FIELDS_PAD ((3 + _KTR_PAD) % PCPU_MAXPAD) /* * Inside the kernel, the globally reserved register g7 is used to --1X+6QtwRodzgDPAC--