svn commit: r293306 - in head: sbin/geom/class/eli sys/conf sys/geom/eli sys/modules/geom/geom_eli
Author: allanjude
Date: Thu Jan 7 05:47:34 2016
New Revision: 293306
URL: https://svnweb.freebsd.org/changeset/base/293306
Log:
Make additional parts of sys/geom/eli more usable in userspace
The upcoming GELI support in the loader reuses parts of this code
Some ifdefs are added, and some code is moved outside of existing ifdefs
The HMAC parts of GELI are broken out into their own file, to separate
them from the kernel crypto/openssl dependant parts that are replaced
in the boot code.
Passed the GELI regression suite (tools/regression/geom/eli)
Files=20 Tests=14996
Result: PASS
Reviewed by: pjd, delphij
MFC after:1 week
Sponsored by: ScaleEngine Inc.
Differential Revision:https://reviews.freebsd.org/D4699
Added:
head/sys/geom/eli/g_eli_hmac.c
- copied, changed from r292238, head/sys/geom/eli/g_eli_crypto.c
Modified:
head/sbin/geom/class/eli/Makefile
head/sys/conf/files
head/sys/geom/eli/g_eli.c
head/sys/geom/eli/g_eli.h
head/sys/geom/eli/g_eli_crypto.c
head/sys/geom/eli/g_eli_key_cache.c
head/sys/geom/eli/pkcs5v2.c
head/sys/modules/geom/geom_eli/Makefile
Modified: head/sbin/geom/class/eli/Makefile
==
--- head/sbin/geom/class/eli/Makefile Thu Jan 7 05:34:39 2016
(r293305)
+++ head/sbin/geom/class/eli/Makefile Thu Jan 7 05:47:34 2016
(r293306)
@@ -4,6 +4,7 @@
GEOM_CLASS=eli
SRCS= g_eli_crypto.c
+SRCS+= g_eli_hmac.c
SRCS+= g_eli_key.c
SRCS+= pkcs5v2.c
SRCS+= sha256c.c
Modified: head/sys/conf/files
==
--- head/sys/conf/files Thu Jan 7 05:34:39 2016(r293305)
+++ head/sys/conf/files Thu Jan 7 05:47:34 2016(r293306)
@@ -2994,6 +2994,7 @@ geom/concat/g_concat.coptional geom_co
geom/eli/g_eli.c optional geom_eli
geom/eli/g_eli_crypto.coptional geom_eli
geom/eli/g_eli_ctl.c optional geom_eli
+geom/eli/g_eli_hmac.c optional geom_eli
geom/eli/g_eli_integrity.c optional geom_eli
geom/eli/g_eli_key.c optional geom_eli
geom/eli/g_eli_key_cache.c optional geom_eli
Modified: head/sys/geom/eli/g_eli.c
==
--- head/sys/geom/eli/g_eli.c Thu Jan 7 05:34:39 2016(r293305)
+++ head/sys/geom/eli/g_eli.c Thu Jan 7 05:47:34 2016(r293306)
@@ -571,40 +571,6 @@ again:
}
}
-/*
- * Here we generate IV. It is unique for every sector.
- */
-void
-g_eli_crypto_ivgen(struct g_eli_softc *sc, off_t offset, u_char *iv,
-size_t size)
-{
- uint8_t off[8];
-
- if ((sc->sc_flags & G_ELI_FLAG_NATIVE_BYTE_ORDER) != 0)
- bcopy(&offset, off, sizeof(off));
- else
- le64enc(off, (uint64_t)offset);
-
- switch (sc->sc_ealgo) {
- case CRYPTO_AES_XTS:
- bcopy(off, iv, sizeof(off));
- bzero(iv + sizeof(off), size - sizeof(off));
- break;
- default:
- {
- u_char hash[SHA256_DIGEST_LENGTH];
- SHA256_CTX ctx;
-
- /* Copy precalculated SHA256 context for IV-Key. */
- bcopy(&sc->sc_ivctx, &ctx, sizeof(ctx));
- SHA256_Update(&ctx, off, sizeof(off));
- SHA256_Final(hash, &ctx);
- bcopy(hash, iv, MIN(sizeof(hash), size));
- break;
- }
- }
-}
-
int
g_eli_read_metadata(struct g_class *mp, struct g_provider *pp,
struct g_eli_metadata *md)
@@ -751,44 +717,9 @@ g_eli_create(struct gctl_req *req, struc
else
gp->access = g_std_access;
- sc->sc_version = md->md_version;
- sc->sc_inflight = 0;
- sc->sc_crypto = G_ELI_CRYPTO_UNKNOWN;
- sc->sc_flags = md->md_flags;
- /* Backward compatibility. */
- if (md->md_version < G_ELI_VERSION_04)
- sc->sc_flags |= G_ELI_FLAG_NATIVE_BYTE_ORDER;
- if (md->md_version < G_ELI_VERSION_05)
- sc->sc_flags |= G_ELI_FLAG_SINGLE_KEY;
- if (md->md_version < G_ELI_VERSION_06 &&
- (sc->sc_flags & G_ELI_FLAG_AUTH) != 0) {
- sc->sc_flags |= G_ELI_FLAG_FIRST_KEY;
- }
- if (md->md_version < G_ELI_VERSION_07)
- sc->sc_flags |= G_ELI_FLAG_ENC_IVKEY;
- sc->sc_ealgo = md->md_ealgo;
+ eli_metadata_softc(sc, md, bpp->sectorsize, bpp->mediasize);
sc->sc_nkey = nkey;
- if (sc->sc_flags & G_ELI_FLAG_AUTH) {
- sc->sc_akeylen = sizeof(sc->sc_akey) * 8;
- sc->sc_aalgo = md->md_aalgo;
- sc->sc_alen = g_eli_hashlen(sc->sc_aalgo);
-
- sc->sc_data_per_sector = bpp->sectorsize - sc->sc_alen;
- /*
-* Some hash functions (like SHA1 and RIPEMD160) generates hash
-* which length
svn commit: r293305 - head/usr.sbin/mountd
Author: jpaetzel
Date: Thu Jan 7 05:34:39 2016
New Revision: 293305
URL: https://svnweb.freebsd.org/changeset/base/293305
Log:
Allow /etc/exports to contain usernames/groups with spaces in them.
If you are getting your users/groups from a directory service such
as LDAP or AD it's possible for those usernames or groupnames to
contain spaces.
Submitted by: Sean E. Fagan
Reviewed by: rmacklem
MFC after:1 week
Sponsored by: iXsystems
Modified:
head/usr.sbin/mountd/exports.5
head/usr.sbin/mountd/mountd.c
Modified: head/usr.sbin/mountd/exports.5
==
--- head/usr.sbin/mountd/exports.5 Thu Jan 7 04:02:37 2016
(r293304)
+++ head/usr.sbin/mountd/exports.5 Thu Jan 7 05:34:39 2016
(r293305)
@@ -131,6 +131,7 @@ The credential includes all the groups t
on the local machine (see
.Xr id 1 ) .
The user may be specified by name or number.
+The user string may be quoted, or use backslash escaping.
.Pp
.Sm off
.Fl maproot Li = Sy user:group1:group2:...
@@ -140,6 +141,7 @@ to be used for remote access by root.
The elements of the list may be either names or numbers.
Note that user: should be used to distinguish a credential containing
no groups from a complete credential for that user.
+The group names may be quoted, or use backslash escaping.
.Pp
.Sm off
.Fl mapall Li = Sy user
Modified: head/usr.sbin/mountd/mountd.c
==
--- head/usr.sbin/mountd/mountd.c Thu Jan 7 04:02:37 2016
(r293304)
+++ head/usr.sbin/mountd/mountd.c Thu Jan 7 05:34:39 2016
(r293305)
@@ -174,6 +174,7 @@ static int check_options(struct dirlist
static int checkmask(struct sockaddr *sa);
static int chk_host(struct dirlist *, struct sockaddr *, int *, int *,
int *, int **);
+static char*strsep_quote(char **stringp, const char *delim);
static int create_service(struct netconfig *nconf);
static voidcomplete_service(struct netconfig *nconf, char *port_str);
static voidclearout_service(void);
@@ -278,6 +279,73 @@ static int debug = 0;
#endif
/*
+ * Similar to strsep(), but it allows for quoted strings
+ * and escaped characters.
+ *
+ * It returns the string (or NULL, if *stringp is NULL),
+ * which is a de-quoted version of the string if necessary.
+ *
+ * It modifies *stringp in place.
+ */
+static char *
+strsep_quote(char **stringp, const char *delim)
+{
+ char *srcptr, *dstptr, *retval;
+ char quot = 0;
+
+ if (stringp == NULL || *stringp == NULL)
+ return (NULL);
+
+ srcptr = dstptr = retval = *stringp;
+
+ while (*srcptr) {
+ /*
+* We're looking for several edge cases here.
+* First: if we're in quote state (quot != 0),
+* then we ignore the delim characters, but otherwise
+* process as normal, unless it is the quote character.
+* Second: if the current character is a backslash,
+* we take the next character as-is, without checking
+* for delim, quote, or backslash. Exception: if the
+* next character is a NUL, that's the end of the string.
+* Third: if the character is a quote character, we toggle
+* quote state.
+* Otherwise: check the current character for NUL, or
+* being in delim, and end the string if either is true.
+*/
+ if (*srcptr == '\\') {
+ srcptr++;
+ /*
+* The edge case here is if the next character
+* is NUL, we want to stop processing. But if
+* it's not NUL, then we simply want to copy it.
+*/
+ if (*srcptr) {
+ *dstptr++ = *srcptr++;
+ }
+ continue;
+ }
+ if (quot == 0 && (*srcptr == '\'' || *srcptr == '"')) {
+ quot = *srcptr++;
+ continue;
+ }
+ if (quot && *srcptr == quot) {
+ /* End of the quoted part */
+ quot = 0;
+ srcptr++;
+ continue;
+ }
+ if (!quot && strchr(delim, *srcptr))
+ break;
+ *dstptr++ = *srcptr++;
+ }
+
+ *dstptr = 0; /* Terminate the string */
+ *stringp = (*srcptr == '\0') ? NULL : srcptr + 1;
+ return (retval);
+}
+
+/*
* Mountd server for NFS mount protocol as described in:
* NFS: Network File System Protocol Specification, RFC1094, Appendix A
* The optional arguments are the exports file name
@@ -2831,8 +2899,
Re: svn commit: r293284 - in head/sys: dev/cxgb/ulp/tom dev/cxgbe/tom netinet
On Wed, Jan 6, 2016 at 4:14 PM, Gleb Smirnoff wrote:
> Author: glebius
> Date: Thu Jan 7 00:14:42 2016
> New Revision: 293284
> URL: https://svnweb.freebsd.org/changeset/base/293284
>
> Log:
> Historically we have two fields in tcpcb to describe sender MSS: t_maxopd,
> and t_maxseg. This dualism emerged with T/TCP, but was not properly cleaned
> up after T/TCP removal. After all permutations over the years the result is
> that t_maxopd stores a minimum of peer offered MSS and MTU reduced by
> minimum
> protocol header. And t_maxseg stores (t_maxopd - TCPOLEN_TSTAMP_APPA) if
> timestamps are in action, or is equal to t_maxopd otherwise. That's a very
> rough estimate of MSS reduced by options length. Throughout the code it
> was used in places, where preciseness was not important, like cwnd or
> ssthresh calculations.
>
> With this change:
>
> - t_maxopd goes away.
> - t_maxseg now stores MSS not adjusted by options.
> - new function tcp_maxseg() is provided, that calculates MSS reduced by
> options length. The functions gives a better estimate, since it takes
> into account SACK state as well.
>
> Reviewed by: jtl
> Differential Revision:https://reviews.freebsd.org/D3593
This broke the build.
>From https://jenkins.freebsd.org/job/FreeBSD_HEAD_i386/2053/ :
/usr/src/sys/modules/tcp/fastpath/../../../netinet/tcp_stacks/fastpath.c:481:6:
error: no member named 't_maxopd' in 'struct tcpcb'
--- all_subdir_sound ---
--- all_subdir_sb8 ---
===> sound/driver/sb8 (all)
--- all_subdir_tcp/fastpath ---
if (DELAY_ACK(tp, tlen)) {
^ ~~
/usr/src/sys/modules/tcp/fastpath/../../../netinet/tcp_stacks/fastpath.c:167:19:
note: expanded from macro 'DELAY_ACK'
(tlen <= tp->t_maxopd) && \
^
/usr/src/sys/modules/tcp/fastpath/../../../netinet/tcp_stacks/fastpath.c:606:8:
error: no member named 't_maxopd' in 'struct tcpcb'
if (DELAY_ACK(tp, tlen) && tlen != 0)
^ ~~
/usr/src/sys/modules/tcp/fastpath/../../../netinet/tcp_stacks/fastpath.c:167:19:
note: expanded from macro 'DELAY_ACK'
(tlen <= tp->t_maxopd) && \
^
--- all_subdir_sound ---
--- all_subdir_sb16 ---
ctfconvert -L VERSION -g sb16.o
--- all_subdir_tcp/fastpath ---
/usr/src/sys/modules/tcp/fastpath/../../../netinet/tcp_stacks/fastpath.c:1545:8:
error: no member named 't_maxopd' in 'struct tcpcb'
if (DELAY_ACK(tp, tlen))
^ ~~
/usr/src/sys/modules/tcp/fastpath/../../../netinet/tcp_stacks/fastpath.c:167:19:
note: expanded from macro 'DELAY_ACK'
(tlen <= tp->t_maxopd) && \
^
3 errors generated.
*** [fastpath.o] Error code 1
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r293295 - head/sys/kern
Author: mjg
Date: Thu Jan 7 02:04:17 2016
New Revision: 293295
URL: https://svnweb.freebsd.org/changeset/base/293295
Log:
cache: ansify functions and fix some style issues
No functional changes.
Modified:
head/sys/kern/vfs_cache.c
Modified: head/sys/kern/vfs_cache.c
==
--- head/sys/kern/vfs_cache.c Thu Jan 7 01:50:50 2016(r293294)
+++ head/sys/kern/vfs_cache.c Thu Jan 7 02:04:17 2016(r293295)
@@ -288,7 +288,7 @@ static u_long nummiss; STATNODE(CTLFLAG_
"Number of cache misses");
static u_long nummisszap; STATNODE(CTLFLAG_RD, nummisszap, &nummisszap,
"Number of cache misses we do not want to cache");
-static u_long numposzaps; STATNODE(CTLFLAG_RD, numposzaps, &numposzaps,
+static u_long numposzaps; STATNODE(CTLFLAG_RD, numposzaps, &numposzaps,
"Number of cache hits (positive) we do not want to cache");
static u_long numposhits; STATNODE(CTLFLAG_RD, numposhits, &numposhits,
"Number of cache hits (positive)");
@@ -303,8 +303,6 @@ SYSCTL_OPAQUE(_vfs_cache, OID_AUTO, nchs
&nchstats, sizeof(nchstats), "LU",
"VFS cache effectiveness statistics");
-
-
static void cache_zap(struct namecache *ncp);
static int vn_vptocnp_locked(struct vnode **vp, struct ucred *cred, char *buf,
u_int *buflen);
@@ -410,8 +408,7 @@ SYSCTL_PROC(_debug_hashstat, OID_AUTO, n
* pointer to a vnode or if it is just a negative cache entry.
*/
static void
-cache_zap(ncp)
- struct namecache *ncp;
+cache_zap(struct namecache *ncp)
{
struct vnode *vp;
@@ -446,7 +443,7 @@ cache_zap(ncp)
}
numcache--;
cache_free(ncp);
- if (vp)
+ if (vp != NULL)
vdrop(vp);
}
@@ -468,12 +465,8 @@ cache_zap(ncp)
*/
int
-cache_lookup(dvp, vpp, cnp, tsp, ticksp)
- struct vnode *dvp;
- struct vnode **vpp;
- struct componentname *cnp;
- struct timespec *tsp;
- int *ticksp;
+cache_lookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp,
+struct timespec *tsp, int *ticksp)
{
struct namecache *ncp;
uint32_t hash;
@@ -701,12 +694,8 @@ unlock:
* Add an entry to the cache.
*/
void
-cache_enter_time(dvp, vp, cnp, tsp, dtsp)
- struct vnode *dvp;
- struct vnode *vp;
- struct componentname *cnp;
- struct timespec *tsp;
- struct timespec *dtsp;
+cache_enter_time(struct vnode *dvp, struct vnode *vp, struct componentname
*cnp,
+struct timespec *tsp, struct timespec *dtsp)
{
struct namecache *ncp, *n2;
struct namecache_ts *n3;
@@ -836,9 +825,9 @@ cache_enter_time(dvp, vp, cnp, tsp, dtsp
* has populated v_cache_dd pointer already.
*/
if (dvp->v_cache_dd != NULL) {
- CACHE_WUNLOCK();
- cache_free(ncp);
- return;
+ CACHE_WUNLOCK();
+ cache_free(ncp);
+ return;
}
KASSERT(vp == NULL || vp->v_type == VDIR,
("wrong vnode type %p", vp));
@@ -846,7 +835,7 @@ cache_enter_time(dvp, vp, cnp, tsp, dtsp
}
numcache++;
- if (!vp) {
+ if (vp == NULL) {
numneg++;
if (cnp->cn_flags & ISWHITEOUT)
ncp->nc_flag |= NCF_WHITE;
@@ -884,7 +873,7 @@ cache_enter_time(dvp, vp, cnp, tsp, dtsp
* "negative" cache queue, otherwise, we place it into the
* destination vnode's cache entries queue.
*/
- if (vp) {
+ if (vp != NULL) {
TAILQ_INSERT_HEAD(&vp->v_cache_dst, ncp, nc_dst);
SDT_PROBE3(vfs, namecache, enter, done, dvp, nc_get_name(ncp),
vp);
@@ -975,8 +964,7 @@ cache_changesize(int newmaxvnodes)
* Invalidate all entries to a particular vnode.
*/
void
-cache_purge(vp)
- struct vnode *vp;
+cache_purge(struct vnode *vp)
{
CTR1(KTR_VFS, "cache_purge(%p)", vp);
@@ -999,8 +987,7 @@ cache_purge(vp)
* Invalidate all negative entries for a particular directory vnode.
*/
void
-cache_purge_negative(vp)
- struct vnode *vp;
+cache_purge_negative(struct vnode *vp)
{
struct namecache *cp, *ncp;
@@ -1018,8 +1005,7 @@ cache_purge_negative(vp)
* Flush all entries referencing a particular filesystem.
*/
void
-cache_purgevfs(mp)
- struct mount *mp;
+cache_purgevfs(struct mount *mp)
{
struct nchashhead *ncpp;
struct namecache *ncp, *nnp;
@@ -1042,12 +1028,7 @@ cache_purgevfs(mp)
*/
int
-vfs_cache_lookup(ap)
- struct vop_lookup_args /* {
- struct vnode *a_dvp;
- struct vnode **a_vpp;
- struct componentname *a_cnp;
- } */ *ap;
+vfs_cache_lookup(struct vop_lookup_args *ap)
{
struct vnode *dvp;
int error;
@@ -1088,9 +1069,7 @@ SYSCTL_INT(_debug, OID
svn commit: r293289 - head/usr.bin/truss
Author: bdrewery
Date: Thu Jan 7 00:32:40 2016
New Revision: 293289
URL: https://svnweb.freebsd.org/changeset/base/293289
Log:
Update dependencies after r292622 moved the ioctl script.
Sponsored by: EMC / Isilon Storage Division
Modified:
head/usr.bin/truss/Makefile.depend.amd64
Modified: head/usr.bin/truss/Makefile.depend.amd64
==
--- head/usr.bin/truss/Makefile.depend.amd64Thu Jan 7 00:20:47 2016
(r293288)
+++ head/usr.bin/truss/Makefile.depend.amd64Thu Jan 7 00:32:40 2016
(r293289)
@@ -6,7 +6,6 @@ DIRDEPS = \
gnu/lib/libgcc \
include \
include/arpa \
- include/rpc \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
@@ -26,6 +25,4 @@ amd64-freebsd32.o: freebsd32_syscalls.h
amd64-freebsd32.po: freebsd32_syscalls.h
amd64-linux32.o: amd64-linux32_syscalls.h
amd64-linux32.po: amd64-linux32_syscalls.h
-ioctl.o: ioctl.c
-ioctl.po: ioctl.c
.endif
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r293288 - in head: . share/mk
Author: bdrewery
Date: Thu Jan 7 00:20:47 2016
New Revision: 293288
URL: https://svnweb.freebsd.org/changeset/base/293288
Log:
Revert r293286. It was not intended to come in yet.
Modified:
head/Makefile
head/share/mk/sys.mk
Modified: head/Makefile
==
--- head/Makefile Thu Jan 7 00:19:30 2016(r293287)
+++ head/Makefile Thu Jan 7 00:20:47 2016(r293288)
@@ -143,6 +143,13 @@ TGTS+= ${BITGTS}
PATH= /sbin:/bin:/usr/sbin:/usr/bin
MAKEOBJDIRPREFIX?= /usr/obj
+_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \
+${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \
+-f /dev/null -V MAKEOBJDIRPREFIX dummy
+.if !empty(_MAKEOBJDIRPREFIX)
+.error MAKEOBJDIRPREFIX can only be set in environment, not as a global\
+ (in make.conf(5)) or command-line variable.
+.endif
# We often need to use the tree's version of make to build it.
# Choices add to complexity though.
Modified: head/share/mk/sys.mk
==
--- head/share/mk/sys.mkThu Jan 7 00:19:30 2016(r293287)
+++ head/share/mk/sys.mkThu Jan 7 00:20:47 2016(r293288)
@@ -33,13 +33,6 @@ __ENV_ONLY_OPTIONS:= \
${__DEFAULT_YES_OPTIONS} \
${__DEFAULT_DEPENDENT_OPTIONS:H}
-__ENV_ONLY_VARS= \
- MAKEOBJDIR \
- MAKEOBJDIRPREFIX
-.for _var in ${__ENV_ONLY_VARS}
-_pre_includes_${_var:tl}:= ${${_var}:U__null}
-.endfor
-
# early include for customization
# see local.sys.mk below
# Not included when building in fmake compatibility mode (still needed
@@ -57,9 +50,6 @@ _pre_includes_${_var:tl}:=${${_var}:U__
.endif
.endif
.if ${MK_AUTO_OBJ} == "yes"
-# Reset, since it is allowed to be set from src-env.conf included before this.
-_pre_includes_makeobjdirprefix:= ${MAKEOBJDIRPREFIX:U__null}
-_pre_includes_makeobjdir:= ${MAKEOBJDIR:U__null}
# This needs to be done early - before .PATH is computed
# Don't do this for 'make showconfig' as it enables all options where meta mode
# is not expected.
@@ -420,15 +410,6 @@ __MAKE_SHELL?=/bin/sh
path=${__MAKE_SHELL}
.endif
-# Ensure MAKEOBJDIRPREFIX was not incorrectly set.
-.for _var in ${__ENV_ONLY_VARS}
-.if ${.MAKEOVERRIDES:M${_var}} || (defined(${_var}) && \
-${${_var}} != ${_pre_includes_${_var:tl}})
-.error ${_var} can only be set in environment, not as a global (in
make.conf(5)) or command-line variable.
-.endif
-.undef _pre_includes_${_var:tl}
-.endfor
-
# Hack for ports compatibility. Historically, ports makefiles have
# assumed they can examine MACHINE_CPU without including anything
# because this was automatically included in sys.mk. For /usr/src,
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r293287 - in head: lib/libsysdecode targets/pseudo/userland/lib
Author: bdrewery
Date: Thu Jan 7 00:19:30 2016
New Revision: 293287
URL: https://svnweb.freebsd.org/changeset/base/293287
Log:
Add in DIRDEPS_BUILD support.
Sponsored by: EMC / Isilon Storage Division
Added:
head/lib/libsysdecode/Makefile.depend (contents, props changed)
Modified:
head/targets/pseudo/userland/lib/Makefile.depend
Added: head/lib/libsysdecode/Makefile.depend
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libsysdecode/Makefile.depend Thu Jan 7 00:19:30 2016
(r293287)
@@ -0,0 +1,22 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
+ include \
+ include/rpc \
+ include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+
+
+.include
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+ioctl.So: ioctl.c
+ioctl.o: ioctl.c
+ioctl.po: ioctl.c
+.endif
Modified: head/targets/pseudo/userland/lib/Makefile.depend
==
--- head/targets/pseudo/userland/lib/Makefile.dependThu Jan 7 00:19:03
2016(r293286)
+++ head/targets/pseudo/userland/lib/Makefile.dependThu Jan 7 00:19:30
2016(r293287)
@@ -136,6 +136,7 @@ DIRDEPS = \
lib/libstand \
lib/libstdbuf \
lib/libstdthreads \
+ lib/libsysdecode \
lib/libtacplus \
lib/libtelnet \
lib/libthr \
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r293286 - in head: . share/mk
Author: bdrewery
Date: Thu Jan 7 00:19:03 2016
New Revision: 293286
URL: https://svnweb.freebsd.org/changeset/base/293286
Log:
Move the MAKEOBJDIRPREFIX value guard to sys.mk and expand to MAKEOBJDIR.
This will ensure that the variable was not set as a make override, in
make.conf, src.conf or src-env.conf. It allows setting the value in
src-env.conf when using WITH_AUTO_OBJ since that case properly handles
changing .OBJDIR (except if MAKEOBJDIRPREFIX does not yet exist which is
being discussed to be changed).
This change allows setting a default MAKEOBJDIRPREFIX via local.sys.env.mk.
Sponsored by: EMC / Isilon Storage Division
Modified:
head/Makefile
head/share/mk/sys.mk
Modified: head/Makefile
==
--- head/Makefile Thu Jan 7 00:15:02 2016(r293285)
+++ head/Makefile Thu Jan 7 00:19:03 2016(r293286)
@@ -143,13 +143,6 @@ TGTS+= ${BITGTS}
PATH= /sbin:/bin:/usr/sbin:/usr/bin
MAKEOBJDIRPREFIX?= /usr/obj
-_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \
-${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \
--f /dev/null -V MAKEOBJDIRPREFIX dummy
-.if !empty(_MAKEOBJDIRPREFIX)
-.error MAKEOBJDIRPREFIX can only be set in environment, not as a global\
- (in make.conf(5)) or command-line variable.
-.endif
# We often need to use the tree's version of make to build it.
# Choices add to complexity though.
Modified: head/share/mk/sys.mk
==
--- head/share/mk/sys.mkThu Jan 7 00:15:02 2016(r293285)
+++ head/share/mk/sys.mkThu Jan 7 00:19:03 2016(r293286)
@@ -33,6 +33,13 @@ __ENV_ONLY_OPTIONS:= \
${__DEFAULT_YES_OPTIONS} \
${__DEFAULT_DEPENDENT_OPTIONS:H}
+__ENV_ONLY_VARS= \
+ MAKEOBJDIR \
+ MAKEOBJDIRPREFIX
+.for _var in ${__ENV_ONLY_VARS}
+_pre_includes_${_var:tl}:= ${${_var}:U__null}
+.endfor
+
# early include for customization
# see local.sys.mk below
# Not included when building in fmake compatibility mode (still needed
@@ -50,6 +57,9 @@ __ENV_ONLY_OPTIONS:= \
.endif
.endif
.if ${MK_AUTO_OBJ} == "yes"
+# Reset, since it is allowed to be set from src-env.conf included before this.
+_pre_includes_makeobjdirprefix:= ${MAKEOBJDIRPREFIX:U__null}
+_pre_includes_makeobjdir:= ${MAKEOBJDIR:U__null}
# This needs to be done early - before .PATH is computed
# Don't do this for 'make showconfig' as it enables all options where meta mode
# is not expected.
@@ -410,6 +420,15 @@ __MAKE_SHELL?=/bin/sh
path=${__MAKE_SHELL}
.endif
+# Ensure MAKEOBJDIRPREFIX was not incorrectly set.
+.for _var in ${__ENV_ONLY_VARS}
+.if ${.MAKEOVERRIDES:M${_var}} || (defined(${_var}) && \
+${${_var}} != ${_pre_includes_${_var:tl}})
+.error ${_var} can only be set in environment, not as a global (in
make.conf(5)) or command-line variable.
+.endif
+.undef _pre_includes_${_var:tl}
+.endfor
+
# Hack for ports compatibility. Historically, ports makefiles have
# assumed they can examine MACHINE_CPU without including anything
# because this was automatically included in sys.mk. For /usr/src,
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r293285 - head/gnu/usr.bin/binutils/ld
Author: emaste
Date: Thu Jan 7 00:15:02 2016
New Revision: 293285
URL: https://svnweb.freebsd.org/changeset/base/293285
Log:
Switch GNU ld to be installed as ld.bfd and linked as ld
We intend to replace GNU ld with LLVM's lld, and on the path to there
we'll experiment with having lld installed or linked as /usr/bin/ld.
Thus, make ld.bfd the primary install target for GNU ld, to later
facilitate making the ld link optional.
Reviewed by: davide, dim
Differential Revision:https://reviews.freebsd.org/D4790
Modified:
head/gnu/usr.bin/binutils/ld/Makefile
Modified: head/gnu/usr.bin/binutils/ld/Makefile
==
--- head/gnu/usr.bin/binutils/ld/Makefile Thu Jan 7 00:14:42 2016
(r293284)
+++ head/gnu/usr.bin/binutils/ld/Makefile Thu Jan 7 00:15:02 2016
(r293285)
@@ -6,7 +6,8 @@ ELF_SCR_EXT=x xbn xc xd xdc xdw xn xr x
.PATH: ${SRCDIR}/ld
-PROG= ld
+PROG= ld.bfd
+MAN= ld.1
SCRIPTDIR= /usr/libdata/ldscripts
SRCS+= ldcref.c \
ldctor.c \
@@ -48,7 +49,7 @@ CLEANFILES+= ldemul-list.h stringify.sed
FILES= ${LDSCRIPTS:S|^|ldscripts/|}
FILESDIR= ${SCRIPTDIR}
-LINKS= ${BINDIR}/ld ${BINDIR}/ld.bfd
+LINKS= ${BINDIR}/ld.bfd ${BINDIR}/ld
HOST= ${TARGET_TUPLE}
LIBSEARCHPATH= \"=/lib\":\"=/usr/lib\"
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r293284 - in head/sys: dev/cxgb/ulp/tom dev/cxgbe/tom netinet
Author: glebius
Date: Thu Jan 7 00:14:42 2016
New Revision: 293284
URL: https://svnweb.freebsd.org/changeset/base/293284
Log:
Historically we have two fields in tcpcb to describe sender MSS: t_maxopd,
and t_maxseg. This dualism emerged with T/TCP, but was not properly cleaned
up after T/TCP removal. After all permutations over the years the result is
that t_maxopd stores a minimum of peer offered MSS and MTU reduced by minimum
protocol header. And t_maxseg stores (t_maxopd - TCPOLEN_TSTAMP_APPA) if
timestamps are in action, or is equal to t_maxopd otherwise. That's a very
rough estimate of MSS reduced by options length. Throughout the code it
was used in places, where preciseness was not important, like cwnd or
ssthresh calculations.
With this change:
- t_maxopd goes away.
- t_maxseg now stores MSS not adjusted by options.
- new function tcp_maxseg() is provided, that calculates MSS reduced by
options length. The functions gives a better estimate, since it takes
into account SACK state as well.
Reviewed by: jtl
Differential Revision:https://reviews.freebsd.org/D3593
Modified:
head/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
head/sys/dev/cxgbe/tom/t4_cpl_io.c
head/sys/netinet/tcp_input.c
head/sys/netinet/tcp_output.c
head/sys/netinet/tcp_subr.c
head/sys/netinet/tcp_timer.c
head/sys/netinet/tcp_usrreq.c
head/sys/netinet/tcp_var.h
Modified: head/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
==
--- head/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c Wed Jan 6 22:02:08 2016
(r293283)
+++ head/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c Thu Jan 7 00:14:42 2016
(r293284)
@@ -1536,14 +1536,13 @@ assign_rxopt(struct tcpcb *tp, uint16_t
struct toepcb *toep = tp->t_toe;
struct adapter *sc = toep->tp_tod->tod_softc;
- tp->t_maxseg = tp->t_maxopd = sc->params.mtus[G_TCPOPT_MSS(tcpopt)] -
40;
+ tp->t_maxseg = sc->params.mtus[G_TCPOPT_MSS(tcpopt)] - 40;
if (G_TCPOPT_TSTAMP(tcpopt)) {
tp->t_flags |= TF_RCVD_TSTMP;
tp->t_flags |= TF_REQ_TSTMP;/* forcibly set */
tp->ts_recent = 0; /* XXX */
tp->ts_recent_age = tcp_ts_getticks();
- tp->t_maxseg -= TCPOLEN_TSTAMP_APPA;
}
if (G_TCPOPT_SACK(tcpopt))
Modified: head/sys/dev/cxgbe/tom/t4_cpl_io.c
==
--- head/sys/dev/cxgbe/tom/t4_cpl_io.c Wed Jan 6 22:02:08 2016
(r293283)
+++ head/sys/dev/cxgbe/tom/t4_cpl_io.c Thu Jan 7 00:14:42 2016
(r293284)
@@ -221,7 +221,7 @@ assign_rxopt(struct tcpcb *tp, unsigned
n = sizeof(struct ip6_hdr) + sizeof(struct tcphdr);
else
n = sizeof(struct ip) + sizeof(struct tcphdr);
- tp->t_maxseg = tp->t_maxopd = sc->params.mtus[G_TCPOPT_MSS(opt)] - n;
+ tp->t_maxseg = sc->params.mtus[G_TCPOPT_MSS(opt)] - n;
CTR4(KTR_CXGBE, "%s: tid %d, mtu_idx %u (%u)", __func__, toep->tid,
G_TCPOPT_MSS(opt), sc->params.mtus[G_TCPOPT_MSS(opt)]);
@@ -230,7 +230,6 @@ assign_rxopt(struct tcpcb *tp, unsigned
tp->t_flags |= TF_RCVD_TSTMP; /* timestamps ok */
tp->ts_recent = 0; /* hmmm */
tp->ts_recent_age = tcp_ts_getticks();
- tp->t_maxseg -= TCPOLEN_TSTAMP_APPA;
}
if (G_TCPOPT_SACK(opt))
Modified: head/sys/netinet/tcp_input.c
==
--- head/sys/netinet/tcp_input.cWed Jan 6 22:02:08 2016
(r293283)
+++ head/sys/netinet/tcp_input.cThu Jan 7 00:14:42 2016
(r293284)
@@ -290,7 +290,7 @@ cc_ack_received(struct tcpcb *tp, struct
if (type == CC_ACK) {
if (tp->snd_cwnd > tp->snd_ssthresh) {
tp->t_bytes_acked += min(tp->ccv->bytes_this_ack,
-V_tcp_abc_l_var * tp->t_maxseg);
+V_tcp_abc_l_var * tcp_maxseg(tp));
if (tp->t_bytes_acked >= tp->snd_cwnd) {
tp->t_bytes_acked -= tp->snd_cwnd;
tp->ccv->flags |= CCF_ABC_SENTAWND;
@@ -313,11 +313,13 @@ cc_conn_init(struct tcpcb *tp)
{
struct hc_metrics_lite metrics;
struct inpcb *inp = tp->t_inpcb;
+ u_int maxseg;
int rtt;
INP_WLOCK_ASSERT(tp->t_inpcb);
tcp_hc_get(&inp->inp_inc, &metrics);
+ maxseg = tcp_maxseg(tp);
if (tp->t_srtt == 0 && (rtt = metrics.rmx_rtt)) {
tp->t_srtt = rtt;
@@ -342,7 +344,7 @@ cc_conn_init(struct tcpcb *tp)
* the slow start threshhold, but set the
* threshold to no less than 2*mss.
*/
- tp->snd_ssthresh = max(2 * tp->t_maxseg, metrics.r
svn commit: r293282 - head
Author: glebius
Date: Wed Jan 6 21:58:45 2016
New Revision: 293282
URL: https://svnweb.freebsd.org/changeset/base/293282
Log:
Provide knob NO_INSTALLEXTRAKERNELS. If defined, extra kernels in KERNCONF
won't be installed, only the first one would.
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Wed Jan 6 21:47:49 2016(r293281)
+++ head/Makefile.inc1 Wed Jan 6 21:58:45 2016(r293282)
@@ -1230,7 +1230,7 @@ reinstallkernel reinstallkernel.debug: _
${CROSSENV} PATH=${TMPPATH} \
${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME}
${.TARGET:S/kernel//}
.endif
-.if ${BUILDKERNELS:[#]} > 1
+.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
.for _kernel in ${BUILDKERNELS:[2..-1]}
@echo "--"
@echo ">>> Installing kernel ${_kernel}"
@@ -1261,7 +1261,7 @@ distributekernel distributekernel.debug:
${DESTDIR}/${DISTDIR}/kernel.meta
.endif
.endif
-.if ${BUILDKERNELS:[#]} > 1
+.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
.for _kernel in ${BUILDKERNELS:[2..-1]}
.if defined(NO_ROOT)
echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta
@@ -1292,7 +1292,7 @@ packagekernel:
tar cvf - --include '*/*/*.debug' \
@${DESTDIR}/${DISTDIR}/kernel.meta | \
${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz
-.if ${BUILDKERNELS:[#]} > 1
+.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
.for _kernel in ${BUILDKERNELS:[2..-1]}
cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
tar cvf - --exclude '*.debug' \
@@ -1313,7 +1313,7 @@ packagekernel:
cd ${DESTDIR}/${DISTDIR}/kernel; \
tar cvf - --include '*/*/*.debug' $$(eval find .) | \
${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz
-.if ${BUILDKERNELS:[#]} > 1
+.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
.for _kernel in ${BUILDKERNELS:[2..-1]}
cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
tar cvf - --exclude '*.debug' . | \
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r293281 - in head/share: man/man7 misc
Author: emaste
Date: Wed Jan 6 21:47:49 2016
New Revision: 293281
URL: https://svnweb.freebsd.org/changeset/base/293281
Log:
Use standard name for ASCII LF and FF control codes
PR: 205778
MFC after:2 weeks
Modified:
head/share/man/man7/ascii.7
head/share/misc/ascii (contents, props changed)
Modified: head/share/man/man7/ascii.7
==
--- head/share/man/man7/ascii.7 Wed Jan 6 21:31:07 2016(r293280)
+++ head/share/man/man7/ascii.7 Wed Jan 6 21:47:49 2016(r293281)
@@ -28,7 +28,7 @@
.\"@(#)ascii.7 8.1 (Berkeley) 6/5/93
.\" $FreeBSD$
.\"
-.Dd June 5, 1993
+.Dd January 6, 2016
.Dt ASCII 7
.Os
.Sh NAME
@@ -42,7 +42,7 @@ The
set:
.Bd -literal -offset left
000 NUL 001 SOH 002 STX 003 ETX 004 EOT 005 ENQ 006 ACK 007 BEL
-010 BS 011 HT 012 NL 013 VT 014 NP 015 CR 016 SO 017 SI
+010 BS 011 HT 012 LF 013 VT 014 FF 015 CR 016 SO 017 SI
020 DLE 021 DC1 022 DC2 023 DC3 024 DC4 025 NAK 026 SYN 027 ETB
030 CAN 031 EM 032 SUB 033 ESC 034 FS 035 GS 036 RS 037 US
040 SP 041 ! 042 " 043 # 044 $ 045 % 046 & 047 '
@@ -64,7 +64,7 @@ The
set:
.Bd -literal -offset left
00 NUL 01 SOH 02 STX 03 ETX 04 EOT 05 ENQ 06 ACK 07 BEL
-08 BS09 HT0A NL0B VT0C NP0D CR0E SO0F SI
+08 BS09 HT0A LF0B VT0C FF0D CR0E SO0F SI
10 DLE 11 DC1 12 DC2 13 DC3 14 DC4 15 NAK 16 SYN 17 ETB
18 CAN 19 EM1A SUB 1B ESC 1C FS1D GS1E RS1F US
20 SP21 !22 "23 #24 $25 %26 &27 '
@@ -86,7 +86,7 @@ The
set:
.Bd -literal -offset left
0 NUL1 SOH2 STX3 ETX4 EOT5 ENQ6 ACK7 BEL
- 8 BS 9 HT10 NL11 VT12 NP13 CR14 SO15 SI
+ 8 BS 9 HT10 LF11 VT12 FF13 CR14 SO15 SI
16 DLE 17 DC1 18 DC2 19 DC3 20 DC4 21 NAK 22 SYN 23 ETB
24 CAN 25 EM26 SUB 27 ESC 28 FS29 GS30 RS31 US
32 SP33 !34 "35 #36 $37 %38 &39 '
Modified: head/share/misc/ascii
==
--- head/share/misc/ascii Wed Jan 6 21:31:07 2016(r293280)
+++ head/share/misc/ascii Wed Jan 6 21:47:49 2016(r293281)
@@ -1,5 +1,5 @@
|000 nul|001 soh|002 stx|003 etx|004 eot|005 enq|006 ack|007 bel|
-|010 bs |011 ht |012 nl |013 vt |014 np |015 cr |016 so |017 si |
+|010 bs |011 ht |012 lf |013 vt |014 ff |015 cr |016 so |017 si |
|020 dle|021 dc1|022 dc2|023 dc3|024 dc4|025 nak|026 syn|027 etb|
|030 can|031 em |032 sub|033 esc|034 fs |035 gs |036 rs |037 us |
|040 sp |041 ! |042 " |043 # |044 $ |045 % |046 & |047 ' |
@@ -16,7 +16,7 @@
|170 x |171 y |172 z |173 { |174 | |175 } |176 ~ |177 del|
| 00 nul| 01 soh| 02 stx| 03 etx| 04 eot| 05 enq| 06 ack| 07 bel|
-| 08 bs | 09 ht | 0a nl | 0b vt | 0c np | 0d cr | 0e so | 0f si |
+| 08 bs | 09 ht | 0a lf | 0b vt | 0c ff | 0d cr | 0e so | 0f si |
| 10 dle| 11 dc1| 12 dc2| 13 dc3| 14 dc4| 15 nak| 16 syn| 17 etb|
| 18 can| 19 em | 1a sub| 1b esc| 1c fs | 1d gs | 1e rs | 1f us |
| 20 sp | 21 ! | 22 " | 23 # | 24 $ | 25 % | 26 & | 27 ' |
@@ -33,7 +33,7 @@
| 78 x | 79 y | 7a z | 7b { | 7c | | 7d } | 7e ~ | 7f del|
| 0 nul| 1 soh| 2 stx| 3 etx| 4 eot| 5 enq| 6 ack| 7 bel|
-| 8 bs | 9 ht | 10 nl | 11 vt | 12 np | 13 cr | 14 so | 15 si |
+| 8 bs | 9 ht | 10 lf | 11 vt | 12 ff | 13 cr | 14 so | 15 si |
| 16 dle| 17 dc1| 18 dc2| 19 dc3| 20 dc4| 21 nak| 22 syn| 23 etb|
| 24 can| 25 em | 26 sub| 27 esc| 28 fs | 29 gs | 30 rs | 31 us |
| 32 sp | 33 ! | 34 " | 35 # | 36 $ | 37 % | 38 & | 39 ' |
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r293274 - in head/sys/boot/efi: boot1 loader
Author: smh
Date: Wed Jan 6 20:48:29 2016
New Revision: 293274
URL: https://svnweb.freebsd.org/changeset/base/293274
Log:
style(9) fixes for EFI boot
Fix some style(9) nits for EFI boot code, no functional changes.
MFC after:2 weeks
X-MFC-With: r293268
Sponsored by: Multiplay
Modified:
head/sys/boot/efi/boot1/boot1.c
head/sys/boot/efi/loader/devicename.c
Modified: head/sys/boot/efi/boot1/boot1.c
==
--- head/sys/boot/efi/boot1/boot1.c Wed Jan 6 20:43:41 2016
(r293273)
+++ head/sys/boot/efi/boot1/boot1.c Wed Jan 6 20:48:29 2016
(r293274)
@@ -132,8 +132,7 @@ EFI_STATUS efi_main(EFI_HANDLE Ximage, E
conout->Reset(conout, TRUE);
max_dim = best_mode = 0;
for (i = 0; ; i++) {
- status = conout->QueryMode(conout, i,
- &cols, &rows);
+ status = conout->QueryMode(conout, i, &cols, &rows);
if (EFI_ERROR(status))
break;
if (cols * rows > max_dim) {
Modified: head/sys/boot/efi/loader/devicename.c
==
--- head/sys/boot/efi/loader/devicename.c Wed Jan 6 20:43:41 2016
(r293273)
+++ head/sys/boot/efi/loader/devicename.c Wed Jan 6 20:48:29 2016
(r293274)
@@ -147,7 +147,7 @@ efi_fmtdev(void *vdev)
break;
}
- return(buf);
+ return (buf);
}
/*
@@ -161,7 +161,7 @@ efi_setcurrdev(struct env_var *ev, int f
rv = efi_parsedev(&ncurr, value, NULL);
if (rv != 0)
- return(rv);
+ return (rv);
free(ncurr);
env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r293271 - head/sys/cddl/boot/zfs
Author: smh Date: Wed Jan 6 20:28:09 2016 New Revision: 293271 URL: https://svnweb.freebsd.org/changeset/base/293271 Log: Fix const conversion warning in lz4_decompress Fix const conversion warning in lz4_decompress which shows when warnings are enabled (to be done later). MFC after:2 weeks X-MFC-With: r293268 Sponsored by: Multiplay Modified: head/sys/cddl/boot/zfs/lz4.c Modified: head/sys/cddl/boot/zfs/lz4.c == --- head/sys/cddl/boot/zfs/lz4.cWed Jan 6 20:27:55 2016 (r293270) +++ head/sys/cddl/boot/zfs/lz4.cWed Jan 6 20:28:09 2016 (r293271) @@ -52,7 +52,7 @@ lz4_decompress(void *s_start, void *d_st * Returns 0 on success (decompression function returned non-negative) * and non-zero on failure (decompression function returned negative). */ - return (LZ4_uncompress_unknownOutputSize(s_start + 4, d_start, bufsiz, + return (LZ4_uncompress_unknownOutputSize((const char *)s_start + 4, d_start, bufsiz, d_len) < 0); } ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r293269 - head/sys/boot/zfs
Author: smh Date: Wed Jan 6 20:25:41 2016 New Revision: 293269 URL: https://svnweb.freebsd.org/changeset/base/293269 Log: Fix return from zfs_probe_dev Ensure zfs_probe_dev returns the correct value. Also fix a style(9) trailing whitespace issue while here. MFC after:2 weeks X-MFC-With: r293268 Sponsored by: Multiplay Modified: head/sys/boot/zfs/zfs.c Modified: head/sys/boot/zfs/zfs.c == --- head/sys/boot/zfs/zfs.c Wed Jan 6 20:22:28 2016(r293268) +++ head/sys/boot/zfs/zfs.c Wed Jan 6 20:25:41 2016(r293269) @@ -154,7 +154,7 @@ zfs_read(struct open_file *f, void *star n = size; if (fp->f_seekp + n > sb.st_size) n = sb.st_size - fp->f_seekp; - + rc = dnode_read(spa, &fp->f_dnode, fp->f_seekp, start, n); if (rc) return (rc); @@ -507,7 +507,7 @@ zfs_probe_dev(const char *devname, uint6 } } close(pa.fd); - return (0); + return (ret); } /* ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r293268 - in head/sys/boot/efi/include: amd64 arm64 i386
Author: smh Date: Wed Jan 6 20:22:28 2016 New Revision: 293268 URL: https://svnweb.freebsd.org/changeset/base/293268 Log: Fix _MSC_EXTENSIONS checks Use #ifdef instead of #if checks to prevent warnings generated by checks to be enabled shortly. MFC after:2 weeks Sponsored by: Multiplay Modified: head/sys/boot/efi/include/amd64/efibind.h head/sys/boot/efi/include/arm64/efibind.h head/sys/boot/efi/include/i386/efibind.h Modified: head/sys/boot/efi/include/amd64/efibind.h == --- head/sys/boot/efi/include/amd64/efibind.h Wed Jan 6 20:21:40 2016 (r293267) +++ head/sys/boot/efi/include/amd64/efibind.h Wed Jan 6 20:22:28 2016 (r293268) @@ -39,7 +39,7 @@ Revision History // No ANSI C 1999/2000 stdint.h integer width declarations -#if _MSC_EXTENSIONS +#ifdef _MSC_EXTENSIONS // Use Microsoft C compiler integer width declarations @@ -164,7 +164,7 @@ typedef uint64_t UINTN; #endif #ifndef EFIAPI // Forces EFI calling conventions reguardless of compiler options -#if _MSC_EXTENSIONS +#ifdef _MSC_EXTENSIONS #define EFIAPI __cdecl // Force C calling convention for Microsoft C compiler #else #define EFIAPI // Substitute expresion to force C calling convention @@ -265,7 +265,7 @@ typedef uint64_t UINTN; #endif #endif /* __FreeBSD__ */ -#if _MSC_EXTENSIONS +#ifdef _MSC_EXTENSIONS #pragma warning ( disable : 4731 ) // Suppress warnings about modification of EBP #endif Modified: head/sys/boot/efi/include/arm64/efibind.h == --- head/sys/boot/efi/include/arm64/efibind.h Wed Jan 6 20:21:40 2016 (r293267) +++ head/sys/boot/efi/include/arm64/efibind.h Wed Jan 6 20:22:28 2016 (r293268) @@ -39,7 +39,7 @@ Revision History // No ANSI C 1999/2000 stdint.h integer width declarations -#if _MSC_EXTENSIONS +#ifdef _MSC_EXTENSIONS // Use Microsoft C compiler integer width declarations @@ -159,7 +159,7 @@ typedef uint64_t UINTN; // #ifndef EFIAPI // Forces EFI calling conventions reguardless of compiler options -#if _MSC_EXTENSIONS +#ifdef _MSC_EXTENSIONS #define EFIAPI __cdecl // Force C calling convention for Microsoft C compiler #else #define EFIAPI // Substitute expresion to force C calling convention Modified: head/sys/boot/efi/include/i386/efibind.h == --- head/sys/boot/efi/include/i386/efibind.hWed Jan 6 20:21:40 2016 (r293267) +++ head/sys/boot/efi/include/i386/efibind.hWed Jan 6 20:22:28 2016 (r293268) @@ -39,7 +39,7 @@ Revision History // No ANSI C 1999/2000 stdint.h integer width declarations -#if _MSC_EXTENSIONS +#ifdef _MSC_EXTENSIONS // Use Microsoft C compiler integer width declarations @@ -160,7 +160,7 @@ typedef uint32_t UINTN; // #ifndef EFIAPI // Forces EFI calling conventions reguardless of compiler options -#if _MSC_EXTENSIONS +#ifdef _MSC_EXTENSIONS #define EFIAPI __cdecl // Force C calling convention for Microsoft C compiler #else #define EFIAPI // Substitute expresion to force C calling convention @@ -261,7 +261,7 @@ typedef uint32_t UINTN; #endif #endif /* __FreeBSD__ */ -#if _MSC_EXTENSIONS +#ifdef _MSC_EXTENSIONS #pragma warning ( disable : 4731 ) // Suppress warnings about modification of EBP #endif ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r293247 - head/contrib/llvm/projects/libunwind/src
Author: emaste
Date: Wed Jan 6 19:41:06 2016
New Revision: 293247
URL: https://svnweb.freebsd.org/changeset/base/293247
Log:
libunwind: Include header for dl_unwind_find_exidx for ARM EHABI
Modified:
head/contrib/llvm/projects/libunwind/src/AddressSpace.hpp
Modified: head/contrib/llvm/projects/libunwind/src/AddressSpace.hpp
==
--- head/contrib/llvm/projects/libunwind/src/AddressSpace.hpp Wed Jan 6
19:40:37 2016(r293246)
+++ head/contrib/llvm/projects/libunwind/src/AddressSpace.hpp Wed Jan 6
19:41:06 2016(r293247)
@@ -37,6 +37,7 @@ namespace libunwind {
#if _LIBUNWIND_ARM_EHABI
#if defined(__FreeBSD__)
+#include
typedef void *_Unwind_Ptr;
#elif defined(__linux__)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r293245 - head/sys/boot/efi/loader
Author: emaste
Date: Wed Jan 6 19:18:43 2016
New Revision: 293245
URL: https://svnweb.freebsd.org/changeset/base/293245
Log:
loader.efi style(9) cleanup
Submitted by: smh
Modified:
head/sys/boot/efi/loader/main.c
Modified: head/sys/boot/efi/loader/main.c
==
--- head/sys/boot/efi/loader/main.c Wed Jan 6 19:15:16 2016
(r293244)
+++ head/sys/boot/efi/loader/main.c Wed Jan 6 19:18:43 2016
(r293245)
@@ -227,50 +227,47 @@ command_memmap(int argc, char *argv[])
status = BS->GetMemoryMap(&sz, 0, &key, &dsz, &dver);
if (status != EFI_BUFFER_TOO_SMALL) {
printf("Can't determine memory map size\n");
- return CMD_ERROR;
+ return (CMD_ERROR);
}
map = malloc(sz);
status = BS->GetMemoryMap(&sz, map, &key, &dsz, &dver);
if (EFI_ERROR(status)) {
printf("Can't read memory map\n");
- return CMD_ERROR;
+ return (CMD_ERROR);
}
ndesc = sz / dsz;
printf("%23s %12s %12s %8s %4s\n",
- "Type", "Physical", "Virtual", "#Pages", "Attr");
+ "Type", "Physical", "Virtual", "#Pages", "Attr");
for (i = 0, p = map; i < ndesc;
i++, p = NextMemoryDescriptor(p, dsz)) {
- printf("%23s %012lx %012lx %08lx ",
- types[p->Type],
- p->PhysicalStart,
- p->VirtualStart,
- p->NumberOfPages);
- if (p->Attribute & EFI_MEMORY_UC)
- printf("UC ");
- if (p->Attribute & EFI_MEMORY_WC)
- printf("WC ");
- if (p->Attribute & EFI_MEMORY_WT)
- printf("WT ");
- if (p->Attribute & EFI_MEMORY_WB)
- printf("WB ");
- if (p->Attribute & EFI_MEMORY_UCE)
- printf("UCE ");
- if (p->Attribute & EFI_MEMORY_WP)
- printf("WP ");
- if (p->Attribute & EFI_MEMORY_RP)
- printf("RP ");
- if (p->Attribute & EFI_MEMORY_XP)
- printf("XP ");
- printf("\n");
+ printf("%23s %012lx %012lx %08lx ", types[p->Type],
+ p->PhysicalStart, p->VirtualStart, p->NumberOfPages);
+ if (p->Attribute & EFI_MEMORY_UC)
+ printf("UC ");
+ if (p->Attribute & EFI_MEMORY_WC)
+ printf("WC ");
+ if (p->Attribute & EFI_MEMORY_WT)
+ printf("WT ");
+ if (p->Attribute & EFI_MEMORY_WB)
+ printf("WB ");
+ if (p->Attribute & EFI_MEMORY_UCE)
+ printf("UCE ");
+ if (p->Attribute & EFI_MEMORY_WP)
+ printf("WP ");
+ if (p->Attribute & EFI_MEMORY_RP)
+ printf("RP ");
+ if (p->Attribute & EFI_MEMORY_XP)
+ printf("XP ");
+ printf("\n");
}
- return CMD_OK;
+ return (CMD_OK);
}
-COMMAND_SET(configuration, "configuration",
- "print configuration tables", command_configuration);
+COMMAND_SET(configuration, "configuration", "print configuration tables",
+command_configuration);
static const char *
guid_to_string(EFI_GUID *guid)
@@ -318,7 +315,7 @@ command_configuration(int argc, char *ar
printf(" at %p\n", ST->ConfigurationTable[i].VendorTable);
}
- return CMD_OK;
+ return (CMD_OK);
}
@@ -395,20 +392,17 @@ command_nvram(int argc, char *argv[])
status = RS->GetNextVariableName(&varsz, NULL, NULL);
for (; status != EFI_NOT_FOUND; ) {
- status = RS->GetNextVariableName(&varsz, var,
- &varguid);
+ status = RS->GetNextVariableName(&varsz, var, &varguid);
//if (EFI_ERROR(status))
//break;
conout->OutputString(conout, var);
printf("=");
datasz = 0;
- status = RS->GetVariable(var, &varguid, NULL, &datasz,
- NULL);
+ status = RS->GetVariable(var, &varguid, NULL, &datasz, NULL);
/* XXX: check status */
data = malloc(datasz);
- status = RS->GetVariable(var, &varguid, NULL, &datasz,
- data);
+ status = RS->GetVariable(var, &varguid, NULL, &datasz, data);
if (EFI_ERROR(status))
printf("");
else {
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r293244 - in head/sys/boot/efi: boot1 include loader loader/arch/amd64
Author: emaste
Date: Wed Jan 6 19:15:16 2016
New Revision: 293244
URL: https://svnweb.freebsd.org/changeset/base/293244
Log:
Introduce and use new EFI_ERROR_CODE macro for EFI errors
Submitted by: smh
MFC after:1 week
Modified:
head/sys/boot/efi/boot1/boot1.c
head/sys/boot/efi/include/efierr.h
head/sys/boot/efi/loader/arch/amd64/framebuffer.c
head/sys/boot/efi/loader/bootinfo.c
head/sys/boot/efi/loader/copy.c
Modified: head/sys/boot/efi/boot1/boot1.c
==
--- head/sys/boot/efi/boot1/boot1.c Wed Jan 6 17:53:51 2016
(r293243)
+++ head/sys/boot/efi/boot1/boot1.c Wed Jan 6 19:15:16 2016
(r293244)
@@ -331,20 +331,20 @@ load(const char *fname)
buffer, bufsize, &loaderhandle);
if (EFI_ERROR(status))
printf("LoadImage failed with error %lu\n",
- status & ~EFI_ERROR_MASK);
+ EFI_ERROR_CODE(status));
status = systab->BootServices->HandleProtocol(loaderhandle,
&LoadedImageGUID, (VOID**)&loaded_image);
if (EFI_ERROR(status))
printf("HandleProtocol failed with error %lu\n",
- status & ~EFI_ERROR_MASK);
+ EFI_ERROR_CODE(status));
loaded_image->DeviceHandle = bootdevhandle;
status = systab->BootServices->StartImage(loaderhandle, NULL, NULL);
if (EFI_ERROR(status))
printf("StartImage failed with error %lu\n",
- status & ~EFI_ERROR_MASK);
+ EFI_ERROR_CODE(status));
}
static void
Modified: head/sys/boot/efi/include/efierr.h
==
--- head/sys/boot/efi/include/efierr.h Wed Jan 6 17:53:51 2016
(r293243)
+++ head/sys/boot/efi/include/efierr.h Wed Jan 6 19:15:16 2016
(r293244)
@@ -30,7 +30,8 @@ Revision History
#define EFIWARN(a)(a)
-#define EFI_ERROR(a) (((INTN) a) < 0)
+#define EFI_ERROR(a) (((INTN) a) < 0)
+#define EFI_ERROR_CODE(a) (a & ~EFI_ERROR_MASK)
#define EFI_SUCCESS 0
Modified: head/sys/boot/efi/loader/arch/amd64/framebuffer.c
==
--- head/sys/boot/efi/loader/arch/amd64/framebuffer.c Wed Jan 6 17:53:51
2016(r293243)
+++ head/sys/boot/efi/loader/arch/amd64/framebuffer.c Wed Jan 6 19:15:16
2016(r293244)
@@ -178,7 +178,7 @@ efifb_uga_find_pixel(EFI_UGA_DRAW_PROTOC
printf("No change detected in frame buffer");
fail:
- printf(" -- error %lu\n", status & ~EFI_ERROR_MASK);
+ printf(" -- error %lu\n", EFI_ERROR_CODE(status));
free(data1);
return (-1);
}
@@ -473,7 +473,7 @@ command_gop(int argc, char *argv[])
status = BS->LocateProtocol(&gop_guid, NULL, (VOID **)&gop);
if (EFI_ERROR(status)) {
sprintf(command_errbuf, "%s: Graphics Output Protocol not "
- "present (error=%lu)", argv[0], status & ~EFI_ERROR_MASK);
+ "present (error=%lu)", argv[0], EFI_ERROR_CODE(status));
return (CMD_ERROR);
}
@@ -494,7 +494,7 @@ command_gop(int argc, char *argv[])
if (EFI_ERROR(status)) {
sprintf(command_errbuf, "%s: Unable to set mode to "
"%u (error=%lu)", argv[0], mode,
- status & ~EFI_ERROR_MASK);
+ EFI_ERROR_CODE(status));
return (CMD_ERROR);
}
} else if (!strcmp(argv[1], "get")) {
@@ -541,7 +541,7 @@ command_uga(int argc, char *argv[])
status = BS->LocateProtocol(&uga_guid, NULL, (VOID **)&uga);
if (EFI_ERROR(status)) {
sprintf(command_errbuf, "%s: UGA Protocol not present "
- "(error=%lu)", argv[0], status & ~EFI_ERROR_MASK);
+ "(error=%lu)", argv[0], EFI_ERROR_CODE(status));
return (CMD_ERROR);
}
Modified: head/sys/boot/efi/loader/bootinfo.c
==
--- head/sys/boot/efi/loader/bootinfo.c Wed Jan 6 17:53:51 2016
(r293243)
+++ head/sys/boot/efi/loader/bootinfo.c Wed Jan 6 19:15:16 2016
(r293244)
@@ -290,7 +290,7 @@ bi_load_efi_data(struct preloaded_file *
pages, &addr);
if (EFI_ERROR(status)) {
printf("%s: AllocatePages error %lu\n", __func__,
- (unsigned long)(status & ~EFI_ERROR_MASK));
+ EFI_ERROR_CODE(status));
return (ENOMEM);
}
@@ -306,7 +306,7 @@ bi_load_efi_data(struct preloaded_file *
status = BS->GetMemoryMap(&sz, mm, &efi_mapkey, &mmsz, &mmv
Re: svn commit: r293234 - head/sys/boot/forth
Awesome work, just back ported this to our internal 10.2 build along size the ZFS EFI and I'm pleased to report all is working as expected :) Regards Steve On 06/01/2016 15:50, Ed Maste wrote: Author: emaste Date: Wed Jan 6 15:50:21 2016 New Revision: 293234 URL: https://svnweb.freebsd.org/changeset/base/293234 Log: Enable the beastie menu for the UEFI console As of r293233 the UEFI console includes basic terminal emulator support. MFC after: 2 weeks Relnotes:Yes Modified: head/sys/boot/forth/beastie.4th head/sys/boot/forth/beastie.4th.8 head/sys/boot/forth/loader.conf.5 Modified: head/sys/boot/forth/beastie.4th == --- head/sys/boot/forth/beastie.4th Wed Jan 6 15:38:39 2016 (r293233) +++ head/sys/boot/forth/beastie.4th Wed Jan 6 15:50:21 2016 (r293234) @@ -85,11 +85,6 @@ variable logoY also support-functions : beastie-start ( -- ) \ starts the menu - s" console" getenv dup -1 <> if - s" efi" 2swap contains? if - s" set beastie_disable=YES" evaluate - then - else drop then s" beastie_disable" getenv dup -1 <> if s" YES" compare-insensitive 0= if any_conf_read? if Modified: head/sys/boot/forth/beastie.4th.8 == --- head/sys/boot/forth/beastie.4th.8 Wed Jan 6 15:38:39 2016 (r293233) +++ head/sys/boot/forth/beastie.4th.8 Wed Jan 6 15:50:21 2016 (r293234) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 27, 2014 +.Dd January 6, 2016 .Dt BEASTIE.4TH 8 .Os .Sh NAME @@ -119,8 +119,7 @@ Sets the desired row position of the log If set to .Dq YES , the beastie boot menu will be skipped. -The beastie boot menu is always skipped if booting UEFI or running non-x86 -hardware. +The beastie boot menu is always skipped if running non-x86 hardware. .It Va loader_delay If set to a number higher than zero, introduces a delay before starting the beastie boot menu. During the delay the user can press either Ctrl-C to skip Modified: head/sys/boot/forth/loader.conf.5 == --- head/sys/boot/forth/loader.conf.5 Wed Jan 6 15:38:39 2016 (r293233) +++ head/sys/boot/forth/loader.conf.5 Wed Jan 6 15:50:21 2016 (r293234) @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd April 27, 2014 +.Dd January 6, 2016 .Dt LOADER.CONF 5 .Os .Sh NAME @@ -236,8 +236,7 @@ be displayed. If set to .Dq YES , the beastie boot menu will be skipped. -The beastie boot menu is always skipped if booting UEFI or running non-x86 -hardware. +The beastie boot menu is always skipped if running non-x86 hardware. .It Va loader_logo Pq Dq Li orbbw Selects a desired logo in the beastie boot menu. Possible values are: ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r293241 - head/lib/libstand
Author: emaste
Date: Wed Jan 6 17:33:32 2016
New Revision: 293241
URL: https://svnweb.freebsd.org/changeset/base/293241
Log:
Add fls() to libstand
Although we don't use it in tree yet libstand is installed as user-
facing /usr/liblibstand.a, and some work in progress makes use of it.
Instead of conflicting with ongoing libstand Makefile deduplication,
just add it now.
Modified:
head/lib/libstand/Makefile
Modified: head/lib/libstand/Makefile
==
--- head/lib/libstand/Makefile Wed Jan 6 17:13:40 2016(r293240)
+++ head/lib/libstand/Makefile Wed Jan 6 17:33:32 2016(r293241)
@@ -38,8 +38,9 @@ SRCS+= ntoh.c
# string functions from libc
.PATH: ${LIBC_SRC}/string
-SRCS+= bcmp.c bcopy.c bzero.c ffs.c memccpy.c memchr.c memcmp.c memcpy.c \
- memmove.c memset.c qdivrem.c strcat.c strchr.c strcmp.c strcpy.c \
+SRCS+= bcmp.c bcopy.c bzero.c ffs.c fls.c \
+ memccpy.c memchr.c memcmp.c memcpy.c memmove.c memset.c \
+ qdivrem.c strcat.c strchr.c strcmp.c strcpy.c \
strcspn.c strlcat.c strlcpy.c strlen.c strncat.c strncmp.c strncpy.c \
strpbrk.c strrchr.c strsep.c strspn.c strstr.c strtok.c swab.c
.if ${MACHINE_CPUARCH} == "arm"
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r293240 - head/etc
Author: imp
Date: Wed Jan 6 17:13:40 2016
New Revision: 293240
URL: https://svnweb.freebsd.org/changeset/base/293240
Log:
Try a little harder to remove firstboot and firstboot-reboot files in
case they accidentally get created as directories or with flags that
prevent their removal. While I wouldn't normally go the extra mile
here and let the normal unix rules prevail, the effects of failure are
large enough that extra care is warranted.
Modified:
head/etc/rc
Modified: head/etc/rc
==
--- head/etc/rc Wed Jan 6 16:35:30 2016(r293239)
+++ head/etc/rc Wed Jan 6 17:13:40 2016(r293240)
@@ -130,11 +130,17 @@ for _rc_elem in ${files}; do
done
# Remove the firstboot sentinel, and reboot if it was requested.
+# Be a bit paranoid about removing it to handle the common failure
+# modes since the consequence of failure can be big.
+# Note: this assumes firstboot_sentinel is on / when we have
+# a read-only /, or that it is on media that's writable.
if [ -e ${firstboot_sentinel} ]; then
[ ${root_rw_mount} = "yes" ] || mount -uw /
- /bin/rm -f ${firstboot_sentinel}
+ chflags -R 0 ${firstboot_sentinel}
+ rm -rf ${firstboot_sentinel}
if [ -e ${firstboot_sentinel}-reboot ]; then
- /bin/rm -f ${firstboot_sentinel}-reboot
+ chflags -R 0 ${firstboot_sentinel}-reboot
+ rm -rf ${firstboot_sentinel}-reboot
[ ${root_rw_mount} = "yes" ] || mount -ur /
kill -INT 1
fi
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r293226 - head/libexec/rtld-elf
On Wed, Jan 6, 2016 at 9:10 AM, Konstantin Belousov
wrote:
> On Tue, Jan 05, 2016 at 09:20:46PM +, Warner Losh wrote:
> > Author: imp
> > Date: Tue Jan 5 21:20:46 2016
> > New Revision: 293226
> > URL: https://svnweb.freebsd.org/changeset/base/293226
> >
> > Log:
> > Disable abi variant hook until strangeness with packages can be sorted
> > out.
> >
> > Modified:
> > head/libexec/rtld-elf/rtld.c
> >
> > Modified: head/libexec/rtld-elf/rtld.c
> >
> ==
> > --- head/libexec/rtld-elf/rtld.c Tue Jan 5 21:12:49 2016
> (r293225)
> > +++ head/libexec/rtld-elf/rtld.c Tue Jan 5 21:20:46 2016
> (r293226)
> > @@ -435,7 +435,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_
> >
> > trust = !issetugid();
> >
> > -md_abi_variant_hook(aux_info);
> > +/* md_abi_variant_hook(aux_info); */
> >
> > ld_bind_now = getenv(_LD("BIND_NOW"));
> > /*
> The ARM hook resets the default paths to the libsoft variants. It cannot
> work while /lib, /usr/lib and /usr/local/lib are populated with soft-fp
> libraries. I thought that you are going to switch the default target_arch
> to armv6hf immediately after the commit to rtld.
>
That analysis isn't quite right. I'll throw the replacement switch very
soon.
The problem is that it highlighted was things were incomplete, not that
I'd left soft float libraries where I did for a short period of time.
> And then, looking into the issue, IMO the way forward is to leave softfp
> libraries where they are, but install v6hf somewhere in /lib/armv6hf etc.
>
No. That's even worse. We're not doing that.
Warner
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r293226 - head/libexec/rtld-elf
On Tue, Jan 05, 2016 at 09:20:46PM +, Warner Losh wrote:
> Author: imp
> Date: Tue Jan 5 21:20:46 2016
> New Revision: 293226
> URL: https://svnweb.freebsd.org/changeset/base/293226
>
> Log:
> Disable abi variant hook until strangeness with packages can be sorted
> out.
>
> Modified:
> head/libexec/rtld-elf/rtld.c
>
> Modified: head/libexec/rtld-elf/rtld.c
> ==
> --- head/libexec/rtld-elf/rtld.c Tue Jan 5 21:12:49 2016
> (r293225)
> +++ head/libexec/rtld-elf/rtld.c Tue Jan 5 21:20:46 2016
> (r293226)
> @@ -435,7 +435,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_
>
> trust = !issetugid();
>
> -md_abi_variant_hook(aux_info);
> +/* md_abi_variant_hook(aux_info); */
>
> ld_bind_now = getenv(_LD("BIND_NOW"));
> /*
The ARM hook resets the default paths to the libsoft variants. It cannot
work while /lib, /usr/lib and /usr/local/lib are populated with soft-fp
libraries. I thought that you are going to switch the default target_arch
to armv6hf immediately after the commit to rtld.
And then, looking into the issue, IMO the way forward is to leave softfp
libraries where they are, but install v6hf somewhere in /lib/armv6hf etc.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r293234 - head/sys/boot/forth
Author: emaste Date: Wed Jan 6 15:50:21 2016 New Revision: 293234 URL: https://svnweb.freebsd.org/changeset/base/293234 Log: Enable the beastie menu for the UEFI console As of r293233 the UEFI console includes basic terminal emulator support. MFC after:2 weeks Relnotes: Yes Modified: head/sys/boot/forth/beastie.4th head/sys/boot/forth/beastie.4th.8 head/sys/boot/forth/loader.conf.5 Modified: head/sys/boot/forth/beastie.4th == --- head/sys/boot/forth/beastie.4th Wed Jan 6 15:38:39 2016 (r293233) +++ head/sys/boot/forth/beastie.4th Wed Jan 6 15:50:21 2016 (r293234) @@ -85,11 +85,6 @@ variable logoY also support-functions : beastie-start ( -- ) \ starts the menu - s" console" getenv dup -1 <> if - s" efi" 2swap contains? if - s" set beastie_disable=YES" evaluate - then - else drop then s" beastie_disable" getenv dup -1 <> if s" YES" compare-insensitive 0= if any_conf_read? if Modified: head/sys/boot/forth/beastie.4th.8 == --- head/sys/boot/forth/beastie.4th.8 Wed Jan 6 15:38:39 2016 (r293233) +++ head/sys/boot/forth/beastie.4th.8 Wed Jan 6 15:50:21 2016 (r293234) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 27, 2014 +.Dd January 6, 2016 .Dt BEASTIE.4TH 8 .Os .Sh NAME @@ -119,8 +119,7 @@ Sets the desired row position of the log If set to .Dq YES , the beastie boot menu will be skipped. -The beastie boot menu is always skipped if booting UEFI or running non-x86 -hardware. +The beastie boot menu is always skipped if running non-x86 hardware. .It Va loader_delay If set to a number higher than zero, introduces a delay before starting the beastie boot menu. During the delay the user can press either Ctrl-C to skip Modified: head/sys/boot/forth/loader.conf.5 == --- head/sys/boot/forth/loader.conf.5 Wed Jan 6 15:38:39 2016 (r293233) +++ head/sys/boot/forth/loader.conf.5 Wed Jan 6 15:50:21 2016 (r293234) @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd April 27, 2014 +.Dd January 6, 2016 .Dt LOADER.CONF 5 .Os .Sh NAME @@ -236,8 +236,7 @@ be displayed. If set to .Dq YES , the beastie boot menu will be skipped. -The beastie boot menu is always skipped if booting UEFI or running non-x86 -hardware. +The beastie boot menu is always skipped if running non-x86 hardware. .It Va loader_logo Pq Dq Li orbbw Selects a desired logo in the beastie boot menu. Possible values are: ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r293233 - in head/sys/boot: efi/libefi efi/loader ficl/amd64
Author: emaste
Date: Wed Jan 6 15:38:39 2016
New Revision: 293233
URL: https://svnweb.freebsd.org/changeset/base/293233
Log:
loader.efi: add terminal emulation support
This is based on the vidconsole implementation.
Submitted by: Toomas Soome
Reviewed by: adrian
MFC after:2 weeks
Relnotes: Yes
Differential Revision:https://reviews.freebsd.org/D4797
Modified:
head/sys/boot/efi/libefi/Makefile
head/sys/boot/efi/libefi/efi_console.c
head/sys/boot/efi/loader/main.c
head/sys/boot/ficl/amd64/sysdep.c
Modified: head/sys/boot/efi/libefi/Makefile
==
--- head/sys/boot/efi/libefi/Makefile Wed Jan 6 09:56:06 2016
(r293232)
+++ head/sys/boot/efi/libefi/Makefile Wed Jan 6 15:38:39 2016
(r293233)
@@ -21,5 +21,6 @@ CFLAGS+= -I${.CURDIR}/../../common
# Handle FreeBSD specific %b and %D printf format specifiers
CFLAGS+= ${FORMAT_EXTENSIONS}
+CFLAGS+= -DTERM_EMU
.include
Modified: head/sys/boot/efi/libefi/efi_console.c
==
--- head/sys/boot/efi/libefi/efi_console.c Wed Jan 6 09:56:06 2016
(r293232)
+++ head/sys/boot/efi/libefi/efi_console.c Wed Jan 6 15:38:39 2016
(r293233)
@@ -35,6 +35,69 @@ __FBSDID("$FreeBSD$");
static SIMPLE_TEXT_OUTPUT_INTERFACE*conout;
static SIMPLE_INPUT_INTERFACE *conin;
+#ifdef TERM_EMU
+#defineDEFAULT_FGCOLOR EFI_LIGHTGRAY
+#defineDEFAULT_BGCOLOR EFI_BLACK
+
+#defineMAXARGS 8
+static int args[MAXARGS], argc;
+static int fg_c, bg_c, curx, cury;
+static int esc;
+
+void get_pos(int *x, int *y);
+void curs_move(int *_x, int *_y, int x, int y);
+static void CL(int);
+#endif
+
+static void efi_cons_probe(struct console *);
+static int efi_cons_init(int);
+void efi_cons_putchar(int);
+int efi_cons_getchar(void);
+void efi_cons_efiputchar(int);
+int efi_cons_poll(void);
+
+struct console efi_console = {
+ "efi",
+ "EFI console",
+ 0,
+ efi_cons_probe,
+ efi_cons_init,
+ efi_cons_putchar,
+ efi_cons_getchar,
+ efi_cons_poll
+};
+
+#ifdef TERM_EMU
+
+/* Get cursor position. */
+void
+get_pos(int *x, int *y)
+{
+ *x = conout->Mode->CursorColumn;
+ *y = conout->Mode->CursorRow;
+}
+
+/* Move cursor to x rows and y cols (0-based). */
+void
+curs_move(int *_x, int *_y, int x, int y)
+{
+ conout->SetCursorPosition(conout, x, y);
+ if (_x != NULL)
+ *_x = conout->Mode->CursorColumn;
+ if (_y != NULL)
+ *_y = conout->Mode->CursorRow;
+}
+
+/* Clear internal state of the terminal emulation code. */
+void
+end_term(void)
+{
+ esc = 0;
+ argc = -1;
+}
+
+#endif
+
static void
efi_cons_probe(struct console *cp)
{
@@ -46,22 +109,314 @@ efi_cons_probe(struct console *cp)
static int
efi_cons_init(int arg)
{
- conout->SetAttribute(conout, EFI_TEXT_ATTR(EFI_LIGHTGRAY, EFI_BLACK));
+ conout->SetAttribute(conout, EFI_TEXT_ATTR(DEFAULT_FGCOLOR,
+ DEFAULT_BGCOLOR));
+#ifdef TERM_EMU
+ end_term();
+ get_pos(&curx, &cury);
+ curs_move(&curx, &cury, curx, cury);
+ fg_c = DEFAULT_FGCOLOR;
+ bg_c = DEFAULT_BGCOLOR;
+#endif
+ conout->EnableCursor(conout, TRUE);
return 0;
}
+static void
+efi_cons_rawputchar(int c)
+{
+ int i;
+ UINTN x, y;
+ conout->QueryMode(conout, conout->Mode->Mode, &x, &y);
+
+ if (c == '\t')
+ /* XXX lame tab expansion */
+ for (i = 0; i < 8; i++)
+ efi_cons_rawputchar(' ');
+ else {
+#ifndefTERM_EMU
+ if (c == '\n')
+ efi_cons_efiputchar('\r');
+ else
+ efi_cons_efiputchar(c);
+#else
+ switch (c) {
+ case '\r':
+ curx = 0;
+ curs_move(&curx, &cury, curx, cury);
+ return;
+ case '\n':
+ cury++;
+ if (cury >= y) {
+ efi_cons_efiputchar('\n');
+ cury--;
+ } else
+ curs_move(&curx, &cury, curx, cury);
+ return;
+ case '\b':
+ if (curx > 0) {
+ curx--;
+ curs_move(&curx, &cury, curx, cury);
+ }
+ return;
+ default:
+ efi_cons_efiputchar(c);
+ curx++;
+ if (curx > x-1) {
+ curx = 0;
+ cury++;
+ }
+ if (cury > y-1) {
+ curx = 0;
+
Re: svn commit: r293223 - in head: . release release/amd64 release/i386 release/pc98 release/powerpc release/scripts release/sparc64 usr.sbin/bsdinstall/scripts
On Wed, Jan 06, 2016 at 01:42:00PM +, Glen Barber wrote: > On Wed, Jan 06, 2016 at 04:39:40PM +0300, Slawa Olhovchenkov wrote: > > On Wed, Jan 06, 2016 at 01:26:53PM +, Glen Barber wrote: > > > On Wed, Jan 06, 2016 at 04:02:13PM +0300, Slawa Olhovchenkov wrote: > > > > Somehow not done? > > > > > > I'm sorry, I do not understand what you mean. > > > > Sorry for my english. > > Your english is fine. :) > > I was not sure if you meant this particular commit, or something else. > > > Do you planed for some commit to head before MFC planed? > > > > Bug fixes, mainly. I am sure I have missed something, regardless of how > much testing was done. Thanks, I will try. ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r293223 - in head: . release release/amd64 release/i386 release/pc98 release/powerpc release/scripts release/sparc64 usr.sbin/bsdinstall/scripts
On Wed, Jan 06, 2016 at 04:39:40PM +0300, Slawa Olhovchenkov wrote: > On Wed, Jan 06, 2016 at 01:26:53PM +, Glen Barber wrote: > > On Wed, Jan 06, 2016 at 04:02:13PM +0300, Slawa Olhovchenkov wrote: > > > Somehow not done? > > > > I'm sorry, I do not understand what you mean. > > Sorry for my english. Your english is fine. :) I was not sure if you meant this particular commit, or something else. > Do you planed for some commit to head before MFC planed? > Bug fixes, mainly. I am sure I have missed something, regardless of how much testing was done. Glen signature.asc Description: PGP signature
Re: svn commit: r293223 - in head: . release release/amd64 release/i386 release/pc98 release/powerpc release/scripts release/sparc64 usr.sbin/bsdinstall/scripts
On Wed, Jan 06, 2016 at 01:26:53PM +, Glen Barber wrote: > On Wed, Jan 06, 2016 at 04:02:13PM +0300, Slawa Olhovchenkov wrote: > > On Wed, Jan 06, 2016 at 12:34:29PM +, Glen Barber wrote: > > > > > On Wed, Jan 06, 2016 at 02:52:30PM +0300, Slawa Olhovchenkov wrote: > > > > On Tue, Jan 05, 2016 at 09:05:17PM +, Glen Barber wrote: > > > > > > > > > Author: gjb > > > > > Date: Tue Jan 5 21:05:17 2016 > > > > > New Revision: 293223 > > > > > URL: https://svnweb.freebsd.org/changeset/base/293223 > > > > > > > > > > Log: > > > > > Merge ^/projects/release-install-debug: > > > > > > > > > > - Rework MANIFEST generation and parsing via bsdinstall(8). > > > > > - Allow selecting debugging distribution sets during install. > > > > > - Rework bsdinstall(8) to fetch remote debug distribution sets > > > > > when they are not available on the local install medium. > > > > > - Allow selecting additional non-GENERIC kernels during install. > > > > > At present, GENERIC is still required, and installed by default. > > > > > > > > > > Tested with:head@r293203 > > > > > Sponsored by: The FreeBSD Foundation > > > > > > > > MFC planed? > > > > > > > > > > Not before 10.3-RELEASE, no. Perhaps after that. > > > > Somehow not done? > > I'm sorry, I do not understand what you mean. Sorry for my english. Do you planed for some commit to head before MFC planed? > > Can I use this as patch for custom intallation images? > > > > It should mostly apply, yes. There are likely sharp edges, though, > which is why I will not merge it before 10.3-RELEASE. > > Glen > ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r293223 - in head: . release release/amd64 release/i386 release/pc98 release/powerpc release/scripts release/sparc64 usr.sbin/bsdinstall/scripts
On Wed, Jan 06, 2016 at 04:02:13PM +0300, Slawa Olhovchenkov wrote: > On Wed, Jan 06, 2016 at 12:34:29PM +, Glen Barber wrote: > > > On Wed, Jan 06, 2016 at 02:52:30PM +0300, Slawa Olhovchenkov wrote: > > > On Tue, Jan 05, 2016 at 09:05:17PM +, Glen Barber wrote: > > > > > > > Author: gjb > > > > Date: Tue Jan 5 21:05:17 2016 > > > > New Revision: 293223 > > > > URL: https://svnweb.freebsd.org/changeset/base/293223 > > > > > > > > Log: > > > > Merge ^/projects/release-install-debug: > > > > > > > > - Rework MANIFEST generation and parsing via bsdinstall(8). > > > > - Allow selecting debugging distribution sets during install. > > > > - Rework bsdinstall(8) to fetch remote debug distribution sets > > > > when they are not available on the local install medium. > > > > - Allow selecting additional non-GENERIC kernels during install. > > > > At present, GENERIC is still required, and installed by default. > > > > > > > > Tested with: head@r293203 > > > > Sponsored by: The FreeBSD Foundation > > > > > > MFC planed? > > > > > > > Not before 10.3-RELEASE, no. Perhaps after that. > > Somehow not done? I'm sorry, I do not understand what you mean. > Can I use this as patch for custom intallation images? > It should mostly apply, yes. There are likely sharp edges, though, which is why I will not merge it before 10.3-RELEASE. Glen signature.asc Description: PGP signature
Re: svn commit: r293223 - in head: . release release/amd64 release/i386 release/pc98 release/powerpc release/scripts release/sparc64 usr.sbin/bsdinstall/scripts
On Wed, Jan 06, 2016 at 12:34:29PM +, Glen Barber wrote: > On Wed, Jan 06, 2016 at 02:52:30PM +0300, Slawa Olhovchenkov wrote: > > On Tue, Jan 05, 2016 at 09:05:17PM +, Glen Barber wrote: > > > > > Author: gjb > > > Date: Tue Jan 5 21:05:17 2016 > > > New Revision: 293223 > > > URL: https://svnweb.freebsd.org/changeset/base/293223 > > > > > > Log: > > > Merge ^/projects/release-install-debug: > > > > > > - Rework MANIFEST generation and parsing via bsdinstall(8). > > > - Allow selecting debugging distribution sets during install. > > > - Rework bsdinstall(8) to fetch remote debug distribution sets > > > when they are not available on the local install medium. > > > - Allow selecting additional non-GENERIC kernels during install. > > > At present, GENERIC is still required, and installed by default. > > > > > > Tested with:head@r293203 > > > Sponsored by: The FreeBSD Foundation > > > > MFC planed? > > > > Not before 10.3-RELEASE, no. Perhaps after that. Somehow not done? Can I use this as patch for custom intallation images? ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r293223 - in head: . release release/amd64 release/i386 release/pc98 release/powerpc release/scripts release/sparc64 usr.sbin/bsdinstall/scripts
On Wed, Jan 06, 2016 at 02:52:30PM +0300, Slawa Olhovchenkov wrote: > On Tue, Jan 05, 2016 at 09:05:17PM +, Glen Barber wrote: > > > Author: gjb > > Date: Tue Jan 5 21:05:17 2016 > > New Revision: 293223 > > URL: https://svnweb.freebsd.org/changeset/base/293223 > > > > Log: > > Merge ^/projects/release-install-debug: > > > > - Rework MANIFEST generation and parsing via bsdinstall(8). > > - Allow selecting debugging distribution sets during install. > > - Rework bsdinstall(8) to fetch remote debug distribution sets > > when they are not available on the local install medium. > > - Allow selecting additional non-GENERIC kernels during install. > > At present, GENERIC is still required, and installed by default. > > > > Tested with: head@r293203 > > Sponsored by: The FreeBSD Foundation > > MFC planed? > Not before 10.3-RELEASE, no. Perhaps after that. Glen signature.asc Description: PGP signature
Re: svn commit: r293223 - in head: . release release/amd64 release/i386 release/pc98 release/powerpc release/scripts release/sparc64 usr.sbin/bsdinstall/scripts
On Tue, Jan 05, 2016 at 09:05:17PM +, Glen Barber wrote: > Author: gjb > Date: Tue Jan 5 21:05:17 2016 > New Revision: 293223 > URL: https://svnweb.freebsd.org/changeset/base/293223 > > Log: > Merge ^/projects/release-install-debug: > > - Rework MANIFEST generation and parsing via bsdinstall(8). > - Allow selecting debugging distribution sets during install. > - Rework bsdinstall(8) to fetch remote debug distribution sets > when they are not available on the local install medium. > - Allow selecting additional non-GENERIC kernels during install. > At present, GENERIC is still required, and installed by default. > > Tested with:head@r293203 > Sponsored by: The FreeBSD Foundation MFC planed? > Modified: > head/Makefile.inc1 > head/release/Makefile > head/release/amd64/mkisoimages.sh > head/release/i386/mkisoimages.sh > head/release/pc98/mkisoimages.sh > head/release/powerpc/mkisoimages.sh > head/release/scripts/make-manifest.sh > head/release/sparc64/mkisoimages.sh > head/usr.sbin/bsdinstall/scripts/auto > ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
