svn commit: r333395 - head/usr.bin/enigma
Author: eadler
Date: Wed May 9 07:46:57 2018
New Revision: 95
URL: https://svnweb.freebsd.org/changeset/base/95
Log:
enigma(1) Remove reference to PGP; modernize a bit
- the port was removed 2017-06-07 in r442847
- gnupg1 is the older version of gpg with legacy PGP support
- remove unused macro
- remove now-false statement about export restrictions
Modified:
head/usr.bin/enigma/enigma.1
head/usr.bin/enigma/enigma.c
Modified: head/usr.bin/enigma/enigma.1
==
--- head/usr.bin/enigma/enigma.1Wed May 9 04:09:49 2018
(r94)
+++ head/usr.bin/enigma/enigma.1Wed May 9 07:46:57 2018
(r95)
@@ -6,7 +6,7 @@
.\"
.\" $FreeBSD$
.\" "
-.Dd February 5, 2017
+.Dd May 8, 2018
.Dt ENIGMA 1
.Os
.Sh NAME
@@ -85,13 +85,8 @@ with other operating systems that also provide an impl
there).
For real encryption, refer to
.Xr openssl 1 ,
-.Xr pgp 1 Pq Pa ports/security/pgp ,
or
-.Xr gpg 1 Pq Pa ports/security/gnupg .
-However, restrictions for exporting,
-importing or using such tools might exist in some countries, so those
-stronger programs are not being shipped as part of the operating
-system by default.
+.Xr gpg 1 Pq Pa security/gnupg1 .
.Sh ENVIRONMENT
.Bl -tag -offset indent -width ".Ev CrYpTkEy"
.It Ev CrYpTkEy
@@ -116,7 +111,6 @@ This displays the previously created file on the termi
.Sh SEE ALSO
.Xr gpg 1 ,
.Xr openssl 1 ,
-.Xr pgp 1 ,
.Xr ps 1 ,
.Xr getpass 3
.Sh HISTORY
Modified: head/usr.bin/enigma/enigma.c
==
--- head/usr.bin/enigma/enigma.cWed May 9 04:09:49 2018
(r94)
+++ head/usr.bin/enigma/enigma.cWed May 9 07:46:57 2018
(r95)
@@ -22,7 +22,6 @@ __FBSDID("$FreeBSD$");
#define MINUSKVAR "CrYpTkEy"
-#define ECHO 010
#define ROTORSZ 256
#define MASK 0377
static chart1[ROTORSZ];
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333396 - head/sys/compat/linuxkpi/common/src
Author: hselasky Date: Wed May 9 08:50:42 2018 New Revision: 96 URL: https://svnweb.freebsd.org/changeset/base/96 Log: Add myself to copyright in the LinuxKPI RCU support layer. Suggested by: mmacy@ Sponsored by: Mellanox Technologies Modified: head/sys/compat/linuxkpi/common/src/linux_rcu.c Modified: head/sys/compat/linuxkpi/common/src/linux_rcu.c == --- head/sys/compat/linuxkpi/common/src/linux_rcu.c Wed May 9 07:46:57 2018(r95) +++ head/sys/compat/linuxkpi/common/src/linux_rcu.c Wed May 9 08:50:42 2018(r96) @@ -1,5 +1,6 @@ /*- * Copyright (c) 2016 Matthew Macy (mm...@mattmacy.io) + * Copyright (c) 2017 Hans Petter Selasky (hsela...@freebsd.org) * All rights reserved. * * Redistribution and use in source and binary forms, with or without ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333397 - in head: lib/libc share/mk
Author: kib
Date: Wed May 9 10:28:24 2018
New Revision: 97
URL: https://svnweb.freebsd.org/changeset/base/97
Log:
Created static libc PIC/no-SSP library to be used by rtld.
Rtld is not compatible with SSP, and since we link libc_pic.a to rtld
to have the basic support like memory and string copy functions, we
have to both carefully limit libc use, and to provide the ssp support
shims. This change makes the libc use in rtld more straighforward but
still limited, and allows to remove the shims, to be done in the next
commit.
Submitted by: Luis Pires
Reviewed by: bdrewery, brooks
Differential revision:https://reviews.freebsd.org/D15283
Modified:
head/lib/libc/Makefile
head/share/mk/bsd.README
head/share/mk/bsd.dep.mk
head/share/mk/bsd.lib.mk
head/share/mk/meta.autodep.mk
head/share/mk/src.libnames.mk
Modified: head/lib/libc/Makefile
==
--- head/lib/libc/Makefile Wed May 9 08:50:42 2018(r96)
+++ head/lib/libc/Makefile Wed May 9 10:28:24 2018(r97)
@@ -43,6 +43,7 @@ CFLAGS+=-DNLS
.endif
CLEANFILES+=tags
INSTALL_PIC_ARCHIVE=
+BUILD_NOSSP_PIC_ARCHIVE=
PRECIOUSLIB=
.ifndef NO_THREAD_STACK_UNWIND
Modified: head/share/mk/bsd.README
==
--- head/share/mk/bsd.READMEWed May 9 08:50:42 2018(r96)
+++ head/share/mk/bsd.READMEWed May 9 10:28:24 2018(r97)
@@ -115,6 +115,8 @@ the tree where the file gets installed.
The profiled libraries are no longer built in a different directory than
the regular libraries. A new suffix, ".po", is used to denote a profiled
object, and ".pico" denotes a position-independent relocatable object.
+".nossppico" denotes a position-independent relocatable object without
+stack smashing protection.
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
Modified: head/share/mk/bsd.dep.mk
==
--- head/share/mk/bsd.dep.mkWed May 9 08:50:42 2018(r96)
+++ head/share/mk/bsd.dep.mkWed May 9 10:28:24 2018(r97)
@@ -160,11 +160,14 @@ ${_D}.o: ${_DSRC} ${OBJS:S/^${_D}.o$//}
@rm -f ${.TARGET}
${DTRACE} ${DTRACEFLAGS} -G -o ${.TARGET} -s ${.ALLSRC:N*.h}
.if defined(LIB)
-CLEANFILES+= ${_D}.pico ${_D}.po
+CLEANFILES+= ${_D}.pico ${_D}.po ${_D}.nossppico
${_D}.pico: ${_DSRC} ${SOBJS:S/^${_D}.pico$//}
@rm -f ${.TARGET}
${DTRACE} ${DTRACEFLAGS} -G -o ${.TARGET} -s ${.ALLSRC:N*.h}
${_D}.po: ${_DSRC} ${POBJS:S/^${_D}.po$//}
+ @rm -f ${.TARGET}
+ ${DTRACE} ${DTRACEFLAGS} -G -o ${.TARGET} -s ${.ALLSRC:N*.h}
+${_D}.nossppico: ${_DSRC} ${SOBJS:S/^${_D}.nossppico$//}
@rm -f ${.TARGET}
${DTRACE} ${DTRACEFLAGS} -G -o ${.TARGET} -s ${.ALLSRC:N*.h}
.endif
Modified: head/share/mk/bsd.lib.mk
==
--- head/share/mk/bsd.lib.mkWed May 9 08:50:42 2018(r96)
+++ head/share/mk/bsd.lib.mkWed May 9 10:28:24 2018(r97)
@@ -21,9 +21,11 @@ LIB_PRIVATE= ${PRIVATELIB:Dprivate}
# SHLIB_NAME will be defined only if we are to create a shared library.
# SHLIB_LINK will be defined only if we are to create a link to it.
# INSTALL_PIC_ARCHIVE will be defined only if we are to create a PIC archive.
+# BUILD_NOSSP_PIC_ARCHIVE will be defined only if we are to create a PIC
archive.
.if defined(NO_PIC)
.undef SHLIB_NAME
.undef INSTALL_PIC_ARCHIVE
+.undef BUILD_NOSSP_PIC_ARCHIVE
.else
.if !defined(SHLIB) && defined(LIB)
SHLIB= ${LIB}
@@ -78,7 +80,8 @@ CTFFLAGS+= -g
# prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
# .pico used for PIC object files
-.SUFFIXES: .out .o .bc .ll .po .pico .S .asm .s .c .cc .cpp .cxx .C .f .y .l
.ln
+# .nossppico used for NOSSP PIC object files
+.SUFFIXES: .out .o .bc .ll .po .pico .nossppico .S .asm .s .c .cc .cpp .cxx .C
.f .y .l .ln
.if !defined(PICFLAG)
.if ${MACHINE_CPUARCH} == "sparc64"
@@ -98,12 +101,19 @@ PO_FLAG=-pg
${CC} ${PICFLAG} -DPIC ${SHARED_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o
${.TARGET}
${CTFCONVERT_CMD}
+.c.nossppico:
+ ${CC} ${PICFLAG} -DPIC ${SHARED_CFLAGS:C/^-fstack-protector.*$//}
${CFLAGS:C/^-fstack-protector.*$//} -c ${.IMPSRC} -o ${.TARGET}
+ ${CTFCONVERT_CMD}
+
.cc.po .C.po .cpp.po .cxx.po:
${CXX} ${PO_FLAG} ${STATIC_CXXFLAGS} ${PO_CXXFLAGS} -c ${.IMPSRC} -o
${.TARGET}
.cc.pico .C.pico .cpp.pico .cxx.pico:
${CXX} ${PICFLAG} -DPIC ${SHARED_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o
${.TARGET}
+.cc.nossppico .C.nossppico .cpp.nossppico .cxx.nossppico:
+ ${CXX} ${PICFLAG} -DPIC ${SHARED_CXXFLAGS:C/^-fstack-protector.*$//}
${CXXFLAGS:C/^-fstack-protector.*$//} -c ${.IMPSRC} -o ${.TARGET}
+
.f.po:
${FC
svn commit: r333398 - head/libexec/rtld-elf
Author: kib
Date: Wed May 9 10:30:56 2018
New Revision: 98
URL: https://svnweb.freebsd.org/changeset/base/98
Log:
Make rtld use libc_nossp_pic.a. Remove SSP shims.
Submitted by: Luis Pires
Reviewed by: brooks
Differential revision:https://reviews.freebsd.org/D15341
Modified:
head/libexec/rtld-elf/Makefile
head/libexec/rtld-elf/rtld.c
Modified: head/libexec/rtld-elf/Makefile
==
--- head/libexec/rtld-elf/Makefile Wed May 9 10:28:24 2018
(r97)
+++ head/libexec/rtld-elf/Makefile Wed May 9 10:30:56 2018
(r98)
@@ -51,7 +51,7 @@ CFLAGS+= -fvisibility=hidden
CFLAGS.reloc.c+=-fno-jump-tables
.endif
LDFLAGS+= -shared -Wl,-Bsymbolic -Wl,-z,defs
-LIBADD=c_pic
+LIBADD=c_nossp_pic
.if ${MK_TOOLCHAIN} == "no"
LDFLAGS+= -L${LIBCDIR}
.endif
Modified: head/libexec/rtld-elf/rtld.c
==
--- head/libexec/rtld-elf/rtld.cWed May 9 10:28:24 2018
(r97)
+++ head/libexec/rtld-elf/rtld.cWed May 9 10:30:56 2018
(r98)
@@ -238,8 +238,6 @@ void _rtld_error(const char *, ...) __exported;
int npagesizes, osreldate;
size_t *pagesizes;
-long __stack_chk_guard[8] = {0, 0, 0, 0, 0, 0, 0, 0};
-
static int stack_prot = PROT_READ | PROT_WRITE | RTLD_DEFAULT_STACK_EXEC;
static int max_stack_flags;
@@ -360,8 +358,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entr
char **argv, *argv0, **env, **envp, *kexecpath, *library_path_rpath;
caddr_t imgentry;
char buf[MAXPATHLEN];
-int argc, fd, i, mib[2], phnum, rtld_argc;
-size_t len;
+int argc, fd, i, phnum, rtld_argc;
bool dir_enable, explicit_fd, search_in_path;
/*
@@ -399,27 +396,6 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entr
main_argc = argc;
main_argv = argv;
-if (aux_info[AT_CANARY] != NULL &&
- aux_info[AT_CANARY]->a_un.a_ptr != NULL) {
- i = aux_info[AT_CANARYLEN]->a_un.a_val;
- if (i > sizeof(__stack_chk_guard))
- i = sizeof(__stack_chk_guard);
- memcpy(__stack_chk_guard, aux_info[AT_CANARY]->a_un.a_ptr, i);
-} else {
- mib[0] = CTL_KERN;
- mib[1] = KERN_ARND;
-
- len = sizeof(__stack_chk_guard);
- if (sysctl(mib, 2, __stack_chk_guard, &len, NULL, 0) == -1 ||
- len != sizeof(__stack_chk_guard)) {
- /* If sysctl was unsuccessful, use the "terminator canary". */
- ((unsigned char *)(void *)__stack_chk_guard)[0] = 0;
- ((unsigned char *)(void *)__stack_chk_guard)[1] = 0;
- ((unsigned char *)(void *)__stack_chk_guard)[2] = '\n';
- ((unsigned char *)(void *)__stack_chk_guard)[3] = 255;
- }
-}
-
trust = !issetugid();
md_abi_variant_hook(aux_info);
@@ -5535,23 +5511,6 @@ int _thread_autoinit_dummy_decl = 1;
void
__pthread_cxa_finalize(struct dl_phdr_info *a)
{
-}
-
-void
-__stack_chk_fail(void)
-{
-
- _rtld_error("stack overflow detected; terminated");
- rtld_die();
-}
-__weak_reference(__stack_chk_fail, __stack_chk_fail_local);
-
-void
-__chk_fail(void)
-{
-
- _rtld_error("buffer overflow detected; terminated");
- rtld_die();
}
const char *
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333399 - head/lib/libc
Author: kib
Date: Wed May 9 10:33:25 2018
New Revision: 99
URL: https://svnweb.freebsd.org/changeset/base/99
Log:
Now that a special no-SSP libc is used for rtld, allow
-fstack-protector-all for normal libc builds.
Submitted by: Luis Pires
Reviewed by: brooks
Differential revision:https://reviews.freebsd.org/D15340
Modified:
head/lib/libc/Makefile
Modified: head/lib/libc/Makefile
==
--- head/lib/libc/Makefile Wed May 9 10:30:56 2018(r98)
+++ head/lib/libc/Makefile Wed May 9 10:33:25 2018(r99)
@@ -199,10 +199,6 @@ GENDIRDEPS_FILTER+= N${RELDIR:H}/msun
# Disable warnings in contributed sources.
CWARNFLAGS:= ${.IMPSRC:Ngdtoa_*.c:C/^.+$/${CWARNFLAGS}/:C/^$/-w/}
-# XXX For now, we don't allow libc to be compiled with
-# -fstack-protector-all because it breaks rtld. We may want to make a librtld
-# in the future to circumvent this.
-SSP_CFLAGS:= ${SSP_CFLAGS:S/^-fstack-protector-all$/-fstack-protector/}
# Disable stack protection for SSP symbols.
SSP_CFLAGS:= ${.IMPSRC:N*/stack_protector.c:C/^.+$/${SSP_CFLAGS}/}
# Generate stack unwinding tables for cancellation points
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333400 - head/sys/net
Author: ae Date: Wed May 9 10:50:51 2018 New Revision: 333400 URL: https://svnweb.freebsd.org/changeset/base/333400 Log: Add IFCAP_LINKSTATE support to if_loop(4). Reviewed by: wollman Obtained from:Yandex LLC MFC after:3 weeks Differential Revision:https://reviews.freebsd.org/D15278 Modified: head/sys/net/if_loop.c Modified: head/sys/net/if_loop.c == --- head/sys/net/if_loop.c Wed May 9 10:33:25 2018(r99) +++ head/sys/net/if_loop.c Wed May 9 10:50:51 2018(r333400) @@ -136,7 +136,7 @@ lo_clone_create(struct if_clone *ifc, int unit, caddr_ ifp->if_output = looutput; ifp->if_snd.ifq_maxlen = ifqmaxlen; ifp->if_capabilities = ifp->if_capenable = - IFCAP_HWCSUM | IFCAP_HWCSUM_IPV6; + IFCAP_HWCSUM | IFCAP_HWCSUM_IPV6 | IFCAP_LINKSTATE; ifp->if_hwassist = LO_CSUM_FEATURES | LO_CSUM_FEATURES6; if_attach(ifp); bpfattach(ifp, DLT_NULL, sizeof(u_int32_t)); @@ -413,6 +413,8 @@ loioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; case SIOCSIFFLAGS: + if_link_state_change(ifp, (ifp->if_flags & IFF_UP) ? + LINK_STATE_UP: LINK_STATE_DOWN); break; case SIOCSIFCAP: ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333401 - in head: contrib/llvm/tools/lld/ELF lib/clang/include/lld/Common
Author: emaste
Date: Wed May 9 11:17:01 2018
New Revision: 333401
URL: https://svnweb.freebsd.org/changeset/base/333401
Log:
lld: Omit PT_NOTE for SHT_NOTE without SHF_ALLOC
A non-alloc note section should not have a PT_NOTE program header.
Found while linking ghc (Haskell compiler) with lld on FreeBSD. Haskell
emits a .debug-ghc-link-info note section (as the name suggests, it
contains link info) as a SHT_NOTE section without SHF_ALLOC set.
For this case ld.bfd does not emit a PT_NOTE segment for
.debug-ghc-link-info. lld previously emitted a PT_NOTE with p_vaddr = 0
and FreeBSD's rtld segfaulted when trying to parse a note at address 0.
LLVM PR: https://llvm.org/pr37361
LLVM review: https://reviews.llvm.org/D46623
PR: 226872
Reviewed by: dim
Sponsored by: The FreeBSD Foundation
Modified:
head/contrib/llvm/tools/lld/ELF/Writer.cpp
head/lib/clang/include/lld/Common/Version.inc
Modified: head/contrib/llvm/tools/lld/ELF/Writer.cpp
==
--- head/contrib/llvm/tools/lld/ELF/Writer.cpp Wed May 9 10:50:51 2018
(r333400)
+++ head/contrib/llvm/tools/lld/ELF/Writer.cpp Wed May 9 11:17:01 2018
(r333401)
@@ -1708,7 +1708,7 @@ template std::vector Writer<
// Create one PT_NOTE per a group of contiguous .note sections.
PhdrEntry *Note = nullptr;
for (OutputSection *Sec : OutputSections) {
-if (Sec->Type == SHT_NOTE) {
+if (Sec->Type == SHT_NOTE && (Sec->Flags & SHF_ALLOC)) {
if (!Note || Sec->LMAExpr)
Note = AddHdr(PT_NOTE, PF_R);
Note->add(Sec);
Modified: head/lib/clang/include/lld/Common/Version.inc
==
--- head/lib/clang/include/lld/Common/Version.inc Wed May 9 10:50:51
2018(r333400)
+++ head/lib/clang/include/lld/Common/Version.inc Wed May 9 11:17:01
2018(r333401)
@@ -7,4 +7,4 @@
#define LLD_REPOSITORY_STRING "FreeBSD"
// -
-#define LLD_REVISION_STRING "326565-121"
+#define LLD_REVISION_STRING "326565-122"
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Joy of Reading - Invitation 1
_ Pedagogical Project The Joy of Reading _ Dear Sir/Madam, The team responsible for the Project "Joy of Reading" consists of a group of people dedicated to raise the joy of reading stories. For some years now, the team involved in the project has worked together with schools, libraries, and foster centres, as well as other places, to encourage the love of reading among people of all ages and to promote literacy. So we decided to share stories via email on a weekly basis with everyone who is interested in receiving them. The project consists of 2 weekly stories, sent by e-mail one for a young and adult audience and another one shorter and more suitable for early ages. Each story is about values such as peace, solidarity, respect, gentleness, and responsibility, among others, while also working as a reflection on the fundamental ethical principles of the world we all live in. Below you can read 2 stories and take your time to enjoy them or you can read them in the PDF attachment where they are written in colourful fonts and with pictures. If you are interested in receiving 2 stories every week in your email, you will have to subscribe to it by replying to this email saying I would like to subscribe to the Joy of Reading Project. If you dont subscribe until next week, you will stop receiving the story. The subscription is totally free of charge and you can unsubscribe when you want to. We also assure you that your email address will remain strictly confidential. The Joy of Reading team  If you are interested in receiving the weekly story, click here. If you donât want to receive the weekly story, click here. ___ We have projects of exactly the same nature in French, German, Spanish and Portuguese. If you wish to receive two weekly stories for free in any of these languages, you can reply to this email expressing the one(s) of your preference. - French - Histoires à faire rêver - German - Mit Geschichten groß werden - Spanish - Cuentos para Crecer - Portuguese - Abrir as portas ao sonho e à reflexão _ This weeks stories with PDF attachments: - The trouble tree - This is our house _ The trouble tree The carpenter I hired to help me restore an old farmhouse had just finished a rough first day on the job. A flat tire made him lose an hour of work, his electric saw quit, and now his ancient pickup truck refused to start. While I drove him home, he sat in stony silence. On arriving, he invited me in to meet his family. As we walked toward the front door, he paused briefly at a small tree, touching the tips of the branches with both hands. When opening the door he underwent an amazing transformation. His tanned face was wreathed in smiles and he hugged his two small children and gave his wife a kiss. Afterward he walked me to the car. We passed the tree and my curiosity got the better of me. I asked him about what I had seen him do earlier. Oh, thats my trouble tree, he replied. I know I cant help having troubles on the job, but one things for sure, troubles dont belong in the house with my wife and the children. So I just hang them on the tree every night when I come home. Then in the morning I pick them up again. He paused. Funny thing is, he smiled, when I come out in the morning to pick them up, there arent nearly as many as I remember hanging up the night before. Author unknown _ This Is Our House George was in the house. This house is mine and no one else is coming in, George said. Its not your house, George, said Lindy. It belongs to everybody. No, it doesnt, said George. This house is all for me! Lindy and Marly went for a walk over to the swings. Its not Georges house, is it? said Lindy. Of course it isnt, said Marly. Lindy and Marly looked in the window. Its not your house, George, and were coming in. Oh no, youre not, said George. This house isnt for girls. Freddie was walking past with Rabbity. Ive come to put Rabbity to bed, said Freddie. You cant, said George. This house isnt for small people like you. Freddie took Rabbity for a ride in the car. Charlene and Marlene fixed the front wheel. George wont let me and Rabbity in the house, said Freddie. Charlene and Marlene, Freddie and Rabbity headed straight for the house. Stop right there, said George. Were coming in to fix the fridge, said Charlene and Marlene. Oh, no youre not, said George. This house isnt for twins. Luthers jumbo jet landed in the house. He went to get it. Where do you think youre going? said George. Flight 505 has crashed, said Luther, and Im coming in for the rescue. Fire! Fire! Wee-oo-wee-oo-wee-oo! Your
svn commit: r333403 - in head: sbin/ipfw sys/modules/ipfw_nat64 sys/netpfil/ipfw/nat64
Author: ae
Date: Wed May 9 11:59:24 2018
New Revision: 333403
URL: https://svnweb.freebsd.org/changeset/base/333403
Log:
Bring in some last changes in NAT64 implementation:
o Modify ipfw(8) to be able set any prefix6 not just Well-Known,
and also show configured prefix6;
o relocate some definitions and macros into proper place;
o convert nat64_debug and nat64_allow_private variables to be
VNET-compatible;
o add struct nat64_config that keeps generic configuration needed
to NAT64 code;
o add nat64_check_prefix6() function to check validness of specified
by user IPv6 prefix according to RFC6052;
o use nat64_check_private_ip4() and nat64_embed_ip4() functions
instead of nat64_get_ip4() and nat64_set_ip4() macros. This allows
to use any configured IPv6 prefixes that are allowed by RFC6052;
o introduce NAT64_WKPFX flag, that is set when IPv6 prefix is
Well-Known IPv6 prefix. It is used to reduce overhead to check this;
o modify nat64lsn_cfg and nat64stl_cfg structures to use nat64_config
structure. And respectivelly modify the rest of code;
o remove now unused ro argument from nat64_output() function;
o remove __FreeBSD_version ifdef, NAT64 was not merged to older versions;
o add commented -DIPFIREWALL_NAT64_DIRECT_OUTPUT flag to module's Makefile
as example.
Obtained from:Yandex LLC
MFC after:1 month
Sponsored by: Yandex LLC
Modified:
head/sbin/ipfw/ipfw2.h
head/sbin/ipfw/nat64lsn.c
head/sbin/ipfw/nat64stl.c
head/sys/modules/ipfw_nat64/Makefile
head/sys/netpfil/ipfw/nat64/ip_fw_nat64.c
head/sys/netpfil/ipfw/nat64/ip_fw_nat64.h
head/sys/netpfil/ipfw/nat64/nat64_translate.c
head/sys/netpfil/ipfw/nat64/nat64_translate.h
head/sys/netpfil/ipfw/nat64/nat64lsn.c
head/sys/netpfil/ipfw/nat64/nat64lsn.h
head/sys/netpfil/ipfw/nat64/nat64lsn_control.c
head/sys/netpfil/ipfw/nat64/nat64stl.c
head/sys/netpfil/ipfw/nat64/nat64stl.h
head/sys/netpfil/ipfw/nat64/nat64stl_control.c
Modified: head/sbin/ipfw/ipfw2.h
==
--- head/sbin/ipfw/ipfw2.h Wed May 9 11:47:05 2018(r333402)
+++ head/sbin/ipfw/ipfw2.h Wed May 9 11:59:24 2018(r333403)
@@ -384,6 +384,7 @@ void ipfw_nat64lsn_handler(int ac, char *av[]);
void ipfw_nat64stl_handler(int ac, char *av[]);
void ipfw_nptv6_handler(int ac, char *av[]);
int ipfw_check_object_name(const char *name);
+int ipfw_check_nat64prefix(const struct in6_addr *prefix, int length);
#ifdef PF
/* altq.c */
Modified: head/sbin/ipfw/nat64lsn.c
==
--- head/sbin/ipfw/nat64lsn.c Wed May 9 11:47:05 2018(r333402)
+++ head/sbin/ipfw/nat64lsn.c Wed May 9 11:59:24 2018(r333403)
@@ -428,13 +428,17 @@ nat64lsn_create(const char *name, uint8_t set, int ac,
flags |= NAT64LSN_HAS_PREFIX4;
ac--; av++;
break;
-#if 0
case TOK_PREFIX6:
NEED1("IPv6 prefix required");
nat64lsn_parse_prefix(*av, AF_INET6, &cfg->prefix6,
&cfg->plen6);
+ if (ipfw_check_nat64prefix(&cfg->prefix6,
+ cfg->plen6) != 0)
+ errx(EX_USAGE, "Bad prefix6 %s", *av);
+
ac--; av++;
break;
+#if 0
case TOK_AGG_LEN:
NEED1("Aggregation prefix len required");
cfg->agg_prefix_len = nat64lsn_parse_int(*av, opt);
@@ -767,10 +771,10 @@ nat64lsn_show_cb(ipfw_nat64lsn_cfg *cfg, const char *n
if (co.use_set != 0 || cfg->set != 0)
printf("set %u ", cfg->set);
inet_ntop(AF_INET, &cfg->prefix4, abuf, sizeof(abuf));
- printf("nat64lsn %s prefix4 %s/%u ", cfg->name, abuf, cfg->plen4);
-#if 0
+ printf("nat64lsn %s prefix4 %s/%u", cfg->name, abuf, cfg->plen4);
inet_ntop(AF_INET6, &cfg->prefix6, abuf, sizeof(abuf));
- printf("prefix6 %s/%u", abuf, cfg->plen6);
+ printf(" prefix6 %s/%u", abuf, cfg->plen6);
+#if 0
printf("agg_len %u agg_count %u ", cfg->agg_prefix_len,
cfg->agg_prefix_max);
if (cfg->min_port != NAT64LSN_PORT_MIN ||
Modified: head/sbin/ipfw/nat64stl.c
==
--- head/sbin/ipfw/nat64stl.c Wed May 9 11:47:05 2018(r333402)
+++ head/sbin/ipfw/nat64stl.c Wed May 9 11:59:24 2018(r333403)
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
#include
#include
-static int nat64stl_check_prefix(struct in6_addr *prefix, int length);
typedef int (nat64stl_cb_t)(ipfw_nat64stl_cfg *i, const char *name,
uint8_t set);
static int nat64stl_foreach(nat64stl_cb_t *f, const char *name, uint8_t set,
@@ -80,13 +79,10 @@ static struct _
svn commit: r333404 - head/sys/amd64/amd64
Author: kib
Date: Wed May 9 12:03:40 2018
New Revision: 333404
URL: https://svnweb.freebsd.org/changeset/base/333404
Log:
Remove PG_U from the recursive pte for kernel pmap' PML4 page.
This PML4 page is never used for the userspace process, so there is no
security implications. But the configuration trips SMAP check, which
should be corrected.
Reviewed by: alc, markj
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/sys/amd64/amd64/pmap.c
Modified: head/sys/amd64/amd64/pmap.c
==
--- head/sys/amd64/amd64/pmap.c Wed May 9 11:59:24 2018(r333403)
+++ head/sys/amd64/amd64/pmap.c Wed May 9 12:03:40 2018(r333404)
@@ -1060,7 +1060,7 @@ create_pagetables(vm_paddr_t *firstaddr)
/* And recursively map PML4 to itself in order to get PTmap */
p4_p = (pml4_entry_t *)KPML4phys;
p4_p[PML4PML4I] = KPML4phys;
- p4_p[PML4PML4I] |= X86_PG_RW | X86_PG_V | PG_U | pg_nx;
+ p4_p[PML4PML4I] |= X86_PG_RW | X86_PG_V | pg_nx;
/* Connect the Direct Map slot(s) up to the PML4. */
for (i = 0; i < ndmpdpphys; i++) {
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333405 - head/sys/amd64/amd64
Author: kib
Date: Wed May 9 12:09:08 2018
New Revision: 333405
URL: https://svnweb.freebsd.org/changeset/base/333405
Log:
Remove PG_U from the rest of the kernel pmap ptes.
Supposedly, they PG_U bits there were set to easier making some kernel
page accessible to userspace in-place. Since it was not used for the
whole existence of the amd64 pmap.c and current design of the shared
pages prefers double-mapping over the in-place access, remove PG_U
both from the direct map and KVA slots.
Reviewed by: alc, markj
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/sys/amd64/amd64/pmap.c
Modified: head/sys/amd64/amd64/pmap.c
==
--- head/sys/amd64/amd64/pmap.c Wed May 9 12:03:40 2018(r333404)
+++ head/sys/amd64/amd64/pmap.c Wed May 9 12:09:08 2018(r333405)
@@ -1011,8 +1011,7 @@ create_pagetables(vm_paddr_t *firstaddr)
/* And connect up the PD to the PDP (leaving room for L4 pages) */
pdp_p = (pdp_entry_t *)(KPDPphys + ptoa(KPML4I - KPML4BASE));
for (i = 0; i < nkpdpe; i++)
- pdp_p[i + KPDPI] = (KPDphys + ptoa(i)) | X86_PG_RW | X86_PG_V |
- PG_U;
+ pdp_p[i + KPDPI] = (KPDphys + ptoa(i)) | X86_PG_RW | X86_PG_V;
/*
* Now, set up the direct map region using 2MB and/or 1GB pages. If
@@ -1038,7 +1037,7 @@ create_pagetables(vm_paddr_t *firstaddr)
}
for (j = 0; i < ndmpdp; i++, j++) {
pdp_p[i] = DMPDphys + ptoa(j);
- pdp_p[i] |= X86_PG_RW | X86_PG_V | PG_U;
+ pdp_p[i] |= X86_PG_RW | X86_PG_V;
}
/*
@@ -1054,7 +1053,7 @@ create_pagetables(vm_paddr_t *firstaddr)
bootaddr_rwx(i << PDRSHIFT);
for (i = 0; i < nkdmpde; i++)
pdp_p[i] = (DMPDkernphys + ptoa(i)) | X86_PG_RW |
- X86_PG_V | PG_U;
+ X86_PG_V;
}
/* And recursively map PML4 to itself in order to get PTmap */
@@ -1065,13 +1064,13 @@ create_pagetables(vm_paddr_t *firstaddr)
/* Connect the Direct Map slot(s) up to the PML4. */
for (i = 0; i < ndmpdpphys; i++) {
p4_p[DMPML4I + i] = DMPDPphys + ptoa(i);
- p4_p[DMPML4I + i] |= X86_PG_RW | X86_PG_V | PG_U;
+ p4_p[DMPML4I + i] |= X86_PG_RW | X86_PG_V;
}
/* Connect the KVA slots up to the PML4 */
for (i = 0; i < NKPML4E; i++) {
p4_p[KPML4BASE + i] = KPDPphys + ptoa(i);
- p4_p[KPML4BASE + i] |= X86_PG_RW | X86_PG_V | PG_U;
+ p4_p[KPML4BASE + i] |= X86_PG_RW | X86_PG_V;
}
}
@@ -2628,11 +2627,11 @@ pmap_pinit_pml4(vm_page_t pml4pg)
/* Wire in kernel global address entries. */
for (i = 0; i < NKPML4E; i++) {
pm_pml4[KPML4BASE + i] = (KPDPphys + ptoa(i)) | X86_PG_RW |
- X86_PG_V | PG_U;
+ X86_PG_V;
}
for (i = 0; i < ndmpdpphys; i++) {
pm_pml4[DMPML4I + i] = (DMPDPphys + ptoa(i)) | X86_PG_RW |
- X86_PG_V | PG_U;
+ X86_PG_V;
}
/* install self-referential address mapping entry(s) */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333406 - head/sbin/ipfw
Author: ae Date: Wed May 9 12:25:23 2018 New Revision: 333406 URL: https://svnweb.freebsd.org/changeset/base/333406 Log: Update NAT64 documentation, now we support any IPv6 prefixes. MFC after:1 month Modified: head/sbin/ipfw/ipfw.8 Modified: head/sbin/ipfw/ipfw.8 == --- head/sbin/ipfw/ipfw.8 Wed May 9 12:09:08 2018(r333405) +++ head/sbin/ipfw/ipfw.8 Wed May 9 12:25:23 2018(r333406) @@ -1,7 +1,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 19, 2018 +.Dd May 9, 2018 .Dt IPFW 8 .Os .Sh NAME @@ -3048,13 +3048,6 @@ After translation NAT64 translator sends packets throu queue. Thus translator host should be configured as IPv4 and IPv6 router. .Pp -Currently both stateful and stateless NAT64 translators use Well-Known IPv6 -Prefix -.Ar 64:ff9b::/96 -to represent IPv4 addresses in the IPv6 address. -Thus DNS64 service and routing should be configured to use Well-Known IPv6 -Prefix. -.Pp The stateful NAT64 configuration command is the following: .Bd -ragged -offset indent .Bk -words @@ -3067,7 +3060,7 @@ The stateful NAT64 configuration command is the follow .Pp The following parameters can be configured: .Bl -tag -width indent -.It Cm prefix4 Ar ipv4_prefix/mask +.It Cm prefix4 Ar ipv4_prefix/plen The IPv4 prefix with mask defines the pool of IPv4 addresses used as source address after translation. Stateful NAT64 module translates IPv6 source address of client to one @@ -3075,6 +3068,12 @@ IPv4 address from this pool. Note that incoming IPv4 packets that don't have corresponding state entry in the states table will be dropped by translator. Make sure that translation rules handle packets, destined to configured prefix. +.It Cm prefix6 Ar ipv6_prefix/length +The IPv6 prefix defines IPv4-embedded IPv6 addresses used by translator +to represent IPv4 addresses. This IPv6 prefix should be configured in DNS64. +The translator implementation follows RFC6052, that restricts the length of +prefixes to one of following: 32, 40, 48, 56, 64, or 96. +The Well-Known IPv6 Prefix 64:ff9b:: must be 96 bits long. .It Cm max_ports Ar number Maximum number of ports reserved for upper level protocols to one IPv6 client. All reserved ports are divided into chunks between supported protocols. @@ -3174,6 +3173,9 @@ The stateless NAT64 configuration command is the follo .Pp The following parameters can be configured: .Bl -tag -width indent +.It Cm prefix6 Ar ipv6_prefix/length +The IPv6 prefix defines IPv4-embedded IPv6 addresses used by translator +to represent IPv4 addresses. This IPv6 prefix should be configured in DNS64. .It Cm table4 Ar table46 The lookup table .Ar table46 ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r333309 - in head/sys: net netinet netinet6
On Sun, May 06, 2018 at 08:34:13PM +, Matt Macy wrote: > Author: mmacy > Date: Sun May 6 20:34:13 2018 > New Revision: 09 > URL: https://svnweb.freebsd.org/changeset/base/09 > > Log: > r333175 introduced deferred deletion of multicast addresses in order to > permit the driver ioctl > to sleep on commands to the NIC when updating multicast filters. More > generally this permitted > driver's to use an sx as a softc lock. Unfortunately this change introduced > a race whereby a > a multicast update would still be queued for deletion when ifconfig deleted > the interface > thus calling down in to _purgemaddrs and synchronously deleting _all_ of > the multicast addresses > on the interface. > > Synchronously remove all external references to a multicast address before > enqueueing for delete. > Hi Matt, I am getting periodic panics on a FreeBSD CURRENT guest running bhyve on a 11.1 Host. An idle guest will panic after about 5 minutes. Reverting this commit stops the panics. Fatal trap 9: general protection fault while in kernel mode cpuid = 0; apic id = 00 instruction pointer = 0x20:0x80db01ac stack pointer = 0x28:0xfe00121827d0 frame pointer = 0x28:0xfe0012182800 code segment= base 0x0, limit 0xf, type 0x1b = DPL 0, pres 1, long 1, def32 0, gran 1 processor eflags= interrupt enabled, resume, IOPL = 0 current process = 12 (swi4: clock (0)) [ thread pid 12 tid 100023 ] Stopped at in6m_disconnect+0x13c: cmpq%r13,(%rcx) db> bt Tracing pid 12 tid 100023 td 0xf8000322d000 in6m_disconnect() at in6m_disconnect+0x13c/frame 0xfe0012182800 mld_fasttimo() at mld_fasttimo+0x62b/frame 0xfe00121828d0 pffasttimo() at pffasttimo+0x54/frame 0xfe0012182900 softclock_call_cc() at softclock_call_cc+0x150/frame 0xfe00121829b0 softclock() at softclock+0x7c/frame 0xfe00121829e0 intr_event_execute_handlers() at intr_event_execute_handlers+0x99/frame 0xfe0012182a20 ithread_loop() at ithread_loop+0xb7/frame 0xfe0012182a70 fork_exit() at fork_exit+0x84/frame 0xfe0012182ab0 fork_trampoline() at fork_trampoline+0xe/frame 0xfe0012182ab0 --- trap 0, rip = 0, rsp = 0, rbp = 0 --- - [tj] ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333407 - head/share/mk
Author: brd
Date: Wed May 9 13:44:54 2018
New Revision: 333407
URL: https://svnweb.freebsd.org/changeset/base/333407
Log:
Enable directory creation with FILESDIR.
This is part of packaging base work.
Reviewed by: will
Approved by: bapt (mentor), allanjude (mentor)
Differential Revision:https://reviews.freebsd.org/D15130
Modified:
head/share/mk/bsd.files.mk
head/share/mk/bsd.own.mk
Modified: head/share/mk/bsd.files.mk
==
--- head/share/mk/bsd.files.mk Wed May 9 12:25:23 2018(r333406)
+++ head/share/mk/bsd.files.mk Wed May 9 13:44:54 2018(r333407)
@@ -67,7 +67,7 @@ STAGE_AS_${file:T}= ${${group}NAME_${file:T}}
STAGE_DIR.${file:T}= ${STAGE_OBJTOP}${${group}DIR_${file:T}}
stage_as.${file:T}: ${file}
-installfiles-${group}: _${group}INS_${file:T}
+installfiles-${group}: installdirs-${group} _${group}INS_${file:T}
_${group}INS_${file:T}: ${file}
${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN_${.ALLSRC:T}} \
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
@@ -77,10 +77,24 @@ _${group}INS_${file:T}: ${file}
_${group}FILES+= ${file}
.endif
.endfor
+
+
+installdirs-${group}:
+ @echo installing dirs ${group}DIR ${${group}DIR}
+.for dir in ${${group}DIR}
+.if defined(NO_ROOT)
+ ${INSTALL} ${${group}TAG_ARGS} -d ${DESTDIR}${dir}
+.else
+ ${INSTALL} ${${group}TAG_ARGS} -d -o ${DIROWN} -g ${DIRGRP} \
+ -m ${DIRMODE} ${DESTDIR}${dir}
+.endif
+.endfor
+
+
.if !empty(_${group}FILES)
stage_files.${group}: ${_${group}FILES}
-installfiles-${group}: _${group}INS
+installfiles-${group}: installdirs-${group} _${group}INS
_${group}INS: ${_${group}FILES}
.if defined(${group}NAME)
${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \
Modified: head/share/mk/bsd.own.mk
==
--- head/share/mk/bsd.own.mkWed May 9 12:25:23 2018(r333406)
+++ head/share/mk/bsd.own.mkWed May 9 13:44:54 2018(r333407)
@@ -75,6 +75,13 @@
# CONFMODE Configuration file mode. [644]
#
#
+# DIROWN Directory owner. [root]
+#
+# DIRGRP Directory group. [wheel]
+#
+# DIRMODE Directory mode. [755]
+#
+#
# DOCDIR Base path for system documentation (e.g. PSD, USD,
# handbook, FAQ etc.). [${SHAREDIR}/doc]
#
@@ -185,6 +192,10 @@ MANDIR?= ${SHAREDIR}/man/man
MANOWN?= ${SHAREOWN}
MANGRP?= ${SHAREGRP}
MANMODE?= ${NOBINMODE}
+
+DIROWN?= root
+DIRGRP?= wheel
+DIRMODE?= 755
DOCDIR?= ${SHAREDIR}/doc
DOCOWN?= ${SHAREOWN}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333408 - head/share/examples
Author: brd
Date: Wed May 9 13:53:10 2018
New Revision: 333408
URL: https://svnweb.freebsd.org/changeset/base/333408
Log:
Convert share/examples/Makefile over to using FILES and FILESDIR.
The goal is to avoid using install directly so we can make changes the affect
how the entire system is installed, without having to touch many places.
This is part of the packaging base work.
Reviewed by: will
Approved by: bapt (mentor), allanjude (mentor)
Differential Revision:https://reviews.freebsd.org/D1513
Modified:
head/share/examples/Makefile
Modified: head/share/examples/Makefile
==
--- head/share/examples/MakefileWed May 9 13:44:54 2018
(r333407)
+++ head/share/examples/MakefileWed May 9 13:53:10 2018
(r333408)
@@ -7,12 +7,6 @@
PACKAGE=examples
FILESDIR= ${SHAREDIR}/examples
-.for _XFILE in ${XFILES}
-FILESGROUPS+= ${_XFILE}
-PACKAGE_${_XFILE}?=examples
-${_XFILE}DIR= ${SHAREDIR}/examples/${_XFILE:H}
-.endfor
-
LDIRS= BSD_daemon \
FreeBSD_version \
IPv6 \
@@ -40,236 +34,372 @@ LDIRS=BSD_daemon \
uefisign \
ypldap
-XFILES=BSD_daemon/FreeBSD.pfa \
- BSD_daemon/README \
- BSD_daemon/beastie.eps \
- BSD_daemon/beastie.fig \
- BSD_daemon/eps.patch \
- BSD_daemon/poster.sh \
- FreeBSD_version/FreeBSD_version.c \
- FreeBSD_version/Makefile \
- FreeBSD_version/README \
- IPv6/USAGE \
- bootforth/README \
- bootforth/boot.4th \
- bootforth/frames.4th \
- bootforth/loader.rc \
- bootforth/menu.4th \
- bootforth/menuconf.4th \
- bootforth/screen.4th \
- csh/dot.cshrc \
- diskless/ME \
- diskless/README.BOOTP \
- diskless/README.TEMPLATING \
- diskless/clone_root \
- drivers/README \
- drivers/make_device_driver.sh \
- drivers/make_pseudo_driver.sh \
- etc/README.examples \
- etc/bsd-style-copyright \
- etc/make.conf \
- find_interface/Makefile \
- find_interface/README \
- find_interface/find_interface.c \
- ibcs2/README \
- ibcs2/hello.uu \
- indent/indent.pro \
- ipfw/change_rules.sh \
- jails/README \
- jails/VIMAGE \
- jails/jail.xxx.conf \
- jails/jib \
- jails/jng \
- jails/rc.conf.jails \
- jails/rcjail.xxx.conf \
- kld/Makefile \
- kld/cdev/Makefile \
- kld/cdev/README \
- kld/cdev/module/Makefile \
- kld/cdev/module/cdev.c \
- kld/cdev/module/cdev.h \
- kld/cdev/module/cdevmod.c \
- kld/cdev/test/Makefile \
- kld/cdev/test/testcdev.c \
- kld/dyn_sysctl/Makefile \
- kld/dyn_sysctl/README \
- kld/dyn_sysctl/dyn_sysctl.c \
- kld/firmware/Makefile \
- kld/firmware/README \
- kld/firmware/fwconsumer/Makefile \
- kld/firmware/fwconsumer/fw_consumer.c \
- kld/firmware/fwimage/Makefile \
- kld/firmware/fwimage/firmware.img.uu \
- kld/khelp/Makefile \
- kld/khelp/README \
- kld/khelp/h_example.c \
- kld/syscall/Makefile \
- kld/syscall/module/Makefile \
- kld/syscall/module/syscall.c \
- kld/syscall/test/Makefile \
- kld/syscall/test/call.c \
- libvgl/Makefile \
- libvgl/demo.c \
- mdoc/POSIX-copyright \
- mdoc/deshallify.sh \
- mdoc/example.1 \
- mdoc/example.3 \
- mdoc/example.4 \
- mdoc/example.9 \
- netgraph/ether.bridge \
- netgraph/frame_relay \
- netgraph/ngctl \
- netgraph/raw \
- netgraph/udp.tunnel \
- netgraph/virtual.chain \
- netgraph/virtual.lan \
- perfmon/Makefile \
- perfmon/README \
- perfmon/perfmon.c \
- ppi/Makefile \
- ppi/ppilcd.c \
- ppp/chap-auth \
- ppp/login-auth \
- ppp/ppp.conf.sample \
- ppp/ppp.conf.span-isp \
- ppp/ppp.conf.span-isp.working \
- ppp/ppp.linkdown.sample \
- ppp/ppp.linkdown.span-isp \
- ppp/ppp.linkdown.span-isp.working \
- ppp/ppp.linkup.sample \
- ppp/ppp.linkup.span-isp \
- ppp/ppp.linkup.span-isp.working \
- ppp/ppp.secret.sample \
- ppp/ppp.secret.span-isp \
- ppp/ppp.secret.span-isp.working \
- printing/diablo-if-net \
- printing/hpdf \
- printing/hpif \
- printing/hpof \
- printing/hprf \
- printing/hpvf \
- printing/if-simple \
- printing/if-simpleX \
- printing/ifhp \
- printing/make-ps-header \
- printing/netprint \
- printing/psdf \
- printing/psdfX \
- printing/psif \
- printing/pstf \
- printing/pstfX \
- ses/Makefile \
- ses/Makefile.inc \
- ses/getencstat/Makefile \
- ses/getencstat/getencstat.0 \
- ses/sesd/Makefile \
- ses/sesd/sesd.0
Re: svn commit: r333407 - head/share/mk
On Wed, May 9, 2018, at 7:44 AM, Brad Davis wrote: > Author: brd > Date: Wed May 9 13:44:54 2018 > New Revision: 333407 > URL: https://svnweb.freebsd.org/changeset/base/333407 > > Log: > Enable directory creation with FILESDIR. I forgot to note that this work was largely done by will@ and I just made some small tweaks. Regards, Brad Davis ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333409 - in head/sys: netinet sys
Author: imp
Date: Wed May 9 14:11:35 2018
New Revision: 333409
URL: https://svnweb.freebsd.org/changeset/base/333409
Log:
Minor style nits
Use full copyright year.
Remove 'All Rights Reserved' from new file (rights holder OK'd)
Minor #ifdef motion and #endif tagging
Remove __FBSDID macro from comments
Sponsored by: Netflix
OK'd by: rrs@
Modified:
head/sys/netinet/tcp_hpts.c
head/sys/netinet/tcp_hpts.h
head/sys/sys/kern_prefetch.h
Modified: head/sys/netinet/tcp_hpts.c
==
--- head/sys/netinet/tcp_hpts.c Wed May 9 13:53:10 2018(r333408)
+++ head/sys/netinet/tcp_hpts.c Wed May 9 14:11:35 2018(r333409)
@@ -1,6 +1,5 @@
/*-
- * Copyright (c) 2016-8
- * Netflix Inc. All rights reserved.
+ * Copyright (c) 2016-2018 Netflix Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: head/sys/netinet/tcp_hpts.h
==
--- head/sys/netinet/tcp_hpts.h Wed May 9 13:53:10 2018(r333408)
+++ head/sys/netinet/tcp_hpts.h Wed May 9 14:11:35 2018(r333409)
@@ -1,8 +1,5 @@
-#ifndef __tcp_hpts_h__
-#define __tcp_hpts_h__
/*-
- * Copyright (c) 2016-8
- * Netflix Inc. All rights reserved.
+ * Copyright (c) 2016-18 Netflix Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -25,9 +22,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * __FBSDID("$FreeBSD$")
+ * $FreeBSD$
*/
+#ifndef __tcp_hpts_h__
+#define __tcp_hpts_h__
+
/*
* The hpts uses a 102400 wheel. The wheel
* defines the time in 10 usec increments (102400 x 10).
@@ -300,5 +300,5 @@ tcp_get_usecs(struct timeval *tv)
return (tcp_tv_to_usectick(tv));
}
-#endif
-#endif
+#endif /* _KERNEL */
+#endif /* __tcp_hpts_h__ */
Modified: head/sys/sys/kern_prefetch.h
==
--- head/sys/sys/kern_prefetch.hWed May 9 13:53:10 2018
(r333408)
+++ head/sys/sys/kern_prefetch.hWed May 9 14:11:35 2018
(r333409)
@@ -1,7 +1,5 @@
-#ifndef __kern_prefetch_h__
/*-
- * Copyright (c) 2016-8
- * Netflix Inc. All rights reserved.
+ * Copyright (c) 2016-2018 Netflix Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -24,8 +22,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * __FBSDID("$FreeBSD$")
+ * $FreeBSD$
*/
+#ifndef __kern_prefetch_h__
#define __kern_prefetch_h__
#ifdef _KERNEL
@@ -39,5 +38,5 @@ kern_prefetch(const volatile void *addr, void* before)
#endif
}
-#endif
-#endif
+#endif /* _KERNEL */
+#endif /* __kern_prefetch_h__ */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333411 - in head/sys: amd64/amd64 kern
Author: kib
Date: Wed May 9 14:39:24 2018
New Revision: 333411
URL: https://svnweb.freebsd.org/changeset/base/333411
Log:
Avoid calls to bzero() before ireloc.
Evaluate cpu_stdext_feature early to have moved link_elf_ireloc() see
correct flags, most important is SMAP.
Tested by:mjg
Sponsored by: The FreeBSD Foundation
Differential revision:https://reviews.freebsd.org/D15367
Modified:
head/sys/amd64/amd64/machdep.c
head/sys/kern/link_elf.c
Modified: head/sys/amd64/amd64/machdep.c
==
--- head/sys/amd64/amd64/machdep.c Wed May 9 14:38:07 2018
(r333410)
+++ head/sys/amd64/amd64/machdep.c Wed May 9 14:39:24 2018
(r333411)
@@ -1556,19 +1556,24 @@ hammer_time(u_int64_t modulep, u_int64_t physfree)
TSRAW(&thread0, TS_ENTER, __func__, NULL);
- /*
-* This may be done better later if it gets more high level
-* components in it. If so just link td->td_proc here.
-*/
- proc_linkup0(&proc0, &thread0);
-
kmdp = init_ops.parse_preload_data(modulep);
identify_cpu1();
identify_hypervisor();
+ /*
+* hw.cpu_stdext_disable is ignored by the call, it will be
+* re-evaluted by the below call to finishidentcpu().
+*/
+ identify_cpu2();
- /* link_elf_ireloc(kmdp); */
+ link_elf_ireloc(kmdp);
+ /*
+* This may be done better later if it gets more high level
+* components in it. If so just link td->td_proc here.
+*/
+ proc_linkup0(&proc0, &thread0);
+
/* Init basic tunables, hz etc */
init_param1();
@@ -1753,7 +1758,6 @@ hammer_time(u_int64_t modulep, u_int64_t physfree)
cninit();
amd64_kdb_init();
}
- link_elf_ireloc(kmdp);
getmemsize(kmdp, physfree);
init_param2(physmem);
Modified: head/sys/kern/link_elf.c
==
--- head/sys/kern/link_elf.cWed May 9 14:38:07 2018(r333410)
+++ head/sys/kern/link_elf.cWed May 9 14:39:24 2018(r333411)
@@ -1692,9 +1692,15 @@ link_elf_ireloc(caddr_t kmdp)
{
struct elf_file eff;
elf_file_t ef;
+ volatile char *c;
+ size_t i;
ef = &eff;
- bzero(ef, sizeof(*ef));
+
+ /* Do not use bzero/memset before ireloc is done. */
+ for (c = (char *)ef, i = 0; i < sizeof(*ef); i++)
+ c[i] = 0;
+
ef->modptr = kmdp;
ef->dynamic = (Elf_Dyn *)&_DYNAMIC;
parse_dynamic(ef);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333413 - head/sys/amd64/amd64
Author: mjg Date: Wed May 9 15:16:25 2018 New Revision: 333413 URL: https://svnweb.freebsd.org/changeset/base/333413 Log: amd64: depessimize bcmp for small buffers Adapt assembly generated by clang for memcmp and use it for <= 64 sized compares (which are the vast majority). Sample result of doing stats on Broadwell (% of samples): before: 4.0 kernel bcmp cache_lookup after : 0.7 kernel bcmp cache_lookup The routine is most definitely still not optimal. Anyone interested in spending time improving it is welcome to take over. Reviewed by: kib Modified: head/sys/amd64/amd64/support.S Modified: head/sys/amd64/amd64/support.S == --- head/sys/amd64/amd64/support.S Wed May 9 14:50:32 2018 (r333412) +++ head/sys/amd64/amd64/support.S Wed May 9 15:16:25 2018 (r333413) @@ -98,17 +98,40 @@ END(sse2_pagezero) ENTRY(bcmp) PUSH_FRAME_POINTER + test%rdx,%rdx + je 1f + cmpq$64,%rdx + jg 4f + + xor %ecx,%ecx +2: + movzbl (%rdi,%rcx,1),%eax + movzbl (%rsi,%rcx,1),%r8d + cmp %r8b,%al + jne 3f + add $0x1,%rcx + cmp %rcx,%rdx + jne 2b +1: + xor %eax,%eax + POP_FRAME_POINTER + retq +3: + mov $1,%eax + POP_FRAME_POINTER + retq +4: movq%rdx,%rcx shrq$3,%rcx repe cmpsq - jne 1f + jne 5f movq%rdx,%rcx andq$7,%rcx repe cmpsb -1: +5: setne %al movsbl %al,%eax POP_FRAME_POINTER ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333414 - head/share/mk
Author: jhb
Date: Wed May 9 15:20:39 2018
New Revision: 333414
URL: https://svnweb.freebsd.org/changeset/base/333414
Log:
Recognize the base/gcc compiler as GCC.
The existing patterns for 'cc --version' output do not work for GCC
built from the base/gcc port.
Reviewed by: imp
Differential Revision:https://reviews.freebsd.org/D15357
Modified:
head/share/mk/bsd.compiler.mk
Modified: head/share/mk/bsd.compiler.mk
==
--- head/share/mk/bsd.compiler.mk Wed May 9 15:16:25 2018
(r333413)
+++ head/share/mk/bsd.compiler.mk Wed May 9 15:20:39 2018
(r333414)
@@ -157,7 +157,7 @@ ${X_}COMPILER_TYPE:=gcc
${X_}COMPILER_TYPE:= clang
. elif ${_v:Mgcc}
${X_}COMPILER_TYPE:= gcc
-. elif ${_v:M\(GCC\)}
+. elif ${_v:M\(GCC\)} || ${_v:M*GNU}
${X_}COMPILER_TYPE:= gcc
. elif ${_v:Mclang} || ${_v:M(clang-*.*.*)}
${X_}COMPILER_TYPE:= clang
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333416 - head/sys/sparc64/sparc64
Author: jhb
Date: Wed May 9 15:25:26 2018
New Revision: 333416
URL: https://svnweb.freebsd.org/changeset/base/333416
Log:
Report TRAP_BRKPT for breakpoint traps on sparc64.
Reviewed by: marius
MFC after:2 weeks
Differential Revision:https://reviews.freebsd.org/D15190
Modified:
head/sys/sparc64/sparc64/trap.c
Modified: head/sys/sparc64/sparc64/trap.c
==
--- head/sys/sparc64/sparc64/trap.c Wed May 9 15:22:40 2018
(r333415)
+++ head/sys/sparc64/sparc64/trap.c Wed May 9 15:25:26 2018
(r333416)
@@ -257,7 +257,7 @@ trap(struct trapframe *tf)
struct thread *td;
struct proc *p;
int error;
- int sig;
+ int sig, ucode;
register_t addr;
ksiginfo_t ksi;
@@ -277,6 +277,7 @@ trap(struct trapframe *tf)
td->td_pticks = 0;
td->td_frame = tf;
addr = tf->tf_tpc;
+ ucode = (int)tf->tf_type; /* XXX not POSIX */
if (td->td_cowgen != p->p_cowgen)
thread_cow_update(td);
@@ -300,6 +301,10 @@ trap(struct trapframe *tf)
case T_CORRECTED_ECC_ERROR:
sig = trap_cecc();
break;
+ case T_BREAKPOINT:
+ sig = SIGTRAP;
+ ucode = TRAP_BRKPT;
+ break;
default:
if (tf->tf_type > T_MAX)
panic("trap: bad trap type %#lx (user)",
@@ -322,7 +327,7 @@ trap(struct trapframe *tf)
kdb_enter(KDB_WHY_TRAPSIG, "trapsig");
ksiginfo_init_trap(&ksi);
ksi.ksi_signo = sig;
- ksi.ksi_code = (int)tf->tf_type; /* XXX not POSIX */
+ ksi.ksi_code = ucode;
ksi.ksi_addr = (void *)addr;
ksi.ksi_trapno = (int)tf->tf_type;
trapsignal(td, &ksi);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r333393 - head/sys/contrib/ipfilter/netinet
On Wednesday, May 09, 2018 02:07:09 AM Cy Schubert wrote: > Author: cy > Date: Wed May 9 02:07:09 2018 > New Revision: 93 > URL: https://svnweb.freebsd.org/changeset/base/93 > > Log: > Document intentional fallthrough. (CID 976535) > > MFC after: 1 week > > Modified: > head/sys/contrib/ipfilter/netinet/fil.c > > Modified: head/sys/contrib/ipfilter/netinet/fil.c > == > --- head/sys/contrib/ipfilter/netinet/fil.c Wed May 9 02:02:58 2018 > (r92) > +++ head/sys/contrib/ipfilter/netinet/fil.c Wed May 9 02:07:09 2018 > (r93) > @@ -1299,6 +1299,7 @@ ipf_pr_icmp(fin) > } > } > #endif > + /* fallthrough is intentional */ > case ICMP_SOURCEQUENCH : > case ICMP_REDIRECT : > case ICMP_TIMXCEED : Hmm, normal FreeBSD style here is to use /* FALLTHROUGH */, and there are three other instances of that style in ipfilter already (and none others using this comment style). -- John Baldwin ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r333393 - head/sys/contrib/ipfilter/netinet
On Wed, May 9, 2018 at 8:58 AM, John Baldwin wrote: > On Wednesday, May 09, 2018 02:07:09 AM Cy Schubert wrote: > > Author: cy > > Date: Wed May 9 02:07:09 2018 > > New Revision: 93 > > URL: https://svnweb.freebsd.org/changeset/base/93 > > > > Log: > > Document intentional fallthrough. (CID 976535) > > > > MFC after: 1 week > > > > Modified: > > head/sys/contrib/ipfilter/netinet/fil.c > > > > Modified: head/sys/contrib/ipfilter/netinet/fil.c > > > == > > --- head/sys/contrib/ipfilter/netinet/fil.c Wed May 9 02:02:58 2018 > (r92) > > +++ head/sys/contrib/ipfilter/netinet/fil.c Wed May 9 02:07:09 2018 > (r93) > > @@ -1299,6 +1299,7 @@ ipf_pr_icmp(fin) > > } > > } > > #endif > > + /* fallthrough is intentional */ > > case ICMP_SOURCEQUENCH : > > case ICMP_REDIRECT : > > case ICMP_TIMXCEED : > > Hmm, normal FreeBSD style here is to use /* FALLTHROUGH */, and there are > three other instances of that style in ipfilter already (and none others > using this comment style). > /* FALLTHROUGH */ is actually an old-school lint directive that other tools have picked up. Warner ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333418 - in head: share/man/man4 share/man/man9 stand/lua sys/arm/allwinner sys/arm/allwinner/clkng sys/dev/extres/syscon usr.bin/grep/tests
Author: kevans Date: Wed May 9 16:44:19 2018 New Revision: 333418 URL: https://svnweb.freebsd.org/changeset/base/333418 Log: Remove "All Rights Reserved" on files that I hold sole copyright on See r91 for more detail; in summary: it holds no weight and may be removed. Modified: head/share/man/man4/aw_sid.4 head/share/man/man4/aw_syscon.4 head/share/man/man9/style.lua.9 head/stand/lua/cli.lua head/stand/lua/core.lua.8 head/stand/lua/hook.lua head/stand/lua/logo-beastie.lua head/stand/lua/logo-beastiebw.lua head/stand/lua/logo-fbsdbw.lua head/stand/lua/logo-orb.lua head/stand/lua/logo-orbbw.lua head/stand/lua/menu.lua.8 head/sys/arm/allwinner/aw_syscon.c head/sys/arm/allwinner/clkng/ccu_a83t.c head/sys/arm/allwinner/clkng/ccu_a83t.h head/sys/dev/extres/syscon/syscon.c head/sys/dev/extres/syscon/syscon.h head/sys/dev/extres/syscon/syscon_generic.h head/usr.bin/grep/tests/grep_freebsd_test.sh Modified: head/share/man/man4/aw_sid.4 == --- head/share/man/man4/aw_sid.4Wed May 9 16:14:12 2018 (r333417) +++ head/share/man/man4/aw_sid.4Wed May 9 16:44:19 2018 (r333418) @@ -1,6 +1,5 @@ .\"- .\" Copyright (c) 2018 Kyle Evans -.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions Modified: head/share/man/man4/aw_syscon.4 == --- head/share/man/man4/aw_syscon.4 Wed May 9 16:14:12 2018 (r333417) +++ head/share/man/man4/aw_syscon.4 Wed May 9 16:44:19 2018 (r333418) @@ -1,6 +1,5 @@ .\"- .\" Copyright (c) 2018 Kyle Evans -.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions Modified: head/share/man/man9/style.lua.9 == --- head/share/man/man9/style.lua.9 Wed May 9 16:14:12 2018 (r333417) +++ head/share/man/man9/style.lua.9 Wed May 9 16:44:19 2018 (r333418) @@ -1,6 +1,5 @@ .\"- .\" Copyright (c) 2018 Kyle Evans -.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions Modified: head/stand/lua/cli.lua == --- head/stand/lua/cli.lua Wed May 9 16:14:12 2018(r333417) +++ head/stand/lua/cli.lua Wed May 9 16:44:19 2018(r333418) @@ -2,7 +2,6 @@ -- SPDX-License-Identifier: BSD-2-Clause-FreeBSD -- -- Copyright (c) 2018 Kyle Evans --- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without -- modification, are permitted provided that the following conditions Modified: head/stand/lua/core.lua.8 == --- head/stand/lua/core.lua.8 Wed May 9 16:14:12 2018(r333417) +++ head/stand/lua/core.lua.8 Wed May 9 16:44:19 2018(r333418) @@ -2,7 +2,6 @@ .\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD .\" .\" Copyright (c) 2018 Kyle Evans -.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions Modified: head/stand/lua/hook.lua == --- head/stand/lua/hook.lua Wed May 9 16:14:12 2018(r333417) +++ head/stand/lua/hook.lua Wed May 9 16:44:19 2018(r333418) @@ -2,7 +2,6 @@ -- SPDX-License-Identifier: BSD-2-Clause-FreeBSD -- -- Copyright (c) 2018 Kyle Evans --- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without -- modification, are permitted provided that the following conditions Modified: head/stand/lua/logo-beastie.lua == --- head/stand/lua/logo-beastie.lua Wed May 9 16:14:12 2018 (r333417) +++ head/stand/lua/logo-beastie.lua Wed May 9 16:44:19 2018 (r333418) @@ -2,7 +2,6 @@ -- SPDX-License-Identifier: BSD-2-Clause-FreeBSD -- -- Copyright (c) 2018 Kyle Evans --- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without -- modification, are permitted provided that the following conditions Modified: head/stand/lua/logo-beastiebw.lua == --- head/stand/lua/logo-beastiebw.lua Wed May 9 16:14:12 2018 (r333417) +++ head/stand/lua/logo-beastiebw.lua Wed May 9 16:44:19 2018 (r333418) @@ -2,7
svn commit: r333419 - in head: share/man/man4 share/man/man9 sys/arm/allwinner/clkng usr.bin/grep/tests usr.bin/hexdump/tests
Author: kevans Date: Wed May 9 16:52:28 2018 New Revision: 333419 URL: https://svnweb.freebsd.org/changeset/base/333419 Log: Standardize SPDX tag on files I've added Modified: head/share/man/man4/aw_sid.4 head/share/man/man4/aw_syscon.4 head/share/man/man9/style.lua.9 head/sys/arm/allwinner/clkng/ccu_a83t.c head/sys/arm/allwinner/clkng/ccu_a83t.h head/usr.bin/grep/tests/grep_freebsd_test.sh head/usr.bin/hexdump/tests/hexdump_test.sh head/usr.bin/hexdump/tests/od_test.sh Modified: head/share/man/man4/aw_sid.4 == --- head/share/man/man4/aw_sid.4Wed May 9 16:44:19 2018 (r333418) +++ head/share/man/man4/aw_sid.4Wed May 9 16:52:28 2018 (r333419) @@ -1,4 +1,6 @@ .\"- +.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD +.\" .\" Copyright (c) 2018 Kyle Evans .\" .\" Redistribution and use in source and binary forms, with or without Modified: head/share/man/man4/aw_syscon.4 == --- head/share/man/man4/aw_syscon.4 Wed May 9 16:44:19 2018 (r333418) +++ head/share/man/man4/aw_syscon.4 Wed May 9 16:52:28 2018 (r333419) @@ -1,4 +1,6 @@ .\"- +.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD +.\" .\" Copyright (c) 2018 Kyle Evans .\" .\" Redistribution and use in source and binary forms, with or without Modified: head/share/man/man9/style.lua.9 == --- head/share/man/man9/style.lua.9 Wed May 9 16:44:19 2018 (r333418) +++ head/share/man/man9/style.lua.9 Wed May 9 16:52:28 2018 (r333419) @@ -1,4 +1,6 @@ .\"- +.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD +.\" .\" Copyright (c) 2018 Kyle Evans .\" .\" Redistribution and use in source and binary forms, with or without Modified: head/sys/arm/allwinner/clkng/ccu_a83t.c == --- head/sys/arm/allwinner/clkng/ccu_a83t.c Wed May 9 16:44:19 2018 (r333418) +++ head/sys/arm/allwinner/clkng/ccu_a83t.c Wed May 9 16:52:28 2018 (r333419) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2017 Kyle Evans * * Redistribution and use in source and binary forms, with or without Modified: head/sys/arm/allwinner/clkng/ccu_a83t.h == --- head/sys/arm/allwinner/clkng/ccu_a83t.h Wed May 9 16:44:19 2018 (r333418) +++ head/sys/arm/allwinner/clkng/ccu_a83t.h Wed May 9 16:52:28 2018 (r333419) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2017 Kyle Evans * * Redistribution and use in source and binary forms, with or without Modified: head/usr.bin/grep/tests/grep_freebsd_test.sh == --- head/usr.bin/grep/tests/grep_freebsd_test.shWed May 9 16:44:19 2018(r333418) +++ head/usr.bin/grep/tests/grep_freebsd_test.shWed May 9 16:52:28 2018(r333419) @@ -1,4 +1,6 @@ # +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# # Copyright (c) 2017 Kyle Evans # # Redistribution and use in source and binary forms, with or without Modified: head/usr.bin/hexdump/tests/hexdump_test.sh == --- head/usr.bin/hexdump/tests/hexdump_test.sh Wed May 9 16:44:19 2018 (r333418) +++ head/usr.bin/hexdump/tests/hexdump_test.sh Wed May 9 16:52:28 2018 (r333419) @@ -1,6 +1,7 @@ # +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# # Copyright (c) 2017 Kyle Evans -# All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions Modified: head/usr.bin/hexdump/tests/od_test.sh == --- head/usr.bin/hexdump/tests/od_test.sh Wed May 9 16:44:19 2018 (r333418) +++ head/usr.bin/hexdump/tests/od_test.sh Wed May 9 16:52:28 2018 (r333419) @@ -1,3 +1,4 @@ +# # SPDX-License-Identifier: BSD-2-Clause-FreeBSD # # Copyright 2018 (C) Yuri Pankov ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333420 - in head: lib/libc/string usr.sbin/ipfwpcap
Author: zeising (doc,ports committer) Date: Wed May 9 17:06:52 2018 New Revision: 333420 URL: https://svnweb.freebsd.org/changeset/base/333420 Log: Remove "all rights reserved" on files where I have copyright. According to r91 it is not needed any more. Reviewed by: imp, emaste Differential Revision:https://reviews.freebsd.org/D15370 Modified: head/lib/libc/string/strchrnul.c head/usr.sbin/ipfwpcap/ipfwpcap.8 Modified: head/lib/libc/string/strchrnul.c == --- head/lib/libc/string/strchrnul.cWed May 9 16:52:28 2018 (r333419) +++ head/lib/libc/string/strchrnul.cWed May 9 17:06:52 2018 (r333420) @@ -2,7 +2,6 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2013 Niclas Zeising - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: head/usr.sbin/ipfwpcap/ipfwpcap.8 == --- head/usr.sbin/ipfwpcap/ipfwpcap.8 Wed May 9 16:52:28 2018 (r333419) +++ head/usr.sbin/ipfwpcap/ipfwpcap.8 Wed May 9 17:06:52 2018 (r333420) @@ -1,5 +1,4 @@ .\" Copyright (c) 2006 Niclas Zeising -.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r333393 - head/sys/contrib/ipfilter/netinet
In message <4065288.o9qkffz...@ralph.baldwin.cx>, John Baldwin writes: >Hmm, normal FreeBSD style here is to use /* FALLTHROUGH */, and there are >three other instances of that style in ipfilter already (and none others >using this comment style). Not to mention that code analysis tools like lint, FlexeLint, Coverity etc expect /* FALLTHROUGH */ comments. -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 p...@freebsd.org | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r333309 - in head/sys: net netinet netinet6
Can you tell me anything more about your workload? On Wed, May 9, 2018 at 5:48 AM, Tom Jones wrote: > On Sun, May 06, 2018 at 08:34:13PM +, Matt Macy wrote: >> Author: mmacy >> Date: Sun May 6 20:34:13 2018 >> New Revision: 09 >> URL: https://svnweb.freebsd.org/changeset/base/09 >> >> Log: >> r333175 introduced deferred deletion of multicast addresses in order to >> permit the driver ioctl >> to sleep on commands to the NIC when updating multicast filters. More >> generally this permitted >> driver's to use an sx as a softc lock. Unfortunately this change >> introduced a race whereby a >> a multicast update would still be queued for deletion when ifconfig >> deleted the interface >> thus calling down in to _purgemaddrs and synchronously deleting _all_ of >> the multicast addresses >> on the interface. >> >> Synchronously remove all external references to a multicast address before >> enqueueing for delete. >> > > Hi Matt, > > I am getting periodic panics on a FreeBSD CURRENT guest running bhyve on > a 11.1 Host. An idle guest will panic after about 5 minutes. Reverting > this commit stops the panics. > > Fatal trap 9: general protection fault while in kernel mode > cpuid = 0; apic id = 00 > instruction pointer = 0x20:0x80db01ac > stack pointer = 0x28:0xfe00121827d0 > frame pointer = 0x28:0xfe0012182800 > code segment= base 0x0, limit 0xf, type 0x1b > = DPL 0, pres 1, long 1, def32 0, gran 1 > processor eflags= interrupt enabled, resume, IOPL = 0 > current process = 12 (swi4: clock (0)) > [ thread pid 12 tid 100023 ] > Stopped at in6m_disconnect+0x13c: cmpq%r13,(%rcx) > db> bt > Tracing pid 12 tid 100023 td 0xf8000322d000 > in6m_disconnect() at in6m_disconnect+0x13c/frame 0xfe0012182800 > mld_fasttimo() at mld_fasttimo+0x62b/frame 0xfe00121828d0 > pffasttimo() at pffasttimo+0x54/frame 0xfe0012182900 > softclock_call_cc() at softclock_call_cc+0x150/frame 0xfe00121829b0 > softclock() at softclock+0x7c/frame 0xfe00121829e0 > intr_event_execute_handlers() at intr_event_execute_handlers+0x99/frame > 0xfe0012182a20 > ithread_loop() at ithread_loop+0xb7/frame 0xfe0012182a70 > fork_exit() at fork_exit+0x84/frame 0xfe0012182ab0 > fork_trampoline() at fork_trampoline+0xe/frame 0xfe0012182ab0 > --- trap 0, rip = 0, rsp = 0, rbp = 0 --- > > - [tj] > ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333421 - head/sys/dev/e1000
Author: mmacy
Date: Wed May 9 17:48:52 2018
New Revision: 333421
URL: https://svnweb.freebsd.org/changeset/base/333421
Log:
Remove bogus panic
r45 added a panic to the default case statement on the incorrect
premise that it should "never happen" when in fact it is simply a
different adapter version.
Reported by: markj
Approved by: sbruno
Modified:
head/sys/dev/e1000/e1000_82571.c
Modified: head/sys/dev/e1000/e1000_82571.c
==
--- head/sys/dev/e1000/e1000_82571.cWed May 9 17:06:52 2018
(r333420)
+++ head/sys/dev/e1000/e1000_82571.cWed May 9 17:48:52 2018
(r333421)
@@ -1000,7 +1000,7 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
e1000_put_hw_semaphore_82574(hw);
break;
default:
- panic("unknown mac type %x\n", hw->mac.type);
+ /* we didn't get the semaphore no need to put it */
break;
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r333309 - in head/sys: net netinet netinet6
On Wed, May 09, 2018 at 10:47:17AM -0700, Matthew Macy wrote: > Can you tell me anything more about your workload? Running the VM snapshot based on r333209, with kernels built today. VM will panic sitting idle. Network has some light v6 multicast. root@freebsd:~ # cat /etc/rc.conf hostname="freebsd" ifconfig_DEFAULT="DHCP inet6 accept_rtadv" sshd_enable="YES" Single tap interface bridged with an igb interface. - [tj] ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r333309 - in head/sys: net netinet netinet6
On Wed, May 9, 2018 at 11:03 AM, Tom Jones wrote: > On Wed, May 09, 2018 at 10:47:17AM -0700, Matthew Macy wrote: >> Can you tell me anything more about your workload? > > Running the VM snapshot based on r333209, with kernels built today. VM > will panic sitting idle. Network has some light v6 multicast. > > root@freebsd:~ # cat /etc/rc.conf > hostname="freebsd" > ifconfig_DEFAULT="DHCP inet6 accept_rtadv" Thanks. Will try to reproduce and then fix ASAP. -M ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333424 - head/sbin/camcontrol
Author: imp
Date: Wed May 9 18:41:04 2018
New Revision: 333424
URL: https://svnweb.freebsd.org/changeset/base/333424
Log:
nda protocol rate reporting
Report the NVMe spec, number of lanes (and max) as well as the PCIe
generation we're negotiated at (and max) for the camcontrol rate
command.
Reviewed by: scottl (the output, not the code)
Sponsored by: Netflix
Modified:
head/sbin/camcontrol/camcontrol.c
Modified: head/sbin/camcontrol/camcontrol.c
==
--- head/sbin/camcontrol/camcontrol.c Wed May 9 18:39:31 2018
(r333423)
+++ head/sbin/camcontrol/camcontrol.c Wed May 9 18:41:04 2018
(r333424)
@@ -5167,7 +5167,22 @@ cts_print(struct cam_device *device, struct ccb_trans_
"enabled" : "disabled");
}
}
+ if (cts->protocol == PROTO_NVME) {
+ struct ccb_trans_settings_nvme *nvmex =
+ &cts->xport_specific.nvme;
+ if (nvmex->valid & CTS_NVME_VALID_SPEC) {
+ fprintf(stdout, "%sNVMe Spec: %d.%d\n", pathstr,
+ NVME_MAJOR(nvmex->spec),
+ NVME_MINOR(nvmex->spec));
+ }
+ if (nvmex->valid & CTS_NVME_VALID_LINK) {
+ fprintf(stdout, "%sPCIe lanes: %d (%d max)\n", pathstr,
+ nvmex->lanes, nvmex->max_lanes);
+ fprintf(stdout, "%sPCIe Generation: %d (%d max)\n",
pathstr,
+ nvmex->speed, nvmex->max_speed);
+ }
+ }
}
/*
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333425 - in head/sys: cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs compat/cloudabi compat/linux compat/linuxkpi/common/include/linux dev/filemon dev/hwpmc fs/...
Author: mmacy
Date: Wed May 9 18:47:24 2018
New Revision: 333425
URL: https://svnweb.freebsd.org/changeset/base/333425
Log:
Eliminate the overhead of gratuitous repeated reinitialization of cap_rights
- Add macros to allow preinitialization of cap_rights_t.
- Convert most commonly used code paths to use preinitialized cap_rights_t.
A 3.6% speedup in fstat was measured with this change.
Reported by: mjg
Reviewed by: oshogbo
Approved by: sbruno
MFC after:1 month
Modified:
head/sys/cddl/compat/opensolaris/sys/file.h
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c
head/sys/compat/cloudabi/cloudabi_file.c
head/sys/compat/linux/linux_event.c
head/sys/compat/linux/linux_file.c
head/sys/compat/linux/linux_ioctl.c
head/sys/compat/linux/linux_mmap.c
head/sys/compat/linux/linux_socket.c
head/sys/compat/linux/linux_stats.c
head/sys/compat/linuxkpi/common/include/linux/file.h
head/sys/dev/filemon/filemon.c
head/sys/dev/hwpmc/hwpmc_logging.c
head/sys/fs/fdescfs/fdesc_vnops.c
head/sys/fs/fuse/fuse_vfsops.c
head/sys/kern/kern_descrip.c
head/sys/kern/kern_event.c
head/sys/kern/kern_exec.c
head/sys/kern/kern_sendfile.c
head/sys/kern/kern_sig.c
head/sys/kern/subr_capability.c
head/sys/kern/sys_generic.c
head/sys/kern/sys_procdesc.c
head/sys/kern/uipc_mqueue.c
head/sys/kern/uipc_sem.c
head/sys/kern/uipc_syscalls.c
head/sys/kern/vfs_aio.c
head/sys/kern/vfs_syscalls.c
head/sys/netsmb/smb_dev.c
head/sys/sys/capsicum.h
Modified: head/sys/cddl/compat/opensolaris/sys/file.h
==
--- head/sys/cddl/compat/opensolaris/sys/file.h Wed May 9 18:41:04 2018
(r333424)
+++ head/sys/cddl/compat/opensolaris/sys/file.h Wed May 9 18:47:24 2018
(r333425)
@@ -52,10 +52,9 @@ static __inline void
releasef(int fd)
{
struct file *fp;
- cap_rights_t rights;
/* No CAP_ rights required, as we're only releasing. */
- if (fget(curthread, fd, cap_rights_init(&rights), &fp) == 0) {
+ if (fget(curthread, fd, &cap_no_rights, &fp) == 0) {
fdrop(fp, curthread);
fdrop(fp, curthread);
}
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Wed May
9 18:41:04 2018(r333424)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Wed May
9 18:47:24 2018(r333425)
@@ -4446,7 +4446,6 @@ zfs_ioc_recv(zfs_cmd_t *zc)
char *origin = NULL;
char *tosnap;
char tofs[ZFS_MAX_DATASET_NAME_LEN];
- cap_rights_t rights;
boolean_t first_recvd_props = B_FALSE;
if (dataset_namecheck(zc->zc_value, NULL, NULL) != 0 ||
@@ -4467,7 +4466,7 @@ zfs_ioc_recv(zfs_cmd_t *zc)
#ifdef illumos
fp = getf(fd);
#else
- fget_read(curthread, fd, cap_rights_init(&rights, CAP_PREAD), &fp);
+ fget_read(curthread, fd, &cap_pread_rights, &fp);
#endif
if (fp == NULL) {
nvlist_free(props);
@@ -4744,13 +4743,11 @@ zfs_ioc_send(zfs_cmd_t *zc)
dsl_pool_rele(dp, FTAG);
} else {
file_t *fp;
- cap_rights_t rights;
#ifdef illumos
fp = getf(zc->zc_cookie);
#else
- fget_write(curthread, zc->zc_cookie,
- cap_rights_init(&rights, CAP_WRITE), &fp);
+ fget_write(curthread, zc->zc_cookie, &cap_write_rights, &fp);
#endif
if (fp == NULL)
return (SET_ERROR(EBADF));
@@ -5387,15 +5384,13 @@ static int
zfs_ioc_diff(zfs_cmd_t *zc)
{
file_t *fp;
- cap_rights_t rights;
offset_t off;
int error;
#ifdef illumos
fp = getf(zc->zc_cookie);
#else
- fget_write(curthread, zc->zc_cookie,
- cap_rights_init(&rights, CAP_WRITE), &fp);
+ fget_write(curthread, zc->zc_cookie, &cap_write_rights, &fp);
#endif
if (fp == NULL)
return (SET_ERROR(EBADF));
@@ -5787,7 +5782,6 @@ zfs_ioc_unjail(zfs_cmd_t *zc)
static int
zfs_ioc_send_new(const char *snapname, nvlist_t *innvl, nvlist_t *outnvl)
{
- cap_rights_t rights;
file_t *fp;
int error;
offset_t off;
@@ -5815,7 +5809,7 @@ zfs_ioc_send_new(const char *snapname, nvlist_t *innvl
#ifdef illumos
file_t *fp = getf(fd);
#else
- fget_write(curthread, fd, cap_rights_init(&rights, CAP_WRITE), &fp);
+ fget_write(curthread, fd, &cap_write_rights, &fp);
#endif
if (fp == NULL)
return (SET_ERROR(EBADF));
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c
=
svn commit: r333426 - in head/sys: kern sys
Author: mmacy
Date: Wed May 9 18:51:35 2018
New Revision: 333426
URL: https://svnweb.freebsd.org/changeset/base/333426
Log:
Add taskqgroup_config_gtask_deinit to support teardown after
taskqgroup_config_gtask_init.
Approved by: sbruno
Modified:
head/sys/kern/subr_gtaskqueue.c
head/sys/sys/gtaskqueue.h
Modified: head/sys/kern/subr_gtaskqueue.c
==
--- head/sys/kern/subr_gtaskqueue.c Wed May 9 18:47:24 2018
(r333425)
+++ head/sys/kern/subr_gtaskqueue.c Wed May 9 18:51:35 2018
(r333426)
@@ -987,3 +987,9 @@ taskqgroup_config_gtask_init(void *ctx, struct groupta
GROUPTASK_INIT(gtask, 0, fn, ctx);
taskqgroup_attach(qgroup_config, gtask, gtask, -1, name);
}
+
+void
+taskqgroup_config_gtask_deinit(struct grouptask *gtask)
+{
+ taskqgroup_detach(qgroup_config, gtask);
+}
Modified: head/sys/sys/gtaskqueue.h
==
--- head/sys/sys/gtaskqueue.h Wed May 9 18:47:24 2018(r333425)
+++ head/sys/sys/gtaskqueue.h Wed May 9 18:51:35 2018(r333426)
@@ -63,6 +63,7 @@ void taskqgroup_destroy(struct taskqgroup *qgroup);
inttaskqgroup_adjust(struct taskqgroup *qgroup, int cnt, int stride);
void taskqgroup_config_gtask_init(void *ctx, struct grouptask *gtask,
gtask_fn_t *fn,
const char *name);
+void taskqgroup_config_gtask_deinit(struct grouptask *gtask);
#define TASK_ENQUEUED 0x1
#define TASK_SKIP_WAKEUP 0x2
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333427 - head/sys/contrib/ipfilter/netinet
Author: cy Date: Wed May 9 19:05:27 2018 New Revision: 333427 URL: https://svnweb.freebsd.org/changeset/base/333427 Log: Fix style error introduced in r93. Reported by: jhb, imp, phk MFC after:6 days X-MFC with: r93 Modified: head/sys/contrib/ipfilter/netinet/fil.c Modified: head/sys/contrib/ipfilter/netinet/fil.c == --- head/sys/contrib/ipfilter/netinet/fil.c Wed May 9 18:51:35 2018 (r333426) +++ head/sys/contrib/ipfilter/netinet/fil.c Wed May 9 19:05:27 2018 (r333427) @@ -1299,7 +1299,7 @@ ipf_pr_icmp(fin) } } #endif - /* fallthrough is intentional */ + /* FALLTHROUGH */ case ICMP_SOURCEQUENCH : case ICMP_REDIRECT : case ICMP_TIMXCEED : ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r333393 - head/sys/contrib/ipfilter/netinet
In message <4065288.o9qkffz...@ralph.baldwin.cx>, John Baldwin writes: > On Wednesday, May 09, 2018 02:07:09 AM Cy Schubert wrote: > > Author: cy > > Date: Wed May 9 02:07:09 2018 > > New Revision: 93 > > URL: https://svnweb.freebsd.org/changeset/base/93 > > > > Log: > > Document intentional fallthrough. (CID 976535) > > > > MFC after:1 week > > > > Modified: > > head/sys/contrib/ipfilter/netinet/fil.c > > > > Modified: head/sys/contrib/ipfilter/netinet/fil.c > > === > === > > --- head/sys/contrib/ipfilter/netinet/fil.c Wed May 9 02:02:58 2018 > (r92) > > +++ head/sys/contrib/ipfilter/netinet/fil.c Wed May 9 02:07:09 2018 > (r93) > > @@ -1299,6 +1299,7 @@ ipf_pr_icmp(fin) > > } > > } > > #endif > > + /* fallthrough is intentional */ > > case ICMP_SOURCEQUENCH : > > case ICMP_REDIRECT : > > case ICMP_TIMXCEED : > > Hmm, normal FreeBSD style here is to use /* FALLTHROUGH */, and there are > three other instances of that style in ipfilter already (and none others > using this comment style). Thanks John. It's been fixed in r93. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r333393 - head/sys/contrib/ipfilter/netinet
In message <27445.1525885...@critter.freebsd.dk>, "Poul-Henning Kamp" writes: > > In message <4065288.o9qkffz...@ralph.baldwin.cx>, John Baldwin writes: > > >Hmm, normal FreeBSD style here is to use /* FALLTHROUGH */, and there are > >three other instances of that style in ipfilter already (and none others > >using this comment style). > > Not to mention that code analysis tools like lint, FlexeLint, Coverity etc > expect /* FALLTHROUGH */ comments. Thanks everyone. Just fixed in r333427. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r333393 - head/sys/contrib/ipfilter/netinet
In message <201805091907.w49j7y0l003...@slippy.cwsent.com>, Cy Schubert writes: > In message <4065288.o9qkffz...@ralph.baldwin.cx>, John Baldwin writes: > > On Wednesday, May 09, 2018 02:07:09 AM Cy Schubert wrote: > > > Author: cy > > > Date: Wed May 9 02:07:09 2018 > > > New Revision: 93 > > > URL: https://svnweb.freebsd.org/changeset/base/93 > > > > > > Log: > > > Document intentional fallthrough. (CID 976535) > > > > > > MFC after: 1 week > > > > > > Modified: > > > head/sys/contrib/ipfilter/netinet/fil.c > > > > > > Modified: head/sys/contrib/ipfilter/netinet/fil.c > > > = > == > > === > > > --- head/sys/contrib/ipfilter/netinet/fil.c Wed May 9 02:02:58 201 > 8 > > (r92) > > > +++ head/sys/contrib/ipfilter/netinet/fil.c Wed May 9 02:07:09 201 > 8 > > (r93) > > > @@ -1299,6 +1299,7 @@ ipf_pr_icmp(fin) > > > } > > > } > > > #endif > > > + /* fallthrough is intentional */ > > > case ICMP_SOURCEQUENCH : > > > case ICMP_REDIRECT : > > > case ICMP_TIMXCEED : > > > > Hmm, normal FreeBSD style here is to use /* FALLTHROUGH */, and there are > > three other instances of that style in ipfilter already (and none others > > using this comment style). > > Thanks John. It's been fixed in r93. s/r93/r333427/ -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333429 - head/sys/dev/bxe
Author: markj Date: Wed May 9 19:54:34 2018 New Revision: 333429 URL: https://svnweb.freebsd.org/changeset/base/333429 Log: Fix bxe(4) netdump rx polling. Reviewed by: cem, rstone X-MFC with: r333287 Sponsored by: Dell EMC Isilon Modified: head/sys/dev/bxe/bxe.c Modified: head/sys/dev/bxe/bxe.c == --- head/sys/dev/bxe/bxe.c Wed May 9 19:52:33 2018(r333428) +++ head/sys/dev/bxe/bxe.c Wed May 9 19:54:34 2018(r333429) @@ -19240,7 +19240,7 @@ bxe_netdump_poll(struct ifnet *ifp, int count) return (ENOENT); for (i = 0; i < sc->num_queues; i++) - (void)bxe_rxeof(sc, &sc->fp[0]); + (void)bxe_rxeof(sc, &sc->fp[i]); (void)bxe_txeof(sc, &sc->fp[0]); return (0); } ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r333409 - in head/sys: netinet sys
On Wednesday, May 9, 2018, Warner Losh wrote:
> Author: imp
> Date: Wed May 9 14:11:35 2018
> New Revision: 333409
> URL: https://svnweb.freebsd.org/changeset/base/333409
>
> Log:
> Minor style nits
>
> Use full copyright year.
> Remove 'All Rights Reserved' from new file (rights holder OK'd)
> Minor #ifdef motion and #endif tagging
> Remove __FBSDID macro from comments
>
> Sponsored by: Netflix
> OK'd by: rrs@
>
> Modified:
> head/sys/netinet/tcp_hpts.c
> head/sys/netinet/tcp_hpts.h
> head/sys/sys/kern_prefetch.h
>
> Modified: head/sys/netinet/tcp_hpts.c
>
> ==
> --- head/sys/netinet/tcp_hpts.c Wed May 9 13:53:10 2018(r333408)
> +++ head/sys/netinet/tcp_hpts.c Wed May 9 14:11:35 2018(r333409)
> @@ -1,6 +1,5 @@
> /*-
> - * Copyright (c) 2016-8
> - * Netflix Inc. All rights reserved.
> + * Copyright (c) 2016-2018 Netflix Inc.
> *
> * Redistribution and use in source and binary forms, with or without
> * modification, are permitted provided that the following conditions
>
> Modified: head/sys/netinet/tcp_hpts.h
>
> ==
> --- head/sys/netinet/tcp_hpts.h Wed May 9 13:53:10 2018(r333408)
> +++ head/sys/netinet/tcp_hpts.h Wed May 9 14:11:35 2018(r333409)
> @@ -1,8 +1,5 @@
> -#ifndef __tcp_hpts_h__
> -#define __tcp_hpts_h__
> /*-
> - * Copyright (c) 2016-8
> - * Netflix Inc. All rights reserved.
> + * Copyright (c) 2016-18 Netflix Inc.
Hi!
Could you please use full year here, same as in the other parts of this
patch?
> *
> * Redistribution and use in source and binary forms, with or without
> * modification, are permitted provided that the following conditions
> @@ -25,9 +22,12 @@
> * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> * SUCH DAMAGE.
> *
> - * __FBSDID("$FreeBSD$")
> + * $FreeBSD$
> */
>
> +#ifndef __tcp_hpts_h__
> +#define __tcp_hpts_h__
> +
> /*
> * The hpts uses a 102400 wheel. The wheel
> * defines the time in 10 usec increments (102400 x 10).
> @@ -300,5 +300,5 @@ tcp_get_usecs(struct timeval *tv)
> return (tcp_tv_to_usectick(tv));
> }
>
> -#endif
> -#endif
> +#endif /* _KERNEL */
> +#endif /* __tcp_hpts_h__ */
>
> Modified: head/sys/sys/kern_prefetch.h
>
> ==
> --- head/sys/sys/kern_prefetch.hWed May 9 13:53:10 2018
> (r333408)
> +++ head/sys/sys/kern_prefetch.hWed May 9 14:11:35 2018
> (r333409)
> @@ -1,7 +1,5 @@
> -#ifndef __kern_prefetch_h__
> /*-
> - * Copyright (c) 2016-8
> - * Netflix Inc. All rights reserved.
> + * Copyright (c) 2016-2018 Netflix Inc.
> *
> * Redistribution and use in source and binary forms, with or without
> * modification, are permitted provided that the following conditions
> @@ -24,8 +22,9 @@
> * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> * SUCH DAMAGE.
> *
> - * __FBSDID("$FreeBSD$")
> + * $FreeBSD$
> */
> +#ifndef __kern_prefetch_h__
> #define __kern_prefetch_h__
> #ifdef _KERNEL
>
> @@ -39,5 +38,5 @@ kern_prefetch(const volatile void *addr, void* before)
> #endif
> }
>
> -#endif
> -#endif
> +#endif /* _KERNEL */
> +#endif /* __kern_prefetch_h__ */
> ___
> svn-src-head@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
>
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r333393 - head/sys/contrib/ipfilter/netinet
On Wednesday, May 09, 2018 10:02:06 AM Warner Losh wrote: > On Wed, May 9, 2018 at 8:58 AM, John Baldwin wrote: > > > On Wednesday, May 09, 2018 02:07:09 AM Cy Schubert wrote: > > > Author: cy > > > Date: Wed May 9 02:07:09 2018 > > > New Revision: 93 > > > URL: https://svnweb.freebsd.org/changeset/base/93 > > > > > > Log: > > > Document intentional fallthrough. (CID 976535) > > > > > > MFC after: 1 week > > > > > > Modified: > > > head/sys/contrib/ipfilter/netinet/fil.c > > > > > > Modified: head/sys/contrib/ipfilter/netinet/fil.c > > > > > == > > > --- head/sys/contrib/ipfilter/netinet/fil.c Wed May 9 02:02:58 2018 > > (r92) > > > +++ head/sys/contrib/ipfilter/netinet/fil.c Wed May 9 02:07:09 2018 > > (r93) > > > @@ -1299,6 +1299,7 @@ ipf_pr_icmp(fin) > > > } > > > } > > > #endif > > > + /* fallthrough is intentional */ > > > case ICMP_SOURCEQUENCH : > > > case ICMP_REDIRECT : > > > case ICMP_TIMXCEED : > > > > Hmm, normal FreeBSD style here is to use /* FALLTHROUGH */, and there are > > three other instances of that style in ipfilter already (and none others > > using this comment style). > > > > /* FALLTHROUGH */ is actually an old-school lint directive that other tools > have picked up. Yes, but it is still the dominant style in the tree even if it has come from lint. -- John Baldwin ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333430 - in head/lib/libc: sys tests/iconv
Author: vangyzen Date: Wed May 9 20:12:59 2018 New Revision: 333430 URL: https://svnweb.freebsd.org/changeset/base/333430 Log: Remove 'All rights reserved' from my files See r91 for the rationale. Approved by: emaste (for the Foundation copyright) Sponsored by: Dell EMC Modified: head/lib/libc/sys/clock_nanosleep.c head/lib/libc/tests/iconv/iconvctl_test.c Modified: head/lib/libc/sys/clock_nanosleep.c == --- head/lib/libc/sys/clock_nanosleep.c Wed May 9 19:54:34 2018 (r333429) +++ head/lib/libc/sys/clock_nanosleep.c Wed May 9 20:12:59 2018 (r333430) @@ -1,7 +1,6 @@ /* * Copyright (c) 2017 Eric van Gyzen * Copyright (c) 2014 The FreeBSD Foundation. - * All rights reserved. * * Portions of this software were developed by Konstantin Belousov * under sponsorship from the FreeBSD Foundation. Modified: head/lib/libc/tests/iconv/iconvctl_test.c == --- head/lib/libc/tests/iconv/iconvctl_test.c Wed May 9 19:54:34 2018 (r333429) +++ head/lib/libc/tests/iconv/iconvctl_test.c Wed May 9 20:12:59 2018 (r333430) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Eric van Gyzen - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333433 - head/sys/netinet
Author: imp Date: Wed May 9 20:26:37 2018 New Revision: 333433 URL: https://svnweb.freebsd.org/changeset/base/333433 Log: Use the full year, for real this time. Modified: head/sys/netinet/tcp_hpts.h Modified: head/sys/netinet/tcp_hpts.h == --- head/sys/netinet/tcp_hpts.h Wed May 9 20:22:09 2018(r333432) +++ head/sys/netinet/tcp_hpts.h Wed May 9 20:26:37 2018(r333433) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2016-18 Netflix Inc. + * Copyright (c) 2016-2018 Netflix Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r333409 - in head/sys: netinet sys
On Wed, May 9, 2018 at 2:05 PM, Oliver Pinter wrote:
>
>
> On Wednesday, May 9, 2018, Warner Losh wrote:
>
>> Author: imp
>> Date: Wed May 9 14:11:35 2018
>> New Revision: 333409
>> URL: https://svnweb.freebsd.org/changeset/base/333409
>>
>> Log:
>> Minor style nits
>>
>> Use full copyright year.
>> Remove 'All Rights Reserved' from new file (rights holder OK'd)
>> Minor #ifdef motion and #endif tagging
>> Remove __FBSDID macro from comments
>>
>> Sponsored by: Netflix
>> OK'd by: rrs@
>>
>> Modified:
>> head/sys/netinet/tcp_hpts.c
>> head/sys/netinet/tcp_hpts.h
>> head/sys/sys/kern_prefetch.h
>>
>> Modified: head/sys/netinet/tcp_hpts.c
>>
>> ==
>> --- head/sys/netinet/tcp_hpts.c Wed May 9 13:53:10 2018(r333408)
>> +++ head/sys/netinet/tcp_hpts.c Wed May 9 14:11:35 2018(r333409)
>> @@ -1,6 +1,5 @@
>> /*-
>> - * Copyright (c) 2016-8
>> - * Netflix Inc. All rights reserved.
>> + * Copyright (c) 2016-2018 Netflix Inc.
>> *
>> * Redistribution and use in source and binary forms, with or without
>> * modification, are permitted provided that the following conditions
>>
>> Modified: head/sys/netinet/tcp_hpts.h
>>
>> ==
>> --- head/sys/netinet/tcp_hpts.h Wed May 9 13:53:10 2018(r333408)
>> +++ head/sys/netinet/tcp_hpts.h Wed May 9 14:11:35 2018(r333409)
>> @@ -1,8 +1,5 @@
>> -#ifndef __tcp_hpts_h__
>> -#define __tcp_hpts_h__
>> /*-
>> - * Copyright (c) 2016-8
>> - * Netflix Inc. All rights reserved.
>> + * Copyright (c) 2016-18 Netflix Inc.
>
>
> Hi!
>
> Could you please use full year here, same as in the other parts of this
> patch?
>
Doh! I fixed that before the commit. I was sure Anyway, fixed now
in r333433.
Warner
*
>> * Redistribution and use in source and binary forms, with or without
>> * modification, are permitted provided that the following conditions
>> @@ -25,9 +22,12 @@
>> * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
>> * SUCH DAMAGE.
>> *
>> - * __FBSDID("$FreeBSD$")
>> + * $FreeBSD$
>> */
>>
>> +#ifndef __tcp_hpts_h__
>> +#define __tcp_hpts_h__
>> +
>> /*
>> * The hpts uses a 102400 wheel. The wheel
>> * defines the time in 10 usec increments (102400 x 10).
>> @@ -300,5 +300,5 @@ tcp_get_usecs(struct timeval *tv)
>> return (tcp_tv_to_usectick(tv));
>> }
>>
>> -#endif
>> -#endif
>> +#endif /* _KERNEL */
>> +#endif /* __tcp_hpts_h__ */
>>
>> Modified: head/sys/sys/kern_prefetch.h
>>
>> ==
>> --- head/sys/sys/kern_prefetch.hWed May 9 13:53:10 2018
>> (r333408)
>> +++ head/sys/sys/kern_prefetch.hWed May 9 14:11:35 2018
>> (r333409)
>> @@ -1,7 +1,5 @@
>> -#ifndef __kern_prefetch_h__
>> /*-
>> - * Copyright (c) 2016-8
>> - * Netflix Inc. All rights reserved.
>> + * Copyright (c) 2016-2018 Netflix Inc.
>> *
>> * Redistribution and use in source and binary forms, with or without
>> * modification, are permitted provided that the following conditions
>> @@ -24,8 +22,9 @@
>> * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
>> * SUCH DAMAGE.
>> *
>> - * __FBSDID("$FreeBSD$")
>> + * $FreeBSD$
>> */
>> +#ifndef __kern_prefetch_h__
>> #define __kern_prefetch_h__
>> #ifdef _KERNEL
>>
>> @@ -39,5 +38,5 @@ kern_prefetch(const volatile void *addr, void* before)
>> #endif
>> }
>>
>> -#endif
>> -#endif
>> +#endif /* _KERNEL */
>> +#endif /* __kern_prefetch_h__ */
>> ___
>> svn-src-head@freebsd.org mailing list
>> https://lists.freebsd.org/mailman/listinfo/svn-src-head
>> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
>>
>
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r333393 - head/sys/contrib/ipfilter/netinet
On Wed, May 9, 2018 at 10:52 AM, John Baldwin wrote: > On Wednesday, May 09, 2018 10:02:06 AM Warner Losh wrote: > > On Wed, May 9, 2018 at 8:58 AM, John Baldwin wrote: > > > > > On Wednesday, May 09, 2018 02:07:09 AM Cy Schubert wrote: > > > > Author: cy > > > > Date: Wed May 9 02:07:09 2018 > > > > New Revision: 93 > > > > URL: https://svnweb.freebsd.org/changeset/base/93 > > > > > > > > Log: > > > > Document intentional fallthrough. (CID 976535) > > > > > > > > MFC after: 1 week > > > > > > > > Modified: > > > > head/sys/contrib/ipfilter/netinet/fil.c > > > > > > > > Modified: head/sys/contrib/ipfilter/netinet/fil.c > > > > > > > == > > > > --- head/sys/contrib/ipfilter/netinet/fil.c Wed May 9 02:02:58 > 2018 > > > (r92) > > > > +++ head/sys/contrib/ipfilter/netinet/fil.c Wed May 9 02:07:09 > 2018 > > > (r93) > > > > @@ -1299,6 +1299,7 @@ ipf_pr_icmp(fin) > > > > } > > > > } > > > > #endif > > > > + /* fallthrough is intentional */ > > > > case ICMP_SOURCEQUENCH : > > > > case ICMP_REDIRECT : > > > > case ICMP_TIMXCEED : > > > > > > Hmm, normal FreeBSD style here is to use /* FALLTHROUGH */, and there > are > > > three other instances of that style in ipfilter already (and none > others > > > using this comment style). > > > > > > > /* FALLTHROUGH */ is actually an old-school lint directive that other > tools > > have picked up. > > Yes, but it is still the dominant style in the tree even if it has come > from > lint. > Agreed. I wasn't arguing, just saying it has a long history and everybody does it today even though lint's relevance has faded. Warner ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333434 - in head/sys: cam cam/nvme dev/nvme
Author: imp Date: Wed May 9 20:32:23 2018 New Revision: 333434 URL: https://svnweb.freebsd.org/changeset/base/333434 Log: Remove the 'All Rights Reserved' clause from some of the stuff I've done for Netflix, since I'm in the neighborhood. Modified: head/sys/cam/cam_iosched.c head/sys/cam/cam_iosched.h head/sys/cam/nvme/nvme_all.c head/sys/cam/nvme/nvme_all.h head/sys/cam/nvme/nvme_da.c head/sys/cam/nvme/nvme_xpt.c head/sys/dev/nvme/nvme_sim.c Modified: head/sys/cam/cam_iosched.c == --- head/sys/cam/cam_iosched.c Wed May 9 20:26:37 2018(r333433) +++ head/sys/cam/cam_iosched.c Wed May 9 20:32:23 2018(r333434) @@ -4,7 +4,6 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2015 Netflix, Inc. - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: head/sys/cam/cam_iosched.h == --- head/sys/cam/cam_iosched.h Wed May 9 20:26:37 2018(r333433) +++ head/sys/cam/cam_iosched.h Wed May 9 20:32:23 2018(r333434) @@ -4,7 +4,6 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2015 Netflix, Inc. - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: head/sys/cam/nvme/nvme_all.c == --- head/sys/cam/nvme/nvme_all.cWed May 9 20:26:37 2018 (r333433) +++ head/sys/cam/nvme/nvme_all.cWed May 9 20:32:23 2018 (r333434) @@ -2,7 +2,6 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2015 Netflix, Inc - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: head/sys/cam/nvme/nvme_all.h == --- head/sys/cam/nvme/nvme_all.hWed May 9 20:26:37 2018 (r333433) +++ head/sys/cam/nvme/nvme_all.hWed May 9 20:32:23 2018 (r333434) @@ -2,7 +2,6 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2015 Netflix, Inc - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: head/sys/cam/nvme/nvme_da.c == --- head/sys/cam/nvme/nvme_da.c Wed May 9 20:26:37 2018(r333433) +++ head/sys/cam/nvme/nvme_da.c Wed May 9 20:32:23 2018(r333434) @@ -2,7 +2,6 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2015 Netflix, Inc - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: head/sys/cam/nvme/nvme_xpt.c == --- head/sys/cam/nvme/nvme_xpt.cWed May 9 20:26:37 2018 (r333433) +++ head/sys/cam/nvme/nvme_xpt.cWed May 9 20:32:23 2018 (r333434) @@ -2,7 +2,6 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2015 Netflix, Inc. - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: head/sys/dev/nvme/nvme_sim.c == --- head/sys/dev/nvme/nvme_sim.cWed May 9 20:26:37 2018 (r333433) +++ head/sys/dev/nvme/nvme_sim.cWed May 9 20:32:23 2018 (r333434) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2016 Netflix, Inc - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333435 - in head/tools/tools/nanobsd: . dhcpd embedded
Author: imp Date: Wed May 9 20:41:03 2018 New Revision: 333435 URL: https://svnweb.freebsd.org/changeset/base/333435 Log: Remove 'All Rights Reserved' Remove this from some of the iXsystems stuff I did. OK'd by kmoore at iXsystems Modified: head/tools/tools/nanobsd/dhcpd/common head/tools/tools/nanobsd/dhcpd/os-base head/tools/tools/nanobsd/embedded/beaglebone.cfg head/tools/tools/nanobsd/embedded/common head/tools/tools/nanobsd/embedded/i386.cfg head/tools/tools/nanobsd/embedded/pandaboard.cfg head/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg head/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg head/tools/tools/nanobsd/embedded/qemu-amd64.cfg head/tools/tools/nanobsd/embedded/qemu-armv7.cfg head/tools/tools/nanobsd/embedded/qemu-i386.cfg head/tools/tools/nanobsd/embedded/qemu-mips.cfg head/tools/tools/nanobsd/embedded/qemu-mips64.cfg head/tools/tools/nanobsd/embedded/qemu-powerpc.cfg head/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg head/tools/tools/nanobsd/embedded/qemu-sparc64.cfg head/tools/tools/nanobsd/embedded/rpi.cfg head/tools/tools/nanobsd/embedded/rpi2.cfg head/tools/tools/nanobsd/embedded/rpi3.cfg head/tools/tools/nanobsd/embedded/sam9260ek.cfg head/tools/tools/nanobsd/embedded/sam9g20ek.cfg head/tools/tools/nanobsd/mtree-dedup.awk Modified: head/tools/tools/nanobsd/dhcpd/common == --- head/tools/tools/nanobsd/dhcpd/common Wed May 9 20:32:23 2018 (r333434) +++ head/tools/tools/nanobsd/dhcpd/common Wed May 9 20:41:03 2018 (r333435) @@ -2,7 +2,7 @@ #- # Copyright (c) 2014 M. Warner Losh. -# Copyright (c) 2010 iXsystems, Inc., All rights reserved. +# Copyright (c) 2010 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions Modified: head/tools/tools/nanobsd/dhcpd/os-base == --- head/tools/tools/nanobsd/dhcpd/os-base Wed May 9 20:32:23 2018 (r333434) +++ head/tools/tools/nanobsd/dhcpd/os-base Wed May 9 20:41:03 2018 (r333435) @@ -2,7 +2,7 @@ #- # Copyright (c) 2014 M. Warner Losh. -# Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved. +# Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions Modified: head/tools/tools/nanobsd/embedded/beaglebone.cfg == --- head/tools/tools/nanobsd/embedded/beaglebone.cfgWed May 9 20:32:23 2018(r333434) +++ head/tools/tools/nanobsd/embedded/beaglebone.cfgWed May 9 20:41:03 2018(r333435) @@ -2,7 +2,7 @@ #- # Copyright (c) 2015 M. Warner Losh. -# Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved. +# Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions Modified: head/tools/tools/nanobsd/embedded/common == --- head/tools/tools/nanobsd/embedded/commonWed May 9 20:32:23 2018 (r333434) +++ head/tools/tools/nanobsd/embedded/commonWed May 9 20:41:03 2018 (r333435) @@ -2,7 +2,7 @@ #- # Copyright (c) 2015 M. Warner Losh. -# Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved. +# Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions Modified: head/tools/tools/nanobsd/embedded/i386.cfg == --- head/tools/tools/nanobsd/embedded/i386.cfg Wed May 9 20:32:23 2018 (r333434) +++ head/tools/tools/nanobsd/embedded/i386.cfg Wed May 9 20:41:03 2018 (r333435) @@ -2,7 +2,7 @@ #- # Copyright (c) 2015 M. Warner Losh. -# Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved. +# Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions Modified: head/tools/tools/nanobsd/embedded/pandaboard.cfg == --- head/tools/tools/nanobsd/embedded/pandaboard.cfgWed May 9 20:32:23 2018(r333434) +++ head/tools/tools/nanobsd/embedded/pandaboard.cfgWed May 9 20:41:03 2018(r333435) @@ -2,7 +2,7 @@ #- # Copyright (c) 2016 M. Warner Losh. -# Copyright (c) 2010-2011 iXsystems, Inc., All rights reserved. +# Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use i
svn commit: r333436 - in head/etc: etc.aarch64 etc.amd64 etc.arm etc.i386 etc.powerpc etc.riscv etc.sparc64
Author: imp Date: Wed May 9 20:49:00 2018 New Revision: 333436 URL: https://svnweb.freebsd.org/changeset/base/333436 Log: For video consoles, only launch a getty if the device exists. Differential Revision: https://reviews.freebsd.org/D15169 Modified: head/etc/etc.aarch64/ttys head/etc/etc.amd64/ttys head/etc/etc.arm/ttys head/etc/etc.i386/ttys head/etc/etc.powerpc/ttys head/etc/etc.riscv/ttys head/etc/etc.sparc64/ttys Modified: head/etc/etc.aarch64/ttys == --- head/etc/etc.aarch64/ttys Wed May 9 20:41:03 2018(r333435) +++ head/etc/etc.aarch64/ttys Wed May 9 20:49:00 2018(r333436) @@ -29,16 +29,16 @@ # when going to single-user mode. consolenoneunknown off secure # -ttyv0 "/usr/libexec/getty Pc" xterm onifconsole secure +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" xterm off secure -ttyv2 "/usr/libexec/getty Pc" xterm off secure -ttyv3 "/usr/libexec/getty Pc" xterm off secure -ttyv4 "/usr/libexec/getty Pc" xterm off secure -ttyv5 "/usr/libexec/getty Pc" xterm off secure -ttyv6 "/usr/libexec/getty Pc" xterm off secure -ttyv7 "/usr/libexec/getty Pc" xterm off secure -#ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv5 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv6 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv7 "/usr/libexec/getty Pc" xterm onifexists secure +#ttyv8 "/usr/local/bin/xdm -nodaemon" xterm onifexists secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ttyu0 "/usr/libexec/getty 3wire" vt100 onifconsole secure Modified: head/etc/etc.amd64/ttys == --- head/etc/etc.amd64/ttys Wed May 9 20:41:03 2018(r333435) +++ head/etc/etc.amd64/ttys Wed May 9 20:49:00 2018(r333436) @@ -29,15 +29,15 @@ # when going to single-user mode. consolenoneunknown off secure # -ttyv0 "/usr/libexec/getty Pc" xterm on secure +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" xterm on secure -ttyv2 "/usr/libexec/getty Pc" xterm on secure -ttyv3 "/usr/libexec/getty Pc" xterm on secure -ttyv4 "/usr/libexec/getty Pc" xterm on secure -ttyv5 "/usr/libexec/getty Pc" xterm on secure -ttyv6 "/usr/libexec/getty Pc" xterm on secure -ttyv7 "/usr/libexec/getty Pc" xterm on secure +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv5 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv6 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv7 "/usr/libexec/getty Pc" xterm onifexists secure ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. Modified: head/etc/etc.arm/ttys == --- head/etc/etc.arm/ttys Wed May 9 20:41:03 2018(r333435) +++ head/etc/etc.arm/ttys Wed May 9 20:49:00 2018(r333436) @@ -29,15 +29,15 @@ # when going to single-user mode. consolenoneunknown off secure # -ttyv0 "/usr/libexec/getty Pc" xterm onifconsole secure +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" xterm off secure -ttyv2 "/usr/libexec/getty Pc" xterm off secure -ttyv3 "/usr/libexec/getty Pc" xterm off secure -ttyv4 "/usr/libexec/getty Pc" xterm off secure -ttyv5 "/usr/libexec/getty Pc" xterm off secure -ttyv6 "/usr/libexec/getty Pc" xterm off secure -ttyv7 "/usr/libexec/getty Pc" xterm off secure +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv5 "/usr/libexec/getty Pc" xterm onifexists s
svn commit: r333438 - head/sbin/geom/class/eli
Author: oshogbo
Date: Wed May 9 20:51:16 2018
New Revision: 333438
URL: https://svnweb.freebsd.org/changeset/base/333438
Log:
Change option dry-run from 'n' to 'C' in geli attach command.
'n' is used in other commands to define the key index.
We should be consistent with that.
'C' option is used by patch(1) to perform dryrun so lets use that.
Reviewed by: allanjude
Differential Revision:https://reviews.freebsd.org/D15308
Modified:
head/sbin/geom/class/eli/geli.8
head/sbin/geom/class/eli/geom_eli.c
Modified: head/sbin/geom/class/eli/geli.8
==
--- head/sbin/geom/class/eli/geli.8 Wed May 9 20:49:50 2018
(r333437)
+++ head/sbin/geom/class/eli/geli.8 Wed May 9 20:51:16 2018
(r333438)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 10, 2018
+.Dd May 9, 2018
.Dt GELI 8
.Os
.Sh NAME
@@ -67,7 +67,7 @@ utility:
.Cm init
.Nm
.Cm attach
-.Op Fl dnprv
+.Op Fl Cdprv
.Op Fl j Ar passfile
.Op Fl k Ar keyfile
.Ar prov
@@ -393,6 +393,9 @@ suffix.
.Pp
Additional options include:
.Bl -tag -width ".Fl j Ar passfile"
+.It Fl C
+Do a dry-run decryption.
+This is useful to verify passphrase and keyfile without decrypting the device.
.It Fl d
If specified, a decrypted provider will be detached automatically on last
close.
This can help with scarce memory so the user does not have to remember to
detach the
@@ -420,9 +423,6 @@ For more information see the description of the
option for the
.Cm init
subcommand.
-.It Fl n
-Do a dry-run decryption.
-This is useful to verify passphrase and keyfile without decrypting the device.
.It Fl p
Do not use a passphrase as a component of the User Key.
Cannot be combined with the
Modified: head/sbin/geom/class/eli/geom_eli.c
==
--- head/sbin/geom/class/eli/geom_eli.c Wed May 9 20:49:50 2018
(r333437)
+++ head/sbin/geom/class/eli/geom_eli.c Wed May 9 20:51:16 2018
(r333438)
@@ -86,7 +86,7 @@ static int eli_backup_create(struct gctl_req *req, con
*
* init [-bdgPTv] [-a aalgo] [-B backupfile] [-e ealgo] [-i iterations] [-l
keylen] [-J newpassfile] [-K newkeyfile] [-s sectorsize] [-V version] prov
* label - alias for 'init'
- * attach [-dprv] [-j passfile] [-k keyfile] prov
+ * attach [-Cdprv] [-j passfile] [-k keyfile] prov
* detach [-fl] prov ...
* stop - alias for 'detach'
* onetime [-d] [-a aalgo] [-e ealgo] [-l keylen] prov
@@ -145,15 +145,15 @@ struct g_command class_commands[] = {
},
{ "attach", G_FLAG_VERBOSE | G_FLAG_LOADKLD, eli_main,
{
+ { 'C', "dryrun", NULL, G_TYPE_BOOL },
{ 'd', "detach", NULL, G_TYPE_BOOL },
{ 'j', "passfile", G_VAL_OPTIONAL, G_TYPE_STRING | G_TYPE_MULTI
},
{ 'k', "keyfile", G_VAL_OPTIONAL, G_TYPE_STRING | G_TYPE_MULTI
},
- { 'n', "dryrun", NULL, G_TYPE_BOOL },
{ 'p', "nopassphrase", NULL, G_TYPE_BOOL },
{ 'r', "readonly", NULL, G_TYPE_BOOL },
G_OPT_SENTINEL
},
- "[-dnprv] [-j passfile] [-k keyfile] prov"
+ "[-Cdprv] [-j passfile] [-k keyfile] prov"
},
{ "detach", 0, NULL,
{
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333439 - in head: sbin/geom/class/eli stand/geli sys/geom/eli
Author: oshogbo
Date: Wed May 9 20:53:38 2018
New Revision: 333439
URL: https://svnweb.freebsd.org/changeset/base/333439
Log:
Introduce the 'n' flag for the geli attach command.
If the 'n' flag is provided the provided key number will be used to
decrypt device. This can be used combined with dryrun to verify if the key
is set correctly. This can be also used to determine which key slot we want to
change on already attached device.
Reviewed by: allanjude
Differential Revision:https://reviews.freebsd.org/D15309
Modified:
head/sbin/geom/class/eli/geli.8
head/sbin/geom/class/eli/geom_eli.c
head/stand/geli/geliboot.c
head/sys/geom/eli/g_eli.c
head/sys/geom/eli/g_eli.h
head/sys/geom/eli/g_eli_ctl.c
head/sys/geom/eli/g_eli_key.c
Modified: head/sbin/geom/class/eli/geli.8
==
--- head/sbin/geom/class/eli/geli.8 Wed May 9 20:51:16 2018
(r333438)
+++ head/sbin/geom/class/eli/geli.8 Wed May 9 20:53:38 2018
(r333439)
@@ -68,6 +68,7 @@ utility:
.Nm
.Cm attach
.Op Fl Cdprv
+.Op Fl n Ar keyno
.Op Fl j Ar passfile
.Op Fl k Ar keyfile
.Ar prov
@@ -407,6 +408,9 @@ Probably a better choice is the
option for the
.Cm detach
subcommand.
+.It Fl n Ar keyno
+Specifies the index number of the Master Key copy to use (could be 0 or 1).
+If the index number is not provided all keys will be tested.
.It Fl j Ar passfile
Specifies a file which contains the passphrase component of the User Key
(or part of it).
Modified: head/sbin/geom/class/eli/geom_eli.c
==
--- head/sbin/geom/class/eli/geom_eli.c Wed May 9 20:51:16 2018
(r333438)
+++ head/sbin/geom/class/eli/geom_eli.c Wed May 9 20:53:38 2018
(r333439)
@@ -86,7 +86,7 @@ static int eli_backup_create(struct gctl_req *req, con
*
* init [-bdgPTv] [-a aalgo] [-B backupfile] [-e ealgo] [-i iterations] [-l
keylen] [-J newpassfile] [-K newkeyfile] [-s sectorsize] [-V version] prov
* label - alias for 'init'
- * attach [-Cdprv] [-j passfile] [-k keyfile] prov
+ * attach [-Cdprv] [-n keyno] [-j passfile] [-k keyfile] prov
* detach [-fl] prov ...
* stop - alias for 'detach'
* onetime [-d] [-a aalgo] [-e ealgo] [-l keylen] prov
@@ -149,11 +149,12 @@ struct g_command class_commands[] = {
{ 'd', "detach", NULL, G_TYPE_BOOL },
{ 'j', "passfile", G_VAL_OPTIONAL, G_TYPE_STRING | G_TYPE_MULTI
},
{ 'k', "keyfile", G_VAL_OPTIONAL, G_TYPE_STRING | G_TYPE_MULTI
},
+ { 'n', "keyno", "-1", G_TYPE_NUMBER },
{ 'p', "nopassphrase", NULL, G_TYPE_BOOL },
{ 'r', "readonly", NULL, G_TYPE_BOOL },
G_OPT_SENTINEL
},
- "[-Cdprv] [-j passfile] [-k keyfile] prov"
+ "[-Cdprv] [-n keyno] [-j passfile] [-k keyfile] prov"
},
{ "detach", 0, NULL,
{
@@ -1129,7 +1130,7 @@ eli_setkey_detached(struct gctl_req *req, const char *
}
/* Decrypt Master Key. */
- error = g_eli_mkey_decrypt(md, key, mkey, &nkey);
+ error = g_eli_mkey_decrypt_any(md, key, mkey, &nkey);
bzero(key, sizeof(key));
if (error != 0) {
bzero(md, sizeof(*md));
Modified: head/stand/geli/geliboot.c
==
--- head/stand/geli/geliboot.c Wed May 9 20:51:16 2018(r333438)
+++ head/stand/geli/geliboot.c Wed May 9 20:53:38 2018(r333439)
@@ -121,14 +121,14 @@ geli_findkey(struct geli_entry *ge, struct dsk *dskp,
int i;
if (ge->keybuf_slot >= 0) {
- if (g_eli_mkey_decrypt(&ge->md, saved_keys[ge->keybuf_slot],
+ if (g_eli_mkey_decrypt_any(&ge->md, saved_keys[ge->keybuf_slot],
mkey, &keynum) == 0) {
return (0);
}
}
for (i = 0; i < nsaved_keys; i++) {
- if (g_eli_mkey_decrypt(&ge->md, saved_keys[i], mkey,
+ if (g_eli_mkey_decrypt_any(&ge->md, saved_keys[i], mkey,
&keynum) == 0) {
ge->keybuf_slot = i;
return (0);
@@ -266,7 +266,7 @@ geli_attach(struct geli_entry *ge, struct dsk *dskp, c
g_eli_crypto_hmac_final(&ctx, key, 0);
- error = g_eli_mkey_decrypt(&geli_e->md, key, mkey, &keynum);
+ error = g_eli_mkey_decrypt_any(&geli_e->md, key, mkey, &keynum);
if (error == -1) {
explicit_bzero(mkey, sizeof(mkey));
explicit_bzero(key, sizeof(key));
Modified: head/sys/geom/eli/g_eli.c
==
--- head/sys/geom/eli/g_eli.c Wed May 9 20:51:16 2018(r333438)
+++ head/sys/geom/eli/g_eli.c Wed May 9 20:53:38 2018(r333439)
@@ -1086,7 +1086,7
svn commit: r333440 - in head/sys/compat/linuxkpi/common: include/linux src
Author: markj Date: Wed May 9 20:57:18 2018 New Revision: 333440 URL: https://svnweb.freebsd.org/changeset/base/333440 Log: Remove "All rights reserved" from my files. See r91 for the rationale. MFC after:1 week Modified: head/sys/compat/linuxkpi/common/include/linux/hrtimer.h head/sys/compat/linuxkpi/common/src/linux_hrtimer.c Modified: head/sys/compat/linuxkpi/common/include/linux/hrtimer.h == --- head/sys/compat/linuxkpi/common/include/linux/hrtimer.h Wed May 9 20:53:38 2018(r333439) +++ head/sys/compat/linuxkpi/common/include/linux/hrtimer.h Wed May 9 20:57:18 2018(r333440) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2017 Mark Johnston - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: head/sys/compat/linuxkpi/common/src/linux_hrtimer.c == --- head/sys/compat/linuxkpi/common/src/linux_hrtimer.c Wed May 9 20:53:38 2018(r333439) +++ head/sys/compat/linuxkpi/common/src/linux_hrtimer.c Wed May 9 20:57:18 2018(r333440) @@ -1,6 +1,5 @@ /*- * Copyright (c) 2017 Mark Johnston - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r333438 - head/sbin/geom/class/eli
On Wednesday, May 9, 2018, Mariusz Zaborski wrote:
> Author: oshogbo
> Date: Wed May 9 20:51:16 2018
> New Revision: 333438
> URL: https://svnweb.freebsd.org/changeset/base/333438
>
> Log:
> Change option dry-run from 'n' to 'C' in geli attach command.
>
> 'n' is used in other commands to define the key index.
> We should be consistent with that.
> 'C' option is used by patch(1) to perform dryrun so lets use that.
>
> Reviewed by: allanjude
> Differential Revision:https://reviews.freebsd.org/D15308
Relnotes: yes
>
> Modified:
> head/sbin/geom/class/eli/geli.8
> head/sbin/geom/class/eli/geom_eli.c
>
> Modified: head/sbin/geom/class/eli/geli.8
>
> ==
> --- head/sbin/geom/class/eli/geli.8 Wed May 9 20:49:50 2018
> (r333437)
> +++ head/sbin/geom/class/eli/geli.8 Wed May 9 20:51:16 2018
> (r333438)
> @@ -24,7 +24,7 @@
> .\"
> .\" $FreeBSD$
> .\"
> -.Dd April 10, 2018
> +.Dd May 9, 2018
> .Dt GELI 8
> .Os
> .Sh NAME
> @@ -67,7 +67,7 @@ utility:
> .Cm init
> .Nm
> .Cm attach
> -.Op Fl dnprv
> +.Op Fl Cdprv
> .Op Fl j Ar passfile
> .Op Fl k Ar keyfile
> .Ar prov
> @@ -393,6 +393,9 @@ suffix.
> .Pp
> Additional options include:
> .Bl -tag -width ".Fl j Ar passfile"
> +.It Fl C
> +Do a dry-run decryption.
> +This is useful to verify passphrase and keyfile without decrypting the
> device.
> .It Fl d
> If specified, a decrypted provider will be detached automatically on last
> close.
> This can help with scarce memory so the user does not have to remember to
> detach the
> @@ -420,9 +423,6 @@ For more information see the description of the
> option for the
> .Cm init
> subcommand.
> -.It Fl n
> -Do a dry-run decryption.
> -This is useful to verify passphrase and keyfile without decrypting the
> device.
> .It Fl p
> Do not use a passphrase as a component of the User Key.
> Cannot be combined with the
>
> Modified: head/sbin/geom/class/eli/geom_eli.c
>
> ==
> --- head/sbin/geom/class/eli/geom_eli.c Wed May 9 20:49:50 2018
> (r333437)
> +++ head/sbin/geom/class/eli/geom_eli.c Wed May 9 20:51:16 2018
> (r333438)
> @@ -86,7 +86,7 @@ static int eli_backup_create(struct gctl_req *req, con
> *
> * init [-bdgPTv] [-a aalgo] [-B backupfile] [-e ealgo] [-i iterations]
> [-l keylen] [-J newpassfile] [-K newkeyfile] [-s sectorsize] [-V version]
> prov
> * label - alias for 'init'
> - * attach [-dprv] [-j passfile] [-k keyfile] prov
> + * attach [-Cdprv] [-j passfile] [-k keyfile] prov
> * detach [-fl] prov ...
> * stop - alias for 'detach'
> * onetime [-d] [-a aalgo] [-e ealgo] [-l keylen] prov
> @@ -145,15 +145,15 @@ struct g_command class_commands[] = {
> },
> { "attach", G_FLAG_VERBOSE | G_FLAG_LOADKLD, eli_main,
> {
> + { 'C', "dryrun", NULL, G_TYPE_BOOL },
> { 'd', "detach", NULL, G_TYPE_BOOL },
> { 'j', "passfile", G_VAL_OPTIONAL, G_TYPE_STRING |
> G_TYPE_MULTI },
> { 'k', "keyfile", G_VAL_OPTIONAL, G_TYPE_STRING |
> G_TYPE_MULTI },
> - { 'n', "dryrun", NULL, G_TYPE_BOOL },
> { 'p', "nopassphrase", NULL, G_TYPE_BOOL },
> { 'r', "readonly", NULL, G_TYPE_BOOL },
> G_OPT_SENTINEL
> },
> - "[-dnprv] [-j passfile] [-k keyfile] prov"
> + "[-Cdprv] [-j passfile] [-k keyfile] prov"
> },
> { "detach", 0, NULL,
> {
> ___
> svn-src-head@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
>
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r333438 - head/sbin/geom/class/eli
On Wed, 2018-05-09 at 20:51 +, Mariusz Zaborski wrote: > Author: oshogbo > Date: Wed May 9 20:51:16 2018 > New Revision: 333438 > URL: https://svnweb.freebsd.org/changeset/base/333438 > > Log: > Change option dry-run from 'n' to 'C' in geli attach command. > > 'n' is used in other commands to define the key index. > We should be consistent with that. > 'C' option is used by patch(1) to perform dryrun so lets use that. This seems like a dangerous change. Today I am begining to write new product image creation scripts that involve geli, and I'm going to do so under the assumption that the commands and arguments are not going to suddenly change their meaning on some future OS update. Hopefully the new meaning of -n implies an argument which is validated as being either 0 or 1, so that any existing scripts that contain -n to mean "dry run" will very likely fail the validation and not silently misbehave. At the very least, it seems like an entry in UPDATING is required. -- Ian ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r333436 - in head/etc: etc.aarch64 etc.amd64 etc.arm etc.i386 etc.powerpc etc.riscv etc.sparc64
Thanks! At this point, these files only differ from each other in white space, comments, and whether they have video console lines at all, which is made unnecessary by this commit --- with the exception of sparc64, which has a few extra off-by-default console options. Any reason not to unify them? Or is that a follow-up commit? -Nathan On 05/09/18 13:49, Warner Losh wrote: Author: imp Date: Wed May 9 20:49:00 2018 New Revision: 333436 URL: https://svnweb.freebsd.org/changeset/base/333436 Log: For video consoles, only launch a getty if the device exists. Differential Revision: https://reviews.freebsd.org/D15169 Modified: head/etc/etc.aarch64/ttys head/etc/etc.amd64/ttys head/etc/etc.arm/ttys head/etc/etc.i386/ttys head/etc/etc.powerpc/ttys head/etc/etc.riscv/ttys head/etc/etc.sparc64/ttys Modified: head/etc/etc.aarch64/ttys == --- head/etc/etc.aarch64/ttys Wed May 9 20:41:03 2018(r333435) +++ head/etc/etc.aarch64/ttys Wed May 9 20:49:00 2018(r333436) @@ -29,16 +29,16 @@ # when going to single-user mode. console noneunknown off secure # -ttyv0 "/usr/libexec/getty Pc" xterm onifconsole secure +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" xterm off secure -ttyv2 "/usr/libexec/getty Pc" xterm off secure -ttyv3 "/usr/libexec/getty Pc" xterm off secure -ttyv4 "/usr/libexec/getty Pc" xterm off secure -ttyv5 "/usr/libexec/getty Pc" xterm off secure -ttyv6 "/usr/libexec/getty Pc" xterm off secure -ttyv7 "/usr/libexec/getty Pc" xterm off secure -#ttyv8 "/usr/local/bin/xdm -nodaemon"xterm off secure +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv5 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv6 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv7 "/usr/libexec/getty Pc" xterm onifexists secure +#ttyv8 "/usr/local/bin/xdm -nodaemon"xterm onifexists secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ttyu0 "/usr/libexec/getty 3wire"vt100 onifconsole secure Modified: head/etc/etc.amd64/ttys == --- head/etc/etc.amd64/ttys Wed May 9 20:41:03 2018(r333435) +++ head/etc/etc.amd64/ttys Wed May 9 20:49:00 2018(r333436) @@ -29,15 +29,15 @@ # when going to single-user mode. console noneunknown off secure # -ttyv0 "/usr/libexec/getty Pc" xterm on secure +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" xterm on secure -ttyv2 "/usr/libexec/getty Pc" xterm on secure -ttyv3 "/usr/libexec/getty Pc" xterm on secure -ttyv4 "/usr/libexec/getty Pc" xterm on secure -ttyv5 "/usr/libexec/getty Pc" xterm on secure -ttyv6 "/usr/libexec/getty Pc" xterm on secure -ttyv7 "/usr/libexec/getty Pc" xterm on secure +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv5 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv6 "/usr/libexec/getty Pc" xterm onifexists secure +ttyv7 "/usr/libexec/getty Pc" xterm onifexists secure ttyv8 "/usr/local/bin/xdm -nodaemon"xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. Modified: head/etc/etc.arm/ttys == --- head/etc/etc.arm/ttys Wed May 9 20:41:03 2018(r333435) +++ head/etc/etc.arm/ttys Wed May 9 20:49:00 2018(r333436) @@ -29,15 +29,15 @@ # when going to single-user mode. console noneunknown off secure # -ttyv0 "/usr/libexec/getty Pc" xterm onifconsole secure +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" xterm off secure -ttyv2 "/usr/libexec/getty Pc" xte
Re: svn commit: r333436 - in head/etc: etc.aarch64 etc.amd64 etc.arm etc.i386 etc.powerpc etc.riscv etc.sparc64
I plan on unifying them as far as I can. The devil is in the details, so that will be a followup commit. Warner On Wed, May 9, 2018 at 2:54 PM, Nathan Whitehorn wrote: > Thanks! > > At this point, these files only differ from each other in white space, > comments, and whether they have video console lines at all, which is made > unnecessary by this commit --- with the exception of sparc64, which has a > few extra off-by-default console options. Any reason not to unify them? Or > is that a follow-up commit? > -Nathan > > > On 05/09/18 13:49, Warner Losh wrote: > >> Author: imp >> Date: Wed May 9 20:49:00 2018 >> New Revision: 333436 >> URL: https://svnweb.freebsd.org/changeset/base/333436 >> >> Log: >>For video consoles, only launch a getty if the device exists. >> Differential Revision: https://reviews.freebsd.org/D15169 >> >> Modified: >>head/etc/etc.aarch64/ttys >>head/etc/etc.amd64/ttys >>head/etc/etc.arm/ttys >>head/etc/etc.i386/ttys >>head/etc/etc.powerpc/ttys >>head/etc/etc.riscv/ttys >>head/etc/etc.sparc64/ttys >> >> Modified: head/etc/etc.aarch64/ttys >> >> == >> --- head/etc/etc.aarch64/ttys Wed May 9 20:41:03 2018(r333435) >> +++ head/etc/etc.aarch64/ttys Wed May 9 20:49:00 2018(r333436) >> @@ -29,16 +29,16 @@ >> # when going to single-user mode. >> console noneunknown off secure >> # >> -ttyv0 "/usr/libexec/getty Pc" xterm onifconsole secure >> +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure >> # Virtual terminals >> -ttyv1 "/usr/libexec/getty Pc" xterm off secure >> -ttyv2 "/usr/libexec/getty Pc" xterm off secure >> -ttyv3 "/usr/libexec/getty Pc" xterm off secure >> -ttyv4 "/usr/libexec/getty Pc" xterm off secure >> -ttyv5 "/usr/libexec/getty Pc" xterm off secure >> -ttyv6 "/usr/libexec/getty Pc" xterm off secure >> -ttyv7 "/usr/libexec/getty Pc" xterm off secure >> -#ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure >> +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv5 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv6 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv7 "/usr/libexec/getty Pc" xterm onifexists secure >> +#ttyv8 "/usr/local/bin/xdm -nodaemon" xterm onifexists secure >> # Serial terminals >> # The 'dialup' keyword identifies dialin lines to login, fingerd etc. >> ttyu0 "/usr/libexec/getty 3wire" vt100 onifconsole secure >> >> Modified: head/etc/etc.amd64/ttys >> >> == >> --- head/etc/etc.amd64/ttys Wed May 9 20:41:03 2018(r333435) >> +++ head/etc/etc.amd64/ttys Wed May 9 20:49:00 2018(r333436) >> @@ -29,15 +29,15 @@ >> # when going to single-user mode. >> console noneunknown off secure >> # >> -ttyv0 "/usr/libexec/getty Pc" xterm on secure >> +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure >> # Virtual terminals >> -ttyv1 "/usr/libexec/getty Pc" xterm on secure >> -ttyv2 "/usr/libexec/getty Pc" xterm on secure >> -ttyv3 "/usr/libexec/getty Pc" xterm on secure >> -ttyv4 "/usr/libexec/getty Pc" xterm on secure >> -ttyv5 "/usr/libexec/getty Pc" xterm on secure >> -ttyv6 "/usr/libexec/getty Pc" xterm on secure >> -ttyv7 "/usr/libexec/getty Pc" xterm on secure >> +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv5 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv6 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv7 "/usr/libexec/getty Pc" xterm onifexists secure >> ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure >> # Serial terminals >> # The 'dialup' keyword identifies dialin lines to login, fingerd etc. >> >> Modified: head/etc/etc.arm/ttys >> >> == >> --- head/etc/etc.arm/ttys Wed May 9 20:41:03 2018(r333435) >> +++ head/etc/etc.arm/ttys Wed May 9 20:49:00 2018(r333436) >> @@ -29,15 +29,15 @@ >> # when going to single-user mode. >> console noneunknown off secure >> # >> -ttyv0 "/usr/libexec/getty Pc"
Re: svn commit: r333438 - head/sbin/geom/class/eli
On Wed, May 09, 2018 at 03:05:43PM -0600, Ian Lepore wrote: > On Wed, 2018-05-09 at 20:51 +, Mariusz Zaborski wrote: > > Author: oshogbo > > Date: Wed May 9 20:51:16 2018 > > New Revision: 333438 > > URL: https://svnweb.freebsd.org/changeset/base/333438 > > > > Log: > > Change option dry-run from 'n' to 'C' in geli attach command. > > > > 'n' is used in other commands to define the key index. > > We should be consistent with that. > > 'C' option is used by patch(1) to perform dryrun so lets use that. > > This seems like a dangerous change. Today I am begining to write new > product image creation scripts that involve geli, and I'm going to do > so under the assumption that the commands and arguments are not going > to suddenly change their meaning on some future OS update. > > Hopefully the new meaning of -n implies an argument which is validated > as being either 0 or 1, so that any existing scripts that contain -n to > mean "dry run" will very likely fail the validation and not silently > misbehave. > > At the very least, it seems like an entry in UPDATING is required. Oliver, Ian - thank you for noticing this. I wasn't sure if we need to add UPDATING or release notes because I added 'n' option couple weeks ago and wasn't integrated to any stable/release branch. Considering that should we still update UPDATING? Thanks, -- Mariusz Zaborski oshogbo//vx | http://oshogbo.vexillium.org FreeBSD commiter| https://freebsd.org Software developer | http://wheelsystems.com If it's not broken, let's fix it till it is!!1 signature.asc Description: PGP signature
Re: svn commit: r333393 - head/sys/contrib/ipfilter/netinet
On Wednesday, May 09, 2018 02:29:05 PM Warner Losh wrote: > On Wed, May 9, 2018 at 10:52 AM, John Baldwin wrote: > > > On Wednesday, May 09, 2018 10:02:06 AM Warner Losh wrote: > > > On Wed, May 9, 2018 at 8:58 AM, John Baldwin wrote: > > > > > > > On Wednesday, May 09, 2018 02:07:09 AM Cy Schubert wrote: > > > > > Author: cy > > > > > Date: Wed May 9 02:07:09 2018 > > > > > New Revision: 93 > > > > > URL: https://svnweb.freebsd.org/changeset/base/93 > > > > > > > > > > Log: > > > > > Document intentional fallthrough. (CID 976535) > > > > > > > > > > MFC after: 1 week > > > > > > > > > > Modified: > > > > > head/sys/contrib/ipfilter/netinet/fil.c > > > > > > > > > > Modified: head/sys/contrib/ipfilter/netinet/fil.c > > > > > > > > > == > > > > > --- head/sys/contrib/ipfilter/netinet/fil.c Wed May 9 02:02:58 > > 2018 > > > > (r92) > > > > > +++ head/sys/contrib/ipfilter/netinet/fil.c Wed May 9 02:07:09 > > 2018 > > > > (r93) > > > > > @@ -1299,6 +1299,7 @@ ipf_pr_icmp(fin) > > > > > } > > > > > } > > > > > #endif > > > > > + /* fallthrough is intentional */ > > > > > case ICMP_SOURCEQUENCH : > > > > > case ICMP_REDIRECT : > > > > > case ICMP_TIMXCEED : > > > > > > > > Hmm, normal FreeBSD style here is to use /* FALLTHROUGH */, and there > > are > > > > three other instances of that style in ipfilter already (and none > > others > > > > using this comment style). > > > > > > > > > > /* FALLTHROUGH */ is actually an old-school lint directive that other > > tools > > > have picked up. > > > > Yes, but it is still the dominant style in the tree even if it has come > > from > > lint. > > > > Agreed. I wasn't arguing, just saying it has a long history and everybody > does it today even though lint's relevance has faded. I do think that clang and gcc will look for 'fallthrough' (case insensitive) for their built-in warnings. C has also added a [[fallthrough]] attribute apparently? -- John Baldwin ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r333438 - head/sbin/geom/class/eli
On Thu, 2018-05-10 at 00:13 +0200, Mariusz Zaborski wrote: > On Wed, May 09, 2018 at 03:05:43PM -0600, Ian Lepore wrote: > > > > On Wed, 2018-05-09 at 20:51 +, Mariusz Zaborski wrote: > > > > > > Author: oshogbo > > > Date: Wed May 9 20:51:16 2018 > > > New Revision: 333438 > > > URL: https://svnweb.freebsd.org/changeset/base/333438 > > > > > > Log: > > > Change option dry-run from 'n' to 'C' in geli attach command. > > > > > > 'n' is used in other commands to define the key index. > > > We should be consistent with that. > > > 'C' option is used by patch(1) to perform dryrun so lets use that. > > This seems like a dangerous change. Today I am begining to write new > > product image creation scripts that involve geli, and I'm going to do > > so under the assumption that the commands and arguments are not going > > to suddenly change their meaning on some future OS update. > > > > Hopefully the new meaning of -n implies an argument which is validated > > as being either 0 or 1, so that any existing scripts that contain -n to > > mean "dry run" will very likely fail the validation and not silently > > misbehave. > > > > At the very least, it seems like an entry in UPDATING is required. > Oliver, Ian - thank you for noticing this. > I wasn't sure if we need to add UPDATING or release notes because I added 'n' > option couple weeks ago and wasn't integrated to any stable/release branch. > Considering that should we still update UPDATING? Oh, I didn't realize the -n was that new. In that case, I think this change is probably safe and doesn't need an UPDATING entry. For release notes, maybe just a note that the attach command now lets you select the key index. -- Ian ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333442 - in head/sys/dev/cxgbe: . common
Author: np
Date: Thu May 10 00:04:14 2018
New Revision: 333442
URL: https://svnweb.freebsd.org/changeset/base/333442
Log:
cxgbe(4): Determine whether the firmware supports the FILTER2 work
request, which can be used to configure hardware NAT and swapmac.
All firmwares released after Jan 2017 support this work request.
Sponsored by: Chelsio Communications
Modified:
head/sys/dev/cxgbe/common/common.h
head/sys/dev/cxgbe/t4_main.c
Modified: head/sys/dev/cxgbe/common/common.h
==
--- head/sys/dev/cxgbe/common/common.h Wed May 9 21:50:20 2018
(r333441)
+++ head/sys/dev/cxgbe/common/common.h Thu May 10 00:04:14 2018
(r333442)
@@ -371,6 +371,7 @@ struct adapter_params {
unsigned int bypass:1; /* this is a bypass card */
unsigned int ethoffload:1;
unsigned int hash_filter:1;
+ unsigned int filter2_wr_support:1;
unsigned int ofldq_wr_cred;
unsigned int eo_wr_cred;
Modified: head/sys/dev/cxgbe/t4_main.c
==
--- head/sys/dev/cxgbe/t4_main.cWed May 9 21:50:20 2018
(r333441)
+++ head/sys/dev/cxgbe/t4_main.cThu May 10 00:04:14 2018
(r333442)
@@ -3631,6 +3631,18 @@ get_params__post_init(struct adapter *sc)
else
sc->params.mps_bg_map = 0;
+ /*
+* Determine whether the firmware supports the filter2 work request.
+* This is queried separately for the same reason as MPSBGMAP above.
+*/
+ param[0] = FW_PARAM_DEV(FILTER2_WR);
+ val[0] = 0;
+ rc = -t4_query_params(sc, sc->mbox, sc->pf, 0, 1, param, val);
+ if (rc == 0)
+ sc->params.filter2_wr_support = val[0] != 0;
+ else
+ sc->params.filter2_wr_support = 0;
+
/* get capabilites */
bzero(&caps, sizeof(caps));
caps.op_to_write = htobe32(V_FW_CMD_OP(FW_CAPS_CONFIG_CMD) |
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333443 - in head/sys: conf libkern powerpc/powerpc
Author: imp Date: Thu May 10 02:31:38 2018 New Revision: 333443 URL: https://svnweb.freebsd.org/changeset/base/333443 Log: Move MI-ish bcopy routine to libkern riscv and powerpc have nearly identical bcopy.c that's supposed to be mostly MI. Move it to the MI libkern. Differential Revision: https://reviews.freebsd.org/D15374 Added: head/sys/libkern/bcopy.c (contents, props changed) - copied, changed from r333436, head/sys/powerpc/powerpc/bcopy.c Deleted: head/sys/powerpc/powerpc/bcopy.c Modified: head/sys/conf/files.powerpc head/sys/conf/files.riscv Modified: head/sys/conf/files.powerpc == --- head/sys/conf/files.powerpc Thu May 10 00:04:14 2018(r333442) +++ head/sys/conf/files.powerpc Thu May 10 02:31:38 2018(r333443) @@ -85,6 +85,7 @@ kern/subr_sfbuf.c standard libkern/ashldi3.c optionalpowerpc | powerpcspe libkern/ashrdi3.c optionalpowerpc | powerpcspe libkern/bcmp.c standard +libkern/bcopy.cstandard libkern/cmpdi2.c optionalpowerpc | powerpcspe libkern/divdi3.c optionalpowerpc | powerpcspe libkern/ffs.c standard @@ -195,7 +196,6 @@ powerpc/powernv/powernv_centaur.c optionalpowernv powerpc/powernv/powernv_xscom.coptionalpowernv powerpc/powerpc/altivec.c optionalpowerpc | powerpc64 powerpc/powerpc/autoconf.c standard -powerpc/powerpc/bcopy.cstandard powerpc/powerpc/bus_machdep.c standard powerpc/powerpc/busdma_machdep.c standard powerpc/powerpc/clock.cstandard Modified: head/sys/conf/files.riscv == --- head/sys/conf/files.riscv Thu May 10 00:04:14 2018(r333442) +++ head/sys/conf/files.riscv Thu May 10 02:31:38 2018(r333443) @@ -12,6 +12,7 @@ kern/kern_clocksource.c standard kern/subr_devmap.c standard kern/subr_dummy_vdso_tc.c standard libkern/bcmp.c standard +libkern/bcopy.cstandard libkern/ffs.c standard libkern/ffsl.c standard libkern/ffsll.cstandard @@ -21,7 +22,6 @@ libkern/flsll.c standard libkern/memmove.c standard libkern/memset.c standard riscv/riscv/autoconf.c standard -riscv/riscv/bcopy.cstandard riscv/riscv/bus_machdep.c standard riscv/riscv/bus_space_asm.Sstandard riscv/riscv/busdma_machdep.c standard Copied and modified: head/sys/libkern/bcopy.c (from r333436, head/sys/powerpc/powerpc/bcopy.c) == ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333445 - in head/sys/i386: i386 include
Author: imp Date: Thu May 10 02:31:54 2018 New Revision: 333445 URL: https://svnweb.freebsd.org/changeset/base/333445 Log: Remove unused bcopyb. Differential Revision: https://reviews.freebsd.org/D15374 Modified: head/sys/i386/i386/support.s head/sys/i386/include/md_var.h Modified: head/sys/i386/i386/support.s == --- head/sys/i386/i386/support.sThu May 10 02:31:48 2018 (r333444) +++ head/sys/i386/i386/support.sThu May 10 02:31:54 2018 (r333445) @@ -145,37 +145,6 @@ ENTRY(fillw) ret END(fillw) -ENTRY(bcopyb) - pushl %esi - pushl %edi - movl12(%esp),%esi - movl16(%esp),%edi - movl20(%esp),%ecx - movl%edi,%eax - subl%esi,%eax - cmpl%ecx,%eax /* overlapping && src < dst? */ - jb 1f - rep - movsb - popl%edi - popl%esi - ret - - ALIGN_TEXT -1: - addl%ecx,%edi /* copy backwards. */ - addl%ecx,%esi - decl%edi - decl%esi - std - rep - movsb - popl%edi - popl%esi - cld - ret -END(bcopyb) - /* * bcopy(src, dst, cnt) * w...@tools.de (Wolfgang Solfrank, TooLs GmbH) +49-228-985800 Modified: head/sys/i386/include/md_var.h == --- head/sys/i386/include/md_var.h Thu May 10 02:31:48 2018 (r333444) +++ head/sys/i386/include/md_var.h Thu May 10 02:31:54 2018 (r333445) @@ -54,7 +54,6 @@ externuintptr_t setidt_disp; struct segment_descriptor; union savefpu; -void bcopyb(const void *from, void *to, size_t len); intcp_slow0(vm_offset_t uva, size_t len, bool write, void (*f)(vm_offset_t, void *), void *arg); void cpu_switch_load_gs(void) __asm(__STRING(cpu_switch_load_gs)); ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333444 - in head/sys: conf libkern
Author: imp
Date: Thu May 10 02:31:48 2018
New Revision: 333444
URL: https://svnweb.freebsd.org/changeset/base/333444
Log:
Simplify things a little
Rather than include a copy for memmove to call bcopy to call memcpy
(which handles overlapping copies), make memmove a strong reference to
memcpy to save the two calls.
Differential Revision: https://reviews.freebsd.org/D15374
Modified:
head/sys/conf/files.powerpc
head/sys/conf/files.riscv
head/sys/libkern/bcopy.c
Modified: head/sys/conf/files.powerpc
==
--- head/sys/conf/files.powerpc Thu May 10 02:31:38 2018(r333443)
+++ head/sys/conf/files.powerpc Thu May 10 02:31:48 2018(r333444)
@@ -95,7 +95,6 @@ libkern/fls.c standard
libkern/flsl.c standard
libkern/flsll.cstandard
libkern/lshrdi3.c optionalpowerpc | powerpcspe
-libkern/memmove.c standard
libkern/memset.c standard
libkern/moddi3.c optionalpowerpc | powerpcspe
libkern/qdivrem.c optionalpowerpc | powerpcspe
Modified: head/sys/conf/files.riscv
==
--- head/sys/conf/files.riscv Thu May 10 02:31:38 2018(r333443)
+++ head/sys/conf/files.riscv Thu May 10 02:31:48 2018(r333444)
@@ -19,7 +19,6 @@ libkern/ffsll.c standard
libkern/fls.c standard
libkern/flsl.c standard
libkern/flsll.cstandard
-libkern/memmove.c standard
libkern/memset.c standard
riscv/riscv/autoconf.c standard
riscv/riscv/bus_machdep.c standard
Modified: head/sys/libkern/bcopy.c
==
--- head/sys/libkern/bcopy.cThu May 10 02:31:38 2018(r333443)
+++ head/sys/libkern/bcopy.cThu May 10 02:31:48 2018(r333444)
@@ -50,6 +50,10 @@ __FBSDID("$FreeBSD$");
#include
#endif
+#undef memcpy
+#undef memmove
+#undef bcopy
+
/*
* sizeof(word) MUST BE A POWER OF TWO
* SO THAT wmask BELOW IS ALL ONES
@@ -141,6 +145,8 @@ memcpy(void *dst0, const void *src0, size_t length)
done:
return (dst0);
}
+
+__strong_reference(memcpy, memmove);
void
(bcopy)(const void *src0, void *dst0, size_t length)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333446 - in head: sys/cam/ctl sys/sys usr.sbin/ctladm usr.sbin/ctld
Author: araujo
Date: Thu May 10 03:50:20 2018
New Revision: 333446
URL: https://svnweb.freebsd.org/changeset/base/333446
Log:
Rework CTL frontend & backend options to use nv(3), allow creating multiple
ioctl frontend ports.
This revision introduces two changes to CTL:
- Changes the way options are passed to CTL_LUN_REQ and CTL_PORT_REQ ioctls.
Removes ctl_be_arg structure and associated logic and replaces it with
nv(3)-based logic for passing in and out arguments.
- Allows creating multiple ioctl frontend ports using either ctladm(8) or
ctld(8).
New frontend ports are represented by /dev/cam/ctl. nodes, eg
/dev/cam/ctl5.3.
Those device nodes respond only to CTL_IO ioctl.
New command-line options for ctladm:
# creates new ioctl frontend port with using free pp and vp=0
ctladm port -c
# creates new ioctl frontend port with pp=10 and vp=0
ctladm port -c -O pp=10
# creates new ioctl frontend port with pp=11 and vp=12
ctladm port -c -O pp=11 -O vp=12
# removes port with number 4 (it's a "targ_port" number, not pp number)
ctladm port -r -p 4
New syntax for ctl.conf:
target ... {
port ioctl/
...
}
target ... {
port ioctl//
...
Note: Most of this work was made by jceel@, thank you.
Submitted by: jceel
Reworked by: myself
Reviewed by: mav (earlier versions and recently during the rework)
Obtained from: FreeNAS and TrueOS
Relnotes: Yes
Sponsored by: iXsystems Inc.
Differential Revision:https://reviews.freebsd.org/D9299
Modified:
head/sys/cam/ctl/ctl.c
head/sys/cam/ctl/ctl.h
head/sys/cam/ctl/ctl_backend.c
head/sys/cam/ctl/ctl_backend.h
head/sys/cam/ctl/ctl_backend_block.c
head/sys/cam/ctl/ctl_backend_ramdisk.c
head/sys/cam/ctl/ctl_frontend.c
head/sys/cam/ctl/ctl_frontend.h
head/sys/cam/ctl/ctl_frontend_ioctl.c
head/sys/cam/ctl/ctl_frontend_iscsi.c
head/sys/cam/ctl/ctl_ioctl.h
head/sys/cam/ctl/ctl_tpc.c
head/sys/sys/param.h
head/usr.sbin/ctladm/Makefile
head/usr.sbin/ctladm/ctladm.8
head/usr.sbin/ctladm/ctladm.c
head/usr.sbin/ctld/Makefile
head/usr.sbin/ctld/ctld.c
head/usr.sbin/ctld/ctld.h
head/usr.sbin/ctld/kernel.c
head/usr.sbin/ctld/parse.y
head/usr.sbin/ctld/uclparse.c
Modified: head/sys/cam/ctl/ctl.c
==
--- head/sys/cam/ctl/ctl.c Thu May 10 02:31:54 2018(r333445)
+++ head/sys/cam/ctl/ctl.c Thu May 10 03:50:20 2018(r333446)
@@ -4,6 +4,8 @@
* Copyright (c) 2003-2009 Silicon Graphics International Corp.
* Copyright (c) 2012 The FreeBSD Foundation
* Copyright (c) 2014-2017 Alexander Motin
+ * Copyright (c) 2017 Jakub Wojciech Klama
+ * Copyright (c) 2018 Marcelo Araujo
* All rights reserved.
*
* Portions of this software were developed by Edward Tomasz Napierala
@@ -65,6 +67,8 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
+#include
#include
#include
@@ -1869,6 +1873,7 @@ ctl_init(void)
args.mda_gid = GID_OPERATOR;
args.mda_mode = 0600;
args.mda_si_drv1 = softc;
+ args.mda_si_drv2 = NULL;
error = make_dev_s(&args, &softc->dev, "cam/ctl");
if (error != 0) {
free(softc, M_DEVBUF);
@@ -2468,105 +2473,6 @@ ctl_copyin_alloc(void *user_addr, unsigned int len, ch
return (kptr);
}
-static void
-ctl_free_args(int num_args, struct ctl_be_arg *args)
-{
- int i;
-
- if (args == NULL)
- return;
-
- for (i = 0; i < num_args; i++) {
- free(args[i].kname, M_CTL);
- free(args[i].kvalue, M_CTL);
- }
-
- free(args, M_CTL);
-}
-
-static struct ctl_be_arg *
-ctl_copyin_args(int num_args, struct ctl_be_arg *uargs,
- char *error_str, size_t error_str_len)
-{
- struct ctl_be_arg *args;
- int i;
-
- args = ctl_copyin_alloc(uargs, num_args * sizeof(*args),
- error_str, error_str_len);
-
- if (args == NULL)
- goto bailout;
-
- for (i = 0; i < num_args; i++) {
- args[i].kname = NULL;
- args[i].kvalue = NULL;
- }
-
- for (i = 0; i < num_args; i++) {
- uint8_t *tmpptr;
-
- if (args[i].namelen == 0) {
- snprintf(error_str, error_str_len, "Argument %d "
-"name length is zero", i);
- goto bailout;
- }
-
- args[i].kname = ctl_copyin_alloc(args[i].name,
- args[i].namelen, error_str, error_str_len);
- if (args[i].kname == NULL)
- goto bailout;
-
- if (args[i].kname[args[i].namelen - 1] != '\0') {
- snprintf(error_str, error_str_len, "Argument %d "
-"name is not NUL-terminated", i);
- goto ba
svn commit: r333447 - in head/sys: ddb powerpc/include powerpc/pseries
Author: jhibbits
Date: Thu May 10 03:59:48 2018
New Revision: 333447
URL: https://svnweb.freebsd.org/changeset/base/333447
Log:
Fix PPC symbol resolution
Summary:
There were 2 issues that were preventing correct symbol resolution
on PowerPC/pseries:
1- memory corruption at chrp_attach() - this caused the inital
part of the symbol table to become zeroed, which would cause
the kernel linker to fail to parse it.
(this was probably zeroing out other memory parts as well)
2- DDB symbol resolution wasn't working because symtab contained
not relocated addresses but it was given relocated offsets.
Although relocating the symbol table fixed this, it broke the
linker, that already handled this case.
Thus, the fix for this consists in adding a new DDB macro:
DB_STOFFS(offs) that converts a (potentially) relocated offset
into one that can be compared with symbol table values.
PR: 227093
Submitted by: Leandro Lupori
Differential Revision: https://reviews.freebsd.org/D15372
Modified:
head/sys/ddb/db_main.c
head/sys/ddb/ddb.h
head/sys/powerpc/include/db_machdep.h
head/sys/powerpc/pseries/platform_chrp.c
Modified: head/sys/ddb/db_main.c
==
--- head/sys/ddb/db_main.c Thu May 10 03:50:20 2018(r333446)
+++ head/sys/ddb/db_main.c Thu May 10 03:59:48 2018(r333447)
@@ -100,6 +100,7 @@ X_db_search_symbol(db_symtab_t *symtab, db_addr_t off,
c_linker_sym_t lsym;
Elf_Sym *sym, *match;
unsigned long diff;
+ db_addr_t stoffs;
if (symtab->private == NULL) {
if (!linker_ddb_search_symbol((caddr_t)off, &lsym, &diff)) {
@@ -111,19 +112,20 @@ X_db_search_symbol(db_symtab_t *symtab, db_addr_t off,
diff = ~0UL;
match = NULL;
+ stoffs = DB_STOFFS(off);
for (sym = (Elf_Sym*)symtab->start; (char*)sym < symtab->end; sym++) {
if (sym->st_name == 0 || sym->st_shndx == SHN_UNDEF)
continue;
- if (off < sym->st_value)
+ if (stoffs < sym->st_value)
continue;
if (ELF_ST_TYPE(sym->st_info) != STT_OBJECT &&
ELF_ST_TYPE(sym->st_info) != STT_FUNC &&
ELF_ST_TYPE(sym->st_info) != STT_NOTYPE)
continue;
- if ((off - sym->st_value) > diff)
+ if ((stoffs - sym->st_value) > diff)
continue;
- if ((off - sym->st_value) < diff) {
- diff = off - sym->st_value;
+ if ((stoffs - sym->st_value) < diff) {
+ diff = stoffs - sym->st_value;
match = sym;
} else {
if (match == NULL)
Modified: head/sys/ddb/ddb.h
==
--- head/sys/ddb/ddb.h Thu May 10 03:50:20 2018(r333446)
+++ head/sys/ddb/ddb.h Thu May 10 03:59:48 2018(r333447)
@@ -72,6 +72,10 @@ SYSCTL_DECL(_debug_ddb);
#defineDB_MAXSCRIPTRECURSION 3
#endif
+#ifndef DB_STOFFS
+#define DB_STOFFS(offs)(offs)
+#endif
+
#ifndef DB_CALL
#defineDB_CALL db_fncall_generic
#else
Modified: head/sys/powerpc/include/db_machdep.h
==
--- head/sys/powerpc/include/db_machdep.h Thu May 10 03:50:20 2018
(r333446)
+++ head/sys/powerpc/include/db_machdep.h Thu May 10 03:59:48 2018
(r333447)
@@ -85,4 +85,8 @@ typedef intptr_tdb_expr_t; /* expression -
signed */
#defineinst_load(ins) 0
#defineinst_store(ins) 0
+#ifdef __powerpc64__
+#define DB_STOFFS(offs)((offs) & ~DMAP_BASE_ADDRESS)
+#endif
+
#endif /* _POWERPC_DB_MACHDEP_H_ */
Modified: head/sys/powerpc/pseries/platform_chrp.c
==
--- head/sys/powerpc/pseries/platform_chrp.cThu May 10 03:50:20 2018
(r333446)
+++ head/sys/powerpc/pseries/platform_chrp.cThu May 10 03:59:48 2018
(r333447)
@@ -146,7 +146,7 @@ chrp_attach(platform_t plat)
/* Set up important VPA fields */
for (i = 0; i < MAXCPU; i++) {
- bzero(splpar_vpa[i], sizeof(splpar_vpa));
+ bzero(splpar_vpa[i], sizeof(splpar_vpa[i]));
/* First two: VPA size */
splpar_vpa[i][4] =
(uint8_t)((sizeof(splpar_vpa[i]) >> 8) & 0xff);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333448 - head/sys/dev/cxgbe
Author: np
Date: Thu May 10 06:33:54 2018
New Revision: 333448
URL: https://svnweb.freebsd.org/changeset/base/333448
Log:
cxgbe(4): Disable write-combined doorbells by default.
This had been the default behavior but was changed accidentally as part
of the recent iw_cxgbe+OFED overhaul. Fix another bug in that change
while here: the global knob affects all the adapters in the system and
should be left alone by per-adapter code.
MFC after:3 days
Sponsored by: Chelsio Communications
Modified:
head/sys/dev/cxgbe/t4_main.c
Modified: head/sys/dev/cxgbe/t4_main.c
==
--- head/sys/dev/cxgbe/t4_main.cThu May 10 03:59:48 2018
(r333447)
+++ head/sys/dev/cxgbe/t4_main.cThu May 10 06:33:54 2018
(r333448)
@@ -455,7 +455,7 @@ TUNABLE_INT("hw.cxgbe.iscsicaps_allowed", &t4_iscsicap
static int t4_fcoecaps_allowed = 0;
TUNABLE_INT("hw.cxgbe.fcoecaps_allowed", &t4_fcoecaps_allowed);
-static int t5_write_combine = 1;
+static int t5_write_combine = 0;
TUNABLE_INT("hw.cxl.write_combine", &t5_write_combine);
static int t4_num_vis = 1;
@@ -2292,7 +2292,6 @@ t4_map_bar_2(struct adapter *sc)
setbit(&sc->doorbells, DOORBELL_WCWR);
setbit(&sc->doorbells, DOORBELL_UDBWC);
} else {
- t5_write_combine = 0;
device_printf(sc->dev,
"couldn't enable write combining: %d\n",
rc);
@@ -2302,11 +2301,9 @@ t4_map_bar_2(struct adapter *sc)
t4_write_reg(sc, A_SGE_STAT_CFG,
V_STATSOURCE_T5(7) | mode);
}
-#else
- t5_write_combine = 0;
#endif
- sc->iwt.wc_en = t5_write_combine;
}
+ sc->iwt.wc_en = isset(&sc->doorbells, DOORBELL_UDBWC) ? 1 : 0;
return (0);
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r333449 - in head: etc/rc.d lib/libc/db/mpool lib/libc/gen lib/libc/string lib/libc/sys lib/libz share/man/man3 share/man/man5 sys/libkern usr.bin/gzip usr.bin/ident usr.sbin/fstyp usr....
Author: delphij Date: Thu May 10 06:41:08 2018 New Revision: 333449 URL: https://svnweb.freebsd.org/changeset/base/333449 Log: Remove "All rights reserved" from my files. See r91 for the rationale. MFC after:1 week Modified: head/etc/rc.d/hostid head/etc/rc.d/static_arp head/etc/rc.d/static_ndp head/lib/libc/db/mpool/mpool-compat.c head/lib/libc/gen/libc_dlopen.c head/lib/libc/string/strlen.c head/lib/libc/sys/rtprio.2 head/lib/libz/zopen.3 head/share/man/man3/pthread_affinity_np.3 head/share/man/man3/pthread_attr_affinity_np.3 head/share/man/man5/tmpfs.5 head/sys/libkern/strlen.c head/usr.bin/gzip/unpack.c head/usr.bin/ident/ident.c head/usr.sbin/fstyp/zfs.c head/usr.sbin/portsnap/phttpget/phttpget.8 Modified: head/etc/rc.d/hostid == --- head/etc/rc.d/hostidThu May 10 06:33:54 2018(r333448) +++ head/etc/rc.d/hostidThu May 10 06:41:08 2018(r333449) @@ -2,7 +2,6 @@ # # Copyright (c) 2007 Pawel Jakub Dawidek # Copyright (c) 2015 Xin LI -# All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions Modified: head/etc/rc.d/static_arp == --- head/etc/rc.d/static_arpThu May 10 06:33:54 2018(r333448) +++ head/etc/rc.d/static_arpThu May 10 06:41:08 2018(r333449) @@ -1,7 +1,6 @@ #!/bin/sh # # Copyright (c) 2009 Xin LI -# All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions Modified: head/etc/rc.d/static_ndp == --- head/etc/rc.d/static_ndpThu May 10 06:33:54 2018(r333448) +++ head/etc/rc.d/static_ndpThu May 10 06:41:08 2018(r333449) @@ -1,7 +1,6 @@ #!/bin/sh # -# Copyright (c) 2011 Xin Li -# All rights reserved. +# Copyright (c) 2011 Xin LI # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions Modified: head/lib/libc/db/mpool/mpool-compat.c == --- head/lib/libc/db/mpool/mpool-compat.c Thu May 10 06:33:54 2018 (r333448) +++ head/lib/libc/db/mpool/mpool-compat.c Thu May 10 06:41:08 2018 (r333449) @@ -2,7 +2,6 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2009 Xin LI - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: head/lib/libc/gen/libc_dlopen.c == --- head/lib/libc/gen/libc_dlopen.c Thu May 10 06:33:54 2018 (r333448) +++ head/lib/libc/gen/libc_dlopen.c Thu May 10 06:41:08 2018 (r333449) @@ -1,8 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2011 Xin Li - * All rights reserved. + * Copyright (c) 2011 Xin LI * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: head/lib/libc/string/strlen.c == --- head/lib/libc/string/strlen.c Thu May 10 06:33:54 2018 (r333448) +++ head/lib/libc/string/strlen.c Thu May 10 06:41:08 2018 (r333449) @@ -2,7 +2,6 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2009, 2010 Xin LI - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: head/lib/libc/sys/rtprio.2 == --- head/lib/libc/sys/rtprio.2 Thu May 10 06:33:54 2018(r333448) +++ head/lib/libc/sys/rtprio.2 Thu May 10 06:41:08 2018(r333449) @@ -29,7 +29,6 @@ .\" SUCH DAMAGE. .\"- .\" Copyright (c) 2011 Xin LI -.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions Modified: head/lib/libz/zopen.3 == --- head/lib/libz/zopen.3 Thu May 10 06:33:54 2018(r333448) +++ head/lib/libz/zopen.3 Thu May 10 06:41:08 2018(r333449) @@ -1,5 +1,4 @@ -.\" Copyright (c) 2014 Xin Li -.\" All rights reserved. +.\" Copyright (c) 2014 Xin LI .\" .\" Redistribution and use in source and binary forms, with or without .\"
