From owner-svn-src-head@freebsd.org  Fri Jul  6 13:25:22 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6F99E1026FA4;
 Fri,  6 Jul 2018 13:25:22 +0000 (UTC)
 (envelope-from Michael.Tuexen@macmic.franken.de)
Received: from drew.franken.de (mail-n.franken.de [193.175.24.27])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "*.franken.de",
 Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id EFD3B80D2A;
 Fri,  6 Jul 2018 13:25:21 +0000 (UTC)
 (envelope-from Michael.Tuexen@macmic.franken.de)
Received: from [IPv6:2003:cd:6f1a:9700:b5c6:bf04:2e47:716d]
 (p200300CD6F1A9700B5C6BF042E47716D.dip0.t-ipconnect.de
 [IPv6:2003:cd:6f1a:9700:b5c6:bf04:2e47:716d])
 (Authenticated sender: macmic)
 by drew.franken.de (Postfix) with ESMTPSA id 65A35721E280D;
 Fri,  6 Jul 2018 15:25:18 +0200 (CEST)
Content-Type: text/plain;
	charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 11.4 \(3445.8.2\))
Subject: Re: svn commit: r335979 - in head: . lib/libkvm sys/kern sys/netinet
 sys/sys usr.bin/netstat usr.bin/sockstat
From: Michael Tuexen <Michael.Tuexen@macmic.franken.de>
In-Reply-To: <201807051313.w65DDnQJ041281@repo.freebsd.org>
Date: Fri, 6 Jul 2018 15:25:17 +0200
Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Content-Transfer-Encoding: quoted-printable
Message-Id: <1C558706-A190-481A-9B5C-458B4EE0747F@macmic.franken.de>
References: <201807051313.w65DDnQJ041281@repo.freebsd.org>
To: Brooks Davis <brooks@freebsd.org>
X-Mailer: Apple Mail (2.3445.8.2)
X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00
 autolearn=disabled version=3.4.1
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Jul 2018 13:25:22 -0000

