svn commit: r314483 - head/sys/dev/hyperv/netvsc
Author: sephe Date: Wed Mar 1 08:24:17 2017 New Revision: 314483 URL: https://svnweb.freebsd.org/changeset/base/314483 Log: hyperv/hn: Simplify RNDIS packet total length calculation. MFC after:1 week Sponsored by: Microsoft Differential Revision:https://reviews.freebsd.org/D9712 Modified: head/sys/dev/hyperv/netvsc/if_hn.c Modified: head/sys/dev/hyperv/netvsc/if_hn.c == --- head/sys/dev/hyperv/netvsc/if_hn.c Wed Mar 1 08:22:51 2017 (r314482) +++ head/sys/dev/hyperv/netvsc/if_hn.c Wed Mar 1 08:24:17 2017 (r314483) @@ -1784,9 +1784,6 @@ hn_rndis_pktinfo_append(struct rndis_pac pi->rm_type = pi_type; pi->rm_pktinfooffset = RNDIS_PKTINFO_OFFSET; - /* Update RNDIS packet msg length */ - pkt->rm_len += pi_size; - return (pi->rm_data); } @@ -1928,7 +1925,7 @@ hn_encap(struct ifnet *ifp, struct hn_tx } pkt->rm_type = REMOTE_NDIS_PACKET_MSG; - pkt->rm_len = sizeof(*pkt) + m_head->m_pkthdr.len; + pkt->rm_len = m_head->m_pkthdr.len; pkt->rm_dataoffset = 0; pkt->rm_datalen = m_head->m_pkthdr.len; pkt->rm_oobdataoffset = 0; @@ -1999,6 +1996,8 @@ hn_encap(struct ifnet *ifp, struct hn_tx } pkt_hlen = pkt->rm_pktinfooffset + pkt->rm_pktinfolen; + /* Fixup RNDIS packet message total length */ + pkt->rm_len += pkt_hlen; /* Convert RNDIS packet message offsets */ pkt->rm_dataoffset = hn_rndis_pktmsg_offset(pkt_hlen); pkt->rm_pktinfooffset = hn_rndis_pktmsg_offset(pkt->rm_pktinfooffset); ___ 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: r314473 - head
Am 1. März 2017 06:45:25 MEZ schrieb "Rodney W. Grimes" : >> Author: imp >> Date: Wed Mar 1 05:05:05 2017 >> New Revision: 314473 >> URL: https://svnweb.freebsd.org/changeset/base/314473 >> >> Log: >> Create README.md file for viewing on github. >> >> This is a lightly edited README using github's MARKDOWN. >> >> Submitted by: Johan >> Pull Request: https://github.com/freebsd/freebsd/pull/56 >> >> Added: >> head/README.md (contents, props changed) >> […] > […] >Also lots and lots of trailing white space... > >[…] Trailing whitespace can be significant in markdown: Two trailing spaces force a linebreak in the rendered output. Regards, Florian ___ 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: r314484 - head/sys/dev/hyperv/netvsc
Author: sephe
Date: Wed Mar 1 08:50:41 2017
New Revision: 314484
URL: https://svnweb.freebsd.org/changeset/base/314484
Log:
hyperv/hn: Make sure that RNDIS packet message is at least 4B aligned.
MFC after:1 week
Sponsored by: Microsoft
Differential Revision:https://reviews.freebsd.org/D9713
Modified:
head/sys/dev/hyperv/netvsc/hn_rndis.c
Modified: head/sys/dev/hyperv/netvsc/hn_rndis.c
==
--- head/sys/dev/hyperv/netvsc/hn_rndis.c Wed Mar 1 08:24:17 2017
(r314483)
+++ head/sys/dev/hyperv/netvsc/hn_rndis.c Wed Mar 1 08:50:41 2017
(r314484)
@@ -841,9 +841,22 @@ hn_rndis_init(struct hn_softc *sc)
sc->hn_rndis_agg_pkts = comp->rm_pktmaxcnt;
sc->hn_rndis_agg_align = 1U << comp->rm_align;
+ if (sc->hn_rndis_agg_align < sizeof(uint32_t)) {
+ /*
+* The RNDIS packet messsage encap assumes that the RNDIS
+* packet message is at least 4 bytes aligned. Fix up the
+* alignment here, if the remote side sets the alignment
+* too low.
+*/
+ if_printf(sc->hn_ifp, "fixup RNDIS aggpkt align: %u -> %zu\n",
+ sc->hn_rndis_agg_align, sizeof(uint32_t));
+ sc->hn_rndis_agg_align = sizeof(uint32_t);
+ }
+
if (bootverbose) {
- if_printf(sc->hn_ifp, "RNDIS ver %u.%u, pktsz %u, pktcnt %u, "
- "align %u\n", comp->rm_ver_major, comp->rm_ver_minor,
+ if_printf(sc->hn_ifp, "RNDIS ver %u.%u, "
+ "aggpkt size %u, aggpkt cnt %u, aggpkt align %u\n",
+ comp->rm_ver_major, comp->rm_ver_minor,
sc->hn_rndis_agg_size, sc->hn_rndis_agg_pkts,
sc->hn_rndis_agg_align);
}
___
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: r314485 - head/sys/dev/hyperv/netvsc
Author: sephe
Date: Wed Mar 1 09:05:12 2017
New Revision: 314485
URL: https://svnweb.freebsd.org/changeset/base/314485
Log:
hyperv/hn: Misaligned chimney sending buffers should not be used
MFC after:1 week
Sponsored by: Microsoft
Differential Revision:https://reviews.freebsd.org/D9714
Modified:
head/sys/dev/hyperv/netvsc/hn_nvs.c
Modified: head/sys/dev/hyperv/netvsc/hn_nvs.c
==
--- head/sys/dev/hyperv/netvsc/hn_nvs.c Wed Mar 1 08:50:41 2017
(r314484)
+++ head/sys/dev/hyperv/netvsc/hn_nvs.c Wed Mar 1 09:05:12 2017
(r314485)
@@ -272,12 +272,17 @@ hn_nvs_conn_chim(struct hn_softc *sc)
error = EIO;
goto cleanup;
}
- if (sectsz == 0) {
+ if (sectsz == 0 || sectsz % sizeof(uint32_t) != 0) {
/*
* Can't use chimney sending buffer; done!
*/
- if_printf(sc->hn_ifp, "zero chimney sending buffer "
- "section size\n");
+ if (sectsz == 0) {
+ if_printf(sc->hn_ifp, "zero chimney sending buffer "
+ "section size\n");
+ } else {
+ if_printf(sc->hn_ifp, "misaligned chimney sending "
+ "buffers, section size: %u\n", sectsz);
+ }
sc->hn_chim_szmax = 0;
sc->hn_chim_cnt = 0;
sc->hn_flags |= HN_FLAG_CHIM_CONNECTED;
___
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: r314486 - head/sys/kern
Author: kib
Date: Wed Mar 1 10:22:07 2017
New Revision: 314486
URL: https://svnweb.freebsd.org/changeset/base/314486
Log:
When deallocating the vm object in elf_map_insert() due to
vm_map_insert() failure, drop the vnode lock around the call to
vm_object_deallocate().
Since the deallocated object is the vm object of the vnode, we might
get the vnode lock recursion there. In fact, it is almost impossible
to make vm_map_insert() failing there on stock kernel.
Tested by:pho
Sponsored by: The FreeBSD Foundation
MFC after:2 weeks
Modified:
head/sys/kern/imgact_elf.c
Modified: head/sys/kern/imgact_elf.c
==
--- head/sys/kern/imgact_elf.c Wed Mar 1 09:05:12 2017(r314485)
+++ head/sys/kern/imgact_elf.c Wed Mar 1 10:22:07 2017(r314486)
@@ -422,13 +422,14 @@ __elfN(map_partial)(vm_map_t map, vm_obj
}
static int
-__elfN(map_insert)(vm_map_t map, vm_object_t object, vm_ooffset_t offset,
-vm_offset_t start, vm_offset_t end, vm_prot_t prot, int cow)
+__elfN(map_insert)(struct image_params *imgp, vm_map_t map, vm_object_t object,
+vm_ooffset_t offset, vm_offset_t start, vm_offset_t end, vm_prot_t prot,
+int cow)
{
struct sf_buf *sf;
vm_offset_t off;
vm_size_t sz;
- int error, rv;
+ int error, locked, rv;
if (start != trunc_page(start)) {
rv = __elfN(map_partial)(map, object, offset, start,
@@ -480,8 +481,12 @@ __elfN(map_insert)(vm_map_t map, vm_obje
rv = vm_map_insert(map, object, offset, start, end,
prot, VM_PROT_ALL, cow);
vm_map_unlock(map);
- if (rv != KERN_SUCCESS)
+ if (rv != KERN_SUCCESS) {
+ locked = VOP_ISLOCKED(imgp->vp);
+ VOP_UNLOCK(imgp->vp, 0);
vm_object_deallocate(object);
+ vn_lock(imgp->vp, locked | LK_RETRY);
+ }
}
return (rv);
} else {
@@ -538,7 +543,7 @@ __elfN(load_section)(struct image_params
cow = MAP_COPY_ON_WRITE | MAP_PREFAULT |
(prot & VM_PROT_WRITE ? 0 : MAP_DISABLE_COREDUMP);
- rv = __elfN(map_insert)(map,
+ rv = __elfN(map_insert)(imgp, map,
object,
file_addr,/* file offset */
map_addr, /* virtual start */
@@ -568,8 +573,8 @@ __elfN(load_section)(struct image_params
/* This had damn well better be true! */
if (map_len != 0) {
- rv = __elfN(map_insert)(map, NULL, 0, map_addr, map_addr +
- map_len, VM_PROT_ALL, 0);
+ rv = __elfN(map_insert)(imgp, map, NULL, 0, map_addr,
+ map_addr + map_len, VM_PROT_ALL, 0);
if (rv != KERN_SUCCESS) {
return (EINVAL);
}
___
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: r314487 - head/sys/kern
Author: kib Date: Wed Mar 1 10:28:15 2017 New Revision: 314487 URL: https://svnweb.freebsd.org/changeset/base/314487 Log: Use vm_map_insert() instead of vm_map_find() in elf_map_insert(). Elf_map_insert() needs to create mapping at the known fixed address. Usage of vm_map_find() assumes, on the other hand, that any suitable address space range above or equal the specified hint, is acceptable. Due to operating on the fresh or cleared address space, vm_map_find() usually creates mapping starting exactly at hint. Switch to vm_map_insert() use to clearly request fixed mapping from the VM. Tested by:pho Sponsored by: The FreeBSD Foundation MFC after:2 weeks Modified: head/sys/kern/imgact_elf.c Modified: head/sys/kern/imgact_elf.c == --- head/sys/kern/imgact_elf.c Wed Mar 1 10:22:07 2017(r314486) +++ head/sys/kern/imgact_elf.c Wed Mar 1 10:28:15 2017(r314487) @@ -452,9 +452,10 @@ __elfN(map_insert)(struct image_params * * The mapping is not page aligned. This means we have * to copy the data. Sigh. */ - rv = vm_map_find(map, NULL, 0, &start, end - start, 0, - VMFS_NO_SPACE, prot | VM_PROT_WRITE, VM_PROT_ALL, - 0); + vm_map_lock(map); + rv = vm_map_insert(map, NULL, 0, start, end, + prot | VM_PROT_WRITE, VM_PROT_ALL, 0); + vm_map_unlock(map); if (rv != KERN_SUCCESS) return (rv); if (object == 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: r314488 - head/sys/boot/fdt/dts/arm
Author: br
Date: Wed Mar 1 10:55:12 2017
New Revision: 314488
URL: https://svnweb.freebsd.org/changeset/base/314488
Log:
Set USB OTG mode to host (missed in vendor DTS for some reason).
Sponsored by: DARPA, AFRL
Modified:
head/sys/boot/fdt/dts/arm/socfpga_arria10_socdk_sdmmc.dts
Modified: head/sys/boot/fdt/dts/arm/socfpga_arria10_socdk_sdmmc.dts
==
--- head/sys/boot/fdt/dts/arm/socfpga_arria10_socdk_sdmmc.dts Wed Mar 1
10:28:15 2017(r314487)
+++ head/sys/boot/fdt/dts/arm/socfpga_arria10_socdk_sdmmc.dts Wed Mar 1
10:55:12 2017(r314488)
@@ -80,3 +80,7 @@
reg = <0x28>;
};
};
+
+&usb0 {
+ dr_mode = "host";
+};
___
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: r314489 - head/sys/compat/ia32
Author: kib
Date: Wed Mar 1 11:39:29 2017
New Revision: 314489
URL: https://svnweb.freebsd.org/changeset/base/314489
Log:
With the removal of IA64, the only arch which uses ia32 compat is amd64.
Sponsored by: The FreeBSD Foundation
MFC after:2 weeks
Modified:
head/sys/compat/ia32/ia32_sysvec.c
Modified: head/sys/compat/ia32/ia32_sysvec.c
==
--- head/sys/compat/ia32/ia32_sysvec.c Wed Mar 1 10:55:12 2017
(r314488)
+++ head/sys/compat/ia32/ia32_sysvec.c Wed Mar 1 11:39:29 2017
(r314489)
@@ -120,11 +120,8 @@ struct sysentvec ia32_freebsd_sysvec = {
.sv_setregs = ia32_setregs,
.sv_fixlimit= ia32_fixlimit,
.sv_maxssiz = &ia32_maxssiz,
- .sv_flags =
-#ifdef __amd64__
- SV_SHP | SV_TIMEKEEP |
-#endif
- SV_ABI_FREEBSD | SV_IA32 | SV_ILP32,
+ .sv_flags = SV_ABI_FREEBSD | SV_IA32 | SV_ILP32 |
+ SV_SHP | SV_TIMEKEEP,
.sv_set_syscall_retval = ia32_set_syscall_retval,
.sv_fetch_syscall_args = ia32_fetch_syscall_args,
.sv_syscallnames = freebsd32_syscallnames,
___
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: r314490 - head/sys/sys
Author: kib
Date: Wed Mar 1 12:10:24 2017
New Revision: 314490
URL: https://svnweb.freebsd.org/changeset/base/314490
Log:
Add some explanation for SV_TIMEKEEP flag.
Sponsored by: The FreeBSD Foundation
MFC after:3 days
Modified:
head/sys/sys/sysent.h
Modified: head/sys/sys/sysent.h
==
--- head/sys/sys/sysent.h Wed Mar 1 11:39:29 2017(r314489)
+++ head/sys/sys/sysent.h Wed Mar 1 12:10:24 2017(r314490)
@@ -138,7 +138,7 @@ struct sysentvec {
#defineSV_AOUT 0x008000/* a.out executable. */
#defineSV_SHP 0x01/* Shared page. */
#defineSV_CAPSICUM 0x02/* Force cap_enter() on
startup. */
-#defineSV_TIMEKEEP 0x04
+#defineSV_TIMEKEEP 0x04/* Shared page timehands. */
#defineSV_ABI_MASK 0xff
#defineSV_ABI_ERRNO(p, e) ((p)->p_sysent->sv_errsize <= 0 ? e :
\
___
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: r314473 - head
On Tue, Feb 28, 2017 at 10:45 PM, Rodney W. Grimes wrote: >> Author: imp >> Date: Wed Mar 1 05:05:05 2017 >> New Revision: 314473 >> URL: https://svnweb.freebsd.org/changeset/base/314473 >> >> Log: >> Create README.md file for viewing on github. >> >> This is a lightly edited README using github's MARKDOWN. >> >> Submitted by: Johan >> Pull Request: https://github.com/freebsd/freebsd/pull/56 >> >> Added: >> head/README.md (contents, props changed) >> >> Added: head/README.md >> == >> --- /dev/null 00:00:00 1970 (empty, because file is newly added) >> +++ head/README.mdWed Mar 1 05:05:05 2017(r314473) >> @@ -0,0 +1,86 @@ >> +FreeBSD Source: >> +--- >> +This is the top level of the FreeBSD source directory. This file >> +was last revised on: >> +$FreeBSD$ >> + >> +For copyright information, please see the file COPYRIGHT in this >> +directory (additional copyright information also exists for some >> +sources in this tree - please see the specific source directories for >> +more information). >> + >> +The Makefile in this directory supports a number of targets for >> +building components (or all) of the FreeBSD source tree. See build(7) >> +and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html >> +for more information, including setting make(1) variables. >> + >> +The `buildkernel` and `installkernel` targets build and install >> +the kernel and the modules (see below). Please see the top of >> +the Makefile in this directory for more information on the >> +standard build targets and compile-time flags. >> + >> +Building a kernel is a somewhat more involved process. See build(7), >> config(8), >> +and >> http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html >> +for more information. >> + >> +Note: If you want to build and install the kernel with the >> +`buildkernel` and `installkernel` targets, you might need to build >> +world before. More information is available in the handbook. >> + >> +The kernel configuration files reside in the `sys//conf` >> +sub-directory. GENERIC is the default configuration used in release builds. >> +NOTES contains entries and documentation for all possible >> +devices, not just those commonly used. >> + >> + >> +Source Roadmap: >> +--- > > Is there someway this can be a pointer to the usr/src part of > hier(7) and have hier(7) updated to reflect current reality? > > Also lots and lots of trailing white space... > > This should be a pointer to hier(7) It's a verbatim copy of README converted to markdown. Maybe README should be fixed and this regenerated. The trailing whitespace is part of the conversion and not a mistake. If you want to update README and hier(7) and have README.md generated from that automatically, be my guest. None of that was in the submission, and the submission was useful as it was. 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: r314495 - head
Author: emaste Date: Wed Mar 1 15:39:58 2017 New Revision: 314495 URL: https://svnweb.freebsd.org/changeset/base/314495 Log: Remove hard line breaks from README.md This is rendered with variable-width formatting and a proportional font, so hard line breaks before 80 cols are undesired. Modified: head/README.md Modified: head/README.md == --- head/README.md Wed Mar 1 13:47:36 2017(r314494) +++ head/README.md Wed Mar 1 15:39:58 2017(r314495) @@ -1,35 +1,35 @@ FreeBSD Source: --- -This is the top level of the FreeBSD source directory. This file -was last revised on: +This is the top level of the FreeBSD source directory. This file +was last revised on: $FreeBSD$ -For copyright information, please see the file COPYRIGHT in this -directory (additional copyright information also exists for some -sources in this tree - please see the specific source directories for +For copyright information, please see the file COPYRIGHT in this +directory (additional copyright information also exists for some +sources in this tree - please see the specific source directories for more information). -The Makefile in this directory supports a number of targets for -building components (or all) of the FreeBSD source tree. See build(7) -and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html -for more information, including setting make(1) variables. - -The `buildkernel` and `installkernel` targets build and install -the kernel and the modules (see below). Please see the top of -the Makefile in this directory for more information on the +The Makefile in this directory supports a number of targets for +building components (or all) of the FreeBSD source tree. See build(7) +and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html +for more information, including setting make(1) variables. + +The `buildkernel` and `installkernel` targets build and install +the kernel and the modules (see below). Please see the top of +the Makefile in this directory for more information on the standard build targets and compile-time flags. -Building a kernel is a somewhat more involved process. See build(7), config(8), -and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html +Building a kernel is a somewhat more involved process. See build(7), config(8), +and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html for more information. -Note: If you want to build and install the kernel with the -`buildkernel` and `installkernel` targets, you might need to build +Note: If you want to build and install the kernel with the +`buildkernel` and `installkernel` targets, you might need to build world before. More information is available in the handbook. -The kernel configuration files reside in the `sys//conf` -sub-directory. GENERIC is the default configuration used in release builds. -NOTES contains entries and documentation for all possible +The kernel configuration files reside in the `sys//conf` +sub-directory. GENERIC is the default configuration used in release builds. +NOTES contains entries and documentation for all possible devices, not just those commonly used. @@ -80,7 +80,7 @@ usr.bin User commands. usr.sbin System administration commands. ``` -For information on synchronizing your source tree with one or more of +For information on synchronizing your source tree with one or more of the FreeBSD Project's development branches, please see: http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/synching.html ___ 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: r314473 - head
[ Charset UTF-8 unsupported, converting... ] > > > Am 1. M?rz 2017 06:45:25 MEZ schrieb "Rodney W. Grimes" > : > >> Author: imp > >> Date: Wed Mar 1 05:05:05 2017 > >> New Revision: 314473 > >> URL: https://svnweb.freebsd.org/changeset/base/314473 > >> > >> Log: > >> Create README.md file for viewing on github. > >> > >> This is a lightly edited README using github's MARKDOWN. > >> > >> Submitted by:Johan > >> Pull Request:https://github.com/freebsd/freebsd/pull/56 > >> > >> Added: > >> head/README.md (contents, props changed) > >> [?] > > [?] > >Also lots and lots of trailing white space... > > > >[?] > > Trailing whitespace can be significant in > markdown: Two trailing spaces force a > linebreak in the rendered output. You have to be kidding me? Anything that treats white space as a significant part of the syntax is... well.. broken by design. Yes, including phython. A quick google yeilds me this about github markdown: (Technical note: Markdown Here uses GFM line breaks, so there's no need to use MD's two-space line breaks.) And wordpress's use of markdown also has abaondon this. I would say lets please abaondon it as a bad idea as it appears as if git/github can use something called GFM? -- Rod Grimes rgri...@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: r314473 - head
On Wed, Mar 1, 2017 at 8:49 AM, Rodney W. Grimes wrote: > [ Charset UTF-8 unsupported, converting... ] >> >> >> Am 1. M?rz 2017 06:45:25 MEZ schrieb "Rodney W. Grimes" >> : >> >> Author: imp >> >> Date: Wed Mar 1 05:05:05 2017 >> >> New Revision: 314473 >> >> URL: https://svnweb.freebsd.org/changeset/base/314473 >> >> >> >> Log: >> >> Create README.md file for viewing on github. >> >> >> >> This is a lightly edited README using github's MARKDOWN. >> >> >> >> Submitted by:Johan >> >> Pull Request:https://github.com/freebsd/freebsd/pull/56 >> >> >> >> Added: >> >> head/README.md (contents, props changed) >> >> [?] >> > [?] >> >Also lots and lots of trailing white space... >> > >> >[?] >> >> Trailing whitespace can be significant in >> markdown: Two trailing spaces force a >> linebreak in the rendered output. > > You have to be kidding me? Anything that treats white space as > a significant part of the syntax is... well.. broken by design. > > Yes, including phython. > > A quick google yeilds me this about github markdown: > (Technical note: Markdown Here uses GFM line breaks, so > there's no need to use MD's two-space line breaks.) > > And wordpress's use of markdown also has abaondon this. > > I would say lets please abaondon it as a bad idea as it > appears as if git/github can use something called GFM? Knock yourself out if you want to do something better, or get someone else (not me) to do something better. Ed's already made things look a bit better, so if you can improve on that work great. Warner ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r314464 - head/usr.sbin/yppush
On Tue, 2017-02-28 at 21:53 -0800, Rodney W. Grimes wrote:
> -- Start of PGP signed section.
> [ Charset UTF-8 unsupported, converting... ]
> >
> >
> > >
> > > On Feb 28, 2017, at 21:38, Rodney W. Grimes > > N85.dnsmgr.net> wrote:
> > >
> > > Would it be possible to not do this as 1000 commits?
> > Yes, but I?m trying to do this in a way that allows me to
> > backport all of the changes as easily as possible to ^/stable/10
> > (on the other side of the coin, I?ve run into dependent commits of
> > other MFCs that required sweeping changes in order to make my
> > changes possible).
> > I do think your point is valid though and I can probably strike
> > some middle ground with my changes. I think grouping it up by 2nd
> > level directory (like I did with usr.bin/svn) makes the most sense.
> > Thank you,
> Yes, that is what I was thinking. Note that I dont agree with this
> change,
> but I have probably missed a discussion that is allowing it to move
> forward.
> It makes the logfiles of make output now src tree possition
> dependent,
> but I am probalby the only person in the universe that has ever run a
> diff on the output of make world.
>
> It may also be possible to split this into some phases to reduce some
> of
> your issues, only do the {.CURDIR}/../../foo -> ${SRCTOP}/bar/foo in
> one pass and
> some of the other fixes in another pass.
>
>
You're not the only one who has diffed build output logs (I suspect
anyone who has to maintain a non-trivial build infrastructure has done
so), and you're not the only one who thinks that changing relative
paths to absolute is a bad idea.
-- 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: r314473 - head
On 1 March 2017 at 09:58, Warner Losh wrote: > > It's a verbatim copy of README converted to markdown. Maybe README > should be fixed and this regenerated. The trailing whitespace is part > of the conversion and not a mistake. I think the whitespace is a mistake, since the markdown version is rendered in variable width with proportional font, so hard 80-col wrapping is undesirable. I've removed the whitespace in r314495. > If you want to update README and hier(7) and have README.md generated > from that automatically, be my guest. None of that was in the > submission, and the submission was useful as it was. I'm happy for us to have a README.md although we now have the issue of keeping them in sync (if we want to). There are some minor things that we don't want to make completely identical -- for example, the rendered version claims "This file was last revised on: $FreeBSD$" because the svn-git exporter does not expand $FreeBSD$. I think we ought to just remove that sentence from the markdown version. Perhaps this suggests we don't try to keep them in sync, which is likely fine as they'll generally be seen by different groups of people (markdown for those browsing the project on GitHub, plain README for those with an installed source tree). ___ 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: r314473 - head
> On Tue, Feb 28, 2017 at 10:45 PM, Rodney W. Grimes > wrote: > >> Author: imp > >> Date: Wed Mar 1 05:05:05 2017 > >> New Revision: 314473 > >> URL: https://svnweb.freebsd.org/changeset/base/314473 > >> > >> Log: > >> Create README.md file for viewing on github. > >> > >> This is a lightly edited README using github's MARKDOWN. > >> > >> Submitted by: Johan > >> Pull Request: https://github.com/freebsd/freebsd/pull/56 > >> > >> Added: > >> head/README.md (contents, props changed) > >> > >> Added: head/README.md > >> == > >> --- /dev/null 00:00:00 1970 (empty, because file is newly added) > >> +++ head/README.mdWed Mar 1 05:05:05 2017(r314473) > >> @@ -0,0 +1,86 @@ > >> +FreeBSD Source: > >> +--- > >> +This is the top level of the FreeBSD source directory. This file > >> +was last revised on: > >> +$FreeBSD$ > >> + > >> +For copyright information, please see the file COPYRIGHT in this > >> +directory (additional copyright information also exists for some > >> +sources in this tree - please see the specific source directories for > >> +more information). > >> + > >> +The Makefile in this directory supports a number of targets for > >> +building components (or all) of the FreeBSD source tree. See build(7) > >> +and > >> http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html > >> +for more information, including setting make(1) variables. > >> + > >> +The `buildkernel` and `installkernel` targets build and install > >> +the kernel and the modules (see below). Please see the top of > >> +the Makefile in this directory for more information on the > >> +standard build targets and compile-time flags. > >> + > >> +Building a kernel is a somewhat more involved process. See build(7), > >> config(8), > >> +and > >> http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html > >> +for more information. > >> + > >> +Note: If you want to build and install the kernel with the > >> +`buildkernel` and `installkernel` targets, you might need to build > >> +world before. More information is available in the handbook. > >> + > >> +The kernel configuration files reside in the `sys//conf` > >> +sub-directory. GENERIC is the default configuration used in release > >> builds. > >> +NOTES contains entries and documentation for all possible > >> +devices, not just those commonly used. > >> + > >> + > >> +Source Roadmap: > >> +--- > > > > Is there someway this can be a pointer to the usr/src part of > > hier(7) and have hier(7) updated to reflect current reality? > > > > Also lots and lots of trailing white space... > > > > This should be a pointer to hier(7) > > It's a verbatim copy of README converted to markdown. Maybe README > should be fixed and this regenerated. Yes, but then couldnt this be a pointer to readme? We have this documented now in 3 places that are gona just get further out of sync. Or at least add a note to README that says you need to update README.md if you touch this file. > The trailing whitespace is part > of the conversion and not a mistake. I have learned this now and responded else where. It appears that there are ways to do this in markdown without using trailing double spaces as a syntax item. > If you want to update README and hier(7) and have README.md generated > from that automatically, be my guest. None of that was in the > submission, and the submission was useful as it was. I agree that the submission is useful, as the README.md file, just would like to see some polish put on it so it doesnt suffer the same bitrot that hier(7) has. -- Rod Grimes rgri...@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: r314464 - head/usr.sbin/yppush
[ Charset ISO-8859-1 unsupported, converting... ]
> On Tue, 2017-02-28 at 21:53 -0800, Rodney W. Grimes wrote:
> > -- Start of PGP signed section.
> > [ Charset UTF-8 unsupported, converting... ]
> > >
> > >
> > > >
> > > > On Feb 28, 2017, at 21:38, Rodney W. Grimes > > > N85.dnsmgr.net> wrote:
> > > >
> > > > Would it be possible to not do this as 1000 commits?
> > > Yes, but I?m trying to do this in a way that allows me to
> > > backport all of the changes as easily as possible to ^/stable/10
> > > (on the other side of the coin, I?ve run into dependent commits of
> > > other MFCs that required sweeping changes in order to make my
> > > changes possible).
> > > I do think your point is valid though and I can probably strike
> > > some middle ground with my changes. I think grouping it up by 2nd
> > > level directory (like I did with usr.bin/svn) makes the most sense.
> > > Thank you,
> > Yes, that is what I was thinking.??Note that I dont agree with this
> > change,
> > but I have probably missed a discussion that is allowing it to move
> > forward.
> > It makes the logfiles of make output now src tree possition
> > dependent,
> > but I am probalby the only person in the universe that has ever run a
> > diff on the output of make world.
> >
> > It may also be possible to split this into some phases to reduce some
> > of
> > your issues, only do the {.CURDIR}/../../foo -> ${SRCTOP}/bar/foo in
> > one pass and
> > some of the other fixes in another pass.
> >
> >
>
> You're not the only one who has diffed build output logs (I suspect
> anyone who has to maintain a non-trivial build infrastructure has done
> so), and you're not the only one who thinks that changing relative
> paths to absolute is a bad idea.
Was there any @developers or @hackers discussion on this before
such a wide sweeping and non-trival change was undertaken? I may
of wrongly assumed that this was discussed and though to be a good
idea for some reason(s).
--
Rod Grimes rgri...@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: r314473 - head
On Wed, Mar 1, 2017 at 9:04 AM, Rodney W. Grimes wrote: >> On Tue, Feb 28, 2017 at 10:45 PM, Rodney W. Grimes >> wrote: >> >> Author: imp >> >> Date: Wed Mar 1 05:05:05 2017 >> >> New Revision: 314473 >> >> URL: https://svnweb.freebsd.org/changeset/base/314473 >> >> >> >> Log: >> >> Create README.md file for viewing on github. >> >> >> >> This is a lightly edited README using github's MARKDOWN. >> >> >> >> Submitted by: Johan >> >> Pull Request: https://github.com/freebsd/freebsd/pull/56 >> >> >> >> Added: >> >> head/README.md (contents, props changed) >> >> >> >> Added: head/README.md >> >> == >> >> --- /dev/null 00:00:00 1970 (empty, because file is newly added) >> >> +++ head/README.mdWed Mar 1 05:05:05 2017(r314473) >> >> @@ -0,0 +1,86 @@ >> >> +FreeBSD Source: >> >> +--- >> >> +This is the top level of the FreeBSD source directory. This file >> >> +was last revised on: >> >> +$FreeBSD$ >> >> + >> >> +For copyright information, please see the file COPYRIGHT in this >> >> +directory (additional copyright information also exists for some >> >> +sources in this tree - please see the specific source directories for >> >> +more information). >> >> + >> >> +The Makefile in this directory supports a number of targets for >> >> +building components (or all) of the FreeBSD source tree. See build(7) >> >> +and >> >> http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html >> >> +for more information, including setting make(1) variables. >> >> + >> >> +The `buildkernel` and `installkernel` targets build and install >> >> +the kernel and the modules (see below). Please see the top of >> >> +the Makefile in this directory for more information on the >> >> +standard build targets and compile-time flags. >> >> + >> >> +Building a kernel is a somewhat more involved process. See build(7), >> >> config(8), >> >> +and >> >> http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html >> >> +for more information. >> >> + >> >> +Note: If you want to build and install the kernel with the >> >> +`buildkernel` and `installkernel` targets, you might need to build >> >> +world before. More information is available in the handbook. >> >> + >> >> +The kernel configuration files reside in the `sys//conf` >> >> +sub-directory. GENERIC is the default configuration used in release >> >> builds. >> >> +NOTES contains entries and documentation for all possible >> >> +devices, not just those commonly used. >> >> + >> >> + >> >> +Source Roadmap: >> >> +--- >> > >> > Is there someway this can be a pointer to the usr/src part of >> > hier(7) and have hier(7) updated to reflect current reality? >> > >> > Also lots and lots of trailing white space... >> > >> > This should be a pointer to hier(7) >> >> It's a verbatim copy of README converted to markdown. Maybe README >> should be fixed and this regenerated. > > Yes, but then couldnt this be a pointer to readme? We have this > documented now in 3 places that are gona just get further out > of sync. Or at least add a note to README that says you need > to update README.md if you touch this file. README changes about once every other year. Not worth the churn. >> The trailing whitespace is part >> of the conversion and not a mistake. > > I have learned this now and responded else where. It appears > that there are ways to do this in markdown without using > trailing double spaces as a syntax item. > >> If you want to update README and hier(7) and have README.md generated >> from that automatically, be my guest. None of that was in the >> submission, and the submission was useful as it was. > > I agree that the submission is useful, as the README.md file, > just would like to see some polish put on it so it doesnt > suffer the same bitrot that hier(7) has. I can't see what polish we could put here that would prevent that. If heir(7) is so horrible, fix it. Looking at it now shows just a tiny bit of rot in /usr/include and maybe /usr/share/doc. Warner ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r314473 - head
[ Charset UTF-8 unsupported, converting... ] > On 1 March 2017 at 09:58, Warner Losh wrote: > > > > It's a verbatim copy of README converted to markdown. Maybe README > > should be fixed and this regenerated. The trailing whitespace is part > > of the conversion and not a mistake. > > I think the whitespace is a mistake, since the markdown version is > rendered in variable width with proportional font, so hard 80-col > wrapping is undesirable. I've removed the whitespace in r314495. Thank you Ed, this makes much more sense for me too. > > If you want to update README and hier(7) and have README.md generated > > from that automatically, be my guest. None of that was in the > > submission, and the submission was useful as it was. > > I'm happy for us to have a README.md although we now have the issue of > keeping them in sync (if we want to). I have no objection what so ever to the README.md file. > There are some minor things that we don't want to make completely > identical -- for example, the rendered version claims "This file was > last revised on: $FreeBSD$" because the svn-git exporter does not > expand $FreeBSD$. I think we ought to just remove that sentence from > the markdown version. What about a From: line using the $FreeBSD$ of README? At least that might give some a notion that they should change README if they find something wrong in README.md? > Perhaps this suggests we don't try to keep them in sync, which is > likely fine as they'll generally be seen by different groups of people > (markdown for those browsing the project on GitHub, plain README for > those with an installed source tree). I would think 2 files with the same basename of README being used by 2 different groups for the same purpose, a map of the src, should be syncronized some how. -- Rod Grimes rgri...@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: r314473 - head
> On Wed, Mar 1, 2017 at 9:04 AM, Rodney W. Grimes > wrote: > >> On Tue, Feb 28, 2017 at 10:45 PM, Rodney W. Grimes > >> wrote: > >> >> Author: imp > >> >> Date: Wed Mar 1 05:05:05 2017 > >> >> New Revision: 314473 > >> >> URL: https://svnweb.freebsd.org/changeset/base/314473 > >> >> > >> >> Log: > >> >> Create README.md file for viewing on github. > >> >> > >> >> This is a lightly edited README using github's MARKDOWN. > >> >> > >> >> Submitted by: Johan > >> >> Pull Request: https://github.com/freebsd/freebsd/pull/56 > >> >> > >> >> Added: > >> >> head/README.md (contents, props changed) > >> >> > >> >> Added: head/README.md > >> >> == > >> >> --- /dev/null 00:00:00 1970 (empty, because file is newly added) > >> >> +++ head/README.mdWed Mar 1 05:05:05 2017(r314473) > >> >> @@ -0,0 +1,86 @@ > >> >> +FreeBSD Source: > >> >> +--- > >> >> +This is the top level of the FreeBSD source directory. This file > >> >> +was last revised on: > >> >> +$FreeBSD$ > >> >> + > >> >> +For copyright information, please see the file COPYRIGHT in this > >> >> +directory (additional copyright information also exists for some > >> >> +sources in this tree - please see the specific source directories for > >> >> +more information). > >> >> + > >> >> +The Makefile in this directory supports a number of targets for > >> >> +building components (or all) of the FreeBSD source tree. See build(7) > >> >> +and > >> >> http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html > >> >> +for more information, including setting make(1) variables. > >> >> + > >> >> +The `buildkernel` and `installkernel` targets build and install > >> >> +the kernel and the modules (see below). Please see the top of > >> >> +the Makefile in this directory for more information on the > >> >> +standard build targets and compile-time flags. > >> >> + > >> >> +Building a kernel is a somewhat more involved process. See build(7), > >> >> config(8), > >> >> +and > >> >> http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html > >> >> +for more information. > >> >> + > >> >> +Note: If you want to build and install the kernel with the > >> >> +`buildkernel` and `installkernel` targets, you might need to build > >> >> +world before. More information is available in the handbook. > >> >> + > >> >> +The kernel configuration files reside in the `sys//conf` > >> >> +sub-directory. GENERIC is the default configuration used in release > >> >> builds. > >> >> +NOTES contains entries and documentation for all possible > >> >> +devices, not just those commonly used. > >> >> + > >> >> + > >> >> +Source Roadmap: > >> >> +--- > >> > > >> > Is there someway this can be a pointer to the usr/src part of > >> > hier(7) and have hier(7) updated to reflect current reality? > >> > > >> > Also lots and lots of trailing white space... > >> > > >> > This should be a pointer to hier(7) > >> > >> It's a verbatim copy of README converted to markdown. Maybe README > >> should be fixed and this regenerated. > > > > Yes, but then couldnt this be a pointer to readme? We have this > > documented now in 3 places that are gona just get further out > > of sync. Or at least add a note to README that says you need > > to update README.md if you touch this file. > > README changes about once every other year. Not worth the churn. And exactly what makes it a bad idea to have the same infromation stored in 2, now 3 different places. With no pointers to the duplicated data for a human to follow it almost makes it certain that things well diverge. > >> The trailing whitespace is part > >> of the conversion and not a mistake. > > > > I have learned this now and responded else where. It appears > > that there are ways to do this in markdown without using > > trailing double spaces as a syntax item. > > > >> If you want to update README and hier(7) and have README.md generated > >> from that automatically, be my guest. None of that was in the > >> submission, and the submission was useful as it was. > > > > I agree that the submission is useful, as the README.md file, > > just would like to see some polish put on it so it doesnt > > suffer the same bitrot that hier(7) has. > > I can't see what polish we could put here that would prevent that. If > heir(7) is so horrible, fix it. Looking at it now shows just a tiny > bit of rot in /usr/include and maybe /usr/share/doc. There are 21 directors in /usr/src, 20 of them documented in README, 18 of them documented in hier(7). I'll rectifiy this if and when I get my commit bit. -- Rod Grimes rgri...@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: r314464 - head/usr.sbin/yppush
On Wed, Mar 01, 2017 at 08:54:51AM -0700, Ian Lepore wrote: > ... > You're not the only one who has diffed build output logs (I suspect > anyone who has to maintain a non-trivial build infrastructure has done > so), and you're not the only one who thinks that changing relative > paths to absolute is a bad idea. +1. Relative paths are so much nicer (and they are usually shorter as well). I didn't respond to these changes only because .CURDIR itself is expanded to a full path, so arguing if one wants some ../../ within what's inherently starts with a slash seems pointless. ./danfe ___ 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: r314464 - head/usr.sbin/yppush
> On Wed, Mar 01, 2017 at 08:54:51AM -0700, Ian Lepore wrote:
> > ...
> > You're not the only one who has diffed build output logs (I suspect
> > anyone who has to maintain a non-trivial build infrastructure has done
> > so), and you're not the only one who thinks that changing relative
> > paths to absolute is a bad idea.
>
> +1. Relative paths are so much nicer (and they are usually shorter as
> well). I didn't respond to these changes only because .CURDIR itself
> is expanded to a full path, so arguing if one wants some ../../ within
> what's inherently starts with a slash seems pointless.
True, in the normal use relative paths are shorter, but in how this
actually all goes about the use of ${SRCTOP} vs ${.CURDIR} yeilds
both short strings in the Makefile, and shorter output in the log.
Your reasoning is also why I was somewhat quiet on it when I saw it
start to be merged into -stable, which was the first place I saw it.
I *thought* at that point the whole of -current had already been
converted and this was just coming over with other nearby changes.
I believe we have some other full path things that have crept
forward into the production release, but that may be in ports
only. Nope bad full paths links I found in just a few seconds:
lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chfn -> /usr/bin/chpass
lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chsh -> /usr/bin/chpass
lrwxr-xr-x 1 root wheel 7 Nov 30 02:27 cpio -> bsdcpio
lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 mailq ->
/usr/sbin/mailwrapper
lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 newaliases ->
/usr/sbin/mailwrapper
lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pgrep -> /bin/pgrep
lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pkill -> /bin/pkill
lrwxr-xr-x 1 root wheel 6 Nov 30 02:27 tar -> bsdtar
lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 ypchfn -> /usr/bin/chpass
lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 ypchpass -> /usr/bin/chpass
lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 ypchsh -> /usr/bin/chpass
lrwxr-xr-x 1 root wheel 15 Nov 30 02:27 yppasswd -> /usr/bin/passwd
This breaks the abilty to mv usr/bin and have the right stuff
happen if you invoke usr/bin.moved/mailq.
--
Rod Grimes rgri...@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: r314464 - head/usr.sbin/yppush
On Wed, Mar 01, 2017 at 08:43:55AM -0800, Rodney W. Grimes wrote: > I believe we have some other full path things that have crept > forward into the production release, but that may be in ports > only. Nope bad full paths links I found in just a few seconds: > > lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chfn -> /usr/bin/chpass > lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chsh -> /usr/bin/chpass > lrwxr-xr-x 1 root wheel 7 Nov 30 02:27 cpio -> bsdcpio > lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 mailq -> > /usr/sbin/mailwrapper > lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 newaliases -> > /usr/sbin/mailwrapper > lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pgrep -> /bin/pgrep > lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pkill -> /bin/pkill > [...] Jeez, this is all so bogus! Imagine accessing those remotely via NFS mount and watch things break hell in all weird ways. :-( ./danfe ___ 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: r314464 - head/usr.sbin/yppush
On Wed, Mar 01, 2017 at 08:43:55AM -0800, Rodney W. Grimes wrote:
> > On Wed, Mar 01, 2017 at 08:54:51AM -0700, Ian Lepore wrote:
> > > ...
> > > You're not the only one who has diffed build output logs (I suspect
> > > anyone who has to maintain a non-trivial build infrastructure has done
> > > so), and you're not the only one who thinks that changing relative
> > > paths to absolute is a bad idea.
> >
> > +1. Relative paths are so much nicer (and they are usually shorter as
> > well). I didn't respond to these changes only because .CURDIR itself
> > is expanded to a full path, so arguing if one wants some ../../ within
> > what's inherently starts with a slash seems pointless.
>
> True, in the normal use relative paths are shorter, but in how this
> actually all goes about the use of ${SRCTOP} vs ${.CURDIR} yeilds
> both short strings in the Makefile, and shorter output in the log.
And making the logs with relative path would actually be hard given how make
works or maybe I'm missing something
>
> Your reasoning is also why I was somewhat quiet on it when I saw it
> start to be merged into -stable, which was the first place I saw it.
> I *thought* at that point the whole of -current had already been
> converted and this was just coming over with other nearby changes.
>
> I believe we have some other full path things that have crept
> forward into the production release, but that may be in ports
> only. Nope bad full paths links I found in just a few seconds:
>
> lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chfn -> /usr/bin/chpass
> lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chsh -> /usr/bin/chpass
> lrwxr-xr-x 1 root wheel 7 Nov 30 02:27 cpio -> bsdcpio
> lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 mailq ->
> /usr/sbin/mailwrapper
> lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 newaliases ->
> /usr/sbin/mailwrapper
> lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pgrep -> /bin/pgrep
> lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pkill -> /bin/pkill
> lrwxr-xr-x 1 root wheel 6 Nov 30 02:27 tar -> bsdtar
> lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 ypchfn -> /usr/bin/chpass
> lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 ypchpass -> /usr/bin/chpass
> lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 ypchsh -> /usr/bin/chpass
> lrwxr-xr-x 1 root wheel 15 Nov 30 02:27 yppasswd -> /usr/bin/passwd
>
> This breaks the abilty to mv usr/bin and have the right stuff
> happen if you invoke usr/bin.moved/mailq.
Almost every was with absolute path for the symlinks, we have changed "recently"
most (all?) of the symlinks for libraries (.so files) into relative to be able
to have a proper sysroot, and yes I agree we should go further and make all the
symlinks relative which is very easy install just add the option -l sr and magic
happen :)
Best regards,
Bapt
signature.asc
Description: PGP signature
Re: svn commit: r314362 - in head/sys: arm/at91 arm/cavium/cns11xx arm/nvidia arm/xscale/i8134x arm/xscale/ixp425 arm/xscale/pxa dev/uart mips/adm5120 mips/alchemy mips/atheros mips/atheros/ar531x mip
On 27 February 2017 at 15:08, Ruslan Bukin wrote: > Author: br > Date: Mon Feb 27 20:08:42 2017 > New Revision: 314362 > URL: https://svnweb.freebsd.org/changeset/base/314362 Tinderbox build is currently failing in mips XLP, XLP64, XLPN32 with: In file included from /scratch/tmp/emaste/freebsd/sys/mips/nlm/xlp_pci.c:51: /scratch/tmp/emaste/freebsd/sys/dev/uart/uart.h: In function 'uart_getreg': /scratch/tmp/emaste/freebsd/sys/dev/uart/uart.h:57: warning: implicit declaration of function 'bus_space_read_4' ___ 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: r314464 - head/usr.sbin/yppush
-- Start of PGP signed section.
> On Wed, Mar 01, 2017 at 08:43:55AM -0800, Rodney W. Grimes wrote:
> > > On Wed, Mar 01, 2017 at 08:54:51AM -0700, Ian Lepore wrote:
> > > > ...
> > > > You're not the only one who has diffed build output logs (I suspect
> > > > anyone who has to maintain a non-trivial build infrastructure has done
> > > > so), and you're not the only one who thinks that changing relative
> > > > paths to absolute is a bad idea.
> > >
> > > +1. Relative paths are so much nicer (and they are usually shorter as
> > > well). I didn't respond to these changes only because .CURDIR itself
> > > is expanded to a full path, so arguing if one wants some ../../ within
> > > what's inherently starts with a slash seems pointless.
> >
> > True, in the normal use relative paths are shorter, but in how this
> > actually all goes about the use of ${SRCTOP} vs ${.CURDIR} yeilds
> > both short strings in the Makefile, and shorter output in the log.
>
> And making the logs with relative path would actually be hard given how make
> works or maybe I'm missing something
Yes, iirc even the output from make -n well have the pathnames all
expanded to full lengths. I dont believe there is any short way
to fix that.
> > Your reasoning is also why I was somewhat quiet on it when I saw it
> > start to be merged into -stable, which was the first place I saw it.
> > I *thought* at that point the whole of -current had already been
> > converted and this was just coming over with other nearby changes.
> >
> > I believe we have some other full path things that have crept
> > forward into the production release, but that may be in ports
> > only. Nope bad full paths links I found in just a few seconds:
> >
> > lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chfn -> /usr/bin/chpass
> > lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chsh -> /usr/bin/chpass
> > lrwxr-xr-x 1 root wheel 7 Nov 30 02:27 cpio -> bsdcpio
> > lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 mailq ->
> > /usr/sbin/mailwrapper
> > lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 newaliases ->
> > /usr/sbin/mailwrapper
> > lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pgrep -> /bin/pgrep
> > lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pkill -> /bin/pkill
> > lrwxr-xr-x 1 root wheel 6 Nov 30 02:27 tar -> bsdtar
> > lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 ypchfn -> /usr/bin/chpass
> > lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 ypchpass ->
> > /usr/bin/chpass
> > lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 ypchsh -> /usr/bin/chpass
> > lrwxr-xr-x 1 root wheel 15 Nov 30 02:27 yppasswd ->
> > /usr/bin/passwd
> >
> > This breaks the abilty to mv usr/bin and have the right stuff
> > happen if you invoke usr/bin.moved/mailq.
>
> Almost every was with absolute path for the symlinks, we have changed
> "recently"
> most (all?) of the symlinks for libraries (.so files) into relative to be able
> to have a proper sysroot, and yes I agree we should go further and make all
> the
> symlinks relative which is very easy install just add the option -l sr and
> magic
> happen :)
At one point in history I can promise you that ALL symlinks in the release
where shortest possible relative path. So any absolute links that entered
the system got created by developers who where not aware that they should
always use a relative link for anything landing in DESTDIR. This creates
breakge on so many levels we should make a rapid correction to this
regression.
--
Rod Grimes rgri...@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: r314473 - head
On Wed, Mar 1, 2017 at 9:29 AM, Rodney W. Grimes wrote: > I'll rectifiy this if and when I get my commit bit. In the mean time, you could submit a Bugzilla or a github pull request :) 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: r314496 - head/sys/cam/ctl
Author: mav Date: Wed Mar 1 17:35:56 2017 New Revision: 314496 URL: https://svnweb.freebsd.org/changeset/base/314496 Log: Add check missed in r314257. MFC after:11 days Modified: head/sys/cam/ctl/ctl.c Modified: head/sys/cam/ctl/ctl.c == --- head/sys/cam/ctl/ctl.c Wed Mar 1 15:39:58 2017(r314495) +++ head/sys/cam/ctl/ctl.c Wed Mar 1 17:35:56 2017(r314496) @@ -9550,7 +9550,7 @@ ctl_inquiry_evpd_devid(struct ctl_scsiio if (port && port->port_type == CTL_PORT_FC) proto = SCSI_PROTO_FC << 4; - else if (port->port_type == CTL_PORT_SAS) + else if (port && port->port_type == CTL_PORT_SAS) proto = SCSI_PROTO_SAS << 4; else if (port && port->port_type == CTL_PORT_ISCSI) proto = SCSI_PROTO_ISCSI << 4; ___ 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: r313268 - head/sys/kern [through -r313271 for atomic_fcmpset use and later: fails on PowerMac G5 "Quad Core"; -r313266 works]
On 2017-Feb-28, at 10:13 PM, Mateusz Guzik wrote: On Sat, Feb 25, 2017 at 08:31:04PM +0100, Mateusz Guzik wrote: >> On Sat, Feb 25, 2017 at 09:58:39AM -0800, Mark Millard wrote: >>> Thus the PowerMac G5 so-called "Quad Core" is back to >>> -r313254 without your patches. (The "Quad Core" really has >>> two processors, each with 2 cores.) >>> >> >> >> Thanks a lot for testing. I'll have to think what to do with it, worst >> case I'll #ifdef changes with powerpc. >> > > Should be fixed with r314474. Got a real powerpc to test on (60 cores), > was able to lock it up in seconds. Now it is perfectly stablle. > > -- > Mateusz Guzik The updated so-called "Quad Core" PowerMac G5 used for TARGET_ARCH=powerpc64 was able to do a self hosted buildworld buildkernel for -r314479 just fine. Thanks much for the fixes: Now I can track head again for powerpc64. Summary of the transition interval: So for powerpc64 (and powerpc?) It is a good idea to avoid anything that is after -r313254 and before -r314474 in head. (Would this be appropriate for a UPDATING notice given its span?) There may be other architectures that might have a similar status(?): the last fixes involved were not in Machine Dependent code. (Some architectures are apparently insensitive to the errors, such as amd64). === Mark Millard markmi at dsl-only.net ___ 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: r314497 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: ae Date: Wed Mar 1 18:03:32 2017 New Revision: 314497 URL: https://svnweb.freebsd.org/changeset/base/314497 Log: Do not invoke the resize event when previous provider's size was zero. This is similar to r303637 fix for geom_disk. Reported by: avg Tested by:avg MFC after:1 week Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c == --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c Wed Mar 1 17:35:56 2017(r314496) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c Wed Mar 1 18:03:32 2017(r314497) @@ -278,7 +278,16 @@ zvol_size_changed(zvol_state_t *zv, uint if (pp == NULL) return; g_topology_lock(); - g_resize_provider(pp, zv->zv_volsize); + + /* +* Do not invoke resize event when initial size was zero. +* ZVOL initializes the size on first open, this is not +* real resizing. +*/ + if (pp->mediasize == 0) + pp->mediasize = zv->zv_volsize; + else + g_resize_provider(pp, zv->zv_volsize); g_topology_unlock(); } #endif /* illumos */ ___ 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: r314502 - in head/sys: kern net sys
Author: sbruno
Date: Wed Mar 1 18:37:35 2017
New Revision: 314502
URL: https://svnweb.freebsd.org/changeset/base/314502
Log:
Make gtaskqueue compatible with drm-next such that they can be used with the
linuxkpi tasklets.
Submitted by: mm...@nextbsd.org
Reported by: hps
Modified:
head/sys/kern/subr_gtaskqueue.c
head/sys/net/iflib.c
head/sys/sys/gtaskqueue.h
Modified: head/sys/kern/subr_gtaskqueue.c
==
--- head/sys/kern/subr_gtaskqueue.c Wed Mar 1 18:23:30 2017
(r314501)
+++ head/sys/kern/subr_gtaskqueue.c Wed Mar 1 18:37:35 2017
(r314502)
@@ -52,6 +52,8 @@ static MALLOC_DEFINE(M_GTASKQUEUE, "task
static voidgtaskqueue_thread_enqueue(void *);
static voidgtaskqueue_thread_loop(void *arg);
+TASKQGROUP_DEFINE(softirq, mp_ncpus, 1);
+
struct gtaskqueue_busy {
struct gtask*tb_running;
TAILQ_ENTRY(gtaskqueue_busy) tb_link;
Modified: head/sys/net/iflib.c
==
--- head/sys/net/iflib.cWed Mar 1 18:23:30 2017(r314501)
+++ head/sys/net/iflib.cWed Mar 1 18:37:35 2017(r314502)
@@ -480,7 +480,6 @@ MODULE_VERSION(iflib, 1);
MODULE_DEPEND(iflib, pci, 1, 1, 1);
MODULE_DEPEND(iflib, ether, 1, 1, 1);
-TASKQGROUP_DEFINE(if_io_tqg, mp_ncpus, 1);
TASKQGROUP_DEFINE(if_config_tqg, 1, 1);
#ifndef IFLIB_DEBUG_COUNTERS
@@ -3922,7 +3921,7 @@ iflib_device_deregister(if_ctx_t ctx)
if (ctx->ifc_led_dev != NULL)
led_destroy(ctx->ifc_led_dev);
/* XXX drain any dependent tasks */
- tqg = qgroup_if_io_tqg;
+ tqg = qgroup_softirq;
for (txq = ctx->ifc_txqs, i = 0; i < NTXQSETS(ctx); i++, txq++) {
callout_drain(&txq->ift_timer);
callout_drain(&txq->ift_db_check);
@@ -4552,7 +4551,7 @@ iflib_irq_alloc_generic(if_ctx_t ctx, if
q = &ctx->ifc_txqs[qid];
info = &ctx->ifc_txqs[qid].ift_filter_info;
gtask = &ctx->ifc_txqs[qid].ift_task;
- tqg = qgroup_if_io_tqg;
+ tqg = qgroup_softirq;
fn = _task_fn_tx;
GROUPTASK_INIT(gtask, 0, fn, q);
break;
@@ -4560,7 +4559,7 @@ iflib_irq_alloc_generic(if_ctx_t ctx, if
q = &ctx->ifc_rxqs[qid];
info = &ctx->ifc_rxqs[qid].ifr_filter_info;
gtask = &ctx->ifc_rxqs[qid].ifr_task;
- tqg = qgroup_if_io_tqg;
+ tqg = qgroup_softirq;
fn = _task_fn_rx;
GROUPTASK_INIT(gtask, 0, fn, q);
break;
@@ -4611,13 +4610,13 @@ iflib_softirq_alloc_generic(if_ctx_t ctx
case IFLIB_INTR_TX:
q = &ctx->ifc_txqs[qid];
gtask = &ctx->ifc_txqs[qid].ift_task;
- tqg = qgroup_if_io_tqg;
+ tqg = qgroup_softirq;
fn = _task_fn_tx;
break;
case IFLIB_INTR_RX:
q = &ctx->ifc_rxqs[qid];
gtask = &ctx->ifc_rxqs[qid].ifr_task;
- tqg = qgroup_if_io_tqg;
+ tqg = qgroup_softirq;
fn = _task_fn_rx;
break;
case IFLIB_INTR_IOV:
@@ -4661,7 +4660,7 @@ iflib_legacy_setup(if_ctx_t ctx, driver_
q = &ctx->ifc_rxqs[0];
info = &rxq[0].ifr_filter_info;
gtask = &rxq[0].ifr_task;
- tqg = qgroup_if_io_tqg;
+ tqg = qgroup_softirq;
tqrid = irq->ii_rid = *rid;
fn = _task_fn_rx;
@@ -4678,7 +4677,7 @@ iflib_legacy_setup(if_ctx_t ctx, driver_
taskqgroup_attach(tqg, gtask, q, tqrid, name);
GROUPTASK_INIT(&txq->ift_task, 0, _task_fn_tx, txq);
- taskqgroup_attach(qgroup_if_io_tqg, &txq->ift_task, txq, tqrid, "tx");
+ taskqgroup_attach(qgroup_softirq, &txq->ift_task, txq, tqrid, "tx");
return (0);
}
@@ -4728,7 +4727,7 @@ void
iflib_io_tqg_attach(struct grouptask *gt, void *uniq, int cpu, char *name)
{
- taskqgroup_attach_cpu(qgroup_if_io_tqg, gt, uniq, cpu, -1, name);
+ taskqgroup_attach_cpu(qgroup_softirq, gt, uniq, cpu, -1, name);
}
void
Modified: head/sys/sys/gtaskqueue.h
==
--- head/sys/sys/gtaskqueue.h Wed Mar 1 18:23:30 2017(r314501)
+++ head/sys/sys/gtaskqueue.h Wed Mar 1 18:37:35 2017(r314502)
@@ -119,5 +119,6 @@ SYSINIT(taskqgroup_adj_##name, SI_SUB_SM
#endif /* EARLY_AP_STARTUP */
TASKQGROUP_DECLARE(net);
+TASKQGROUP_DECLARE(softirq);
#endif /* !_SYS_GTASKQUEUE_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: r314504 - head/sys/boot/zfs
Author: tsoome Date: Wed Mar 1 19:02:43 2017 New Revision: 314504 URL: https://svnweb.freebsd.org/changeset/base/314504 Log: loader: r314112 did introduce dereference freed pointer entry CID: 1371675 Reported by: Coverity Reviewed by: jhb, allanjude Approved by: allanjude (mentor) Differential Revision:https://reviews.freebsd.org/D9846 Modified: head/sys/boot/zfs/zfsimpl.c Modified: head/sys/boot/zfs/zfsimpl.c == --- head/sys/boot/zfs/zfsimpl.c Wed Mar 1 18:53:05 2017(r314503) +++ head/sys/boot/zfs/zfsimpl.c Wed Mar 1 19:02:43 2017(r314504) @@ -2334,7 +2334,7 @@ zfs_lookup(const struct zfsmount *mount, char path[1024]; int symlinks_followed = 0; struct stat sb; - struct obj_list *entry; + struct obj_list *entry, *tentry; STAILQ_HEAD(, obj_list) on_cache = STAILQ_HEAD_INITIALIZER(on_cache); spa = mount->spa; @@ -2482,7 +2482,7 @@ zfs_lookup(const struct zfsmount *mount, *dnode = dn; done: - STAILQ_FOREACH(entry, &on_cache, entry) + STAILQ_FOREACH_SAFE(entry, &on_cache, entry, tentry) free(entry); return (rc); } ___ 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: r314505 - in head/sys/boot: arm/uboot powerpc/kboot powerpc/ofw powerpc/ps3 powerpc/uboot userboot/userboot
Author: pfg
Date: Wed Mar 1 19:36:32 2017
New Revision: 314505
URL: https://svnweb.freebsd.org/changeset/base/314505
Log:
Split the ficl CFLAGS when they refer to an arch-specific include path.
This is a minimal attempt to keep consistency in the Makefiles so that
moving ficl to somwehere like contrib will be less error prone.
MFC after:1 week
Modified:
head/sys/boot/arm/uboot/Makefile
head/sys/boot/powerpc/kboot/Makefile
head/sys/boot/powerpc/ofw/Makefile
head/sys/boot/powerpc/ps3/Makefile
head/sys/boot/powerpc/uboot/Makefile
head/sys/boot/userboot/userboot/Makefile
Modified: head/sys/boot/arm/uboot/Makefile
==
--- head/sys/boot/arm/uboot/MakefileWed Mar 1 19:02:43 2017
(r314504)
+++ head/sys/boot/arm/uboot/MakefileWed Mar 1 19:36:32 2017
(r314505)
@@ -80,7 +80,8 @@ LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a
.if ${MK_FORTH} != "no"
# Enable BootForth
BOOT_FORTH=yes
-CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/arm
+CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl
+CFLAGS+= -I${.CURDIR}/../../ficl/arm
LIBFICL= ${.OBJDIR}/../../ficl/libficl.a
.endif
Modified: head/sys/boot/powerpc/kboot/Makefile
==
--- head/sys/boot/powerpc/kboot/MakefileWed Mar 1 19:02:43 2017
(r314504)
+++ head/sys/boot/powerpc/kboot/MakefileWed Mar 1 19:36:32 2017
(r314505)
@@ -64,7 +64,8 @@ LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a
.if ${MK_FORTH} != "no"
# Enable BootForth
BOOT_FORTH=yes
-CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl
-I${.CURDIR}/../../ficl/powerpc
+CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl
+CFLAGS+= -I${.CURDIR}/../../ficl/powerpc
LIBFICL= ${.OBJDIR}/../../ficl/libficl.a
.endif
Modified: head/sys/boot/powerpc/ofw/Makefile
==
--- head/sys/boot/powerpc/ofw/Makefile Wed Mar 1 19:02:43 2017
(r314504)
+++ head/sys/boot/powerpc/ofw/Makefile Wed Mar 1 19:36:32 2017
(r314505)
@@ -63,7 +63,8 @@ LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a
.if ${MK_FORTH} != "no"
# Enable BootForth
BOOT_FORTH=yes
-CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl
-I${.CURDIR}/../../ficl/powerpc
+CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl
+CFLAGS+= -I${.CURDIR}/../../ficl/powerpc
LIBFICL= ${.OBJDIR}/../../ficl/libficl.a
.endif
Modified: head/sys/boot/powerpc/ps3/Makefile
==
--- head/sys/boot/powerpc/ps3/Makefile Wed Mar 1 19:02:43 2017
(r314504)
+++ head/sys/boot/powerpc/ps3/Makefile Wed Mar 1 19:36:32 2017
(r314505)
@@ -64,7 +64,8 @@ LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a
.if ${MK_FORTH} != "no"
# Enable BootForth
BOOT_FORTH=yes
-CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl
-I${.CURDIR}/../../ficl/powerpc
+CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl
+CFLAGS+= -I${.CURDIR}/../../ficl/powerpc
LIBFICL= ${.OBJDIR}/../../ficl/libficl.a
.endif
Modified: head/sys/boot/powerpc/uboot/Makefile
==
--- head/sys/boot/powerpc/uboot/MakefileWed Mar 1 19:02:43 2017
(r314504)
+++ head/sys/boot/powerpc/uboot/MakefileWed Mar 1 19:36:32 2017
(r314505)
@@ -69,7 +69,8 @@ LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a
.if ${MK_FORTH} != "no"
# Enable BootForth
BOOT_FORTH=yes
-CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl
-I${.CURDIR}/../../ficl/powerpc
+CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl
+CFLAGS+= -I${.CURDIR}/../../ficl/powerpc
LIBFICL= ${.OBJDIR}/../../ficl/libficl.a
.endif
Modified: head/sys/boot/userboot/userboot/Makefile
==
--- head/sys/boot/userboot/userboot/MakefileWed Mar 1 19:02:43 2017
(r314504)
+++ head/sys/boot/userboot/userboot/MakefileWed Mar 1 19:36:32 2017
(r314505)
@@ -43,7 +43,8 @@ NEWVERSWHAT= "User boot" ${MACHINE_CPUAR
.if ${MK_FORTH} != "no"
BOOT_FORTH=yes
-CFLAGS+=-DBOOT_FORTH -I${.CURDIR}/../../ficl
-I${.CURDIR}/../../ficl/i386
+CFLAGS+=-DBOOT_FORTH -I${.CURDIR}/../../ficl
+CFLAGS+=-I${.CURDIR}/../../ficl/i386
CFLAGS+= -DBF_DICTSIZE=15000
LIBFICL= ${.OBJDIR}/../ficl/libficl.a
.endif
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r314507 - in head/sys/netpfil/ipfw: . nptv6
Author: ae
Date: Wed Mar 1 20:00:19 2017
New Revision: 314507
URL: https://svnweb.freebsd.org/changeset/base/314507
Log:
Fix NPTv6 rule counters when one_pass is not enabled.
Consider the rule matching when both @done and @retval values
returned from ipfw_run_eaction() are zero. And modify ipfw_nptv6()
to return IP_FW_DENY and @done=0 when addresses do not match.
Obtained from:Yandex LLC
Sponsored by: Yandex LLC
Modified:
head/sys/netpfil/ipfw/ip_fw2.c
head/sys/netpfil/ipfw/nptv6/nptv6.c
Modified: head/sys/netpfil/ipfw/ip_fw2.c
==
--- head/sys/netpfil/ipfw/ip_fw2.c Wed Mar 1 19:55:04 2017
(r314506)
+++ head/sys/netpfil/ipfw/ip_fw2.c Wed Mar 1 20:00:19 2017
(r314507)
@@ -2565,6 +2565,13 @@ do {
\
l = 0; /* in any case exit inner loop */
retval = ipfw_run_eaction(chain, args,
cmd, &done);
+ /*
+* If both @retval and @done are zero,
+* consider this as rule matching and
+* update counters.
+*/
+ if (retval == 0 && done == 0)
+ IPFW_INC_RULE_COUNTER(f, pktlen);
break;
default:
Modified: head/sys/netpfil/ipfw/nptv6/nptv6.c
==
--- head/sys/netpfil/ipfw/nptv6/nptv6.c Wed Mar 1 19:55:04 2017
(r314506)
+++ head/sys/netpfil/ipfw/nptv6/nptv6.c Wed Mar 1 20:00:19 2017
(r314507)
@@ -352,24 +352,24 @@ ipfw_nptv6(struct ip_fw_chain *chain, st
int ret;
*done = 0; /* try next rule if not matched */
+ ret = IP_FW_DENY;
icmd = cmd + 1;
if (cmd->opcode != O_EXTERNAL_ACTION ||
cmd->arg1 != V_nptv6_eid ||
icmd->opcode != O_EXTERNAL_INSTANCE ||
(cfg = NPTV6_LOOKUP(chain, icmd)) == NULL)
- return (0);
+ return (ret);
/*
* We need act as router, so when forwarding is disabled -
* do nothing.
*/
if (V_ip6_forwarding == 0 || args->f_id.addr_type != 6)
- return (0);
+ return (ret);
/*
* NOTE: we expect ipfw_chk() did m_pullup() up to upper level
* protocol's headers. Also we skip some checks, that ip6_input(),
* ip6_forward(), ip6_fastfwd() and ipfw_chk() already did.
*/
- ret = IP_FW_DENY;
ip6 = mtod(args->m, struct ip6_hdr *);
NPTV6_IPDEBUG("eid %u, oid %u, %s -> %s %d",
cmd->arg1, icmd->arg1,
@@ -384,15 +384,15 @@ ipfw_nptv6(struct ip_fw_chain *chain, st
*/
if (IN6_ARE_MASKED_ADDR_EQUAL(&ip6->ip6_dst,
&cfg->internal, &cfg->mask))
- return (0);
+ return (ret);
ret = nptv6_rewrite_internal(cfg, &args->m, 0);
} else if (IN6_ARE_MASKED_ADDR_EQUAL(&ip6->ip6_dst,
&cfg->external, &cfg->mask))
ret = nptv6_rewrite_external(cfg, &args->m, 0);
else
- return (0);
+ return (ret);
/*
-* If address wasn't rewrited - free mbuf.
+* If address wasn't rewrited - free mbuf and terminate the search.
*/
if (ret != 0) {
if (args->m != NULL) {
@@ -400,14 +400,16 @@ ipfw_nptv6(struct ip_fw_chain *chain, st
args->m = NULL; /* mark mbuf as consumed */
}
NPTV6STAT_INC(cfg, dropped);
- }
- /* Terminate the search if one_pass is set */
- *done = V_fw_one_pass;
- /* Update args->f_id when one_pass is off */
- if (*done == 0 && ret == 0) {
- ip6 = mtod(args->m, struct ip6_hdr *);
- args->f_id.src_ip6 = ip6->ip6_src;
- args->f_id.dst_ip6 = ip6->ip6_dst;
+ *done = 1;
+ } else {
+ /* Terminate the search if one_pass is set */
+ *done = V_fw_one_pass;
+ /* Update args->f_id when one_pass is off */
+ if (*done == 0) {
+ ip6 = mtod(args->m, struct ip6_hdr *);
+ args->f_id.src_ip6 = ip6->ip6_src;
+ args->f_id.dst_ip6 = ip6->ip6_dst;
+ }
}
return (ret);
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r314404 - head/sys/compat/linux
On Tue, Feb 28, 2017 at 12:00:41PM -0800, Conrad Meyer wrote: > On Tue, Feb 28, 2017 at 11:55 AM, Dmitry Chagin wrote: > > Author: dchagin > > Date: Tue Feb 28 19:55:16 2017 > > New Revision: 314404 > > URL: https://svnweb.freebsd.org/changeset/base/314404 > > > > Log: > > Linux epoll return EEXIST on case when op is EPOLL_CTL_ADD, and the > > supplied > > file descriptor fd is already registered with this epoll instance. > > Hi Dmitry, > > Do we have an automated test suite for epoll behavior compliance? If > you have some existing test programs you're using to determine > compatibility, it would be good to adapt those to a test framework and > commit them as well. usually we use LTP and glibc (NPTL) tests. Feel free to adapt it ___ 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: r314509 - head/sys/dev/cxgbe/iw_cxgbe
Author: np Date: Wed Mar 1 20:23:21 2017 New Revision: 314509 URL: https://svnweb.freebsd.org/changeset/base/314509 Log: cxgbe/iw_cxgbe: Do not check the size of the memory region being registered. T4/5/6 have no internal limit on this size. This is probably a copy paste from the T3 iw_cxgb driver. MFC after:3 days Sponsored by: Chelsio Communications Modified: head/sys/dev/cxgbe/iw_cxgbe/mem.c Modified: head/sys/dev/cxgbe/iw_cxgbe/mem.c == --- head/sys/dev/cxgbe/iw_cxgbe/mem.c Wed Mar 1 20:22:25 2017 (r314508) +++ head/sys/dev/cxgbe/iw_cxgbe/mem.c Wed Mar 1 20:23:21 2017 (r314509) @@ -341,9 +341,6 @@ static int build_phys_page_list(struct i PAGE_SIZE - 1) & PAGE_MASK; } - if (*total_size > 0xULL) - return -ENOMEM; - /* Find largest page shift we can use to cover buffers */ for (*shift = PAGE_SHIFT; *shift < 27; ++(*shift)) if ((1ULL << *shift) & mask) ___ 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: r314404 - head/sys/compat/linux
But I think, the case is to run compiled/built-on-linux on FreeBSD. -- Best regards, MMokhi. ___ 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: r313006 - in head: sys/conf sys/libkern sys/libkern/x86 sys/sys tests/sys/kern
Hi Bruce,
On my laptop (Intel(R) Core(TM) i5-3320M CPU — Ivy Bridge) I still see
a little worse performance with this patch. Please excuse the ugly
graphs, I don't have a better graphing tool set up at this time:
https://people.freebsd.org/~cem/crc32/sse42_bde.png
https://people.freebsd.org/~cem/crc32/sse42_bde_log.png
Best,
Conrad
On Mon, Feb 27, 2017 at 6:27 PM, Bruce Evans wrote:
> On Mon, 27 Feb 2017, Conrad Meyer wrote:
>
>> On Thu, Feb 2, 2017 at 12:29 PM, Bruce Evans wrote:
>>>
>>> I've almost finished fixing and optimizing this. I didn't manage to fix
>>> all the compiler pessimizations, but the result is within 5% of optimal
>>> for buffers larger than a few K.
>>
>>
>> Did you ever get to a final patch that you are satisfied with? It
>> would be good to get this improvement into the tree.
>
>
> I'm happy with this version (attached and partly enclosed). You need to
> test it in the kernel and commit it (I on;y did simple correctness tests
> in userland).
>
> X Index: conf/files.amd64
> X ===
> X --- conf/files.amd64 (revision 314363)
> X +++ conf/files.amd64 (working copy)
> X @@ -545,6 +545,9 @@
> X isa/vga_isa.coptionalvga
> X kern/kern_clocksource.c standard
> X kern/link_elf_obj.c standard
> X +libkern/x86/crc32_sse42.cstandard
> X +libkern/memmove.cstandard
> X +libkern/memset.c standard
>
> Also fix some nearby disorder.
>
> X ...
> X Index: libkern/x86/crc32_sse42.c
> X ===
> X --- libkern/x86/crc32_sse42.c (revision 314363)
> X +++ libkern/x86/crc32_sse42.c (working copy)
> X @@ -31,15 +31,41 @@
> X */
> X #ifdef USERSPACE_TESTING
> X #include
> X +#include
> X #else
> X #include
> X +#include
> X #include
> X -#include
> X -#include
> X #endif
>
> Also fix minor #include errors.
>
> X X -#include
> X +static __inline uint32_t
> X +_mm_crc32_u8(uint32_t x, uint8_t y)
> X +{
> X + /*
> X + * clang (at least 3.9.[0-1]) pessimizes "rm" (y) and "m" (y)
> X + * significantly and "r" (y) a lot by copying y to a different
> X + * local variable (on the stack or in a register), so only use
> X + * the latter. This costs a register and an instruction but
> X + * not a uop.
> X + */
> X + __asm("crc32b %1,%0" : "+r" (x) : "r" (y));
> X + return (x);
> X +}
>
> Using intrinsics avoids the silly copying via the stack, and allows more
> unrolling. Old gcc does more unrolling with just asms. Unrolling is
> almost useless (some details below).
>
> X @@ -47,12 +73,14 @@
> X * Block sizes for three-way parallel crc computation. LONG and SHORT
> must
> X * both be powers of two.
> X */
> X -#define LONG 8192
> X -#define SHORT256
> X +#define LONG 128
> X +#define SHORT64
>
> These are aggressively low.
>
> Note that small buffers aren't handled very well. SHORT = 64 means that
> a buffer of size 3 * 64 = 192 is handled entirely by the "SHORT" loop.
> 192 is not very small, but any smaller than that and overheads for
> adjustment at the end of the loop are too large for the "SHORT" loop
> to be worth doing. Almost any value of LONG larger than 128 works OK
> now, but if LONG is large then it gives too much work for the "SHORT"
> loop, since normal buffer sizes are not a multiple of 3. E.g., with
> the old LONG and SHORT, a buffer of size 128 was decomposed as 5 * 24K
> (done almost optimally by the "LONG" loop) + 10 * 768 (done a bit less
> optimally by the "SHORT" loop) + 10 * 768 + 64 * 8 (done pessimally).
>
> I didn't get around to ifdefing this for i386. On i386, the loops take
> twice as many crc32 instructions for a given byte count, so the timing
> is satisfed by a byte count half as large, so SHORT and LONG can be
> reduced by a factor of 2 to give faster handling for small buffers without
> affecting the speed for large buffers significantly.
>
> X X /* Tables for hardware crc that shift a crc by LONG and SHORT zeros. */
> X static uint32_t crc32c_long[4][256];
> X +static uint32_t crc32c_2long[4][256];
> X static uint32_t crc32c_short[4][256];
> X +static uint32_t crc32c_2short[4][256];
>
> I didn't get around to updating the comment. 2long shifts by 2*LONG zeros,
> etc.
>
> Shifts by 3N are done by adding shifts by 1N and 2N in parallel. I couldn't
> get the direct 3N shift to run any faster.
>
> X @@ -190,7 +220,11 @@
> X const size_t align = 4;
> X #endif
> X const unsigned char *next, *end;
> X - uint64_t crc0, crc1, crc2; /* need to be 64 bits for crc32q */
> X +#ifdef __amd64__
> X + uint64_t crc0, crc1, crc2;
> X +#else
> X + uint32_t crc0, crc1, crc2;
> X +#endif
> X X next = buf;
> X crc0 = crc;
>
> 64 bits of course isn't needed for i386. It isn't needed for amd64 either.
> I think the crc32 instruction zeros the top 32 bits so they
svn commit: r314520 - head/contrib/dma
Author: bapt
Date: Wed Mar 1 21:42:22 2017
New Revision: 314520
URL: https://svnweb.freebsd.org/changeset/base/314520
Log:
Import dma snapshot from git 2017-02-10
The only change is:
use basename to select executable identity
PR: 216910
Submitted by: Andrej Ebert
Modified:
head/contrib/dma/dma.c
Directory Properties:
head/contrib/dma/ (props changed)
Modified: head/contrib/dma/dma.c
==
--- head/contrib/dma/dma.c Wed Mar 1 21:37:43 2017(r314519)
+++ head/contrib/dma/dma.c Wed Mar 1 21:42:22 2017(r314520)
@@ -47,6 +47,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -457,7 +458,7 @@ main(int argc, char **argv)
bzero(&queue, sizeof(queue));
LIST_INIT(&queue.queue);
- if (strcmp(argv[0], "mailq") == 0) {
+ if (strcmp(basename(argv[0]), "mailq") == 0) {
argv++; argc--;
showq = 1;
if (argc != 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: r314464 - head/usr.sbin/yppush
On Wed, Mar 1, 2017 at 8:57 AM, Alexey Dokuchaev wrote: > On Wed, Mar 01, 2017 at 08:43:55AM -0800, Rodney W. Grimes wrote: >> I believe we have some other full path things that have crept >> forward into the production release, but that may be in ports >> only. Nope bad full paths links I found in just a few seconds: >> >> lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chfn -> /usr/bin/chpass >> lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chsh -> /usr/bin/chpass >> lrwxr-xr-x 1 root wheel 7 Nov 30 02:27 cpio -> bsdcpio >> lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 mailq -> >> /usr/sbin/mailwrapper >> lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 newaliases -> >> /usr/sbin/mailwrapper >> lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pgrep -> /bin/pgrep >> lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pkill -> /bin/pkill >> [...] > > Jeez, this is all so bogus! Imagine accessing those remotely via NFS mount > and watch things break hell in all weird ways. :-( This is completely orthogonal to my changes (and has been in place for a number of years). If you'd like to use relative symlinks for programs, then let's definitely do it as part of another change (personally, I think that some of these items could and should be replaced with hardlinks). Thanks, -Ngie ___ 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: r314464 - head/usr.sbin/yppush
On Wed, Mar 1, 2017 at 9:08 AM, Rodney W. Grimes
wrote:
...
> At one point in history I can promise you that ALL symlinks in the release
> where shortest possible relative path. So any absolute links that entered
> the system got created by developers who where not aware that they should
> always use a relative link for anything landing in DESTDIR. This creates
> breakge on so many levels we should make a rapid correction to this
> regression.
This is why things are that way currently:
$ git blame usr.bin/chpass/Makefile| grep ypchfn
780ae7713f72b (gjb 2016-01-28 01:15:57 + 29) SYMLINKS+=
${BINDIR}/chpass ${BINDIR}/ypchfn
aca2488187113 (wosch 1997-09-13 12:21:25 + 35) MLINKS+= chpass.1
ypchpass.1 chpass.1 ypchfn.1 chpass.1 ypchsh.1
5294f47313a2d (gjb 2016-01-28 02:56:30 + 39) .for i in chpass
chfn chsh ypchpass ypchfn ypchsh
$ git log 780ae7713f72b^..780ae7713f72b
commit 780ae7713f72b471859c0997295ac0c59695c7b4
Author: gjb
Date: Thu Jan 28 01:15:57 2016 +
Ensure mtree(8) recognizes chpass(1) is schg.
Convert hard links to symbolic links, and remove the
'beforeinstall' and 'afterinstall' chflags(8) execution.
Sponsored by: The FreeBSD Foundation
Notes:
svn path=/projects/release-pkg/; revision=294966
BINDIR evaluates to /usr/sbin/, so /usr/sbin/chpass is symlinked to
/usr/sbin/ypchfn . But, there's no reason why the symlink needs to be
hardcoded, or even a symlink at all. Hardlinks would achieve the same
thing here IMHO, but gjb changed it in r294966 to be symlinks.
The point that might be missed is that changing it from absolute paths
to relative paths or otherwise, might break other workflows.. I could
just as easily mount /lib, /usr/lib, /usr/sbin, etc as nullfs
mountpoints and have a working system on a system root where MACHINE
!= TARGET, but this is all orthogonal to my changing
`${.CURDIR}/../../contrib` (e.g. `foo/usr.sbin/yppush/../../contrib`),
etc to ${SRCTOP}/contrib` (e.g. `foo/contrib`).
Thanks,
-Ngie
___
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: r314464 - head/usr.sbin/yppush
On Wed, Mar 1, 2017 at 2:32 PM, Ngie Cooper wrote: ... > This is completely orthogonal to my changes (and has been in place for > a number of years). If you'd like to use relative symlinks for > programs, then let's definitely do it as part of another change > (personally, I think that some of these items could and should be > replaced with hardlinks). Correction: I was making a general statement that turned out to be false (my bad), so I change the "a number of years" portion of my statement to "since 2016". Please see my other reply in the thread for more details. Thanks, -Ngie ___ 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: r314404 - head/sys/compat/linux
On Wed, Mar 1, 2017 at 12:22 PM, Chagin Dmitry wrote: ... > usually we use LTP and glibc (NPTL) tests. Feel free to adapt it LTP would probably be the best way to do this. Please feel free to ping me if you need changes ushered into the project (I'm a contributor there). Thanks, -Ngie ___ 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: r314464 - head/usr.sbin/yppush
On Wed, Mar 01, 2017 at 02:41:23PM -0800, Ngie Cooper wrote:
> On Wed, Mar 1, 2017 at 9:08 AM, Rodney W. Grimes
> wrote:
> ...
> > At one point in history I can promise you that ALL symlinks in the release
> > where shortest possible relative path. So any absolute links that entered
> > the system got created by developers who where not aware that they should
> > always use a relative link for anything landing in DESTDIR. This creates
> > breakge on so many levels we should make a rapid correction to this
> > regression.
>
> This is why things are that way currently:
>
> $ git blame usr.bin/chpass/Makefile| grep ypchfn
> 780ae7713f72b (gjb 2016-01-28 01:15:57 + 29) SYMLINKS+=
> ${BINDIR}/chpass ${BINDIR}/ypchfn
> aca2488187113 (wosch 1997-09-13 12:21:25 + 35) MLINKS+= chpass.1
> ypchpass.1 chpass.1 ypchfn.1 chpass.1 ypchsh.1
> 5294f47313a2d (gjb 2016-01-28 02:56:30 + 39) .for i in chpass
> chfn chsh ypchpass ypchfn ypchsh
For thos in particular I think the right thing is actually to modify install so
if it creates hardlinks with chflags it should first check for chflags, remove
it make the hardlink and reapply. The issue would be that well you break what
chflags are for given you are workarounding it :)
Bapt
signature.asc
Description: PGP signature
svn commit: r314527 - in head: crypto/openssh crypto/openssh/contrib crypto/openssh/contrib/cygwin crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/openssh/openbsd-compat crypto/ope...
Author: des Date: Thu Mar 2 00:11:32 2017 New Revision: 314527 URL: https://svnweb.freebsd.org/changeset/base/314527 Log: Upgrade to OpenSSH 7.3p1. Added: head/crypto/openssh/.skipped-commit-ids - copied unchanged from r313010, vendor-crypto/openssh/dist/.skipped-commit-ids head/crypto/openssh/openbsd-compat/bsd-err.c - copied unchanged from r313010, vendor-crypto/openssh/dist/openbsd-compat/bsd-err.c head/crypto/openssh/platform-tracing.c - copied unchanged from r313010, vendor-crypto/openssh/dist/platform-tracing.c head/crypto/openssh/regress/cfginclude.sh - copied unchanged from r313010, vendor-crypto/openssh/dist/regress/cfginclude.sh head/crypto/openssh/regress/misc/ - copied from r313010, vendor-crypto/openssh/dist/regress/misc/ head/crypto/openssh/regress/sshcfgparse.sh - copied unchanged from r313010, vendor-crypto/openssh/dist/regress/sshcfgparse.sh head/crypto/openssh/regress/unittests/utf8/ - copied from r313010, vendor-crypto/openssh/dist/regress/unittests/utf8/ head/crypto/openssh/utf8.c - copied unchanged from r313010, vendor-crypto/openssh/dist/utf8.c head/crypto/openssh/utf8.h - copied unchanged from r313010, vendor-crypto/openssh/dist/utf8.h Deleted: head/crypto/openssh/.cvsignore head/crypto/openssh/openbsd-compat/.cvsignore head/crypto/openssh/openbsd-compat/regress/.cvsignore head/crypto/openssh/regress/.cvsignore head/crypto/openssh/roaming.h head/crypto/openssh/scard/ Modified: head/crypto/openssh/ChangeLog head/crypto/openssh/INSTALL head/crypto/openssh/Makefile.in head/crypto/openssh/PROTOCOL head/crypto/openssh/PROTOCOL.agent head/crypto/openssh/PROTOCOL.certkeys head/crypto/openssh/PROTOCOL.chacha20poly1305 head/crypto/openssh/README head/crypto/openssh/audit-linux.c head/crypto/openssh/auth-krb5.c head/crypto/openssh/auth-options.c head/crypto/openssh/auth-pam.c head/crypto/openssh/auth-pam.h head/crypto/openssh/auth-passwd.c head/crypto/openssh/auth-rh-rsa.c head/crypto/openssh/auth-rhosts.c head/crypto/openssh/auth.c head/crypto/openssh/auth.h head/crypto/openssh/auth2-chall.c head/crypto/openssh/auth2-hostbased.c head/crypto/openssh/auth2.c head/crypto/openssh/authfile.c head/crypto/openssh/canohost.c head/crypto/openssh/canohost.h head/crypto/openssh/channels.c head/crypto/openssh/cipher-bf1.c head/crypto/openssh/cipher.c head/crypto/openssh/clientloop.c head/crypto/openssh/compat.c head/crypto/openssh/config.h head/crypto/openssh/configure.ac head/crypto/openssh/contrib/cygwin/README head/crypto/openssh/contrib/redhat/openssh.spec head/crypto/openssh/contrib/ssh-copy-id head/crypto/openssh/contrib/suse/openssh.spec head/crypto/openssh/defines.h head/crypto/openssh/dh.c head/crypto/openssh/dh.h head/crypto/openssh/kex.c head/crypto/openssh/kex.h head/crypto/openssh/kexc25519.c head/crypto/openssh/kexdh.c head/crypto/openssh/kexdhc.c head/crypto/openssh/kexdhs.c head/crypto/openssh/kexgexs.c head/crypto/openssh/key.c head/crypto/openssh/log.c head/crypto/openssh/log.h head/crypto/openssh/mac.c head/crypto/openssh/mac.h head/crypto/openssh/misc.c head/crypto/openssh/misc.h head/crypto/openssh/moduli head/crypto/openssh/monitor.c head/crypto/openssh/monitor_fdpass.c head/crypto/openssh/monitor_wrap.c head/crypto/openssh/monitor_wrap.h head/crypto/openssh/mux.c head/crypto/openssh/myproposal.h head/crypto/openssh/opacket.h head/crypto/openssh/openbsd-compat/Makefile.in head/crypto/openssh/openbsd-compat/arc4random.c head/crypto/openssh/openbsd-compat/bindresvport.c head/crypto/openssh/openbsd-compat/bsd-asprintf.c head/crypto/openssh/openbsd-compat/bsd-misc.c head/crypto/openssh/openbsd-compat/bsd-misc.h head/crypto/openssh/openbsd-compat/bsd-snprintf.c head/crypto/openssh/openbsd-compat/inet_aton.c head/crypto/openssh/openbsd-compat/openbsd-compat.h head/crypto/openssh/openbsd-compat/port-solaris.h head/crypto/openssh/openbsd-compat/vis.c head/crypto/openssh/openbsd-compat/vis.h head/crypto/openssh/openbsd-compat/xcrypt.c head/crypto/openssh/packet.c head/crypto/openssh/packet.h head/crypto/openssh/pathnames.h head/crypto/openssh/platform.c head/crypto/openssh/platform.h head/crypto/openssh/progressmeter.c head/crypto/openssh/readconf.c head/crypto/openssh/readconf.h head/crypto/openssh/regress/Makefile head/crypto/openssh/regress/agent-getpeereid.sh head/crypto/openssh/regress/cert-hostkey.sh head/crypto/openssh/regress/cert-userkey.sh head/crypto/openssh/regress/cfgparse.sh head/crypto/openssh/regress/connect-privsep.sh head/crypto/openssh/regress/forwarding.sh head/crypto/openssh/regress/integrity.sh head/crypto/openssh/regress/modpipe.c head/crypto/openssh/regress/netcat.c head/crypto/openssh/regress/test-exec.sh head/crypto/openssh/regress/unittests/Makefile head/crypto/openssh/regress/unittests/sshbuf/tes
svn commit: r314528 - head/sbin/md5
Author: des Date: Thu Mar 2 00:27:21 2017 New Revision: 314528 URL: https://svnweb.freebsd.org/changeset/base/314528 Log: Update to reflect that SHA-1 has now been broken. Submitted by: ak MFC after:1 week Modified: head/sbin/md5/md5.1 Modified: head/sbin/md5/md5.1 == --- head/sbin/md5/md5.1 Thu Mar 2 00:11:32 2017(r314527) +++ head/sbin/md5/md5.1 Thu Mar 2 00:27:21 2017(r314528) @@ -1,5 +1,5 @@ .\" $FreeBSD$ -.Dd January 7, 2017 +.Dd March 2, 2017 .Dt MD5 1 .Os .Sh NAME @@ -84,21 +84,17 @@ in a secure manner before being encrypte key under a public-key cryptosystem such as .Tn RSA . .Pp +The .Tn MD5 -has been completely broken as far as finding collisions is -concerned, and should not be relied upon to produce unique outputs. -This also means that -.Tn MD5 -should not be used as part of a cryptographic signature scheme. -At the current time (2014-05-17) there is no publicly known method to -.Dq reverse -MD5, i.e., to find an input given a hash value. -.Pp -.Tn SHA-1 -currently (2014-05-17) has no known collisions, but an attack has been -found which is faster than a brute-force search, placing the security of +and .Tn SHA-1 -in doubt. +algorithms have been proven to be vulnerable to practical collision +attacks and should not be relied upon to produce unique outputs, nor +should they be used as part of a cryptographic signature scheme. +As of 2016-03-02, there is no publicly known method to +.Em reverse +either algorithm, i.e. to find an input that produces a specific +output. .Pp .Tn SHA-512t256 is a version of @@ -111,6 +107,8 @@ The hashes are not interchangeable. .Pp It is recommended that all new applications use .Tn SHA-512 +or +.Tn SKEIN-512 instead of one of the other hash functions. .Pp The following options may be used in any combination and must ___ 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: r314529 - in head/contrib/jemalloc: . doc include/jemalloc include/jemalloc/internal src
Author: jasone Date: Thu Mar 2 01:14:48 2017 New Revision: 314529 URL: https://svnweb.freebsd.org/changeset/base/314529 Log: Update jemalloc to 4.5.0. Modified: head/contrib/jemalloc/ChangeLog head/contrib/jemalloc/FREEBSD-Xlist head/contrib/jemalloc/FREEBSD-diffs head/contrib/jemalloc/VERSION head/contrib/jemalloc/doc/jemalloc.3 head/contrib/jemalloc/include/jemalloc/internal/arena.h head/contrib/jemalloc/include/jemalloc/internal/chunk.h head/contrib/jemalloc/include/jemalloc/internal/extent.h head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h head/contrib/jemalloc/include/jemalloc/internal/mb.h head/contrib/jemalloc/include/jemalloc/internal/mutex.h head/contrib/jemalloc/include/jemalloc/internal/private_namespace.h head/contrib/jemalloc/include/jemalloc/internal/tcache.h head/contrib/jemalloc/include/jemalloc/internal/tsd.h head/contrib/jemalloc/include/jemalloc/internal/witness.h head/contrib/jemalloc/include/jemalloc/jemalloc.h head/contrib/jemalloc/src/arena.c head/contrib/jemalloc/src/chunk.c head/contrib/jemalloc/src/chunk_dss.c head/contrib/jemalloc/src/ctl.c head/contrib/jemalloc/src/extent.c head/contrib/jemalloc/src/huge.c head/contrib/jemalloc/src/jemalloc.c head/contrib/jemalloc/src/pages.c head/contrib/jemalloc/src/stats.c head/contrib/jemalloc/src/tcache.c head/contrib/jemalloc/src/witness.c Modified: head/contrib/jemalloc/ChangeLog == --- head/contrib/jemalloc/ChangeLog Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/ChangeLog Thu Mar 2 01:14:48 2017 (r314529) @@ -4,6 +4,41 @@ brevity. Much more detail can be found https://github.com/jemalloc/jemalloc +* 4.5.0 (February 28, 2017) + + This is the first release to benefit from much broader continuous integration + testing, thanks to @davidtgoldblatt. Had we had this testing infrastructure + in place for prior releases, it would have caught all of the most serious + regressions fixed by this release. + + New features: + - Add --disable-thp and the opt.thp to provide opt-out mechanisms for +transparent huge page integration. (@jasone) + - Update zone allocator integration to work with macOS 10.12. (@glandium) + - Restructure *CFLAGS configuration, so that CFLAGS behaves typically, and +EXTRA_CFLAGS provides a way to specify e.g. -Werror during building, but not +during configuration. (@jasone, @ronawho) + + Bug fixes: + - Fix DSS (sbrk(2)-based) allocation. This regression was first released in +4.3.0. (@jasone) + - Handle race in per size class utilization computation. This functionality +was first released in 4.0.0. (@interwq) + - Fix lock order reversal during gdump. (@jasone) + - Fix-refactor tcache synchronization. This regression was first released in +4.0.0. (@jasone) + - Fix various JSON-formatted malloc_stats_print() bugs. This functionality +was first released in 4.3.0. (@jasone) + - Fix huge-aligned allocation. This regression was first released in 4.4.0. +(@jasone) + - When transparent huge page integration is enabled, detect what state pages +start in according to the kernel's current operating mode, and only convert +arena chunks to non-huge during purging if that is not their initial state. +This functionality was first released in 4.4.0. (@jasone) + - Fix lg_chunk clamping for the --enable-cache-oblivious --disable-fill case. +This regression was first released in 4.0.0. (@jasone, @428desmo) + - Properly detect sparc64 when building for Linux. (@glaubitz) + * 4.4.0 (December 3, 2016) New features: Modified: head/contrib/jemalloc/FREEBSD-Xlist == --- head/contrib/jemalloc/FREEBSD-Xlist Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/FREEBSD-Xlist Thu Mar 2 01:14:48 2017 (r314529) @@ -49,6 +49,7 @@ include/msvc_compat/ install-sh jemalloc.pc* msvc/ +scripts/ src/valgrind.c src/zone.c test/ Modified: head/contrib/jemalloc/FREEBSD-diffs == --- head/contrib/jemalloc/FREEBSD-diffs Thu Mar 2 00:27:21 2017 (r314528) +++ head/contrib/jemalloc/FREEBSD-diffs Thu Mar 2 01:14:48 2017 (r314529) @@ -1,5 +1,5 @@ diff --git a/doc/jemalloc.xml.in b/doc/jemalloc.xml.in -index d9c8345..9898c3c 100644 +index c97ab0f..be8dda5 100644 --- a/doc/jemalloc.xml.in +++ b/doc/jemalloc.xml.in @@ -53,11 +53,23 @@ @@ -27,7 +27,7 @@ index d9c8345..9898c3c 100644 Standard API -@@ -2963,4 +2975,18 @@ malloc_conf = "lg_chunk:24";]]> +@@ -2989,4 +3001,18 @@ malloc_conf = "lg_chunk:24";]]> The posix_memalign() function conforms to IEEE Std 1003.1-2001 (POS
svn commit: r314533 - head/lib/libsbuf
Author: scottl
Date: Thu Mar 2 01:39:23 2017
New Revision: 314533
URL: https://svnweb.freebsd.org/changeset/base/314533
Log:
Expose the sbuf_putbuf() symbol to libsbuf. There are a few other symbols
that are present but not exposed, like get/set/clear flags, not sure if they
need to be exposed at this point.
Sponsored by: Netflix
Modified:
head/lib/libsbuf/Symbol.map
head/lib/libsbuf/Version.def
Modified: head/lib/libsbuf/Symbol.map
==
--- head/lib/libsbuf/Symbol.map Thu Mar 2 01:28:15 2017(r314532)
+++ head/lib/libsbuf/Symbol.map Thu Mar 2 01:39:23 2017(r314533)
@@ -31,3 +31,8 @@ FBSD_1.3 {
FBSD_1.4 {
sbuf_hexdump;
};
+
+FBSD_1.5 {
+ sbuf_putbuf;
+};
+
Modified: head/lib/libsbuf/Version.def
==
--- head/lib/libsbuf/Version.defThu Mar 2 01:28:15 2017
(r314532)
+++ head/lib/libsbuf/Version.defThu Mar 2 01:39:23 2017
(r314533)
@@ -8,3 +8,6 @@ FBSD_1.3 {
FBSD_1.4 {
} FBSD_1.3;
+
+FBSD_1.5 {
+} FBSD_1.4;
___
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: r314464 - head/usr.sbin/yppush
> On Wed, Mar 1, 2017 at 8:57 AM, Alexey Dokuchaev wrote: > > On Wed, Mar 01, 2017 at 08:43:55AM -0800, Rodney W. Grimes wrote: > >> I believe we have some other full path things that have crept > >> forward into the production release, but that may be in ports > >> only. Nope bad full paths links I found in just a few seconds: > >> > >> lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chfn -> /usr/bin/chpass > >> lrwxr-xr-x 1 root wheel 15 Nov 30 02:26 chsh -> /usr/bin/chpass > >> lrwxr-xr-x 1 root wheel 7 Nov 30 02:27 cpio -> bsdcpio > >> lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 mailq -> > >> /usr/sbin/mailwrapper > >> lrwxr-xr-x 1 root wheel 21 Nov 30 02:27 newaliases -> > >> /usr/sbin/mailwrapper > >> lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pgrep -> /bin/pgrep > >> lrwxr-xr-x 1 root wheel 10 Nov 30 02:25 pkill -> /bin/pkill > >> [...] > > > > Jeez, this is all so bogus! Imagine accessing those remotely via NFS mount > > and watch things break hell in all weird ways. :-( > > This is completely orthogonal to my changes (and has been in place for > a number of years). If you'd like to use relative symlinks for > programs, then let's definitely do it as part of another change > (personally, I think that some of these items could and should be > replaced with hardlinks). Yes, this is just something that leaked over into this thread. Note that this is not just something I want to do, this is technically a bug in FreeBSD and a regresion that occured. And yes in general if the binaries live in the same directoy hard rather than soft links should be used, so another regresion. -- Rod Grimes rgri...@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"
svn commit: r314534 - head/share/man/man5
Author: emaste Date: Thu Mar 2 02:10:59 2017 New Revision: 314534 URL: https://svnweb.freebsd.org/changeset/base/314534 Log: regen src.conf.5 after r313169 Sponsored by: The FreeBSD Foundation Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 == --- head/share/man/man5/src.conf.5 Thu Mar 2 01:39:23 2017 (r314533) +++ head/share/man/man5/src.conf.5 Thu Mar 2 02:10:59 2017 (r314534) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. -.\" from FreeBSD: head/tools/build/options/makeman 306729 2016-10-05 20:12:00Z emaste +.\" from FreeBSD: head/tools/build/options/makeman 313173 2017-02-03 20:17:54Z wblock .\" $FreeBSD$ -.Dd January 28, 2017 +.Dd March 1, 2017 .Dt SRC.CONF 5 .Os .Sh NAME @@ -86,11 +86,11 @@ even if they would be set to .Dq Li FALSE or .Dq Li NO . -Just the existence of an option will cause -it to be honoured by +The presence of an option causes +it to be honored by .Xr make 1 . .Pp -The following list provides a name and short description for variables +This list provides a name and short description for variables that can be used for source builds. .Bl -tag -width indent .It Va WITHOUT_ACCT @@ -163,9 +163,9 @@ Set to not build or install binutils (as of the normal system build. The resulting system cannot build programs from source. .Pp -It is a default setting on +This is a default setting on arm64/aarch64. -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -176,7 +176,7 @@ When set, it also enforces the following Set to build and install binutils (as, ld, objcopy, and objdump) as part of the normal system build. .Pp -It is a default setting on +This is a default setting on amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITHOUT_BINUTILS_BOOTSTRAP .\" from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP 295490 2016-02-10 23:57:09Z emaste @@ -187,19 +187,19 @@ The option does not work for build targe toolchain is provided. .Ef .Pp -It is a default setting on +This is a default setting on arm64/aarch64. .It Va WITH_BINUTILS_BOOTSTRAP .\" from FreeBSD: head/tools/build/options/WITH_BINUTILS_BOOTSTRAP 295491 2016-02-11 00:14:00Z emaste Set build binutils (as, ld, objcopy and objdump) as part of the bootstrap process. .Pp -It is a default setting on +This is a default setting on amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITHOUT_BLACKLIST -.\" from FreeBSD: head/tools/build/options/WITHOUT_BLACKLIST 301554 2016-06-07 16:35:55Z lidl -Set this if you do not want to build blacklistd / blacklistctl. -When set, it also enforces the following options: +.\" from FreeBSD: head/tools/build/options/WITHOUT_BLACKLIST 313169 2017-02-03 19:09:46Z wblock +Set this if you do not want to build blacklistd/blacklistctl. +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -252,7 +252,7 @@ Set to not build contributed bzip2 softw .Bf -symbolic The option has no effect yet. .Ef -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -268,7 +268,7 @@ Set to not build .It Va WITHOUT_CAPSICUM .\" from FreeBSD: head/tools/build/options/WITHOUT_CAPSICUM 229319 2012-01-02 21:57:58Z rwatson Set to not build Capsicum support into system programs. -When set, it also enforces the following options: +When set, it enforces these options: .Pp .Bl -item -compact .It @@ -278,16 +278,16 @@ When set, it also enforces the following .\" from FreeBSD: head/tools/build/options/WITHOUT_CASPER 258838 2013-12-02 08:21:28Z pjd Set to not build Casper program and related libraries. .It Va WITH_CCACHE_BUILD -.\" from FreeBSD: head/tools/build/options/WITH_CCACHE_BUILD 297436 2016-03-30 23:53:12Z bdrewery +.\" from FreeBSD: head/tools/build/options/WITH_CCACHE_BUILD 313169 2017-02-03 19:09:46Z wblock Set to use .Xr ccache 1 for the build. No configuration is required except to install the .Sy devel/ccache package. -Using with -.Xr distcc 1 -should set +When using with +.Xr distcc 1 , +set .Sy CCACHE_PREFIX=/usr/local/bin/distcc . The default cache directory of .Pa $HOME/.ccache @@ -325,7 +325,7 @@ and related utilities. .It Va WITHOUT_CDDL .\" from FreeBSD: head/tools/build/options/WITHOUT_CDDL 163861 2006-11-01 09:02:11Z jb Set to not build code licensed under Sun's CDDL. -When set, it also enforces the follow
Re: svn commit: r314464 - head/usr.sbin/yppush
[ Charset UTF-8 unsupported, converting... ]
> On Wed, Mar 1, 2017 at 9:08 AM, Rodney W. Grimes
> wrote:
> ...
> > At one point in history I can promise you that ALL symlinks in the release
> > where shortest possible relative path. So any absolute links that entered
> > the system got created by developers who where not aware that they should
> > always use a relative link for anything landing in DESTDIR. This creates
> > breakge on so many levels we should make a rapid correction to this
> > regression.
>
> This is why things are that way currently:
>
> $ git blame usr.bin/chpass/Makefile| grep ypchfn
> 780ae7713f72b (gjb 2016-01-28 01:15:57 + 29) SYMLINKS+=
> ${BINDIR}/chpass ${BINDIR}/ypchfn
Use of ${BINDIR} is almost always a mistake in SYMLINKS.
> aca2488187113 (wosch 1997-09-13 12:21:25 + 35) MLINKS+= chpass.1
> ypchpass.1 chpass.1 ypchfn.1 chpass.1 ypchsh.1
> 5294f47313a2d (gjb 2016-01-28 02:56:30 + 39) .for i in chpass
> chfn chsh ypchpass ypchfn ypchsh
> $ git log 780ae7713f72b^..780ae7713f72b
> commit 780ae7713f72b471859c0997295ac0c59695c7b4
> Author: gjb
> Date: Thu Jan 28 01:15:57 2016 +
>
> Ensure mtree(8) recognizes chpass(1) is schg.
>
> Convert hard links to symbolic links, and remove the
> 'beforeinstall' and 'afterinstall' chflags(8) execution.
>
> Sponsored by: The FreeBSD Foundation
>
> Notes:
> svn path=/projects/release-pkg/; revision=294966
>
> BINDIR evaluates to /usr/sbin/, so /usr/sbin/chpass is symlinked to
> /usr/sbin/ypchfn . But, there's no reason why the symlink needs to be
> hardcoded, or even a symlink at all. Hardlinks would achieve the same
> thing here IMHO, but gjb changed it in r294966 to be symlinks.
The error is inclusion of ${BINDIR} in SYMLINKS.
The BIGGER mistake uncovered here is now none of the aliases to
chpass(1) are protected by schg(THis is a 10.2):
ls -ilago /usr/bin/ | grep ^3842
3842 -r-sr-xr-x 6 root wheel schg18316 Aug 12 2015 chfn
3842 -r-sr-xr-x 6 root wheel schg18316 Aug 12 2015 chpass
3842 -r-sr-xr-x 6 root wheel schg18316 Aug 12 2015 chsh
3842 -r-sr-xr-x 6 root wheel schg18316 Aug 12 2015 ypchfn
3842 -r-sr-xr-x 6 root wheel schg18316 Aug 12 2015 ypchpass
3842 -r-sr-xr-x 6 root wheel schg18316 Aug 12 2015 ypchsh
The reason for the commit seems to be an issue with mtree, so
that is probably the more correct place to be tyring to fix
this if it is confused by hardlinks and schg attributes.
> The point that might be missed is that changing it from absolute paths
> to relative paths or otherwise, might break other workflows.. I could
> just as easily mount /lib, /usr/lib, /usr/sbin, etc as nullfs
> mountpoints and have a working system on a system root where MACHINE
> != TARGET, but this is all orthogonal to my changing
> `${.CURDIR}/../../contrib` (e.g. `foo/usr.sbin/yppush/../../contrib`),
> etc to ${SRCTOP}/contrib` (e.g. `foo/contrib`).
Though you might make it work with lots of magic the expected historical
behavior is that these things should not have absolute paths in them
and many long standing work flows depend on that fact. Being able
to move /usr/bin or /bin or any other part of the tree someplace
and have it self contained and internally contained and operation
is expected traditional behavior.
> Thanks,
> -Ngie
>
--
Rod Grimes rgri...@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"
svn commit: r314535 - in head/sys/modules: bytgpio intelspi
Author: gonzo
Date: Thu Mar 2 03:19:39 2017
New Revision: 314535
URL: https://svnweb.freebsd.org/changeset/base/314535
Log:
[intelspi][bytgio] Fix buildworld with MODULES_WITH_WORLD set
Add opt_platform.h and opt_acpi.h to the dependencies so modules can be
built as a part of buildworld when MODULES_WITH_WORLD is set
Reported by: Andre Albsmeier (for 11-stable)
MFC after:1 day
Modified:
head/sys/modules/bytgpio/Makefile
head/sys/modules/intelspi/Makefile
Modified: head/sys/modules/bytgpio/Makefile
==
--- head/sys/modules/bytgpio/Makefile Thu Mar 2 02:10:59 2017
(r314534)
+++ head/sys/modules/bytgpio/Makefile Thu Mar 2 03:19:39 2017
(r314535)
@@ -3,6 +3,6 @@
.PATH: ${.CURDIR}/../../dev/gpio
KMOD= bytgpio
SRCS= bytgpio.c
-SRCS+= acpi_if.h device_if.h bus_if.h gpio_if.h
+SRCS+= acpi_if.h device_if.h bus_if.h gpio_if.h opt_acpi.h opt_platform.h
.include
Modified: head/sys/modules/intelspi/Makefile
==
--- head/sys/modules/intelspi/Makefile Thu Mar 2 02:10:59 2017
(r314534)
+++ head/sys/modules/intelspi/Makefile Thu Mar 2 03:19:39 2017
(r314535)
@@ -3,6 +3,6 @@
.PATH: ${.CURDIR}/../../dev/intel
KMOD= intelspi
SRCS= spi.c
-SRCS+= acpi_if.h device_if.h bus_if.h spibus_if.h
+SRCS+= acpi_if.h device_if.h bus_if.h opt_acpi.h spibus_if.h
.include
___
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: r314536 - head/usr.sbin/makefs/ffs
Author: emaste
Date: Thu Mar 2 04:08:14 2017
New Revision: 314536
URL: https://svnweb.freebsd.org/changeset/base/314536
Log:
makefs: remove archaic __P prototypes from ufs_bswap.h
This reduces differences with NetBSD
Sponsored by: The FreeBSD Foundation
Modified:
head/usr.sbin/makefs/ffs/ufs_bswap.h
Modified: head/usr.sbin/makefs/ffs/ufs_bswap.h
==
--- head/usr.sbin/makefs/ffs/ufs_bswap.hThu Mar 2 03:19:39 2017
(r314535)
+++ head/usr.sbin/makefs/ffs/ufs_bswap.hThu Mar 2 04:08:14 2017
(r314536)
@@ -55,10 +55,6 @@
#if !defined(_KERNEL) || defined(FFS_EI)
/* inlines for access to swapped data */
-static __inline u_int16_t ufs_rw16 __P((u_int16_t, int));
-static __inline u_int32_t ufs_rw32 __P((u_int32_t, int));
-static __inline u_int64_t ufs_rw64 __P((u_int64_t, int));
-
static __inline u_int16_t
ufs_rw16(u_int16_t a, int ns)
{
___
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: r314537 - head/usr.sbin/makefs/ffs
Author: emaste Date: Thu Mar 2 04:11:18 2017 New Revision: 314537 URL: https://svnweb.freebsd.org/changeset/base/314537 Log: makefs: remove clause 3 & 4 from Manuel Bouyer license ffs_bswap.c 1.34 ufs_bswap.h 1.34 Obtained from:NetBSD Sponsored by: The FreeBSD Foundation Modified: head/usr.sbin/makefs/ffs/ffs_bswap.c head/usr.sbin/makefs/ffs/ufs_bswap.h Modified: head/usr.sbin/makefs/ffs/ffs_bswap.c == --- head/usr.sbin/makefs/ffs/ffs_bswap.cThu Mar 2 04:08:14 2017 (r314536) +++ head/usr.sbin/makefs/ffs/ffs_bswap.cThu Mar 2 04:11:18 2017 (r314537) @@ -11,11 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by Manuel Bouyer. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES Modified: head/usr.sbin/makefs/ffs/ufs_bswap.h == --- head/usr.sbin/makefs/ffs/ufs_bswap.hThu Mar 2 04:08:14 2017 (r314536) +++ head/usr.sbin/makefs/ffs/ufs_bswap.hThu Mar 2 04:11:18 2017 (r314537) @@ -11,11 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by Manuel Bouyer. - * 4. The name of the author may not be used to endorse or promote products - *derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ___ 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: r314541 - in head/usr.sbin/wpa: . hostapd hostapd_cli wpa_cli wpa_passphrase wpa_priv wpa_supplicant
Author: ngie
Date: Thu Mar 2 05:04:45 2017
New Revision: 314541
URL: https://svnweb.freebsd.org/changeset/base/314541
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output.
MFC after:1 week
Sponsored by: Dell EMC Isilon
Modified:
head/usr.sbin/wpa/Makefile.inc
head/usr.sbin/wpa/hostapd/Makefile
head/usr.sbin/wpa/hostapd_cli/Makefile
head/usr.sbin/wpa/wpa_cli/Makefile
head/usr.sbin/wpa/wpa_passphrase/Makefile
head/usr.sbin/wpa/wpa_priv/Makefile
head/usr.sbin/wpa/wpa_supplicant/Makefile
Modified: head/usr.sbin/wpa/Makefile.inc
==
--- head/usr.sbin/wpa/Makefile.inc Thu Mar 2 04:55:54 2017
(r314540)
+++ head/usr.sbin/wpa/Makefile.inc Thu Mar 2 05:04:45 2017
(r314541)
@@ -2,11 +2,11 @@
BINDIR?= /usr/sbin
-WPA_DISTDIR?= ${.CURDIR}/../../../contrib/wpa/
+WPA_DISTDIR?= ${SRCTOP}/contrib/wpa/
WPA_SUPPLICANT_DISTDIR?=${WPA_DISTDIR}/wpa_supplicant
HOSTAPD_DISTDIR?= ${WPA_DISTDIR}/hostapd
-.PATH.c:${.CURDIR}/.. \
+.PATH.c:${.CURDIR:H} \
${WPA_DISTDIR}/src/ap \
${WPA_DISTDIR}/src/common \
${WPA_DISTDIR}/src/crypto \
Modified: head/usr.sbin/wpa/hostapd/Makefile
==
--- head/usr.sbin/wpa/hostapd/Makefile Thu Mar 2 04:55:54 2017
(r314540)
+++ head/usr.sbin/wpa/hostapd/Makefile Thu Mar 2 05:04:45 2017
(r314541)
@@ -1,7 +1,7 @@
# $FreeBSD$
.include
-.include "${.CURDIR}/../Makefile.inc"
+.include "../Makefile.inc"
.PATH.c:${HOSTAPD_DISTDIR} \
${WPA_DISTDIR}/src/drivers
@@ -117,6 +117,6 @@ SRCS+= eap_server_sake.c \
eap_sake_common.c
.endif
-.include "${.CURDIR}/../Makefile.crypto"
+.include "../Makefile.crypto"
.include
Modified: head/usr.sbin/wpa/hostapd_cli/Makefile
==
--- head/usr.sbin/wpa/hostapd_cli/Makefile Thu Mar 2 04:55:54 2017
(r314540)
+++ head/usr.sbin/wpa/hostapd_cli/Makefile Thu Mar 2 05:04:45 2017
(r314541)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include "${.CURDIR}/../Makefile.inc"
+.include "../Makefile.inc"
.PATH.c:${HOSTAPD_DISTDIR}
Modified: head/usr.sbin/wpa/wpa_cli/Makefile
==
--- head/usr.sbin/wpa/wpa_cli/Makefile Thu Mar 2 04:55:54 2017
(r314540)
+++ head/usr.sbin/wpa/wpa_cli/Makefile Thu Mar 2 05:04:45 2017
(r314541)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include "${.CURDIR}/../Makefile.inc"
+.include "../Makefile.inc"
.PATH.c:${WPA_SUPPLICANT_DISTDIR}
Modified: head/usr.sbin/wpa/wpa_passphrase/Makefile
==
--- head/usr.sbin/wpa/wpa_passphrase/Makefile Thu Mar 2 04:55:54 2017
(r314540)
+++ head/usr.sbin/wpa/wpa_passphrase/Makefile Thu Mar 2 05:04:45 2017
(r314541)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include "${.CURDIR}/../Makefile.inc"
+.include "../Makefile.inc"
.PATH.c:${WPA_SUPPLICANT_DISTDIR}
Modified: head/usr.sbin/wpa/wpa_priv/Makefile
==
--- head/usr.sbin/wpa/wpa_priv/Makefile Thu Mar 2 04:55:54 2017
(r314540)
+++ head/usr.sbin/wpa/wpa_priv/Makefile Thu Mar 2 05:04:45 2017
(r314541)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include "${.CURDIR}/../Makefile.inc"
+.include "../Makefile.inc"
.PATH.c:${WPA_SUPPLICANT_DISTDIR} \
${WPA_DISTDIR}/src/drivers
@@ -11,6 +11,6 @@ SRCS= drivers.c os_unix.c eloop.c common
LIBADD=pcap
-.include "${.CURDIR}/../Makefile.crypto"
+.include "../Makefile.crypto"
.include
Modified: head/usr.sbin/wpa/wpa_supplicant/Makefile
==
--- head/usr.sbin/wpa/wpa_supplicant/Makefile Thu Mar 2 04:55:54 2017
(r314540)
+++ head/usr.sbin/wpa/wpa_supplicant/Makefile Thu Mar 2 05:04:45 2017
(r314541)
@@ -2,7 +2,7 @@
.include
-.include "${.CURDIR}/../Makefile.inc"
+.include "../Makefile.inc"
.PATH.c:${WPA_SUPPLICANT_DISTDIR} \
${WPA_DISTDIR}/src/drivers
@@ -142,6 +142,6 @@ SRCS+= eap_sake.c \
eap_sake_common.c
.endif
-.include "${.CURDIR}/../Makefile.crypto"
+.include "../Makefile.crypto"
.include
___
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: r313006 - in head: sys/conf sys/libkern sys/libkern/x86 sys/sys tests/sys/kern
On Wed, 1 Mar 2017, Conrad Meyer wrote: On my laptop (Intel(R) Core(TM) i5-3320M CPU ??? Ivy Bridge) I still see a little worse performance with this patch. Please excuse the ugly graphs, I don't have a better graphing tool set up at this time: https://people.freebsd.org/~cem/crc32/sse42_bde.png https://people.freebsd.org/~cem/crc32/sse42_bde_log.png Try doubling the loop sizes. There shouldn't be any significant difference above size 3*LONG unless LONG is too small. Apparently it is too small for older CPUs. I now have a Sandybridge i5-2xxx laptop to test on, but don't have it set up for much yet. Bruce___ 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: r314542 - head/share/man/man4
Author: ngie Date: Thu Mar 2 06:02:17 2017 New Revision: 314542 URL: https://svnweb.freebsd.org/changeset/base/314542 Log: kern.cam.da.X.delete_method: add -width to .Bl macro call Now the section width is set appropriately per the BIO_DELETE parameter being described. Reported by: make manlint MFC after:1 week Sponsored by: Dell EMC Isilon Modified: head/share/man/man4/da.4 Modified: head/share/man/man4/da.4 == --- head/share/man/man4/da.4Thu Mar 2 05:04:45 2017(r314541) +++ head/share/man/man4/da.4Thu Mar 2 06:02:17 2017(r314542) @@ -156,7 +156,7 @@ Set to 1 to enable sorting, 0 to disable The default is sorting enabled for HDDs and disabled for SSDs. .It Va kern.cam.da. Ns Ar X Ns Va .delete_method This variable specifies method to handle BIO_DELETE requests: -.Bl -tag +.Bl -tag -width "ATA_TRIM" .It ATA_TRIM ATA TRIM via ATA COMMAND PASS THROUGH command, .It UNMAP ___ 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: r314543 - head/share/man/man4
Author: ngie Date: Thu Mar 2 06:03:21 2017 New Revision: 314543 URL: https://svnweb.freebsd.org/changeset/base/314543 Log: Add missing section when referencing ctl(4) via .Xr macro MFC after:1 week Reported by: make manlint Sponsored by: Dell EMC Isilon Modified: head/share/man/man4/cfumass.4 Modified: head/share/man/man4/cfumass.4 == --- head/share/man/man4/cfumass.4 Thu Mar 2 06:02:17 2017 (r314542) +++ head/share/man/man4/cfumass.4 Thu Mar 2 06:03:21 2017 (r314543) @@ -72,7 +72,7 @@ The USB OTG port must be working in USB This happens automatically upon connection to a USB host. .It There must be a -.Xr ctl +.Xr ctl 4 LUN configured for the .Pa cfumass port. ___ 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: r314544 - head/share/man/man4
Author: ngie Date: Thu Mar 2 06:22:05 2017 New Revision: 314544 URL: https://svnweb.freebsd.org/changeset/base/314544 Log: Sort .Xr: ahci(4) comes before ahd(4) X-MFC with: r314110 Reported by: make manlint Sponsored by: Dell EMC Isilon Modified: head/share/man/man4/scsi.4 Modified: head/share/man/man4/scsi.4 == --- head/share/man/man4/scsi.4 Thu Mar 2 06:03:21 2017(r314543) +++ head/share/man/man4/scsi.4 Thu Mar 2 06:22:05 2017(r314544) @@ -256,8 +256,7 @@ There are currently seven debugging flag This flag enables general informational printfs for the device or devices in question. .It Dv CAM_DEBUG_TRACE -This flag enables function-level command flow tracing. -i.e.\& +This flag enables function-level command flow tracing i.e., kernel printfs will happen at the entrance and exit of various functions. .It Dv CAM_DEBUG_SUBTRACE This flag enables debugging output internal to various functions. @@ -316,8 +315,8 @@ for details. .Xr ada 4 , .Xr aha 4 , .Xr ahc 4 , -.Xr ahd 4 , .Xr ahci 4 , +.Xr ahd 4 , .Xr ata 4 , .Xr bt 4 , .Xr cd 4 , ___ 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: r314545 - head/share/man/man4
Author: ngie Date: Thu Mar 2 06:25:50 2017 New Revision: 314545 URL: https://svnweb.freebsd.org/changeset/base/314545 Log: Add missing section to .Xr macro calls for wpifw(4) The driver manpage for wpifw(4) is missing, but will be added soon. This fixes the other 2 .Xr calls lacking sections to match the 3rd, syntactically correct, reference in the SEE ALSO section. MFC after:1 week Reported by: make manlint Sponsored by: Dell EMC Isilon Modified: head/share/man/man4/wpi.4 Modified: head/share/man/man4/wpi.4 == --- head/share/man/man4/wpi.4 Thu Mar 2 06:22:05 2017(r314544) +++ head/share/man/man4/wpi.4 Thu Mar 2 06:25:50 2017(r314545) @@ -85,7 +85,7 @@ driver offloads both encryption and decr hardware for the CCMP cipher. .Pp This driver requires the firmware built with the -.Nm wpifw +.Nm wpifw 4 module to work. .Pp The @@ -144,7 +144,7 @@ The driver failed to load the firmware i .Xr firmware 9 subsystem. Verify the -.Xr wpifw +.Xr wpifw 4 firmware module is installed. .It "wpi%d: %s: timeout waiting for adapter to initialize, error %d" The onboard microcontroller failed to initialize in time. ___ 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: r313006 - in head: sys/conf sys/libkern sys/libkern/x86 sys/sys tests/sys/kern
On Wed, Mar 1, 2017 at 9:27 PM, Bruce Evans wrote: > On Wed, 1 Mar 2017, Conrad Meyer wrote: > >> On my laptop (Intel(R) Core(TM) i5-3320M CPU — Ivy Bridge) I still see >> a little worse performance with this patch. Please excuse the ugly >> graphs, I don't have a better graphing tool set up at this time: >> >> https://people.freebsd.org/~cem/crc32/sse42_bde.png >> https://people.freebsd.org/~cem/crc32/sse42_bde_log.png > > > Try doubling the loop sizes. There shouldn't be any significant difference > above size 3*LONG unless LONG is too small. Apparently it is too small for > older CPUs. > > I now have a Sandybridge i5-2xxx laptop to test on, but don't have it set > up for much yet. > > Bruce Hi Bruce, Doubling the loop sizes seems to make it slightly worse, actually: https://people.freebsd.org/~cem/crc32/sse42_bde2.png https://people.freebsd.org/~cem/crc32/sse42_bde_log2.png I haven't made any attempt to inspect the generated assembly. This is Clang 3.9.1 with -O2. Best, Conrad ___ 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: r314546 - head/share/man/man4
Author: ngie
Date: Thu Mar 2 06:57:13 2017
New Revision: 314546
URL: https://svnweb.freebsd.org/changeset/base/314546
Log:
Wordsmith mlx4{en,ib}(4)
- Replace the "following lines" with more terse phrases.
- Use .Lk for the mellanox URL.
- Reword the SUPPORT section so it's less wordy.
The DESCRIPTION section suggestions are still outstanding; improving
the section requires additional review to make sure the nuance/message
is correct per the original intent.
Bump .Dd for the change
Submitted by: wblock
Sponsored by: Dell EMC Isilon
Differential Revision:https://reviews.freebsd.org/D9241
Modified:
head/share/man/man4/mlx4en.4
head/share/man/man4/mlx4ib.4
Modified: head/share/man/man4/mlx4en.4
==
--- head/share/man/man4/mlx4en.4Thu Mar 2 06:25:50 2017
(r314545)
+++ head/share/man/man4/mlx4en.4Thu Mar 2 06:57:13 2017
(r314546)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd January 18, 2017
+.Dd March 1, 2017
.Dt MLX4EN 4
.Os
.Sh NAME
@@ -32,8 +32,7 @@
.Nd "Mellanox ConnectX-3 10GbE/40GbE network adapter driver"
.Sh SYNOPSIS
To compile this driver into the kernel,
-place the following lines in your
-kernel configuration file:
+place these lines in your kernel configuration file:
.Bd -ragged -offset indent
.Cd "options COMPAT_LINUXKPI"
.Cd "device mlx4"
@@ -41,13 +40,13 @@ kernel configuration file:
.Ed
.Pp
To load the driver as a module at run-time,
-run the following command as root:
+run this command as root:
.Bd -literal -offset indent
kldload mlx4en
.Ed
.Pp
To load the driver as a
-module at boot time, place the following lines in
+module at boot time, place this line in
.Xr loader.conf 5 :
.Bd -literal -offset indent
mlx4en_load="YES"
@@ -75,10 +74,10 @@ Mellanox ConnectX-3 (ETH)
.Sh SUPPORT
For general information and support,
go to the Mellanox support website at:
-.Pa http://www.mellanox.com/ .
+.Lk http://www.mellanox.com/ .
.Pp
-If an issue is identified with this driver with a supported adapter,
-email all the specific information related to the issue to
+If an issue is identified with this driver and a supported network adapter,
+please email the specific information to
.Aq Mt freebsd-driv...@mellanox.com .
.Sh SEE ALSO
.Xr mlx4ib 4 ,
Modified: head/share/man/man4/mlx4ib.4
==
--- head/share/man/man4/mlx4ib.4Thu Mar 2 06:25:50 2017
(r314545)
+++ head/share/man/man4/mlx4ib.4Thu Mar 2 06:57:13 2017
(r314546)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd January 18, 2017
+.Dd March 1, 2017
.Dt MLX4IB 4
.Os
.Sh NAME
@@ -32,8 +32,7 @@
.Nd "Mellanox ConnectX-3 10GbE/40GbE network adapter driver"
.Sh SYNOPSIS
To compile this driver into the kernel,
-place the following lines in your
-kernel configuration file:
+place these lines in your kernel configuration file:
.Bd -ragged -offset indent
.Cd "options COMPAT_LINUXKPI"
.Cd "device mlx4"
@@ -41,13 +40,13 @@ kernel configuration file:
.Ed
.Pp
To load the driver as a module at run-time,
-run the following command as root:
+run this command as root:
.Bd -literal -offset indent
kldload mlx4ib
.Ed
.Pp
To load the driver as a
-module at boot time, place the following lines in
+module at boot time, place this line in
.Xr loader.conf 5 :
.Bd -literal -offset indent
mlx4ib_load="YES"
@@ -75,10 +74,10 @@ Mellanox ConnectX-3 (IB)
.Sh SUPPORT
For general information and support,
go to the Mellanox support website at:
-.Pa http://www.mellanox.com/ .
+.Lk http://www.mellanox.com/ .
.Pp
-If an issue is identified with this driver with a supported adapter,
-email all the specific information related to the issue to
+If an issue is identified with this driver and a supported network adapter,
+please email the specific information to
.Aq Mt freebsd-driv...@mellanox.com .
.Sh SEE ALSO
.Xr mlx4en 4 ,
___
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: r314547 - head/sys/boot/efi/loader
Author: dexuan
Date: Thu Mar 2 07:25:50 2017
New Revision: 314547
URL: https://svnweb.freebsd.org/changeset/base/314547
Log:
loader.efi: reduce the size of the staging area if necessary
The loader assumes physical memory in [2MB, 2MB + EFI_STAGING_SIZE)
is Conventional Memory, but actually it may not, e.g. in the case
of Hyper-V Generation-2 VM (i.e. UEFI VM) running on Windows
Server 2012 R2 host, there is a BootServiceData memory block at
the address 47.449MB and the memory is not writable.
Without the patch, the loader will crash in efi_copy_finish():
see PR 211746.
The patch verifies the end of the staging area, and reduces its
size if necessary. This way, the loader will not try to write into
the BootServiceData memory any longer.
Thank Marcel Moolenaar for helping me on this issue!
The patch also allocates the staging area in the first 1GB memory.
See the comment in the patch for this.
PR: 211746
Reviewed by: marcel, kib, sephe
Approved by: sephe (mentor)
MFC after:2 weeks
Sponsored by: Microsoft
Differential Revision:https://reviews.freebsd.org/D9686
Modified:
head/sys/boot/efi/loader/copy.c
Modified: head/sys/boot/efi/loader/copy.c
==
--- head/sys/boot/efi/loader/copy.c Thu Mar 2 06:57:13 2017
(r314546)
+++ head/sys/boot/efi/loader/copy.c Thu Mar 2 07:25:50 2017
(r314547)
@@ -39,12 +39,71 @@ __FBSDID("$FreeBSD$");
#include "loader_efi.h"
+#if defined(__i386__) || defined(__amd64__)
+
+#define KERNEL_PHYSICAL_BASE (2*1024*1024)
+
+static void
+efi_verify_staging_size(unsigned long *nr_pages)
+{
+ UINTN sz;
+ EFI_MEMORY_DESCRIPTOR *map, *p;
+ EFI_PHYSICAL_ADDRESS start, end;
+ UINTN key, dsz;
+ UINT32 dver;
+ EFI_STATUS status;
+ int i, ndesc;
+ unsigned long available_pages;
+
+ sz = 0;
+ status = BS->GetMemoryMap(&sz, 0, &key, &dsz, &dver);
+ if (status != EFI_BUFFER_TOO_SMALL) {
+ printf("Can't determine memory map size\n");
+ return;
+ }
+
+ map = malloc(sz);
+ status = BS->GetMemoryMap(&sz, map, &key, &dsz, &dver);
+ if (EFI_ERROR(status)) {
+ printf("Can't read memory map\n");
+ goto out;
+ }
+
+ ndesc = sz / dsz;
+
+ for (i = 0, p = map; i < ndesc;
+i++, p = NextMemoryDescriptor(p, dsz)) {
+ start = p->PhysicalStart;
+ end = start + p->NumberOfPages * EFI_PAGE_SIZE;
+
+ if (KERNEL_PHYSICAL_BASE < start ||
+ KERNEL_PHYSICAL_BASE >= end)
+ continue;
+
+ if (p->Type != EfiConventionalMemory)
+ continue;
+
+ available_pages = p->NumberOfPages -
+ ((KERNEL_PHYSICAL_BASE - start) >> EFI_PAGE_SHIFT);
+
+ if (*nr_pages > available_pages) {
+ printf("staging area size is reduced: %ld -> %ld!\n",
+ *nr_pages, available_pages);
+ *nr_pages = available_pages;
+ }
+
+ break;
+ }
+
+out:
+ free(map);
+}
+#endif
+
#ifndef EFI_STAGING_SIZE
#defineEFI_STAGING_SIZE64
#endif
-#defineSTAGE_PAGES EFI_SIZE_TO_PAGES((EFI_STAGING_SIZE) * 1024 *
1024)
-
EFI_PHYSICAL_ADDRESS staging, staging_end;
intstage_offset_set = 0;
ssize_tstage_offset;
@@ -54,14 +113,32 @@ efi_copy_init(void)
{
EFI_STATUS status;
+ unsigned long nr_pages;
+
+ nr_pages = EFI_SIZE_TO_PAGES((EFI_STAGING_SIZE) * 1024 * 1024);
+
+#if defined(__i386__) || defined(__amd64__)
+ /* We'll decrease nr_pages, if it's too big. */
+ efi_verify_staging_size(&nr_pages);
+
+ /*
+* The staging area must reside in the the first 1GB physical
+* memory: see elf64_exec() in
+* boot/efi/loader/arch/amd64/elf64_freebsd.c.
+*/
+ staging = 1024*1024*1024;
+ status = BS->AllocatePages(AllocateMaxAddress, EfiLoaderData,
+ nr_pages, &staging);
+#else
status = BS->AllocatePages(AllocateAnyPages, EfiLoaderData,
- STAGE_PAGES, &staging);
+ nr_pages, &staging);
+#endif
if (EFI_ERROR(status)) {
printf("failed to allocate staging area: %lu\n",
EFI_ERROR_CODE(status));
return (status);
}
- staging_end = staging + STAGE_PAGES * EFI_PAGE_SIZE;
+ staging_end = staging + nr_pages * EFI_PAGE_SIZE;
#if defined(__aarch64__) || defined(__arm__)
/*
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r314548 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: mav
Date: Thu Mar 2 07:50:06 2017
New Revision: 314548
URL: https://svnweb.freebsd.org/changeset/base/314548
Log:
Completely skip cache flushing for not supporting log devices.
MFC after:2 weeks
Sponsored by: iXsystems, Inc.
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Thu Mar 2
07:25:50 2017(r314547)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Thu Mar 2
07:50:06 2017(r314548)
@@ -838,7 +838,7 @@ zil_flush_vdevs(zilog_t *zilog)
avl_tree_t *t = &zilog->zl_vdev_tree;
void *cookie = NULL;
zil_vdev_node_t *zv;
- zio_t *zio;
+ zio_t *zio = NULL;
ASSERT(zilog->zl_writer);
@@ -851,12 +851,13 @@ zil_flush_vdevs(zilog_t *zilog)
spa_config_enter(spa, SCL_STATE, FTAG, RW_READER);
- zio = zio_root(spa, NULL, NULL, ZIO_FLAG_CANFAIL);
-
while ((zv = avl_destroy_nodes(t, &cookie)) != NULL) {
vdev_t *vd = vdev_lookup_top(spa, zv->zv_vdev);
- if (vd != NULL)
+ if (vd != NULL && !vd->vdev_nowritecache) {
+ if (zio == NULL)
+ zio = zio_root(spa, NULL, NULL,
ZIO_FLAG_CANFAIL);
zio_flush(zio, vd);
+ }
kmem_free(zv, sizeof (*zv));
}
@@ -864,7 +865,8 @@ zil_flush_vdevs(zilog_t *zilog)
* Wait for all the flushes to complete. Not all devices actually
* support the DKIOCFLUSHWRITECACHE ioctl, so it's OK if it fails.
*/
- (void) zio_wait(zio);
+ if (zio)
+ (void) zio_wait(zio);
spa_config_exit(spa, SCL_STATE, FTAG);
}
___
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: r314549 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: mav
Date: Thu Mar 2 07:55:47 2017
New Revision: 314549
URL: https://svnweb.freebsd.org/changeset/base/314549
Log:
Execute last ZIO of log commit synchronously.
For short transactions overhead of context switch can be too large.
Skipping it gives significant latency reduction. For large ones,
including multiple ZIOs, latency is less critical, while throughput
there may become limited by checksumming speed of single CPU core.
To get best of both cases, execute last ZIO directly from calling
thread context to save latency, while all others (if there are any)
enqueue to taskqueues in traditional way.
MFC after:2 weeks
Sponsored by: iXsystems, Inc.
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Thu Mar 2
07:50:06 2017(r314548)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Thu Mar 2
07:55:47 2017(r314549)
@@ -959,7 +959,7 @@ uint64_t zil_block_buckets[] = {
* Calls are serialized.
*/
static lwb_t *
-zil_lwb_write_start(zilog_t *zilog, lwb_t *lwb)
+zil_lwb_write_start(zilog_t *zilog, lwb_t *lwb, boolean_t last)
{
lwb_t *nlwb = NULL;
zil_chain_t *zilc;
@@ -1060,6 +1060,8 @@ zil_lwb_write_start(zilog_t *zilog, lwb_
*/
bzero(lwb->lwb_buf + lwb->lwb_nused, wsz - lwb->lwb_nused);
+ if (last)
+ lwb->lwb_zio->io_pipeline &= ~ZIO_STAGE_ISSUE_ASYNC;
zio_nowait(lwb->lwb_zio); /* Kick off the write for the old log block */
/*
@@ -1103,7 +1105,7 @@ cont:
if (reclen > lwb_sp || (reclen + dlen > lwb_sp &&
lwb_sp < ZIL_MAX_LOG_DATA / 8 && (dlen % ZIL_MAX_LOG_DATA == 0 ||
lwb_sp < reclen + dlen % ZIL_MAX_LOG_DATA))) {
- lwb = zil_lwb_write_start(zilog, lwb);
+ lwb = zil_lwb_write_start(zilog, lwb, B_FALSE);
if (lwb == NULL)
return (NULL);
zil_lwb_write_init(zilog, lwb);
@@ -1560,7 +1562,7 @@ zil_commit_writer(zilog_t *zilog)
/* write the last block out */
if (lwb != NULL && lwb->lwb_zio != NULL)
- lwb = zil_lwb_write_start(zilog, lwb);
+ lwb = zil_lwb_write_start(zilog, lwb, B_TRUE);
zilog->zl_cur_used = 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"
