Re: svn commit: r276747 - head/sys/netpfil/pf
On Thu, Jan 8, 2015 at 1:21 AM, Bjoern A. Zeeb < bzeeb-li...@lists.zabbadoz.net> wrote: > > > On 07 Jan 2015, at 20:46 , Gleb Smirnoff wrote: > > > > On Tue, Jan 06, 2015 at 09:03:04AM +, Craig Rodrigues wrote: > > C> Author: rodrigc > > C> Date: Tue Jan 6 09:03:03 2015 > > C> New Revision: 276747 > > C> URL: https://svnweb.freebsd.org/changeset/base/276747 > > C> > > C> Log: > > C> Instead of creating a purge thread for every vnet, create > > C> a single purge thread and clean up all vnets from this thread. > > C> > > C> PR: 194515 > > C> Differential Revision: D1315 > > C> Submitted by: Nikos Vassiliadis > > > > I am not sure that this is a good idea. The core idea of VNETs > > is that they are isolated from each other. If we serialize purging, > > then vnets are strongly affecting each other. > > > > AFAIU, from the PR there is some panic fixed. What is the actual bug > > and why couldn't it be fixed with having per-vnet thread? > > You don’t 3 whatever pf purging threads on a system all running, > possibly competing for some resources, e.g., locks? > You can tune your system to your load! I do not agree with this change as well but just saw it! I would have agreed with this if a thread per CPU is created and some improvements in the locking strategy is performed! This is a potential issue since on busy system this thread gets very resource consuming! > > — > Bjoern A. Zeeb Charles Haddon Spurgeon: > "Friendship is one of the sweetest joys of life. Many might have failed > beneath the bitterness of their trial had they not found a friend." > > > -- Ermal ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276815 - head/contrib/ofed/management/opensm/opensm
Author: hselasky
Date: Thu Jan 8 10:13:56 2015
New Revision: 276815
URL: https://svnweb.freebsd.org/changeset/base/276815
Log:
Fix for compilation issue. Don't use the "abs()" function for unsigned
computations.
MFC after:3 days
PR: 196597
Sponsored by: Mellanox Technologies
Modified:
head/contrib/ofed/management/opensm/opensm/osm_ucast_ftree.c
Modified: head/contrib/ofed/management/opensm/opensm/osm_ucast_ftree.c
==
--- head/contrib/ofed/management/opensm/opensm/osm_ucast_ftree.cThu Jan
8 07:47:39 2015(r276814)
+++ head/contrib/ofed/management/opensm/opensm/osm_ucast_ftree.cThu Jan
8 10:13:56 2015(r276815)
@@ -2917,6 +2917,10 @@ Exit:
/***
***/
+static boolean_t __osm_invalid_link_rank_diff(const uint32_t val)
+{
+ return (val != 1U && val != -1U);
+}
static int __osm_ftree_fabric_construct_sw_ports(IN ftree_fabric_t * p_ftree,
IN ftree_sw_t * p_sw)
@@ -2993,7 +2997,7 @@ static int __osm_ftree_fabric_construct_
p_remote_hca_or_sw = (void *)p_remote_sw;
- if (abs(p_sw->rank - p_remote_sw->rank) != 1) {
+ if (__osm_invalid_link_rank_diff(p_sw->rank -
p_remote_sw->rank)) {
OSM_LOG(&p_ftree->p_osm->log, OSM_LOG_ERROR,
"ERR AB16: "
"Illegal link between switches with
ranks %u and %u:\n"
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r276802 - head/lib/libc/gen
On Thu, Jan 08, 2015 at 01:27:44AM +, Craig Rodrigues wrote: > @@ -43,11 +43,11 @@ > .Sh DESCRIPTION > The > .Fn sleep > -function suspends execution of the calling process until either > +function suspends execution of the calling thread until either > .Fa seconds > -seconds have elapsed or a signal is delivered to the process and its > +seconds have elapsed or a signal is delivered to the thread and its > action is to invoke a signal-catching function or to terminate the > -process. > +thread or process. There is no signal action to terminate thread. > System activity may lengthen the sleep by an indeterminate amount. > .Pp > This function is implemented using ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276818 - head/sys/kern
Author: rwatson
Date: Thu Jan 8 11:16:21 2015
New Revision: 276818
URL: https://svnweb.freebsd.org/changeset/base/276818
Log:
Replace hand-crafted versions of M_SIZE() and M_START() in uipc_mbuf.c
with calls to the centralised macros, reducing direct use of MLEN and
MHLEN.
Differential Revision:https://reviews.freebsd.org/D1444
Reviewed by: bz
Sponsored by: EMC / Isilon Storage Division
Modified:
head/sys/kern/uipc_mbuf.c
Modified: head/sys/kern/uipc_mbuf.c
==
--- head/sys/kern/uipc_mbuf.c Thu Jan 8 10:53:20 2015(r276817)
+++ head/sys/kern/uipc_mbuf.c Thu Jan 8 11:16:21 2015(r276818)
@@ -196,8 +196,7 @@ m_getm2(struct mbuf *m, int len, int how
}
/* Book keeping. */
- len -= (mb->m_flags & M_EXT) ? mb->m_ext.ext_size :
- ((mb->m_flags & M_PKTHDR) ? MHLEN : MLEN);
+ len -= M_SIZE(mb);
if (mtail != NULL)
mtail->m_next = mb;
else
@@ -430,11 +429,8 @@ m_sanity(struct mbuf *m0, int sanitize)
* unrelated kernel memory before or after us is trashed.
* No way to recover from that.
*/
- a = ((m->m_flags & M_EXT) ? m->m_ext.ext_buf :
- ((m->m_flags & M_PKTHDR) ? (caddr_t)(&m->m_pktdat) :
-(caddr_t)(&m->m_dat)) );
- b = (caddr_t)(a + (m->m_flags & M_EXT ? m->m_ext.ext_size :
- ((m->m_flags & M_PKTHDR) ? MHLEN : MLEN)));
+ a = M_START(m);
+ b = a + M_SIZE(m);
if ((caddr_t)m->m_data < a)
M_SANITY_ACTION("m_data outside mbuf data range left");
if ((caddr_t)m->m_data > b)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r276802 - head/lib/libc/gen
On Thu, 8 Jan 2015, Konstantin Belousov wrote: On Thu, Jan 08, 2015 at 01:27:44AM +, Craig Rodrigues wrote: @@ -43,11 +43,11 @@ .Sh DESCRIPTION The .Fn sleep -function suspends execution of the calling process until either +function suspends execution of the calling thread until either .Fa seconds -seconds have elapsed or a signal is delivered to the process and its +seconds have elapsed or a signal is delivered to the thread and its action is to invoke a signal-catching function or to terminate the -process. +thread or process. There is no signal action to terminate thread. There is another bug: the process may be terminated by means other than a signal (usually just by exit() in another thread). This case is not mentioned. These bugs are missing in POSIX. It says: "or a signal is delivered to the calling thread and its action is to invoke a signal-catching function, or the process is terminated" The second clause (after the comma) seems hard to parse until you realise that it is intentionally separate from the signal case. When there was only 1 thread per process, the only way to terminate a process was via a signal. The FreeBSD description still covers only that case. Related bugs found by grepping for "process" and "thread" in sleep man pages (unless I missed other changes): - nanosleep(2) still says "process" in its NAME and ERRORS sections It has no other uses of "process" so no correct ones. - nanosleep(2) is missing the description of early returns for signals and terminations in the DESCRIPTION section. It has a little about this in the RETURN VALUES section. The latter has the only use of "thread". Many more are needed - usleep(3) is still almost identical to the old version of sleep(3) - clock_nanosleep(2) is broken (not supported). In POSIX, the above POSIX wording is used in these 3 functions and nowhere else. Both POSIX and FreeBSD are less verbose in describing when [p]select() and poll() return early due to a timeout. Bruce ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r276796 - in head: . share/mk tools/build/options
Thanks, Ed. That's really cool! Does anyone know what the status of replacing ld is? Erik > Den 07/01/2015 kl. 23.02 skrev Ed Maste : > > Author: emaste > Date: Wed Jan 7 22:02:37 2015 > New Revision: 276796 > URL: https://svnweb.freebsd.org/changeset/base/276796 > > Log: > Use a set of ELF Tool Chain tools by default > > These tools are now from the ELF Tool Chain project: > > * addr2line > * elfcopy (strip) > * nm > * size > * strings > > The binutils versions are available by setting in src.conf: > WITHOUT_ELFTOOLCHAIN_TOOLS=yes > > Thanks to antoine@ for multiple exp-runs and diagnosing many of the > failures. > > PR: 195561 (ports exp-run) > Sponsored by:The FreeBSD Foundation > > Added: > head/tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS > - copied, changed from r276793, > head/tools/build/options/WITH_ELFTOOLCHAIN_TOOLS > Deleted: > head/tools/build/options/WITH_ELFTOOLCHAIN_TOOLS > Modified: > head/UPDATING > head/share/mk/src.opts.mk > > Modified: head/UPDATING > == > --- head/UPDATING Wed Jan 7 21:44:57 2015(r276795) > +++ head/UPDATING Wed Jan 7 22:02:37 2015(r276796) > @@ -31,6 +31,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 > disable the most expensive debugging functionality run > "ln -s 'abort:false,junk:false' /etc/malloc.conf".) > > +20150107: > + ELF tools addr2line, elfcopy (strip), nm, size, and strings are now > + taken from the ELF Tool Chain project rather than GNU binutils. They > + should be drop-in replacements, with the addition of arm64 support. > + The WITHOUT_ELFTOOLCHAIN_TOOLS= knob may be used to obtain the > + binutils tools, if necessary. > + > 20150105: > The default Unbound configuration now enables remote control > using a local socket. Users who have already enabled the > > Modified: head/share/mk/src.opts.mk > == > --- head/share/mk/src.opts.mk Wed Jan 7 21:44:57 2015(r276795) > +++ head/share/mk/src.opts.mk Wed Jan 7 22:02:37 2015(r276796) > @@ -73,6 +73,7 @@ __DEFAULT_YES_OPTIONS = \ > DMAGENT \ > DYNAMICROOT \ > ED_CRYPTO \ > +ELFTOOLCHAIN_TOOLS \ > EXAMPLES \ > FDT \ > FLOPPY \ > @@ -159,7 +160,6 @@ __DEFAULT_NO_OPTIONS = \ > BSD_GREP \ > CLANG_EXTRAS \ > EISA \ > -ELFTOOLCHAIN_TOOLS \ > FMAKE \ > HESIOD \ > LLDB \ > > Copied and modified: head/tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS > (from r276793, head/tools/build/options/WITH_ELFTOOLCHAIN_TOOLS) > == > --- head/tools/build/options/WITH_ELFTOOLCHAIN_TOOLS Wed Jan 7 21:09:25 > 2015(r276793, copy source) > +++ head/tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS Wed Jan 7 > 22:02:37 2015(r276796) > @@ -6,4 +6,4 @@ Set to use > .Xr strings 1 , > and > .Xr strip 1 > -from the elftoolchain project instead of GNU binutils. > +from GNU binutils instead of the ELF Tool Chain project. > ___ > svn-src-head@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org" ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r276801 - head/sys/i386/i386
In article <201501080039.t080df3o011...@svn.freebsd.org> Warner Losh writes: > Author: imp > Date: Thu Jan 8 00:39:40 2015 > New Revision: 276801 > URL: https://svnweb.freebsd.org/changeset/base/276801 > > Log: > Don't call the SSE routines when they aren't enabled (or even compiled > into the kernel). > > +#if !defined(CPU_DISABLE_SSE) && defined(I686_CPU) > +#define CPU_ENABLE_SSE > +#endif % grep CPU_DISABLE_SSE options.* options.i386:CPU_DISABLE_SSEopt_cpu.h options.pc98:CPU_DISABLE_SSEopt_cpu.h So including opt_cpu.h is required. --- TAKAHASHI Yoshihiro ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276819 - head/lib/clang/libllvmaarch64disassembler
Author: emaste
Date: Thu Jan 8 14:26:49 2015
New Revision: 276819
URL: https://svnweb.freebsd.org/changeset/base/276819
Log:
Fix WITH_LLDB build
A build with WITH_LLDB and not WITH_CLANG_EXTRAS failed after r276783.
Reported by: rodrigc
Modified:
head/lib/clang/libllvmaarch64disassembler/Makefile
Modified: head/lib/clang/libllvmaarch64disassembler/Makefile
==
--- head/lib/clang/libllvmaarch64disassembler/Makefile Thu Jan 8 11:16:21
2015(r276818)
+++ head/lib/clang/libllvmaarch64disassembler/Makefile Thu Jan 8 14:26:49
2015(r276819)
@@ -8,7 +8,7 @@ SRCDIR= lib/Target/AArch64/Disassembler
INCDIR=lib/Target/AArch64
SRCS= AArch64Disassembler.cpp
-.if ${MK_CLANG_EXTRAS} != "no"
+.if ${MK_CLANG_EXTRAS} != "no" || .${MK_LLDB} != "no"
SRCS+= AArch64ExternalSymbolizer.cpp
.endif
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276820 - head/release/scripts
Author: gjb Date: Thu Jan 8 14:29:03 2015 New Revision: 276820 URL: https://svnweb.freebsd.org/changeset/base/276820 Log: Print informational output when NOPORTS is set, which would otherwise cause pkg-stage.sh to silently exit. MFC after:3 days Sponsored by: The FreeBSD Foundation Modified: head/release/scripts/pkg-stage.sh Modified: head/release/scripts/pkg-stage.sh == --- head/release/scripts/pkg-stage.sh Thu Jan 8 14:26:49 2015 (r276819) +++ head/release/scripts/pkg-stage.sh Thu Jan 8 14:29:03 2015 (r276820) @@ -33,6 +33,9 @@ x11/xorg" # If NOPORTS is set for the release, do not attempt to build pkg(8). if [ ! -f /usr/ports/Makefile ]; then + echo "*** /usr/ports is missing!***" + echo "*** Skipping pkg-stage.sh ***" + echo "*** Unset NOPORTS to fix this ***" exit 0 fi ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276821 - head/contrib/elftoolchain/nm
Author: emaste
Date: Thu Jan 8 14:35:16 2015
New Revision: 276821
URL: https://svnweb.freebsd.org/changeset/base/276821
Log:
nm: Accept long option --extern-only for -g
Submitted by: jkim
Modified:
head/contrib/elftoolchain/nm/nm.1
head/contrib/elftoolchain/nm/nm.c
Modified: head/contrib/elftoolchain/nm/nm.1
==
--- head/contrib/elftoolchain/nm/nm.1 Thu Jan 8 14:29:03 2015
(r276820)
+++ head/contrib/elftoolchain/nm/nm.1 Thu Jan 8 14:35:16 2015
(r276821)
@@ -24,7 +24,7 @@
.\"
.\" $Id: nm.1 2377 2012-01-03 07:10:59Z jkoshy $
.\"
-.Dd January 3, 2012
+.Dd January 8, 2015
.Os
.Dt NM 1
.Sh NAME
@@ -36,6 +36,7 @@
.Op Fl -defined-only
.Op Fl -demangle Ns Op = Ns style
.Op Fl -dynamic
+.Op Fl -extern-only
.Op Fl -help
.Op Fl -line-numbers
.Op Fl -no-demangle
@@ -107,6 +108,8 @@ is not specified, it is taken to be
.It Fl -dynamic
Only display dynamic symbols.
This option is only meaningful for shared libraries.
+.It Fl -extern-only
+Only display information about global (external) symbols.
.It Fl -help
Display a help message and exit.
.It Fl -format Ns = Ns Ar format
@@ -200,7 +203,8 @@ Only display information for global and
.It Fl f
Produce full output (default).
.It Fl g
-Only display information about global (external) symbols.
+Equivalent to specifying option
+.Fl -extern-only .
.It Fl h
Equivalent to specifying option
.Fl -help .
Modified: head/contrib/elftoolchain/nm/nm.c
==
--- head/contrib/elftoolchain/nm/nm.c Thu Jan 8 14:29:03 2015
(r276820)
+++ head/contrib/elftoolchain/nm/nm.c Thu Jan 8 14:35:16 2015
(r276821)
@@ -248,6 +248,7 @@ static const struct option nm_longopts[]
{ "defined-only", no_argument,&nm_opts.def_only, 1},
{ "demangle", optional_argument, NULL, 'C' },
{ "dynamic",no_argument,NULL, 'D' },
+ { "extern-only",no_argument,NULL, 'g' },
{ "format", required_argument, NULL, 'F' },
{ "help", no_argument,NULL, 'h' },
{ "line-numbers", no_argument,NULL, 'l' },
@@ -2042,7 +2043,7 @@ usage(int exitcode)
\n -fProduce full output (default).\
\n --format=format Display output in specific format. Allowed\
\nformats are: \"bsd\", \"posix\" and \"sysv\".\
-\n -gDisplay only global symbol information.\
+\n -g, --extern-only Display only global symbol information.\
\n -h, --helpShow this help message.\
\n -l, --line-numbersDisplay filename and linenumber using\
\ndebugging information.\
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276822 - head/release/scripts
Author: gjb Date: Thu Jan 8 14:39:53 2015 New Revision: 276822 URL: https://svnweb.freebsd.org/changeset/base/276822 Log: Ensure /var/run/ld-elf.so.hints exists before building pkg(8). MFC after:3 days X-MFC-With: r276820 Sponsored by: The FreeBSD Foundation Modified: head/release/scripts/pkg-stage.sh Modified: head/release/scripts/pkg-stage.sh == --- head/release/scripts/pkg-stage.sh Thu Jan 8 14:35:16 2015 (r276821) +++ head/release/scripts/pkg-stage.sh Thu Jan 8 14:39:53 2015 (r276822) @@ -40,6 +40,7 @@ if [ ! -f /usr/ports/Makefile ]; then fi if [ ! -x /usr/local/sbin/pkg ]; then + /etc/rc.d/ldconfig restart /usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean fi ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r276796 - in head: . share/mk tools/build/options
On 8 January 2015 at 07:54, Erik Cederstrand wrote: > Thanks, Ed. That's really cool! > > Does anyone know what the status of replacing ld is? The plan is to use lld from the LLVM linker. Good progress is being made upstream on lld; it can self-host on FreeBSD. We're currently blocked on linker script support -- lld actually has a linker script parser, but doesn't use it yet. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276823 - in head: contrib/ofed/management/opensm/osmtest contrib/ofed/usr.bin contrib/ofed/usr.bin/osmtest contrib/ofed/usr.lib etc/mtree
Author: hselasky
Date: Thu Jan 8 14:45:54 2015
New Revision: 276823
URL: https://svnweb.freebsd.org/changeset/base/276823
Log:
Add makefile for the "osmtest" utility. While at it:
- Fix depend target by removing a space after an "-I" inclusion option.
- Fix some minor compile issues in the "osmtest" utility.
MFC after:3 days
PR: 196580
Sponsored by: Mellanox Technologies
Added:
head/contrib/ofed/usr.bin/osmtest/
head/contrib/ofed/usr.bin/osmtest/Makefile (contents, props changed)
Modified:
head/contrib/ofed/management/opensm/osmtest/osmt_multicast.c
head/contrib/ofed/management/opensm/osmtest/osmtest.c
head/contrib/ofed/usr.bin/Makefile
head/contrib/ofed/usr.lib/Makefile
head/etc/mtree/BSD.tests.dist
Modified: head/contrib/ofed/management/opensm/osmtest/osmt_multicast.c
==
--- head/contrib/ofed/management/opensm/osmtest/osmt_multicast.cThu Jan
8 14:39:53 2015(r276822)
+++ head/contrib/ofed/management/opensm/osmtest/osmt_multicast.cThu Jan
8 14:45:54 2015(r276823)
@@ -42,6 +42,7 @@
#ifndef __WIN__
#include
#endif
+#include
#include
#include
#include
Modified: head/contrib/ofed/management/opensm/osmtest/osmtest.c
==
--- head/contrib/ofed/management/opensm/osmtest/osmtest.c Thu Jan 8
14:39:53 2015(r276822)
+++ head/contrib/ofed/management/opensm/osmtest/osmtest.c Thu Jan 8
14:45:54 2015(r276823)
@@ -3013,7 +3013,7 @@ Exit:
/**
**/
-inline uint32_t osmtest_path_rec_key_get(IN const ib_path_rec_t * const p_rec)
+static inline uint32_t osmtest_path_rec_key_get(IN const ib_path_rec_t * const
p_rec)
{
return (p_rec->dlid << 16 | p_rec->slid);
}
Modified: head/contrib/ofed/usr.bin/Makefile
==
--- head/contrib/ofed/usr.bin/Makefile Thu Jan 8 14:39:53 2015
(r276822)
+++ head/contrib/ofed/usr.bin/Makefile Thu Jan 8 14:45:54 2015
(r276823)
@@ -1,6 +1,12 @@
-SUBDIR = ibaddr ibnetdiscover ibping ibportstate ibroute ibsendtrap ibstat
-SUBDIR += ibsysstat ibtracert opensm perfquery saquery
-SUBDIR += sminfo smpdump smpquery vendstat
+.include
+
+SUBDIR= ibaddr ibnetdiscover ibping ibportstate ibroute ibsendtrap ibstat \
+ ibsysstat ibtracert opensm perfquery saquery \
+ sminfo smpdump smpquery vendstat
+
+.if ${MK_TESTS} != "no"
+SUBDIR+= osmtest
+.endif
SUBDIR_PARALLEL=
Added: head/contrib/ofed/usr.bin/osmtest/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/ofed/usr.bin/osmtest/Makefile Thu Jan 8 14:45:54 2015
(r276823)
@@ -0,0 +1,34 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
+
+OPENSM=${.CURDIR}/../../management/opensm
+.PATH: ${OPENSM}/osmtest ${OPENSM}/man
+
+BINDIR=${TESTSBASE}/usr.bin/opensm
+PROG= osmtest
+
+SRCS= main.c \
+ osmt_inform.c \
+ osmt_mtl_regular_qp.c \
+ osmt_multicast.c \
+ osmt_service.c \
+ osmt_slvl_vl_arb.c \
+ osmtest.c
+
+LDADD= -libcommon \
+ -libmad \
+ -libumad \
+ -losmvendor \
+ -losmcomp \
+ -lopensm \
+ -lpthread
+
+CFLAGS=-DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP \
+ -I${OPENSM}/osmtest/include
+
+MAN= osmtest.8
+
+WARNS?= 1
+
+.include
Modified: head/contrib/ofed/usr.lib/Makefile
==
--- head/contrib/ofed/usr.lib/Makefile Thu Jan 8 14:39:53 2015
(r276822)
+++ head/contrib/ofed/usr.lib/Makefile Thu Jan 8 14:45:54 2015
(r276823)
@@ -1,5 +1,5 @@
-SUBDIR = libibcommon libibmad libibumad libibverbs libmlx4 libmthca
-SUBDIR += libopensm libosmcomp libosmvendor libibcm librdmacm libsdp libcxgb4
+SUBDIR=libibcommon libibmad libibumad libibverbs libmlx4 libmthca \
+ libopensm libosmcomp libosmvendor libibcm librdmacm libsdp libcxgb4
SUBDIR_PARALLEL=
Modified: head/etc/mtree/BSD.tests.dist
==
--- head/etc/mtree/BSD.tests.dist Thu Jan 8 14:39:53 2015
(r276822)
+++ head/etc/mtree/BSD.tests.dist Thu Jan 8 14:45:54 2015
(r276823)
@@ -358,6 +358,8 @@
..
ncal
..
+opensm
+..
printf
..
sed
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276824 - in head/sys/ofed/drivers/infiniband/ulp: ipoib sdp
Author: hselasky
Date: Thu Jan 8 14:58:54 2015
New Revision: 276824
URL: https://svnweb.freebsd.org/changeset/base/276824
Log:
Use the M_SIZE() macro when possible.
MFC after:3 days
Suggested by: rwatson@
Modified:
head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c
head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c
Modified: head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c
==
--- head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c Thu Jan 8
14:45:54 2015(r276823)
+++ head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c Thu Jan 8
14:58:54 2015(r276824)
@@ -117,8 +117,7 @@ ipoib_alloc_map_mb(struct ipoib_dev_priv
if (mb == NULL)
return (NULL);
for (i = 0, m = mb; m != NULL; m = m->m_next, i++) {
- m->m_len = (m->m_flags & M_EXT) ? m->m_ext.ext_size :
- ((m->m_flags & M_PKTHDR) ? MHLEN : MLEN);
+ m->m_len = M_SIZE(m);
mb->m_pkthdr.len += m->m_len;
rx_req->mapping[i] = ib_dma_map_single(priv->ca,
mtod(m, void *), m->m_len, DMA_FROM_DEVICE);
Modified: head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c
==
--- head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c Thu Jan 8 14:45:54
2015(r276823)
+++ head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c Thu Jan 8 14:58:54
2015(r276824)
@@ -116,8 +116,7 @@ sdp_post_recv(struct sdp_sock *ssk)
return -1;
}
for (m = mb; m != NULL; m = m->m_next) {
- m->m_len = (m->m_flags & M_EXT) ? m->m_ext.ext_size :
-((m->m_flags & M_PKTHDR) ? MHLEN : MLEN);
+ m->m_len = M_SIZE(m);
mb->m_pkthdr.len += m->m_len;
}
h = mtod(mb, struct sdp_bsdh *);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276825 - head/sys/cam/scsi
Author: hselasky
Date: Thu Jan 8 15:10:25 2015
New Revision: 276825
URL: https://svnweb.freebsd.org/changeset/base/276825
Log:
Allow a block size of zero to mean 512 bytes, which is the most common
block size for USB disks. This fixes support for "Action Cam SJ4000".
Reviewed by: mav @
MFC after:1 week
Modified:
head/sys/cam/scsi/scsi_da.c
Modified: head/sys/cam/scsi/scsi_da.c
==
--- head/sys/cam/scsi/scsi_da.c Thu Jan 8 14:58:54 2015(r276824)
+++ head/sys/cam/scsi/scsi_da.c Thu Jan 8 15:10:25 2015(r276825)
@@ -3094,8 +3094,10 @@ dadone(struct cam_periph *periph, union
if (block_size == 0 && maxsector == 0) {
block_size = 512;
maxsector = -1;
+ } else if (block_size == 0) {
+ block_size = 512;
}
- if (block_size >= MAXPHYS || block_size == 0) {
+ if (block_size >= MAXPHYS) {
xpt_print(periph->path,
"unsupportable block size %ju\n",
(uintmax_t) block_size);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r276819 - head/lib/clang/libllvmaarch64disassembler
On 08 Jan 2015, at 15:26, Ed Maste wrote: > > Author: emaste > Date: Thu Jan 8 14:26:49 2015 > New Revision: 276819 > URL: https://svnweb.freebsd.org/changeset/base/276819 > > Log: > Fix WITH_LLDB build > > A build with WITH_LLDB and not WITH_CLANG_EXTRAS failed after r276783. > > Reported by: rodrigc Thanks! This was the one combination I forgot to test... :) -Dimitry signature.asc Description: Message signed with OpenPGP using GPGMail
svn commit: r276826 - in head/tools/tools/nanobsd: gateworks pcengines
Author: jhb Date: Thu Jan 8 15:20:42 2015 New Revision: 276826 URL: https://svnweb.freebsd.org/changeset/base/276826 Log: Drop 'new' from the description of NFSCL to match the recent change in HEAD kernel confs. Modified: head/tools/tools/nanobsd/gateworks/G2348 head/tools/tools/nanobsd/pcengines/ALIX_DSK head/tools/tools/nanobsd/pcengines/ALIX_NFS Modified: head/tools/tools/nanobsd/gateworks/G2348 == --- head/tools/tools/nanobsd/gateworks/G2348Thu Jan 8 15:10:25 2015 (r276825) +++ head/tools/tools/nanobsd/gateworks/G2348Thu Jan 8 15:20:42 2015 (r276826) @@ -41,7 +41,7 @@ options FFS #Berkeley Fast Filesystem #options SOFTUPDATES #Enable FFS soft updates support #options UFS_ACL #Support for access control lists #options UFS_DIRHASH #Improve performance on big directories -optionsNFSCL #New Network Filesystem Client +optionsNFSCL #Network Filesystem Client optionsNFSLOCKD#Network Lock Manager optionsKTRACE #ktrace(1) support #options SYSVSHM #SYSV-style shared memory Modified: head/tools/tools/nanobsd/pcengines/ALIX_DSK == --- head/tools/tools/nanobsd/pcengines/ALIX_DSK Thu Jan 8 15:10:25 2015 (r276825) +++ head/tools/tools/nanobsd/pcengines/ALIX_DSK Thu Jan 8 15:20:42 2015 (r276826) @@ -14,7 +14,7 @@ options FFS optionsSOFTUPDATES optionsUFS_ACL optionsUFS_DIRHASH -optionsNFSCL # New Network Filesystem Client +optionsNFSCL # Network Filesystem Client optionsNFSLOCKD optionsMSDOSFS optionsCD9660 Modified: head/tools/tools/nanobsd/pcengines/ALIX_NFS == --- head/tools/tools/nanobsd/pcengines/ALIX_NFS Thu Jan 8 15:10:25 2015 (r276825) +++ head/tools/tools/nanobsd/pcengines/ALIX_NFS Thu Jan 8 15:20:42 2015 (r276826) @@ -14,7 +14,7 @@ options FFS optionsSOFTUPDATES optionsUFS_ACL optionsUFS_DIRHASH -optionsNFSCL # New Network Filesystem Client +optionsNFSCL # Network Filesystem Client optionsNFSLOCKD optionsMSDOSFS optionsCD9660 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276827 - head/release/scripts
Author: gjb
Date: Thu Jan 8 15:42:10 2015
New Revision: 276827
URL: https://svnweb.freebsd.org/changeset/base/276827
Log:
Ensure the ports directories exist for the list of
packages intended to be included on the DVD, and
remove any nonexistent ports from the final list.
Print the list of missing paths, and ensure that
DVD_PACKAGES is non-zero length (which should never
happen).
MFC after:3 days
X-MFC-With: r276820, r276822
Sponsored by: The FreeBSD Foundation
Modified:
head/release/scripts/pkg-stage.sh
Modified: head/release/scripts/pkg-stage.sh
==
--- head/release/scripts/pkg-stage.sh Thu Jan 8 15:20:42 2015
(r276826)
+++ head/release/scripts/pkg-stage.sh Thu Jan 8 15:42:10 2015
(r276827)
@@ -11,7 +11,7 @@ export PERMISSIVE="YES"
export REPO_AUTOUPDATE="NO"
export PKGCMD="/usr/sbin/pkg -d"
-DVD_PACKAGES="archivers/unzip
+_DVD_PACKAGES="archivers/unzip
devel/subversion
devel/subversion-static
emulators/linux_base-f10
@@ -54,6 +54,25 @@ if [ ! -z "${PKG_ALTABI}" ]; then
(cd ${DVD_DIR} && ln -s ${PKG_ABI} ${PKG_ALTABI})
fi
+# Ensure the ports listed in _DVD_PACKAGES exist to sanitize the
+# final list.
+for _P in ${_DVD_PACKAGES}; do
+ if [ -d "/usr/ports/${_P}" ]; then
+ DVD_PACKAGES="${DVD_PACKAGES} ${_P}"
+ else
+ echo "*** Skipping nonexistent port: ${_P}"
+ fi
+done
+
+# Make sure the package list is not empty.
+if [ -z "${DVD_PACKAGES}" ]; then
+ echo "*** The package list is empty."
+ echo "*** Something is very wrong."
+ # Exit '0' so the rest of the build process continues
+ # so other issues (if any) can be addressed as well.
+ exit 0
+fi
+
# Print pkg(8) information to make debugging easier.
${PKGCMD} -vv
${PKGCMD} update -f
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276828 - head/release/scripts
Author: gjb Date: Thu Jan 8 15:50:10 2015 New Revision: 276828 URL: https://svnweb.freebsd.org/changeset/base/276828 Log: Switch to x11/gnome3 now that x11/gnome2 no longer exists in the ports tree. MFC after:3 days X-MFC-With: r276820, r276822, r276827 Sponsored by: The FreeBSD Foundation Modified: head/release/scripts/pkg-stage.sh Modified: head/release/scripts/pkg-stage.sh == --- head/release/scripts/pkg-stage.sh Thu Jan 8 15:42:10 2015 (r276827) +++ head/release/scripts/pkg-stage.sh Thu Jan 8 15:50:10 2015 (r276828) @@ -27,7 +27,7 @@ sysutils/screen www/firefox www/links x11-drivers/xf86-video-vmware -x11/gnome2 +x11/gnome3 x11/kde4 x11/xorg" ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276829 - in head: sys/kern sys/sys sys/x86/acpica usr.bin/cpuset
Author: jhb
Date: Thu Jan 8 15:53:13 2015
New Revision: 276829
URL: https://svnweb.freebsd.org/changeset/base/276829
Log:
Create a cpuset mask for each NUMA domain that is available in the
kernel via the global cpuset_domain[] array. To export these to userland,
add a CPU_WHICH_DOMAIN level that can be used to fetch the mask for a
specific domain. Add a -d flag to cpuset(1) that can be used to fetch
the mask for a given domain.
Differential Revision:https://reviews.freebsd.org/D1232
Submitted by: jeff (kernel bits)
Reviewed by: adrian, jeff
Modified:
head/sys/kern/kern_cpuset.c
head/sys/sys/cpuset.h
head/sys/sys/smp.h
head/sys/x86/acpica/srat.c
head/usr.bin/cpuset/cpuset.1
head/usr.bin/cpuset/cpuset.c
Modified: head/sys/kern/kern_cpuset.c
==
--- head/sys/kern/kern_cpuset.c Thu Jan 8 15:50:10 2015(r276828)
+++ head/sys/kern/kern_cpuset.c Thu Jan 8 15:53:13 2015(r276829)
@@ -56,6 +56,10 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
+#include
+#include
+#include
#ifdef DDB
#include
@@ -113,6 +117,7 @@ SYSCTL_INT(_kern_sched, OID_AUTO, cpuset
SYSCTL_NULL_INT_PTR, sizeof(cpuset_t), "sizeof(cpuset_t)");
cpuset_t *cpuset_root;
+cpuset_t cpuset_domain[MAXMEMDOM];
/*
* Acquire a reference to a cpuset, all pointers must be tracked with refs.
@@ -457,6 +462,7 @@ cpuset_which(cpuwhich_t which, id_t id,
return (0);
}
case CPU_WHICH_IRQ:
+ case CPU_WHICH_DOMAIN:
return (0);
default:
return (EINVAL);
@@ -810,7 +816,8 @@ out:
/*
- * Creates the cpuset for thread0. We make two sets:
+ * Creates system-wide cpusets and the cpuset for thread0 including two
+ * sets:
*
* 0 - The root set which should represent all valid processors in the
* system. It is initially created with a mask of all processors
@@ -856,6 +863,10 @@ cpuset_thread0(void)
*/
cpuset_unr = new_unrhdr(2, INT_MAX, NULL);
+ /* MD Code is responsible for initializing sets if vm_ndomains > 1. */
+ if (vm_ndomains == 1)
+ CPU_COPY(&all_cpus, &cpuset_domain[0]);
+
return (set);
}
@@ -1010,6 +1021,7 @@ sys_cpuset_getid(struct thread *td, stru
case CPU_WHICH_JAIL:
break;
case CPU_WHICH_IRQ:
+ case CPU_WHICH_DOMAIN:
return (EINVAL);
}
switch (uap->level) {
@@ -1073,6 +1085,7 @@ sys_cpuset_getaffinity(struct thread *td
case CPU_WHICH_JAIL:
break;
case CPU_WHICH_IRQ:
+ case CPU_WHICH_DOMAIN:
error = EINVAL;
goto out;
}
@@ -1104,6 +1117,12 @@ sys_cpuset_getaffinity(struct thread *td
case CPU_WHICH_IRQ:
error = intr_getaffinity(uap->id, mask);
break;
+ case CPU_WHICH_DOMAIN:
+ if (uap->id >= vm_ndomains)
+ error = ESRCH;
+ else
+ CPU_COPY(&cpuset_domain[uap->id], mask);
+ break;
}
break;
default:
@@ -1182,6 +1201,7 @@ sys_cpuset_setaffinity(struct thread *td
case CPU_WHICH_JAIL:
break;
case CPU_WHICH_IRQ:
+ case CPU_WHICH_DOMAIN:
error = EINVAL;
goto out;
}
Modified: head/sys/sys/cpuset.h
==
--- head/sys/sys/cpuset.h Thu Jan 8 15:50:10 2015(r276828)
+++ head/sys/sys/cpuset.h Thu Jan 8 15:53:13 2015(r276829)
@@ -76,6 +76,7 @@
#defineCPU_WHICH_CPUSET3 /* Specifies a set id. */
#defineCPU_WHICH_IRQ 4 /* Specifies an irq #. */
#defineCPU_WHICH_JAIL 5 /* Specifies a jail id. */
+#defineCPU_WHICH_DOMAIN6 /* Specifies a NUMA domain id.
*/
/*
* Reserved cpuset identifiers.
Modified: head/sys/sys/smp.h
==
--- head/sys/sys/smp.h Thu Jan 8 15:50:10 2015(r276828)
+++ head/sys/sys/smp.h Thu Jan 8 15:53:13 2015(r276829)
@@ -85,6 +85,7 @@ extern int mp_ncpus;
extern volatile int smp_started;
extern cpuset_t all_cpus;
+extern cpuset_t cpuset_domain[MAXMEMDOM]; /* CPUs in each NUMA domain. */
/*
* Macro allowing us to determine whether a CPU is absent at any given
Modified: head/sys/x86/acpica/srat.c
==
--- head/sys/x86/acpica/srat.c Thu Jan 8 15:50:10 2015(r276828)
+++ head/sys/x86/acpica/srat.c Th
svn commit: r276831 - head/sys/cam/scsi
Author: ken
Date: Thu Jan 8 16:27:56 2015
New Revision: 276831
URL: https://svnweb.freebsd.org/changeset/base/276831
Log:
Fix a bug in the CAM SCSI probe code that caused changes in inquiry
data to go undetected.
The probe code does an MD5 checksum of the inquiry data (and page
0x80 serial number if available) before doing a reprobe of an
existing device, and then compares a checksum after the probe to
see whether the device has changed.
This check was broken in January, 2000 by change 56146 when the extended
inquiry probe code was added.
In the extended inquiry probe case, it was calculating the checksum
a second time. The second time it included the updated inquiry
data from the short inquiry probe (first 36 bytes). So it wouldn't
catch cases where the vendor, product, revision, etc. changed.
This change will have the effect that when a device's inquiry data is
updated and a rescan is issued, it will disappear and then reappear.
This is the appropriate action, because if the inquiry data or serial
number changes, it is either a different device or the device
configuration may have changed significantly. (e.g. with updated
firmware.)
scsi_xpt.c: Don't calculate the initial MD5 checksum on
standard inquiry data and the page 0x80 serial
number if we have already calculated it.
MFC after:1 week
Sponsored by: Spectra Logic
Modified:
head/sys/cam/scsi/scsi_xpt.c
Modified: head/sys/cam/scsi/scsi_xpt.c
==
--- head/sys/cam/scsi/scsi_xpt.cThu Jan 8 16:13:21 2015
(r276830)
+++ head/sys/cam/scsi/scsi_xpt.cThu Jan 8 16:27:56 2015
(r276831)
@@ -755,7 +755,8 @@ again:
* serial number check finish, we attempt to figure out
* whether we still have the same device.
*/
- if ((periph->path->device->flags & CAM_DEV_UNCONFIGURED) == 0) {
+ if (((periph->path->device->flags & CAM_DEV_UNCONFIGURED) == 0)
+&& ((softc->flags & PROBE_INQUIRY_CKSUM) == 0)) {
MD5Init(&softc->context);
MD5Update(&softc->context, (unsigned char *)inq_buf,
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276832 - head/usr.bin/sed
Author: pfg
Date: Thu Jan 8 16:33:15 2015
New Revision: 276832
URL: https://svnweb.freebsd.org/changeset/base/276832
Log:
sed: Address warnings with clang and gcc48.
MFC after:2 weeks
Modified:
head/usr.bin/sed/Makefile
head/usr.bin/sed/main.c
head/usr.bin/sed/process.c
Modified: head/usr.bin/sed/Makefile
==
--- head/usr.bin/sed/Makefile Thu Jan 8 16:27:56 2015(r276831)
+++ head/usr.bin/sed/Makefile Thu Jan 8 16:33:15 2015(r276832)
@@ -6,8 +6,6 @@
PROG= sed
SRCS= compile.c main.c misc.c process.c
-WARNS?=2
-
.if ${MK_TESTS} != "no"
SUBDIR+= tests
.endif
Modified: head/usr.bin/sed/main.c
==
--- head/usr.bin/sed/main.c Thu Jan 8 16:27:56 2015(r276831)
+++ head/usr.bin/sed/main.c Thu Jan 8 16:33:15 2015(r276832)
@@ -400,13 +400,13 @@ mf_fgets(SPACE *sp, enum e_spflag spflag
sizeof(oldfname));
len = strlcat(oldfname, inplace,
sizeof(oldfname));
- if (len > sizeof(oldfname))
+ if (len > (ssize_t)sizeof(oldfname))
errx(1, "%s: name too long", fname);
}
len = snprintf(tmpfname, sizeof(tmpfname),
"%s/.!%ld!%s", dirname(fname), (long)getpid(),
basename(fname));
- if (len >= sizeof(tmpfname))
+ if (len >= (ssize_t)sizeof(tmpfname))
errx(1, "%s: name too long", fname);
unlink(tmpfname);
if ((outfile = fopen(tmpfname, "w")) == NULL)
@@ -488,7 +488,7 @@ add_file(char *s)
}
static int
-next_files_have_lines()
+next_files_have_lines(void)
{
struct s_flist *file;
FILE *file_fd;
Modified: head/usr.bin/sed/process.c
==
--- head/usr.bin/sed/process.c Thu Jan 8 16:27:56 2015(r276831)
+++ head/usr.bin/sed/process.c Thu Jan 8 16:33:15 2015(r276832)
@@ -71,7 +71,7 @@ static __inline intapplies(struct s_co
static void do_tr(struct s_tr *);
static void flush_appends(void);
static void lputs(char *, size_t);
-static __inline int regexec_e(regex_t *, const char *, int, int, size_t);
+static int regexec_e(regex_t *, const char *, int, int, size_t);
static void regsub(SPACE *, char *, char *);
static int substitute(struct s_command *);
@@ -656,7 +656,7 @@ lputs(char *s, size_t len)
errx(1, "%s: %s", outfname, strerror(errno ? errno : EIO));
}
-static __inline int
+static int
regexec_e(regex_t *preg, const char *string, int eflags, int nomatch,
size_t slen)
{
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276833 - head/etc
Author: trasz Date: Thu Jan 8 16:35:09 2015 New Revision: 276833 URL: https://svnweb.freebsd.org/changeset/base/276833 Log: Make /net use -intr by default. Linux does that, and it seems a good idea. MFC after:1 month Sponsored by: The FreeBSD Foundation Modified: head/etc/auto_master Modified: head/etc/auto_master == --- head/etc/auto_masterThu Jan 8 16:33:15 2015(r276832) +++ head/etc/auto_masterThu Jan 8 16:35:09 2015(r276833) @@ -2,7 +2,7 @@ # # Automounter master map, see auto_master(5) for details. # -/net -hosts -nobrowse,nosuid +/net -hosts -nobrowse,nosuid,intr # When using the -media special map, make sure to edit devd.conf(5) # to move the call to "automount -c" out of the comments section. #/media-media -nosuid ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276834 - in head/sys/x86: include x86
Author: sbruno Date: Thu Jan 8 16:50:35 2015 New Revision: 276834 URL: https://svnweb.freebsd.org/changeset/base/276834 Log: Update Features2 to display SDBG capability of processor. This is showing up on Haswell-class CPUs From the Intel SDM, "Table 3-20. Feature Information Returned in the ECX Register" 11 | SDBG | A value of 1 indicates the processor supports IA32_DEBUG_INTERFACE MSR for silicon debug. Submitted by: jiash...@gmail.com Reviewed by: jhb neel MFC after:2 weeks Modified: head/sys/x86/include/specialreg.h head/sys/x86/x86/identcpu.c Modified: head/sys/x86/include/specialreg.h == --- head/sys/x86/include/specialreg.h Thu Jan 8 16:35:09 2015 (r276833) +++ head/sys/x86/include/specialreg.h Thu Jan 8 16:50:35 2015 (r276834) @@ -154,6 +154,7 @@ #defineCPUID2_TM2 0x0100 #defineCPUID2_SSSE30x0200 #defineCPUID2_CNXTID 0x0400 +#defineCPUID2_SDBG 0x0800 #defineCPUID2_FMA 0x1000 #defineCPUID2_CX16 0x2000 #defineCPUID2_XTPR 0x4000 Modified: head/sys/x86/x86/identcpu.c == --- head/sys/x86/x86/identcpu.c Thu Jan 8 16:35:09 2015(r276833) +++ head/sys/x86/x86/identcpu.c Thu Jan 8 16:50:35 2015(r276834) @@ -781,7 +781,7 @@ printcpuinfo(void) "\011TM2" /* Thermal Monitor 2 */ "\012SSSE3" /* SSSE3 */ "\013CNXT-ID" /* L1 context ID available */ - "\014" + "\014SDBG" /* IA32 silicon debug */ "\015FMA" /* Fused Multiply Add */ "\016CX16" /* CMPXCHG16B Instruction */ "\017xTPR" /* Send Task Priority Messages*/ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276835 - in head: sbin/camcontrol sys/cam/scsi
Author: ken Date: Thu Jan 8 16:58:40 2015 New Revision: 276835 URL: https://svnweb.freebsd.org/changeset/base/276835 Log: Improve camcontrol(8) handling of drive defect data. This includes a new summary mode (-s) for camcontrol defects that quickly tells the user the most important thing: how many defects are in the requested list. The actual location of the defects is less important. Modern drives frequently have more than the 8191 defects that can be reported by the READ DEFECT DATA (10) command. If they don't have that many grown defects, they certainly have more than 8191 defects in the primary (i.e. factory) defect list. The READ DEFECT DATA (12) command allows for longer parameter lists, as well as indexing into the list of defects, and so allows reporting many more defects. This has been tested with HGST drives and Seagate drives, but does not fully work with Seagate drives. Once I have a Seagate spec I may be able to determine whether it is possible to make it work with Seagate drives. scsi_da.h:Add a definition for the new long block defect format. Add bit and mask definitions for the new extended physical sector and bytes from index defect formats. Add a prototype for the new scsi_read_defects() CDB building function. scsi_da.c:Add a new scsi_read_defects() CDB building function. camcontrol(8) was previously composing CDBs manually. This is long overdue. camcontrol.c: Revamp the camcontrol defects subcommand. We now go through multiple stages in trying to get defect data off the drive while avoiding various drive firmware quirks. We start off by requesting the defect header with the 10 byte command. If we're in summary mode (-s) and the drive reports fewer defects than can be represented in the 10 byte header, we're done. Otherwise, we know that we need to issue the 12 byte command if the drive reports the maximum number of defects. If we're in summary mode, we're done if we get a good response back when asking for the 12 byte header. If the user has asked for the full list, then we use the address descriptor index field in the 12 byte CDB to step through the list in 64K chunks. 64K is small enough to work with most any ancient or modern SCSI controller. Add support for printing the new long block defect format, as well as the extended physical sector and bytes from index formats. I don't have any drives that support the new formats. Add a hexadecimal output format that can be turned on with -X. Add a quiet mode (-q) that can be turned on with the summary mode (-s) to just print out a number. Revamp the error detection and recovery code for the defects command to work with HGST drives. Call the new scsi_read_defects() CDB building function instead of rolling the CDB ourselves. Pay attention to the residual from the defect list request when printing it out, so we don't run off the end of the list. Use the new scsi_nv library routines to convert from strings to numbers and back. camcontrol.8: Document the new defect formats (longblock, extbfi, extphys) and command line options (-q, -s, -S and -X) for the defects subcommand. Explain a little more about what drives generally do and don't support. Sponsored by: Spectra Logic MFC after:1 week Modified: head/sbin/camcontrol/camcontrol.8 head/sbin/camcontrol/camcontrol.c head/sys/cam/scsi/scsi_da.c head/sys/cam/scsi/scsi_da.h Modified: head/sbin/camcontrol/camcontrol.8 == --- head/sbin/camcontrol/camcontrol.8 Thu Jan 8 16:50:35 2015 (r276834) +++ head/sbin/camcontrol/camcontrol.8 Thu Jan 8 16:58:40 2015 (r276835) @@ -110,6 +110,10 @@ .Aq Fl f Ar format .Op Fl P .Op Fl G +.Op Fl q +.Op Fl s +.Op Fl S Ar offset +.Op Fl X .Nm .Ic modepage .Op device id @@ -513,18 +517,16 @@ connecting to that device. Note that this can have a destructive impact on the system. .It Ic defects -Send the SCSI READ DEFECT DATA (10) command (0x37) to the given device, and +Send the +.Tn SCSI +READ DEFECT DATA (10) command (0x37) or the +.Tn SCSI +READ DEFECT DATA (12) command (0xB7) to the given device, and print
svn commit: r276837 - head/usr.bin/sed
Author: pfg
Date: Thu Jan 8 17:23:59 2015
New Revision: 276837
URL: https://svnweb.freebsd.org/changeset/base/276837
Log:
Partial revert of r276832:
Do not bump the warns level as it still breaks the gcc build on sparc64
Reported by: jenkins
Modified:
head/usr.bin/sed/Makefile
Modified: head/usr.bin/sed/Makefile
==
--- head/usr.bin/sed/Makefile Thu Jan 8 17:23:05 2015(r276836)
+++ head/usr.bin/sed/Makefile Thu Jan 8 17:23:59 2015(r276837)
@@ -6,6 +6,8 @@
PROG= sed
SRCS= compile.c main.c misc.c process.c
+WARNS?=2
+
.if ${MK_TESTS} != "no"
SUBDIR+= tests
.endif
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276839 - head/sys/dev/isp
Author: ken
Date: Thu Jan 8 17:41:28 2015
New Revision: 276839
URL: https://svnweb.freebsd.org/changeset/base/276839
Log:
Fix Fibre Channel Command Reference Number handling in the isp(4) driver.
The Command Reference Number is used for precise delivery of
commands, and is part of the FC-Tape functionality set. (This is
only enabled for devices that support precise delivery of commands.)
It is an 8-bit unsigned number that increments from 1 to 255. The
commands sent by the initiator must be processed by the target in
CRN order if the CRN is non-zero.
There are certain scenarios where the Command Reference Number
sequence needs to be reset. When the target is power cycled, for
instance, the initiator needs to reset the CRN to 1. The initiator
will know this because it will see a LIP (when directly connected)
or get a logout/login event (when connected to a switch).
The isp(4) driver was not resetting the CRN when a target
went away and came back. When it saw the target again after a
power cycle, it would continue the CRN sequence where it left off.
The target would ignore the command because the CRN sequence is
supposed to be reset to 1 after a power cycle or other similar
event.
The symptom that the user would see is that there would be lots of
aborted INQUIRY commands after a tape library was power cycled, and
the library would fail to probe. The INQUIRY commands were being
ignored by the tape drive due to the CRN issue mentioned above.
isp_freebsd.c:
Add a new function, isp_fcp_reset_crn(). This will reset
all of the CRNs for a given port, or the CRNs for all LUNs
on a target.
Reset the CRNs for all targets on a port when we get a LIP,
loop reset, or loop down event.
Reset the CRN for a particular target when it arrives, is changed
or departs. This is less precise behavior than the
clearing behavior specified in the FCP-4 spec (which says
that it should be reset for PRLI, PRLO, PLOGI and LOGO),
but this is the level of information we have here. If this
is insufficient, then we will need to add more precise
notification from the lower level isp(4) code.
isp_freebsd.h:
Add a prototype for isp_fcp_reset_crn().
Sponsored by: Spectra Logic
MFC after:1 week
Modified:
head/sys/dev/isp/isp_freebsd.c
head/sys/dev/isp/isp_freebsd.h
Modified: head/sys/dev/isp/isp_freebsd.c
==
--- head/sys/dev/isp/isp_freebsd.c Thu Jan 8 17:38:03 2015
(r276838)
+++ head/sys/dev/isp/isp_freebsd.c Thu Jan 8 17:41:28 2015
(r276839)
@@ -5696,6 +5696,8 @@ isp_async(ispsoftc_t *isp, ispasync_t cm
}
}
}
+ isp_fcp_reset_crn(fc, /*tgt*/0, /*tgt_set*/ 0);
+
isp_prt(isp, ISP_LOGINFO, "Chan %d: %s", bus, msg);
break;
}
@@ -5747,6 +5749,7 @@ isp_async(ispsoftc_t *isp, ispasync_t cm
if (lp->dev_map_idx) {
tgt = lp->dev_map_idx - 1;
isp_prt(isp, ISP_LOGCONFIG, prom2, bus, lp->portid,
lp->handle, buf, "arrived at", tgt, (uint32_t) (lp->port_wwn >> 32), (uint32_t)
lp->port_wwn);
+ isp_fcp_reset_crn(fc, tgt, /*tgt_set*/ 1);
isp_make_here(isp, bus, tgt);
} else {
isp_prt(isp, ISP_LOGCONFIG, prom0, bus, lp->portid,
lp->handle, buf, "arrived", (uint32_t) (lp->port_wwn >> 32), (uint32_t)
lp->port_wwn);
@@ -5783,6 +5786,7 @@ isp_async(ispsoftc_t *isp, ispasync_t cm
tgt = lp->dev_map_idx - 1;
isp_prt(isp, ISP_LOGCONFIG, prom2, bus,
lp->portid, lp->handle, buf, "changed at", tgt,
(uint32_t) (lp->port_wwn >> 32), (uint32_t)
lp->port_wwn);
+ isp_fcp_reset_crn(fc, tgt, /*tgt_set*/ 1);
} else {
isp_prt(isp, ISP_LOGCONFIG, prom0, bus,
lp->portid, lp->handle, buf, "changed", (uint32_t) (lp->port_wwn >> 32),
(uint32_t) lp->port_wwn);
}
@@ -5795,6 +5799,7 @@ isp_async(ispsoftc_t *isp, ispasync_t cm
va_end(ap);
isp_gen_role_str(buf, sizeof (buf), lp->prli_word3);
if (lp->dev_map_idx) {
+ fc = ISP_FC_PC(isp, bus);
tgt = lp->dev_map_idx - 1;
isp_prt(isp, ISP_LOGCONFIG, prom2, bus, lp->portid,
lp->handle, buf, "stayed at", tgt,
(uint32_t) (lp->port_wwn >> 32), (uint32_t)
lp->port_wwn);
@@ -5829,6 +5834,7 @@ isp_async(ispsoftc_t *isp, ispasync_t cm
}
tgt = lp->dev_map_idx - 1;
svn commit: r276840 - head/sys/i386/i386
Author: imp
Date: Thu Jan 8 17:46:42 2015
New Revision: 276840
URL: https://svnweb.freebsd.org/changeset/base/276840
Log:
Need to include opt_cpu.h to access CPU_DISABLE_SSE option. Thankfully, this
only broke i686 configs that disabled SSE.
Submitted by: nyan@
Modified:
head/sys/i386/i386/elf_machdep.c
Modified: head/sys/i386/i386/elf_machdep.c
==
--- head/sys/i386/i386/elf_machdep.cThu Jan 8 17:41:28 2015
(r276839)
+++ head/sys/i386/i386/elf_machdep.cThu Jan 8 17:46:42 2015
(r276840)
@@ -26,6 +26,8 @@
#include
__FBSDID("$FreeBSD$");
+#include "opt_cpu.h"
+
#include
#include
#include
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276841 - head/sys/netpfil/pf
Author: rodrigc Date: Thu Jan 8 17:49:07 2015 New Revision: 276841 URL: https://svnweb.freebsd.org/changeset/base/276841 Log: Do not initialize pfi_unlnkdkifs_mtx and pf_frag_mtx. They are already initialized by MTX_SYSINIT. Submitted by: Nikos Vassiliadis Modified: head/sys/netpfil/pf/pf_if.c head/sys/netpfil/pf/pf_norm.c Modified: head/sys/netpfil/pf/pf_if.c == --- head/sys/netpfil/pf/pf_if.c Thu Jan 8 17:46:42 2015(r276840) +++ head/sys/netpfil/pf/pf_if.c Thu Jan 8 17:49:07 2015(r276841) @@ -117,10 +117,6 @@ pfi_vnet_initialize(void) V_pfi_buffer_max = 64; V_pfi_buffer = malloc(V_pfi_buffer_max * sizeof(*V_pfi_buffer), PFI_MTYPE, M_WAITOK); - - if (IS_DEFAULT_VNET(curvnet)) - mtx_init(&pfi_unlnkdkifs_mtx, "pf unlinked interfaces", NULL, MTX_DEF); - kif = malloc(sizeof(*kif), PFI_MTYPE, M_WAITOK); PF_RULES_WLOCK(); V_pfi_all = pfi_kif_attach(kif, IFG_ALL); Modified: head/sys/netpfil/pf/pf_norm.c == --- head/sys/netpfil/pf/pf_norm.c Thu Jan 8 17:46:42 2015 (r276840) +++ head/sys/netpfil/pf/pf_norm.c Thu Jan 8 17:49:07 2015 (r276841) @@ -163,10 +163,6 @@ pf_vnet_normalize_init(void) V_pf_limits[PF_LIMIT_FRAGS].limit = PFFRAG_FRENT_HIWAT; uma_zone_set_max(V_pf_frent_z, PFFRAG_FRENT_HIWAT); uma_zone_set_warning(V_pf_frent_z, "PF frag entries limit reached"); - - if (IS_DEFAULT_VNET(curvnet)) - mtx_init(&pf_frag_mtx, "pf fragments", NULL, MTX_DEF); - TAILQ_INIT(&V_pf_fragqueue); TAILQ_INIT(&V_pf_cachequeue); } ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276842 - head/sys/dev/isp
Author: ken
Date: Thu Jan 8 17:51:12 2015
New Revision: 276842
URL: https://svnweb.freebsd.org/changeset/base/276842
Log:
Close a race in the isp(4) driver that caused devices to disappear
and not automatically come back if they were gone for a short
period of time.
The isp(4) driver has a 30 second gone device timer that gets
activated whenever a device goes away. If the device comes back
before the timer expires, we don't send a notification to CAM that
it has gone away. If, however, there is a command sent to the
device while it is gone and before it comes back, the isp(4) driver
sends the command back with CAM_SEL_TIMEOUT status.
CAM responds to the CAM_SEL_TIMEOUT status by removing the device.
In the case where a device comes back within the 30 second gone
device timer window, though, we weren't telling CAM the device
came back.
So, fix this by tracking whether we have told CAM the device is
gone, and if we have, send a rescan if it comes back within the 30
second window.
ispvar.h:
In the fcportdb_t structure, add a new bitfield,
reported_gone. This gets set whenever we return a command
with CAM_SEL_TIMEOUT status on a Fibre Channel device.
isp_freebsd.c:
In isp_done(), if we're sending CAM_SEL_TIMEOUT for for a
command sent to a FC device, set the reported_gone bit.
In isp_async(), in the ISPASYNC_DEV_STAYED case, rescan the
device in question if it is mapped to a target ID and has
been reported gone.
In isp_make_here(), take a port database entry argument,
and clear the reported_gone bit when we send a rescan to
CAM.
In isp_make_gone(), take a port database entry as an
argument, and set the reported_gone bit when we send an
async event telling CAM consumers that the device is gone.
Sponsored by: Spectra Logic
MFC after:1 week
Modified:
head/sys/dev/isp/isp_freebsd.c
head/sys/dev/isp/ispvar.h
Modified: head/sys/dev/isp/isp_freebsd.c
==
--- head/sys/dev/isp/isp_freebsd.c Thu Jan 8 17:49:07 2015
(r276841)
+++ head/sys/dev/isp/isp_freebsd.c Thu Jan 8 17:51:12 2015
(r276842)
@@ -4565,7 +4565,7 @@ isp_watchdog(void *arg)
}
static void
-isp_make_here(ispsoftc_t *isp, int chan, int tgt)
+isp_make_here(ispsoftc_t *isp, fcportdb_t *fcp, int chan, int tgt)
{
union ccb *ccb;
struct isp_fc *fc = ISP_FC_PC(isp, chan);
@@ -4588,11 +4588,18 @@ isp_make_here(ispsoftc_t *isp, int chan,
xpt_free_ccb(ccb);
return;
}
+
+ /*
+* Since we're about to issue a rescan, mark this device as not
+* reported gone.
+*/
+ fcp->reported_gone = 0;
+
xpt_rescan(ccb);
}
static void
-isp_make_gone(ispsoftc_t *isp, int chan, int tgt)
+isp_make_gone(ispsoftc_t *isp, fcportdb_t *fcp, int chan, int tgt)
{
struct cam_path *tp;
struct isp_fc *fc = ISP_FC_PC(isp, chan);
@@ -4601,6 +4608,11 @@ isp_make_gone(ispsoftc_t *isp, int chan,
return;
}
if (xpt_create_path(&tp, NULL, cam_sim_path(fc->sim), tgt,
CAM_LUN_WILDCARD) == CAM_REQ_CMP) {
+ /*
+* We're about to send out the lost device async
+* notification, so indicate that we have reported it gone.
+*/
+ fcp->reported_gone = 1;
xpt_async(AC_LOST_DEVICE, tp, NULL);
xpt_free_path(tp);
}
@@ -4654,7 +4666,7 @@ isp_gdt_task(void *arg, int pending)
lp->dev_map_idx = 0;
lp->state = FC_PORTDB_STATE_NIL;
isp_prt(isp, ISP_LOGCONFIG, prom3, chan, lp->portid, tgt, "Gone
Device Timeout");
- isp_make_gone(isp, chan, tgt);
+ isp_make_gone(isp, lp, chan, tgt);
}
if (fc->ready) {
if (more_to_do) {
@@ -4747,7 +4759,7 @@ isp_ldt_task(void *arg, int pending)
lp->dev_map_idx = 0;
lp->state = FC_PORTDB_STATE_NIL;
isp_prt(isp, ISP_LOGCONFIG, prom3, chan, lp->portid, tgt, "Loop
Down Timeout");
- isp_make_gone(isp, chan, tgt);
+ isp_make_gone(isp, lp, chan, tgt);
}
if (FCPARAM(isp, chan)->role & ISP_ROLE_INITIATOR) {
@@ -5561,6 +5573,21 @@ isp_done(XS_T *sccb)
if (status != CAM_REQ_CMP) {
if (status != CAM_SEL_TIMEOUT)
isp_prt(isp, ISP_LOGDEBUG0, "target %d lun %d CAM
status 0x%x SCSI status 0x%x", XS_TGT(sccb), XS_LUN(sccb), sccb->ccb_h.status,
sccb->scsi_status);
+ else if ((IS_FC(isp))
+ && (XS_TGT(sccb) < MAX_FC_TARG)) {
+ fcparam *fcp;
+ int hdlidx;
+
+ fcp = FCPARAM(isp, XS_CHANNEL(sccb));
+
svn commit: r276843 - head/tools/tools/nanobsd/pcengines
Author: imp Date: Thu Jan 8 18:00:38 2015 New Revision: 276843 URL: https://svnweb.freebsd.org/changeset/base/276843 Log: We don't want tests on these embedded boxes. Modified: head/tools/tools/nanobsd/pcengines/common.conf Modified: head/tools/tools/nanobsd/pcengines/common.conf == --- head/tools/tools/nanobsd/pcengines/common.conf Thu Jan 8 17:51:12 2015(r276842) +++ head/tools/tools/nanobsd/pcengines/common.conf Thu Jan 8 18:00:38 2015(r276843) @@ -29,6 +29,7 @@ CONF_WORLD=' #TARGET_ARCH=i386 CFLAGS=-O -pipe WITHOUT_ACPI= +WITHOUT_TESTS= MODULES_OVERRIDE=netgraph rc4 BOOT_PXELDR_PROBE_KEYBOARD=1 BOOT_PXELDR_ALWAYS_SERIAL=1 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276844 - head/sys/netinet6
Author: melifaro
Date: Thu Jan 8 18:02:05 2015
New Revision: 276844
URL: https://svnweb.freebsd.org/changeset/base/276844
Log:
* Use newly-created nd6_grab_holdchain() function to retrieve lle
hold mbuf chain instead of calling full-blown nd6_output_lle()
for each packet. This simplifies both callers and nd6_output_lle()
implementation.
* Make nd6_output_lle() static and remove now-unused lle and chain
arguments.
* Rename nd6_output_flush() -> nd6_flush_holdchain() to be consistent.
* Move all pre-send transmit hooks to newly-created nd6_output_ifp().
Now nd6_output(), nd6_output_lle() and nd6_flush_holdchain() are using
it to send mbufs to if_output.
* Remove SeND hook from nd6_na_input() because it was implemented
incorrectly since the beginning (r211501):
- it tagged initial input mbuf (m) instead of m_hold
- tagging _all_ mbufs in holdchain seems to be wrong anyway.
Modified:
head/sys/netinet6/nd6.c
head/sys/netinet6/nd6.h
head/sys/netinet6/nd6_nbr.c
Modified: head/sys/netinet6/nd6.c
==
--- head/sys/netinet6/nd6.c Thu Jan 8 18:00:38 2015(r276843)
+++ head/sys/netinet6/nd6.c Thu Jan 8 18:02:05 2015(r276844)
@@ -134,6 +134,8 @@ static struct llentry *nd6_free(struct l
static void nd6_llinfo_timer(void *);
static void clear_llinfo_pqueue(struct llentry *);
static void nd6_rtrequest(int, struct rtentry *, struct rt_addrinfo *);
+static int nd6_output_lle(struct ifnet *, struct ifnet *, struct mbuf *,
+ struct sockaddr_in6 *);
static VNET_DEFINE(struct callout, nd6_slowtimo_ch);
#defineV_nd6_slowtimo_ch VNET(nd6_slowtimo_ch)
@@ -1646,42 +1648,8 @@ nd6_cache_lladdr(struct ifnet *ifp, stru
ln->ln_state = newstate;
if (ln->ln_state == ND6_LLINFO_STALE) {
- /*
-* XXX: since nd6_output() below will cause
-* state tansition to DELAY and reset the timer,
-* we must set the timer now, although it is actually
-* meaningless.
-*/
- nd6_llinfo_settimer_locked(ln, (long)V_nd6_gctimer *
hz);
-
- if (ln->la_hold) {
- struct mbuf *m_hold, *m_hold_next;
-
- /*
-* reset the la_hold in advance, to explicitly
-* prevent a la_hold lookup in nd6_output()
-* (wouldn't happen, though...)
-*/
- for (m_hold = ln->la_hold, ln->la_hold = NULL;
- m_hold; m_hold = m_hold_next) {
- m_hold_next = m_hold->m_nextpkt;
- m_hold->m_nextpkt = NULL;
-
- /*
-* we assume ifp is not a p2p here, so
-* just set the 2nd argument as the
-* 1st one.
-*/
- nd6_output_lle(ifp, ifp, m_hold,
L3_ADDR_SIN6(ln), NULL, ln, &chain);
- }
- /*
-* If we have mbufs in the chain we need to do
-* deferred transmit. Copy the address from the
-* llentry before dropping the lock down below.
-*/
- if (chain != NULL)
- memcpy(&sin6, L3_ADDR_SIN6(ln),
sizeof(sin6));
- }
+ if (ln->la_hold != NULL)
+ nd6_grab_holdchain(ln, &chain, &sin6);
} else if (ln->ln_state == ND6_LLINFO_INCOMPLETE) {
/* probe right away */
nd6_llinfo_settimer_locked((void *)ln, 0);
@@ -1764,8 +1732,8 @@ nd6_cache_lladdr(struct ifnet *ifp, stru
if (static_route)
ln = NULL;
}
- if (chain)
- nd6_output_flush(ifp, ifp, chain, &sin6);
+ if (chain != NULL)
+ nd6_flush_holdchain(ifp, ifp, chain, &sin6);
/*
* When the link-layer address of a router changes, select the
@@ -1833,6 +1801,79 @@ nd6_slowtimo(void *arg)
CURVNET_RESTORE();
}
+void
+nd6_grab_holdchain(struct llentry *ln, struct mbuf **chain,
+struct sockaddr_in6 *sin6)
+{
+
+ LLE_WLOCK_ASSERT(ln);
+
+ *chain = ln->la_hold;
+ ln->la_hold = NULL;
+ memcpy(sin6, L3_ADDR_SIN6(ln), sizeof(*sin6));
+
+ if (ln->ln_state == ND6_LLINFO_STALE) {
+
+
svn commit: r276846 - in head: share/mk sys/arm/conf sys/conf sys/modules/dtb sys/modules/dtb/atmel
Author: imp
Date: Thu Jan 8 18:28:06 2015
New Revision: 276846
URL: https://svnweb.freebsd.org/changeset/base/276846
Log:
Add infrastructure to build dtb files from dts files.
Added:
head/share/mk/bsd.dtb.mk (contents, props changed)
head/sys/conf/dtb.mk (contents, props changed)
head/sys/modules/dtb/
head/sys/modules/dtb/atmel/
head/sys/modules/dtb/atmel/Makefile (contents, props changed)
Modified:
head/share/mk/Makefile
head/sys/arm/conf/ATMEL
Modified: head/share/mk/Makefile
==
--- head/share/mk/Makefile Thu Jan 8 18:09:36 2015(r276845)
+++ head/share/mk/Makefile Thu Jan 8 18:28:06 2015(r276846)
@@ -11,6 +11,7 @@ FILES=\
bsd.crunchgen.mk \
bsd.dep.mk \
bsd.doc.mk \
+ bsd.dtb.mk \
bsd.endian.mk \
bsd.files.mk \
bsd.incs.mk \
Added: head/share/mk/bsd.dtb.mk
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/share/mk/bsd.dtb.mkThu Jan 8 18:28:06 2015(r276846)
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+# Search for kernel source tree in standard places.
+.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
+${.CURDIR}/../../../../.. /sys /usr/src/sys
+.if !defined(SYSDIR) && exists(${_dir}/kern/) && exists(${_dir}/conf/kmod.mk)
+SYSDIR=${_dir}
+.endif
+.endfor
+.if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) || \
+!exists(${SYSDIR}/conf/kmod.mk)
+.error Unable to locate the kernel source tree. Set SYSDIR to override.
+.endif
+
+.include "${SYSDIR}/conf/dtb.mk"
+
+.include
Modified: head/sys/arm/conf/ATMEL
==
--- head/sys/arm/conf/ATMEL Thu Jan 8 18:09:36 2015(r276845)
+++ head/sys/arm/conf/ATMEL Thu Jan 8 18:28:06 2015(r276846)
@@ -15,7 +15,7 @@ makeoptions KERNVIRTADDR=0xc000
optionsKERNPHYSADDR=0x2000
optionsKERNVIRTADDR=0xc000
-makeoptionsMODULES_OVERRIDE=""
+makeoptionsMODULES_OVERRIDE="dtb/atmel"
# list all boards here, but not just yet (no multiboard in mainline).
optionsARM_MANY_BOARD
Added: head/sys/conf/dtb.mk
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/conf/dtb.mkThu Jan 8 18:28:06 2015(r276846)
@@ -0,0 +1,75 @@
+# $FreeBSD$
+#
+# The include file handles building and installing dtb files.
+#
+# +++ variables +++
+#
+# DTS List of the dts files to build and install.
+#
+# DTBDIR Base path for dtb modules [/boot/dtb]
+#
+# DTBOWN .dtb file owner. [${BINOWN}]
+#
+# DTBGRP .dtb file group. [${BINGRP}]
+#
+# DTBMODE Module file mode. [${BINMODE}]
+#
+# DESTDIR The tree where the module gets installed. [not set]
+#
+# +++ targets +++
+#
+# install:
+# install the kernel module; if the Makefile
+# does not itself define the target install, the targets
+# beforeinstall and afterinstall may also be used to cause
+# actions immediately before and after the install target
+# is executed.
+#
+
+.include
+# Grab all the options for a kernel build. For backwards compat, we need to
+# do this after bsd.own.mk.
+.include "kern.opts.mk"
+
+# Search for kernel source tree in standard places.
+.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. /sys /usr/src/sys
+.if !defined(SYSDIR) && exists(${_dir}/kern/)
+SYSDIR=${_dir}
+.endif
+.endfor
+.if !defined(SYSDIR) || !exists(${SYSDIR}/kern/)
+.error "can't find kernel source tree"
+.endif
+
+.SUFFIXES: .dtb .dts
+
+.PATH: ${SYSDIR}/gnu/dts/${MACHINE} ${SYSDIR}/boot/fdt/dts/${MACHINE}
+
+DTBDIR?=/boot/dtb
+DTB=${DTS:R:S/$/.dtb/}
+
+all: ${DTB}
+
+.if defined(DTS)
+.for _dts in ${DTS}
+${_dts:R:S/$/.dtb/}: ${_dts}
+ @echo Generating ${.TARGET} from ${_dts}
+ @${SYSDIR}/tools/fdt/make_dtb.sh ${SYSDIR} ${_dts} ${.OBJDIR}
+CLEANFILES+=${_dts:R:S/$/.dtb/}
+.endfor
+.endif
+
+.if !target(install)
+.if !target(realinstall)
+realinstall: _dtbinstall
+.ORDER: beforeinstall _kmodinstall
+_dtbinstall:
+.for _dtb in ${DTB}
+ ${INSTALL} -o ${DTBOWN} -g ${DTBGRP} -m ${DTBMODE} \
+ ${_INSTALLFLAGS} ${_dtb} ${DESTDIR}${DTBDIR}
+.endfor
+.endif # !target(realinstall)
+.endif # !target(install)
+
+.include
+.include
Added: head/sys/modules/dtb/atmel/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/modules/dtb/atmel/Makefile Thu Jan 8 18:28:06 2015
(r276846)
@@ -0,0 +1,9 @@
+# $FreeBSD$
+# All the dts files for the boards we might likely support made by Atmel,
+# plus the SAMA5 offerings.
svn commit: r276847 - head/sys/netinet6
Author: melifaro Date: Thu Jan 8 18:29:54 2015 New Revision: 276847 URL: https://svnweb.freebsd.org/changeset/base/276847 Log: Add forgotten definition for nd6_output_ifp(). Modified: head/sys/netinet6/nd6.c Modified: head/sys/netinet6/nd6.c == --- head/sys/netinet6/nd6.c Thu Jan 8 18:28:06 2015(r276846) +++ head/sys/netinet6/nd6.c Thu Jan 8 18:29:54 2015(r276847) @@ -136,6 +136,8 @@ static void clear_llinfo_pqueue(struct l static void nd6_rtrequest(int, struct rtentry *, struct rt_addrinfo *); static int nd6_output_lle(struct ifnet *, struct ifnet *, struct mbuf *, struct sockaddr_in6 *); +static int nd6_output_ifp(struct ifnet *, struct ifnet *, struct mbuf *, +struct sockaddr_in6 *); static VNET_DEFINE(struct callout, nd6_slowtimo_ch); #defineV_nd6_slowtimo_ch VNET(nd6_slowtimo_ch) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276848 - head/cddl/contrib/opensolaris/tools/ctf/cvt
Author: markj Date: Thu Jan 8 18:45:16 2015 New Revision: 276848 URL: https://svnweb.freebsd.org/changeset/base/276848 Log: Revert r274569. It seems to be causing a crash when merging CTF data for recent i386 GENERIC kernels. Reported by: David Wolfskill Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c == --- head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Thu Jan 8 18:29:54 2015(r276847) +++ head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Thu Jan 8 18:45:16 2015(r276848) @@ -349,7 +349,7 @@ equiv_node(tdesc_t *ctdp, tdesc_t *mtdp, int (*equiv)(tdesc_t *, tdesc_t *, equiv_data_t *); int mapping; - if (ctdp->t_emark > ed->ed_clear_mark && + if (ctdp->t_emark > ed->ed_clear_mark || mtdp->t_emark > ed->ed_clear_mark) return (ctdp->t_emark == mtdp->t_emark); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276849 - in head: lib/libc/sys usr.bin/cpuset
Author: jhb Date: Thu Jan 8 18:53:11 2015 New Revision: 276849 URL: https://svnweb.freebsd.org/changeset/base/276849 Log: Document CPU_WHICH_DOMAIN and bump Dd for cpuset.1. Missed in:r276829 Modified: head/lib/libc/sys/cpuset.2 head/usr.bin/cpuset/cpuset.1 Modified: head/lib/libc/sys/cpuset.2 == --- head/lib/libc/sys/cpuset.2 Thu Jan 8 18:45:16 2015(r276848) +++ head/lib/libc/sys/cpuset.2 Thu Jan 8 18:53:11 2015(r276849) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 14, 2014 +.Dd January 8, 2015 .Dt CPUSET 2 .Os .Sh NAME @@ -101,6 +101,7 @@ argument may have the following values: .It Dv CPU_WHICH_JAIL Ta "id is jid (jail id)" .It Dv CPU_WHICH_CPUSET Ta "id is a cpusetid_t (cpuset id)" .It Dv CPU_WHICH_IRQ Ta "id is an irq number" +.It Dv CPU_WHICH_DOMAIN Ta "id is a NUMA domain" .El .Pp An Modified: head/usr.bin/cpuset/cpuset.1 == --- head/usr.bin/cpuset/cpuset.1Thu Jan 8 18:45:16 2015 (r276848) +++ head/usr.bin/cpuset/cpuset.1Thu Jan 8 18:53:11 2015 (r276849) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 14, 2011 +.Dd January 8, 2015 .Dt CPUSET 1 .Os .Sh NAME ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276850 - head/sys/kern
Author: jhb Date: Thu Jan 8 19:11:14 2015 New Revision: 276850 URL: https://svnweb.freebsd.org/changeset/base/276850 Log: Reject attempts to read the cpuset mask of a negative domain ID. Modified: head/sys/kern/kern_cpuset.c Modified: head/sys/kern/kern_cpuset.c == --- head/sys/kern/kern_cpuset.c Thu Jan 8 18:53:11 2015(r276849) +++ head/sys/kern/kern_cpuset.c Thu Jan 8 19:11:14 2015(r276850) @@ -1118,7 +1118,7 @@ sys_cpuset_getaffinity(struct thread *td error = intr_getaffinity(uap->id, mask); break; case CPU_WHICH_DOMAIN: - if (uap->id >= vm_ndomains) + if (uap->id < 0 || uap->id >= vm_ndomains) error = ESRCH; else CPU_COPY(&cpuset_domain[uap->id], mask); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r276747 - head/sys/netpfil/pf
On 8 January 2015 at 00:13, Ermal Luçi wrote: > > > On Thu, Jan 8, 2015 at 1:21 AM, Bjoern A. Zeeb > wrote: >> >> >> > On 07 Jan 2015, at 20:46 , Gleb Smirnoff wrote: >> > >> > On Tue, Jan 06, 2015 at 09:03:04AM +, Craig Rodrigues wrote: >> > C> Author: rodrigc >> > C> Date: Tue Jan 6 09:03:03 2015 >> > C> New Revision: 276747 >> > C> URL: https://svnweb.freebsd.org/changeset/base/276747 >> > C> >> > C> Log: >> > C> Instead of creating a purge thread for every vnet, create >> > C> a single purge thread and clean up all vnets from this thread. >> > C> >> > C> PR: 194515 >> > C> Differential Revision: D1315 >> > C> Submitted by: Nikos Vassiliadis >> > >> > I am not sure that this is a good idea. The core idea of VNETs >> > is that they are isolated from each other. If we serialize purging, >> > then vnets are strongly affecting each other. >> > >> > AFAIU, from the PR there is some panic fixed. What is the actual bug >> > and why couldn't it be fixed with having per-vnet thread? >> >> You don’t 3 whatever pf purging threads on a system all running, >> possibly competing for some resources, e.g., locks? > > > You can tune your system to your load! > > I do not agree with this change as well but just saw it! > > I would have agreed with this if a thread per CPU is created and some > improvements in the locking strategy is performed! > This is a potential issue since on busy system this thread gets very > resource consuming! So the tricksy bit here is once you have things being called via a taskqueue, they're effectively cooperative multitasking bits. A lot of things I've found aren't .. really designed for this. So I'm all for it, and I think it's a good idea in general, but then the pieces need to be reviewed for their suitability for this and may need some reworking so they don't hog CPU. (Yes, it's like writing WIN16 or MACOS code, or maybe network drivers in FreeBSD, but you get the idea.) -adrian ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276851 - in head: contrib/compiler-rt contrib/compiler-rt/BlocksRuntime contrib/compiler-rt/include contrib/compiler-rt/lib contrib/compiler-rt/lib/BlocksRuntime contrib/compiler-rt/li...
Author: dim Date: Thu Jan 8 19:47:10 2015 New Revision: 276851 URL: https://svnweb.freebsd.org/changeset/base/276851 Log: Update compiler-rt to trunk r224034. This brings a number of new builtins, and also the various sanitizers. Support for these will be added in a later commit. Added: head/contrib/compiler-rt/include/ - copied from r276796, vendor/compiler-rt/dist/include/ head/contrib/compiler-rt/lib/BlocksRuntime/ - copied from r276795, vendor/compiler-rt/dist/lib/BlocksRuntime/ head/contrib/compiler-rt/lib/asan/ - copied from r276797, vendor/compiler-rt/dist/lib/asan/ head/contrib/compiler-rt/lib/builtins/ - copied from r276795, vendor/compiler-rt/dist/lib/builtins/ head/contrib/compiler-rt/lib/builtins/sparc64/ - copied from r276846, head/contrib/compiler-rt/lib/sparc64/ head/contrib/compiler-rt/lib/dfsan/ - copied from r276795, vendor/compiler-rt/dist/lib/dfsan/ head/contrib/compiler-rt/lib/interception/ - copied from r276797, vendor/compiler-rt/dist/lib/interception/ head/contrib/compiler-rt/lib/lsan/ - copied from r276795, vendor/compiler-rt/dist/lib/lsan/ head/contrib/compiler-rt/lib/msan/ - copied from r276797, vendor/compiler-rt/dist/lib/msan/ head/contrib/compiler-rt/lib/profile/ - copied from r276797, vendor/compiler-rt/dist/lib/profile/ head/contrib/compiler-rt/lib/sanitizer_common/ - copied from r276797, vendor/compiler-rt/dist/lib/sanitizer_common/ head/contrib/compiler-rt/lib/tsan/ - copied from r276797, vendor/compiler-rt/dist/lib/tsan/ head/contrib/compiler-rt/lib/ubsan/ - copied from r276797, vendor/compiler-rt/dist/lib/ubsan/ Deleted: head/contrib/compiler-rt/BlocksRuntime/ head/contrib/compiler-rt/include/CMakeLists.txt head/contrib/compiler-rt/lib/absvdi2.c head/contrib/compiler-rt/lib/absvsi2.c head/contrib/compiler-rt/lib/absvti2.c head/contrib/compiler-rt/lib/adddf3.c head/contrib/compiler-rt/lib/addsf3.c head/contrib/compiler-rt/lib/addvdi3.c head/contrib/compiler-rt/lib/addvsi3.c head/contrib/compiler-rt/lib/addvti3.c head/contrib/compiler-rt/lib/arm/ head/contrib/compiler-rt/lib/asan/CMakeLists.txt head/contrib/compiler-rt/lib/asan/Makefile.mk head/contrib/compiler-rt/lib/asan/scripts/CMakeLists.txt head/contrib/compiler-rt/lib/asan/tests/CMakeLists.txt head/contrib/compiler-rt/lib/ashldi3.c head/contrib/compiler-rt/lib/ashlti3.c head/contrib/compiler-rt/lib/ashrdi3.c head/contrib/compiler-rt/lib/ashrti3.c head/contrib/compiler-rt/lib/assembly.h head/contrib/compiler-rt/lib/atomic.c head/contrib/compiler-rt/lib/builtins/CMakeLists.txt head/contrib/compiler-rt/lib/builtins/Makefile.mk head/contrib/compiler-rt/lib/builtins/arm/Makefile.mk head/contrib/compiler-rt/lib/builtins/arm64/Makefile.mk head/contrib/compiler-rt/lib/builtins/armv6m/Makefile.mk head/contrib/compiler-rt/lib/builtins/i386/Makefile.mk head/contrib/compiler-rt/lib/builtins/ppc/Makefile.mk head/contrib/compiler-rt/lib/builtins/x86_64/Makefile.mk head/contrib/compiler-rt/lib/clear_cache.c head/contrib/compiler-rt/lib/clzdi2.c head/contrib/compiler-rt/lib/clzsi2.c head/contrib/compiler-rt/lib/clzti2.c head/contrib/compiler-rt/lib/cmpdi2.c head/contrib/compiler-rt/lib/cmpti2.c head/contrib/compiler-rt/lib/comparedf2.c head/contrib/compiler-rt/lib/comparesf2.c head/contrib/compiler-rt/lib/ctzdi2.c head/contrib/compiler-rt/lib/ctzsi2.c head/contrib/compiler-rt/lib/ctzti2.c head/contrib/compiler-rt/lib/dfsan/CMakeLists.txt head/contrib/compiler-rt/lib/dfsan/Makefile.mk head/contrib/compiler-rt/lib/divdc3.c head/contrib/compiler-rt/lib/divdf3.c head/contrib/compiler-rt/lib/divdi3.c head/contrib/compiler-rt/lib/divmoddi4.c head/contrib/compiler-rt/lib/divmodsi4.c head/contrib/compiler-rt/lib/divsc3.c head/contrib/compiler-rt/lib/divsf3.c head/contrib/compiler-rt/lib/divsi3.c head/contrib/compiler-rt/lib/divti3.c head/contrib/compiler-rt/lib/divxc3.c head/contrib/compiler-rt/lib/enable_execute_stack.c head/contrib/compiler-rt/lib/eprintf.c head/contrib/compiler-rt/lib/extendsfdf2.c head/contrib/compiler-rt/lib/ffsdi2.c head/contrib/compiler-rt/lib/ffsti2.c head/contrib/compiler-rt/lib/fixdfdi.c head/contrib/compiler-rt/lib/fixdfsi.c head/contrib/compiler-rt/lib/fixdfti.c head/contrib/compiler-rt/lib/fixsfdi.c head/contrib/compiler-rt/lib/fixsfsi.c head/contrib/compiler-rt/lib/fixsfti.c head/contrib/compiler-rt/lib/fixunsdfdi.c head/contrib/compiler-rt/lib/fixunsdfsi.c head/contrib/compiler-rt/lib/fixunsdfti.c head/contrib/compiler-rt/lib/fixunssfdi.c head/contrib/compiler-rt/lib/fixunssfsi.c head/contrib/compiler-rt/lib/fixunssfti.c head/contrib/compiler-rt/lib/fixunsxfdi.c head/contrib/compiler-rt/lib/fixunsxfsi.c head/contrib/compiler-rt/lib/fixunsxfti.c head/contrib/compiler-rt/lib/fixxfdi.c head/contrib/compiler-rt/lib/fixxfti.c head/contrib/compiler-rt/lib/floatdidf.c
Re: svn commit: r276846 - in head: share/mk sys/arm/conf sys/conf sys/modules/dtb sys/modules/dtb/atmel
On Thu, Jan 8, 2015 at 10:28 AM, Warner Losh wrote:
> Author: imp
> Date: Thu Jan 8 18:28:06 2015
> New Revision: 276846
> URL: https://svnweb.freebsd.org/changeset/base/276846
>
> Log:
> Add infrastructure to build dtb files from dts files.
...
> Added: head/share/mk/bsd.dtb.mk
> ==
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/share/mk/bsd.dtb.mkThu Jan 8 18:28:06 2015(r276846)
> @@ -0,0 +1,17 @@
> +# $FreeBSD$
> +
> +# Search for kernel source tree in standard places.
> +.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
> +${.CURDIR}/../../../../.. /sys /usr/src/sys
> +.if !defined(SYSDIR) && exists(${_dir}/kern/) && exists(${_dir}/conf/kmod.mk)
> +SYSDIR=${_dir}
> +.endif
> +.endfor
> +.if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) || \
> +!exists(${SYSDIR}/conf/kmod.mk)
> +.error Unable to locate the kernel source tree. Set SYSDIR to override.
> +.endif
> +
> +.include "${SYSDIR}/conf/dtb.mk"
> +
> +.include
...
> +# Search for kernel source tree in standard places.
> +.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. /sys /usr/src/sys
> +.if !defined(SYSDIR) && exists(${_dir}/kern/)
> +SYSDIR=${_dir}
> +.endif
> +.endfor
> +.if !defined(SYSDIR) || !exists(${SYSDIR}/kern/)
> +.error "can't find kernel source tree"
> +.endif
Why is ${SYSDIR} being checked for in bsd.dtb.mk and dtb.mk?
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276852 - head/lib/libblocksruntime
Author: dim
Date: Thu Jan 8 20:08:00 2015
New Revision: 276852
URL: https://svnweb.freebsd.org/changeset/base/276852
Log:
Follow up to r276851 by also committing a necessary update to
lib/libblocksruntime.
Pointy hat to:dim
Modified:
head/lib/libblocksruntime/Makefile
Modified: head/lib/libblocksruntime/Makefile
==
--- head/lib/libblocksruntime/Makefile Thu Jan 8 19:47:10 2015
(r276851)
+++ head/lib/libblocksruntime/Makefile Thu Jan 8 20:08:00 2015
(r276852)
@@ -5,7 +5,7 @@ SHLIB_MAJOR=0
CFLAGS+=-I${.CURDIR}
WARNS?=2
-.PATH: ${.CURDIR}/../../contrib/compiler-rt/BlocksRuntime
+.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/BlocksRuntime
INCS= Block.h Block_private.h
SRCS= data.c runtime.c
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276853 - in head: lib/libc/arm/aeabi lib/libstand sys/boot/libstand32
Author: dim
Date: Thu Jan 8 20:11:38 2015
New Revision: 276853
URL: https://svnweb.freebsd.org/changeset/base/276853
Log:
Apparently more Makefiles use stuff from compiler-rt, so fix them up
too. (This did not show during a make universe, strangely.)
Modified:
head/lib/libc/arm/aeabi/Makefile.inc
head/lib/libstand/Makefile
head/sys/boot/libstand32/Makefile
Modified: head/lib/libc/arm/aeabi/Makefile.inc
==
--- head/lib/libc/arm/aeabi/Makefile.incThu Jan 8 20:08:00 2015
(r276852)
+++ head/lib/libc/arm/aeabi/Makefile.incThu Jan 8 20:11:38 2015
(r276853)
@@ -20,7 +20,7 @@ SRCS+=aeabi_vfp_double.S \
# libc. This causes issues when other parts of libc call these functions.
# We work around this by including these functions in libc but mark them as
# hidden so users of libc will not pick up these versions.
-.PATH: ${LIBC_SRCTOP}/../../contrib/compiler-rt/lib/arm
+.PATH: ${LIBC_SRCTOP}/../../contrib/compiler-rt/lib/builtins/arm
SRCS+= aeabi_memcmp.S \
aeabi_memcpy.S \
Modified: head/lib/libstand/Makefile
==
--- head/lib/libstand/Makefile Thu Jan 8 20:08:00 2015(r276852)
+++ head/lib/libstand/Makefile Thu Jan 8 20:11:38 2015(r276853)
@@ -65,14 +65,14 @@ SRCS+= bcmp.c bcopy.c bzero.c ffs.c memc
.PATH: ${.CURDIR}/../libc/arm/gen
# Compiler support functions
-.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/
+.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/builtins/
# __clzsi2 and ctzsi2 for various builtin functions
SRCS+= clzsi2.c ctzsi2.c
# Divide and modulus functions called by the compiler
SRCS+= divmoddi4.c divmodsi4.c divdi3.c divsi3.c moddi3.c modsi3.c
SRCS+= udivmoddi4.c udivmodsi4.c udivdi3.c udivsi3.c umoddi3.c umodsi3.c
-.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/arm/
+.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/builtins/arm/
SRCS+= aeabi_idivmod.S aeabi_ldivmod.S aeabi_uidivmod.S aeabi_uldivmod.S
SRCS+= aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S aeabi_memset.S
Modified: head/sys/boot/libstand32/Makefile
==
--- head/sys/boot/libstand32/Makefile Thu Jan 8 20:08:00 2015
(r276852)
+++ head/sys/boot/libstand32/Makefile Thu Jan 8 20:11:38 2015
(r276853)
@@ -68,14 +68,14 @@ SRCS+= bcmp.c bcopy.c bzero.c ffs.c memc
.PATH: ${LIBC}/arm/gen
# Compiler support functions
-.PATH: ${.CURDIR}/../../../contrib/compiler-rt/lib/
+.PATH: ${.CURDIR}/../../../contrib/compiler-rt/lib/builtins/
# __clzsi2 and ctzsi2 for various builtin functions
SRCS+= clzsi2.c ctzsi2.c
# Divide and modulus functions called by the compiler
SRCS+= divmoddi4.c divmodsi4.c divdi3.c divsi3.c moddi3.c modsi3.c
SRCS+= udivmoddi4.c udivmodsi4.c udivdi3.c udivsi3.c umoddi3.c umodsi3.c
-.PATH: ${.CURDIR}/../../../contrib/compiler-rt/lib/arm/
+.PATH: ${.CURDIR}/../../../contrib/compiler-rt/lib/builtins/arm/
SRCS+= aeabi_idivmod.S aeabi_ldivmod.S aeabi_uidivmod.S aeabi_uldivmod.S
SRCS+= aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S aeabi_memset.S
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276855 - head/sys/kern
Author: jhb
Date: Thu Jan 8 21:46:28 2015
New Revision: 276855
URL: https://svnweb.freebsd.org/changeset/base/276855
Log:
Change the default method for device_quiesce() to return 0 instead of
EOPNOTSUPP. The current behavior can mask real quiesce errors since
devclass_quiesce_driver() stops iterating over drivers as soon as it
gets an error (incluiding EOPNOTSUPP), but the caller it returns the
error to explicitly ignores EOPNOTSUPP.
Reviewed by: imp
Modified:
head/sys/kern/device_if.m
Modified: head/sys/kern/device_if.m
==
--- head/sys/kern/device_if.m Thu Jan 8 21:17:35 2015(r276854)
+++ head/sys/kern/device_if.m Thu Jan 8 21:46:28 2015(r276855)
@@ -60,7 +60,7 @@ CODE {
static int null_quiesce(device_t dev)
{
- return EOPNOTSUPP;
+ return 0;
}
};
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276857 - in head/lib/libclang_rt: . asan asan_cxx profile san ubsan ubsan_cxx
Author: dim
Date: Thu Jan 8 22:40:56 2015
New Revision: 276857
URL: https://svnweb.freebsd.org/changeset/base/276857
Log:
Now compiler-rt has been updated in r276851, bring in the various
sanitizer libraries that already work on FreeBSD:
* asan:Address Sanitizer
* ubsan: Undefined Behavior Sanitizer
* profile: Profile Guided Optimization support
Please note that these libraries are *experimental* at this stage, so
the main Makefile is not yet connected to the build.
Since I didn't want to needlessly edit BSD.usr.dist, you will also have
to create the install directory /usr/lib/clang/3.5.0/lib/freebsd
manually for now.
Added:
head/lib/libclang_rt/
head/lib/libclang_rt/Makefile (contents, props changed)
head/lib/libclang_rt/Makefile.inc (contents, props changed)
head/lib/libclang_rt/asan/
head/lib/libclang_rt/asan/Makefile (contents, props changed)
head/lib/libclang_rt/asan_cxx/
head/lib/libclang_rt/asan_cxx/Makefile (contents, props changed)
head/lib/libclang_rt/profile/
head/lib/libclang_rt/profile/Makefile (contents, props changed)
head/lib/libclang_rt/san/
head/lib/libclang_rt/san/Makefile (contents, props changed)
head/lib/libclang_rt/ubsan/
head/lib/libclang_rt/ubsan/Makefile (contents, props changed)
head/lib/libclang_rt/ubsan_cxx/
head/lib/libclang_rt/ubsan_cxx/Makefile (contents, props changed)
Added: head/lib/libclang_rt/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libclang_rt/Makefile Thu Jan 8 22:40:56 2015
(r276857)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+SUBDIR=asan\
+ asan_cxx\
+ profile\
+ san\
+ ubsan\
+ ubsan_cxx
+
+.include
Added: head/lib/libclang_rt/Makefile.inc
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libclang_rt/Makefile.inc Thu Jan 8 22:40:56 2015
(r276857)
@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+.include
+
+CRTARCH=${MACHINE_CPUARCH:C/amd64/x86_64/}
+CRTSRC=${.CURDIR}/../../../contrib/compiler-rt
+
+LIBDIR=/usr/lib/clang/3.5.0/lib/freebsd
+
+NO_PIC=
+MK_PROFILE=no
+
+WARNS?=0
+
+SSP_CFLAGS=
+CFLAGS+=-DNDEBUG
+CFLAGS+=${PICFLAG}
+CFLAGS+=-fno-builtin
+CFLAGS+=-fno-exceptions
+CFLAGS+=-fno-rtti
+CFLAGS+=-fno-stack-protector
+CFLAGS+=-funwind-tables
+CFLAGS+=-fvisibility-inlines-hidden
+CFLAGS+=-fvisibility=hidden
+CFLAGS+=-I${CRTSRC}/lib
Added: head/lib/libclang_rt/asan/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libclang_rt/asan/Makefile Thu Jan 8 22:40:56 2015
(r276857)
@@ -0,0 +1,78 @@
+# $FreeBSD$
+
+.include
+
+LIB= clang_rt.asan-${CRTARCH}
+
+.PATH: ${CRTSRC}/lib/asan\
+ ${CRTSRC}/lib/interception\
+ ${CRTSRC}/lib/sanitizer_common\
+ ${CRTSRC}/lib/lsan
+
+SRCS= asan_preinit.cc\
+ asan_allocator2.cc\
+ asan_activation.cc\
+ asan_debugging.cc\
+ asan_fake_stack.cc\
+ asan_globals.cc\
+ asan_interceptors.cc\
+ asan_linux.cc\
+ asan_mac.cc\
+ asan_malloc_linux.cc\
+ asan_malloc_mac.cc\
+ asan_malloc_win.cc\
+ asan_poisoning.cc\
+ asan_posix.cc\
+ asan_report.cc\
+ asan_rtl.cc\
+ asan_stack.cc\
+ asan_stats.cc\
+ asan_suppressions.cc\
+ asan_thread.cc\
+ asan_win.cc\
+ interception_linux.cc\
+ interception_mac.cc\
+ interception_win.cc\
+ interception_type_test.cc\
+ sanitizer_allocator.cc\
+ sanitizer_common.cc\
+ sanitizer_deadlock_detector1.cc\
+ sanitizer_deadlock_detector2.cc\
+ sanitizer_flags.cc\
+ sanitizer_libc.cc\
+ sanitizer_libignore.cc\
+ sanitizer_linux.cc\
+ sanitizer_mac.cc\
+ sanitizer_persistent_allocator.cc\
+ sanitizer_platform_limits_linux.cc\
+ sanitizer_platform_limits_posix.cc\
+ sanitizer_posix.cc\
+ sanitizer_printf.cc\
+ sanitizer_procmaps_common.cc\
+ sanitizer_procmaps_freebsd.cc\
+ sanitizer_procmaps_linux.cc\
+ sanitizer_procmaps_mac.cc\
+ sanitizer_stackdepot.cc\
+ sanitizer_stacktrace.cc\
+ sanitizer_stacktrace_printer.cc\
+ sanitizer_suppressions.cc\
+ sanitizer_symbolizer.cc\
+ sanitizer_symbolizer_libbacktrace.cc\
+ sanitizer_symbolizer_win.cc\
+ sanitizer_tls_get_addr.cc\
+ sanitizer_thread_registry.cc\
+ sanitizer_win.cc\
+ sanitizer_common_libcdep.cc\
+ sanitizer_coverage_libcdep.cc\
+ sanitizer_coverage_mapping_libcdep.cc\
+ sanitizer_linux_libcdep.cc\
+ sanitizer_posix_libcdep.cc\
+ sanitizer_stacktrace_libcdep.cc\
+ sanitizer_stoptheworld_linux_libcdep.cc\
+
Re: svn commit: r276853 - in head: lib/libc/arm/aeabi lib/libstand sys/boot/libstand32
On Thu, Jan 8, 2015 at 12:11 PM, Dimitry Andric wrote: > Author: dim > Date: Thu Jan 8 20:11:38 2015 > New Revision: 276853 > URL: https://svnweb.freebsd.org/changeset/base/276853 > > Log: > Apparently more Makefiles use stuff from compiler-rt, so fix them up > too. (This did not show during a make universe, strangely.) Have you tried "make tinderbox" instead of "make universe"? ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r276846 - in head: share/mk sys/arm/conf sys/conf sys/modules/dtb sys/modules/dtb/atmel
> On Jan 8, 2015, at 12:49 PM, NGie Cooper wrote:
>
> On Thu, Jan 8, 2015 at 10:28 AM, Warner Losh wrote:
>> Author: imp
>> Date: Thu Jan 8 18:28:06 2015
>> New Revision: 276846
>> URL: https://svnweb.freebsd.org/changeset/base/276846
>>
>> Log:
>> Add infrastructure to build dtb files from dts files.
>
> ...
>
>> Added: head/share/mk/bsd.dtb.mk
>> ==
>> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
>> +++ head/share/mk/bsd.dtb.mkThu Jan 8 18:28:06 2015(r276846)
>> @@ -0,0 +1,17 @@
>> +# $FreeBSD$
>> +
>> +# Search for kernel source tree in standard places.
>> +.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
>> +${.CURDIR}/../../../../.. /sys /usr/src/sys
>> +.if !defined(SYSDIR) && exists(${_dir}/kern/) &&
>> exists(${_dir}/conf/kmod.mk)
>> +SYSDIR=${_dir}
>> +.endif
>> +.endfor
>> +.if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) || \
>> +!exists(${SYSDIR}/conf/kmod.mk)
>> +.error Unable to locate the kernel source tree. Set SYSDIR to override.
>> +.endif
>> +
>> +.include "${SYSDIR}/conf/dtb.mk"
>> +
>> +.include
>
> ...
>
>> +# Search for kernel source tree in standard places.
>> +.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. /sys /usr/src/sys
>> +.if !defined(SYSDIR) && exists(${_dir}/kern/)
>> +SYSDIR=${_dir}
>> +.endif
>> +.endfor
>> +.if !defined(SYSDIR) || !exists(${SYSDIR}/kern/)
>> +.error "can't find kernel source tree"
>> +.endif
>
> Why is ${SYSDIR} being checked for in bsd.dtb.mk and dtb.mk?
SYSDIR may not exist if dtb.mk was included directly.
Warner
signature.asc
Description: Message signed with OpenPGP using GPGMail
svn commit: r276861 - in head: crypto/openssl crypto/openssl/apps crypto/openssl/crypto crypto/openssl/crypto/aes/asm crypto/openssl/crypto/asn1 crypto/openssl/crypto/bio crypto/openssl/crypto/bn c...
Author: jkim Date: Thu Jan 8 23:42:41 2015 New Revision: 276861 URL: https://svnweb.freebsd.org/changeset/base/276861 Log: Merge OpenSSL 1.0.1k. Added: head/crypto/openssl/util/mkbuildinf.pl - copied unchanged from r276856, vendor-crypto/openssl/dist/util/mkbuildinf.pl Deleted: head/crypto/openssl/crypto/bn/asm/mips3.s Modified: head/crypto/openssl/CHANGES head/crypto/openssl/Configure head/crypto/openssl/Makefile head/crypto/openssl/NEWS head/crypto/openssl/README head/crypto/openssl/apps/ca.c head/crypto/openssl/apps/dgst.c head/crypto/openssl/apps/ocsp.c head/crypto/openssl/apps/openssl.c head/crypto/openssl/apps/s_client.c head/crypto/openssl/apps/s_server.c head/crypto/openssl/apps/s_time.c head/crypto/openssl/apps/speed.c head/crypto/openssl/crypto/Makefile head/crypto/openssl/crypto/aes/asm/aes-mips.pl head/crypto/openssl/crypto/asn1/a_bitstr.c head/crypto/openssl/crypto/asn1/a_type.c head/crypto/openssl/crypto/asn1/a_verify.c head/crypto/openssl/crypto/asn1/asn1.h head/crypto/openssl/crypto/asn1/asn1_err.c head/crypto/openssl/crypto/asn1/tasn_dec.c head/crypto/openssl/crypto/asn1/x_algor.c head/crypto/openssl/crypto/asn1/x_name.c head/crypto/openssl/crypto/bio/bio.h head/crypto/openssl/crypto/bio/bss_dgram.c head/crypto/openssl/crypto/bn/asm/mips.pl head/crypto/openssl/crypto/bn/asm/x86_64-gcc.c head/crypto/openssl/crypto/bn/bn.h head/crypto/openssl/crypto/bn/bn_asm.c head/crypto/openssl/crypto/bn/bn_ctx.c head/crypto/openssl/crypto/bn/bn_div.c head/crypto/openssl/crypto/bn/bntest.c head/crypto/openssl/crypto/constant_time_locl.h head/crypto/openssl/crypto/cversion.c head/crypto/openssl/crypto/dsa/dsa_asn1.c head/crypto/openssl/crypto/dso/dso_dlfcn.c head/crypto/openssl/crypto/ec/ec_lib.c head/crypto/openssl/crypto/ec/ec_mult.c head/crypto/openssl/crypto/ec/ec_pmeth.c head/crypto/openssl/crypto/ec/ecp_nistp256.c head/crypto/openssl/crypto/ec/ectest.c head/crypto/openssl/crypto/ecdsa/Makefile head/crypto/openssl/crypto/ecdsa/ecs_vrf.c head/crypto/openssl/crypto/engine/eng_dyn.c head/crypto/openssl/crypto/evp/Makefile head/crypto/openssl/crypto/evp/e_des3.c head/crypto/openssl/crypto/evp/evp_enc.c head/crypto/openssl/crypto/md32_common.h head/crypto/openssl/crypto/mem.c head/crypto/openssl/crypto/objects/obj_xref.h head/crypto/openssl/crypto/objects/objxref.pl head/crypto/openssl/crypto/opensslv.h head/crypto/openssl/crypto/sha/asm/sha1-mips.pl head/crypto/openssl/crypto/sha/asm/sha512-mips.pl head/crypto/openssl/crypto/ts/ts_rsp_sign.c head/crypto/openssl/crypto/x509/x509.h head/crypto/openssl/crypto/x509/x509_vpm.c head/crypto/openssl/crypto/x509/x_all.c head/crypto/openssl/doc/HOWTO/certificates.txt head/crypto/openssl/doc/HOWTO/proxy_certificates.txt head/crypto/openssl/doc/apps/dgst.pod head/crypto/openssl/doc/apps/ocsp.pod head/crypto/openssl/doc/crypto/EVP_EncryptInit.pod head/crypto/openssl/doc/crypto/EVP_PKEY_encrypt.pod head/crypto/openssl/doc/crypto/X509_NAME_add_entry_by_txt.pod head/crypto/openssl/doc/crypto/X509_NAME_get_index_by_NID.pod head/crypto/openssl/doc/ssl/SSL_CTX_set_mode.pod head/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod head/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_rsa_callback.pod head/crypto/openssl/e_os.h head/crypto/openssl/engines/e_padlock.c head/crypto/openssl/ssl/d1_both.c head/crypto/openssl/ssl/d1_clnt.c head/crypto/openssl/ssl/d1_enc.c head/crypto/openssl/ssl/d1_lib.c head/crypto/openssl/ssl/d1_pkt.c head/crypto/openssl/ssl/d1_srvr.c head/crypto/openssl/ssl/dtls1.h head/crypto/openssl/ssl/kssl.c head/crypto/openssl/ssl/s23_srvr.c head/crypto/openssl/ssl/s2_enc.c head/crypto/openssl/ssl/s2_pkt.c head/crypto/openssl/ssl/s2_srvr.c head/crypto/openssl/ssl/s3_both.c head/crypto/openssl/ssl/s3_clnt.c head/crypto/openssl/ssl/s3_enc.c head/crypto/openssl/ssl/s3_lib.c head/crypto/openssl/ssl/s3_meth.c head/crypto/openssl/ssl/s3_pkt.c head/crypto/openssl/ssl/s3_srvr.c head/crypto/openssl/ssl/srtp.h head/crypto/openssl/ssl/ssl.h head/crypto/openssl/ssl/ssl3.h head/crypto/openssl/ssl/ssl_cert.c head/crypto/openssl/ssl/ssl_ciph.c head/crypto/openssl/ssl/ssl_lib.c head/crypto/openssl/ssl/ssl_locl.h head/crypto/openssl/ssl/ssl_sess.c head/crypto/openssl/ssl/ssltest.c head/crypto/openssl/ssl/t1_enc.c head/crypto/openssl/ssl/t1_lib.c head/crypto/openssl/util/libeay.num head/crypto/openssl/util/mk1mf.pl head/crypto/openssl/util/mkdef.pl head/crypto/openssl/util/pl/netware.pl head/crypto/openssl/util/ssleay.num head/secure/lib/libcrypto/Makefile.inc head/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 head/secure/lib/libcrypto/man/ASN1_STRING_length.3 head/secure/lib/libcrypto/man/ASN1_STRING_new.3 head/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 head/secure/lib/libcrypto/man/ASN1_generate_nconf.3 head/secure/lib/libcrypto/man/BIO_ctrl.3 head
svn commit: r276863 - in head/crypto/openssl: crypto util
Author: jkim
Date: Fri Jan 9 00:42:10 2015
New Revision: 276863
URL: https://svnweb.freebsd.org/changeset/base/276863
Log:
MFV: r276862
Fix build.
Modified:
head/crypto/openssl/crypto/cversion.c
head/crypto/openssl/util/mkbuildinf.pl
Directory Properties:
head/crypto/openssl/ (props changed)
Modified: head/crypto/openssl/crypto/cversion.c
==
--- head/crypto/openssl/crypto/cversion.c Fri Jan 9 00:12:20 2015
(r276862)
+++ head/crypto/openssl/crypto/cversion.c Fri Jan 9 00:42:10 2015
(r276863)
@@ -77,7 +77,7 @@ const char *SSLeay_version(int t)
if (t == SSLEAY_CFLAGS)
{
#ifdef CFLAGS
- return(cflags);
+ return(CFLAGS);
#else
return("compiler: information not available");
#endif
Modified: head/crypto/openssl/util/mkbuildinf.pl
==
--- head/crypto/openssl/util/mkbuildinf.pl Fri Jan 9 00:12:20 2015
(r276862)
+++ head/crypto/openssl/util/mkbuildinf.pl Fri Jan 9 00:42:10 2015
(r276863)
@@ -7,7 +7,7 @@ $date = localtime();
print <<"END_OUTPUT";
#ifndef MK1MF_BUILD
/* auto-generated by util/mkbuildinf.pl for crypto/cversion.c */
-#define CFLAGS
+#define CFLAGS cflags
/*
* Generate CFLAGS as an array of individual characters. This is a
* workaround for the situation where CFLAGS gets too long for a C90 string
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r276819 - head/lib/clang/libllvmaarch64disassembler
On Thu, Jan 8, 2015 at 6:26 AM, Ed Maste wrote:
>
> +.if ${MK_CLANG_EXTRAS} != "no" || .${MK_LLDB} != "no"
>
>
There is no need for a leading "."
--
Craig
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r276861 - in head: crypto/openssl crypto/openssl/apps crypto/openssl/crypto crypto/openssl/crypto/aes/asm crypto/openssl/crypto/asn1 crypto/openssl/crypto/bio crypto/openssl/crypto/bn
On Thu, Jan 8, 2015 at 3:42 PM, Jung-uk Kim wrote: > Author: jkim > Date: Thu Jan 8 23:42:41 2015 > New Revision: 276861 > URL: https://svnweb.freebsd.org/changeset/base/276861 > > Log: > Merge OpenSSL 1.0.1k. > In future, please set Relnotes: flag in the commit message for this type of commit to make it easier for re@ to track items like this which should go into release notes. -- Craig ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276866 - head/lib/clang/libllvmaarch64disassembler
Author: emaste
Date: Fri Jan 9 01:57:11 2015
New Revision: 276866
URL: https://svnweb.freebsd.org/changeset/base/276866
Log:
Remove extraneous period
Reported by: rodrigc
Modified:
head/lib/clang/libllvmaarch64disassembler/Makefile
Modified: head/lib/clang/libllvmaarch64disassembler/Makefile
==
--- head/lib/clang/libllvmaarch64disassembler/Makefile Fri Jan 9 01:11:43
2015(r276865)
+++ head/lib/clang/libllvmaarch64disassembler/Makefile Fri Jan 9 01:57:11
2015(r276866)
@@ -8,7 +8,7 @@ SRCDIR= lib/Target/AArch64/Disassembler
INCDIR=lib/Target/AArch64
SRCS= AArch64Disassembler.cpp
-.if ${MK_CLANG_EXTRAS} != "no" || .${MK_LLDB} != "no"
+.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
SRCS+= AArch64ExternalSymbolizer.cpp
.endif
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r276819 - head/lib/clang/libllvmaarch64disassembler
On 8 January 2015 at 20:27, Craig Rodrigues wrote:
>>
>> +.if ${MK_CLANG_EXTRAS} != "no" || .${MK_LLDB} != "no"
>>
>
>
> There is no need for a leading "."
Oops, yes it was a cut-and-pasteo. Thanks for spotting it.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276867 - head/sys/x86/iommu
Author: kib
Date: Fri Jan 9 02:10:44 2015
New Revision: 276867
URL: https://svnweb.freebsd.org/changeset/base/276867
Log:
Fix DMAR context allocations for the devices behind PCIe->PCI bridges
after dmar driver was converted to use rids. The bus component to
calculate context page must be taken from the requestor rid, which is
a bridge, and not from the device bus number.
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/sys/x86/iommu/intel_ctx.c
Modified: head/sys/x86/iommu/intel_ctx.c
==
--- head/sys/x86/iommu/intel_ctx.c Fri Jan 9 01:57:11 2015
(r276866)
+++ head/sys/x86/iommu/intel_ctx.c Fri Jan 9 02:10:44 2015
(r276867)
@@ -288,7 +288,7 @@ dmar_get_ctx(struct dmar_unit *dmar, dev
* higher chance to succeed if the sleep is allowed.
*/
DMAR_UNLOCK(dmar);
- dmar_ensure_ctx_page(dmar, bus);
+ dmar_ensure_ctx_page(dmar, PCI_RID2BUS(rid));
ctx1 = dmar_get_ctx_alloc(dmar, rid);
if (id_mapped) {
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276879 - head/sys/ofed/include/net
Author: hselasky Date: Fri Jan 9 06:39:07 2015 New Revision: 276879 URL: https://svnweb.freebsd.org/changeset/base/276879 Log: Don't mask the IP-address when doing multicast IP over infiniband. PR: 196631 MFC after:3 days Sponsored by: Mellanox Technologies Modified: head/sys/ofed/include/net/ip.h Modified: head/sys/ofed/include/net/ip.h == --- head/sys/ofed/include/net/ip.h Fri Jan 9 03:35:19 2015 (r276878) +++ head/sys/ofed/include/net/ip.h Fri Jan 9 06:39:07 2015 (r276879) @@ -74,7 +74,7 @@ ip_ib_mc_map(uint32_t addr, const unsign buf[13] = 0; buf[14] = 0; buf[15] = 0; - buf[16] = (addr >> 24) & 0x0f; + buf[16] = (addr >> 24) & 0xff; buf[17] = (addr >> 16) & 0xff; buf[18] = (addr >> 8) & 0xff; buf[19] = addr & 0xff; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r276881 - in head/lib/libedit: . TEST edit/readline
Author: bapt
Date: Fri Jan 9 07:40:56 2015
New Revision: 276881
URL: https://svnweb.freebsd.org/changeset/base/276881
Log:
Synchronize libedit with NetBSD and activate UTF-8 support [1]
Differences with NetBSD
Reapply our local patches on top of it
Fix Unicode environement detection
Fix reading a line in unicode environment.
It allows /bin/sh to works in UTF-8 envs
Differential Revision:https://reviews.freebsd.org/D1455
Reviewed by: jilles, pfg
Obtained from:NetBSD [1]
MFC after:1 month
Relnotes: yes
Added:
head/lib/libedit/TEST/rl1.c (contents, props changed)
head/lib/libedit/TEST/wtc1.c (contents, props changed)
head/lib/libedit/chartype.c (contents, props changed)
head/lib/libedit/config.h (contents, props changed)
head/lib/libedit/eln.c (contents, props changed)
head/lib/libedit/keymacro.c
- copied, changed from r276637, head/lib/libedit/key.c
head/lib/libedit/keymacro.h
- copied, changed from r276637, head/lib/libedit/key.h
head/lib/libedit/terminal.c
- copied, changed from r276637, head/lib/libedit/term.c
head/lib/libedit/terminal.h
- copied, changed from r276637, head/lib/libedit/term.h
Deleted:
head/lib/libedit/key.c
head/lib/libedit/key.h
head/lib/libedit/term.c
head/lib/libedit/term.h
Modified:
head/lib/libedit/Makefile
head/lib/libedit/TEST/tc1.c
head/lib/libedit/chared.c
head/lib/libedit/chared.h
head/lib/libedit/chartype.h
head/lib/libedit/common.c
head/lib/libedit/edit/readline/readline.h
head/lib/libedit/editline.3
head/lib/libedit/editrc.5
head/lib/libedit/el.c
head/lib/libedit/el.h
head/lib/libedit/emacs.c
head/lib/libedit/filecomplete.c
head/lib/libedit/filecomplete.h
head/lib/libedit/hist.c
head/lib/libedit/hist.h
head/lib/libedit/histedit.h
head/lib/libedit/history.c
head/lib/libedit/makelist
head/lib/libedit/map.c
head/lib/libedit/map.h
head/lib/libedit/parse.c
head/lib/libedit/parse.h
head/lib/libedit/prompt.c
head/lib/libedit/prompt.h
head/lib/libedit/read.c
head/lib/libedit/read.h
head/lib/libedit/readline.c
head/lib/libedit/refresh.c
head/lib/libedit/refresh.h
head/lib/libedit/search.c
head/lib/libedit/search.h
head/lib/libedit/sig.c
head/lib/libedit/sig.h
head/lib/libedit/sys.h
head/lib/libedit/tokenizer.c
head/lib/libedit/tty.c
head/lib/libedit/tty.h
head/lib/libedit/vi.c
Modified: head/lib/libedit/Makefile
==
--- head/lib/libedit/Makefile Fri Jan 9 07:32:43 2015(r276880)
+++ head/lib/libedit/Makefile Fri Jan 9 07:40:56 2015(r276881)
@@ -7,8 +7,8 @@ SHLIB_MAJOR=7
SHLIBDIR?= /lib
OSRCS= chared.c common.c el.c emacs.c fcns.c filecomplete.c help.c \
- hist.c key.c map.c \
- parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c
+ hist.c keymacro.c map.c chartype.c \
+ parse.c prompt.c read.c refresh.c search.c sig.c terminal.c tty.c vi.c
LIBADD=ncursesw
@@ -34,7 +34,10 @@ CLEANFILES+= common.h editline.c emacs.h
INCS= histedit.h
-CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/edit
+OSRCS+=eln.c
+SRCS+= tokenizern.c historyn.c
+CLEANFILES+= tokenizern.c historyn.c
+CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/edit -DWIDECHAR
CFLAGS+= #-DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG -DDEBUG_REFRESH
CFLAGS+= #-DDEBUG_PASTE -DDEBUG_EDIT
@@ -65,6 +68,12 @@ help.h: ${ASRC} makelist
editline.c: ${OSRCS}
sh ${.CURDIR}/makelist -e ${.ALLSRC:T} > ${.TARGET}
+tokenizern.c: makelist Makefile
+ sh ${.CURDIR}/makelist -n tokenizer.c > ${.TARGET}
+
+historyn.c: makelist Makefile
+ sh ${.CURDIR}/makelist -n history.c > ${.TARGET}
+
# minimal dependency to make "make depend" optional
editline.o editline.po editline.So editline.ln:\
common.h emacs.h fcns.c fcns.h help.c help.h vi.h
Added: head/lib/libedit/TEST/rl1.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libedit/TEST/rl1.c Fri Jan 9 07:40:56 2015(r276881)
@@ -0,0 +1,53 @@
+/* $NetBSD: rl1.c,v 1.1 2010/09/16 20:08:51 christos Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+
svn commit: r276882 - head/lib/libedit
Author: bapt
Date: Fri Jan 9 07:48:22 2015
New Revision: 276882
URL: https://svnweb.freebsd.org/changeset/base/276882
Log:
Remove junk added during testing phase
Modified:
head/lib/libedit/eln.c
Modified: head/lib/libedit/eln.c
==
--- head/lib/libedit/eln.c Fri Jan 9 07:40:56 2015(r276881)
+++ head/lib/libedit/eln.c Fri Jan 9 07:48:22 2015(r276882)
@@ -77,7 +77,6 @@ public const char *
el_gets(EditLine *el, int *nread)
{
const wchar_t *tmp;
- const char *ret;
int nwread;
*nread = 0;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