> On 5. Jul 2018, at 15:13, Brooks Davis <brooks@freebsd.org> wrote:
>=20
> Author: brooks
> Date: Thu Jul  5 13:13:48 2018
> New Revision: 335979
> URL: https://svnweb.freebsd.org/changeset/base/335979
>=20
> Log:
>  Make struct xinpcb and friends word-size independent.
>=20
>  Replace size_t members with ksize_t (uint64_t) and pointer members
>  (never used as pointers in userspace, but instead as unique
>  idenitifiers) with kvaddr_t (uint64_t). This makes the structs
>  identical between 32-bit and 64-bit ABIs.
>=20
>  On 64-bit bit systems, the ABI is maintained. On 32-bit systems,
>  this is an ABI breaking change. The ABI of most of these structs
>  was previously broken in r315662.  This also imposes a small API
>  change on userspace consumers who must handle kernel pointers
>  becoming virtual addresses.
>=20
>  PR:		228301 (exp-run by antoine)
>  Reviewed by:	jtl, kib, rwatson (various versions)
>  Sponsored by:	DARPA, AFRL
>  Differential Revision:	https://reviews.freebsd.org/D15386
>=20
> Modified:
>  head/UPDATING
>  head/lib/libkvm/kvm.h
>  head/sys/kern/kern_descrip.c
>  head/sys/kern/uipc_socket.c
>  head/sys/kern/uipc_usrreq.c
>  head/sys/netinet/in_pcb.c
>  head/sys/netinet/in_pcb.h
>  head/sys/netinet/sctp_sysctl.c
>  head/sys/netinet/sctp_uio.h
>  head/sys/netinet/tcp_var.h
>  head/sys/sys/file.h
>  head/sys/sys/param.h
>  head/sys/sys/socketvar.h
>  head/sys/sys/types.h
>  head/sys/sys/unpcb.h
>  head/usr.bin/netstat/inet.c
>  head/usr.bin/netstat/unix.c
>  head/usr.bin/sockstat/sockstat.c
>=20
> Modified: head/UPDATING
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/UPDATING	Thu Jul  5 11:50:59 2018	(r335978)
> +++ head/UPDATING	Thu Jul  5 13:13:48 2018	(r335979)
> @@ -31,6 +31,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
> 	disable the most expensive debugging functionality run
> 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
>=20
> +20180705:
> +	The ABI of syscalls used by management tools like sockstat and
> +	netstat has been broken to allow 32-bit binaries to work on
> +	64-bit kernels without modification.  These programs will need
> +	to match the kernel in order to function.  External programs may
> +	require minor modifications to accommodate a change of type in
> +	structures from pointers to 64-bit virtual addresses.
> +
> 20180702:
> 	On i386 and amd64 atomics are now inlined. Out of tree modules =
using
> 	atomics will need to be rebuilt.
>=20
> Modified: head/lib/libkvm/kvm.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/lib/libkvm/kvm.h	Thu Jul  5 11:50:59 2018	=
(r335978)
> +++ head/lib/libkvm/kvm.h	Thu Jul  5 13:13:48 2018	=
(r335979)
> @@ -61,8 +61,6 @@ typedef	__ssize_t	ssize_t;
> #define	_SSIZE_T_DECLARED
> #endif
>=20
> -typedef	uint64_t kvaddr_t;		/* An address in a =
target image. */
> -
> struct kvm_nlist {
> 	const char *n_name;
> 	unsigned char n_type;
>=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	Thu Jul  5 11:50:59 2018	=
(r335978)
> +++ head/sys/kern/kern_descrip.c	Thu Jul  5 13:13:48 2018	=
(r335979)
> @@ -3362,10 +3362,10 @@ sysctl_kern_file(SYSCTL_HANDLER_ARGS)
> 			if ((fp =3D fdp->fd_ofiles[n].fde_file) =3D=3D =
NULL)
> 				continue;
> 			xf.xf_fd =3D n;
> -			xf.xf_file =3D fp;
> -			xf.xf_data =3D fp->f_data;
> -			xf.xf_vnode =3D fp->f_vnode;
> -			xf.xf_type =3D fp->f_type;
> +			xf.xf_file =3D (kvaddr_t)fp;
> +			xf.xf_data =3D (kvaddr_t)fp->f_data;
> +			xf.xf_vnode =3D (kvaddr_t)fp->f_vnode;
> +			xf.xf_type =3D (kvaddr_t)fp->f_type;
> 			xf.xf_count =3D fp->f_count;
> 			xf.xf_msgcount =3D 0;
> 			xf.xf_offset =3D foffset_get(fp);
>=20
> Modified: head/sys/kern/uipc_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
> --- head/sys/kern/uipc_socket.c	Thu Jul  5 11:50:59 2018	=
(r335978)
> +++ head/sys/kern/uipc_socket.c	Thu Jul  5 13:13:48 2018	=
(r335979)
> @@ -3985,12 +3985,12 @@ sotoxsocket(struct socket *so, struct xsocket =
*xso)
> {
>=20
> 	xso->xso_len =3D sizeof *xso;
> -	xso->xso_so =3D so;
> +	xso->xso_so =3D (kvaddr_t)so;
> 	xso->so_type =3D so->so_type;
> 	xso->so_options =3D so->so_options;
> 	xso->so_linger =3D so->so_linger;
> 	xso->so_state =3D so->so_state;
> -	xso->so_pcb =3D so->so_pcb;
> +	xso->so_pcb =3D (kvaddr_t)so->so_pcb;
> 	xso->xso_protocol =3D so->so_proto->pr_protocol;
> 	xso->xso_family =3D so->so_proto->pr_domain->dom_family;
> 	xso->so_timeo =3D so->so_timeo;
>=20
> Modified: head/sys/kern/uipc_usrreq.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/uipc_usrreq.c	Thu Jul  5 11:50:59 2018	=
(r335978)
> +++ head/sys/kern/uipc_usrreq.c	Thu Jul  5 13:13:48 2018	=
(r335979)
> @@ -1853,7 +1853,7 @@ unp_pcblist(SYSCTL_HANDLER_ARGS)
>=20
> 		if (freeunp =3D=3D 0 && unp->unp_gencnt <=3D gencnt) {
> 			xu->xu_len =3D sizeof *xu;
> -			xu->xu_unpp =3D unp;
> +			xu->xu_unpp =3D (kvaddr_t)unp;
> 			/*
> 			 * XXX - need more locking here to protect =
against
> 			 * connect/disconnect races for SMP.
> @@ -1870,10 +1870,10 @@ unp_pcblist(SYSCTL_HANDLER_ARGS)
> 				      unp->unp_conn->unp_addr->sun_len);
> 			else
> 				bzero(&xu->xu_caddr, =
sizeof(xu->xu_caddr));
> -			xu->unp_vnode =3D unp->unp_vnode;
> -			xu->unp_conn =3D unp->unp_conn;
> -			xu->xu_firstref =3D LIST_FIRST(&unp->unp_refs);
> -			xu->xu_nextref =3D LIST_NEXT(unp, unp_reflink);
> +			xu->unp_vnode =3D (kvaddr_t)unp->unp_vnode;
> +			xu->unp_conn =3D (kvaddr_t)unp->unp_conn;
> +			xu->xu_firstref =3D =
(kvaddr_t)LIST_FIRST(&unp->unp_refs);
> +			xu->xu_nextref =3D (kvaddr_t)LIST_NEXT(unp, =
unp_reflink);
> 			xu->unp_gencnt =3D unp->unp_gencnt;
> 			sotoxsocket(unp->unp_socket, &xu->xu_socket);
> 			UNP_PCB_UNLOCK(unp);
>=20
> Modified: head/sys/netinet/in_pcb.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/netinet/in_pcb.c	Thu Jul  5 11:50:59 2018	=
(r335978)
> +++ head/sys/netinet/in_pcb.c	Thu Jul  5 13:13:48 2018	=
(r335979)
> @@ -2906,7 +2906,7 @@ in_pcbtoxinpcb(const struct inpcb *inp, struct =
xinpcb=20
> 		bzero(&xi->xi_socket, sizeof(struct xsocket));
> 	bcopy(&inp->inp_inc, &xi->inp_inc, sizeof(struct in_conninfo));
> 	xi->inp_gencnt =3D inp->inp_gencnt;
> -	xi->inp_ppcb =3D inp->inp_ppcb;
> +	xi->inp_ppcb =3D (kvaddr_t)inp->inp_ppcb;
> 	xi->inp_flow =3D inp->inp_flow;
> 	xi->inp_flowid =3D inp->inp_flowid;
> 	xi->inp_flowtype =3D inp->inp_flowtype;
>=20
> Modified: head/sys/netinet/in_pcb.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/netinet/in_pcb.h	Thu Jul  5 11:50:59 2018	=
(r335978)
> +++ head/sys/netinet/in_pcb.h	Thu Jul  5 13:13:48 2018	=
(r335979)
> @@ -366,12 +366,12 @@ struct inpcb {
>  */
> #ifdef _SYS_SOCKETVAR_H_
> struct xinpcb {
> -	size_t		xi_len;		/* length of this structure */
> +	ksize_t		xi_len;			/* length of this =
structure */
> 	struct xsocket	xi_socket;		/* (s,p) */
> 	struct in_conninfo inp_inc;		/* (s,p) */
> 	uint64_t	inp_gencnt;		/* (s,p) */
> 	union {
> -		void	*inp_ppcb;		/* (s) netstat(1) */
> +		kvaddr_t inp_ppcb;		/* (s) netstat(1) */
> 		int64_t	ph_ppcb;
> 	};
> 	int64_t		inp_spare64[4];
> @@ -394,10 +394,12 @@ struct xinpcb {
> } __aligned(8);
>=20
> struct xinpgen {
> -	size_t		xig_len;	/* length of this structure */
> +	ksize_t	xig_len;	/* length of this structure */
> 	u_int		xig_count;	/* number of PCBs at this time =
*/
> +	uint32_t	_xig_spare32;
> 	inp_gen_t	xig_gen;	/* generation count at this time =
*/
> 	so_gen_t	xig_sogen;	/* socket generation count this =
time */
> +	uint64_t	_xig_spare64[4];
> } __aligned(8);
> #ifdef	_KERNEL
> void	in_pcbtoxinpcb(const struct inpcb *, struct xinpcb *);
>=20
> Modified: head/sys/netinet/sctp_sysctl.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/netinet/sctp_sysctl.c	Thu Jul  5 11:50:59 2018	=
(r335978)
> +++ head/sys/netinet/sctp_sysctl.c	Thu Jul  5 13:13:48 2018	=
(r335979)
> @@ -409,7 +409,7 @@ sctp_sysctl_handle_assoclist(SYSCTL_HANDLER_ARGS)
> 		xinpcb.total_recvs =3D inp->total_recvs;
> 		xinpcb.total_nospaces =3D inp->total_nospaces;
> 		xinpcb.fragmentation_point =3D inp->sctp_frag_point;
> -		xinpcb.socket =3D inp->sctp_socket;
> +		xinpcb.socket =3D (kvaddr_t)inp->sctp_socket;
This breaks compilation on 32-bit PPC:

cc -c -O -pipe  -g -nostdinc  -I. -I../../.. =
-I../../../contrib/ck/include -I../../../contrib/libfdt -D_KERNEL =
-DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h  -msoft-float -fPIC =
-fno-omit-frame-pointer -MD  -MF.depend.sctp_sysctl.o -MTsctp_sysctl.o =
-mno-altivec -msoft-float -ffreestanding -fwrapv -fstack-protector =
-gdwarf-2 -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes =
-Wmissing-prototypes -Wpointer-arith -Wcast-qual -Wundef =
-Wno-pointer-sign -fformat-extensions -Wmissing-include-dirs =
-fdiagnostics-show-option -Wno-unknown-pragmas -Wno-uninitialized  =
-fno-common -fms-extensions -finline-limit=3D15000 --param =
inline-unit-growth=3D100 --param large-function-growth=3D1000 -Wa,-many  =
-std=3Diso9899:1999 -Werror  ../../../netinet/sctp_sysctl.c
cc1: warnings being treated as errors
../../../netinet/sctp_sysctl.c: In function =
'sctp_sysctl_handle_assoclist':
../../../netinet/sctp_sysctl.c:412: warning: cast from pointer to =
integer of different size [-Wpointer-to-int-cast]
*** Error code 1

Stop.
make: stopped in /usr/home/tuexen/head/sys/powerpc/compile/TCP-NODEBUG

Best regards
Michael
> 		so =3D inp->sctp_socket;
> 		if ((so =3D=3D NULL) ||
> 		    (!SCTP_IS_LISTENING(inp)) ||
>=20
> Modified: head/sys/netinet/sctp_uio.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/netinet/sctp_uio.h	Thu Jul  5 11:50:59 2018	=
(r335978)
> +++ head/sys/netinet/sctp_uio.h	Thu Jul  5 13:13:48 2018	=
(r335979)
> @@ -1175,14 +1175,11 @@ struct xsctp_inpcb {
> 	uint16_t local_port;
> 	uint16_t qlen_old;
> 	uint16_t maxqlen_old;
> -	void *socket;
> +	uint16_t __spare16;
> +	kvaddr_t socket;
> 	uint32_t qlen;
> 	uint32_t maxqlen;
> -#if defined(__LP64__)
> -	uint32_t extra_padding[27];	/* future */
> -#else
> -	uint32_t extra_padding[28];	/* future */
> -#endif
> +	uint32_t extra_padding[26];	/* future */
> };
>=20
> struct xsctp_tcb {
>=20
> Modified: head/sys/netinet/tcp_var.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/netinet/tcp_var.h	Thu Jul  5 11:50:59 2018	=
(r335978)
> +++ head/sys/netinet/tcp_var.h	Thu Jul  5 13:13:48 2018	=
(r335979)
> @@ -677,7 +677,7 @@ void hhook_run_tcp_est_out(struct tcpcb *tp,
>  */
> #if defined(_NETINET_IN_PCB_H_) && defined(_SYS_SOCKETVAR_H_)
> struct xtcpcb {
> -	size_t		xt_len;		/* length of this structure */
> +	ksize_t	xt_len;		/* length of this structure */
> 	struct xinpcb	xt_inp;
> 	char		xt_stack[TCP_FUNCTION_NAME_LEN_MAX];	/* (s) =
*/
> 	char		xt_logid[TCP_LOG_ID_LEN];	/* (s) */
>=20
> Modified: head/sys/sys/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
> --- head/sys/sys/file.h	Thu Jul  5 11:50:59 2018	=
(r335978)
> +++ head/sys/sys/file.h	Thu Jul  5 13:13:48 2018	=
(r335979)
> @@ -209,18 +209,23 @@ struct file {
>  * Userland version of struct file, for sysctl
>  */
> struct xfile {
> -	size_t	xf_size;	/* size of struct xfile */
> +	ksize_t	xf_size;	/* size of struct xfile */
> 	pid_t	xf_pid;		/* owning process */
> 	uid_t	xf_uid;		/* effective uid of owning process */
> 	int	xf_fd;		/* descriptor number */
> -	void	*xf_file;	/* address of struct file */
> +	int	_xf_int_pad1;
> +	kvaddr_t xf_file;	/* address of struct file */
> 	short	xf_type;	/* descriptor type */
> +	short	_xf_short_pad1;
> 	int	xf_count;	/* reference count */
> 	int	xf_msgcount;	/* references from message queue */
> +	int	_xf_int_pad2;
> 	off_t	xf_offset;	/* file offset */
> -	void	*xf_data;	/* file descriptor specific data */
> -	void	*xf_vnode;	/* vnode pointer */
> +	kvaddr_t xf_data;	/* file descriptor specific data */
> +	kvaddr_t xf_vnode;	/* vnode pointer */
> 	u_int	xf_flag;	/* flags (see fcntl.h) */
> +	int	_xf_int_pad3;
> +	int64_t	_xf_int64_pad[6];
> };
>=20
> #ifdef _KERNEL
>=20
> Modified: head/sys/sys/param.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/param.h	Thu Jul  5 11:50:59 2018	=
(r335978)
> +++ head/sys/sys/param.h	Thu Jul  5 13:13:48 2018	=
(r335979)
> @@ -60,7 +60,7 @@
>  *		in the range 5 to 9.
>  */
> #undef __FreeBSD_version
> -#define __FreeBSD_version 1200071	/* Master, propagated to newvers =
*/
> +#define __FreeBSD_version 1200072	/* Master, propagated to newvers =
*/
>=20
> /*
>  * __FreeBSD_kernel__ indicates that this system uses the kernel of =
FreeBSD,
>=20
> Modified: head/sys/sys/socketvar.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/socketvar.h	Thu Jul  5 11:50:59 2018	=
(r335978)
> +++ head/sys/sys/socketvar.h	Thu Jul  5 13:13:48 2018	=
(r335979)
> @@ -474,13 +474,13 @@ int	accept_filt_generic_mod_event(module_t =
mod, int ev
>  * Structure to export socket from kernel to utilities, via sysctl(3).
>  */
> struct xsocket {
> -	size_t		xso_len;	/* length of this structure */
> +	ksize_t		xso_len;	/* length of this structure */
> 	union {
> -		void	*xso_so;	/* kernel address of struct =
socket */
> +		kvaddr_t xso_so;	/* kernel address of struct =
socket */
> 		int64_t ph_so;
> 	};
> 	union {
> -		void 	*so_pcb;	/* kernel address of struct =
inpcb */
> +		kvaddr_t so_pcb;	/* kernel address of struct =
inpcb */
> 		int64_t ph_pcb;
> 	};
> 	uint64_t	so_oobmark;
>=20
> Modified: head/sys/sys/types.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/types.h	Thu Jul  5 11:50:59 2018	=
(r335978)
> +++ head/sys/sys/types.h	Thu Jul  5 13:13:48 2018	=
(r335979)
> @@ -251,6 +251,15 @@ struct cap_rights;
> typedef	struct cap_rights	cap_rights_t;
> #endif
>=20
> +/*
> + * Types suitable for exporting size and pointers (as virtual =
addresses)
> + * from the kernel independent of native word size.  These should be
> + * used in place of size_t and (u)intptr_t in structs which contain =
such
> + * types that are shared with userspace.
> + */
> +typedef	__uint64_t	kvaddr_t;
> +typedef	__uint64_t	ksize_t;
> +
> typedef	__vm_offset_t	vm_offset_t;
> typedef	__int64_t	vm_ooffset_t;
> typedef	__vm_paddr_t	vm_paddr_t;
>=20
> Modified: head/sys/sys/unpcb.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/unpcb.h	Thu Jul  5 11:50:59 2018	=
(r335978)
> +++ head/sys/sys/unpcb.h	Thu Jul  5 13:13:48 2018	=
(r335979)
> @@ -138,12 +138,12 @@ struct unpcb {
>  */
> #ifdef	_SYS_SOCKETVAR_H_
> struct xunpcb {
> -	size_t		xu_len;			/* length of this =
structure */
> -	void		*xu_unpp;		/* to help netstat, =
fstat */
> -	void		*unp_vnode;		/* (s) */
> -	void		*unp_conn;		/* (s) */
> -	void		*xu_firstref;		/* (s) */
> -	void		*xu_nextref;		/* (s) */
> +	ksize_t		xu_len;			/* length of this =
structure */
> +	kvaddr_t	xu_unpp;		/* to help netstat, =
fstat */
> +	kvaddr_t	unp_vnode;		/* (s) */
> +	kvaddr_t	unp_conn;		/* (s) */
> +	kvaddr_t	xu_firstref;		/* (s) */
> +	kvaddr_t	xu_nextref;		/* (s) */
> 	unp_gen_t	unp_gencnt;		/* (s) */
> 	int64_t		xu_spare64[8];
> 	int32_t		xu_spare32[8];
> @@ -159,7 +159,7 @@ struct xunpcb {
> } __aligned(8);
>=20
> struct xunpgen {
> -	size_t	xug_len;
> +	ksize_t	xug_len;
> 	u_int	xug_count;
> 	unp_gen_t xug_gen;
> 	so_gen_t xug_sogen;
>=20
> Modified: head/usr.bin/netstat/inet.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/usr.bin/netstat/inet.c	Thu Jul  5 11:50:59 2018	=
(r335978)
> +++ head/usr.bin/netstat/inet.c	Thu Jul  5 13:13:48 2018	=
(r335979)
> @@ -159,12 +159,12 @@ sotoxsocket(struct socket *so, struct xsocket =
*xso)
>=20
> 	bzero(xso, sizeof *xso);
> 	xso->xso_len =3D sizeof *xso;
> -	xso->xso_so =3D so;
> +	xso->xso_so =3D (kvaddr_t)so;
> 	xso->so_type =3D so->so_type;
> 	xso->so_options =3D so->so_options;
> 	xso->so_linger =3D so->so_linger;
> 	xso->so_state =3D so->so_state;
> -	xso->so_pcb =3D so->so_pcb;
> +	xso->so_pcb =3D (kvaddr_t)so->so_pcb;
> 	if (kread((uintptr_t)so->so_proto, &proto, sizeof(proto)) !=3D =
0)
> 		return (-1);
> 	xso->xso_protocol =3D proto.pr_protocol;
>=20
> Modified: head/usr.bin/netstat/unix.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/usr.bin/netstat/unix.c	Thu Jul  5 11:50:59 2018	=
(r335978)
> +++ head/usr.bin/netstat/unix.c	Thu Jul  5 13:13:48 2018	=
(r335979)
> @@ -153,7 +153,7 @@ pcblist_kvm(u_long count_off, u_long gencnt_off, =
u_lon
> 	xu.xu_len =3D sizeof xu;
> 	KREAD(head_off, &head, sizeof(head));
> 	LIST_FOREACH(unp, &head, unp_link) {
> -		xu.xu_unpp =3D unp;
> +		xu.xu_unpp =3D (kvaddr_t)unp;
> 		KREAD(unp, &unp0, sizeof (*unp));
> 		unp =3D &unp0;
>=20
>=20
> Modified: head/usr.bin/sockstat/sockstat.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/usr.bin/sockstat/sockstat.c	Thu Jul  5 11:50:59 2018	=
(r335978)
> +++ head/usr.bin/sockstat/sockstat.c	Thu Jul  5 13:13:48 2018	=
(r335979)
> @@ -108,8 +108,8 @@ struct addr {
> };
>=20
> struct sock {
> -	void *socket;
> -	void *pcb;
> +	kvaddr_t socket;
> +	kvaddr_t pcb;
> 	int shown;
> 	int vflag;
> 	int family;
> @@ -789,8 +789,8 @@ gather_unix(int proto)
> 			warnx("struct xunpcb size mismatch");
> 			goto out;
> 		}
> -		if ((xup->unp_conn =3D=3D NULL && !opt_l) ||
> -		    (xup->unp_conn !=3D NULL && !opt_c))
> +		if ((xup->unp_conn =3D=3D 0 && !opt_l) ||
> +		    (xup->unp_conn !=3D 0 && !opt_c))
> 			continue;
> 		if ((sock =3D calloc(1, sizeof(*sock))) =3D=3D NULL)
> 			err(1, "malloc()");
> @@ -806,8 +806,8 @@ gather_unix(int proto)
> 		if (xup->xu_addr.sun_family =3D=3D AF_UNIX)
> 			laddr->address =3D
> 			    *(struct sockaddr_storage *)(void =
*)&xup->xu_addr;
> -		else if (xup->unp_conn !=3D NULL)
> -			*(void **)&(faddr->address) =3D xup->unp_conn;
> +		else if (xup->unp_conn !=3D 0)
> +			*(kvaddr_t*)&(faddr->address) =3D xup->unp_conn;
> 		laddr->next =3D NULL;
> 		faddr->next =3D NULL;
> 		sock->laddr =3D laddr;
> @@ -1008,7 +1008,7 @@ sctp_path_state(int state)
> static void
> displaysock(struct sock *s, int pos)
> {
> -	void *p;
> +	kvaddr_t p;
> 	int hash, first, offset;
> 	struct addr *laddr, *faddr;
> 	struct sock *s_tmp;
> @@ -1054,8 +1054,8 @@ displaysock(struct sock *s, int pos)
> 				break;
> 			}
> 			/* client */
> -			p =3D *(void **)&(faddr->address);
> -			if (p =3D=3D NULL) {
> +			p =3D *(kvaddr_t*)&(faddr->address);
> +			if (p =3D=3D 0) {
> 				pos +=3D xprintf("(not connected)");
> 				offset +=3D opt_w ? 92 : 44;
> 				break;
> @@ -1174,13 +1174,13 @@ display(void)
> 	}
> 	setpassent(1);
> 	for (xf =3D xfiles, n =3D 0; n < nxfiles; ++n, ++xf) {
> -		if (xf->xf_data =3D=3D NULL)
> +		if (xf->xf_data =3D=3D 0)
> 			continue;
> 		if (opt_j >=3D 0 && opt_j !=3D getprocjid(xf->xf_pid))
> 			continue;
> 		hash =3D (int)((uintptr_t)xf->xf_data % HASHSIZE);
> 		for (s =3D sockhash[hash]; s !=3D NULL; s =3D s->next) {
> -			if ((void *)s->socket !=3D xf->xf_data)
> +			if (s->socket !=3D xf->xf_data)
> 				continue;
> 			if (!check_ports(s))
> 				continue;
>=20