Date: Tue, 17 Nov 2020 17:11:14 +0000 From: Brooks Davis <brooks@freebsd.org> To: Kyle Evans <kevans@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r367744 - in head/sys: compat/freebsd32 kern sys Message-ID: <20201117171114.GA1158@spindle.one-eyed-alien.net> In-Reply-To: <202011170336.0AH3awYt006482@repo.freebsd.org> References: <202011170336.0AH3awYt006482@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--ZPt4rx8FFjLCG7dd
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Tue, Nov 17, 2020 at 03:36:58AM +0000, Kyle Evans wrote:
> Modified: head/sys/compat/freebsd32/freebsd32.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/compat/freebsd32/freebsd32.h Tue Nov 17 03:34:01 2020 (r3677=
43)
> +++ head/sys/compat/freebsd32/freebsd32.h Tue Nov 17 03:36:58 2020 (r3677=
44)
> @@ -94,6 +94,27 @@ struct itimerval32 {
> struct timeval32 it_value;
> };
> =20
> +struct umtx_time32 {
> + struct timespec32 _timeout;
> + uint32_t _flags;
> + uint32_t _clockid;
> +};
> +
> +struct umtx_robust_lists_params_compat32 {
> + uint32_t robust_list_offset;
> + uint32_t robust_priv_list_offset;
> + uint32_t robust_inact_offset;
> +};
> +
> +struct umutex32 {
> + volatile __lwpid_t m_owner; /* Owner of the mutex */
> + __uint32_t m_flags; /* Flags of the mutex */
> + __uint32_t m_ceilings[2]; /* Priority protect ceiling */
> + __uint32_t m_rb_lnk; /* Robust linkage */
> + __uint32_t m_pad;
> + __uint32_t m_spare[2];
> +};
> +
> #define FREEBSD4_MFSNAMELEN 16
> #define FREEBSD4_MNAMELEN (88 - 2 * sizeof(int32_t))
> =20
>=20
> Modified: head/sys/compat/freebsd32/freebsd32_misc.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/compat/freebsd32/freebsd32_misc.c Tue Nov 17 03:34:01 2020 (=
r367743)
> +++ head/sys/compat/freebsd32/freebsd32_misc.c Tue Nov 17 03:36:58 2020 (=
r367744)
> @@ -84,6 +84,7 @@ __FBSDID("$FreeBSD$");
> #include <sys/thr.h>
> #include <sys/unistd.h>
> #include <sys/ucontext.h>
> +#include <sys/umtx.h>
> #include <sys/vnode.h>
> #include <sys/wait.h>
> #include <sys/ipc.h>
> @@ -3764,4 +3765,12 @@ freebsd32_sched_rr_get_interval(struct thread *td,
> error =3D copyout(&ts32, uap->interval, sizeof(ts32));
> }
> return (error);
> +}
> +
> +int
> +freebsd32__umtx_op(struct thread *td, struct freebsd32__umtx_op_args *ua=
p)
> +{
> +
> + return (kern__umtx_op(td, uap->obj, uap->op, uap->val, uap->uaddr,
> + uap->uaddr2, &umtx_native_ops32));
> }
>=20
Putting any of this under compat/freebsd32 seems like a somewhat
odd choice since all the work is done in kern_umtx.h. In CheriBSD,
everything just lives there so nothing has to be exposed in headers.
-- Brooks
--ZPt4rx8FFjLCG7dd
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQEcBAEBAgAGBQJftAQxAAoJEKzQXbSebgfA9tEH/jE8qO/Jbdhphf+OLFNz0aWo
g/Xg8m+8exNtVsKuKDNgwikavj5mslQTzyGuP7NXDcZpug+rbIBVz5fLy/0QecmT
GScA0B29Uw6h/5pv8NQlqcICsvqxVYATBHkhFaUIbq0dzJSYezmBPIcM+H87opih
/sKBMxvlEnzUh8KrmmL/w1hc3k6BJrlE9aS3SYSuRrj0dRpIvWWg1NqwO7DvfVve
rVsV3n4JmODxyn4t6GY/YCGA+JgNHTSthWz48pUGo86y/A1K7sQl6dn86yxoVhE4
KWBpmfUiUmNxuH2tP3S2L3TuX0vBfWe0oRDIJ3onYJZIohcNMX9Z0YBGmTHh7us=
=z5PA
-----END PGP SIGNATURE-----
--ZPt4rx8FFjLCG7dd--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20201117171114.GA1158>