From owner-svn-src-user@FreeBSD.ORG Thu May 1 15:17:51 2014 Return-Path: Delivered-To: svn-src-user@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 7D13F9BB for ; Thu, 1 May 2014 15:17:51 +0000 (UTC) Received: from mail-pa0-f44.google.com (mail-pa0-f44.google.com [209.85.220.44]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4E91716CD for ; Thu, 1 May 2014 15:17:50 +0000 (UTC) Received: by mail-pa0-f44.google.com with SMTP id ey11so3758342pad.17 for ; Thu, 01 May 2014 08:17:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:content-type:mime-version:subject:from :in-reply-to:date:cc:content-transfer-encoding:message-id:references :to; bh=ghwsGA4QmRvyRUKsMvtD21SgsevsXk2aiZwq2FtPO5o=; b=KqQnIO2/Vl4LZQK7HRtEQaJFlanFSTd07xZEMp9z5u3yOsDDTUZDTc6jW+DFCPm4zj EgOeDqN9gJ15WRHCPZC88adgbadBMZ4yh9/vVAY24NyLKOnrLyhIvJEzn+l95olxi3c6 wWyR7XBE99Bosd0jZ9skpdzHoAv2aupVqhupfUtAV52iutlkMzbwGIh+OScnwqimMeZy HBeduEcDPOI4DAwXoR/LA7GPOMdZrFx49QYX5rcfu7W3T7+XJpeFJHNZ0fRoItrtp1QB glWhMw00+09WxLaNLX+ybGue55aOucYJkJrep9yNV4TCkZXk9K0hsLLfPCO9zTum9wnR K+Vg== X-Gm-Message-State: ALoCoQkErzkqdzL9k6sALRQn/9W5A3q5oMPdsDLzXfwcRkn53xTt+AbY8rI4Ph/+g4LH9rF6f2Cu X-Received: by 10.66.141.197 with SMTP id rq5mr22686747pab.64.1398957469738; Thu, 01 May 2014 08:17:49 -0700 (PDT) Received: from macintosh-3c0754232d17.corp.netflix.com (dc1-prod.netflix.com. [69.53.236.251]) by mx.google.com with ESMTPSA id tu3sm159041774pab.1.2014.05.01.08.17.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 01 May 2014 08:17:49 -0700 (PDT) Sender: Warner Losh X-Google-Original-From: Warner Losh Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 7.2 \(1874\)) Subject: Re: svn commit: r265187 - in user/dchagin/lemul/sys: amd64/linux amd64/linux32 compat/linux i386/linux From: Warner Losh In-Reply-To: <201405011402.s41E2lnv074130@svn.freebsd.org> Date: Thu, 1 May 2014 09:17:45 -0600 Content-Transfer-Encoding: quoted-printable Message-Id: <559801B7-3515-44C1-ABF4-2ED6D7F1A4F4@gmail.com> References: <201405011402.s41E2lnv074130@svn.freebsd.org> To: Dmitry Chagin X-Mailer: Apple Mail (2.1874) Cc: src-committers@freebsd.org, svn-src-user@freebsd.org X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 May 2014 15:17:51 -0000 Re this and the signals changes: Are you sure that these values are = identical on all linux ABIs? Last time I checked, there was substantial = variation between arm, x86 and mips for these values. Warner On May 1, 2014, at 8:02 AM, Dmitry Chagin wrote: > Author: dchagin > Date: Thu May 1 14:02:47 2014 > New Revision: 265187 > URL: http://svnweb.freebsd.org/changeset/base/265187 >=20 > Log: > To avoid code duplication move MI open/fcntl definitions to the MI > header file. >=20 > Modified: > user/dchagin/lemul/sys/amd64/linux/linux.h > user/dchagin/lemul/sys/amd64/linux32/linux.h > user/dchagin/lemul/sys/compat/linux/linux_file.h > user/dchagin/lemul/sys/compat/linux/linux_socket.c > user/dchagin/lemul/sys/i386/linux/linux.h >=20 > Modified: user/dchagin/lemul/sys/amd64/linux/linux.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 > --- user/dchagin/lemul/sys/amd64/linux/linux.h Thu May 1 = 14:01:45 2014 (r265186) > +++ user/dchagin/lemul/sys/amd64/linux/linux.h Thu May 1 = 14:02:47 2014 (r265187) > @@ -353,44 +353,6 @@ struct l_rt_sigframe { > }; >=20 > /* > - * open/fcntl flags > - */ > -#define LINUX_O_RDONLY 00000000 > -#define LINUX_O_WRONLY 00000001 > -#define LINUX_O_RDWR 00000002 > -#define LINUX_O_ACCMODE 00000003 > -#define LINUX_O_CREAT 00000100 > -#define LINUX_O_EXCL 00000200 > -#define LINUX_O_NOCTTY 00000400 > -#define LINUX_O_TRUNC 00001000 > -#define LINUX_O_APPEND 00002000 > -#define LINUX_O_NONBLOCK 00004000 > -#define LINUX_O_NDELAY LINUX_O_NONBLOCK > -#define LINUX_O_SYNC 00010000 > -#define LINUX_FASYNC 00020000 > -#define LINUX_O_DIRECT 00040000 /* Direct disk = access hint */ > -#define LINUX_O_LARGEFILE 00100000 > -#define LINUX_O_DIRECTORY 00200000 /* Must be a = directory */ > -#define LINUX_O_NOFOLLOW 00400000 /* Do not follow = links */ > -#define LINUX_O_NOATIME 01000000 > -#define LINUX_O_CLOEXEC 02000000 > - > -#define LINUX_F_DUPFD 0 > -#define LINUX_F_GETFD 1 > -#define LINUX_F_SETFD 2 > -#define LINUX_F_GETFL 3 > -#define LINUX_F_SETFL 4 > -#define LINUX_F_GETLK 5 > -#define LINUX_F_SETLK 6 > -#define LINUX_F_SETLKW 7 > -#define LINUX_F_SETOWN 8 > -#define LINUX_F_GETOWN 9 > - > -#define LINUX_F_RDLCK 0 > -#define LINUX_F_WRLCK 1 > -#define LINUX_F_UNLCK 2 > - > -/* > * mount flags > */ > #define LINUX_MS_RDONLY 0x0001 >=20 > Modified: user/dchagin/lemul/sys/amd64/linux32/linux.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 > --- user/dchagin/lemul/sys/amd64/linux32/linux.h Thu May 1 = 14:01:45 2014 (r265186) > +++ user/dchagin/lemul/sys/amd64/linux32/linux.h Thu May 1 = 14:02:47 2014 (r265187) > @@ -468,47 +468,12 @@ struct l_rt_sigframe { > } __packed; >=20 > /* > - * open/fcntl flags > + * arch specific open/fcntl flags > */ > -#define LINUX_O_RDONLY 00000000 > -#define LINUX_O_WRONLY 00000001 > -#define LINUX_O_RDWR 00000002 > -#define LINUX_O_ACCMODE 00000003 > -#define LINUX_O_CREAT 00000100 > -#define LINUX_O_EXCL 00000200 > -#define LINUX_O_NOCTTY 00000400 > -#define LINUX_O_TRUNC 00001000 > -#define LINUX_O_APPEND 00002000 > -#define LINUX_O_NONBLOCK 00004000 > -#define LINUX_O_NDELAY LINUX_O_NONBLOCK > -#define LINUX_O_SYNC 00010000 > -#define LINUX_FASYNC 00020000 > -#define LINUX_O_DIRECT 00040000 /* Direct disk = access hint */ > -#define LINUX_O_LARGEFILE 00100000 > -#define LINUX_O_DIRECTORY 00200000 /* Must be a = directory */ > -#define LINUX_O_NOFOLLOW 00400000 /* Do not follow = links */ > -#define LINUX_O_NOATIME 01000000 > -#define LINUX_O_CLOEXEC 02000000 > - > -#define LINUX_F_DUPFD 0 > -#define LINUX_F_GETFD 1 > -#define LINUX_F_SETFD 2 > -#define LINUX_F_GETFL 3 > -#define LINUX_F_SETFL 4 > -#define LINUX_F_GETLK 5 > -#define LINUX_F_SETLK 6 > -#define LINUX_F_SETLKW 7 > -#define LINUX_F_SETOWN 8 > -#define LINUX_F_GETOWN 9 > - > #define LINUX_F_GETLK64 12 > #define LINUX_F_SETLK64 13 > #define LINUX_F_SETLKW64 14 >=20 > -#define LINUX_F_RDLCK 0 > -#define LINUX_F_WRLCK 1 > -#define LINUX_F_UNLCK 2 > - > union l_semun { > l_int val; > l_uintptr_t buf; >=20 > Modified: user/dchagin/lemul/sys/compat/linux/linux_file.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 > --- user/dchagin/lemul/sys/compat/linux/linux_file.h Thu May 1 = 14:01:45 2014 (r265186) > +++ user/dchagin/lemul/sys/compat/linux/linux_file.h Thu May 1 = 14:02:47 2014 (r265187) > @@ -54,4 +54,42 @@ > #define LINUX_MS_NOEXEC 0x0008 > #define LINUX_MS_REMOUNT 0x0020 >=20 > +/* > + * common open/fcntl flags > + */ > +#define LINUX_O_RDONLY 00000000 > +#define LINUX_O_WRONLY 00000001 > +#define LINUX_O_RDWR 00000002 > +#define LINUX_O_ACCMODE 00000003 > +#define LINUX_O_CREAT 00000100 > +#define LINUX_O_EXCL 00000200 > +#define LINUX_O_NOCTTY 00000400 > +#define LINUX_O_TRUNC 00001000 > +#define LINUX_O_APPEND 00002000 > +#define LINUX_O_NONBLOCK 00004000 > +#define LINUX_O_NDELAY LINUX_O_NONBLOCK > +#define LINUX_O_SYNC 00010000 > +#define LINUX_FASYNC 00020000 > +#define LINUX_O_DIRECT 00040000 /* Direct disk = access hint */ > +#define LINUX_O_LARGEFILE 00100000 > +#define LINUX_O_DIRECTORY 00200000 /* Must be a = directory */ > +#define LINUX_O_NOFOLLOW 00400000 /* Do not follow = links */ > +#define LINUX_O_NOATIME 01000000 > +#define LINUX_O_CLOEXEC 02000000 > + > +#define LINUX_F_DUPFD 0 > +#define LINUX_F_GETFD 1 > +#define LINUX_F_SETFD 2 > +#define LINUX_F_GETFL 3 > +#define LINUX_F_SETFL 4 > +#define LINUX_F_GETLK 5 > +#define LINUX_F_SETLK 6 > +#define LINUX_F_SETLKW 7 > +#define LINUX_F_SETOWN 8 > +#define LINUX_F_GETOWN 9 > + > +#define LINUX_F_RDLCK 0 > +#define LINUX_F_WRLCK 1 > +#define LINUX_F_UNLCK 2 > + > #endif /* !_LINUX_FILE_H_ */ >=20 > Modified: user/dchagin/lemul/sys/compat/linux/linux_socket.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 > --- user/dchagin/lemul/sys/compat/linux/linux_socket.c Thu May = 1 14:01:45 2014 (r265186) > +++ user/dchagin/lemul/sys/compat/linux/linux_socket.c Thu May = 1 14:02:47 2014 (r265187) > @@ -70,6 +70,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #endif > +#include > #include > #include >=20 >=20 > Modified: user/dchagin/lemul/sys/i386/linux/linux.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 > --- user/dchagin/lemul/sys/i386/linux/linux.h Thu May 1 14:01:45 2014 = (r265186) > +++ user/dchagin/lemul/sys/i386/linux/linux.h Thu May 1 14:02:47 2014 = (r265187) > @@ -445,47 +445,12 @@ struct l_rt_sigframe { > extern struct sysentvec linux_sysvec; >=20 > /* > - * open/fcntl flags > + * arch specific open/fcntl flags > */ > -#define LINUX_O_RDONLY 00000000 > -#define LINUX_O_WRONLY 00000001 > -#define LINUX_O_RDWR 00000002 > -#define LINUX_O_ACCMODE 00000003 > -#define LINUX_O_CREAT 00000100 > -#define LINUX_O_EXCL 00000200 > -#define LINUX_O_NOCTTY 00000400 > -#define LINUX_O_TRUNC 00001000 > -#define LINUX_O_APPEND 00002000 > -#define LINUX_O_NONBLOCK 00004000 > -#define LINUX_O_NDELAY LINUX_O_NONBLOCK > -#define LINUX_O_SYNC 00010000 > -#define LINUX_FASYNC 00020000 > -#define LINUX_O_DIRECT 00040000 /* Direct disk = access hint */ > -#define LINUX_O_LARGEFILE 00100000 > -#define LINUX_O_DIRECTORY 00200000 /* Must be a = directory */ > -#define LINUX_O_NOFOLLOW 00400000 /* Do not follow = links */ > -#define LINUX_O_NOATIME 01000000 > -#define LINUX_O_CLOEXEC 02000000 > - > -#define LINUX_F_DUPFD 0 > -#define LINUX_F_GETFD 1 > -#define LINUX_F_SETFD 2 > -#define LINUX_F_GETFL 3 > -#define LINUX_F_SETFL 4 > -#define LINUX_F_GETLK 5 > -#define LINUX_F_SETLK 6 > -#define LINUX_F_SETLKW 7 > -#define LINUX_F_SETOWN 8 > -#define LINUX_F_GETOWN 9 > - > #define LINUX_F_GETLK64 12 > #define LINUX_F_SETLK64 13 > #define LINUX_F_SETLKW64 14 >=20 > -#define LINUX_F_RDLCK 0 > -#define LINUX_F_WRLCK 1 > -#define LINUX_F_UNLCK 2 > - > union l_semun { > l_int val; > struct l_semid_ds *buf; >=20