From owner-svn-src-all@FreeBSD.ORG Sun Oct 5 20:27:32 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F2D5DE58; Sun, 5 Oct 2014 20:27:31 +0000 (UTC) Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:130:3ffc::401:25]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 7E4E96A4; Sun, 5 Oct 2014 20:27:31 +0000 (UTC) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 7C88425D3AA4; Sun, 5 Oct 2014 20:27:28 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 97BFDC76FDB; Sun, 5 Oct 2014 20:27:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id jQekbnfYpB9h; Sun, 5 Oct 2014 20:27:25 +0000 (UTC) Received: from [IPv6:fde9:577b:c1a9:4410:90f6:2af7:ba50:d9b9] (unknown [IPv6:fde9:577b:c1a9:4410:90f6:2af7:ba50:d9b9]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 8AB89C76FD7; Sun, 5 Oct 2014 20:27:23 +0000 (UTC) Content-Type: text/plain; charset=windows-1252 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r272567 - in head/sys: kern sys From: "Bjoern A. Zeeb" In-Reply-To: <201410051940.s95JeUg7069798@svn.freebsd.org> Date: Sun, 5 Oct 2014 20:26:59 +0000 Content-Transfer-Encoding: quoted-printable Message-Id: <2438AED3-AC72-4099-ACD6-E2642B4A866D@FreeBSD.org> References: <201410051940.s95JeUg7069798@svn.freebsd.org> To: Mateusz Guzik , Konstantin Belousov X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Oct 2014 20:27:32 -0000 On 05 Oct 2014, at 19:40 , Mateusz Guzik wrote: > Author: mjg > Date: Sun Oct 5 19:40:29 2014 > New Revision: 272567 > URL: https://svnweb.freebsd.org/changeset/base/272567 >=20 > Log: > filedesc: fix up breakage introduced in 272505 >=20 > Include sequence counter supports incoditionally [1]. This fixes = reprted build > problems with e.g. nvidia driver due to missing opt_capsicum.h. >=20 > Replace fishy looking sizeof with offsetof. Make fde_seq the last = member in > order to simplify calculations. Seing this on an incremental build now for bmake: stopped in /scratch/tmp/bz/head.svn/lib/libkvm = /storage/head/obj//mips.mipsel/scratch/tmp/bz/head.svn/tmp/usr/include/sys= /filedesc.h:57: error: expected specifier-qualifier-list before 'seq_t' I=92ll see if this persists with a full build but I assume it will. >=20 > Suggested by: kib [1] > X-MFC: with 272505 >=20 > Modified: > head/sys/kern/kern_descrip.c > head/sys/sys/filedesc.h >=20 > Modified: head/sys/kern/kern_descrip.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/kern/kern_descrip.c Sun Oct 5 17:35:59 2014 = (r272566) > +++ head/sys/kern/kern_descrip.c Sun Oct 5 19:40:29 2014 = (r272567) > @@ -295,7 +295,7 @@ _fdfree(struct filedesc *fdp, int fd, in > filecaps_free(&fde->fde_caps); > if (last) > return; > - bzero(fde_change(fde), fde_change_size); > + bzero(fde, fde_change_size); > fdunused(fdp, fd); > #ifdef CAPABILITIES > seq_write_end(&fde->fde_seq); > @@ -894,7 +894,7 @@ do_dup(struct thread *td, int flags, int > seq_write_begin(&newfde->fde_seq); > #endif > filecaps_free(&newfde->fde_caps); > - memcpy(fde_change(newfde), fde_change(oldfde), fde_change_size); > + memcpy(newfde, oldfde, fde_change_size); > filecaps_copy(&oldfde->fde_caps, &newfde->fde_caps); > if ((flags & DUP_CLOEXEC) !=3D 0) > newfde->fde_flags =3D oldfde->fde_flags | UF_EXCLOSE; > @@ -2778,7 +2778,7 @@ dupfdopen(struct thread *td, struct file > #ifdef CAPABILITIES > seq_write_begin(&newfde->fde_seq); > #endif > - memcpy(fde_change(newfde), fde_change(oldfde), = fde_change_size); > + memcpy(newfde, oldfde, fde_change_size); > filecaps_copy(&oldfde->fde_caps, &newfde->fde_caps); > #ifdef CAPABILITIES > seq_write_end(&newfde->fde_seq); > @@ -2793,8 +2793,8 @@ dupfdopen(struct thread *td, struct file > #ifdef CAPABILITIES > seq_write_begin(&newfde->fde_seq); > #endif > - memcpy(fde_change(newfde), fde_change(oldfde), = fde_change_size); > - bzero(fde_change(oldfde), fde_change_size); > + memcpy(newfde, oldfde, fde_change_size); > + bzero(oldfde, fde_change_size); > fdunused(fdp, dfd); > #ifdef CAPABILITIES > seq_write_end(&newfde->fde_seq); >=20 > Modified: head/sys/sys/filedesc.h > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/sys/filedesc.h Sun Oct 5 17:35:59 2014 = (r272566) > +++ head/sys/sys/filedesc.h Sun Oct 5 19:40:29 2014 = (r272567) > @@ -33,10 +33,6 @@ > #ifndef _SYS_FILEDESC_H_ > #define _SYS_FILEDESC_H_ >=20 > -#ifdef _KERNEL > -#include "opt_capsicum.h" > -#endif > - > #include > #include > #include > @@ -55,24 +51,16 @@ struct filecaps { > }; >=20 > struct filedescent { > -#ifdef CAPABILITIES > - seq_t fde_seq; /* if you need fde_file = and fde_caps in sync */ > -#endif > struct file *fde_file; /* file structure for = open file */ > struct filecaps fde_caps; /* per-descriptor rights = */ > uint8_t fde_flags; /* per-process open file = flags */ > + seq_t fde_seq; /* if you need fde_file = and fde_caps in sync */ > }; > #define fde_rights fde_caps.fc_rights > #define fde_fcntls fde_caps.fc_fcntls > #define fde_ioctls fde_caps.fc_ioctls > #define fde_nioctls fde_caps.fc_nioctls > -#ifdef CAPABILITIES > -#define fde_change(fde) ((char *)(fde) + sizeof(seq_t)) > -#define fde_change_size (sizeof(struct filedescent) - = sizeof(seq_t)) > -#else > -#define fde_change(fde) ((fde)) > -#define fde_change_size (sizeof(struct filedescent)) > -#endif > +#define fde_change_size (offsetof(struct filedescent, fde_seq)) >=20 > /* > * This structure is used for the management of descriptors. It may = be > @@ -97,9 +85,7 @@ struct filedesc { > int fd_holdleaderscount; /* block fdfree() for shared = close() */ > int fd_holdleaderswakeup; /* fdfree() needs wakeup */ > }; > -#ifdef CAPABILITIES > #define fd_seq(fdp, fd) (&(fdp)->fd_ofiles[(fd)].fde_seq) > -#endif >=20 > /* > * Structure to keep track of (process leader, struct fildedesc) = tuples. >=20 =97=20 Bjoern A. Zeeb "Come on. Learn, goddamn it.", WarGames, 1983