From owner-freebsd-current@FreeBSD.ORG Thu Feb 27 05:35:12 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C0B26D27 for ; Thu, 27 Feb 2014 05:35:12 +0000 (UTC) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2B48D1853 for ; Thu, 27 Feb 2014 05:35:11 +0000 (UTC) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.8/8.14.8) with ESMTP id s1R5Yj5d026305 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 27 Feb 2014 09:34:45 +0400 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.8/8.14.8/Submit) id s1R5YiJT026304; Thu, 27 Feb 2014 09:34:44 +0400 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Thu, 27 Feb 2014 09:34:44 +0400 From: Gleb Smirnoff To: Justin Hibbits , FreeBSD Current Subject: Re: Build failure on PowerPC in pf Message-ID: <20140227053444.GY9670@glebius.int.ru> References: <20140226212017.GY92037@funkthat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140226212017.GY92037@funkthat.com> User-Agent: Mutt/1.5.22 (2013-10-16) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 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: Thu, 27 Feb 2014 05:35:12 -0000 On Wed, Feb 26, 2014 at 01:20:17PM -0800, John-Mark Gurney wrote: J> Justin Hibbits wrote this message on Wed, Feb 26, 2014 at 11:12 -0800: J> > On Wed, Feb 26, 2014 at 10:32 AM, Justin Hibbits wrote: J> > > Building on PowerPC I see the following failure: J> > > J> > > cc1: warnings being treated as errors J> > > J> > > /home/chmeee/freebsd/head/sys/modules/pf/../../netpfil/pf/pf_ioctl.c: J> > > In function 'pfioctl': J> > > /home/chmeee/freebsd/head/sys/modules/pf/../../netpfil/pf/pf_ioctl.c:1357:warning: J> > > cast to pointer from integer of different size [-Wint-to-pointer-cast] J> > > /home/chmeee/freebsd/head/sys/modules/pf/../../netpfil/pf/pf_ioctl.c:1359:warning: J> > > cast to pointer from integer of different size [-Wint-to-pointer-cast] J> > > /home/chmeee/freebsd/head/sys/modules/pf/../../netpfil/pf/pf_ioctl.c:1361:warning: J> > > cast to pointer from integer of different size [-Wint-to-pointer-cast] J> > > J> > > struct pf_rule has counter_u64_t entries, which are actually pointers J> > > to uint64_t's. These pointers get assigned from the result of J> > > counter_u64_fetch(), which returns a uint64_t. Looks to me like J> > > there's a bug in here, but I have no idea what to do to fix it. And J> > > I'm surprised this hasn't been reported against other 32-bit J> > > architectures. J> > J> > Replying to myself, it looks like this was broken by r261882. J> J> This comment says it all: J> 1352 glebius 261882 /* J> 1353 * XXXGL: this is what happens when internal kernel J> 1354 * structures are used as ioctl API structures. J> 1355 */ J> J> So, one way could be to use a union for the states: J> union { J> struct { J> counter_u64_t states_cur; J> counter_u64_t states_tot; J> counter_u64_t src_nodes; J> } k; J> struct { J> uint64_t states_cur; J> uint64_t states_tot; J> uint64_t src_nodes; J> } u; J> } u; J> J> The other option is to cast through uintptr_t... J> J> Even though it'd make the code a bit more ugly, I'd vote for the union, J> since it's designed for what the code is trying to do... Union should work fine. I will try to handle that today. Since it bites me for the third time, I'm even ready to add 3 uint64_t fields to pf_rule, they will be used only in ioctl(). Not used through the kernel. -- Totus tuus, Glebius.